From: Guy Martin <gmsoft@gentoo.org>
Date: Mon, 5 Jun 2006 10:47:40 +0000 (+0000)
Subject: pinentry now stable on hppa. removed !hppa?
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=653e8448083e7ad7492faf9cdcfba766097cac15;p=gentoo.git

pinentry now stable on hppa. removed !hppa?
Package-Manager: portage-2.1_rc3-r5
---

diff --git a/kde-base/kdepim/ChangeLog b/kde-base/kdepim/ChangeLog
index 0275ae4f1d46..f86f587cdbd4 100644
--- a/kde-base/kdepim/ChangeLog
+++ b/kde-base/kdepim/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kdepim
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim/ChangeLog,v 1.213 2006/06/03 10:20:37 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim/ChangeLog,v 1.214 2006/06/05 10:47:40 gmsoft Exp $
+
+  05 Jun 2006; Guy Martin <gmsoft@gentoo.org> kdepim-3.5.2-r3.ebuild,
+  kdepim-3.5.3.ebuild:
+  pinentry now stable on hppa. removed !hppa?
 
   03 Jun 2006; Guy Martin <gmsoft@gentoo.org> kdepim-3.5.2-r2.ebuild:
   Stable on hppa.
diff --git a/kde-base/kdepim/Manifest b/kde-base/kdepim/Manifest
index 7dfdbe055d60..e48d11a5f50b 100644
--- a/kde-base/kdepim/Manifest
+++ b/kde-base/kdepim/Manifest
@@ -79,18 +79,18 @@ EBUILD kdepim-3.5.2-r2.ebuild 969 RMD160 ba0d90c1bfc0745e03c2d922807a161e2d7f44a
 MD5 11856734cfd82396028ca8ce01acd9e3 kdepim-3.5.2-r2.ebuild 969
 RMD160 ba0d90c1bfc0745e03c2d922807a161e2d7f44a7 kdepim-3.5.2-r2.ebuild 969
 SHA256 2b19b50244cd23cd049a4247975828f54155f6e3bf2e012ccacb55d0b8a87af6 kdepim-3.5.2-r2.ebuild 969
