Simplify dependencies. Patch by Arfrever.

Package-Manager: portage-2.2.0_alpha51/cvs/Linux x86_64

diff --git a/app-crypt/gnupg/ChangeLog b/app-crypt/gnupg/ChangeLog
index d24e46fb7c7b422c1cff9ac615a2e2df81cba25f..d386e68766c10b9c846eead642a22e1c64566269 100644 (file)
--- a/app-crypt/gnupg/ChangeLog
+++ b/app-crypt/gnupg/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-crypt/gnupg
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/ChangeLog,v 1.417 2011/08/04 23:09:20 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/ChangeLog,v 1.418 2011/08/19 19:31:56 hwoarang Exp $
+
+  19 Aug 2011; Markos Chandras <hwoarang@gentoo.org> gnupg-2.0.18.ebuild:
+  Simplify dependencies. Patch by Arfrever.
 
 *gnupg-2.0.18 (04 Aug 2011)
 

diff --git a/app-crypt/gnupg/Manifest b/app-crypt/gnupg/Manifest
index 06857b0451d7f8d76a478e4c3f2ac6f594190f40..d28fac979c84baab865b176fc934b1e8afd067ea 100644 (file)
--- a/app-crypt/gnupg/Manifest
+++ b/app-crypt/gnupg/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 AUX gnupg-2.0.17-gpgsm-gencert.patch 1079 RMD160 58fdc7454cd23bd9731866f1350eee1d166487d0 SHA1 3f6710fb83de85c34c8edaf4c7aaddeb1ccc771d SHA256 aec0ea30d898f7f7369abac9a61a0713b6b9b89d231b9beff1ee82041983b7ed
 AUX gnupg-2.0.17-libgrcrypt150-bugfix.patch 1125 RMD160 529bd214cb1883e318fae40cfc582ec24d6ebfc2 SHA1 f4119372ae2dece42606eb266211ca7d4a8354a8 SHA256 a909e3d044292ec0869385a529dab5095ae788ea68a9cb70e63054266eb8cf0b
 DIST gnupg-1.4.11.tar.bz2 3407075 RMD160 9daf2dedfd4c6211fc13b8cdee8f08b8f5925378 SHA1 78e22f5cca88514ee71034aafff539c33f3c6676 SHA256 d18ceeac16e554a501170b9bfde611625252d0fe9448685a69c93bf149ee6ef6
@@ -8,6 +11,23 @@ EBUILD gnupg-1.4.11.ebuild 5481 RMD160 f313bd6a39300f48681784d7b7be23917c098688
 EBUILD gnupg-2.0.17-r2.ebuild 4311 RMD160 f6629b07034c3c136a55b31214138f9e69f0f889 SHA1 074cd021b43cbe967242347cb07f78af04c46914 SHA256 af83317377965f1ec5258219c379a233519fd101b534171ddb748c3fb3f95c05
 EBUILD gnupg-2.0.17-r3.ebuild 4366 RMD160 cdbb20daca939c31b065f6d5eb5a3bfea1ad3c9a SHA1 74371ca1b5390c17207cec10faf217c7d7855425 SHA256 79421b9013411d75d7eac959f21e6a187147825fb8dc0431c3d3cebd7f040daa
 EBUILD gnupg-2.0.17.ebuild 4530 RMD160 8e5e06a55c44cee6efe903edda4f0149c38b2044 SHA1 0037dee7d416beeff38cfb4230dad4fb60dd90e1 SHA256 95a2254b67d72ed528b84a7be40d284c4a1bc58d0ae274797eb0a52cf7a6090b
