ecc version bump

Package-Manager: portage-2.1.2-r9

4 files changed, 230 insertions, 5 deletions

diff --git a/app-crypt/gnupg/ChangeLog b/app-crypt/gnupg/ChangeLog
index a467e89e23b8..8a6507ac1b8f 100644
--- a/app-crypt/gnupg/ChangeLog
+++ b/app-crypt/gnupg/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-crypt/gnupg
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/ChangeLog,v 1.275 2007/02/08 15:29:59 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/ChangeLog,v 1.276 2007/02/09 18:29:21 alonbl Exp $
+
+*gnupg-1.4.6-r1 (09 Feb 2007)
+
+  09 Feb 2007; Alon Bar-Lev <alonbl@gentoo.org> +gnupg-1.4.6-r1.ebuild:
+  ecc version bump
 
   08 Feb 2007; Alon Bar-Lev <alonbl@gentoo.org> gnupg-2.0.2.ebuild:
   Added curl dependency, bug#165922, thanks to Harald van Dijk
diff --git a/app-crypt/gnupg/Manifest b/app-crypt/gnupg/Manifest
index b84b52278fc8..f24ce1695a66 100644
--- a/app-crypt/gnupg/Manifest
+++ b/app-crypt/gnupg/Manifest
@@ -85,6 +85,7 @@ SHA256 cfac92c65ed1b8efa1927b8194eea62f7e45fadded559028a7072cc0685d29a3 files/gn
 DIST gnupg-1.4.4-ecc0.1.6.diff.bz2 16931 RMD160 30af14d212c50c56d7f170b6697a9148d086bb5a SHA1 15831b5d4cbccdca3c005199d510700ee862fbc5 SHA256 023e1da2837a06e9c92785184f31c6ecb31c0a328446100ab2c6dcf819c1f5be
 DIST gnupg-1.4.5-ecc0.1.6.diff.bz2 16926 RMD160 1f80d5137f47e48bda96dd59506c452a3833e4e4 SHA1 be330df0b9907a151cd2b97659b93e4fa21fe491 SHA256 3263d8bd2bea6807445f9592b705ae4fca6bb89e8483613a53d553947424c51a
 DIST gnupg-1.4.5.tar.bz2 3089617 RMD160 f27447b3aec1423ac10c3a5b4745ea3b13c5a5e5 SHA1 553fefe0da5a91108dd9468e381faf9487754f9a SHA256 f30a2679ed6bed71b4af6919cd9b963c896fca64e42eeb0536788cb41b2e1805
+DIST gnupg-1.4.6-ecc0.1.6.diff.bz2 17005 RMD160 6a30606386ad9848362f696e5f42c0614d2e5731 SHA1 cc18a613adc3ab382bda93e9a9b474606fd171ad SHA256 cbe2e1a987f7ef2339eb1cd0380708718027fc81da242c7a7c83d32287a83d35
 DIST gnupg-1.4.6.tar.bz2 3149454 RMD160 c7e7409358aaaaf7f3bb202aa86f6121749b97e3 SHA1 9cbbef5c94f793867ff3ae4941816962311a0563 SHA256 fd5a72418e55669b88076c2a6f11c3a59bf92a2071008567e65ae12b7372008e
 DIST gnupg-1.9.21.tar.bz2 1901908 RMD160 f522125f30a29fd2bcacca5894958242946de430 SHA1 f7c9dea1049dfd3da6d66838005def26898d06e2 SHA256 7dfaa7867427dd44ac3277026dec3602626b657d95952b7a5bdeb9e567b5d34c
 DIST gnupg-1.9.22.tar.bz2 1908546 RMD160 43b3e8a17d5e116f5fa0c34bc3beaf68250ec3c3 SHA1 10b2a5c256598d9ed25c84d55ea111710b3f8906 SHA256 2e4472e00c14c881ee1f93deddbe91d3c520311839f30d336ca48a51939e45cf
@@ -97,6 +98,10 @@ EBUILD gnupg-1.4.5-r2.ebuild 5989 RMD160 bd31e4304b6b8746dabc17a5c721f991da6c4eb
 MD5 935b15b17f1c232e742d0f5bd3c8f5cf gnupg-1.4.5-r2.ebuild 5989
 RMD160 bd31e4304b6b8746dabc17a5c721f991da6c4ebc gnupg-1.4.5-r2.ebuild 5989
 SHA256 a67740ddceb8070e22228c60a781fb48329ab3eb20dc4acb179124929013f9fe gnupg-1.4.5-r2.ebuild 5989
