Bug #85263 - Disable capabilities code, as it's broken :-(.
authorRobin H. Johnson <robbat2@gentoo.org>
Thu, 15 Jun 2006 00:09:14 +0000 (00:09 +0000)
committerRobin H. Johnson <robbat2@gentoo.org>
Thu, 15 Jun 2006 00:09:14 +0000 (00:09 +0000)
Package-Manager: portage-2.1

app-crypt/gnupg/ChangeLog
app-crypt/gnupg/Manifest
app-crypt/gnupg/files/digest-gnupg-1.4.3-r1 [new file with mode: 0644]
app-crypt/gnupg/files/digest-gnupg-1.9.20-r4 [new file with mode: 0644]
app-crypt/gnupg/gnupg-1.4.3-r1.ebuild [new file with mode: 0644]
app-crypt/gnupg/gnupg-1.9.20-r4.ebuild [new file with mode: 0644]

index 3b0062875652f7bcc598e3a3fb921de3ac50c254..f4a5b92d76eb2e24f26d772be98151e8fcb69030 100644 (file)
@@ -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.196 2006/06/07 13:01:51 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/ChangeLog,v 1.197 2006/06/15 00:09:14 robbat2 Exp $
+
+*gnupg-1.9.20-r4 (15 Jun 2006)
+*gnupg-1.4.3-r1 (15 Jun 2006)
+
+  15 Jun 2006; Robin H. Johnson <robbat2@gentoo.org> +gnupg-1.4.3-r1.ebuild,
+  +gnupg-1.9.20-r4.ebuild:
+  Bug #85263 - Disable capabilities code, as it's broken :-(.
 
   07 Jun 2006; Diego Pettenò <flameeyes@gentoo.org>
   +files/gnupg-1.9.20-fbsd-gcc41.patch, gnupg-1.9.20-r3.ebuild:
index b0982bc06c7e3d1c7792d9034e08896e369619bd..b57f9b057e5762a098e9bb8e6156102d52902c58 100644 (file)
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX gnupg-1.4-emptytrustpackets.patch 611 RMD160 b87072acd446cebeb9b837ac6bba21c9c761e0c6 SHA1 5de97cdd26d155132c828db89b28cd37e9f03aad SHA256 d7a2cfed32f0fef29edf0506fc3602473cc2c6369d672571d06bff902c9e0689
 MD5 c0b3223dbc599c2da7707cdae2b3683a files/gnupg-1.4-emptytrustpackets.patch 611
 RMD160 b87072acd446cebeb9b837ac6bba21c9c761e0c6 files/gnupg-1.4-emptytrustpackets.patch 611
@@ -63,6 +60,10 @@ EBUILD gnupg-1.4.2.2.ebuild 7051 RMD160 2514b7622efac0ed018295131ccf0cdc2adf5213
 MD5 89d58e8a7c3eedf2660c73a6784a5871 gnupg-1.4.2.2.ebuild 7051
 RMD160 2514b7622efac0ed018295131ccf0cdc2adf5213 gnupg-1.4.2.2.ebuild 7051
 SHA256 28109c5253fd126ff83e4703d2fc92e360d530a34a0ddd2dbc7636a7cb5e77b3 gnupg-1.4.2.2.ebuild 7051
+EBUILD gnupg-1.4.3-r1.ebuild 6476 RMD160 4790f55af18279485a430743b6c58774d488f4bd SHA1 2fa98cd312647bac19002e0f09f3422269e6fc18 SHA256 b3a356b0b9f579004b6f45a4374ba0b47ea2af88e56add3700d269dd1259c50d
+MD5 9e525bc684232e680d9b2d05b9358fc0 gnupg-1.4.3-r1.ebuild 6476
+RMD160 4790f55af18279485a430743b6c58774d488f4bd gnupg-1.4.3-r1.ebuild 6476
+SHA256 b3a356b0b9f579004b6f45a4374ba0b47ea2af88e56add3700d269dd1259c50d gnupg-1.4.3-r1.ebuild 6476
 EBUILD gnupg-1.4.3.ebuild 6384 RMD160 c72bcd2fe78a775b4bf6557ea2b68008e4dba819 SHA1 cd52859b7fd521990271268bce912ee4223a6611 SHA256 d692a1629454419b6c3b118f8f67822b710a2f6fdf435dbe62d2073d2a3a189f
 MD5 a5ad331b3128b0bff375def48c4f47d1 gnupg-1.4.3.ebuild 6384
 RMD160 c72bcd2fe78a775b4bf6557ea2b68008e4dba819 gnupg-1.4.3.ebuild 6384
