gcc-4.3 patch from redhat as per bug #256671 thanks cilly. old version cleanout too

(Portage version: 2.2_rc23/cvs/Linux x86_64)

9 files changed, 63 insertions, 570 deletions

diff --git a/app-crypt/gnupg/ChangeLog b/app-crypt/gnupg/ChangeLog
index 1134503fa576..a5185e15201d 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.334 2008/09/09 09:52:48 robbat2 Exp $
+# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/ChangeLog,v 1.335 2009/01/30 11:24:42 dragonheart Exp $
+
+  30 Jan 2009; Daniel Black <dragonheart@gentoo.org>
+  -files/gnupg-1.4.3-keyserver.patch, -files/gnupg-1.4.3-selftest.patch,
+  +files/gnupg-1.4.9-gcc43.patch, -files/gnupg-2.0.4-idea.patch,
+  -gnupg-1.4.7-r1.ebuild, -gnupg-1.4.8-r1.ebuild, gnupg-1.4.9.ebuild,
+  -gnupg-2.0.7-r1.ebuild:
+  gcc-4.3 patch from redhat as per bug #256671 thanks cilly. old version
+  cleanout too
 
 *gnupg-2.0.9-r1 (09 Sep 2008)
 
diff --git a/app-crypt/gnupg/files/gnupg-1.4.3-keyserver.patch b/app-crypt/gnupg/files/gnupg-1.4.3-keyserver.patch
deleted file mode 100644
index 105a0f62eeab..000000000000
--- a/app-crypt/gnupg/files/gnupg-1.4.3-keyserver.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -ur gnupg-1.4.3.orig/g10/keyserver.c gnupg-1.4.3/g10/keyserver.c
---- gnupg-1.4.3.orig/g10/keyserver.c	2006-03-21 13:29:47.000000000 +0100
-+++ gnupg-1.4.3/g10/keyserver.c	2006-04-09 14:50:02.000000000 +0200
-@@ -934,7 +934,9 @@
- static const char *
- keyserver_typemap(const char *type)
- {
--  if(strcmp(type,"ldaps")==0)
-+  if(strcmp(type,"ldap")==0)
-+    return "ldap";
-+  else if(strcmp(type,"ldaps")==0)
-     return "ldap";
-   else
-     return type;
diff --git a/app-crypt/gnupg/files/gnupg-1.4.3-selftest.patch b/app-crypt/gnupg/files/gnupg-1.4.3-selftest.patch
deleted file mode 100644
index a5ba3840670a..000000000000
--- a/app-crypt/gnupg/files/gnupg-1.4.3-selftest.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -ur gnupg-1.4.3.orig/checks/Makefile.in gnupg-1.4.3/checks/Makefile.in
---- gnupg-1.4.3.orig/checks/Makefile.in	2006-04-03 11:45:05.000000000 +0200
-+++ gnupg-1.4.3/checks/Makefile.in	2006-04-09 14:29:21.000000000 +0200
-@@ -540,9 +540,11 @@
- 
- ./gpg_dearmor:
- 	echo '#!/bin/sh' >./gpg_dearmor
--	echo "../g10/gpg --no-options --no-greeting \
-+	echo "../g10/gpg --no-options --no-greeting --homedir . \
-              --no-secmem-warning --batch --dearmor" >>./gpg_dearmor
- 	chmod 755 ./gpg_dearmor
-+	if test ! -f ./pubring.gpg; then touch -t 197001020000 ./pubring.gpg; fi
-+	if test ! -f ./secring.gpg; then touch -t 197001020000 ./secring.gpg; fi
- 
- ./pubring.gpg: $(srcdir)/pubring.asc $(srcdir)/pubdemo.asc ./gpg_dearmor
- 	./gpg_dearmor > ./pubring.gpg < $(srcdir)/pubring.asc
-diff -ur gnupg-1.4.3.orig/g10/openfile.c gnupg-1.4.3/g10/openfile.c
---- gnupg-1.4.3.orig/g10/openfile.c	2006-03-28 09:41:45.000000000 +0200
-+++ gnupg-1.4.3/g10/openfile.c	2006-04-09 14:30:42.000000000 +0200
-@@ -401,8 +401,10 @@
-      * To cope with HOME, we do compare only the suffix if we see that
-      * the default homedir does start with a tilde.
-      */
-+#ifndef ENABLE_SELINUX_HACKS
-     if( opt.dry_run || opt.no_homedir_creation )
- 	return;
-+#endif
- 
-     if ( ( *defhome == '~'
-            && ( strlen(fname) >= strlen (defhome+1)
diff --git a/app-crypt/gnupg/files/gnupg-1.4.9-gcc43.patch b/app-crypt/gnupg/files/gnupg-1.4.9-gcc43.patch
new file mode 100644
index 000000000000..0a88e258db1e
--- /dev/null
+++ b/app-crypt/gnupg/files/gnupg-1.4.9-gcc43.patch
@@ -0,0 +1,49 @@
+diff -up gnupg-1.4.9/keyserver/gpgkeys_curl.c.BAD gnupg-1.4.9/keyserver/gpgkeys_curl.c
+--- gnupg-1.4.9/keyserver/gpgkeys_curl.c.BAD	2008-05-24 12:41:24.000000000 -0500
++++ gnupg-1.4.9/keyserver/gpgkeys_curl.c	2008-05-24 12:41:41.000000000 -0500
+@@ -286,7 +286,7 @@ main(int argc,char *argv[])
+ 
+   if(follow_redirects)
+     {
+-      curl_easy_setopt(curl,CURLOPT_FOLLOWLOCATION,1);
++      curl_easy_setopt(curl,CURLOPT_FOLLOWLOCATION,1L);
+       if(follow_redirects>0)
+ 	curl_easy_setopt(curl,CURLOPT_MAXREDIRS,follow_redirects);
+     }
+@@ -298,10 +298,10 @@ main(int argc,char *argv[])
+     {
+       fprintf(console,"gpgkeys: curl version = %s\n",curl_version());
+       curl_easy_setopt(curl,CURLOPT_STDERR,console);
+-      curl_easy_setopt(curl,CURLOPT_VERBOSE,1);
++      curl_easy_setopt(curl,CURLOPT_VERBOSE,1L);
+     }
+ 
+-  curl_easy_setopt(curl,CURLOPT_SSL_VERIFYPEER,opt->flags.check_cert);
++  curl_easy_setopt(curl,CURLOPT_SSL_VERIFYPEER,(long)opt->flags.check_cert);
+   curl_easy_setopt(curl,CURLOPT_CAINFO,opt->ca_cert_file);
+ 
+   if(proxy)
+diff -up gnupg-1.4.9/keyserver/gpgkeys_hkp.c.BAD gnupg-1.4.9/keyserver/gpgkeys_hkp.c
+--- gnupg-1.4.9/keyserver/gpgkeys_hkp.c.BAD	2008-05-24 12:41:47.000000000 -0500
++++ gnupg-1.4.9/keyserver/gpgkeys_hkp.c	2008-05-24 12:42:10.000000000 -0500
+@@ -202,9 +202,9 @@ send_key(int *eof)
+     fprintf(console,"gpgkeys: HTTP URL is `%s'\n",request);
+ 
+   curl_easy_setopt(curl,CURLOPT_URL,request);
+-  curl_easy_setopt(curl,CURLOPT_POST,1);
++  curl_easy_setopt(curl,CURLOPT_POST,1L);
+   curl_easy_setopt(curl,CURLOPT_POSTFIELDS,key);
+-  curl_easy_setopt(curl,CURLOPT_FAILONERROR,1);
++  curl_easy_setopt(curl,CURLOPT_FAILONERROR,1L);
+ 
+   res=curl_easy_perform(curl);
+   if(res!=0)
+@@ -661,7 +661,7 @@ main(int argc,char *argv[])
+     {
+       fprintf(console,"gpgkeys: curl version = %s\n",curl_version());
+       curl_easy_setopt(curl,CURLOPT_STDERR,console);
+-      curl_easy_setopt(curl,CURLOPT_VERBOSE,1);
++      curl_easy_setopt(curl,CURLOPT_VERBOSE,1L);
+     }
+ 
+   if(proxy)
diff --git a/app-crypt/gnupg/files/gnupg-2.0.4-idea.patch b/app-crypt/gnupg/files/gnupg-2.0.4-idea.patch
deleted file mode 100644
index aa65cc9f7ac5..000000000000
--- a/app-crypt/gnupg/files/gnupg-2.0.4-idea.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-
-This is required in order to support IDEA encrypted keys
-using gnupg-1.4.X. The raw key has two bytes which are part
-of the checksum but not part of the key.
-
-This will not get into upstream as upstream does not wish to support
-IDEA at all even for backward compatibility.
-
-Signed-off-by: Alon Bar-Lev <alonbl@gentoo.org>
-
-diff -urNp gnupg-2.0.4.org/g10/seckey-cert.c gnupg-2.0.4/g10/seckey-cert.c
---- gnupg-2.0.4.org/g10/seckey-cert.c	2006-11-21 10:26:13.000000000 +0200
-+++ gnupg-2.0.4/g10/seckey-cert.c	2007-06-22 18:08:48.000000000 +0300
-@@ -211,6 +211,11 @@ do_check( PKT_secret_key *sk, const char
-                 csum += checksum (buffer, ndata);
-                 gcry_mpi_release (sk->skey[i]);
- 
-+		if (sk->protect.algo==CIPHER_ALGO_IDEA) {
-+			buffer[0] = 0;
-+			buffer[1] = 0;
-+		}
-+
- 		err = gcry_mpi_scan( &sk->skey[i], GCRYMPI_FMT_USG,
- 				     buffer, ndata, &ndata );
- 		xfree (buffer);
diff --git a/app-crypt/gnupg/gnupg-1.4.7-r1.ebuild b/app-crypt/gnupg/gnupg-1.4.7-r1.ebuild
deleted file mode 100644
index 374836523559..000000000000
--- a/app-crypt/gnupg/gnupg-1.4.7-r1.ebuild
+++ /dev/null
@@ -1,206 +0,0 @@
-# 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.7-r1.ebuild,v 1.13 2008/06/20 10:48:36 dragonheart Exp $
-
-inherit eutils flag-o-matic
-
-ECCVER="0.1.6"
-ECCVER_GNUPG="1.4.7"
-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}
-
-	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}'/" \
-				"${ECC_PATCH}"
-			sed -i \
-				"s/+ VERSION='${ECCVER_GNUPG}-ecc${ECCVER}'/+ VERSION='${PV}-ecc${ECCVER}'/" \
-				"${ECC_PATCH}"
-
-			EPATCH_OPTS="-p1 -d ${S}" epatch "${ECC_PATCH}"
-		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}"/${PN}-1.4.6-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
-
-	# 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) \
-		--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,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://en.wikipedia.org/wiki/International_Data_Encryption_Algorithm#Security"
-		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.8-r1.ebuild b/app-crypt/gnupg/gnupg-1.4.8-r1.ebuild
deleted file mode 100644
index 9e362bb6699b..000000000000
--- a/app-crypt/gnupg/gnupg-1.4.8-r1.ebuild
+++ /dev/null
@@ -1,202 +0,0 @@
-# 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.8-r1.ebuild,v 1.3 2008/06/20 10:48:36 dragonheart 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
-
-	# 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) \
-		--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,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://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.9.ebuild b/app-crypt/gnupg/gnupg-1.4.9.ebuild
index 8acb685fbe5d..881e78eea12f 100644
--- a/app-crypt/gnupg/gnupg-1.4.9.ebuild
+++ b/app-crypt/gnupg/gnupg-1.4.9.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 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.8 2008/10/27 05:43:17 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-1.4.9.ebuild,v 1.9 2009/01/30 11:24:42 dragonheart Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -13,7 +13,7 @@ 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 )
+		idea? ( mirror://gentoo/idea.c.gz )
 		ecc? ( http://www.calcurco.cat/eccGnuPG/src/${ECC_PATCH}.bz2 )
 		)"
 
@@ -45,6 +45,7 @@ S="${WORKDIR}/${MY_P}"
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
+	epatch "${FILESDIR}"/${P}-gcc43.patch
 
 	if use idea; then
 		if use bindist; then
diff --git a/app-crypt/gnupg/gnupg-2.0.7-r1.ebuild b/app-crypt/gnupg/gnupg-2.0.7-r1.ebuild
deleted file mode 100644
index 5fabe16e781b..000000000000
--- a/app-crypt/gnupg/gnupg-2.0.7-r1.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# 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.7-r1.ebuild,v 1.3 2008/06/20 10:48:36 dragonheart Exp $
-
-inherit flag-o-matic eutils
-
-DESCRIPTION="The GNU Privacy Guard, a GPL pgp replacement"
-HOMEPAGE="http://www.gnupg.org/"
-SRC_URI="mirror://gnupg/gnupg/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE="bzip2 doc ldap nls openct pcsc-lite smartcard selinux"
-
-COMMON_DEPEND="
-	virtual/libc
-	>=dev-libs/pth-1.3.7
-	>=dev-libs/libgcrypt-1.2.2
-	>=dev-libs/libksba-1.0.2
-	>=dev-libs/libgpg-error-1.4
-	>=net-misc/curl-7.7.2
-	bzip2? ( app-arch/bzip2 )
-	pcsc-lite? ( >=sys-apps/pcsc-lite-1.3.0 )
-	openct? ( >=dev-libs/openct-0.5.0 )
-	ldap? ( net-nds/openldap )
-	app-crypt/pinentry"
-
-DEPEND="${COMMON_DEPEND}
-	>=dev-libs/libassuan-1.0.2
-	nls? ( sys-devel/gettext )
-	doc? ( sys-apps/texinfo )"
-
-RDEPEND="${COMMON_DEPEND}
-	!app-crypt/gpg-agent
-	!<=app-crypt/gnupg-2.0.1
-	virtual/mta
-	selinux? ( sec-policy/selinux-gnupg )
-	nls? ( virtual/libintl )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${PN}-2.0.4-idea.patch"
-}
-
-src_compile() {
-
-	econf \
-		--enable-symcryptrun \
-		--enable-gpg \
-		--enable-gpgsm \
-		--enable-agent \
-		$(use_enable bzip2) \
-		$(use_enable smartcard scdaemon) \
-		$(use_enable nls) \
-		$(use_enable ldap) \
-		--disable-capabilities \
-		|| die
-	emake || die
-	if use doc; then
-		cd doc
-		emake html || die
-	fi
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die
-	dodoc ChangeLog NEWS README THANKS TODO VERSION
-
-	dosym gpg2 /usr/bin/gpg
-	dosym gpgv2 /usr/bin/gpgv
-	dosym gpg2keys_hkp /usr/libexec/gpgkeys_hkp
-	dosym gpg2keys_finger /usr/libexec/gpgkeys_finger
-	dosym gpg2keys_curl /usr/libexec/gpgkeys_curl
-	use ldap && dosym gpg2keys_ldap /usr/libexec/gpgkeys_ldap
-	echo ".so man1/gpg2.1" > "${D}/usr/share/man/man1/gpg.1"
-	echo ".so man1/gpgv2.1" > "${D}/usr/share/man/man1/gpgv.1"
-
-	use doc && dohtml doc/gnupg.html/* doc/*jpg doc/*png
-}
-
-pkg_postinst() {
-	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"
-	elog "the right viewer"
-}