Respect USE=-pda on 3.5.5-r2, and disable pda support in 3.5.6 because of bug #163853.

Package-Manager: portage-2.1.2-r4

5 files changed, 42 insertions, 31 deletions

diff --git a/kde-base/kdepim/ChangeLog b/kde-base/kdepim/ChangeLog
index 1bb35a589614..dc82e8a2231c 100644
--- a/kde-base/kdepim/ChangeLog
+++ b/kde-base/kdepim/ChangeLog
@@ -1,6 +1,11 @@
 # 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.244 2007/01/25 19:02:22 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim/ChangeLog,v 1.245 2007/01/27 15:13:04 flameeyes Exp $
+
+  27 Jan 2007; Diego Pettenò <flameeyes@gentoo.org> kdepim-3.5.5-r2.ebuild,
+  kdepim-3.5.6.ebuild:
+  Respect USE=-pda on 3.5.5-r2, and disable pda support in 3.5.6 because of
+  bug #163853.
 
   25 Jan 2007; Diego Pettenò <flameeyes@gentoo.org> kdepim-3.5.6.ebuild:
   Drop ~hppa and ~mips keywords because of missing kdelibs-3.5.6 keywording.
diff --git a/kde-base/kdepim/Manifest b/kde-base/kdepim/Manifest
index 6866c048ed2b..b1f588e96011 100644
--- a/kde-base/kdepim/Manifest
+++ b/kde-base/kdepim/Manifest
@@ -78,18 +78,18 @@ EBUILD kdepim-3.5.2-r4.ebuild 1163 RMD160 3c389b30ef970d45f24cfeb730053e753b2615
 MD5 8f56b8d4144467ffa0c3ab2e80c096d0 kdepim-3.5.2-r4.ebuild 1163
 RMD160 3c389b30ef970d45f24cfeb730053e753b2615dc kdepim-3.5.2-r4.ebuild 1163
 SHA256 80fcd854cb16bc13530eb70a2e36e292e90c4725e7b8f8c1ddc30c5728e0b399 kdepim-3.5.2-r4.ebuild 1163
-EBUILD kdepim-3.5.5-r2.ebuild 1344 RMD160 d41cad76ca48cbac5a5ec15042e497c2d62923e5 SHA1 511d006e81a14a6284b155538ecea804ad1c2554 SHA256 f6d682fbac64cf379440f4f11ccf06977cfe882a97d67b48931a64683e2ad094
-MD5 edcb4b77652882e6c64c005c465c1d2c kdepim-3.5.5-r2.ebuild 1344
-RMD160 d41cad76ca48cbac5a5ec15042e497c2d62923e5 kdepim-3.5.5-r2.ebuild 1344
-SHA256 f6d682fbac64cf379440f4f11ccf06977cfe882a97d67b48931a64683e2ad094 kdepim-3.5.5-r2.ebuild 1344
-EBUILD kdepim-3.5.6.ebuild 1235 RMD160 7bbf2e3807de0703aa2e6414291427961e4ef07c SHA1 5cefa049ba4ed06df5d2d2c7b08383ba1263dc1b SHA256 b41ea00c030804f1163728b2f830b8ccca629b2f3ed50fb608cd9cf60a0e4ef6
-MD5 e75c34aaa73868c92c6d187ace84b7af kdepim-3.5.6.ebuild 1235
-RMD160 7bbf2e3807de0703aa2e6414291427961e4ef07c kdepim-3.5.6.ebuild 1235
-SHA256 b41ea00c030804f1163728b2f830b8ccca629b2f3ed50fb608cd9cf60a0e4ef6 kdepim-3.5.6.ebuild 1235
-MISC ChangeLog 32737 RMD160 7e353b7ad02045c5531b8221e8e64cee50f29ad8 SHA1 5d7aafe190a332a83fa5ff7cb8d47536794dfc00 SHA256 46c1d695c3542d26e5748ab473cc547a1efe10b46005528e2209196da38a1e53
-MD5 70b3097dd0d4fdae55ef3f7c01e49bf5 ChangeLog 32737
-RMD160 7e353b7ad02045c5531b8221e8e64cee50f29ad8 ChangeLog 32737
-SHA256 46c1d695c3542d26e5748ab473cc547a1efe10b46005528e2209196da38a1e53 ChangeLog 32737
+EBUILD kdepim-3.5.5-r2.ebuild 1399 RMD160 e513a3b0c03de45188cabb433b9e01d0859c019c SHA1 ddab8d52bbb4cdef58e7a86fc95fe56a6527f227 SHA256 7e92d1d59cece9ab563c20084fbaf04c9bb3c3d08e144ee1557868bc60a8e653
+MD5 5edfb99e9d4d0b41a87789ff81948571 kdepim-3.5.5-r2.ebuild 1399
+RMD160 e513a3b0c03de45188cabb433b9e01d0859c019c kdepim-3.5.5-r2.ebuild 1399
+SHA256 7e92d1d59cece9ab563c20084fbaf04c9bb3c3d08e144ee1557868bc60a8e653 kdepim-3.5.5-r2.ebuild 1399
+EBUILD kdepim-3.5.6.ebuild 1370 RMD160 b670b71f6553fb073a1def44c9d5c920e5e8f531 SHA1 f6697a49b6bbee20368e904e017e9be9323b69c9 SHA256 50097a6b89a356fd4ceb6a3930f786e3f3ca3a39240ea9722adf124ef5be3309
+MD5 f2029009c1eba219a151f8bc0c789504 kdepim-3.5.6.ebuild 1370
+RMD160 b670b71f6553fb073a1def44c9d5c920e5e8f531 kdepim-3.5.6.ebuild 1370
+SHA256 50097a6b89a356fd4ceb6a3930f786e3f3ca3a39240ea9722adf124ef5be3309 kdepim-3.5.6.ebuild 1370
+MISC ChangeLog 32929 RMD160 2f652d0ba79e79dc6df00895f152898333332f79 SHA1 b61f4d9b4770c394f7c9434095fb48fe0a9ac152 SHA256 7d81ecbb9b9ac4339a699d5ad419f7ea8d7d7d860db5aab3781e895a05c0ae54
+MD5 37a8dc5a069d398afdd1b7467f239719 ChangeLog 32929
+RMD160 2f652d0ba79e79dc6df00895f152898333332f79 ChangeLog 32929
+SHA256 7d81ecbb9b9ac4339a699d5ad419f7ea8d7d7d860db5aab3781e895a05c0ae54 ChangeLog 32929
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156
@@ -109,7 +109,7 @@ SHA256 3e201f5c33c8c0db49abffc1cc77b21375548b371d9205d58cd372bc611cb3c5 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.1 (GNU/Linux)
 