@@ -71,10 +72,14 @@ EBUILD gnupg-1.9.20-r3.ebuild 2799 RMD160 a3f0822e3218f3d5d3fefb1107ba9abc831443
 MD5 3179a3c29f157fe3ec975f9fab816bac gnupg-1.9.20-r3.ebuild 2799
 RMD160 a3f0822e3218f3d5d3fefb1107ba9abc8314435e gnupg-1.9.20-r3.ebuild 2799
 SHA256 a33aa24ce80323df40d4b2e9814d6a80e53ce513c597afa844cd791f1b505aa0 gnupg-1.9.20-r3.ebuild 2799
-MISC ChangeLog 31660 RMD160 9c6d27dcaaf056cbfc752f76925c9b14a3755c31 SHA1 3d3abf8f4a35aa266cf31c35f0beb3be2ee76ad8 SHA256 88cd1c7ced08415f4984e0a166e57a791388cacd690e8680f5db2afb17770ecc
-MD5 e85f4a9c0b86607b66e0ab3eb0d2bc86 ChangeLog 31660
-RMD160 9c6d27dcaaf056cbfc752f76925c9b14a3755c31 ChangeLog 31660
-SHA256 88cd1c7ced08415f4984e0a166e57a791388cacd690e8680f5db2afb17770ecc ChangeLog 31660
+EBUILD gnupg-1.9.20-r4.ebuild 2881 RMD160 b60b8a078b3726d9a1bc69238839bb77c8f936ff SHA1 c579621ee83a04b5a064d2846a41f7652d27c8ac SHA256 137768c47bd6bcf96e499bd07fc0b978ceedd521256f68c8eb6d083f0f5be586
+MD5 a5743787cccf8e6be25206f230f4e9aa gnupg-1.9.20-r4.ebuild 2881
+RMD160 b60b8a078b3726d9a1bc69238839bb77c8f936ff gnupg-1.9.20-r4.ebuild 2881
+SHA256 137768c47bd6bcf96e499bd07fc0b978ceedd521256f68c8eb6d083f0f5be586 gnupg-1.9.20-r4.ebuild 2881
+MISC ChangeLog 31887 RMD160 e5c2b0dae4e50467be861b4630600fdd52818484 SHA1 091cf96824d27b5f3110f033d858cae50a12de58 SHA256 36bebf3eeea63d8d5c01251d76007d43d9ab572b34a62131787a4283d14c6420
+MD5 bd6540fe06f8475de5ce85f816b656d4 ChangeLog 31887
+RMD160 e5c2b0dae4e50467be861b4630600fdd52818484 ChangeLog 31887
+SHA256 36bebf3eeea63d8d5c01251d76007d43d9ab572b34a62131787a4283d14c6420 ChangeLog 31887
 MISC metadata.xml 481 RMD160 d5c4e2fc7b94966795cc4c039d850302d8552448 SHA1 13cb529b83ba9feaad91f1d033d6c33d1eafbd25 SHA256 d88eadc2c75a18f57dcd38f20aa72ee7c79504f62bcab3f7dea60651ccd4b672
 MD5 b507ee36c7487372de42cc9dab034370 metadata.xml 481
 RMD160 d5c4e2fc7b94966795cc4c039d850302d8552448 metadata.xml 481
@@ -85,13 +90,12 @@ SHA256 25fa4aa5eaea9962a865c2e6b0f123972c0111ee0999060b3aca8a17f087328f files/di
 MD5 cc4e04dad418f08cb3eef8edf326b35f files/digest-gnupg-1.4.3 708
 RMD160 9bfc71ad352871b75a329439caaff906a1c5397f files/digest-gnupg-1.4.3 708
 SHA256 8e3cf65fbdae1fd9e4657caa33e005261988c8bea3fa62e518d07d863675b7d3 files/digest-gnupg-1.4.3 708
