Drop-in replacement of gnupg-1.4, removed slot fixup use flags

Package-Manager: portage-2.1.1-r2

diff --git a/app-crypt/gnupg/ChangeLog b/app-crypt/gnupg/ChangeLog
index 962b4a39bfef3631253318bdf7a425b2fb78b925..fed2f4612682b09b08d7b288a8d1a964cdd5b4f4 100644 (file)
--- a/app-crypt/gnupg/ChangeLog
+++ b/app-crypt/gnupg/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-crypt/gnupg
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/ChangeLog,v 1.260 2006/12/08 19:58:58 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/ChangeLog,v 1.261 2006/12/09 16:57:59 alonbl Exp $
+
+*gnupg-2.0.1-r1 (09 Dec 2006)
+
+  09 Dec 2006; Alon Bar-Lev <alonbl@gentoo.org> +gnupg-2.0.1-r1.ebuild:
+  Drop-in replacement of gnupg-1.4, removed slot fixup use flags
 
   08 Dec 2006; Daniel Gryniewicz <dang@gentoo.org> gnupg-1.4.6.ebuild:
   Marked stable on amd64 for bug #156947

diff --git a/app-crypt/gnupg/Manifest b/app-crypt/gnupg/Manifest
index a13ed0f77ec3989daaddd09011e1175b2b3feed4..67562f33f29468ede002e2c117ee5c2bcb68d5fe 100644 (file)
--- a/app-crypt/gnupg/Manifest
+++ b/app-crypt/gnupg/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX gnupg-1.4-emptytrustpackets.patch 611 RMD160 b87072acd446cebeb9b837ac6bba21c9c761e0c6 SHA1 5de97cdd26d155132c828db89b28cd37e9f03aad SHA256 d7a2cfed32f0fef29edf0506fc3602473cc2c6369d672571d06bff902c9e0689
 MD5 c0b3223dbc599c2da7707cdae2b3683a files/gnupg-1.4-emptytrustpackets.patch 611
 RMD160 b87072acd446cebeb9b837ac6bba21c9c761e0c6 files/gnupg-1.4-emptytrustpackets.patch 611
@@ -139,14 +136,18 @@ EBUILD gnupg-2.0.0.ebuild 2376 RMD160 45a2a2f91233cc11575cb71c0c22e4bd293d3b62 S
 MD5 4d4aec6534c8b973b6160f75c516009d gnupg-2.0.0.ebuild 2376
 RMD160 45a2a2f91233cc11575cb71c0c22e4bd293d3b62 gnupg-2.0.0.ebuild 2376
 SHA256 4704c55b41e023d71a94075f40e9970905d0a52822d90a47a7036623873afbaa gnupg-2.0.0.ebuild 2376
+EBUILD gnupg-2.0.1-r1.ebuild 2192 RMD160 f8dbe4b96e31e6b4f58563b1c501694852d94637 SHA1 8da7095ee55dcb34a35acde02a3a0b42b7ee390d SHA256 a5332e970ac7a77daa158745eab75da14896d8f14568783cfd6374d1c7b37ccc
+MD5 909344ea1c8f804865fde67d5f16e116 gnupg-2.0.1-r1.ebuild 2192
+RMD160 f8dbe4b96e31e6b4f58563b1c501694852d94637 gnupg-2.0.1-r1.ebuild 2192
+SHA256 a5332e970ac7a77daa158745eab75da14896d8f14568783cfd6374d1c7b37ccc gnupg-2.0.1-r1.ebuild 2192
 EBUILD gnupg-2.0.1.ebuild 2375 RMD160 2f009d186055c4cb251e38bf6e6ba951d0cec430 SHA1 3d70b6b82aaaccc88761a013cf7b07165cfec90b SHA256 5fec10fd56e0bb8e4266ab91e2482f0983f51e4e96afcae7214463ca8002ab4d
 MD5 dffdf508c7bae61f4f4beaa72223a8d4 gnupg-2.0.1.ebuild 2375
 RMD160 2f009d186055c4cb251e38bf6e6ba951d0cec430 gnupg-2.0.1.ebuild 2375
 SHA256 5fec10fd56e0bb8e4266ab91e2482f0983f51e4e96afcae7214463ca8002ab4d gnupg-2.0.1.ebuild 2375