-iD8DBQFFuP7GAiZjviIA2XgRAk7pAJ0ecgaAfxSIyZlYoP9QH+V/pDQmRQCg3OWS
-D+yZWhiFrQCV4QtBbWGEQew=
-=Z87V
+iD8DBQFFu2wJAiZjviIA2XgRAomUAJ4v5/UtxBwjZfucQjInOW7hKL/6oQCgmCtd
+Tzt3PZXk8+uQGssFLqCOyW4=
+=6jrs
 -----END PGP SIGNATURE-----
diff --git a/kde-base/kdepim/kdepim-3.5.5-r2.ebuild b/kde-base/kdepim/kdepim-3.5.5-r2.ebuild
index 39d0c2130c3e..e89138dc8fe9 100644
--- a/kde-base/kdepim/kdepim-3.5.5-r2.ebuild
+++ b/kde-base/kdepim/kdepim-3.5.5-r2.ebuild
@@ -1,6 +1,6 @@
 # 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.5-r2.ebuild,v 1.11 2007/01/17 17:42:59 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim/kdepim-3.5.5-r2.ebuild,v 1.12 2007/01/27 15:13:04 flameeyes Exp $
 
 inherit kde-dist
 
@@ -40,5 +40,7 @@ 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"
+
 	kde_src_compile
 }
diff --git a/kde-base/kdepim/kdepim-3.5.6.ebuild b/kde-base/kdepim/kdepim-3.5.6.ebuild
index 11321185937f..148bb8cbc586 100644
--- a/kde-base/kdepim/kdepim-3.5.6.ebuild
+++ b/kde-base/kdepim/kdepim-3.5.6.ebuild
@@ -1,6 +1,6 @@
 # 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.6.ebuild,v 1.6 2007/01/25 19:02:22 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim/kdepim-3.5.6.ebuild,v 1.7 2007/01/27 15:13:04 flameeyes Exp $
 
 inherit kde-dist
 
@@ -10,16 +10,17 @@ SRC_URI="${SRC_URI}
 DESCRIPTION="KDE PIM (Personal Information Management) apps: korganizer, kmail, knode..."
 
 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="crypt gnokii pda"
+IUSE="crypt gnokii"
 
 # 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
-	pda? ( app-pda/pilot-link dev-libs/libmal )
 	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"
+#	Requires pilot-link-0.12.0
+#	pda? ( >=app-pda/pilot-link-0.12.0 dev-libs/libmal )
 
 RDEPEND="${DEPEND}
 	crypt? ( app-crypt/pinentry )"
@@ -37,5 +38,8 @@ 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
 }
