Version bump

Package-Manager: portage-2.1.4.4

5 files changed, 191 insertions, 36 deletions

diff --git a/app-crypt/gnupg/ChangeLog b/app-crypt/gnupg/ChangeLog
index defd3466b20c..826ec16d0c68 100644
--- a/app-crypt/gnupg/ChangeLog
+++ b/app-crypt/gnupg/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-crypt/gnupg
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/ChangeLog,v 1.317 2008/03/07 07:33:20 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/ChangeLog,v 1.318 2008/03/27 06:06:04 alonbl Exp $
+
+*gnupg-2.0.9 (27 Mar 2008)
+*gnupg-1.4.9 (27 Mar 2008)
+
+  27 Mar 2008; Alon Bar-Lev <alonbl@gentoo.org>
+  -files/gnupg-2.0.8-qualified.patch, +gnupg-1.4.9.ebuild,
+  -gnupg-2.0.8-r2.ebuild, +gnupg-2.0.9.ebuild:
+  Version bump
 
   07 Mar 2008; Alon Bar-Lev <alonbl@gentoo.org> gnupg-2.0.7-r1.ebuild,
   gnupg-2.0.8-r2.ebuild:
diff --git a/app-crypt/gnupg/Manifest b/app-crypt/gnupg/Manifest
index 72218e450d28..d4b8238da763 100644
--- a/app-crypt/gnupg/Manifest
+++ b/app-crypt/gnupg/Manifest
@@ -2,17 +2,18 @@ AUX gnupg-1.4.3-keyserver.patch 455 RMD160 c7eec6bd5ea73cde4d084cffcc1623bea775a
 AUX gnupg-1.4.3-selftest.patch 1324 RMD160 0a8e6d50fde48a2e795907ca56e1e95261919f43 SHA1 0003ffe4d032ace008e6d6ebca364327225a097f SHA256 0ca949d63f7dbb882c0119344c47bfaa99132bb4c7f253194eea06c7472afa54
 AUX gnupg-1.4.6-badruman.patch 534 RMD160 7789da4ceafcc9f1bec778b9b7986359f1513178 SHA1 8423f2fb9e41fdfbcb4b1eae2c5a99b0c9e045bb SHA256 3fef6d7306823db7a8912f4454b05aef8cff035e36065097d9406f57098018e5
 AUX gnupg-2.0.4-idea.patch 906 RMD160 df2f628ee03880ff5b0916185cffe0b28316d08b SHA1 0f56a3d656d8ec3227c1b597bee010b8dbe1d7cd SHA256 89e5af25bf7ae5b1147acb3da41520e2dcad975cda93ab625107626c85651976
-AUX gnupg-2.0.8-qualified.patch 1152 RMD160 48706e52c726c80aacc40472b9405e3ff9758333 SHA1 abfad7c7aba25d46823ea98a1c9702c7b37293c0 SHA256 bd6fe6d341385f3693384cbce1374908607b569fd2e70986bcc5fd0b4636e448
 DIST gnupg-1.4.7-ecc0.1.6.diff.bz2 17083 RMD160 df89fc93d5a9836bb12311d66f0ebdab31799fd5 SHA1 ab9e902539a1be746d3c25d969a4ae044a74f44c SHA256 568c1eb297942157250dd11c9a8171566535c49361ade00ab1c95191821ae1fe
 DIST gnupg-1.4.7.tar.bz2 3200642 RMD160 630344c99834cf9adcf806d55e6f609a1e50bd8b SHA1 22149105845c79068771837c8deb7d5ba0854927 SHA256 69d18b7d193f62ca27ed4febcb4c9044aa0c95305d3258fe902e2fae5fc6468d
 DIST gnupg-1.4.8-ecc0.2.0.diff.bz2 17878 RMD160 532e43cfea00187c72d7d2784decee31b105a5a5 SHA1 822602c76c69160463d7ae3378e8da1b42e6efb2 SHA256 e03a180a95bb3c4c72f4ca97d1038c390b59da1f4d12d97f91ef7932dd01a5c1
 DIST gnupg-1.4.8.tar.bz2 3320100 RMD160 75228c02ea1999494232cb2eb2107951d1602c4d SHA1 4b63267358e5c70f05b48e27d6877bad2636cabd SHA256 119d2574deafe8c2d4444e53051ebad215d375f94f29c520ff891275f14e006c
+DIST gnupg-1.4.9.tar.bz2 3328743 RMD160 21274c6638bb1bc1983a9b5bccfa1ad9cf708edc SHA1 826f4bef1effce61c3799c8f7d3cc8313b340b55 SHA256 3ca5abcd93eeed4ed832995463db3308bfa552a072ef86fab4940e195fab06dd
 DIST gnupg-2.0.7.tar.bz2 3609953 RMD160 70bd8dbf52fe2ccc9d89791c374a5507f6a61ee8 SHA1 f7d9ae7695bd9b849475b482bb7b027ec6fadbae SHA256 3117ce4a477747138431fb2ddf2572cce9e4824bae359a6007e60e6d293c376b