-MISC ChangeLog 40467 RMD160 650b01f58749c33627f1bcc4c671bc21ec67ff2b SHA1 3fd8df91432e7ae34651e39962f0dab7c424ba8c SHA256 5f03fa2d6ec0c2faf0a76ca7f7550a7799f7ec1dc3d614bcc5665addaf74520a
-MD5 54552a5d4b68fef6226dd5483e018a10 ChangeLog 40467
-RMD160 650b01f58749c33627f1bcc4c671bc21ec67ff2b ChangeLog 40467
-SHA256 5f03fa2d6ec0c2faf0a76ca7f7550a7799f7ec1dc3d614bcc5665addaf74520a ChangeLog 40467
+MISC ChangeLog 40638 RMD160 ccc5b26fe43e91985ed6e2c7ee7a15773a40ce4e SHA1 1e17fb4f11a01887551ed4e4fc975c5ef7ef5253 SHA256 f5e810eec409aef6f773991786a725c0ee2b3c45a61afb9e58189606126b8b55
+MD5 bbdbc2054abe62f3f8c5a8b639ddf6c4 ChangeLog 40638
+RMD160 ccc5b26fe43e91985ed6e2c7ee7a15773a40ce4e ChangeLog 40638
+SHA256 f5e810eec409aef6f773991786a725c0ee2b3c45a61afb9e58189606126b8b55 ChangeLog 40638
 MISC metadata.xml 481 RMD160 d5c4e2fc7b94966795cc4c039d850302d8552448 SHA1 13cb529b83ba9feaad91f1d033d6c33d1eafbd25 SHA256 d88eadc2c75a18f57dcd38f20aa72ee7c79504f62bcab3f7dea60651ccd4b672
 MD5 b507ee36c7487372de42cc9dab034370 metadata.xml 481
 RMD160 d5c4e2fc7b94966795cc4c039d850302d8552448 metadata.xml 481
@@ -190,10 +191,6 @@ SHA256 45ceb4d5680badac8223e1c32c90f53fe7407c53fa521d15521ee789467026a4 files/di
 MD5 973de8c9666fa149d0e9ea04d8490f2d files/digest-gnupg-2.0.1 241
 RMD160 24b2ba2a4d33e0f2b910169e8b093caca64d1256 files/digest-gnupg-2.0.1 241
 SHA256 bd68ceadd1c0dcb85124b859d63408bcf8f9676d4b95ba345e5f41550614ec53 files/digest-gnupg-2.0.1 241
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.6-ecc01.6 (GNU/Linux)
-
-iD8DBQFFecOgomPajV0RnrERAjegAJ0dOsQlsxlKaaNtw7hjytt3Cf/gHQCdHttw
-I0Lbfwg0baYfht3DD0RDwt4=
-=++6D
------END PGP SIGNATURE-----
+MD5 973de8c9666fa149d0e9ea04d8490f2d files/digest-gnupg-2.0.1-r1 241
+RMD160 24b2ba2a4d33e0f2b910169e8b093caca64d1256 files/digest-gnupg-2.0.1-r1 241
+SHA256 bd68ceadd1c0dcb85124b859d63408bcf8f9676d4b95ba345e5f41550614ec53 files/digest-gnupg-2.0.1-r1 241

