Version bump, per bug#449546, remove idea USE and handling as it is provided by package, minor cleanups

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

3 files changed, 149 insertions, 17 deletions

diff --git a/app-crypt/gnupg/ChangeLog b/app-crypt/gnupg/ChangeLog
index 8ca0153e8123..09fe15b4f97c 100644
--- a/app-crypt/gnupg/ChangeLog
+++ b/app-crypt/gnupg/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-crypt/gnupg
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/ChangeLog,v 1.438 2012/09/08 01:58:50 radhermit Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/ChangeLog,v 1.439 2013/01/01 16:19:30 alonbl Exp $
+
+*gnupg-1.4.13 (01 Jan 2013)
+
+  01 Jan 2013; Alon Bar-Lev <alonbl@gentoo.org> +gnupg-1.4.13.ebuild:
+  Version bump, per bug#449546, remove idea USE and handling as it is provided
+  by package, minor cleanups
 
   08 Sep 2012; Tim Harder <radhermit@gentoo.org> metadata.xml:
   Remove redundant maintainer from metadata.
diff --git a/app-crypt/gnupg/Manifest b/app-crypt/gnupg/Manifest
index 577d7ab60769..ac7bbce52c21 100644
--- a/app-crypt/gnupg/Manifest
+++ b/app-crypt/gnupg/Manifest
@@ -1,31 +1,19 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX gnupg-2.0.17-gpgsm-gencert.patch 1079 SHA256 aec0ea30d898f7f7369abac9a61a0713b6b9b89d231b9beff1ee82041983b7ed SHA512 c8232ca55ff4f75c9c27bb4c279fc876367d15114824b034f50eaac7c377da45e0849b9ab4bbf7aacfebc1854ad49d4752742df10c2e4f8b22b75cfc835d96bf WHIRLPOOL e6217eb8a409e078898e475df081c81e65443ef8c7ab2a0471e399e041e13fd828b8308c3d6a15d5713de4107b0b90a27e3dd42d6353a871d7989071c9a24adb
 AUX gnupg-2.0.17-libgrcrypt150-bugfix.patch 1125 SHA256 a909e3d044292ec0869385a529dab5095ae788ea68a9cb70e63054266eb8cf0b SHA512 953c78a15238b46ba1b92249d59c060ac91f680a514c285d6c27c105cddcb7a8db0bfab6bed2df06969fdbb8c84b3fdd7ec786c7ef1f98d152116c417636d9fa WHIRLPOOL ddcf2945522161f173938f45592386195bddda8d89a6acfa3e4bad127f0efef4f8c47b2545800d45c069c44fdae6c87b4d4d8d1c905098f4f3a12eae1ac323a2
 DIST gnupg-1.4.11.tar.bz2 3407075 SHA256 d18ceeac16e554a501170b9bfde611625252d0fe9448685a69c93bf149ee6ef6 SHA512 97e7b8b0f972cc2f7cabdb0e013cbee1c33e7d48407d040cca5c2037e32abe1c2100194be7d3b569d4f05eb16b24c205a5b83f06718f0241f8d4ee174f1c37ae WHIRLPOOL 6f914627e2f527f6616e1f99d2ae06942b734f839d03a45ffa45bf67516a81d58f89e6a85612cf8e5fd83be04ab0b6bc2da8f81114143dad7523e5fcea62366b
 DIST gnupg-1.4.12.tar.bz2 3584133 SHA256 4f03ca6902aaee79d0eda00eea0fefde7db9eb005d8ffd54fac9806bc24050ec SHA512 be917efddcb012b2d3155ec2353724a20093f9ce25e4dca3ac0f7f752502e9c505c7e7135c93a38dd7ad08934363c7c8bd1adad956d882843e563abe00992d1a WHIRLPOOL 2ec103d97794aff785b6c422c5d0f98365dc10b3b812de21f6e5b75b8e33635281aeb4a198c918f0fc5d3fb97c40d07603a53af97c7e40ca02b96c7bf18bb81d
