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

Package-Manager: portage-2.1.3_rc6

5 files changed, 382 insertions, 8 deletions

diff --git a/kde-base/kdepim/ChangeLog b/kde-base/kdepim/ChangeLog
index 35c6164c9391..6c6715380658 100644
--- a/kde-base/kdepim/ChangeLog
+++ b/kde-base/kdepim/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/kdepim
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim/ChangeLog,v 1.273 2007/06/23 21:20:34 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim/ChangeLog,v 1.274 2007/07/01 13:34:11 philantrop Exp $
+
+*kdepim-3.5.7-r1 (01 Jul 2007)
+
+  01 Jul 2007; Wulf C. Krueger <philantrop@gentoo.org>
+  +files/akregator-3.5.7-customcolors.diff, +kdepim-3.5.7-r1.ebuild:
+  Added the patch from bug 179376 as provided by 6thpink to enable the use of
+  custom colours in akregator. Thanks, 6thpink! Minor whitespace fixes.
 
   23 Jun 2007; Wulf C. Krueger <philantrop@gentoo.org> kdepim-3.5.7.ebuild:
   Several tests are broken and therefore deactivated now. Fixes bug 183001.
diff --git a/kde-base/kdepim/Manifest b/kde-base/kdepim/Manifest
index 5c4230b11f6d..ed886cde72fd 100644
--- a/kde-base/kdepim/Manifest
+++ b/kde-base/kdepim/Manifest
@@ -1,6 +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
 AUX kmail-3.5.5-dimap-mail-loss.patch 9870 RMD160 8abfe56734cc94917e4ffc94029414789692e8da SHA1 d8396dcda5d2ed6c5cb2fad66c1a2cb98a1a8752 SHA256 30992bb319dff9ef45c3b44873284346e7727f5982835d97af44030511e3a636
 MD5 970d8db800a3bb39be0c7f4a41c35e06 files/kmail-3.5.5-dimap-mail-loss.patch 9870
 RMD160 8abfe56734cc94917e4ffc94029414789692e8da files/kmail-3.5.5-dimap-mail-loss.patch 9870
@@ -54,14 +58,18 @@ EBUILD kdepim-3.5.6-r3.ebuild 1850 RMD160 643dc18700794bc9848188eb3c9790bd04859c
 MD5 f86b5abf090738a59855f6257b776b27 kdepim-3.5.6-r3.ebuild 1850
 RMD160 643dc18700794bc9848188eb3c9790bd04859ccf kdepim-3.5.6-r3.ebuild 1850
 SHA256 9294fb8e4eda74904652615256273f37ec57777f49f40c09c96058b361aef97c kdepim-3.5.6-r3.ebuild 1850
+EBUILD kdepim-3.5.7-r1.ebuild 1842 RMD160 1e386eadb8efc438b9a2e9a88443d66c1af8447a SHA1 96db22505ce65e4725e02f64970dac9e8c7667d6 SHA256 36d730acb97a2a089e48c02203f9e1b9173140e09cb238b99c8b81068e9f1e82
+MD5 503a5c352f6f695f41273f19f0ef52dd kdepim-3.5.7-r1.ebuild 1842
+RMD160 1e386eadb8efc438b9a2e9a88443d66c1af8447a kdepim-3.5.7-r1.ebuild 1842
+SHA256 36d730acb97a2a089e48c02203f9e1b9173140e09cb238b99c8b81068e9f1e82 kdepim-3.5.7-r1.ebuild 1842
 EBUILD kdepim-3.5.7.ebuild 1783 RMD160 9d2984111a73df7fe449dd347b8456c2f0ab375d SHA1 4492ccb4a504bfb3a925ea67abf0bde22c29ffc4 SHA256 3c9defe0d89e8875a928f40ba0b6e72f0e260da41c901a65b901944df408d90a
 MD5 1151c9700bf8739b4dc46c83dc2c67e2 kdepim-3.5.7.ebuild 1783
 RMD160 9d2984111a73df7fe449dd347b8456c2f0ab375d kdepim-3.5.7.ebuild 1783
 SHA256 3c9defe0d89e8875a928f40ba0b6e72f0e260da41c901a65b901944df408d90a kdepim-3.5.7.ebuild 1783
-MISC ChangeLog 37086 RMD160 8ee98488942c52fba92ebafbf8c7d2d360446c0c SHA1 27ce4b35cae0ece6018f8cea18e6a498af2c8a58 SHA256 f8b3352f9d4d95c805029efd48fb7668050c8bfd1be009d59999cceeaa07d144
-MD5 08acfc8a21097803e58fe93b01468001 ChangeLog 37086
-RMD160 8ee98488942c52fba92ebafbf8c7d2d360446c0c ChangeLog 37086
-SHA256 f8b3352f9d4d95c805029efd48fb7668050c8bfd1be009d59999cceeaa07d144 ChangeLog 37086
+MISC ChangeLog 37393 RMD160 35211ce3bb0a785b4b3dc63ecf55d890f1474dc2 SHA1 9a5ff49c712848d33e713cc206981d610f558270 SHA256 ffb6dbdb062ba00e66c4fc27b5d3f1f048725e451973f3c207a544b5b6640715
+MD5 e63cfce1c0bed6f940c035a1a584118e ChangeLog 37393
+RMD160 35211ce3bb0a785b4b3dc63ecf55d890f1474dc2 ChangeLog 37393
+SHA256 ffb6dbdb062ba00e66c4fc27b5d3f1f048725e451973f3c207a544b5b6640715 ChangeLog 37393
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156
@@ -87,10 +95,13 @@ SHA256 28cf961d85e40bd6eda1a8cb0f3f60d54b6201566257887380ef112ab5866552 files/di
 MD5 7f2693c97c9b5efc543db636b6430308 files/digest-kdepim-3.5.7 247
 RMD160 969f30b74378c53d0e07ac66364c0e0ed700b9a9 files/digest-kdepim-3.5.7 247
 SHA256 e2d72a2f91c943cdee1c55c196f4e64591c7568eeae58d52df0dc277921bf345 files/digest-kdepim-3.5.7 247
