Added the patch from bug 179376 as provided by 6thpink to enable the use of custom colours. Thanks, 6thpink!

Package-Manager: portage-2.1.3_rc6

5 files changed, 360 insertions, 5 deletions

diff --git a/kde-base/akregator/ChangeLog b/kde-base/akregator/ChangeLog
index 31609b6fe3bf..0d32e5d590da 100644
--- a/kde-base/akregator/ChangeLog
+++ b/kde-base/akregator/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/akregator
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/akregator/ChangeLog,v 1.74 2007/05/22 20:43:06 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/akregator/ChangeLog,v 1.75 2007/07/01 09:59:34 philantrop Exp $
+
+*akregator-3.5.7-r1 (01 Jul 2007)
+
+  01 Jul 2007; Wulf C. Krueger <philantrop@gentoo.org>
+  +files/akregator-3.5.7-customcolors.diff, +akregator-3.5.7-r1.ebuild:
+  Added the patch from bug 179376 as provided by 6thpink to enable the use of
+  custom colours. Thanks, 6thpink!
 
 *akregator-3.5.7 (22 May 2007)
 
diff --git a/kde-base/akregator/Manifest b/kde-base/akregator/Manifest
index a0eb361128f8..8e2ad94084f8 100644
--- a/kde-base/akregator/Manifest
+++ b/kde-base/akregator/Manifest
@@ -1,3 +1,10 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX akregator-3.5.7-customcolors.diff 11558 RMD160 74ba8c86c208d605d51be53d39de2d58e6fc7c4f SHA1 321387cb813d0615a5760f5d5ed107b344a88e8a SHA256 32673cc1456233b3015832189ca6df7daea3bc8fead527bf3b9fedaae0c3cef1
+MD5 d5a9ca9b65f873e7b550bb9e333c6a88 files/akregator-3.5.7-customcolors.diff 11558
+RMD160 74ba8c86c208d605d51be53d39de2d58e6fc7c4f files/akregator-3.5.7-customcolors.diff 11558
+SHA256 32673cc1456233b3015832189ca6df7daea3bc8fead527bf3b9fedaae0c3cef1 files/akregator-3.5.7-customcolors.diff 11558
 DIST kdepim-3.5-patchset-03.tar.bz2 121475 RMD160 e8aa4e812a3be3d4e13429d487e1e4d466e058b1 SHA1 2c924af34a5bb3562b17b861b63df59c0341298f SHA256 30d4e8d7ac4e11f1a8209bbcb5b39beb044998d4b0d3fa810743a017b38b904b
 DIST kdepim-3.5.5.tar.bz2 12908968 RMD160 5bdcf98909f450ce3839fa72a404571f6cde22f6 SHA1 612f34307c5fac9279c85a4efb1488db4b438f12 SHA256 82887df2c2ff00cb60dcfb8aa04527988123b9a4ed70f4c9082a7a0eb9f1f047
 DIST kdepim-3.5.6.tar.bz2 13643798 RMD160 85f64349d8eedb531895a3591f6fee07c68bf1eb SHA1 a84ad8dd9f84eb3f33070e07ed56f6d694db2cb4 SHA256 0b3a04f72fa640d804df1c4cf2c66ac3ccc5033c98e90a7ae9c62611ea8e3a55
@@ -14,14 +21,18 @@ EBUILD akregator-3.5.6.ebuild 709 RMD160 8c12c479e314b94af4f12d71869308fe02a2ef2
 MD5 a8a0b114b2b19a037cbc8b096123b853 akregator-3.5.6.ebuild 709
 RMD160 8c12c479e314b94af4f12d71869308fe02a2ef29 akregator-3.5.6.ebuild 709
 SHA256 84b67401e25b77757658d4d20b68c3f5338580945c06a105e61703ce996a773d akregator-3.5.6.ebuild 709