+DIST gnupg-1.4.13.tar.bz2 3685873 SHA256 72a24dd318472f0c8f0d00ebe19fb4bcf43e30845bcc92a8ae43c810df295d5a SHA512 62c330e02c311206c653cbadf21783599362601f4375ecb32a5bc8ff3f5c64160d95d28555fe06d7fb612c3802c87e0be1d0a68d61b404fdfcecf3580f14b738 WHIRLPOOL 4ae940bda2cc713a387541101df3ff06753c4f701d5d53460af7118278ce5d9b8cd83dd15ea033de5ac15ec6f4a0e339621a359497f4c178c25bbdcc38763d12
 DIST gnupg-2.0.17.tar.bz2 3997356 SHA256 ea649d5ecb2f97cc8d81c5796c6ad8d7d8581f9554241c39d2b11ab12139eea6 SHA512 cc46781e637038c5716656a8db8827cb63c71409ab4a57d1924654adaa086e4155c6f6a69b3bedc0c9c04070378099408e2b398115ac865b136bd658e46c6301 WHIRLPOOL e89eb6941c0aecfa25408391f79e0c189aecb98dbf23da89ef71bb6b94ddd5469f39ebe4b12628f480ff1f9b073ff8b3e47caaeda2eae6a4dc1a5f2214f523af
 DIST gnupg-2.0.18.tar.bz2 4016606 SHA256 48aedd762ca443fb952a9e859efe3c66706d7c2c9c77c32dbdbac4fe962dae5b SHA512 3a99f50f275f894983a21449c69bfe18615138febd0ccf13b02bc55789246b838e0cf09c19301c208a3d240bbbea69e02e736206702f2dd40e5af03964c0a378 WHIRLPOOL b99cf6d7d4613689051e4aaece86fdc0c79fe798f453340b463904ee1eb4555a2e43dd7e9f406e79f52e7bae5c39a4546da9f76a6482946c548ce4e025fb6401
 DIST gnupg-2.0.19.tar.bz2 4187460 SHA256 efa23a8a925adb51c7d3b708c25b6d000300f5ce37de9bdec6453be7b419c622 SHA512 9bfc83ebca29ca8e3dde803ba494adb3c4e2fdcacbf33b5592764fe187dbe2433e04ff53734a9c3197358d559c1046098707089ddbea9fa63c849d48ce73ca51 WHIRLPOOL 026f9a8740322b951b256ec87fabb8a1b3ad2114208f52c2082b73b2193d1be8e276f0f526762bbebb04e612351162eb78c9c50eeb058e35fad9c4df1d7db540
 DIST idea.c.gz 5216 SHA256 309928da34941dff1d6f6687542ff3d58306d85be9e1a9906bc4f9f8e6011844 SHA512 c75eea965f8dbab8d0cdbe8f292d4cce6f274d10693b3cd022fab0ebc6cd13ad07e1d6ea17c5a34b9c34420f889020cb3ff5cf9674260322188300fe036c24d2 WHIRLPOOL 08c48600e662267ce8703e9671bc491e5d240700b1af24cd8383629368704cbb704cec4b0b81ae55b7ef3246a4752ea24e0bcdb3a4768171b55a669c9aa33a20
 EBUILD gnupg-1.4.11.ebuild 4448 SHA256 908b82979bd9d683eb8dcf4813492ff968e0738f7792e44f01ce9963af01d728 SHA512 c6119ca5df19ea56575c1995fd3a9655f22bcf184d23b78ad31fda6249450e9381300cb5eb1fa0261281fc5bc7c2d0a3852570c96a1f865101278637be092399 WHIRLPOOL 4857a558fcb3afb511379824f9a0af5f373cdf5846f9817ee9376f409f3c308901100d9da18b772b506b4e8565052eb38afb55be42d77b67b0480df522cd895b
 EBUILD gnupg-1.4.12.ebuild 4458 SHA256 3126fc9af47ba4e36cb5d5d136455c9dc76d359a06ecaf86e20e08b5f8dd035c SHA512 2ddf99afa342b05f05338b66565a19531b4241f14308533d93c01b4f7cf4dd97506e9cd3cbd8b4cf44cf75b444eed81c306cf521ca042a9ad54d3f9f6503b247 WHIRLPOOL 1e04ff488b266ed3c3a026763106cd93e5fee5fa7279111664f69f4ac77e70517b1c00ddbd9fb6e451562d923788f97544c12a2761973e9585b2f10d803a2d47
