Removed the crypt USE flag because if it was disabled, kdepim would just use the bundled crypto stuff which just loves to fail to compile.

Package-Manager: portage-2.1.3.7

3 files changed, 34 insertions, 19 deletions

diff --git a/kde-base/kdepim/ChangeLog b/kde-base/kdepim/ChangeLog
index 2eae528b4f96..19c52934a540 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.286 2007/08/15 05:17:24 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim/ChangeLog,v 1.287 2007/09/01 17:41:46 philantrop Exp $
+
+  01 Sep 2007; Wulf C. Krueger <philantrop@gentoo.org>
+  kdepim-3.5.7-r3.ebuild:
+  Removed the crypt USE flag because if it was disabled, kdepim would just use
+  the bundled crypto stuff which just loves to fail to compile.
 
   15 Aug 2007; Jeroen Roovers <jer@gentoo.org> kdepim-3.5.7-r3.ebuild:
   Stable for HPPA (bug #176297).
diff --git a/kde-base/kdepim/Manifest b/kde-base/kdepim/Manifest
index c0526f527097..6865cdb4b5ce 100644
--- a/kde-base/kdepim/Manifest
+++ b/kde-base/kdepim/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX akregator-3.5.7-customcolors.diff 11558 RMD160 74ba8c86c208d605d51be53d39de2d58e6fc7c4f SHA1 321387cb813d0615a5760f5d5ed107b344a88e8a SHA256 32673cc1456233b3015832189ca6df7daea3bc8fead527bf3b9fedaae0c3cef1
 MD5 d5a9ca9b65f873e7b550bb9e333c6a88 files/akregator-3.5.7-customcolors.diff 11558
 RMD160 74ba8c86c208d605d51be53d39de2d58e6fc7c4f files/akregator-3.5.7-customcolors.diff 11558
@@ -68,18 +71,18 @@ EBUILD kdepim-3.5.7-r2.ebuild 2089 RMD160 287d0ba1971613d0cc7561e867c918a08cf13e
 MD5 32140051e2875fbd2a5a4eb5db010a33 kdepim-3.5.7-r2.ebuild 2089
 RMD160 287d0ba1971613d0cc7561e867c918a08cf13e86 kdepim-3.5.7-r2.ebuild 2089
 SHA256 4ca9a1ee11ea70fd6e15c9c2632486a75da51e85f1fa04bb55ce76f2af5906e8 kdepim-3.5.7-r2.ebuild 2089
-EBUILD kdepim-3.5.7-r3.ebuild 2368 RMD160 f8768468dad27a8054f09110b990f899c47128c5 SHA1 2f83181710180a32f25f64f0f63a1d6f486630e7 SHA256 07427f4d0bfb96a262b23995d66ffab3afb97e2c6f505f379aa32d9c6cce8bdc
-MD5 df55ac9367ad11bafa2c096b528e3cb8 kdepim-3.5.7-r3.ebuild 2368
-RMD160 f8768468dad27a8054f09110b990f899c47128c5 kdepim-3.5.7-r3.ebuild 2368
-SHA256 07427f4d0bfb96a262b23995d66ffab3afb97e2c6f505f379aa32d9c6cce8bdc kdepim-3.5.7-r3.ebuild 2368
+EBUILD kdepim-3.5.7-r3.ebuild 2343 RMD160 6f9eca0551c172d1ee1c261fc8fab010a10e0ceb SHA1 057c2a68bee39e54dec01fbf0dc253235be3c250 SHA256 be9174e8ba41f04873a365c31b95ab796e70878fdba2aaca5656c86f26d47d5e
+MD5 cc8c9044f3f804aeee0211e77d9f14c0 kdepim-3.5.7-r3.ebuild 2343
+RMD160 6f9eca0551c172d1ee1c261fc8fab010a10e0ceb kdepim-3.5.7-r3.ebuild 2343
+SHA256 be9174e8ba41f04873a365c31b95ab796e70878fdba2aaca5656c86f26d47d5e kdepim-3.5.7-r3.ebuild 2343
 EBUILD kdepim-3.5.7.ebuild 1990 RMD160 0caa91220439228cf239b03d2bbeba09f607cd0a SHA1 7fe7c84ab5bb1a91b3ab36ccfc175baa4763ce00 SHA256 71efc0f31dce702223cfe56686b41e193b1cfaddb28164e13fb764d2be76340a
 MD5 3272d97b271caa13f242a6c6d6e608ea kdepim-3.5.7.ebuild 1990
 RMD160 0caa91220439228cf239b03d2bbeba09f607cd0a kdepim-3.5.7.ebuild 1990
 SHA256 71efc0f31dce702223cfe56686b41e193b1cfaddb28164e13fb764d2be76340a kdepim-3.5.7.ebuild 1990
-MISC ChangeLog 39042 RMD160 4dba6d16994d42acd7b2503ec1dc08bb063b19a5 SHA1 71ed3e205a675f6092ff92c9a0b407fca759ef4f SHA256 366d7f01e9540b005737871fd5eb153065c9693cf5a7ed68d7ae5892b052f5b5
-MD5 b92f81c1f8507eb7a59e2695bbb90f56 ChangeLog 39042
-RMD160 4dba6d16994d42acd7b2503ec1dc08bb063b19a5 ChangeLog 39042
-SHA256 366d7f01e9540b005737871fd5eb153065c9693cf5a7ed68d7ae5892b052f5b5 ChangeLog 39042
+MISC ChangeLog 39274 RMD160 e9b26bff6e912d908f25e66f4a374f9ca418fe0d SHA1 30f064d01c8dea5335467f8e81a2614dc7b05039 SHA256 78a1bac3995bb95cd04c96928596ce37b30fdb90e7d1f920b7b296298b3f9d2e
+MD5 8c4cbc615ae7fbdf86e14103cad5007c ChangeLog 39274
+RMD160 e9b26bff6e912d908f25e66f4a374f9ca418fe0d ChangeLog 39274
+SHA256 78a1bac3995bb95cd04c96928596ce37b30fdb90e7d1f920b7b296298b3f9d2e ChangeLog 39274
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156
@@ -114,3 +117,10 @@ SHA256 e2d72a2f91c943cdee1c55c196f4e64591c7568eeae58d52df0dc277921bf345 files/di
 MD5 43b28fdf5a7d3a768048ecd296a3222b files/digest-kdepim-3.5.7-r3 518
 RMD160 d77a6b565deebc1d08b5c2dea6f8e144e65fb7e4 files/digest-kdepim-3.5.7-r3 518
 SHA256 06b7519477dcd87ec33c5bedecb84f0b2209cfe37d1e01ff04f7a33e2604b4c8 files/digest-kdepim-3.5.7-r3 518
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.6 (GNU/Linux)
+
+iD8DBQFG2aRhCkvF58q80IkRAgSXAKCA64Gvj9iWZKInSZvNErwNfctNtwCgqxwP
+LHDM7XcXpVyEaNjr30NY8bo=
+=uWY8
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kdepim/kdepim-3.5.7-r3.ebuild b/kde-base/kdepim/kdepim-3.5.7-r3.ebuild
index df3d5469bc06..aea578808f84 100644
--- a/kde-base/kdepim/kdepim-3.5.7-r3.ebuild
+++ b/kde-base/kdepim/kdepim-3.5.7-r3.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.7-r3.ebuild,v 1.11 2007/08/15 05:17:24 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim/kdepim-3.5.7-r3.ebuild,v 1.12 2007/09/01 17:41:46 philantrop Exp $
 
 inherit kde-dist
 
@@ -9,8 +9,8 @@ SRC_URI="${SRC_URI}
 
 DESCRIPTION="KDE PIM (Personal Information Management) applications: KOrganizer, KMail, KNode,..."
 
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
-IUSE="crypt gnokii"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="gnokii"
 
 RESTRICT="test"
 
@@ -18,15 +18,15 @@ RESTRICT="test"
 DEPEND="~kde-base/kdebase-${PV}
 	>=dev-libs/cyrus-sasl-2
 	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
+	>=app-crypt/gpgme-1.1.2-r1
+	|| ( >=app-crypt/gnupg-2.0.1-r1 <app-crypt/gnupg-1.9 )
+	x11-libs/libXScrnSaver
 	app-pda/libopensync"
 #	Requires pilot-link-0.12.0
 #	pda? ( >=app-pda/pilot-link-0.12.0 dev-libs/libmal )
 
 RDEPEND="${DEPEND}
-	crypt? ( app-crypt/pinentry )"
+		app-crypt/pinentry"
 
 DEPEND="${DEPEND}
 	x11-proto/scrnsaverproto
@@ -56,7 +56,7 @@ src_unpack() {
 
 src_compile() {
 	local myconf="--with-sasl $(use_with gnokii)"
-	use crypt && myconf="${myconf} --with-gpg=/usr/bin/gpg"
+	myconf="${myconf} --with-gpg=/usr/bin/gpg"
 
 	# use pda || DO_NOT_COMPILE="${DO_NOT_COMPILE} kpilot"
 	DO_NOT_COMPILE="${DO_NOT_COMPILE} kpilot"
@@ -67,6 +67,6 @@ src_compile() {
 pkg_postinst() {
 	kde_pkg_postinst
 
-	elog "If you're using x11-misc/basket, please re-emerge it now to avoid crashes with Kontact."
-	elog "cf. https://bugs.gentoo.org/show_bug.cgi?id=174872 for details."
+	ewarn "If you're using x11-misc/basket, please re-emerge it now to avoid crashes with Kontact."
+	ewarn "cf. https://bugs.gentoo.org/show_bug.cgi?id=174872 for details."
 }