+EBUILD akregator-3.5.7-r1.ebuild 765 RMD160 16bdfd35261a86b1821b52ead7452fafb0378615 SHA1 dcd7c79dfe6e7da59f9994ed54e6a168f75dc780 SHA256 26d0b38e64622133837f62036428d90da12922948b0550b952328096fac1a765
+MD5 cc87a9a54c4710dd9f1d23a4727e6dae akregator-3.5.7-r1.ebuild 765
+RMD160 16bdfd35261a86b1821b52ead7452fafb0378615 akregator-3.5.7-r1.ebuild 765
+SHA256 26d0b38e64622133837f62036428d90da12922948b0550b952328096fac1a765 akregator-3.5.7-r1.ebuild 765
 EBUILD akregator-3.5.7.ebuild 711 RMD160 b0ed7b59153e69970bc465b18b70ac6c2d7e6a4f SHA1 76087819c69dc6ee811b4df68a2c53ac450c8976 SHA256 9361f825c769b51ef60a1dc108aed88094b19908f614a3ccade7b533cdad70bd
 MD5 4dcf61bd47c7ce2d0997e611abe3289f akregator-3.5.7.ebuild 711
 RMD160 b0ed7b59153e69970bc465b18b70ac6c2d7e6a4f akregator-3.5.7.ebuild 711
 SHA256 9361f825c769b51ef60a1dc108aed88094b19908f614a3ccade7b533cdad70bd akregator-3.5.7.ebuild 711
-MISC ChangeLog 9891 RMD160 23857eccb6f6347e0c5794544ac549d2056aa15c SHA1 1edc47d4e33ea749059d12413527c80e6e06ce06 SHA256 b9b116da0146f2b32c22a4936c1dd629abd5d40d64be42c729fe6f15cd1f55f9
-MD5 dbf27348318e7f8cfc218549c035599c ChangeLog 9891
-RMD160 23857eccb6f6347e0c5794544ac549d2056aa15c ChangeLog 9891
-SHA256 b9b116da0146f2b32c22a4936c1dd629abd5d40d64be42c729fe6f15cd1f55f9 ChangeLog 9891
+MISC ChangeLog 10172 RMD160 6d14581f60d70d85e430dc7e7262242f48b991fb SHA1 b2697145ba56aa497c343106f973c8f850591e3e SHA256 42bc28cfb02c0e65429255d004f186dc5286009b7754a733d992b246764ee8c9
+MD5 80efd249c1b5de194ffd293060b3b540 ChangeLog 10172
+RMD160 6d14581f60d70d85e430dc7e7262242f48b991fb ChangeLog 10172
+SHA256 42bc28cfb02c0e65429255d004f186dc5286009b7754a733d992b246764ee8c9 ChangeLog 10172
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156
@@ -38,3 +49,13 @@ SHA256 28cf961d85e40bd6eda1a8cb0f3f60d54b6201566257887380ef112ab5866552 files/di
 MD5 7f2693c97c9b5efc543db636b6430308 files/digest-akregator-3.5.7 247
 RMD160 969f30b74378c53d0e07ac66364c0e0ed700b9a9 files/digest-akregator-3.5.7 247
 SHA256 e2d72a2f91c943cdee1c55c196f4e64591c7568eeae58d52df0dc277921bf345 files/digest-akregator-3.5.7 247