+EBUILD gnupg-1.4.13.ebuild 4248 SHA256 736611c7a106d9f40b2d006e46a5afcaf5274e4afd906ee0c2d2f81000491971 SHA512 433f8829b923705359bdd4f6f6c8156004cc2375cc061d5c686fc1c69bb7791164c942b5d43791643c33c9df1024ed98a3cc9b32a55fecaae23ffd36c4c549f3 WHIRLPOOL 1b09494b8267682be4d0064b73c789075187fb3a1d1cffe8372638dd654153662b14ce9d3bafd115c4e34c1cc887bda46db901c90495f816375a8c527c1a4bcb
 EBUILD gnupg-2.0.17-r2.ebuild 4323 SHA256 0b8eb50d4ed7ccf2e7552815de12feea599d5774b5a9b101260bc0e50e3402b2 SHA512 e44318c5e7eae0a973094c2796e3356f39824bbc8f12ae994ff15a5368cd71a733660d991151557e09a76263f39aa27cdac6805abed8a482be699a31d6330268 WHIRLPOOL 34a38a67eb7006f261a4116fff06d1ef31ff0f7dfb1f72e7c70cf4e8b27867eb27149d272f810421127ce732f00770ce392406845eae3bbb602ae231849decea
 EBUILD gnupg-2.0.17-r3.ebuild 4377 SHA256 51b43e7d8509fc9c111b1e593a39100d8bb9de2b76e0199f5351183345831a83 SHA512 bd8327b6d5684a30e3ab309cfa14d172d32815a919dd0d1db145282769984257886c4ba8d77e81a320f517999270c77fa6a8be8bed18f4be2869a009ac2b4169 WHIRLPOOL 092b35bb77c8bbf6e00442c1dec004ad9bc7747c802e35dba07fb6b4765661928b4f588605ed00c7f7d2e507420902aa7fc9a6051130fdbc4aec04dd950f599e
 EBUILD gnupg-2.0.17.ebuild 4541 SHA256 1446fbb23702497fe625476dca396b52d860c490014d58e39a35b62077899be1 SHA512 71535d16f5f8df7323ee2c5a2e542622c49c76e4abd368faf968db27114a502d3c6b0172288b86072cc2a104652171770188f233fbe6e9a13589d2da13820c55 WHIRLPOOL 164044a6c1951f765ddc32d9c9e755c98d39972f4a0647ab2ebd0b21e66c105bbac7809fb61f247c190193f0395caa5d6496edff7223b3c698dd26e2739aa040
 EBUILD gnupg-2.0.18.ebuild 4491 SHA256 49a17fa71c86e8cfca2d6c118ff1288f99b12908640fc7a374b6dc03fce294ad SHA512 f0e5b4bad97c84cbb6431b2921e92746951e7979be6ff93652882cb664655c12689a9ed02b894d338e128370ce926386fe3532d43599182890c91b9c675ad526 WHIRLPOOL 501f5b99ac67b8d8f08e5416ba91ad47fd4b2edf486bb107e94a1ced3241fc72d1948c152c196ab85a9571af192a8725668be9bceac6bb0f13ec87dc28e3bb8a
 EBUILD gnupg-2.0.19.ebuild 4472 SHA256 5a5159050703c2cc0831b6b6a7a42e6d1d9a92b3443e5039290fed2b7cfbc5b6 SHA512 48310f5582cf4a95cd20828a7e313bf7bca79e4edbef44ec4f95d048f1f9d7c932f469dc239827f38a3fd6a4b0c5c7624d3f338d8735525a877d623aeb5b0105 WHIRLPOOL 59a01c348c91268690cbc28706d635f511fef2faa2158446a915736652421abb123bf45c9598412b21c8d7b11b5635b55301ec5f44fedce0476eaab7d7e7fd8c
