From: Robin H. Johnson Date: Fri, 2 Apr 2010 22:38:22 +0000 (+0000) Subject: Move the EAPI=3 change to a seperate ebuild for the 1.4 series, as some autobuilds... X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=7352069783f8f67d83b3a69116150dea057114ec;p=gentoo.git Move the EAPI=3 change to a seperate ebuild for the 1.4 series, as some autobuilds still contain a Portage that does not support it, and this can get brought in very early sometimes. Package-Manager: portage-2.2_rc67/cvs/Linux x86_64 --- diff --git a/app-crypt/gnupg/ChangeLog b/app-crypt/gnupg/ChangeLog index 681ccaf567c4..6ac600f6f349 100644 --- a/app-crypt/gnupg/ChangeLog +++ b/app-crypt/gnupg/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for app-crypt/gnupg # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/ChangeLog,v 1.367 2010/04/01 21:28:21 abcd Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/ChangeLog,v 1.368 2010/04/02 22:38:22 robbat2 Exp $ + +*gnupg-1.4.10-r1 (02 Apr 2010) + + 02 Apr 2010; Robin H. Johnson gnupg-1.4.10.ebuild, + +gnupg-1.4.10-r1.ebuild: + Move the EAPI=3 change to a seperate ebuild for the 1.4 series, as some + autobuilds still contain a Portage that does not support it, and this can + get brought in very early sometimes. 01 Apr 2010; Jonathan Callen gnupg-1.4.10.ebuild, gnupg-2.0.14.ebuild, gnupg-2.0.15.ebuild: diff --git a/app-crypt/gnupg/Manifest b/app-crypt/gnupg/Manifest index 8145d944790f..2f6a4aac87a4 100644 --- a/app-crypt/gnupg/Manifest +++ b/app-crypt/gnupg/Manifest @@ -1,6 +1,3 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - AUX gnupg-2.0.12-adns.patch 818 RMD160 5d1b0a267cfd290c0e3b68c58f2fe5a5286c52c2 SHA1 fe3f7a1468a70768f36ef7e8f20b6d8fb8406366 SHA256 cb7b9dcf8019db1afc5aeee0a16659f53c7b41660278c8ecc056f874c22ceea6 DIST gnupg-1.4.10.tar.bz2 3410814 RMD160 d54063eaa5b25dc3c3f4ad924411ec69c25c1e62 SHA1 fd1b6a5f3b2dd836b598a1123ac257b8f105615d SHA256 a2907f4432d67894e425e48ae85785dd60ecb01658c9682bcd96f5e91043bb38 DIST gnupg-2.0.11.tar.bz2 3852869 RMD160 f532a2c41a4fdcf9bd5130f8d382348f6774ba18 SHA1 9f71a342c5be686b0dcef082078af693802a558f SHA256 8c40148ad471f4a7e583bc5f84ebf652c395b303deaf2583b11e51f43fa8b47c @@ -9,18 +6,12 @@ DIST gnupg-2.0.13.tar.bz2 3946616 RMD160 a2291f4d5923b50bca980b726e2fe0c31c2589a DIST gnupg-2.0.14.tar.bz2 3982080 RMD160 3e5ecf0108b65f7d2ecfd6f61b81e04e526ba52f SHA1 cc5e4637f37f5bc82b00c73fc094ddadb7401821 SHA256 feb6050dc00e59d426485550a2af8d416cf975e5e1e0ecf1c5f1bd139baafca5 DIST gnupg-2.0.15.tar.bz2 3976879 RMD160 16fe31125f2a7e18ffc5618902e2d3370b220e65 SHA1 3596668fb9cc8ec0714463a5009f990fc23434b0 SHA256 5881882f4da120ce1c71da64468392704b391ca7652ddc512bc4f1d8968f0d1c DIST idea.c.gz 5216 RMD160 e35be5a031d10d52341ac5f029d28f811edd908d SHA1 82fded4ec31b97b3b2dd22741880b67cfee40f84 SHA256 309928da34941dff1d6f6687542ff3d58306d85be9e1a9906bc4f9f8e6011844 -EBUILD gnupg-1.4.10.ebuild 5443 RMD160 78c4910dce39403ddf9fe8359b7306cb99c8d7bc SHA1 474826e55ad91742fd03c0375098845414250fb0 SHA256 f4d1cc4aa7436eaf30996346639fb5a441125a34821868028367e266e8ba3226 +EBUILD gnupg-1.4.10-r1.ebuild 5460 RMD160 f3da83b605b8e23da939cae854af4928ccc774b9 SHA1 e9e6b75b8b8581359dd1a5037585bc43c40a9e60 SHA256 67cc2dc3fc50467e28991c2bacac88403b9dda380e90c17cf446042427726d06 +EBUILD gnupg-1.4.10.ebuild 5377 RMD160 33dd305ca1e377a6ae154b27316c868e7c8c8fd4 SHA1 5921bb2138994baf8309f172dc6258067ef46812 SHA256 a53465eba2f18eb70eff2fc1619862878efb86508d0a02182f0f2a7bb44a0347 EBUILD gnupg-2.0.11.ebuild 2761 RMD160 a9979ae493727d5a6b350d518fc34d0ac13b042c SHA1 84fe2a6cb7d4583c5c10d3b5660f7fed4fe4aa01 SHA256 fde35e4f1efb21796a23b4f7b92a1c42c61d788743ee257ffc7098c3b7323622 EBUILD gnupg-2.0.12.ebuild 3185 RMD160 325056f1fcef665a1e1e8ae17097278a52c8354c SHA1 bf516692f1c5a8923e32d7b811879c954507b527 SHA256 0fa806394956a2f885b3066ae91a3cb31bf8390f89425fd4271a7a5a53243300 EBUILD gnupg-2.0.13.ebuild 3158 RMD160 ab01ac93f92c3929437feb1a9581d0035f83d87b SHA1 1c8ec29aceb414e0c8f604b5b46220278b9a566c SHA256 e906bf2ef3bc84fca0063d035422772fb5302aa86fe81f57be22ac196b75d762 EBUILD gnupg-2.0.14.ebuild 3239 RMD160 e8491e8882552bc24db50356dc8849e36d13236c SHA1 4554fa53adf6c4c6fec0430b7b406dd2f50155a8 SHA256 8ffdaefb4e605547073c6dfda0caf2f31f485be4da911fb98de36b0280226615 EBUILD gnupg-2.0.15.ebuild 3250 RMD160 d9241f7564748206f55ac6c76f169d963e4b68c7 SHA1 58bb331679710e34b83a8ccb6bb3ace6b972db87 SHA256 bd8f2bf4558a6d73985bff561bcfdb9d009f2e5c4f6fa9ab124ba446f719e067 -MISC ChangeLog 56002 RMD160 3e428843c1eca90b12716cfa2f9bcce50abd2dc5 SHA1 78749e4a660e19f99f506e3e990b452a5204e031 SHA256 760374cbbcde1a6fe2b0c0c6301ed082dff1e54b7017c60add43088fbb4aaaf1 +MISC ChangeLog 56328 RMD160 c8da8bf181d0850db703b869a2421c7ba9945adf SHA1 bdf1f7ec384a49e992d29261b914b2bd51e2e787 SHA256 8d238c6e1c23aca78f36e98ce3e6ad80b7805d9fb48d5241be176d0a11e49eea MISC metadata.xml 698 RMD160 8c3577ffbf64da24c47d181ef24f8f7e9e09a224 SHA1 92579ce4870e7bbee4bf596bb466b3f9ce587157 SHA256 8f18f677d1d437d3033b367e8a7514b745a762d518af7a3afdc44e1ddbf2b31e ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.14 (GNU/Linux) - -iEYEARECAAYFAku1D/sACgkQOypDUo0oQOq26wCfX0DQWcAxDIrhEXoV5zzpGuRD -0wMAnjNRVT14uVKj9HxP2pWvX/Je6o8y -=tEBQ ------END PGP SIGNATURE----- diff --git a/app-crypt/gnupg/gnupg-1.4.10-r1.ebuild b/app-crypt/gnupg/gnupg-1.4.10-r1.ebuild new file mode 100644 index 000000000000..e9d3ed93d3be --- /dev/null +++ b/app-crypt/gnupg/gnupg-1.4.10-r1.ebuild @@ -0,0 +1,171 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-1.4.10-r1.ebuild,v 1.1 2010/04/02 22:38:22 robbat2 Exp $ + +EAPI="3" + +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 + !bindist? ( + idea? ( mirror://gentoo/idea.c.gz ) + )" +# 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 bindist curl idea ldap nls readline selinux smartcard static usb zlib linguas_ru" +#IUSE="bzip2 bindist curl ecc idea 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-gnupg ) + nls? ( virtual/libintl )" + +DEPEND="${COMMON_DEPEND} + dev-lang/perl + nls? ( sys-devel/gettext )" + +S="${WORKDIR}/${MY_P}" + +src_prepare() { + if use idea; then + if use bindist; then + einfo "Skipping IDEA support to comply with binary distribution (bug #148907)." + else + ewarn "Please read http://www.gnupg.org/(en)/faq/why-not-idea.html" + mv "${WORKDIR}"/idea.c "${S}"/cipher/idea.c || \ + ewarn "failed to insert IDEA module" + fi + fi + +# 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 + sed -i -e 's:if PIC:ifdef __PIC__:' mpi/sparc32v8/mpih-mul{1,2}.S +} + +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) \ + --disable-capabilities \ + $(use_with readline) \ + $(use_with usb libusb /usr) \ + $(use_enable static) \ + --enable-static-rnd=linux \ + --libexecdir="${EPREFIX}/usr/libexec" \ + --enable-noexecstack \ + CC_FOR_BUILD=$(tc-getBUILD_CC) \ + ${myconf} +} + +src_install() { + emake DESTDIR="${D}" install || die "emake install failed" + + # keep the documentation in /usr/share/doc/... + rm -rf "${ED}usr/share/gnupg/FAQ" "${ED}usr/share/gnupg/faq.html" + + dodoc AUTHORS BUGS ChangeLog NEWS PROJECTS README THANKS \ + TODO VERSION doc/{FAQ,HACKING,DETAILS,OpenPGP,faq.raw} + + dohtml doc/faq.html + + 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" + 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 idea; then + elog + elog "IDEA" + elog "you have compiled ${PN} with support for the IDEA algorithm, this code" + elog "is distributed under the GPL in countries where it is permitted to do so" + elog "by law." + elog + elog "Please read http://www.gnupg.org/(en)/faq/why-not-idea.html for more information." + elog + ewarn "If you are in a country where the IDEA algorithm is patented, you are permitted" + ewarn "to use it at no cost for 'non revenue generating data transfer between private" + ewarn "individuals'." + ewarn + ewarn "Countries where the patent applies are listed here" + ewarn "http://en.wikipedia.org/wiki/International_Data_Encryption_Algorithm#Security" + ewarn + ewarn "Further information and other licenses are availble from http://www.mediacrypt.com/" + ewarn + fi +# 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/app-crypt/gnupg/gnupg-1.4.10.ebuild b/app-crypt/gnupg/gnupg-1.4.10.ebuild index 3a2eb1ee211b..8f2593fd110b 100644 --- a/app-crypt/gnupg/gnupg-1.4.10.ebuild +++ b/app-crypt/gnupg/gnupg-1.4.10.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-1.4.10.ebuild,v 1.9 2010/04/01 21:28:21 abcd Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-1.4.10.ebuild,v 1.10 2010/04/02 22:38:22 robbat2 Exp $ -EAPI="3" +EAPI="2" inherit eutils flag-o-matic toolchain-funcs @@ -21,7 +21,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" IUSE="bzip2 bindist curl idea ldap nls readline selinux smartcard static usb zlib linguas_ru" #IUSE="bzip2 bindist curl ecc idea ldap nls readline selinux smartcard static usb zlib linguas_ru" @@ -91,7 +91,7 @@ src_configure() { use static &&append-ldflags -static econf \ - --docdir="${EPREFIX}/usr/share/doc/${PF}" \ + --docdir="/usr/share/doc/${PF}" \ $(use_enable ldap) \ --enable-mailto \ --enable-hkp \ @@ -107,7 +107,7 @@ src_configure() { $(use_with usb libusb /usr) \ $(use_enable static) \ --enable-static-rnd=linux \ - --libexecdir="${EPREFIX}/usr/libexec" \ + --libexecdir=/usr/libexec \ --enable-noexecstack \ CC_FOR_BUILD=$(tc-getBUILD_CC) \ ${myconf} @@ -117,7 +117,7 @@ src_install() { emake DESTDIR="${D}" install || die "emake install failed" # keep the documentation in /usr/share/doc/... - rm -rf "${ED}usr/share/gnupg/FAQ" "${ED}usr/share/gnupg/faq.html" + rm -rf "${D}/usr/share/gnupg/FAQ" "${D}/usr/share/gnupg/faq.html" dodoc AUTHORS BUGS ChangeLog NEWS PROJECTS README THANKS \ TODO VERSION doc/{FAQ,HACKING,DETAILS,OpenPGP,faq.raw}