Resolve bug #113474 - new 1.4.5-r1 bump no longers pulls in linux-info and thus linux-sources. Also clean up misleading caps comments in 1.9.21-r1.

Package-Manager: portage-2.1.1_rc1-r3

5 files changed, 244 insertions, 27 deletions

diff --git a/app-crypt/gnupg/ChangeLog b/app-crypt/gnupg/ChangeLog
index 28e129e2c5a0..17b46752aa16 100644
--- a/app-crypt/gnupg/ChangeLog
+++ b/app-crypt/gnupg/ChangeLog
@@ -1,6 +1,13 @@
 # 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.228 2006/09/24 09:55:36 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/ChangeLog,v 1.229 2006/09/30 21:04:59 robbat2 Exp $
+
+*gnupg-1.4.5-r1 (30 Sep 2006)
+
+  30 Sep 2006; Robin H. Johnson <robbat2@gentoo.org> +gnupg-1.4.5-r1.ebuild,
+  gnupg-1.9.21-r1.ebuild:
+  Resolve bug #113474 - new 1.4.5-r1 bump no longers pulls in linux-info and
+  thus linux-sources. Also clean up misleading caps comments in 1.9.21-r1.
 
   24 Sep 2006; Daniel Black <dragonheart@gentoo.org> gnupg-1.9.21-r1.ebuild:
   more improvements as per bug #147361 thanks to Alon
diff --git a/app-crypt/gnupg/Manifest b/app-crypt/gnupg/Manifest
index a73eee91aeee..d4136f636b22 100644
--- a/app-crypt/gnupg/Manifest
+++ b/app-crypt/gnupg/Manifest
@@ -77,6 +77,10 @@ EBUILD gnupg-1.4.4.ebuild 6674 RMD160 6368ca01586daa272fbb8695d417d77cbe5957a3 S
 MD5 5268693d358db789b9486d21f71727d6 gnupg-1.4.4.ebuild 6674
 RMD160 6368ca01586daa272fbb8695d417d77cbe5957a3 gnupg-1.4.4.ebuild 6674
 SHA256 c4901ef7d368055d314fdcb50ffdcba8739f1eaaaeaf5d00a53ec03884353585 gnupg-1.4.4.ebuild 6674
+EBUILD gnupg-1.4.5-r1.ebuild 6016 RMD160 8871e9bd8bf5cb92d6a5e7c98d3a99e6f284d806 SHA1 c2d882aae44204ada90de65489ac7ed8dbcfdf2e SHA256 db1e6b839b8e54dfb07f99c2168b063fedfee9e8e4ffad06e3218a2a0e6d7659
+MD5 313453eb0d2b04d8c164a1cba439a90f gnupg-1.4.5-r1.ebuild 6016
+RMD160 8871e9bd8bf5cb92d6a5e7c98d3a99e6f284d806 gnupg-1.4.5-r1.ebuild 6016
+SHA256 db1e6b839b8e54dfb07f99c2168b063fedfee9e8e4ffad06e3218a2a0e6d7659 gnupg-1.4.5-r1.ebuild 6016
 EBUILD gnupg-1.4.5.ebuild 6597 RMD160 0b6552a883936b63b4822301b3753a0331d3f319 SHA1 aa4335266f2e6e879790fcbb4cf8d7bc2e0280c0 SHA256 cf1bf5cba2549ff3adeff03fba484c8c4f92a6c9c0c85874ead6a6eef6b5c2bc
 MD5 73e045753333164a4d29d6a4808c2aa4 gnupg-1.4.5.ebuild 6597
 RMD160 0b6552a883936b63b4822301b3753a0331d3f319 gnupg-1.4.5.ebuild 6597
@@ -85,18 +89,18 @@ EBUILD gnupg-1.9.20-r3.ebuild 2792 RMD160 4bc5f813aa792d3abf5b693e5deeaa062c4dfc
 MD5 ecba452a5ba0921435c01c67d37bc6c8 gnupg-1.9.20-r3.ebuild 2792
 RMD160 4bc5f813aa792d3abf5b693e5deeaa062c4dfc54 gnupg-1.9.20-r3.ebuild 2792
 SHA256 737db0e5723f7fa2ea3391661398f54a690bccfff3ea27b091a1e5d6f47c0f78 gnupg-1.9.20-r3.ebuild 2792