-MISC ChangeLog 66465 SHA256 086977166a8092845d6d79ffcbdb4f411fa7a6b1494fbec830288c82f66768fe SHA512 11a6c7ead7c8a844fce300da90fed00b177171bb195934e953fc2c6548e817e881c02278b3e561c6c0bb1c0cee37aa919806ed952cd7957cf4fd14b30568f93f WHIRLPOOL ae70a5f788d1c9fd02139b1d23f7d4152fc5b8e4a28fc38699b3608f0040cc7f8b969ac8545a8cfd303da2f1bb8f1d583e5d6de744730cd3539c9c73c8311a55
+MISC ChangeLog 66670 SHA256 d3fd8f38f5d32ba3f912dacffd4c52b4e89ac3b1894e239f2433168259667555 SHA512 e70516429deba6f7ed727903ff531f6acfcffc4311fec31e0292e70224378767c99ba8d1fc560870ae301427d1cb452d0d5eb4c1b04bfd50492916aff5e045a4 WHIRLPOOL 983b2bd50f853efe4b9b315fa3c5c3f49a4bcea58eb70fe22f2925b6679fc4ead9dd6cbb85e916587fdab3062f3ec9b5000c9f8d5e407d2b8d59f62e55b07c5f
 MISC metadata.xml 1292 SHA256 da694ddf99d5ebdf57b48eff9f9a02753ededabd241a9b3d6647b58634dbcbb0 SHA512 df65933098afa09b867c99d01d3b938e0d3110c25f5eae3dae3174ad494b385e72e3cd9404c5a9f9b2f378c1227ebd406d93cd2cd9d6f5aedd3ba28fe058c17c WHIRLPOOL c593d44dae7b82cc438995845f4018e502f668e1b7393256100cdb658f5bef544bf9f0e76c335f336855fff94d0b9408e7ddd0a68cc40425ec863c8035fef630
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iQEcBAEBCAAGBQJQSqZgAAoJEEqz6FtPBkyjEwIH/2LBDdHWZkX5aRir4SsEbAGG
-SKBLJ5sNk5p3OeV8BWzISJb/8XHH2+SZw6uod0yBwHNgXaUQ81113j7iqqIR6bJC
-sNb6yfVPXCxxIxyPoE2MuJRkq9G3O42QwsEKc8DIWnUVB434CT3QXLYqovAbWKOI
-0XrAnQXK2TqcNYvkh/C4KBA0YIuPtY+641eMQCTDMHMNsO9qQ+iZNBXBNJYAGdd6
-qFLo/RYrArTJJWY50ju1vof0gv+bwYSEu+Qs84hyHE5oZWEB0DiTUKSFnasRaTin
-CvGscQvhCBMLzrlu2+JIYwFpfX3V8h5ebcZgZKFrtJ/WdM8Iny5VEMQpU+EdtoI=
-=/QW7
------END PGP SIGNATURE-----
diff --git a/app-crypt/gnupg/gnupg-1.4.13.ebuild b/app-crypt/gnupg/gnupg-1.4.13.ebuild
new file mode 100644
index 000000000000..d7593a7c50d9
--- /dev/null
+++ b/app-crypt/gnupg/gnupg-1.4.13.ebuild
@@ -0,0 +1,138 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-1.4.13.ebuild,v 1.1 2013/01/01 16:19:30 alonbl Exp $
+
+EAPI="4"
+
+inherit eutils flag-o-matic toolchain-funcs
+
+ECCVER="0.2.0"
+ECCVER_GNUPG="1.4.9"
+ECC_PATCH="${PN}-${ECCVER_GNUPG}-ecc${ECCVER}.diff"
+MY_P=${P/_/}
+
+DESCRIPTION="The GNU Privacy Guard, a GPL pgp replacement"
+HOMEPAGE="http://www.gnupg.org/"
+SRC_URI="mirror://gnupg/gnupg/${P}.tar.bz2"
+#		ecc? ( http://www.calcurco.cat/eccGnuPG/src/${ECC_PATCH}.bz2 )
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos"
+IUSE="bzip2 curl ldap nls readline selinux smartcard static usb zlib linguas_ru"
+#IUSE="bzip2 bindist curl ecc ldap nls readline selinux smartcard static usb zlib linguas_ru"
+
+COMMON_DEPEND="
+	ldap? ( net-nds/openldap )
+	bzip2? ( app-arch/bzip2 )
+	zlib? ( sys-libs/zlib )
+	curl? ( net-misc/curl )
+	virtual/mta
+	readline? ( sys-libs/readline )
+	smartcard? ( =virtual/libusb-0* )
+	usb? ( =virtual/libusb-0* )"
+
+RDEPEND="!static? ( ${COMMON_DEPEND} )
+	selinux? ( sec-policy/selinux-gpg )
+	nls? ( virtual/libintl )"
+
+DEPEND="${COMMON_DEPEND}
+	dev-lang/perl
+	nls? ( sys-devel/gettext )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+#	if use ecc; then
+#		if use bindist; then
+#			einfo "Skipping ECC patch to comply with binary distribution (bug #148907)."
+#		else
+#			sed -i \
+#				"s/- VERSION='${ECCVER_GNUPG}'/- VERSION='${PV}'/" \
+#				"${WORKDIR}/${ECC_PATCH}"
+#			sed -i \
+#				"s/+ VERSION='${ECCVER_GNUPG}-ecc${ECCVER}'/+ VERSION='${PV}-ecc${ECCVER}'/" \
+#				"${WORKDIR}/${ECC_PATCH}"
+#
+#			epatch "${WORKDIR}/${ECC_PATCH}"
+#		fi
+#	fi
+
+	# Install RU man page in right location
+	sed -e "/^man_MANS =/s/ gpg\.ru\.1//" -i doc/Makefile.in || die "sed doc/Makefile.in failed"
+
+	# Fix PIC definitions
+	sed -i -e 's:PIC:__PIC__:' mpi/i386/mpih-{add,sub}1.S intl/relocatable.c \
+		|| die "sed PIC failed"
+	sed -i -e 's:if PIC:ifdef __PIC__:' mpi/sparc32v8/mpih-mul{1,2}.S || \
+		die "sed PIC failed"
+}
+
+src_configure() {
+	# Certain sparc32 machines seem to have trouble building correctly with
+	# -mcpu enabled.  While this is not a gnupg problem, it is a temporary
+	# fix until the gcc problem can be tracked down.
+	if [ "${ARCH}" == "sparc" ] && [ "${PROFILE_ARCH}" == "sparc" ]; then
+		filter-flags -mcpu=supersparc -mcpu=v8 -mcpu=v7
+	fi
+
+	# 'USE=static' support was requested in #29299
+	use static && append-ldflags -static
+
+	econf \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		$(use_enable ldap) \
+		--enable-mailto \
+		--enable-hkp \
+		--enable-finger \
+		$(use_with !zlib included-zlib) \
+		$(use_with curl libcurl /usr) \
+		$(use_enable nls) \
+		$(use_enable bzip2) \
+		$(use_enable smartcard card-support) \
+		$(use_enable selinux selinux-support) \
+		--without-capabilities \
+		$(use_with readline) \
+		$(use_with usb libusb /usr) \
+		--enable-static-rnd=linux \
+		--libexecdir="${EPREFIX}/usr/libexec" \
+		--enable-noexecstack \
+		CC_FOR_BUILD=$(tc-getBUILD_CC) \
+		${myconf}
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	# keep the documentation in /usr/share/doc/...
+	rm -rf "${ED}usr/share/gnupg/FAQ" "${ED}usr/share/gnupg/faq.html" || die
+
+	dodoc AUTHORS BUGS ChangeLog NEWS PROJECTS README THANKS \
+		TODO VERSION doc/{FAQ,HACKING,DETAILS,OpenPGP}
+
+	exeinto /usr/libexec/gnupg
+	doexe tools/make-dns-cert
+
+	# install RU documentation in right location
+	if use linguas_ru; then
+		cp doc/gpg.ru.1 "${T}/gpg.1" || die
+		doman -i18n=ru "${T}/gpg.1"
+	fi
+}
+
+pkg_postinst() {
+	ewarn "If you are using a non-Linux system, or a kernel older than 2.6.9,"
+	ewarn "you MUST make the gpg binary setuid."
+	echo
+#	if use !bindist && use ecc; then
+#		ewarn
+#		ewarn "The elliptical curves patch is experimental"
+#		ewarn "Further info available at http://alumnes.eps.udl.es/%7Ed4372211/index.en.html"
+#	fi
+	elog
+	elog "See http://www.gentoo.org/doc/en/gnupg-user.xml for documentation on gnupg"
+	elog
+	elog "If you wish to view images emerge:"
+	elog "media-gfx/xloadimage, media-gfx/xli or any other viewer"
+	elog "Remember to use photo-viewer option in configuration file to activate the right viewer"
+}