+EBUILD gnupg-1.4.6-r1.ebuild 5811 RMD160 5940117a9b6a5255d04e2d402cd2fd133814d09f SHA1 fd3c1f62eb054a160bbfb1b2ffcf92caced69be1 SHA256 3d491327431a328567a9fe4c9d6c62f95c80f7e87b46a7d04b0709c4d4e390bd
+MD5 6bf09f2a6743efbb335ad1485db6c26e gnupg-1.4.6-r1.ebuild 5811
+RMD160 5940117a9b6a5255d04e2d402cd2fd133814d09f gnupg-1.4.6-r1.ebuild 5811
+SHA256 3d491327431a328567a9fe4c9d6c62f95c80f7e87b46a7d04b0709c4d4e390bd gnupg-1.4.6-r1.ebuild 5811
 EBUILD gnupg-1.4.6.ebuild 5847 RMD160 e5662231ddc22f1fad985a29d92926782cef23d4 SHA1 c53d21d82d7f166478302b96cfc9d01c105c6e39 SHA256 1930b5a9bf1f11390198e33c22c44aa7f033c4fa2c22fee730ea8f30d4279320
 MD5 b4b626250ccaebda93e37cec4e8249f9 gnupg-1.4.6.ebuild 5847
 RMD160 e5662231ddc22f1fad985a29d92926782cef23d4 gnupg-1.4.6.ebuild 5847
@@ -141,10 +146,10 @@ EBUILD gnupg-2.0.2.ebuild 2163 RMD160 66c9a377942a247ff2fb5b4c46e09c62c3de6fd7 S
 MD5 920aabb2fa6a43449bf3593e5b4fc2ca gnupg-2.0.2.ebuild 2163
 RMD160 66c9a377942a247ff2fb5b4c46e09c62c3de6fd7 gnupg-2.0.2.ebuild 2163
 SHA256 1b7f1cc606275e0569d7fd61dd167109cb6a42b587b078cc109ff3e488484dd1 gnupg-2.0.2.ebuild 2163
-MISC ChangeLog 42718 RMD160 6d30d78fb4419b28da12ef2dc55e235da35b774c SHA1 4ea8fb373e2a84ee6a26ce1c87c8272927038439 SHA256 6771e513c2bcca08be8601fba20ac95ea2c174dcd453bb1b953d05373ae46bcf
-MD5 5ae14d2d01a42beb65529400003b828d ChangeLog 42718
-RMD160 6d30d78fb4419b28da12ef2dc55e235da35b774c ChangeLog 42718
-SHA256 6771e513c2bcca08be8601fba20ac95ea2c174dcd453bb1b953d05373ae46bcf ChangeLog 42718
+MISC ChangeLog 42841 RMD160 3dd143b27cd0bb2246e99f045176a1ad0b4e0140 SHA1 9a75adf6ee9e6ae77b0c1f5e0dce09938da74571 SHA256 2755c5e88c3ed19c58a16469ca6fd68b25bcd014da1220d910b133eb08afec65
+MD5 3d3d75ce73ab925aba90c761fa6c90b1 ChangeLog 42841
+RMD160 3dd143b27cd0bb2246e99f045176a1ad0b4e0140 ChangeLog 42841
+SHA256 2755c5e88c3ed19c58a16469ca6fd68b25bcd014da1220d910b133eb08afec65 ChangeLog 42841
 MISC metadata.xml 481 RMD160 d5c4e2fc7b94966795cc4c039d850302d8552448 SHA1 13cb529b83ba9feaad91f1d033d6c33d1eafbd25 SHA256 d88eadc2c75a18f57dcd38f20aa72ee7c79504f62bcab3f7dea60651ccd4b672
 MD5 b507ee36c7487372de42cc9dab034370 metadata.xml 481
 RMD160 d5c4e2fc7b94966795cc4c039d850302d8552448 metadata.xml 481
@@ -155,6 +160,9 @@ SHA256 d8f3903fe059e480b38d1602fd9efa409019129dfc9362acfe3e363375b9f90d files/di
 MD5 5c3fa7ed67452d1f8d07729de1dbf3d3 files/digest-gnupg-1.4.6 708
 RMD160 851f04c7257989afb7d059f3a8eed38ec7b89487 files/digest-gnupg-1.4.6 708
 SHA256 923e5f60f1905c9a960016e5cfcc8e6979710c867e40c5b0fb2f22adf3931fad files/digest-gnupg-1.4.6 708
+MD5 643b85eb7479b7eb4418c4e793ac67a0 files/digest-gnupg-1.4.6-r1 708
+RMD160 a7b2a09453f4767fea3ad1b59acd79baa3f4efb4 files/digest-gnupg-1.4.6-r1 708
+SHA256 39042a8cc3e1302c8fe61fd479aef940a9b014797305450f5119f3780b68df22 files/digest-gnupg-1.4.6-r1 708
 MD5 3a094d262f7870e0d3148bf61e353a31 files/digest-gnupg-1.9.21 244
 RMD160 85a121d64713e41d718ffaafc308776d580c0b9f files/digest-gnupg-1.9.21 244
 SHA256 c07e9079f783809952704276a2cc8cded8ee07fa0a1f803d3cd5257fc9e62f76 files/digest-gnupg-1.9.21 244