-EBUILD gnupg-1.9.21-r1.ebuild 2923 RMD160 79afd127150a48f071a02ab5fa150808cf82d37a SHA1 4cad41d2db0bb17b232afcec3e1be569de270b70 SHA256 59304054db58fa5d8a74d3a3770a34903585cc1ff448dc9c527a24b19b5b7f7f
-MD5 27fcdfe7dbcbeddc59242c20cfc018c2 gnupg-1.9.21-r1.ebuild 2923
-RMD160 79afd127150a48f071a02ab5fa150808cf82d37a gnupg-1.9.21-r1.ebuild 2923
-SHA256 59304054db58fa5d8a74d3a3770a34903585cc1ff448dc9c527a24b19b5b7f7f gnupg-1.9.21-r1.ebuild 2923
+EBUILD gnupg-1.9.21-r1.ebuild 2575 RMD160 871a195cf9dc0816902e4ae30693feb1be33b834 SHA1 a9b2044db95e99fb47be32ea420c4531e5858265 SHA256 28214720f540423dd975c5177dcf702650778b8a3b565ff72c57393a6addd480
+MD5 02e8f024013f3b73766191bc6b380dbc gnupg-1.9.21-r1.ebuild 2575
+RMD160 871a195cf9dc0816902e4ae30693feb1be33b834 gnupg-1.9.21-r1.ebuild 2575
+SHA256 28214720f540423dd975c5177dcf702650778b8a3b565ff72c57393a6addd480 gnupg-1.9.21-r1.ebuild 2575
 EBUILD gnupg-1.9.21.ebuild 3059 RMD160 7a3e028c5a71eaf6f3dcbf46bcbeafa206fdda39 SHA1 20f39ad1b9cabbe5a2ac19d469a0843072658cff SHA256 00ff03d5e6a754b16638f5d22bc7e954e26699ae4d206d9cc302a355431e1418
 MD5 c32f4a4200c4b61c404fc4cc332df83f gnupg-1.9.21.ebuild 3059
 RMD160 7a3e028c5a71eaf6f3dcbf46bcbeafa206fdda39 gnupg-1.9.21.ebuild 3059
 SHA256 00ff03d5e6a754b16638f5d22bc7e954e26699ae4d206d9cc302a355431e1418 gnupg-1.9.21.ebuild 3059
-MISC ChangeLog 35926 RMD160 beffd65ee49d5822482dbd38ca48bbad6198d2ba SHA1 afed99e48656ac5160d41e93d5a510b23718d0d2 SHA256 c4458c85f10dc0ccf2a4ddb33cd8116123a54718b8befc8c9e846fbbfb4aebb0
-MD5 221d2004ffaa0b15e29704db0f1cc8b0 ChangeLog 35926
-RMD160 beffd65ee49d5822482dbd38ca48bbad6198d2ba ChangeLog 35926
-SHA256 c4458c85f10dc0ccf2a4ddb33cd8116123a54718b8befc8c9e846fbbfb4aebb0 ChangeLog 35926
+MISC ChangeLog 36209 RMD160 e1953872ecb88350e36b8996dbefbc5ab38bddb2 SHA1 e583b0319dca8dab86750e168053b7c3d44d8007 SHA256 88cc828e4f0fddf711a0b17cbebed1c59faadb082920845c0590bc90333057eb
+MD5 646e984abba055e5f7bc3ea32391ad4f ChangeLog 36209
+RMD160 e1953872ecb88350e36b8996dbefbc5ab38bddb2 ChangeLog 36209
+SHA256 88cc828e4f0fddf711a0b17cbebed1c59faadb082920845c0590bc90333057eb ChangeLog 36209
 MISC metadata.xml 481 RMD160 d5c4e2fc7b94966795cc4c039d850302d8552448 SHA1 13cb529b83ba9feaad91f1d033d6c33d1eafbd25 SHA256 d88eadc2c75a18f57dcd38f20aa72ee7c79504f62bcab3f7dea60651ccd4b672
 MD5 b507ee36c7487372de42cc9dab034370 metadata.xml 481
 RMD160 d5c4e2fc7b94966795cc4c039d850302d8552448 metadata.xml 481
@@ -110,6 +114,9 @@ SHA256 5122660ca270163601e13f1bef65ae7c02c413f4540aff26ff4931974c3fad27 files/di
 MD5 8f18ae380f06f5dd90d7992982200d25 files/digest-gnupg-1.4.5 708
 RMD160 bd8c14fcd3786d851d9a77b0a9aec639de6a5c23 files/digest-gnupg-1.4.5 708
 SHA256 d8f3903fe059e480b38d1602fd9efa409019129dfc9362acfe3e363375b9f90d files/digest-gnupg-1.4.5 708
