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

(Portage version: 2.1.2-r4)

3 files changed, 16 insertions, 5 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/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
 }