+MD5 cc4e04dad418f08cb3eef8edf326b35f files/digest-gnupg-1.4.3-r1 708
+RMD160 9bfc71ad352871b75a329439caaff906a1c5397f files/digest-gnupg-1.4.3-r1 708
+SHA256 8e3cf65fbdae1fd9e4657caa33e005261988c8bea3fa62e518d07d863675b7d3 files/digest-gnupg-1.4.3-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
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.3 (GNU/Linux)
-
-iD8DBQFEhs50AiZjviIA2XgRAhSFAKCx354E8VCDbKgu2ssJsVaJCkhRcgCfQxt+
-FV7tzoiRV5ySLQo/7+RWdCI=
-=+SD9
------END PGP SIGNATURE-----
+MD5 b5311626934af7a07b0760601cc3db45 files/digest-gnupg-1.9.20-r4 244
+RMD160 2cee39773952b56927ea28d0eb108c517493c002 files/digest-gnupg-1.9.20-r4 244
+SHA256 a3f14c72acb1d4aa2102ab2ef7d02f12ae0451eef8528fed05a59b07e733d3d0 files/digest-gnupg-1.9.20-r4 244
diff --git a/app-crypt/gnupg/files/digest-gnupg-1.4.3-r1 b/app-crypt/gnupg/files/digest-gnupg-1.4.3-r1
new file mode 100644 (file)
index 0000000..1984012
--- /dev/null
@@ -0,0 +1,9 @@
+MD5 92dc69b6eb6ae62200e43f79dec3e0c4 gnupg-1.4.3-ecc0.1.6.diff.bz2 18138
+RMD160 609d0d280d0084c4463bcfaa770d1dab4790bb32 gnupg-1.4.3-ecc0.1.6.diff.bz2 18138
+SHA256 35b22cb1ef93042733b8088fee3fb2eff3053c04d506316315295e0b0ea690f0 gnupg-1.4.3-ecc0.1.6.diff.bz2 18138
+MD5 d237d8fe1c4afa379f56dbda0e0b40e4 gnupg-1.4.3.tar.bz2 3114088
+RMD160 f6d328785f41b74f97d25305c6fe95ad45bb70a5 gnupg-1.4.3.tar.bz2 3114088
+SHA256 1d8d65e43751d833d4d49fa86df6fe97cebd00162dd0ced743470dca7e520da6 gnupg-1.4.3.tar.bz2 3114088
+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-1.9.20-r4 b/app-crypt/gnupg/files/digest-gnupg-1.9.20-r4
new file mode 100644 (file)
index 0000000..ba3b6d7
--- /dev/null
@@ -0,0 +1,3 @@
+MD5 93899203fc0530f03e146d49b65c1e28 gnupg-1.9.20.tar.bz2 1810059
+RMD160 3501de32f1526f64510a77fe3cc0905dd7fc8854 gnupg-1.9.20.tar.bz2 1810059
+SHA256 6272727e5a0e019743e8520a2ff6b42eb4cc89251cb5bbca73dda09cb765487e gnupg-1.9.20.tar.bz2 1810059
diff --git a/app-crypt/gnupg/gnupg-1.4.3-r1.ebuild b/app-crypt/gnupg/gnupg-1.4.3-r1.ebuild
new file mode 100644 (file)
index 0000000..8850ce9
--- /dev/null
@@ -0,0 +1,219 @@
+# 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.3-r1.ebuild,v 1.1 2006/06/15 00:09:14 robbat2 Exp $
+
+inherit eutils flag-o-matic linux-info
+
+ECCVER=0.1.6
+ECCVER_GNUPG=1.4.3
+
+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"
+# IUSE+=caps
+
+#      caps? ( sys-libs/libcap )
+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 )"
+
+pkg_setup() {
+       # fix bug #113474 - no compiled kernel needed now
+       if use kernel_linux; then
+           get_running_version
+       fi
+}
+
+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/why-not-idea.html"
+               mv "${WORKDIR}"/idea.c "${S}"/cipher/idea.c || \
+                       ewarn "failed to insert IDEA module"
+       fi
+
+       if use ecc; then
+               EPATCH_OPTS="-p1 -d ${S}" epatch ${PN}-${ECCVER_GNUPG}-ecc${ECCVER}.diff
+       fi
+
+       # maketest fix
+       epatch "${FILESDIR}"/${PN}-1.4.3-selftest.patch
+
+       # install RU man page in right location
+       epatch "${FILESDIR}"/${PN}-1.4.3-badruman.patch
+
+       cd "${S}"
+       # keyserver fix
+       epatch "${FILESDIR}"/${PN}-1.4.3-keyserver.patch
+
+       #  fix segfault of empty segfault packages - bug 129218
+       epatch "${FILESDIR}"/${PN}-1.4-emptytrustpackets.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"
+
+       #       $(use_with caps capabilities) \
+       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
+
+       # 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() {
+       #if ! use kernel_linux || (! use caps && kernel_is lt 2 6 9); then
+       if ! use kernel_linux || kernel_is lt 2 6 9; then
+               chmod u+s,go-r ${ROOT}/usr/bin/gpg
+               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."
+       else
+               chmod u-s,go-r ${ROOT}/usr/bin/gpg
+       fi
+       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/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
+       #if use caps; then
+       #       einfo
+       #       ewarn "Capabilities code is experimental"
+       #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.20-r4.ebuild b/app-crypt/gnupg/gnupg-1.9.20-r4.ebuild
new file mode 100644 (file)
index 0000000..6d1e55a
--- /dev/null
@@ -0,0 +1,108 @@
+# 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.20-r4.ebuild,v 1.1 2006/06/15 00:09:14 robbat2 Exp $
+
+inherit eutils flag-o-matic autotools
+
+DESCRIPTION="The GNU Privacy Guard, a GPL pgp replacement"
+HOMEPAGE="http://www.gnupg.org/"
+SRC_URI="mirror://gnupg/alpha/gnupg/${P}.tar.bz2"
+
+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 smartcard selinux"
+#IUSE+=caps
+
+COMMON_DEPEND="
+       dev-lang/perl
+       sys-libs/zlib
+       virtual/libc
+       >=dev-libs/pth-1.3.7
+       smartcard? ( >=dev-libs/opensc-0.8.0 )
+       >=dev-libs/libgcrypt-1.1.94
+       >=dev-libs/libksba-0.9.13
+       >=dev-libs/libgpg-error-1.0
+       ~dev-libs/libassuan-0.6.10
+       ldap? ( net-nds/openldap )"
+#      caps? ( sys-libs/libcap )"
+
+DEPEND="${COMMON_DEPEND}
+       nls? ( sys-devel/gettext )"
+
+RDEPEND="${COMMON_DEPEND}
+       !app-crypt/gpg-agent
+       =app-crypt/gnupg-1.4*
+       X? ( || ( media-gfx/xloadimage media-gfx/xli ) )
+       virtual/mta
+       selinux? ( sec-policy/selinux-gnupg )
+       nls? ( virtual/libintl )"
+
+src_unpack() {
+       unpack ${A}
+       cd "${S}"
+       if use smartcard && ! built_with_use dev-libs/opensc pcsc-lite ; then
+               sed -i -e 's:OPENSC_LIBS="\$OPENSC_LIBS -lpcsclite -lpthread":OPENSC_LIBS="\$OPENSC_LIBS -lopenct -lpthread":' \
+               acinclude.m4 || die "openct patching failed."
+               ./autogen.sh
+       fi
+       sed -i -e 's/PIC/__PIC__/g' intl/relocatable.c || die "PIC patching failed"
+
+       epatch "${FILESDIR}/${P}-fbsd.patch"
+       epatch "${FILESDIR}/${P}-fbsd-gcc41.patch"
+       AT_M4DIR="m4 gl/m4" eautoreconf
+}
+
+src_compile() {
+       local myconf=""
+
+       if use X; then
+               local viewer
+               if has_version 'media-gfx/xloadimage'; then
+                       viewer=/usr/bin/xloadimage
+               else
+                       viewer=/usr/bin/xli
+               fi
+               myconf="${myconf} --with-photo-viewer=${viewer}"
+       else
+               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 \
+               $(use_enable gpg2-experimental gpg) \
+               --enable-gpgsm \
+               $(use_enable smartcard scdaemon) \
+               $(use_enable nls) \
+               $(use_enable ldap) \
+               --disable-capabilities \
+               ${myconf} \
+               || die
+       emake || die
+}
+
+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
+}
+
+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
+}