+MD5 8f18ae380f06f5dd90d7992982200d25 files/digest-gnupg-1.4.5-r1 708
+RMD160 bd8c14fcd3786d851d9a77b0a9aec639de6a5c23 files/digest-gnupg-1.4.5-r1 708
+SHA256 d8f3903fe059e480b38d1602fd9efa409019129dfc9362acfe3e363375b9f90d files/digest-gnupg-1.4.5-r1 708
 MD5 b5311626934af7a07b0760601cc3db45 files/digest-gnupg-1.9.20-r3 244
 RMD160 2cee39773952b56927ea28d0eb108c517493c002 files/digest-gnupg-1.9.20-r3 244
 SHA256 a3f14c72acb1d4aa2102ab2ef7d02f12ae0451eef8528fed05a59b07e733d3d0 files/digest-gnupg-1.9.20-r3 244
@@ -120,9 +127,10 @@ MD5 3a094d262f7870e0d3148bf61e353a31 files/digest-gnupg-1.9.21-r1 244
 RMD160 85a121d64713e41d718ffaafc308776d580c0b9f files/digest-gnupg-1.9.21-r1 244
 SHA256 c07e9079f783809952704276a2cc8cded8ee07fa0a1f803d3cd5257fc9e62f76 files/digest-gnupg-1.9.21-r1 244
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5-ecc0.1.6 (GNU/Linux)
+Version: GnuPG v1.4.5 (GNU/Linux)
+Comment: Robbat2 @ Orbis-Terrarum Networks
 
-iD8DBQFFFlk2mdTrptrqvGERAl14AJ9dwQ/w0LJlbQwdeqlW8PVLcQkQZgCdEane
-xBwLerWuANhQof+FY8rOk00=
-=7Eeq
+iD8DBQFFHtwUPgYlrpyh79cRAqqUAKCbykB3bGbdd5zb7OvfFjwFHjjTmACeKLs+
+eiP18bjRdtU/JB+AuUwbYYU=
+=3KFK
 -----END PGP SIGNATURE-----