-DIST gnupg-2.0.8.tar.bz2 3654523 RMD160 bfd8cfb48ff74834c80d09d040921e005af9550c SHA1 baeb7962f9d3d4628ada78036d1f5d4480aaa2d9 SHA256 16f310afe4740a26475c7273f585861a4bdefecbde27c214cc30c0db45d26913
+DIST gnupg-2.0.9.tar.bz2 3718925 RMD160 175f8d4e83dd6ae8e186b7c09bb8bdbb001a5799 SHA1 959bdb934e3a72d256bfbd0122d996a73adb5d1f SHA256 2dc124908a1dfa3b79d2b0a82aa1a31817128feb14e84a26226beaab13179686
 DIST idea.c.gz 5216 RMD160 e35be5a031d10d52341ac5f029d28f811edd908d SHA1 82fded4ec31b97b3b2dd22741880b67cfee40f84 SHA256 309928da34941dff1d6f6687542ff3d58306d85be9e1a9906bc4f9f8e6011844
 EBUILD gnupg-1.4.7-r1.ebuild 6027 RMD160 e6a9a149dcc2b53f958849b3f77b1b97dd21e043 SHA1 1a6b718d2d95ea360cdba36bf3998ee8a3b6e689 SHA256 78d481444677d336a1dacbdee7bf64d2d90f56d157f7a3474f7e4c3df30238c2
 EBUILD gnupg-1.4.8-r1.ebuild 5944 RMD160 208ba9bac568a23a034780549e219aa0d90f6c4a SHA1 e4c8e6c2825dfb1e4f7f9794973246b55a2e28f2 SHA256 eed327fd46c9f7ea7759ac7a7da957974713847c35d174aa10e17b25590d55ef
+EBUILD gnupg-1.4.9.ebuild 5246 RMD160 a5eeba5415ef0c28643cac762d5ac3a107a26f14 SHA1 723f8bc913a42301c4b22d3fd6fa812cc4f4173a SHA256 5b1c2128d1189ba2a1acd123e3966f1b814fcfd4c82b655e02d7bc23df5d48e8
 EBUILD gnupg-2.0.7-r1.ebuild 2330 RMD160 fe1d3dcd11cee64242e3bf8bdef470554dfd2689 SHA1 0b8c7d18de838dc778cba555a5f151945cd77766 SHA256 169911d9345b68349560a51a1a49ec16761890824b333466ac0b5422236b83ce
-EBUILD gnupg-2.0.8-r2.ebuild 2384 RMD160 84c53d4b77b89c0ed0df049c1378351434bce08d SHA1 8e71648d48b8d0150c71c21f0e52ebd1ac5148ca SHA256 f6c8e3f64f336ee0f0d3c36063d2afd60a829d8d7edf32a6feaddc0cdee679c0
-MISC ChangeLog 49124 RMD160 b7c39202e803c7102a3639dfa179aa7a62b5c0c1 SHA1 f31ba5a2c0fd937a6ec2f1122e5e476981391332 SHA256 002fd96a60ec5648523d48caac5b9bd07c42ed2c375237331d174de8d89da67e
+EBUILD gnupg-2.0.9.ebuild 2338 RMD160 ee4f35d3fb8b7c63a005b9ef4dbba624f70ad898 SHA1 d2e9075bdb74e4de74b208f20fa94c99a027e0cc SHA256 8ff292d8663de44dbae2a079a7e0820c382c88f5842c274fa4b1c4a0944adfac
+MISC ChangeLog 49349 RMD160 6bb469f4f6d3d90d29513913b861f45db5689401 SHA1 42a11d4841f8a7c24ac33ada6740062e8bb47a4f SHA256 cdf483fd0c43d256091b9f4a828e9d2d6ab65c2c95b16e12bff2eba727e478cf
 MISC metadata.xml 481 RMD160 d5c4e2fc7b94966795cc4c039d850302d8552448 SHA1 13cb529b83ba9feaad91f1d033d6c33d1eafbd25 SHA256 d88eadc2c75a18f57dcd38f20aa72ee7c79504f62bcab3f7dea60651ccd4b672
