bug 96391, add usb USE flag

(Portage version: 2.0.51.19)

4 files changed, 218 insertions, 1 deletions

diff --git a/app-crypt/gnupg/ChangeLog b/app-crypt/gnupg/ChangeLog
index 01ac651cdd08..ac3aa1458f6f 100644
--- a/app-crypt/gnupg/ChangeLog
+++ b/app-crypt/gnupg/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-crypt/gnupg
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/ChangeLog,v 1.116 2005/05/23 14:03:19 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/ChangeLog,v 1.117 2005/06/17 17:32:19 vanquirius Exp $
+
+*gnupg-1.4.1-r1 (17 Jun 2005)
+
+  17 Jun 2005; Marcelo Goes <vanquirius@gentoo.org> +gnupg-1.4.1-r1.ebuild:
+  Added usb USE flag. Fixes bug 96391.
 
   23 May 2005; Daniel Black <dragonheart@gentoo.org> gnupg-1.9.16.ebuild:
   broken with keyservers. -* keyworded temporaly
diff --git a/app-crypt/gnupg/Manifest b/app-crypt/gnupg/Manifest
index ccb8e8fd7b99..e26e58f949bf 100644
--- a/app-crypt/gnupg/Manifest
+++ b/app-crypt/gnupg/Manifest
@@ -5,6 +5,7 @@ MD5 aaaeeeff8a9b06ba7f0eb28f6bbf336d gnupg-1.9.14.ebuild 3077
 MD5 afbd0db2e66222db5fec6282c641ff3c gnupg-1.9.15-r1.ebuild 3070
 MD5 84cf85e579f860997c9830a66eec8dd7 gnupg-1.4.0-r2.ebuild 5180
 MD5 bb91a985f901f48470f51c2a084fa5cb gnupg-1.9.16.ebuild 3452
+MD5 ad08b9d20a70de793f9884d1484f9f5e gnupg-1.4.1-r1.ebuild 6339
 MD5 69888aacc50184d8b0722eec700070ef gnupg-1.4.1.ebuild 6268
 MD5 527be2270ba749a917433938c9ea96e8 ChangeLog 18463
 MD5 b507ee36c7487372de42cc9dab034370 metadata.xml 481
@@ -14,6 +15,7 @@ MD5 c3a43a1e5da266ef33222f721e05fd63 files/digest-gnupg-1.2.6 117
 MD5 4b92f911e900cfd1a37439bd19412f5d files/digest-gnupg-1.4.1 190
 MD5 a8d4b32b219641e9b9df83b581a935ba files/digest-gnupg-1.4.0-r1 117
 MD5 9e4bb59ff6cbb14c85cf044408669ccd files/digest-gnupg-1.4.0-r2 190
+MD5 4b92f911e900cfd1a37439bd19412f5d files/digest-gnupg-1.4.1-r1 190
 MD5 dd317d852aed29e96c5a542f00d0766e files/gnupg-1.2.6-ppc64.patch 454
 MD5 e62b7134c5c0c1b3aad6a08bfdf99b48 files/digest-gnupg-1.9.15-r1 66
 MD5 a614d4d6eb27b31d9b4651c349b31c3e files/digest-gnupg-1.9.14 65
