Version bump

(Portage version: 2.1.4_rc10)

6 files changed, 432 insertions, 1 deletions

diff --git a/app-crypt/gnupg/ChangeLog b/app-crypt/gnupg/ChangeLog
index c4279901bd2f..3d82d0cd43d6 100644
--- a/app-crypt/gnupg/ChangeLog
+++ b/app-crypt/gnupg/ChangeLog
@@ -1,6 +1,14 @@
 # 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.310 2007/12/17 10:50:50 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/ChangeLog,v 1.311 2007/12/20 19:43:36 alonbl Exp $
+
+*gnupg-2.0.8 (20 Dec 2007)
+*gnupg-1.4.8 (20 Dec 2007)
+
+  20 Dec 2007; Alon Bar-Lev <alonbl@gentoo.org>
+  +files/gnupg-1.4.8-ecc-glue.patch, +gnupg-1.4.8.ebuild,
+  +gnupg-2.0.8.ebuild:
+  Version bump
 
   17 Dec 2007; Raúl Porcel <armin76@gentoo.org> gnupg-2.0.7.ebuild:
   alpha/ia64/sparc stable wrt #202158
diff --git a/app-crypt/gnupg/files/digest-gnupg-1.4.8 b/app-crypt/gnupg/files/digest-gnupg-1.4.8
new file mode 100644
index 000000000000..095177b611e0
--- /dev/null
+++ b/app-crypt/gnupg/files/digest-gnupg-1.4.8
@@ -0,0 +1,9 @@
+MD5 6169eb1d9f562b9c7ced37bb7d1ca4f0 gnupg-1.4.7-ecc0.1.8.diff.bz2 17772
+RMD160 83bbdb3d226716acaf749659374579ca023ca0cd gnupg-1.4.7-ecc0.1.8.diff.bz2 17772
+SHA256 71e67ac4196a8911b4cec4e052c418ce4bec23c70111a879d5e4303fcd19af29 gnupg-1.4.7-ecc0.1.8.diff.bz2 17772
+MD5 e5be39ea81bb07de006e7dd44439cb76 gnupg-1.4.8.tar.bz2 3320100
+RMD160 75228c02ea1999494232cb2eb2107951d1602c4d gnupg-1.4.8.tar.bz2 3320100
+SHA256 119d2574deafe8c2d4444e53051ebad215d375f94f29c520ff891275f14e006c gnupg-1.4.8.tar.bz2 3320100
+MD5 9dc3bc086824a8c7a331f35e09a3e57f idea.c.gz 5216
+RMD160 e35be5a031d10d52341ac5f029d28f811edd908d idea.c.gz 5216
+SHA256 309928da34941dff1d6f6687542ff3d58306d85be9e1a9906bc4f9f8e6011844 idea.c.gz 5216
diff --git a/app-crypt/gnupg/files/digest-gnupg-2.0.8 b/app-crypt/gnupg/files/digest-gnupg-2.0.8
new file mode 100644
index 000000000000..d232924e9693
--- /dev/null
+++ b/app-crypt/gnupg/files/digest-gnupg-2.0.8
@@ -0,0 +1,3 @@
+MD5 fc4377ca67e1bf687eeaf22e79c0b9d1 gnupg-2.0.8.tar.bz2 3654523
+RMD160 bfd8cfb48ff74834c80d09d040921e005af9550c gnupg-2.0.8.tar.bz2 3654523
+SHA256 16f310afe4740a26475c7273f585861a4bdefecbde27c214cc30c0db45d26913 gnupg-2.0.8.tar.bz2 3654523
diff --git a/app-crypt/gnupg/files/gnupg-1.4.8-ecc-glue.patch b/app-crypt/gnupg/files/gnupg-1.4.8-ecc-glue.patch
new file mode 100644
index 000000000000..40385a48e1f9
--- /dev/null
+++ b/app-crypt/gnupg/files/gnupg-1.4.8-ecc-glue.patch
@@ -0,0 +1,121 @@
+--- gnupg-1.4.7-ecc0.1.8.diff	2007-12-20 21:24:04.000000000 +0200
++++ gnupg-1.4.8-ecc0.1.8.diff	2007-12-20 21:23:30.000000000 +0200
+@@ -1914,48 +1914,48 @@ diff -Nru gnupg-1.4.7/cipher/Makefile.am
+  
+  if USE_RNDLINUX
+  libcipher_a_SOURCES+=rndlinux.c
+-diff -Nru gnupg-1.4.7/cipher/Makefile.in gnupg-1.4.7-ecc/cipher/Makefile.in
+---- gnupg-1.4.7/cipher/Makefile.in	2007-03-05 10:44:42.000000000 +0100
+-+++ gnupg-1.4.7-ecc/cipher/Makefile.in	2007-11-08 22:24:55.000000000 +0100
+-@@ -96,7 +96,7 @@
+- 	elgamal.c elgamal.h rsa.c rsa.h primegen.c random.h random.c \
+- 	rand-internal.h rmd.h dsa.h dsa.c smallprime.c algorithms.h \
+- 	md5.c rmd160.c sha1.c sha256.c rndlinux.c rndunix.c rndegd.c \
+--	rndw32.c sha512.c
+-+	rndw32.c sha512.c ecc.c
++diff -urNp gnupg-1.4.8/cipher/Makefile.in gnupg-1.4.8.ecc/cipher/Makefile.in
++--- gnupg-1.4.8/cipher/Makefile.in	2007-12-20 09:54:08.000000000 +0200
+++++ gnupg-1.4.8.ecc/cipher/Makefile.in	2007-12-20 21:16:08.000000000 +0200
++@@ -93,7 +93,7 @@ am__libcipher_a_SOURCES_DIST = cipher.c 
++ 	camellia.c camellia.h camellia-glue.c elgamal.c elgamal.h \
++ 	rsa.c rsa.h primegen.c random.h random.c rand-internal.h rmd.h \
++ 	dsa.h dsa.c smallprime.c algorithms.h md5.c rmd160.c sha1.c \
++-	sha256.c rndlinux.c rndunix.c rndegd.c rndw32.c sha512.c
+++	sha256.c rndlinux.c rndunix.c rndegd.c rndw32.c sha512.c ecc.c
+  @USE_RNDLINUX_TRUE@am__objects_1 = rndlinux.$(OBJEXT)
+  @USE_RNDUNIX_TRUE@am__objects_2 = rndunix.$(OBJEXT)
+  @USE_RNDEGD_TRUE@am__objects_3 = rndegd.$(OBJEXT)
+-@@ -107,7 +107,7 @@
+- 	blowfish.$(OBJEXT) cast5.$(OBJEXT) rijndael.$(OBJEXT) \
+- 	elgamal.$(OBJEXT) rsa.$(OBJEXT) primegen.$(OBJEXT) \
+- 	random.$(OBJEXT) dsa.$(OBJEXT) smallprime.$(OBJEXT) \
+--	md5.$(OBJEXT) rmd160.$(OBJEXT) sha1.$(OBJEXT) sha256.$(OBJEXT) \
+-+	md5.$(OBJEXT) rmd160.$(OBJEXT) sha1.$(OBJEXT) sha256.$(OBJEXT) ecc.$(OBJEXT) \
++@@ -105,7 +105,7 @@ am_libcipher_a_OBJECTS = cipher.$(OBJEXT
++ 	camellia.$(OBJEXT) camellia-glue.$(OBJEXT) elgamal.$(OBJEXT) \
++ 	rsa.$(OBJEXT) primegen.$(OBJEXT) random.$(OBJEXT) \
++ 	dsa.$(OBJEXT) smallprime.$(OBJEXT) md5.$(OBJEXT) \
++-	rmd160.$(OBJEXT) sha1.$(OBJEXT) sha256.$(OBJEXT) \
+++	rmd160.$(OBJEXT) sha1.$(OBJEXT) sha256.$(OBJEXT) ecc.$(OBJEXT) \
+  	$(am__objects_1) $(am__objects_2) $(am__objects_3) \
+  	$(am__objects_4) $(am__objects_5)
+  libcipher_a_OBJECTS = $(am_libcipher_a_OBJECTS)
+-@@ -325,7 +325,7 @@
+- 	twofish.c blowfish.c cast5.c rijndael.c elgamal.c elgamal.h \
+- 	rsa.c rsa.h primegen.c random.h random.c rand-internal.h rmd.h \
+- 	dsa.h dsa.c smallprime.c algorithms.h md5.c rmd160.c sha1.c \
+--	sha256.c $(am__append_2) $(am__append_3) $(am__append_4) \
+-+	sha256.c ecc.c $(am__append_2) $(am__append_3) $(am__append_4) \
++@@ -302,7 +302,7 @@ libcipher_a_SOURCES = cipher.c pubkey.c 
++ 	twofish.c blowfish.c cast5.c rijndael.c camellia.c camellia.h \
++ 	camellia-glue.c elgamal.c elgamal.h rsa.c rsa.h primegen.c \
++ 	random.h random.c rand-internal.h rmd.h dsa.h dsa.c \
++-	smallprime.c algorithms.h md5.c rmd160.c sha1.c sha256.c \
+++	smallprime.c algorithms.h md5.c rmd160.c sha1.c sha256.c ecc.c \
++ 	$(am__append_2) $(am__append_3) $(am__append_4) \
+  	$(am__append_5) $(am__append_6)
+  EXTRA_libcipher_a_SOURCES = idea-stub.c
+- libcipher_a_DEPENDENCIES = @IDEA_O@
+-@@ -402,6 +402,7 @@
++@@ -382,6 +382,7 @@ distclean-compile:
+  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sha512.Po@am__quote@
+  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/smallprime.Po@am__quote@
+  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/twofish.Po@am__quote@
+ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ecc.Po@am__quote@
+  
+  .c.o:
+- @am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-diff -Nru gnupg-1.4.7/cipher/pubkey.c gnupg-1.4.7-ecc/cipher/pubkey.c
+---- gnupg-1.4.7/cipher/pubkey.c	2005-07-27 19:02:55.000000000 +0200
+-+++ gnupg-1.4.7-ecc/cipher/pubkey.c	2007-11-08 22:24:55.000000000 +0100
+-@@ -33,6 +33,9 @@
++ @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++diff -urNp gnupg-1.4.8/cipher/pubkey.c gnupg-1.4.8.ecc/cipher/pubkey.c
++--- gnupg-1.4.8/cipher/pubkey.c	2007-12-12 20:06:55.000000000 +0200
+++++ gnupg-1.4.8.ecc/cipher/pubkey.c	2007-12-20 21:13:31.000000000 +0200
++@@ -31,6 +31,9 @@
+  #include "elgamal.h"
+  #include "dsa.h"
+  #include "rsa.h"
+@@ -2311,25 +2311,23 @@ diff -Nru gnupg-1.4.7/g10/keyid.c gnupg-
+        default: return '?';
+      }
+  }
+-diff -Nru gnupg-1.4.7/g10/mainproc.c gnupg-1.4.7-ecc/g10/mainproc.c
+---- gnupg-1.4.7/g10/mainproc.c	2007-03-05 10:08:41.000000000 +0100
+-+++ gnupg-1.4.7-ecc/g10/mainproc.c	2007-11-08 22:24:55.000000000 +0100
+-@@ -399,7 +399,10 @@
+-     }
++diff -urNp gnupg-1.4.8/g10/mainproc.c gnupg-1.4.8.ecc/g10/mainproc.c
++--- gnupg-1.4.8/g10/mainproc.c	2007-12-12 19:44:49.000000000 +0200
+++++ gnupg-1.4.8.ecc/g10/mainproc.c	2007-12-20 21:17:33.000000000 +0200
++@@ -404,6 +404,9 @@ proc_pubkey_enc( CTX c, PACKET *pkt )
+      else if( is_ELGAMAL(enc->pubkey_algo)
+- 	|| enc->pubkey_algo == PUBKEY_ALGO_DSA
+--	|| is_RSA(enc->pubkey_algo)  ) {
+-+	|| is_RSA(enc->pubkey_algo)
+-+/*begin ECC mod*/
+-+        || is_ECC(enc->pubkey_algo) ) {
+-+/*end ECC mod*/
+-       /* FIXME:  strore this all in a list and process it later */
+- 
+- 	if ( !c->dek && ((!enc->keyid[0] && !enc->keyid[1])
+-diff -Nru gnupg-1.4.7/g10/misc.c gnupg-1.4.7-ecc/g10/misc.c
+---- gnupg-1.4.7/g10/misc.c	2006-06-30 11:01:49.000000000 +0200
+-+++ gnupg-1.4.7-ecc/g10/misc.c	2007-11-08 22:24:55.000000000 +0100
+-@@ -421,6 +421,11 @@
++              || enc->pubkey_algo == PUBKEY_ALGO_DSA
++              || is_RSA(enc->pubkey_algo)  
+++/*begin ECC mod*/
+++             || is_ECC(enc->pubkey_algo)
+++/*end ECC mod*/
++              || (RFC2440 && enc->pubkey_algo == PUBKEY_ALGO_ELGAMAL)) {
++       /* Note that we also allow type 20 Elgamal keys for decryption.
++          There are still a couple of those keys in active use as a
++diff -urNp gnupg-1.4.8/g10/misc.c gnupg-1.4.8.ecc/g10/misc.c
++--- gnupg-1.4.8/g10/misc.c	2007-12-12 19:35:18.000000000 +0200
+++++ gnupg-1.4.8.ecc/g10/misc.c	2007-12-20 21:13:31.000000000 +0200
++@@ -433,6 +433,11 @@ openpgp_pk_algo_usage ( int algo )
+        case PUBKEY_ALGO_DSA:  
+            use = PUBKEY_USAGE_CERT | PUBKEY_USAGE_SIG | PUBKEY_USAGE_AUTH;
+            break;
diff --git a/app-crypt/gnupg/gnupg-1.4.8.ebuild b/app-crypt/gnupg/gnupg-1.4.8.ebuild
new file mode 100644
index 000000000000..da3c31bef1eb
--- /dev/null
+++ b/app-crypt/gnupg/gnupg-1.4.8.ebuild
@@ -0,0 +1,205 @@
+# 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.8.ebuild,v 1.1 2007/12/20 19:43:36 alonbl Exp $
+
+inherit eutils flag-o-matic
+
+ECCVER="0.1.8"
+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}
+	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_OPTS="-p0 -d ${WORKDIR}" epatch "${FILESDIR}/${P}-ecc-glue.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
+
+	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) \
+		--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://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
+	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.ebuild b/app-crypt/gnupg/gnupg-2.0.8.ebuild
new file mode 100644
index 000000000000..ac6bc329c1f3
--- /dev/null
+++ b/app-crypt/gnupg/gnupg-2.0.8.ebuild
@@ -0,0 +1,85 @@
+# 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-2.0.8.ebuild,v 1.1 2007/12/20 19:43:36 alonbl 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.4
+	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() {
+	append-ldflags $(bindnow-flags)
+
+	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
+	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"
+}