diff --git a/app-crypt/gnupg/files/digest-gnupg-2.0.1-r1 b/app-crypt/gnupg/files/digest-gnupg-2.0.1-r1
new file mode 100644 (file)
index 0000000..8adb116
--- /dev/null
+++ b/app-crypt/gnupg/files/digest-gnupg-2.0.1-r1
@@ -0,0 +1,3 @@
+MD5 eb24e258db73f4cb53a3ce18375efa21 gnupg-2.0.1.tar.bz2 3923924
+RMD160 3b9252b9b8b1ff5c242a3e541adc0a9700e55df1 gnupg-2.0.1.tar.bz2 3923924
+SHA256 49949762a4e080379dcca23948442d50488f0d74e04bcba87fc49e19a899b01d gnupg-2.0.1.tar.bz2 3923924

diff --git a/app-crypt/gnupg/gnupg-2.0.1-r1.ebuild b/app-crypt/gnupg/gnupg-2.0.1-r1.ebuild
new file mode 100644 (file)
index 0000000..e5ead2b
--- /dev/null
+++ b/app-crypt/gnupg/gnupg-2.0.1-r1.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-2.0.1-r1.ebuild,v 1.1 2006/12/09 16:57:59 alonbl Exp $
+
+WANT_AUTOMAKE='latest'
+
+inherit eutils flag-o-matic autotools
+
+DESCRIPTION="The GNU Privacy Guard, a GPL pgp replacement"
+HOMEPAGE="http://www.gnupg.org/"
+SRC_URI="mirror://gnupg/gnupg/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="bzip2 caps X doc ldap nls openct pcsc-lite smartcard selinux"
+
+COMMON_DEPEND="
+       virtual/libc
+       >=dev-libs/pth-1.3.7
+       >=dev-libs/libgcrypt-1.2.0
+       >=dev-libs/libksba-1.0.0
+       >=dev-libs/libgpg-error-1.4
+       >=dev-libs/libassuan-1.0.1
+       bzip2? ( app-arch/bzip2 )
+       pcsc-lite? ( >=sys-apps/pcsc-lite-1.3.0 )
+       openct? ( >=dev-libs/openct-0.5.0 )
+       ldap? ( net-nds/openldap )"
+# Needs sh and arm to be keyworded on pinentry
+#      X? ( app-crypt/pinentry )
+
+DEPEND="${COMMON_DEPEND}
+       nls? ( sys-devel/gettext )
+       doc? ( sys-apps/texinfo )"
+
+RDEPEND="${COMMON_DEPEND}
+       !app-crypt/gpg-agent
+       !<=app-crypt/gnupg-2.0.1
+       X? ( || ( media-gfx/xloadimage media-gfx/xli ) )
+       virtual/mta
+       selinux? ( sec-policy/selinux-gnupg )
+       nls? ( virtual/libintl )"
+
+src_unpack() {
+       unpack ${A}
+       cd "${S}"
+
+       AT_M4DIR="m4 gl/m4" eautoreconf
+}
+
+src_compile() {
+       local myconf=""
+
+       if use X; then
+               local viewer
+               if has_version 'media-gfx/xloadimage'; then
+                       viewer=/usr/bin/xloadimage
+               else
+                       viewer=/usr/bin/xli
+               fi
+               myconf="${myconf} --with-photo-viewer=${viewer}"
+       else
+               myconf="${myconf} --disable-photo-viewers"
+       fi
+
+       append-ldflags $(bindnow-flags)
+
+       econf \
+               --enable-symcryptrun \
+               --enable-gpg \
+               --enable-gpgsm \
+               --enable-agent \
+               $(use_enable bzip2) \
+               $(use_enable smartcard scdaemon) \
+               $(use_enable nls) \
+               $(use_enable ldap) \
+               $(use_with caps capabilities) \
+               ${myconf} \
+               || die
+       emake || die
+       if use doc; then
+               cd doc
+               emake html || die
+       fi
+}
+
+src_install() {
+       make DESTDIR="${D}" install || die
+       dodoc ChangeLog NEWS README THANKS TODO VERSION
+
+       dosym gpg2 /usr/bin/gpg
+       dosym gpgv2 /usr/bin/gpgv
+
+       use doc && dohtml doc/gnupg.html/* doc/*jpg doc/*png
+}
+