Version bump

(Portage version: 2.1.4.4)

4 files changed, 186 insertions, 32 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/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