diff --git a/app-crypt/gnupg/files/digest-gnupg-1.4.1-r1 b/app-crypt/gnupg/files/digest-gnupg-1.4.1-r1
new file mode 100644
index 000000000000..fa28828dd944
--- /dev/null
+++ b/app-crypt/gnupg/files/digest-gnupg-1.4.1-r1
@@ -0,0 +1,3 @@
+MD5 fdfc5553d0904cd65011e47a42a9532c gnupg-1.4.1.tar.bz2 2822791
+MD5 9dc3bc086824a8c7a331f35e09a3e57f idea.c.gz 5216
+MD5 4e7e9d224879e5a3e01cb2ab4c719559 gnupg-1.4.0-ecc0.1.6.diff.bz2 16703
diff --git a/app-crypt/gnupg/gnupg-1.4.1-r1.ebuild b/app-crypt/gnupg/gnupg-1.4.1-r1.ebuild
new file mode 100644
index 000000000000..861ef3dd7a2f
--- /dev/null
+++ b/app-crypt/gnupg/gnupg-1.4.1-r1.ebuild
@@ -0,0 +1,207 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-1.4.1-r1.ebuild,v 1.1 2005/06/17 17:32:19 vanquirius Exp $
+
+inherit eutils flag-o-matic
+
+ECCVER=0.1.6
+ECCVER_GNUPG=1.4.0
+
+DESCRIPTION="The GNU Privacy Guard, a GPL pgp replacement"
+HOMEPAGE="http://www.gnupg.org/"
+SRC_URI="ftp://ftp.gnupg.org/gcrypt/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 ~sparc ~x86"
+IUSE="bzip2 caps curl ecc idea ldap nls readline selinux smartcard usb zlib X"
+
+#static not working yet
+#!static? (
+#			ldap? ( net-nds/openldap )
+#			bzip2? ( app-arch/bzip2 )
+#			zlib? ( sys-libs/zlib )
+#		)
+
+RDEPEND="
+	ldap? ( net-nds/openldap )
+	bzip2? ( app-arch/bzip2 )
+	zlib? ( sys-libs/zlib )
+	nls? ( sys-devel/gettext )
+	curl? ( net-misc/curl )
+	virtual/libc
+	virtual/mta
+	readline? ( sys-libs/readline )
+	smartcard? ( dev-libs/libusb )
+	selinux? ( sec-policy/selinux-gnupg )
+	usb? ( dev-libs/libusb )"
+# waiting on arm arch - bug #76234
+RDEPEND="${RDEPEND}
+	!arm? ( X? ( || ( media-gfx/xloadimage media-gfx/xli ) ) )"
+
+DEPEND="${RDEPEND}
+	dev-lang/perl"
+
+src_unpack() {
+	unpack ${A}
+	# Please read http://www.gnupg.org/why-not-idea.html
+	if use idea; then
+		mv ${WORKDIR}/idea.c ${S}/cipher/idea.c || \
+			ewarn "failed to insert IDEA module"
+	fi
+
+	if use ecc; then
+		# this trickery is because the only reject in the 1.4.0 patch is the
+		# version number!
+		local eccpatch=${WORKDIR}/${PN}-${ECCVER_GNUPG}-ecc${ECCVER}.diff
+		if [ "${ECCVER_GNUPG}" != "${PV}" ]; then
+			einfo "Tweaking PV in ECC patch"
+			sed -i "s/ VERSION='${ECCVER_GNUPG}/ VERSION='${PV}/g" $eccpatch
+		fi
+		EPATCH_OPTS="-p1 -d ${S}" epatch $eccpatch || die "ecc patch failed"
+	fi
+
+	# Fix PIC definitions
+	cd ${S}
+	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
+
+	# Still needed?
+	# Bug #6387, --enable-m-guard causes bus error on sparcs
+	use sparc || myconf="${myconf} --enable-m-guard"
+
+	use ppc-macos || append-ldflags -Wl,-z,now
+
+	# configure doesn't trean --disable-asm correctly
+	use x86 && myconf="${myconf} --enable-asm"
+
+	# waiting on arm bug #76234
+	use arm || myconf="${myconf} `use_enable X photo-viewers`"
+
+	# 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` \
+		`use_with caps capabilities` \
+		`use_with readline` \
+		`use_with usb libusb /usr` \
+		--enable-static-rnd=linux \
+		--libexecdir=/usr/libexec \
+		--enable-sha512 \
+		${myconf} || die
+	# this is because it will run some tests directly
+	gnupg_fixcheckperms
+	emake || die
+
+	# NOTE libexecdir dir is deliberately different from that in the install
+}
+
+src_install() {
+	gnupg_fixcheckperms
+	emake DESTDIR=${D} libexecdir="/usr/libexec/gnupg" install || die
+
+	# caps support makes life easier
+	use caps || fperms u+s /usr/bin/gpg
+
+	# keep the documentation in /usr/share/doc/...
+	rm -rf "${D}/usr/share/gnupg/FAQ" "${D}/usr/share/gnupg/faq.html"
+
+	dodoc AUTHORS BUGS ChangeLog INSTALL NEWS PROJECTS README THANKS \
+		TODO VERSION doc/{FAQ,HACKING,DETAILS,ChangeLog,OpenPGP,faq.raw}
+
+	docinto sgml
+	dodoc doc/*.sgml
+
+	dohtml doc/faq.html
+
+	# 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 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
+	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
+}