diff --git a/app-crypt/gnupg/files/gnupg-2.0.8-qualified.patch b/app-crypt/gnupg/files/gnupg-2.0.8-qualified.patch
deleted file mode 100644
index b79db0c2c9cd..000000000000
--- a/app-crypt/gnupg/files/gnupg-2.0.8-qualified.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -urNp gnupg-2.0.8.org/doc/qualified.txt gnupg-2.0.8/doc/qualified.txt
---- gnupg-2.0.8.org/doc/qualified.txt	2007-12-13 17:13:10.000000000 +0200
-+++ gnupg-2.0.8/doc/qualified.txt	2008-01-15 20:35:11.000000000 +0200
-@@ -193,7 +193,7 @@ E0:BF:1B:91:91:6B:88:E4:F1:15:92:22:CE:3
- #[checked: 2007-12-13 via received ZIP file with qualified signature from 
- #         /CN=Dr. Matthias Stehle/O=Deutscher Sparkassenverlag
- #         /C=DE/SerialNumber=DSV0000000008/SN=Stehle/GN=Matthias Georg]
--C9:2F:E6:50:DB:32:59:E0:CE:65:55:F3:8C:76:E0:B8:A8:FE:A3:CA
-+C9:2F:E6:50:DB:32:59:E0:CE:65:55:F3:8C:76:E0:B8:A8:FE:A3:CA  de
- 
- #           ID: 0x3A7D979B
- #          S/N: 00C4216083F35C54F67B09A80C3C55FE7D
-@@ -208,7 +208,7 @@ C9:2F:E6:50:DB:32:59:E0:CE:65:55:F3:8C:7
- #[checked: 2007-12-13 via received ZIP file with qualified signature from 
- #         /CN=Dr. Matthias Stehle/O=Deutscher Sparkassenverlag
- #         /C=DE/SerialNumber=DSV0000000008/SN=Stehle/GN=Matthias Georg"]
--D5:C7:50:F2:FE:4E:EE:D7:C7:B1:E4:13:7B:FB:54:84:3A:7D:97:9B
-+D5:C7:50:F2:FE:4E:EE:D7:C7:B1:E4:13:7B:FB:54:84:3A:7D:97:9B  de
- 
- 
- #*******************************************
diff --git a/app-crypt/gnupg/gnupg-1.4.9.ebuild b/app-crypt/gnupg/gnupg-1.4.9.ebuild
new file mode 100644
index 000000000000..71d9319128ca
--- /dev/null
+++ b/app-crypt/gnupg/gnupg-1.4.9.ebuild
@@ -0,0 +1,172 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-1.4.9.ebuild,v 1.1 2008/03/27 06:06:04 alonbl Exp $
+
+inherit eutils flag-o-matic
+
+ECCVER="0.2.0"
+ECCVER_GNUPG="1.4.8"
+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? ( ftp://ftp.gnupg.dk/pub/contrib-dk/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"
+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? ( dev-libs/libusb )
+	usb? ( dev-libs/libusb )"
+
+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_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	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
+	epatch "${FILESDIR}"/${PN}-1.4.6-badruman.patch
+
+	# 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
+
+	econf \
+		--docdir="/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=/usr/libexec \
+		--enable-noexecstack \
+		${myconf} || die
+	# this is because it will run some tests directly
+	emake || die
+}
+
+src_install() {
+	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,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-2.0.8-r2.ebuild b/app-crypt/gnupg/gnupg-2.0.9.ebuild
index aa6d09009021..a45c1bc43a6f 100644
--- a/app-crypt/gnupg/gnupg-2.0.8-r2.ebuild
+++ b/app-crypt/gnupg/gnupg-2.0.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-2.0.8-r2.ebuild,v 1.2 2008/03/07 07:33:20 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-2.0.9.ebuild,v 1.1 2008/03/27 06:06:04 alonbl Exp $
 
 inherit flag-o-matic eutils
 
@@ -38,17 +38,9 @@ RDEPEND="${COMMON_DEPEND}
 	selinux? ( sec-policy/selinux-gnupg )
 	nls? ( virtual/libintl )"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${PN}-2.0.4-idea.patch"
-	epatch "${FILESDIR}/${P}-qualified.patch"
-}
-
 src_compile() {
-	append-ldflags $(bindnow-flags)
-
 	econf \
+		--docdir="/usr/share/doc/${PF}" \
 		--enable-symcryptrun \
 		--enable-gpg \
 		--enable-gpgsm \
@@ -70,6 +62,9 @@ src_install() {
 	make DESTDIR="${D}" install || die
 	dodoc ChangeLog NEWS README THANKS TODO VERSION
 
+	mv "${D}/usr/share/gnupg"/{help*,faq*,FAQ} "${D}/usr/share/doc/${PF}"
+	prepalldocs
+
 	dosym gpg2 /usr/bin/gpg
 	dosym gpgv2 /usr/bin/gpgv
 	dosym gpg2keys_hkp /usr/libexec/gpgkeys_hkp