From 628ff9c704ca725dbbd876fb3906bcd6d7174392 Mon Sep 17 00:00:00 2001 From: Brandon Philips Date: Tue, 10 Sep 2013 08:46:39 -0700 Subject: [PATCH] bump(app-crypt/gnupg): sync with upstream --- .../portage-stable/app-crypt/gnupg/ChangeLog | 104 ++++++++++++- .../portage-stable/app-crypt/gnupg/Manifest | 28 +++- .../app-crypt/gnupg/gnupg-1.4.13.ebuild | 138 ------------------ ...g-1.4.13-r1.ebuild => gnupg-1.4.14.ebuild} | 11 +- ...nupg-2.0.19.ebuild => gnupg-2.0.20.ebuild} | 25 ++-- ...g-2.0.19-r1.ebuild => gnupg-2.0.21.ebuild} | 16 +- 6 files changed, 153 insertions(+), 169 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/app-crypt/gnupg/gnupg-1.4.13.ebuild rename sdk_container/src/third_party/portage-stable/app-crypt/gnupg/{gnupg-1.4.13-r1.ebuild => gnupg-1.4.14.ebuild} (90%) rename sdk_container/src/third_party/portage-stable/app-crypt/gnupg/{gnupg-2.0.19.ebuild => gnupg-2.0.20.ebuild} (83%) rename sdk_container/src/third_party/portage-stable/app-crypt/gnupg/{gnupg-2.0.19-r1.ebuild => gnupg-2.0.21.ebuild} (88%) diff --git a/sdk_container/src/third_party/portage-stable/app-crypt/gnupg/ChangeLog b/sdk_container/src/third_party/portage-stable/app-crypt/gnupg/ChangeLog index 924feb163b..e9358eaa39 100644 --- a/sdk_container/src/third_party/portage-stable/app-crypt/gnupg/ChangeLog +++ b/sdk_container/src/third_party/portage-stable/app-crypt/gnupg/ChangeLog @@ -1,6 +1,108 @@ # ChangeLog for app-crypt/gnupg # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/ChangeLog,v 1.457 2013/01/19 21:16:55 alonbl Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/ChangeLog,v 1.486 2013/08/19 16:59:42 radhermit Exp $ + + 19 Aug 2013; Tim Harder -gnupg-1.4.13.ebuild, + -gnupg-1.4.13-r1.ebuild, -gnupg-2.0.19.ebuild, -gnupg-2.0.19-r1.ebuild, + -gnupg-2.0.19-r2.ebuild, -files/gnupg-2.0.19-support-sc-key-3072.patch, + -files/gnupg-2.0.19-texinfo-5.patch: + Remove old. + +*gnupg-2.0.21 (19 Aug 2013) + + 19 Aug 2013; Tim Harder +gnupg-2.0.21.ebuild: + Version bump. + + 08 Aug 2013; Agostino Sarubbo gnupg-1.4.14.ebuild: + Stable for sh, wrt bug #478184 + + 08 Aug 2013; Agostino Sarubbo gnupg-1.4.14.ebuild: + Stable for sparc, wrt bug #478184 + + 06 Aug 2013; Agostino Sarubbo gnupg-1.4.14.ebuild: + Stable for s390, wrt bug #478184 + + 04 Aug 2013; Agostino Sarubbo gnupg-1.4.14.ebuild: + Stable for ppc64, wrt bug #478184 + + 04 Aug 2013; Agostino Sarubbo gnupg-1.4.14.ebuild: + Stable for ia64, wrt bug #478184 + + 30 Jul 2013; Agostino Sarubbo gnupg-1.4.14.ebuild: + Stable for alpha, wrt bug #478184 + + 28 Jul 2013; Agostino Sarubbo gnupg-1.4.14.ebuild: + Stable for arm, wrt bug #478184 + + 28 Jul 2013; Agostino Sarubbo gnupg-1.4.14.ebuild: + Stable for ppc, wrt bug #478184 + + 27 Jul 2013; Agostino Sarubbo gnupg-1.4.14.ebuild: + Stable for x86, wrt bug #478184 + + 27 Jul 2013; Jeroen Roovers gnupg-1.4.14.ebuild: + Stable for HPPA (bug #478184). + + 26 Jul 2013; Agostino Sarubbo gnupg-1.4.14.ebuild: + Stable for amd64, wrt bug #478184 + +*gnupg-1.4.14 (26 Jul 2013) + + 26 Jul 2013; Tim Harder +gnupg-1.4.14.ebuild: + Security bump (bug #478184). + + 30 Jun 2013; Agostino Sarubbo gnupg-2.0.20.ebuild: + Stable for s390, wrt bug #471404 + + 29 Jun 2013; Agostino Sarubbo gnupg-2.0.20.ebuild: + Stable for sparc, wrt bug #471404 + + 26 Jun 2013; Agostino Sarubbo gnupg-2.0.20.ebuild: + Stable for ia64, wrt bug #471404 + + 26 Jun 2013; Agostino Sarubbo gnupg-2.0.20.ebuild: + Stable for alpha, wrt bug #471404 + + 25 Jun 2013; Agostino Sarubbo gnupg-2.0.20.ebuild: + Stable for ppc64, wrt bug #471404 + + 24 Jun 2013; Agostino Sarubbo gnupg-2.0.20.ebuild: + Stable for ppc, wrt bug #471404 + + 10 Jun 2013; Sergey Popov gnupg-2.0.20.ebuild: + Stable on amd64 and x86, wrt bug #471404 + + 09 Jun 2013; Agostino Sarubbo gnupg-2.0.20.ebuild: + Stable for sh, wrt bug #471404 + + 09 Jun 2013; Markus Meier gnupg-2.0.20.ebuild: + arm stable, bug #471404 + + 03 Jun 2013; Jeroen Roovers gnupg-2.0.20.ebuild: + Stable for HPPA (bug #471404). + +*gnupg-2.0.20 (15 May 2013) + + 15 May 2013; Tim Harder +gnupg-2.0.20.ebuild: + Version bump. + + 13 May 2013; Alon Bar-Lev gnupg-1.4.13-r1.ebuild: + Fix tests accessing wrong homedir, bug#469388 + + 10 Apr 2013; Alon Bar-Lev + +files/gnupg-2.0.19-texinfo-5.patch, gnupg-2.0.19-r2.ebuild: + Fix texinfo-5 comatibility, per bug#464162, thanks to Denys Duchier and Ian + Abbott + +*gnupg-2.0.19-r2 (07 Apr 2013) + + 07 Apr 2013; Alon Bar-Lev + +files/gnupg-2.0.19-support-sc-key-3072.patch, +gnupg-2.0.19-r2.ebuild: + Backport openpgp key>=3072 support from upstream master, per bug#464890, + thanks to Andreas K. Hüttel + + 21 Feb 2013; Zac Medico gnupg-2.0.19-r1.ebuild: + Add ~arm-linux keyword. 19 Jan 2013; Alon Bar-Lev files/gnupg-2.0.17-gpgsm-gencert.patch: diff --git a/sdk_container/src/third_party/portage-stable/app-crypt/gnupg/Manifest b/sdk_container/src/third_party/portage-stable/app-crypt/gnupg/Manifest index 350c85ff03..2429be8b37 100644 --- a/sdk_container/src/third_party/portage-stable/app-crypt/gnupg/Manifest +++ b/sdk_container/src/third_party/portage-stable/app-crypt/gnupg/Manifest @@ -1,9 +1,23 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + AUX gnupg-2.0.17-gpgsm-gencert.patch 1121 SHA256 fa8369a4466b3cce54215a348940422f46f4d359f9e9b3c7029a1138870888df SHA512 ecde032b205cc16c33ff21ded55b93e74058cd804d68e4a0738ac70d54b5b388b6f709d21719a5e418c662b7ee74bc4aef7a0c59de106e2d4bd06b7bc1a11138 WHIRLPOOL 5dc4d3de29290e8e274a0f4fef871cea7f49553846254d819ca776000978a72c694212559d9ad03312f94f71f406de4641c0575188d340017a7937b01753b8a0 -DIST gnupg-1.4.13.tar.bz2 3685873 SHA256 72a24dd318472f0c8f0d00ebe19fb4bcf43e30845bcc92a8ae43c810df295d5a SHA512 62c330e02c311206c653cbadf21783599362601f4375ecb32a5bc8ff3f5c64160d95d28555fe06d7fb612c3802c87e0be1d0a68d61b404fdfcecf3580f14b738 WHIRLPOOL 4ae940bda2cc713a387541101df3ff06753c4f701d5d53460af7118278ce5d9b8cd83dd15ea033de5ac15ec6f4a0e339621a359497f4c178c25bbdcc38763d12 -DIST gnupg-2.0.19.tar.bz2 4187460 SHA256 efa23a8a925adb51c7d3b708c25b6d000300f5ce37de9bdec6453be7b419c622 SHA512 9bfc83ebca29ca8e3dde803ba494adb3c4e2fdcacbf33b5592764fe187dbe2433e04ff53734a9c3197358d559c1046098707089ddbea9fa63c849d48ce73ca51 WHIRLPOOL 026f9a8740322b951b256ec87fabb8a1b3ad2114208f52c2082b73b2193d1be8e276f0f526762bbebb04e612351162eb78c9c50eeb058e35fad9c4df1d7db540 -EBUILD gnupg-1.4.13-r1.ebuild 3700 SHA256 eb816d9de7480c92e31b75401eff2f8f4e4097a222fc8867c81bf1c6a05c60eb SHA512 cced000ac9af04c73dddbc83d8316cecdbb8965f6ad9b8e16066fa3e99c8a1cf7474ed3dac2a50786a15a18bf701aeaa314623f0306c463672aa9d4324741ed8 WHIRLPOOL b62ea4d99fa805564261a76f0da05b06611a1537986e8d4d812da46d2bcd3b421c1fbcdc481255e4c516d526aeffddc9697da08e2e85c52c14711357b3dafdc3 -EBUILD gnupg-1.4.13.ebuild 4239 SHA256 926ecef683acf166bfc7ba9b7b232fb8b19b3e25b9a8cbabb1dd7d5ea7562f4b SHA512 f3c26c737a346bb352df018a9c3fbc645ee40a259ace2cb4d9429124a5d9e77b2d9e45810a7f1f16920b414c2d42b3da5cd88ba1d17e4bf4222d4507d9330dcc WHIRLPOOL 2b3fecbfb80daf95771f3c23dd8d9ea71229da28417bd0b6a6491b91675999aeb0a9bbdf658fa80279b5e343d74c30bbecd8002dbe4d42b39df00691d2dbd6ef -EBUILD gnupg-2.0.19-r1.ebuild 4570 SHA256 1c739bac6e57c08b9a1bc32ca0896993a434663901fc882679c7d280748718dc SHA512 8c2818d807d0415e94a58d5400575488e65d4183dd056a0339ccef36d5ff881409ecd24fd7065f40f749a51509563b093f6b7da91866dc9e5f92bb9eebfe3a50 WHIRLPOOL a9945a6662b6c8857bef977ae4feddbbcf26a7685c19d73ac386b280f82f57b91c9d4efbe9d81fd5124fe59a8570b44dd1ca4402a413fd2eef56cb282901f615 -EBUILD gnupg-2.0.19.ebuild 4472 SHA256 5a5159050703c2cc0831b6b6a7a42e6d1d9a92b3443e5039290fed2b7cfbc5b6 SHA512 48310f5582cf4a95cd20828a7e313bf7bca79e4edbef44ec4f95d048f1f9d7c932f469dc239827f38a3fd6a4b0c5c7624d3f338d8735525a877d623aeb5b0105 WHIRLPOOL 59a01c348c91268690cbc28706d635f511fef2faa2158446a915736652421abb123bf45c9598412b21c8d7b11b5635b55301ec5f44fedce0476eaab7d7e7fd8c -MISC ChangeLog 68667 SHA256 9223fc421f14def4f19863dd14318672284147e995c0a92ea2ba1a56359c2601 SHA512 9637bb946a42d3a551659df6237aa9d5b4f2c28a2a2a17a13ed38ee8504c188f4961ff5c893aca08cce06ca280e0732ab689abf3d844bbda24126e56707bc3e9 WHIRLPOOL fd10906c0fd575e6fc3d27334ddeba5792658e2b94e5d8dfbfa096dae9190a83c64eafd49a8ad885af72856925f66f15eb171058bfe1204146548d02d2745260 +DIST gnupg-1.4.14.tar.bz2 3687929 SHA256 f2c4cd3ed6a5fb66cb369bf8160e53127712adfe41ebf965c0f02ab71d984413 SHA512 324b32807759c8a9c3587e1576ab1f5815918028f015dcff36e7ff1e8610996c89e4bc7af77385adc9359f21cc022642b971509698a81510a88085f5a268405f WHIRLPOOL c14a89171b2bf7a4b0934e67cf970325e394c38a05daa455c87327eaa13fea27e5cadbfcf693dedb5840b4a249b53457baf91ecd307ec66e11dfccbfe661e037 +DIST gnupg-2.0.20.tar.bz2 4286191 SHA256 6e949b7f062cab8a3cf0910f91ecf04cabaad458c0aeeec66298651b8b04b79a SHA512 f4eec0ed3503f2aeecfa63af53b844b19ee4be596ea487dce69ec14189c8163652c932d0e657be147b1ca3d7dc8adf9cc1bc8067086fe0c51a3487d56df388c4 WHIRLPOOL a088aab347be7d2c83078eadc79387e705d048868800c8335574f0b0f7c7cd21d8dd620783f83c908075841144b6f8577db8838c99459edd2309fec836761f0d +DIST gnupg-2.0.21.tar.bz2 4300604 SHA256 00df8902c7cef4d2440d36ca2a45985853eb36c34a4163bc995c3578030eeef5 SHA512 e31b7d9143462e4846111cdbcf0af9ad93fb1f5b9324a1c126c060e4cefb09d3c6b2f85e655d3960b5f21f09317cefd2c5b786e129efb62feab20f4b9a6770ba WHIRLPOOL 911d0122d6aa8bc883b192b47a785c323a0a5fb015ecc6cf08cd19a3d8f03a80b320555c8ebb6804b0a9841fa2b17b633be4f23b458e1778a73a583e4ba608cc +EBUILD gnupg-1.4.14.ebuild 3761 SHA256 4be020e6d1202f937d8b3a59d297bdded0f78a9c1c9e44518080d9fb7bf8605e SHA512 695afc4e15ec18dc29343a2fb551f587ba00f6c8bb1a0122e94556cd5a138cfbc4db5b6a30ebbbf3287f05f580a39ce554d022f1acc467117fc68e9d54531762 WHIRLPOOL ca6f2e8c8d9f1df1f6391e503a48fdb6134cc4da2a851da5d18573a20313909d2357c1cc794f3e92c13d173b2373e059ecd9d091b18b0f01184d15fa1370f105 +EBUILD gnupg-2.0.20.ebuild 4574 SHA256 184e6a23b57a5c86300f5bd76b0eeed3b568a5bc9a06ae43210e1afce4c59fa7 SHA512 2e9682726ba32d27bb99060302960e3e8855718eb7a7a979c13dae2d3fb88216369ba3af690cff013110577359d830732159d2048dd9a9782828f63a3b1cdf3f WHIRLPOOL f2a9a3d767259073f3b6ddf8c97f053de9d3f57a09e6642f014ea4d0eae52bb7730fe1a4eb3dafaf0be627aa8008532859bf0d50853ff9ea520eb77b1a798bbc +EBUILD gnupg-2.0.21.ebuild 4591 SHA256 3a68cb34b57916cefcff1652e6a9e92ec0926e1157a9b13869b935a62a71a695 SHA512 3089940b5e5d5e1311668f2eaa5a937f31aa9916df930b5debdc7b4764ff141423f92a539cb804495cccf22f174c1afc4a0f4c6b14812bb2cd84ab39c198ba2b WHIRLPOOL 942bb8e0edbef388bd3e0b6e4a325e1f8556bd37d5081cadf14aa483a9b06480ed34d32d20b59781d8697b8cbe88b3ac17f66c7b8580bc5e86fbe7ffd715f23b +MISC ChangeLog 72204 SHA256 80a18a6152a51bbdaf7b71c6c64887f7fe27d03abc955af5bf4f6bfc4cd5d8bb SHA512 652d037ccda2a69cece89ff534ce4091dbb5c0e839cf0bd62700fd61b5af1e4268262efc8c6450d4fd653f117772fee73e788c8274b51564944c63bcd1a35a94 WHIRLPOOL 09e58ab4f2de0499e98ec07f2bb94cdde12672ab9dadc563abdcb6ecb14d32a523a7e01b5a8179d5f57d5cd3a39d9fe4d0d7f1bfcbeda66c8d473f3180b4df79 MISC metadata.xml 1078 SHA256 6d0df2861d7b3fc7777f9c703b06f789a8e4e4d08a98b1f5f5cc661943a5b7e0 SHA512 2998315ea1dad11806385d84827189efb626620d6596bf51a67180567a5ed3cbcb5eea50de907477b93d876ce66fb7e944cce159fe29450a301cda9bdd76db87 WHIRLPOOL fc0761ee1950b067a4434192c22b3d516017b539694e3615f9429ad8b05ace449e8d9abf01086baf91eb93cb9ad4fe2c37467b0313ccaf0411a99be63a7440e9 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.20 (GNU/Linux) + +iQEcBAEBCAAGBQJSEk7/AAoJEEqz6FtPBkyjImoIAKudMprhkCz32FRl2KttNOYk +4Fp+2FYYkWVxJAcctQDskKsPo6AvEc9NlSIJNfGQU/ls/10IXG68st8kx0IOanqd ++HKuVhY0yvR1n2FPz3wPhQkxrd93vYS0GKrpHqpnQfxVVX2EjLGi6gjd0Pd/bT34 +ZbRncIBmroTKpFiMFp1md20kJHCfcEvAqPr14CzLDFhljA7j6BCnLrPOLvN7B+Hl +FcsSO19lMG0qaJUmAot9o+k42Mo/z4JLbWeiJtdmu/CwJyPBv36Q5iUOpMaII50X +49W1MQD1ehmX2sjyEUqPxs0ZrGq0AMqUJMeSkbrY4z0IpeqoGMBN1hN5fNG2+Xo= +=O3yA +-----END PGP SIGNATURE----- diff --git a/sdk_container/src/third_party/portage-stable/app-crypt/gnupg/gnupg-1.4.13.ebuild b/sdk_container/src/third_party/portage-stable/app-crypt/gnupg/gnupg-1.4.13.ebuild deleted file mode 100644 index 36e35ada5b..0000000000 --- a/sdk_container/src/third_party/portage-stable/app-crypt/gnupg/gnupg-1.4.13.ebuild +++ /dev/null @@ -1,138 +0,0 @@ -# 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.11 2013/01/13 19:33:20 armin76 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" -} diff --git a/sdk_container/src/third_party/portage-stable/app-crypt/gnupg/gnupg-1.4.13-r1.ebuild b/sdk_container/src/third_party/portage-stable/app-crypt/gnupg/gnupg-1.4.14.ebuild similarity index 90% rename from sdk_container/src/third_party/portage-stable/app-crypt/gnupg/gnupg-1.4.13-r1.ebuild rename to sdk_container/src/third_party/portage-stable/app-crypt/gnupg/gnupg-1.4.14.ebuild index d5ba5f82a5..457aed858a 100644 --- a/sdk_container/src/third_party/portage-stable/app-crypt/gnupg/gnupg-1.4.13-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-crypt/gnupg/gnupg-1.4.14.ebuild @@ -1,8 +1,8 @@ # 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-r1.ebuild,v 1.1 2013/01/19 20:12:23 alonbl Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-1.4.14.ebuild,v 1.12 2013/08/08 12:37:13 ago Exp $ -EAPI="4" +EAPI="5" inherit eutils flag-o-matic toolchain-funcs @@ -17,7 +17,7 @@ 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 ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos" +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 mta nls readline selinux smartcard static usb zlib linguas_ru" COMMON_DEPEND=" @@ -44,6 +44,9 @@ src_prepare() { # 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" + # bug#469388 + sed -i -e 's/--batch --dearmor/--homedir . --batch --dearmor/' checks/Makefile.in + # Fix PIC definitions sed -i -e 's:PIC:__PIC__:' mpi/i386/mpih-{add,sub}1.S intl/relocatable.c \ || die "sed PIC failed" @@ -85,7 +88,7 @@ src_configure() { } src_install() { - emake DESTDIR="${D}" install + default # keep the documentation in /usr/share/doc/... rm -rf "${ED}usr/share/gnupg/FAQ" "${ED}usr/share/gnupg/faq.html" || die diff --git a/sdk_container/src/third_party/portage-stable/app-crypt/gnupg/gnupg-2.0.19.ebuild b/sdk_container/src/third_party/portage-stable/app-crypt/gnupg/gnupg-2.0.20.ebuild similarity index 83% rename from sdk_container/src/third_party/portage-stable/app-crypt/gnupg/gnupg-2.0.19.ebuild rename to sdk_container/src/third_party/portage-stable/app-crypt/gnupg/gnupg-2.0.20.ebuild index d551a83b61..ad8cec3d0e 100644 --- a/sdk_container/src/third_party/portage-stable/app-crypt/gnupg/gnupg-2.0.19.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-crypt/gnupg/gnupg-2.0.20.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2012 Gentoo Foundation +# 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-2.0.19.ebuild,v 1.12 2012/08/19 18:43:45 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-2.0.20.ebuild,v 1.11 2013/06/30 18:08:20 ago Exp $ -EAPI="4" +EAPI="5" inherit eutils flag-o-matic toolchain-funcs @@ -13,8 +13,8 @@ SRC_URI="mirror://gnupg/gnupg/${P}.tar.bz2" LICENSE="GPL-3" SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="adns bzip2 doc ldap nls readline static selinux smartcard usb" +KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="adns bzip2 doc ldap nls mta readline static selinux smartcard usb" COMMON_DEPEND_LIBS=" >=dev-libs/libassuan-2 @@ -40,14 +40,16 @@ DEPEND="${COMMON_DEPEND_LIBS} >=dev-libs/libgpg-error-1.7[static-libs] >=dev-libs/libksba-1.0.7[static-libs] >=dev-libs/pth-1.3.7[static-libs] - || ( sys-libs/zlib[static-libs] =net-misc/curl-7.10[static-libs] + sys-libs/zlib[static-libs] + bzip2? ( app-arch/bzip2[static-libs] ) ) nls? ( sys-devel/gettext ) doc? ( sys-apps/texinfo )" RDEPEND="!static? ( ${COMMON_DEPEND_LIBS} ) ${COMMON_DEPEND_BINS} - virtual/mta + mta? ( virtual/mta ) !<=app-crypt/gnupg-2.0.1 selinux? ( sec-policy/selinux-gpg ) nls? ( virtual/libintl )" @@ -82,6 +84,7 @@ src_configure() { $(use_enable bzip2) \ $(use_enable !elibc_SunOS symcryptrun) \ $(use_enable nls) \ + $(use_enable mta mailto) \ $(use_enable ldap) \ $(use_with readline) \ CC_FOR_BUILD="$(tc-getBUILD_CC)" @@ -99,7 +102,7 @@ src_compile() { src_install() { emake DESTDIR="${D}" install emake DESTDIR="${D}" -f doc/Makefile uninstall-nobase_dist_docDATA - rm -r "${ED}usr/share/gnupg/help"* + rm "${ED}"/usr/share/gnupg/help* || die dodoc ChangeLog NEWS README THANKS TODO VERSION doc/FAQ doc/DETAILS \ doc/HACKING doc/TRANSLATE doc/OpenPGP doc/KEYSERVER doc/help* @@ -112,11 +115,11 @@ src_install() { if use ldap; then dosym gpg2keys_ldap /usr/libexec/gpgkeys_ldap fi - echo ".so man1/gpg2.1" > "${ED}usr/share/man/man1/gpg.1" - echo ".so man1/gpgv2.1" > "${ED}usr/share/man/man1/gpgv.1" + echo ".so man1/gpg2.1" > "${ED}"/usr/share/man/man1/gpg.1 + echo ".so man1/gpgv2.1" > "${ED}"/usr/share/man/man1/gpgv.1 dodir /etc/env.d - echo "CONFIG_PROTECT=/usr/share/gnupg/qualified.txt" >>"${ED}etc/env.d/30gnupg" + echo "CONFIG_PROTECT=/usr/share/gnupg/qualified.txt" >> "${ED}"/etc/env.d/30gnupg if use doc; then dohtml doc/gnupg.html/* doc/*.png diff --git a/sdk_container/src/third_party/portage-stable/app-crypt/gnupg/gnupg-2.0.19-r1.ebuild b/sdk_container/src/third_party/portage-stable/app-crypt/gnupg/gnupg-2.0.21.ebuild similarity index 88% rename from sdk_container/src/third_party/portage-stable/app-crypt/gnupg/gnupg-2.0.19-r1.ebuild rename to sdk_container/src/third_party/portage-stable/app-crypt/gnupg/gnupg-2.0.21.ebuild index e941338dde..028487ea99 100644 --- a/sdk_container/src/third_party/portage-stable/app-crypt/gnupg/gnupg-2.0.19-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-crypt/gnupg/gnupg-2.0.21.ebuild @@ -1,8 +1,8 @@ # 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-2.0.19-r1.ebuild,v 1.3 2013/01/19 20:12:23 alonbl Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-2.0.21.ebuild,v 1.1 2013/08/19 16:55:43 radhermit Exp $ -EAPI="4" +EAPI="5" inherit eutils flag-o-matic toolchain-funcs @@ -13,13 +13,13 @@ SRC_URI="mirror://gnupg/gnupg/${P}.tar.bz2" LICENSE="GPL-3" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="adns bzip2 doc ldap nls mta readline static selinux smartcard usb" COMMON_DEPEND_LIBS=" >=dev-libs/libassuan-2 >=dev-libs/libgcrypt-1.4 - >=dev-libs/libgpg-error-1.7 + >=dev-libs/libgpg-error-1.11 >=dev-libs/libksba-1.0.7 >=dev-libs/pth-1.3.7 >=net-misc/curl-7.10 @@ -102,7 +102,7 @@ src_compile() { src_install() { emake DESTDIR="${D}" install emake DESTDIR="${D}" -f doc/Makefile uninstall-nobase_dist_docDATA - rm -r "${ED}usr/share/gnupg/help"* + rm "${ED}"/usr/share/gnupg/help* || die dodoc ChangeLog NEWS README THANKS TODO VERSION doc/FAQ doc/DETAILS \ doc/HACKING doc/TRANSLATE doc/OpenPGP doc/KEYSERVER doc/help* @@ -115,11 +115,11 @@ src_install() { if use ldap; then dosym gpg2keys_ldap /usr/libexec/gpgkeys_ldap fi - echo ".so man1/gpg2.1" > "${ED}usr/share/man/man1/gpg.1" - echo ".so man1/gpgv2.1" > "${ED}usr/share/man/man1/gpgv.1" + echo ".so man1/gpg2.1" > "${ED}"/usr/share/man/man1/gpg.1 + echo ".so man1/gpgv2.1" > "${ED}"/usr/share/man/man1/gpgv.1 dodir /etc/env.d - echo "CONFIG_PROTECT=/usr/share/gnupg/qualified.txt" >>"${ED}etc/env.d/30gnupg" + echo "CONFIG_PROTECT=/usr/share/gnupg/qualified.txt" >> "${ED}"/etc/env.d/30gnupg if use doc; then dohtml doc/gnupg.html/* doc/*.png