+MD5 7f2693c97c9b5efc543db636b6430308 files/digest-akregator-3.5.7-r1 247
+RMD160 969f30b74378c53d0e07ac66364c0e0ed700b9a9 files/digest-akregator-3.5.7-r1 247
+SHA256 e2d72a2f91c943cdee1c55c196f4e64591c7568eeae58d52df0dc277921bf345 files/digest-akregator-3.5.7-r1 247
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.4 (GNU/Linux)
+
+iD8DBQFGh3sOCkvF58q80IkRAmWZAJ4hrt1Xn/8ugzTtIuQ84w/x/80V0wCcDDjN
+HrUhfPsR9JOVjc7c6b6EfSw=
+=u7RK
+-----END PGP SIGNATURE-----
diff --git a/kde-base/akregator/akregator-3.5.7-r1.ebuild b/kde-base/akregator/akregator-3.5.7-r1.ebuild
new file mode 100644
index 000000000000..4f70dde4de9c
--- /dev/null
+++ b/kde-base/akregator/akregator-3.5.7-r1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/akregator/akregator-3.5.7-r1.ebuild,v 1.1 2007/07/01 09:59:34 philantrop Exp $
+
+KMNAME=kdepim
+MAXKDEVER=$PV
+KM_DEPRANGE="$PV $MAXKDEVER"
+
+inherit kde-meta eutils
+
+DESCRIPTION="KDE news feed aggregator."
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkdepim)
+	$(deprange $PV $MAXKDEVER kde-base/kontact)
+	!net-www/akregator"
+
+RDEPEND="${DEPEND}"
+
+KMCOPYLIB="libkdepim libkdepim
+	libkpinterfaces kontact/interfaces"
+KMEXTRACTONLY="libkdepim
+	kontact/interfaces"
+KMEXTRA="kontact/plugins/akregator"
+
+PATCHES="${FILESDIR}/${P}-customcolors.diff"
diff --git a/kde-base/akregator/files/akregator-3.5.7-customcolors.diff b/kde-base/akregator/files/akregator-3.5.7-customcolors.diff
new file mode 100644
index 000000000000..c0e5e8b229ea
--- /dev/null
+++ b/kde-base/akregator/files/akregator-3.5.7-customcolors.diff
@@ -0,0 +1,298 @@
+Index: akregator.kcfg
+===================================================================
+--- akregator/src/akregator.kcfg	(revision 573936)
++++ akregator/src/akregator.kcfg	(working copy)
+@@ -40,6 +40,16 @@
+    <entry key="Fixed Font" type="String" />
+    <entry key="Serif Font" type="String" />
+    <entry key="Sans Serif Font" type="String" />
++   <entry key="UseCustomColors" type="Bool">
++        <default>false</default>
++   </entry>
++    <entry key="ColorUnreadArticles" type="Color">
++        <default>#0000FF</default>
++    </entry>
++    <entry key="ColorNewArticles" type="Color">
++        <default>#FF0000</default>
++    </entry>
++        
+  </group>
+  <group name="HTML Settings" >
+   <entry key="Fonts" type="StringList" />
+Index: articlelistview.cpp
+===================================================================
+--- akregator/src/articlelistview.cpp	(revision 573936)
++++ akregator/src/articlelistview.cpp	(working copy)
+@@ -181,15 +181,20 @@
+         QColorGroup cg2(cg);
+     
+         if (article().status() == Article::Unread)
+-            cg2.setColor(QColorGroup::Text, Qt::blue);
++            cg2.setColor(QColorGroup::Text, Settings::useCustomColors() ? Settings::colorUnreadArticles() : Qt::blue);
+         else // New
+-            cg2.setColor(QColorGroup::Text, Qt::red);
++            cg2.setColor(QColorGroup::Text, Settings::useCustomColors() ? Settings::colorNewArticles() : Qt::red);
+     
+         KListViewItem::paintCell( p, cg2, column, width, align );
+     }
+ 
+ }
+ 
++void ArticleListView::slotPaletteOrFontChanged()
++{
++    triggerUpdate();
++}
++
+ void ArticleListView::ArticleItem::updateItem(const Article& article)
+ {
+     m_article = article;
+Index: articlelistview.h
+===================================================================
+--- akregator/src/articlelistview.h	(revision 573936)
++++ akregator/src/articlelistview.h	(working copy)
+@@ -80,6 +80,8 @@
+             /** selects next unread article in list view, first unread article if no article was selected */
+             void slotNextUnreadArticle();
+ 
++            void slotPaletteOrFontChanged();
++            
+         signals:
+             void signalArticleChosen(const Article& article);
+             void signalDoubleClicked(const Article&, const QPoint&, int);
+Index: settings_appearance.ui
+===================================================================
+--- akregator/src/settings_appearance.ui	(revision 573936)
++++ akregator/src/settings_appearance.ui	(working copy)
+@@ -10,20 +10,20 @@
+             <x>0</x>
+             <y>0</y>
+             <width>418</width>
+-            <height>377</height>
++            <height>566</height>
+         </rect>
+     </property>
+     <property name="caption">
+         <string>General</string>
+     </property>
+-    <vbox>
++    <grid>
+         <property name="name">
+             <cstring>unnamed</cstring>
+         </property>
+         <property name="margin">
+             <number>0</number>
+         </property>
+-        <widget class="QGroupBox">
++        <widget class="QGroupBox" row="1" column="0">
+             <property name="name">
+                 <cstring>groupBox3</cstring>
+             </property>
+@@ -114,8 +114,25 @@
+                 </widget>
+             </grid>
+         </widget>
+-        <widget class="QGroupBox">
++        <spacer row="4" column="0">
+             <property name="name">
++                <cstring>spacer1</cstring>
++            </property>
++            <property name="orientation">
++                <enum>Vertical</enum>
++            </property>
++            <property name="sizeType">
++                <enum>Expanding</enum>
++            </property>
++            <property name="sizeHint">
++                <size>
++                    <width>20</width>
++                    <height>41</height>
++                </size>
++            </property>
++        </spacer>
++        <widget class="QGroupBox" row="2" column="0">
++            <property name="name">
+                 <cstring>FontsGroupBox</cstring>
+             </property>
+             <property name="title">
+@@ -179,7 +196,7 @@
+                 </widget>
+             </grid>
+         </widget>
+-        <widget class="QCheckBox">
++        <widget class="QCheckBox" row="3" column="0">
+             <property name="name">
+                 <cstring>kcfg_UnderlineLinks</cstring>
+             </property>
+@@ -187,24 +204,99 @@
+                 <string>&amp;Underline links</string>
+             </property>
+         </widget>
+-        <spacer>
++        <widget class="QGroupBox" row="0" column="0">
+             <property name="name">
+-                <cstring>spacer1</cstring>
++                <cstring>groupBox3_2</cstring>
+             </property>
+-            <property name="orientation">
+-                <enum>Vertical</enum>
++            <property name="title">
++                <string>Article List Colors</string>
+             </property>
+-            <property name="sizeType">
+-                <enum>Expanding</enum>
+-            </property>
+-            <property name="sizeHint">
+-                <size>
+-                    <width>20</width>
+-                    <height>41</height>
+-                </size>
+-            </property>
+-        </spacer>
+-    </vbox>
++            <grid>
++                <property name="name">
++                    <cstring>unnamed</cstring>
++                </property>
++                <widget class="QCheckBox" row="0" column="0" rowspan="1" colspan="2">
++                    <property name="name">
++                        <cstring>kcfg_UseCustomColors</cstring>
++                    </property>
++                    <property name="text">
++                        <string>Use custom colors</string>
++                    </property>
++                </widget>
++                <widget class="QLayoutWidget" row="1" column="0">
++                    <property name="name">
++                        <cstring>layout1</cstring>
++                    </property>
++                    <grid>
++                        <property name="name">
++                            <cstring>unnamed</cstring>
++                        </property>
++                        <widget class="QLabel" row="0" column="0">
++                            <property name="name">
++                                <cstring>lbl_unreadArticles</cstring>
++                            </property>
++                            <property name="enabled">
++                                <bool>false</bool>
++                            </property>
++                            <property name="text">
++                                <string>Unread articles</string>
++                            </property>
++                        </widget>
++                        <widget class="KColorButton" row="1" column="1">
++                            <property name="name">
++                                <cstring>kcfg_ColorNewArticles</cstring>
++                            </property>
++                            <property name="enabled">
++                                <bool>false</bool>
++                            </property>
++                            <property name="text">
++                                <string></string>
++                            </property>
++                        </widget>
++                        <widget class="KColorButton" row="0" column="1">
++                            <property name="name">
++                                <cstring>kcfg_ColorUnreadArticles</cstring>
++                            </property>
++                            <property name="enabled">
++                                <bool>false</bool>
++                            </property>
++                            <property name="text">
++                                <string></string>
++                            </property>
++                        </widget>
++                        <widget class="QLabel" row="1" column="0">
++                            <property name="name">
++                                <cstring>lbl_newArticles</cstring>
++                            </property>
++                            <property name="enabled">
++                                <bool>false</bool>
++                            </property>
++                            <property name="text">
++                                <string>New articles</string>
++                            </property>
++                        </widget>
++                    </grid>
++                </widget>
++                <spacer row="1" column="1">
++                    <property name="name">
++                        <cstring>spacer2</cstring>
++                    </property>
++                    <property name="orientation">
++                        <enum>Horizontal</enum>
++                    </property>
++                    <property name="sizeType">
++                        <enum>Expanding</enum>
++                    </property>
++                    <property name="sizeHint">
++                        <size>
++                            <width>110</width>
++                            <height>20</height>
++                        </size>
++                    </property>
++                </spacer>
++            </grid>
++        </widget>
++    </grid>
+ </widget>
+ <customwidgets>
+ </customwidgets>
+@@ -233,18 +325,38 @@
+         <receiver>kcfg_MinimumFontSize</receiver>
+         <slot>setValue(int)</slot>
+     </connection>
++    <connection>
++        <sender>kcfg_UseCustomColors</sender>
++        <signal>toggled(bool)</signal>
++        <receiver>kcfg_ColorUnreadArticles</receiver>
++        <slot>setEnabled(bool)</slot>
++    </connection>
++    <connection>
++        <sender>kcfg_UseCustomColors</sender>
++        <signal>toggled(bool)</signal>
++        <receiver>kcfg_ColorNewArticles</receiver>
++        <slot>setEnabled(bool)</slot>
++    </connection>
++    <connection>
++        <sender>kcfg_UseCustomColors</sender>
++        <signal>toggled(bool)</signal>
++        <receiver>lbl_unreadArticles</receiver>
++        <slot>setEnabled(bool)</slot>
++    </connection>
++    <connection>
++        <sender>kcfg_UseCustomColors</sender>
++        <signal>toggled(bool)</signal>
++        <receiver>lbl_newArticles</receiver>
++        <slot>setEnabled(bool)</slot>
++    </connection>
+ </connections>
+ <layoutdefaults spacing="6" margin="11"/>
+ <includehints>
+-    <includehint>knuminput.h</includehint>
+-    <includehint>knuminput.h</includehint>
+     <includehint>kfontcombo.h</includehint>
+-    <includehint>klineedit.h</includehint>
+     <includehint>kfontcombo.h</includehint>
+-    <includehint>klineedit.h</includehint>
+     <includehint>kfontcombo.h</includehint>
+-    <includehint>klineedit.h</includehint>
+     <includehint>kfontcombo.h</includehint>
+-    <includehint>klineedit.h</includehint>
++    <includehint>kcolorbutton.h</includehint>
++    <includehint>kcolorbutton.h</includehint>
+ </includehints>
+ </UI>
+Index: akregator_view.cpp
+===================================================================
+--- akregator/src/akregator_view.cpp	(revision 577072)
++++ akregator/src/akregator_view.cpp	(working copy)
+@@ -297,6 +297,8 @@
+     connect( m_articleList, SIGNAL(signalDoubleClicked(const Article&, const QPoint&, int)),
+                 this, SLOT( slotOpenArticleExternal(const Article&, const QPoint&, int)) );
+ 
++    connect( m_part, SIGNAL(signalSettingsChanged()), m_articleList, SLOT(slotPaletteOrFontChanged()));
++    
+     m_articleViewer = new ArticleViewer(m_articleSplitter, "article_viewer");
+     m_articleViewer->setSafeMode();  // disable JS, Java, etc...
+ 
diff --git a/kde-base/akregator/files/digest-akregator-3.5.7-r1 b/kde-base/akregator/files/digest-akregator-3.5.7-r1
new file mode 100644
index 000000000000..01737c61da89
--- /dev/null
+++ b/kde-base/akregator/files/digest-akregator-3.5.7-r1
@@ -0,0 +1,3 @@
+MD5 8571db6dcf4168614c96bb72c493f931 kdepim-3.5.7.tar.bz2 14166061
+RMD160 14c05d4620abf1eb5421ad434dc63f037069e930 kdepim-3.5.7.tar.bz2 14166061
+SHA256 9d981d372f1822662e102b6f84f046e4df771641fc4d041aae81b8fafd47b32e kdepim-3.5.7.tar.bz2 14166061