-EBUILD kdepim-3.5.2-r3.ebuild 1100 RMD160 4f266d4ff19729f15787b58059e342fea913a53b SHA1 1ae40ac69c081106bab168e54abc2d3b99d44328 SHA256 3a1c05cda9f1729a19cde10f6380cc7a1ae9e628942b0e5134de9656d694c335
-MD5 e89f523d4735c7d10a6eb4c0e71f9c63 kdepim-3.5.2-r3.ebuild 1100
-RMD160 4f266d4ff19729f15787b58059e342fea913a53b kdepim-3.5.2-r3.ebuild 1100
-SHA256 3a1c05cda9f1729a19cde10f6380cc7a1ae9e628942b0e5134de9656d694c335 kdepim-3.5.2-r3.ebuild 1100
-EBUILD kdepim-3.5.3.ebuild 988 RMD160 e218ba83d84082acb116c9f57aec067c2108851d SHA1 99f2979ae2bcff1a22af1eabb0191fb3c83a52d2 SHA256 50fed4cb6525a195da5ca7ab2fb78ab729bf9c79172d9458ad17359a23d7ca29
-MD5 5f2eab021d656bc142d56b009478e995 kdepim-3.5.3.ebuild 988
-RMD160 e218ba83d84082acb116c9f57aec067c2108851d kdepim-3.5.3.ebuild 988
-SHA256 50fed4cb6525a195da5ca7ab2fb78ab729bf9c79172d9458ad17359a23d7ca29 kdepim-3.5.3.ebuild 988
-MISC ChangeLog 27913 RMD160 beaca874352655dd4698d899e90099c26c21e919 SHA1 6b855248c720079d513cdc5986fc16e53efa924e SHA256 913e65a8a1ac932ca60848feb212d6cfc495380ece0d77a7e57a267fdd001dbe
-MD5 a7f281afba4a63b27a60fd51942279ef ChangeLog 27913
-RMD160 beaca874352655dd4698d899e90099c26c21e919 ChangeLog 27913
-SHA256 913e65a8a1ac932ca60848feb212d6cfc495380ece0d77a7e57a267fdd001dbe ChangeLog 27913
+EBUILD kdepim-3.5.2-r3.ebuild 1082 RMD160 f8e60dbe2d5278cc4fd61bd8fdf85d383740d204 SHA1 e7e4bfc3d6cdb961a89ffece47af24360d1118cb SHA256 e88ba4ba6882b5c5d288dee7c49c00ace7fdc1eebd5a39bcd7a904ae430db18a
+MD5 700f74fa9e736de2c9d641b49790d8f7 kdepim-3.5.2-r3.ebuild 1082
+RMD160 f8e60dbe2d5278cc4fd61bd8fdf85d383740d204 kdepim-3.5.2-r3.ebuild 1082
+SHA256 e88ba4ba6882b5c5d288dee7c49c00ace7fdc1eebd5a39bcd7a904ae430db18a kdepim-3.5.2-r3.ebuild 1082
+EBUILD kdepim-3.5.3.ebuild 972 RMD160 577843d852b03f1c136f49e15a19bb9bee2f6227 SHA1 512a8ba2d41e90a6a5b861e54c2232d584bcd58a SHA256 08498b13f8dd67347945a0ad08c8b3d7ebd9c4610ccf31ea6f62666fea3af27c
+MD5 b178d501876826e99b013f7fa632a7de kdepim-3.5.3.ebuild 972
+RMD160 577843d852b03f1c136f49e15a19bb9bee2f6227 kdepim-3.5.3.ebuild 972
+SHA256 08498b13f8dd67347945a0ad08c8b3d7ebd9c4610ccf31ea6f62666fea3af27c kdepim-3.5.3.ebuild 972
+MISC ChangeLog 28053 RMD160 49b2bf4c3237ec03dbf29a9c78c429fd3e52564d SHA1 166a13ae95e4289540c9573e5676ebe0932f86a0 SHA256 cba786aaccc3d207a898844494c38a06d3d3f8d99985a10af18d28502a65b79f
+MD5 c04ca8b1e6ea6c3d89b93452ed49fa78 ChangeLog 28053
+RMD160 49b2bf4c3237ec03dbf29a9c78c429fd3e52564d ChangeLog 28053
+SHA256 cba786aaccc3d207a898844494c38a06d3d3f8d99985a10af18d28502a65b79f ChangeLog 28053
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156
diff --git a/kde-base/kdepim/kdepim-3.5.2-r3.ebuild b/kde-base/kdepim/kdepim-3.5.2-r3.ebuild
index 3e3230181a46..5aaa74e0e69f 100644
--- a/kde-base/kdepim/kdepim-3.5.2-r3.ebuild
+++ b/kde-base/kdepim/kdepim-3.5.2-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim/kdepim-3.5.2-r3.ebuild,v 1.4 2006/06/01 13:12:38 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim/kdepim-3.5.2-r3.ebuild,v 1.5 2006/06/05 10:47:40 gmsoft Exp $
 
 inherit kde-dist
 
@@ -20,7 +20,7 @@ DEPEND="~kde-base/kdebase-${PV}
 		 <app-crypt/gnupg-1.9 )"
 	# We use GnuPG 1.4.x for OpenPGP and 1.9 (via gpgme) for s/mime as upstream advises.
 RDEPEND="${DEPEND}
-	crypt? ( !hppa? ( ( app-crypt/pinentry ) ) )"
+	crypt? ( app-crypt/pinentry )"
 
 PATCHES="${WORKDIR}/kdepim-3.5.2-patchset.diff
 	${FILESDIR}/akregator-3.5-hppa.patch"
diff --git a/kde-base/kdepim/kdepim-3.5.3.ebuild b/kde-base/kdepim/kdepim-3.5.3.ebuild
index 77dfa7d7edaf..b32c34b094c1 100644
--- a/kde-base/kdepim/kdepim-3.5.3.ebuild
+++ b/kde-base/kdepim/kdepim-3.5.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim/kdepim-3.5.3.ebuild,v 1.1 2006/06/02 20:14:34 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim/kdepim-3.5.3.ebuild,v 1.2 2006/06/05 10:47:40 gmsoft Exp $
 
 inherit kde-dist
 
@@ -17,7 +17,7 @@ DEPEND="~kde-base/kdebase-${PV}
 		 <app-crypt/gnupg-1.9 )"
 	# We use GnuPG 1.4.x for OpenPGP and 1.9 (via gpgme) for s/mime as upstream advises.
 RDEPEND="${DEPEND}
-	crypt? ( !hppa? ( ( app-crypt/pinentry ) ) )"
+	crypt? ( app-crypt/pinentry )"
 
 PATCHES="${FILESDIR}/akregator-3.5-hppa.patch"