diff --git a/app-crypt/gnupg/files/digest-gnupg-1.4.6-r1 b/app-crypt/gnupg/files/digest-gnupg-1.4.6-r1
new file mode 100644
index 000000000000..e40ed3c5ffa3
--- /dev/null
+++ b/app-crypt/gnupg/files/digest-gnupg-1.4.6-r1
@@ -0,0 +1,9 @@
+MD5 28fd713c065dccc68c55a7955e6ffe79 gnupg-1.4.6-ecc0.1.6.diff.bz2 17005
+RMD160 6a30606386ad9848362f696e5f42c0614d2e5731 gnupg-1.4.6-ecc0.1.6.diff.bz2 17005
+SHA256 cbe2e1a987f7ef2339eb1cd0380708718027fc81da242c7a7c83d32287a83d35 gnupg-1.4.6-ecc0.1.6.diff.bz2 17005
+MD5 ec8dc6df1bd83c1d7e1a1ea10653f9f4 gnupg-1.4.6.tar.bz2 3149454
+RMD160 c7e7409358aaaaf7f3bb202aa86f6121749b97e3 gnupg-1.4.6.tar.bz2 3149454
+SHA256 fd5a72418e55669b88076c2a6f11c3a59bf92a2071008567e65ae12b7372008e gnupg-1.4.6.tar.bz2 3149454
+MD5 9dc3bc086824a8c7a331f35e09a3e57f idea.c.gz 5216
+RMD160 e35be5a031d10d52341ac5f029d28f811edd908d idea.c.gz 5216
+SHA256 309928da34941dff1d6f6687542ff3d58306d85be9e1a9906bc4f9f8e6011844 idea.c.gz 5216
diff --git a/app-crypt/gnupg/gnupg-1.4.6-r1.ebuild b/app-crypt/gnupg/gnupg-1.4.6-r1.ebuild
new file mode 100644
index 000000000000..8d38d1c00e36
--- /dev/null
+++ b/app-crypt/gnupg/gnupg-1.4.6-r1.ebuild
@@ -0,0 +1,203 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-1.4.6-r1.ebuild,v 1.1 2007/02/09 18:29:21 alonbl Exp $
+
+inherit eutils flag-o-matic
+
+ECCVER="0.1.6"
+ECCVER_GNUPG="1.4.6"
+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? ( ftp://ftp.gnupg.dk/pub/contrib-dk/idea.c.gz )
+		ecc? ( http://www.calcurco.cat/eccGnuPG/src/${PN}-${ECCVER_GNUPG}-ecc${ECCVER}.diff.bz2 )
+		)"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="bzip2 bindist curl ecc idea ldap nls readline selinux smartcard static usb zlib X 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? ( dev-libs/libusb )
+	usb? ( dev-libs/libusb )"
+
+RDEPEND="!static? (
+		${COMMON_DEPEND}
+		X? ( || ( media-gfx/xloadimage media-gfx/xli ) )
+	)
+	selinux? ( sec-policy/selinux-gnupg )
+	nls? ( virtual/libintl )"
+
+DEPEND="${COMMON_DEPEND}
+	dev-lang/perl
+	nls? ( sys-devel/gettext )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+	unpack ${A}
+
+	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
+			EPATCH_OPTS="-p1 -d ${S}" epatch ${PN}-${ECCVER_GNUPG}-ecc${ECCVER}.diff
+		fi
+	fi
+
+	# maketest fix
+	EPATCH_OPTS="-p1 -d ${S}" epatch "${FILESDIR}"/${PN}-1.4.3-selftest.patch
+
+	# install RU man page in right location
+	EPATCH_OPTS="-p1 -d ${S}" epatch "${FILESDIR}"/${P}-badruman.patch
+
+	# keyserver fix
+	EPATCH_OPTS="-p1 -d ${S}"  epatch "${FILESDIR}"/${PN}-1.4.3-keyserver.patch
+
+	cd "${S}"
+	# 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_compile() {
+	# 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
+
+	append-ldflags $(bindnow-flags)
+
+	# fix compile problem on ppc64
+	use ppc64 && myconf="${myconf} --disable-asm"
+
+	econf \
+		$(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) \
+		$(use_enable X photo-viewers) \
+		--enable-static-rnd=linux \
+		--libexecdir=/usr/libexec \
+		--enable-noexecstack \
+		${myconf} || die
+	# this is because it will run some tests directly
+	gnupg_fixcheckperms
+	emake || die
+}
+
+src_install() {
+	gnupg_fixcheckperms
+	make DESTDIR="${D}" install || die
+
+	# keep the documentation in /usr/share/doc/...
+	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,ChangeLog,OpenPGP,faq.raw}
+
+	docinto sgml
+	dodoc doc/*.sgml
+
+	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
+}
+
+gnupg_fixcheckperms() {
+	# GnuPG does weird things for testing that it build correctly
+	# as we as for the additional tests. It WILL fail with perms 770 :-(.
+	# See bug #80044
+	if has userpriv ${FEATURES}; then
+		einfo "Fixing permissions in check directory"
+		chown -R portage:portage ${S}/checks
+		chmod -R ugo+rw ${S}/checks
+		chmod ugo+rw ${S}/checks
+	fi
+}
+
+src_test() {
+	gnupg_fixcheckperms
+	einfo "Running tests"
+	emake check
+	ret=$?
+	if [ $ret -ne 0 ]; then
+		die "Some tests failed! Please report to the Gentoo Bugzilla"
+	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://www.mediacrypt.com/_contents/10_idea/101030_ea_pi.asp"
+		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
+}