-EBUILD gnupg-2.0.18.ebuild 4399 RMD160 3f2699512c5ec18492f7b4b3a15b64e3ca621803 SHA1 833b974ae05e35fbb18cf6470f6953b228fa3ed2 SHA256 18bc1cb4e4134924afa79aee8871e814f46af7fc4371279d31d4bffe0d27f5b4
-MISC ChangeLog 63638 RMD160 4964d4e6150c912d70334440df62c38b99e086d9 SHA1 f7f18749bf10a9add2b80d28e3764b85fb4034d6 SHA256 1d9d7a7bb272b68fa56e0f5238cb2cde538bec2f5c381f03a32911180adaf718
+EBUILD gnupg-2.0.18.ebuild 4316 RMD160 c8eaf264dba1b1b883db90b5552c7f0dbac2c13a SHA1 118f692817a3b222dece20171a77451387e8e365 SHA256 245a0c24df07a042a9821ad8aa5253507a623af0ba41677e1593e3e6547b2d01
+MISC ChangeLog 63758 RMD160 67c7b3e2bde65ff0227abb4f2f0e65ac5c8e247c SHA1 edea551b6850d9fdcff4e31c66b1b7398d2b714e SHA256 5f8357d25e29c03c97d6d3bc50ce9684bb0f56943a32eeec4780ab42bb15e7e8
 MISC metadata.xml 1386 RMD160 9cdb52f5bfc316fe64af58338dc70fa4dcdb564e SHA1 3e4113636f8e1381acd8b57ee76c8fe33ac65456 SHA256 a3a9dee1b4732c0632705f66524a12563079fa130c5c17845d62325da49a151a
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iQIcBAEBCgAGBQJOTrorAAoJEPqDWhW0r/LCztwP/0qVoFQRaEwsOPRtskrGh6Xv
+9YhPudwiJLUDIKqt2YBXhNUsDkGhxeJG47qr0uLYzgbLMAJTGZk45W8iaPISNurp
+VcsiFhUClQLKQH4pcdhjOHIlEzHC5pZ2OgUfV546EzVk10htQGzbMsgCQvV5oPCO
+Q98BVDp5WIXdAYOVLFj37GcJDX+Itvpd+D3Kub1sJJZvCNyUEiStSFVcdt6Eeo8i
+KJGXrHZPqhslm0MjxNfxE0vXFJ5pk3+yvvupekUJkcxetEmXmA/WSWQyJdmiszsK
+DD5DsmHFrVhAanNEmh5jNm9k6D9x6MMUfivL3WNNtj0LGcYeTAPZBXmp4qYpeNKm
+kowLvfXC+F4R6NdSRLrXYATI6rKpyqoox5SgqN9rwlqzrUiOVR7fCRHInLhNobEj
+TM2eFuqX4sQmuS4Jtuq4x/UuYrxa2874UZMq+8ttxVO0A6IH74JIqXdOr2+MYnEC
+pxunXWhmSMdf2/iDVYXXLGMJRsJ20cmlGpW8a+zCrdcedF+KCR/NcTlV03vDazeR
+eeXo4EdVU2Z3QkmPtyx37dCebvVkpnXCW70g3lxU6/wTyFbpG0ljgrEYkdd22vYZ
+7JzMf6Bq6kMIQuX9HmMFXea006J9KtAkdE4qGRlub3MDVcgwqdxsfBtyubOMAHSB
+w9mTOys3lV/K49wedmvb
+=fAhP
+-----END PGP SIGNATURE-----

diff --git a/app-crypt/gnupg/gnupg-2.0.18.ebuild b/app-crypt/gnupg/gnupg-2.0.18.ebuild
index a4a84dde1f75c2dd49450cf755d265c38e481cf5..fa79ed4357246693cd8c04147ad2e69bd94ce936 100644 (file)
--- a/app-crypt/gnupg/gnupg-2.0.18.ebuild
+++ b/app-crypt/gnupg/gnupg-2.0.18.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-2.0.18.ebuild,v 1.1 2011/08/04 23:09:20 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-2.0.18.ebuild,v 1.2 2011/08/19 19:31:56 hwoarang Exp $
 
 EAPI="4"
 
@@ -25,7 +25,7 @@ COMMON_DEPEND_LIBS="
        >=net-misc/curl-7.10
        adns? ( >=net-libs/adns-1.4 )
        bzip2? ( app-arch/bzip2 )
-       smartcard? ( usb? ( =virtual/libusb-0* ) )
+       smartcard? ( usb? ( virtual/libusb:0 ) )
        ldap? ( net-nds/openldap )"
 COMMON_DEPEND_BINS="|| ( app-crypt/pinentry app-crypt/pinentry-qt )"
 
@@ -53,8 +53,6 @@ REQUIRED_USE="smartcard? ( !static )"
 
 src_prepare() {
        epatch "${FILESDIR}"/${PN}-2.0.17-gpgsm-gencert.patch
-       # Merged upstream
-       #epatch "${FILESDIR}"/${PN}-2.0.17-libgrcrypt150-bugfix.patch
 }
 
 src_configure() {