diff --git a/app-crypt/gnupg/files/digest-gnupg-1.4.5-r1 b/app-crypt/gnupg/files/digest-gnupg-1.4.5-r1
new file mode 100644
index 000000000000..78a17a5c85fc
--- /dev/null
+++ b/app-crypt/gnupg/files/digest-gnupg-1.4.5-r1
@@ -0,0 +1,9 @@
+MD5 0be9a69c1ff363e4ad671860a2b9c14f gnupg-1.4.4-ecc0.1.6.diff.bz2 16931
+RMD160 30af14d212c50c56d7f170b6697a9148d086bb5a gnupg-1.4.4-ecc0.1.6.diff.bz2 16931
+SHA256 023e1da2837a06e9c92785184f31c6ecb31c0a328446100ab2c6dcf819c1f5be gnupg-1.4.4-ecc0.1.6.diff.bz2 16931
+MD5 811525965b4c0987e6418a7729a6444d gnupg-1.4.5.tar.bz2 3089617
+RMD160 f27447b3aec1423ac10c3a5b4745ea3b13c5a5e5 gnupg-1.4.5.tar.bz2 3089617
+SHA256 f30a2679ed6bed71b4af6919cd9b963c896fca64e42eeb0536788cb41b2e1805 gnupg-1.4.5.tar.bz2 3089617
+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.5-r1.ebuild b/app-crypt/gnupg/gnupg-1.4.5-r1.ebuild
new file mode 100644
index 000000000000..a76e14468b57
--- /dev/null
+++ b/app-crypt/gnupg/gnupg-1.4.5-r1.ebuild
@@ -0,0 +1,203 @@
+# 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-1.4.5-r1.ebuild,v 1.1 2006/09/30 21:04:59 robbat2 Exp $
+
+inherit eutils flag-o-matic
+
+ECCVER=0.1.6
+ECCVER_GNUPG=1.4.4
+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
+	idea? ( ftp://ftp.gnupg.dk/pub/contrib-dk/idea.c.gz )
+	ecc? ( http://alumnes.eps.udl.es/%7Ed4372211/src/${PN}-${ECCVER_GNUPG}-ecc${ECCVER}.diff.bz2 )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="bzip2 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}
+
+
+	# Jari's patch to boost iterated key setup by factor of 128
+	EPATCH_OPTS="-p1 -d ${S}" epatch "${FILESDIR}"/${PN}-1.4.3-jari.patch
+
+	if use idea; then
+		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
+
+	if use ecc; then
+		epatch "${FILESDIR}"/${P}-ecc-helper.patch
+		EPATCH_OPTS="-p1 -d ${S}" epatch ${PN}-${ECCVER_GNUPG}-ecc${ECCVER}.diff
+	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}"/${PN}-1.4.3-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
+
+	# Remove collissions
+	if use ppc-macos; then
+		rm ${D}/usr/lib/charset.alias ${D}/usr/share/locale/locale.alias
+	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 idea; then
+		einfo "-----------------------------------------------------------------------------------"
+		einfo "IDEA"
+		ewarn "you have compiled ${PN} with support for the IDEA algorithm, this code"
+		ewarn "is distributed under the GPL in countries where it is permitted to do so"
+		ewarn "by law."
+		einfo
+		einfo "Please read http://www.gnupg.org/(en)/faq/why-not-idea.html for more information."
+		einfo
+		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'."
+		einfo
+		einfo "Countries where the patent applies are listed here"
+		einfo "http://www.mediacrypt.com/_contents/10_idea/101030_ea_pi.asp"
+		einfo
+		einfo "Further information and other licenses are availble from http://www.mediacrypt.com/"
+		einfo "-----------------------------------------------------------------------------------"
+	fi
+	if use ecc; then
+		einfo
+		ewarn "The elliptical curves patch is experimental"
+		einfo "Further info available at http://alumnes.eps.udl.es/%7Ed4372211/index.en.html"
+	fi
+	einfo
+	einfo "See http://www.gentoo.org/doc/en/gnupg-user.xml for documentation on gnupg"
+	einfo
+}
diff --git a/app-crypt/gnupg/gnupg-1.9.21-r1.ebuild b/app-crypt/gnupg/gnupg-1.9.21-r1.ebuild
index a5fb1c4546a4..9c4c68470ff4 100644
--- a/app-crypt/gnupg/gnupg-1.9.21-r1.ebuild
+++ b/app-crypt/gnupg/gnupg-1.9.21-r1.ebuild
@@ -1,6 +1,6 @@
 # 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-1.9.21-r1.ebuild,v 1.2 2006/09/24 09:55:36 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-1.9.21-r1.ebuild,v 1.3 2006/09/30 21:04:59 robbat2 Exp $
 
 inherit eutils flag-o-matic autotools
 
@@ -12,7 +12,6 @@ LICENSE="GPL-2"
 SLOT="1.9"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE="X gpg2-experimental ldap nls openct pcsc-lite smartcard selinux"
-#IUSE+=caps
 
 COMMON_DEPEND="
 	virtual/libc
@@ -26,7 +25,6 @@ COMMON_DEPEND="
 	ldap? ( net-nds/openldap )"
 # Needs sh and arm to be keyworded on pinentry
 #	X? ( app-crypt/pinentry )
-#	caps? ( sys-libs/libcap )"
 
 DEPEND="${COMMON_DEPEND}
 	nls? ( sys-devel/gettext )"
@@ -68,10 +66,8 @@ src_compile() {
 		myconf="${myconf} --disable-photo-viewers"
 	fi
 
-	#use caps || append-ldflags $(bindnow-flags)
 	append-ldflags $(bindnow-flags)
 
-	#$(use_with caps capabilities) \
 	econf \
 		--enable-agent \
 		--enable-symcryptrun \
@@ -90,18 +86,12 @@ src_install() {
 	make DESTDIR="${D}" install || die
 	dodoc ChangeLog NEWS README THANKS TODO VERSION
 
-	#if ! use caps; then
-		use gpg2-experimental && fperms u+s,go-r /usr/bin/gpg2
-		fperms u+s,go-r /usr/bin/gpg-agent
-	#fi
+	# neither of these should really be needed, please check
+	use gpg2-experimental && fperms u+s,go-r /usr/bin/gpg2
+	fperms u+s,go-r /usr/bin/gpg-agent
 }
 
 pkg_postinst() {
-	#if ! use caps; then
-	#	einfo "gpg is installed suid root to make use of protected memory space"
-	#	einfo "This is needed in order to have a secure place to store your"
-	#	einfo "passphrases, etc. at runtime but may make some sysadmins nervous."
-	#fi
 	einfo
 	einfo "See http://www.gentoo.org/doc/en/gnupg-user.xml for documentation on gnupg"
 	einfo