diff --git a/kde-base/kpilot/Manifest b/kde-base/kpilot/Manifest
index e86b58293818..9d4531cc3e86 100644
--- a/kde-base/kpilot/Manifest
+++ b/kde-base/kpilot/Manifest
@@ -7,18 +7,18 @@ RMD160 9409b6afe134f8836fbff481dd184f0bb382ea05 files/kdepim-3.4.1-kpilot-fix.pa
 SHA256 ff990fa6e1c86edd6bb144ec0059bab3b6aaa37905ed743c4299ced92cf4dde6 files/kdepim-3.4.1-kpilot-fix.patch 4635
 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
-EBUILD kpilot-3.5.5.ebuild 1215 RMD160 30890964e5b987a0c5de84048bf36fc168171c29 SHA1 2c9ca98b8447617cae6e23b1191dd19541ab1ef1 SHA256 a101ab26a85df9657f7b2d6bd0a2cd01b2ada923ed33e5019776a9792aad81fa
-MD5 dc09d1d833f39dc1047314ca414479aa kpilot-3.5.5.ebuild 1215
-RMD160 30890964e5b987a0c5de84048bf36fc168171c29 kpilot-3.5.5.ebuild 1215
-SHA256 a101ab26a85df9657f7b2d6bd0a2cd01b2ada923ed33e5019776a9792aad81fa kpilot-3.5.5.ebuild 1215
+EBUILD kpilot-3.5.5.ebuild 1220 RMD160 a9cf4d2c2af3e92964944c9163f92fc3151e72ff SHA1 6dd58198feada911628f191ab40dbdf1339474c7 SHA256 aecd9151aa74466a886cfba74e62af48ac7a9a6b9e520b53d400d351fcd9ac98
+MD5 5c4dda4c997fad0ca74b8dcf2a66c5f7 kpilot-3.5.5.ebuild 1220
+RMD160 a9cf4d2c2af3e92964944c9163f92fc3151e72ff kpilot-3.5.5.ebuild 1220
+SHA256 aecd9151aa74466a886cfba74e62af48ac7a9a6b9e520b53d400d351fcd9ac98 kpilot-3.5.5.ebuild 1220
 EBUILD kpilot-3.5.6.ebuild 1223 RMD160 9e175b96b58768eef0a623450e1c4f6ccf3cdee2 SHA1 353137155420b7329e1752fcbd645df10607c342 SHA256 d36efc9a2dbed97701e40c3023ecab0633b79ac73268ca14a3b3262a68e18357
 MD5 febee019227d63ee0cf0554747456c98 kpilot-3.5.6.ebuild 1223
 RMD160 9e175b96b58768eef0a623450e1c4f6ccf3cdee2 kpilot-3.5.6.ebuild 1223
 SHA256 d36efc9a2dbed97701e40c3023ecab0633b79ac73268ca14a3b3262a68e18357 kpilot-3.5.6.ebuild 1223
-MISC ChangeLog 6710 RMD160 931a9facbadd88b4db536b6727450f4a69463272 SHA1 004d57e3635785f8112d9eecdf11240696d0b3da SHA256 f9b56a913fc0fc07cc5e7078cef2240c1a2d91d707904cd2cc93d9105750ee5f
-MD5 b7ad90c32ca78ac83be95e00dd3e8385 ChangeLog 6710
-RMD160 931a9facbadd88b4db536b6727450f4a69463272 ChangeLog 6710
-SHA256 f9b56a913fc0fc07cc5e7078cef2240c1a2d91d707904cd2cc93d9105750ee5f ChangeLog 6710
+MISC ChangeLog 6830 RMD160 a09d8173213a96a600ced81b10d669d01565b999 SHA1 041e1ecf322e94e777c7e012d507cb39bf70c47d SHA256 7719146d9cd1afc1078b1e4d102b9bd195b293c37dd67297b4af7e00e240c3e9
+MD5 83cf156f72ff4d57ab11122d125fabab ChangeLog 6830
+RMD160 a09d8173213a96a600ced81b10d669d01565b999 ChangeLog 6830
+SHA256 7719146d9cd1afc1078b1e4d102b9bd195b293c37dd67297b4af7e00e240c3e9 ChangeLog 6830
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156
@@ -32,7 +32,7 @@ SHA256 b49ff16e93bead7c5c584b17baa06f51b5bd735636b3ca58e3ed733104c15227 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.1 (GNU/Linux)
 
-iD8DBQFFrm6iAiZjviIA2XgRApFVAKDwpD5QeiQdbT0y6LNqKBx1lAByWgCfaYQb
-+iW1GhYwLY1FpReAEjMMOMY=
-=jbZZ
+iD8DBQFFu2xAAiZjviIA2XgRAj4dAJ493Lpqf6pLyXHckyVbpX6eGSePPgCggFDY
+EUHTvBmqAme2chUJbMPqFBU=
+=rRvO
 -----END PGP SIGNATURE-----