+MD5 7f2693c97c9b5efc543db636b6430308 files/digest-kdepim-3.5.7-r1 247
+RMD160 969f30b74378c53d0e07ac66364c0e0ed700b9a9 files/digest-kdepim-3.5.7-r1 247
+SHA256 e2d72a2f91c943cdee1c55c196f4e64591c7568eeae58d52df0dc277921bf345 files/digest-kdepim-3.5.7-r1 247
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.4 (GNU/Linux)
 
-iD8DBQFGfY6sCkvF58q80IkRAnkTAJ9jsmFdLME0lou1jLs60AEAmeTeVACfWsQm
-C74niF2h+b6/VaXMpuJnIq4=
-=TukZ
+iD8DBQFGh61bCkvF58q80IkRAvIBAJsFGSiDOwkAY1VKpuM8fEyQd6RBsQCglAUK
+NGmqB9pAZLlplGKWBaYr7YY=
+=eRSj
 -----END PGP SIGNATURE-----
diff --git a/kde-base/kdepim/files/akregator-3.5.7-customcolors.diff b/kde-base/kdepim/files/akregator-3.5.7-customcolors.diff
new file mode 100644
index 000000000000..c0e5e8b229ea
--- /dev/null
+++ b/kde-base/kdepim/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/kdepim/files/digest-kdepim-3.5.7-r1 b/kde-base/kdepim/files/digest-kdepim-3.5.7-r1
new file mode 100644
index 000000000000..01737c61da89
--- /dev/null
+++ b/kde-base/kdepim/files/digest-kdepim-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
diff --git a/kde-base/kdepim/kdepim-3.5.7-r1.ebuild b/kde-base/kdepim/kdepim-3.5.7-r1.ebuild
new file mode 100644
index 000000000000..13217e174102
--- /dev/null
+++ b/kde-base/kdepim/kdepim-3.5.7-r1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim/kdepim-3.5.7-r1.ebuild,v 1.1 2007/07/01 13:34:11 philantrop Exp $
+
+inherit kde-dist
+
+DESCRIPTION="KDE PIM (Personal Information Management) applications: KOrganizer, KMail, KNode,..."
+
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="crypt gnokii"
+
+RESTRICT="test"
+
+# We use GnuPG 1.4.x for OpenPGP and 1.9 (via gpgme) for s/mime as upstream advises.
+DEPEND="~kde-base/kdebase-${PV}
+	>=dev-libs/cyrus-sasl-2
+	gnokii? ( app-mobilephone/gnokii )
+	crypt? ( >=app-crypt/gpgme-1.1.2-r1
+		|| ( >=app-crypt/gnupg-2.0.1-r1 <app-crypt/gnupg-1.9 ) )
+		x11-libs/libXScrnSaver
+	app-pda/libopensync"
+#	Requires pilot-link-0.12.0
+#	pda? ( >=app-pda/pilot-link-0.12.0 dev-libs/libmal )
+
+RDEPEND="${DEPEND}
+	crypt? ( app-crypt/pinentry )"
+
+DEPEND="${DEPEND}
+	x11-proto/scrnsaverproto"
+
+PATCHES="${FILESDIR}/akregator-3.5.7-customcolors.diff"
+
+src_unpack() {
+	kde_src_unpack
+	# Call Qt 3 designer
+	sed -i -e "s:\"designer\":\"${QTDIR}/bin/designer\":g" "${S}"/libkdepim/kcmdesignerfields.cpp || die "sed failed"
+
+	# disabling tests, see bug #164038 and bug #164097
+	sed -e "s:SUBDIRS = libical versit tests:SUBDIRS = libical versit:" \
+		-i libkcal/Makefile.am || die "sed failed" || die "sed failed"
+# 	sed -e "s:SUBDIRS = . plugins test:SUBDIRS = . plugins:" \
+# 		-i kitchensync/libkonnector2/Makefile.am || die "sed failed"
+# 	sed -e "s:SUBDIRS = . tests test:SUBDIRS = .:" \
+# 		-i kitchensync/libksync/Makefile.am || die "sed failed"
+}
+
+src_compile() {
+	local myconf="--with-sasl $(use_with gnokii)"
+	use crypt && myconf="${myconf} --with-gpg=/usr/bin/gpg"
+
+	# use pda || DO_NOT_COMPILE="${DO_NOT_COMPILE} kpilot"
+	DO_NOT_COMPILE="${DO_NOT_COMPILE} kpilot"
+
+	kde_src_compile
+}