Added selinux RDEPENDS as per bug #79746. Removed version 1.9.10.

(Portage version: 2.0.51-r15)

7 files changed, 33 insertions, 135 deletions

diff --git a/app-crypt/gnupg/ChangeLog b/app-crypt/gnupg/ChangeLog
index c7784b7a9e73..8dfaa8ffe438 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.99 2005/01/23 10:17:33 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/ChangeLog,v 1.100 2005/01/27 18:55:06 dragonheart Exp $
+
+  28 Jan 2005; Daniel Black <dragonheart@gentoo.org> gnupg-1.2.4.ebuild,
+  gnupg-1.2.6.ebuild, -gnupg-1.9.10.ebuild, gnupg-1.9.14.ebuild,
+  gnupg-1.9.15.ebuild:
+  Added selinux RDEPENDS as per bug #79746. Removed version 1.9.10.
 
 *gnupg-1.4.0-r2 (23 Jan 2005)
 *gnupg-1.9.15 (23 Jan 2005)
diff --git a/app-crypt/gnupg/files/digest-gnupg-1.9.10 b/app-crypt/gnupg/files/digest-gnupg-1.9.10
deleted file mode 100644
index 922e315523c5..000000000000
--- a/app-crypt/gnupg/files/digest-gnupg-1.9.10
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d923cfe0921898fbeb66374a0e32ddc6 gnupg-1.9.10.tar.gz 1385472
diff --git a/app-crypt/gnupg/gnupg-1.2.4.ebuild b/app-crypt/gnupg/gnupg-1.2.4.ebuild
index 61e36f5e0f68..f26402ec54a3 100644
--- a/app-crypt/gnupg/gnupg-1.2.4.ebuild
+++ b/app-crypt/gnupg/gnupg-1.2.4.ebuild
@@ -1,6 +1,6 @@
 # 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.2.4.ebuild,v 1.28 2005/01/23 10:17:33 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-1.2.4.ebuild,v 1.29 2005/01/27 18:55:06 dragonheart Exp $
 
 inherit eutils flag-o-matic
 
@@ -12,7 +12,7 @@ SRC_URI="ftp://ftp.gnupg.org/gcrypt/gnupg/${P}.tar.bz2
 LICENSE="GPL-2 idea? ( IDEA )"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86"
-IUSE="X ldap nls static caps idea"
+IUSE="X ldap nls static caps idea selinux"
 
 RDEPEND="!static? ( ldap? ( net-nds/openldap )
 		caps? ( sys-libs/libcap )
@@ -21,10 +21,9 @@ RDEPEND="!static? ( ldap? ( net-nds/openldap )
 	X? ( || ( media-gfx/xloadimage media-gfx/xli ) )
 	nls? ( sys-devel/gettext )
 	virtual/libc
-	dev-lang/perl"
-# XXX: libpcap earlier than 1.10-r3 did not provide libcap.a
-#	DEPEND="caps? ( static? ( >=sys-libs/libcap-1.10-r3 )
-#				!static? ( sys-libs/libcap ) )
+	dev-lang/perl
+	selinux? ( sec-policy/selinux-gnupg )"
+
 DEPEND="caps? ( sys-libs/libcap )
 	ldap? ( net-nds/openldap )
 	nls? ( sys-devel/gettext )
diff --git a/app-crypt/gnupg/gnupg-1.2.6.ebuild b/app-crypt/gnupg/gnupg-1.2.6.ebuild
index 7ca91ac222f3..f314a1e0db1f 100644
--- a/app-crypt/gnupg/gnupg-1.2.6.ebuild
+++ b/app-crypt/gnupg/gnupg-1.2.6.ebuild
@@ -1,6 +1,6 @@
 # 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.2.6.ebuild,v 1.22 2005/01/15 01:08:46 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-1.2.6.ebuild,v 1.23 2005/01/27 18:55:06 dragonheart Exp $
 
 inherit eutils flag-o-matic
 
@@ -12,23 +12,24 @@ SRC_URI="ftp://ftp.gnupg.org/gcrypt/gnupg/${P}.tar.bz2
 LICENSE="GPL-2 idea? ( IDEA )"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ppc ppc-macos s390 sparc x86 ~ia64 ~mips ppc64"
-IUSE="X ldap nls static idea"
+IUSE="X ldap nls static idea selinux"
 
 RDEPEND="!static? ( ldap? ( net-nds/openldap )
 			app-arch/bzip2
 			sys-libs/zlib )
-		X? ( || ( media-gfx/xloadimage media-gfx/xli ) )
-		nls? ( sys-devel/gettext )
-		dev-lang/perl
-		virtual/libc
-		virtual/mta"
+	X? ( || ( media-gfx/xloadimage media-gfx/xli ) )
+	nls? ( sys-devel/gettext )
+	dev-lang/perl
+	virtual/libc
+	virtual/mta
+	selinux? ( sec-policy/selinux-gnupg )"
 
 DEPEND="ldap? ( net-nds/openldap )
