Add patch to avoid akregator messing with the archive (#86477).

Package-Manager: portage-2.0.51.19

8 files changed, 137 insertions, 5 deletions

diff --git a/kde-base/akregator/ChangeLog b/kde-base/akregator/ChangeLog
index e28e53798575..aaa5d88192e5 100644
--- a/kde-base/akregator/ChangeLog
+++ b/kde-base/akregator/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/akregator
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/akregator/ChangeLog,v 1.8 2005/03/18 17:06:38 morfic Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/akregator/ChangeLog,v 1.9 2005/03/24 22:25:42 greg_g Exp $
+
+*akregator-3.4.0-r1 (24 Mar 2005)
+
+  24 Mar 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +files/kdepim-3.4.0-akregator-fix.patch, +akregator-3.4.0-r1.ebuild,
+  -akregator-3.4.0.ebuild:
+  Add patch to avoid akregator messing with the archive (#86477).
 
   18 Mar 2005; Daniel Goller <morfic@gentoo.org> akregator-3.4.0.ebuild:
   Added to ~ppc
diff --git a/kde-base/akregator/akregator-3.4.0.ebuild b/kde-base/akregator/akregator-3.4.0-r1.ebuild
index e2acbe2667b5..afa5b0270e17 100644
--- a/kde-base/akregator/akregator-3.4.0.ebuild
+++ b/kde-base/akregator/akregator-3.4.0-r1.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/akregator/akregator-3.4.0.ebuild,v 1.2 2005/03/18 17:06:38 morfic Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/akregator/akregator-3.4.0-r1.ebuild,v 1.1 2005/03/24 22:25:42 greg_g Exp $
 
 KMNAME=kdepim
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
-inherit kde-meta
+inherit kde-meta eutils
 
 DESCRIPTION="KDE news feed aggregator"
 KEYWORDS="~x86 ~amd64 ~ppc"
@@ -19,3 +19,6 @@ libkpinterfaces kontact/interfaces"
 KMEXTRACTONLY="libkdepim
 kontact/interfaces"
 KMEXTRA="kontact/plugins/akregator"
+
+# Patch for kde bug 101907. Applied for 3.4.1
+PATCHES1="${FILESDIR}/kdepim-3.4.0-akregator-fix.patch"
diff --git a/kde-base/akregator/files/digest-akregator-3.4.0 b/kde-base/akregator/files/digest-akregator-3.4.0-r1
index 742a79736b66..742a79736b66 100644
--- a/kde-base/akregator/files/digest-akregator-3.4.0
+++ b/kde-base/akregator/files/digest-akregator-3.4.0-r1
diff --git a/kde-base/akregator/files/kdepim-3.4.0-akregator-fix.patch b/kde-base/akregator/files/kdepim-3.4.0-akregator-fix.patch
new file mode 100644
index 000000000000..2277ae4c0545
--- /dev/null
+++ b/kde-base/akregator/files/kdepim-3.4.0-akregator-fix.patch
@@ -0,0 +1,56 @@
+diff -Nur kdepim-3.4.0.orig/akregator/src/settings_archive.ui kdepim-3.4.0/akregator/src/settings_archive.ui
+--- kdepim-3.4.0.orig/akregator/src/settings_archive.ui	2005-02-23 12:08:42.000000000 +0100
++++ kdepim-3.4.0/akregator/src/settings_archive.ui	2005-03-24 19:50:36.000000000 +0100
+@@ -42,14 +42,6 @@
+                         <string>Keep all articles</string>
+                     </property>
+                 </widget>
+-                <widget class="QRadioButton" row="3" column="0" rowspan="1" colspan="2">
+-                    <property name="name">
+-                        <cstring>rb_DisableArchiving</cstring>
+-                    </property>
+-                    <property name="text">
+-                        <string>Disable archiving</string>
+-                    </property>
+-                </widget>
+                 <widget class="QRadioButton" row="1" column="0">
+                     <property name="name">
+                         <cstring>rb_LimitArticleNumber</cstring>
+@@ -58,6 +50,22 @@
+                         <string>Limit feed archive size to:</string>
+                     </property>
+                 </widget>
++		<widget class="QRadioButton" row="2" column="0">
++			<property name="name">
++				<cstring>rb_LimitArticleAge</cstring>
++			</property>
++			<property name="text">
++				<string>Delete articles older than: </string>
++			</property>
++		</widget>
++		<widget class="QRadioButton" row="3" column="0" rowspan="1" colspan="2">
++			<property name="name">
++				<cstring>rb_DisableArchiving</cstring>
++			</property>
++			<property name="text">
++				<string>Disable archiving</string>
++			</property>
++		</widget>
+                 <widget class="KIntSpinBox" row="1" column="1">
+                     <property name="name">
+                         <cstring>kcfg_MaxArticleNumber</cstring>
+@@ -84,14 +92,6 @@
+                         <number>1000</number>
+                     </property>
+                 </widget>
+-                <widget class="QRadioButton" row="2" column="0">
+-                    <property name="name">
+-                        <cstring>rb_LimitArticleAge</cstring>
+-                    </property>
+-                    <property name="text">
+-                        <string>Delete articles older than: </string>
+-                    </property>
+-                </widget>
+                 <widget class="KIntSpinBox" row="2" column="1">
+                     <property name="name">
+                         <cstring>kcfg_MaxArticleAge</cstring>
diff --git a/kde-base/kdepim/ChangeLog b/kde-base/kdepim/ChangeLog
index ed3bc2c50dbd..7f210ec4a0d6 100644
--- a/kde-base/kdepim/ChangeLog
+++ b/kde-base/kdepim/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/kdepim
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim/ChangeLog,v 1.143 2005/03/18 17:29:09 morfic Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim/ChangeLog,v 1.144 2005/03/24 22:23:16 greg_g Exp $
+
+*kdepim-3.4.0-r1 (24 Mar 2005)
+
+  24 Mar 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +files/kdepim-3.4.0-akregator-fix.patch, +kdepim-3.4.0-r1.ebuild,
+  -kdepim-3.4.0.ebuild:
+  Add patch to avoid akregator messing with the archive (#86477).
 
   18 Mar 2005; Daniel Goller <morfic@gentoo.org> kdepim-3.4.0.ebuild:
   Added to ~ppc
diff --git a/kde-base/kdepim/files/digest-kdepim-3.4.0 b/kde-base/kdepim/files/digest-kdepim-3.4.0-r1
index 742a79736b66..742a79736b66 100644
--- a/kde-base/kdepim/files/digest-kdepim-3.4.0
+++ b/kde-base/kdepim/files/digest-kdepim-3.4.0-r1
diff --git a/kde-base/kdepim/files/kdepim-3.4.0-akregator-fix.patch b/kde-base/kdepim/files/kdepim-3.4.0-akregator-fix.patch
new file mode 100644
index 000000000000..2277ae4c0545
--- /dev/null
+++ b/kde-base/kdepim/files/kdepim-3.4.0-akregator-fix.patch
@@ -0,0 +1,56 @@
+diff -Nur kdepim-3.4.0.orig/akregator/src/settings_archive.ui kdepim-3.4.0/akregator/src/settings_archive.ui
+--- kdepim-3.4.0.orig/akregator/src/settings_archive.ui	2005-02-23 12:08:42.000000000 +0100
++++ kdepim-3.4.0/akregator/src/settings_archive.ui	2005-03-24 19:50:36.000000000 +0100
+@@ -42,14 +42,6 @@
+                         <string>Keep all articles</string>
+                     </property>
+                 </widget>
+-                <widget class="QRadioButton" row="3" column="0" rowspan="1" colspan="2">
+-                    <property name="name">
+-                        <cstring>rb_DisableArchiving</cstring>
+-                    </property>
+-                    <property name="text">
+-                        <string>Disable archiving</string>
+-                    </property>
+-                </widget>
+                 <widget class="QRadioButton" row="1" column="0">
+                     <property name="name">
+                         <cstring>rb_LimitArticleNumber</cstring>
+@@ -58,6 +50,22 @@
+                         <string>Limit feed archive size to:</string>
+                     </property>
+                 </widget>
++		<widget class="QRadioButton" row="2" column="0">
++			<property name="name">
++				<cstring>rb_LimitArticleAge</cstring>
++			</property>
++			<property name="text">
++				<string>Delete articles older than: </string>
++			</property>
++		</widget>
++		<widget class="QRadioButton" row="3" column="0" rowspan="1" colspan="2">
++			<property name="name">
++				<cstring>rb_DisableArchiving</cstring>
++			</property>
++			<property name="text">
++				<string>Disable archiving</string>
++			</property>
++		</widget>
+                 <widget class="KIntSpinBox" row="1" column="1">
+                     <property name="name">
+                         <cstring>kcfg_MaxArticleNumber</cstring>
+@@ -84,14 +92,6 @@
+                         <number>1000</number>
+                     </property>
+                 </widget>
+-                <widget class="QRadioButton" row="2" column="0">
+-                    <property name="name">
+-                        <cstring>rb_LimitArticleAge</cstring>
+-                    </property>
+-                    <property name="text">
+-                        <string>Delete articles older than: </string>
+-                    </property>
+-                </widget>
+                 <widget class="KIntSpinBox" row="2" column="1">
+                     <property name="name">
+                         <cstring>kcfg_MaxArticleAge</cstring>
diff --git a/kde-base/kdepim/kdepim-3.4.0.ebuild b/kde-base/kdepim/kdepim-3.4.0-r1.ebuild
index 64adf2db1ed8..407724f2eecd 100644
--- a/kde-base/kdepim/kdepim-3.4.0.ebuild
+++ b/kde-base/kdepim/kdepim-3.4.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim/kdepim-3.4.0.ebuild,v 1.2 2005/03/18 17:29:09 morfic Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim/kdepim-3.4.0-r1.ebuild,v 1.1 2005/03/24 22:23:16 greg_g Exp $
 
 inherit kde-dist eutils
 
@@ -19,6 +19,9 @@ DEPEND="~kde-base/kdebase-${PV}
 src_unpack() {
 	kde_src_unpack
 
+	# Fix for kde bug 101907. Applied for 3.4.1.
+	epatch "${FILESDIR}/${P}-akregator-fix.patch"
+
 	# Applied for 3.4.1.
 	cd "${S}/kresources/kolab/"
 	epatch "${FILESDIR}/${P}-fix-imap-resource-type.patch"