Fix regression in akregator (#95455).

Package-Manager: portage-2.0.51.19

6 files changed, 63 insertions, 3 deletions

diff --git a/kde-base/akregator/Manifest b/kde-base/akregator/Manifest
index d07500ef3641..7f482f55a1d4 100644
--- a/kde-base/akregator/Manifest
+++ b/kde-base/akregator/Manifest
@@ -1,7 +1,10 @@
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
 MD5 acad960f3bfb4af3db6512123cd69392 akregator-3.4.0-r1.ebuild 769
 MD5 cbea42aea3668a2227f03e0599b96f8b akregator-3.4.1.ebuild 665
-MD5 dbd6d6704a251f64a31444658bf3ed59 ChangeLog 2167
+MD5 75faedbbdcfcd8fda92fb9fb13006fea akregator-3.4.1-r1.ebuild 792
+MD5 cb54df9fcdaa18e6db1deac4b60b17c3 ChangeLog 2352
 MD5 e8e3fc943d40a2fa3260a042e8f0dcf6 files/digest-akregator-3.4.1 208
 MD5 f487b0894ac81c4e75d85875ce51d24a files/kdepim-3.4.0-akregator-fix.patch 2505
+MD5 b6a29865e7aefe8e3858bd65de651d3d files/kdepim-3.4.1-akregator-unread.patch 673
+MD5 e8e3fc943d40a2fa3260a042e8f0dcf6 files/digest-akregator-3.4.1-r1 208
 MD5 8c0ffea7b75b42449f4acada755ff36a files/digest-akregator-3.4.0-r1 67
diff --git a/kde-base/kdepim/ChangeLog b/kde-base/kdepim/ChangeLog
index d5d64025b84f..25cbf9e4e31e 100644
--- a/kde-base/kdepim/ChangeLog
+++ b/kde-base/kdepim/ChangeLog
@@ -1,6 +1,12 @@
 # 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.150 2005/05/28 08:34:50 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim/ChangeLog,v 1.151 2005/06/08 21:59:42 greg_g Exp $
+
+*kdepim-3.4.1-r1 (08 Jun 2005)
+
+  08 Jun 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +files/kdepim-3.4.1-akregator-unread.patch, +kdepim-3.4.1-r1.ebuild:
+  Fix regression in akregator (#95455).
 
   27 May 2005; Gregorio Guidi <greg_g@gentoo.org>
   +files/kdepim-3.4.1-kpilot-fix.patch, kdepim-3.4.1.ebuild:
diff --git a/kde-base/kdepim/Manifest b/kde-base/kdepim/Manifest
index 299c4bc6425d..5dd1203a282c 100644
--- a/kde-base/kdepim/Manifest
+++ b/kde-base/kdepim/Manifest
@@ -1,14 +1,17 @@
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
 MD5 1e0eef07c12d5bc541dfd858974691d0 kdepim-3.3.2.ebuild 673
 MD5 2877803bcd1808411419ee469c3740f7 kdepim-3.3.2-r1.ebuild 740
-MD5 c6895f6cf8c3057efa80b85c893ad6b7 ChangeLog 19064
+MD5 1ae3abc089bfc8139681d4131f31c13e ChangeLog 19258
 MD5 65b93f8b6e76e1d92cd3ea8dd39ec4d6 kdepim-3.4.1.ebuild 899
 MD5 53f145bb4ec5a11aad2e6cb113416a2a kdepim-3.2.3.ebuild 819
 MD5 b94c24d965fab7c67e67ba859834c13c kdepim-3.4.0-r1.ebuild 1031
+MD5 7e99c824c89187063619059e5fcb3ae7 kdepim-3.4.1-r1.ebuild 1021
 MD5 0324965cf9c67cc4750d7a14cec3ef1f files/kdepim-3.4.1-kpilot-fix.patch 4635
 MD5 f487b0894ac81c4e75d85875ce51d24a files/kdepim-3.4.0-akregator-fix.patch 2505
+MD5 1e18066c2900b78b7dad11a29ed0f002 files/digest-kdepim-3.4.1-r1 67
 MD5 1ec4778f0dbac85bc27bc2c2541e5c64 files/kdepim-3.4.0-fix-imap-resource-type.patch 1938
 MD5 318e6b50444a5837fed2a5ea9ecc57e9 files/digest-kdepim-3.2.3 66
+MD5 b6a29865e7aefe8e3858bd65de651d3d files/kdepim-3.4.1-akregator-unread.patch 673
 MD5 1e18066c2900b78b7dad11a29ed0f002 files/digest-kdepim-3.4.1 67
 MD5 c516924ee249a2899621263d30ac3676 files/kdepim-3.3.2-kmail-imap-preview.diff 667
 MD5 38f90eca12bd5623fc7f28e814efd1a2 files/digest-kdepim-3.3.2 66
diff --git a/kde-base/kdepim/files/digest-kdepim-3.4.1-r1 b/kde-base/kdepim/files/digest-kdepim-3.4.1-r1
new file mode 100644
index 000000000000..38792ff6b953
--- /dev/null
+++ b/kde-base/kdepim/files/digest-kdepim-3.4.1-r1
@@ -0,0 +1 @@
+MD5 e5515aa230558bac8651e9cd9f8f9673 kdepim-3.4.1.tar.bz2 11345538
diff --git a/kde-base/kdepim/files/kdepim-3.4.1-akregator-unread.patch b/kde-base/kdepim/files/kdepim-3.4.1-akregator-unread.patch
new file mode 100644
index 000000000000..52bb1026b9a6
--- /dev/null
+++ b/kde-base/kdepim/files/kdepim-3.4.1-akregator-unread.patch
@@ -0,0 +1,13 @@
+diff -Nur kdepim-3.4.1.orig/akregator/src/myarticle.cpp kdepim-3.4.1/akregator/src/myarticle.cpp
+--- kdepim-3.4.1.orig/akregator/src/myarticle.cpp	2005-05-23 14:11:26.000000000 +0200
++++ kdepim-3.4.1/akregator/src/myarticle.cpp	2005-06-08 16:54:10.000000000 +0200
+@@ -100,8 +100,7 @@
+         uint parsed = hashStr.toUInt(&parsedOk, 16);
+         if (!parsedOk)
+         {
+-            d->hash = calcHash(title() + description() + link().url() + commentsLink().url()
+-                    + QString::number(comments()) );
++            d->hash = calcHash(title() + description() + link().url() + commentsLink().url());
+         }
+         else
+             d->hash = parsed;
diff --git a/kde-base/kdepim/kdepim-3.4.1-r1.ebuild b/kde-base/kdepim/kdepim-3.4.1-r1.ebuild
new file mode 100644
index 000000000000..a1d3fcb839f2
--- /dev/null
+++ b/kde-base/kdepim/kdepim-3.4.1-r1.ebuild
@@ -0,0 +1,34 @@
+# 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.1-r1.ebuild,v 1.1 2005/06/08 21:59:42 greg_g Exp $
+
+inherit kde-dist eutils
+
+DESCRIPTION="KDE PIM (Personal Information Management) apps: korganizer, kmail, knode..."
+
+KEYWORDS="~x86 ~amd64 ~sparc ~ppc ~ia64"
+IUSE="crypt gnokii pda"
+
+DEPEND="~kde-base/kdebase-${PV}
+	>=dev-libs/cyrus-sasl-2
+	pda? ( app-pda/pilot-link dev-libs/libmal )
+	gnokii? ( app-mobilephone/gnokii )
+	crypt? ( >=app-crypt/gpgme-0.9.0-r1 )
+	!net-www/akregator"
+
+src_unpack() {
+	kde_src_unpack
+
+	# Last minute fix. Applied for 3.4.2.
+	epatch "${FILESDIR}/${P}-kpilot-fix.patch"
+
+	# Fix regression in akregator (kde bug 106345). Applied for 3.4.2.
+	epatch "${FILESDIR}/${P}-akregator-unread.patch"
+}
+
+src_compile() {
+	# needed to detect pi-notepad.h, used by the kpilot notepad conduit.
+	use pda && myconf="${myconf} --with-extra-includes=/usr/include/libpisock"
+
+	kde_src_compile
+}