-		nls? ( sys-devel/gettext )
-		!static? ( sys-libs/zlib )
-		app-arch/bzip2
-		dev-lang/perl
-		virtual/libc"
+	nls? ( sys-devel/gettext )
+	!static? ( sys-libs/zlib )
+	app-arch/bzip2
+	dev-lang/perl
+	virtual/libc"
 
 src_unpack() {
 	unpack ${A}
diff --git a/app-crypt/gnupg/gnupg-1.9.10.ebuild b/app-crypt/gnupg/gnupg-1.9.10.ebuild
deleted file mode 100644
index aa0d14916928..000000000000
--- a/app-crypt/gnupg/gnupg-1.9.10.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# 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.9.10.ebuild,v 1.12 2005/01/15 01:08:46 dragonheart Exp $
-
-inherit eutils flag-o-matic
-
-DESCRIPTION="The GNU Privacy Guard, a GPL pgp replacement"
-HOMEPAGE="http://www.gnupg.org/"
-SRC_URI="ftp://ftp.gnupg.org/gcrypt/alpha/gnupg/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE="X caps ldap nls smartcard static"
-
-RDEPEND="
-	!static? (
-		ldap? ( net-nds/openldap )
-		caps? ( sys-libs/libcap )
-		sys-libs/zlib
-	)
-	X? ( || ( media-gfx/xloadimage media-gfx/xli ) )
-	nls? ( sys-devel/gettext )
-	>=dev-libs/libgcrypt-1.1.42
-	>=dev-libs/libksba-0.9.7
-	smartcard? ( dev-libs/opensc )
-	virtual/libc
-	dev-lang/perl
-	dev-libs/pth
-	virtual/mta"
-DEPEND="caps? ( sys-libs/libcap )
-	ldap? ( net-nds/openldap )
-	nls? ( sys-devel/gettext )
-	>=dev-libs/libgcrypt-1.1.94
-	>=dev-libs/libksba-0.9.7
-	>=dev-libs/libassuan-0.6.6
-	smartcard? ( dev-libs/opensc )
-	sys-libs/zlib
-	virtual/libc
-	dev-lang/perl
-	dev-libs/pth"
-
-src_compile() {
-	local myconf=""
-	sed -i -e 's/PIC/__PIC__/g' intl/relocatable.c
-	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
-
-	append-ldflags -Wl,-z,now
-
-	econf \
-		--disable-agent \
-		`use_enable smartcard scdaemon` \
-		`use_enable nls` \
-		`use_enable ldap` \
-		`use_with caps capabilities` \
-		${myconf} \
-		|| die
-	emake || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-
-	dosym gpg2 /usr/bin/gpg
-
-	# keep the documentation in /usr/share/doc/...
-	rm -rf "${D}/usr/share/gnupg/FAQ" "${D}/usr/share/gnupg/faq.html"
-
-	dodoc ChangeLog INSTALL NEWS README THANKS TODO VERSION
-
-	if ! use caps ; then
-		fperms u+s /usr/bin/gpg2
-	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
-	ewarn "** WARNING ** WARNING ** WARNING ** WARNING ** WARNING ** WARNING **"
-	ewarn "	THIS IS _ALPHA_ CODE, IT MAY NOT WORK CORRECTLY OR AT ALL. THERE"
-	ewarn "	MAY BE UNDISCOVERED SECURITY OR DATA-LOSS ISSUES, DO NOT USE "
-	ewarn "	IN A PRODUCTION ENVIRONMENT."
-	ewarn ""
-	ewarn "	This ebuild is provided for those who wish to experiment with this"
-	ewarn "	new branch of gnupg and beta-testers, not for general purpose use"
-	ewarn "	by non-developers"
-	ewarn ""
-	ewarn "	Please see #37109"
-	ewarn "** WARNING ** WARNING ** WARNING ** WARNING ** WARNING ** WARNING **"
-
-	einfo "gpg-agent is now provided in app-crypt/gpg-agent"
-	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.14.ebuild b/app-crypt/gnupg/gnupg-1.9.14.ebuild
index e82c84eaa2fd..bdfdf8ec249b 100644
--- a/app-crypt/gnupg/gnupg-1.9.14.ebuild
+++ b/app-crypt/gnupg/gnupg-1.9.14.ebuild
@@ -1,6 +1,6 @@
 # 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.9.14.ebuild,v 1.5 2005/01/23 10:17:33 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-1.9.14.ebuild,v 1.6 2005/01/27 18:55:06 dragonheart Exp $
 
 inherit eutils flag-o-matic
 
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.gnupg.org/gcrypt/alpha/gnupg/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE="X caps ldap nls smartcard static"
+IUSE="X caps ldap nls smartcard static selinux"
 
 RDEPEND="
 	!static? (
@@ -27,7 +27,9 @@ RDEPEND="
 	virtual/libc
 	dev-lang/perl
 	dev-libs/pth
-	virtual/mta"
+	virtual/mta
+	selinux? ( sec-policy/selinux-gnupg )"
+
 DEPEND="caps? ( sys-libs/libcap )
 	ldap? ( net-nds/openldap )
 	nls? ( sys-devel/gettext )
diff --git a/app-crypt/gnupg/gnupg-1.9.15.ebuild b/app-crypt/gnupg/gnupg-1.9.15.ebuild
index e922ee056109..aebc0a54b255 100644
--- a/app-crypt/gnupg/gnupg-1.9.15.ebuild
+++ b/app-crypt/gnupg/gnupg-1.9.15.ebuild
@@ -1,6 +1,6 @@
 # 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.9.15.ebuild,v 1.1 2005/01/23 10:17:33 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-1.9.15.ebuild,v 1.2 2005/01/27 18:55:06 dragonheart Exp $
 
 inherit eutils flag-o-matic
 
@@ -13,7 +13,7 @@ SRC_URI="ftp://ftp.gnupg.org/gcrypt/alpha/gnupg/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE="X caps ldap nls smartcard static threads"
+IUSE="X caps ldap nls smartcard static threads selinux"
 
 RDEPEND="
 	!static? (
@@ -31,7 +31,8 @@ RDEPEND="
 	virtual/libc
 	dev-lang/perl
 	threads? ( >=dev-libs/pth-1.3.7 )
-	virtual/mta"
+	virtual/mta
+	selinux? ( sec-policy/selinux-gnupg )"
 
 DEPEND="caps? ( sys-libs/libcap )
 	ldap? ( net-nds/openldap )