Changed !X use dependancy to X as per bug #76225

5 files changed, 25 insertions, 14 deletions

diff --git a/app-crypt/gnupg/ChangeLog b/app-crypt/gnupg/ChangeLog
index c78facd392f5..5a308c2c864f 100644
--- a/app-crypt/gnupg/ChangeLog
+++ b/app-crypt/gnupg/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-crypt/gnupg
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/ChangeLog,v 1.89 2004/12/31 08:44:25 corsair Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/ChangeLog,v 1.90 2004/12/31 14:50:11 dragonheart Exp $
+
+  01 Jan 2005; Daniel Black <dragonheart@gentoo.org> gnupg-1.4.0.ebuild:
+  Changed !X use dependancy to X as per bug #76225. Thanks to Bjarke Istrup
+  Pedersen <Bjarke.ip@tekpunkt.dk> for pointing out the error of my ways
 
   31 Dec 2004; Markus Rothe <corsair@gentoo.org>
   +files/gnupg-1.2.6-ppc64.patch, gnupg-1.2.6.ebuild:
diff --git a/app-crypt/gnupg/gnupg-1.2.4.ebuild b/app-crypt/gnupg/gnupg-1.2.4.ebuild
index 86b66f2ee06a..d8aceb461e83 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-2004 Gentoo Foundation
+# 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.25 2004/12/07 12:54:06 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-1.2.4.ebuild,v 1.26 2004/12/31 14:50:11 dragonheart Exp $
 
 inherit eutils flag-o-matic
 
diff --git a/app-crypt/gnupg/gnupg-1.2.6.ebuild b/app-crypt/gnupg/gnupg-1.2.6.ebuild
index c958e4058c11..aec1478ddf66 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-2004 Gentoo Foundation
+# 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.18 2004/12/31 08:44:25 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-1.2.6.ebuild,v 1.19 2004/12/31 14:50:11 dragonheart Exp $
 
 inherit eutils flag-o-matic
 
diff --git a/app-crypt/gnupg/gnupg-1.4.0.ebuild b/app-crypt/gnupg/gnupg-1.4.0.ebuild
index 5c8a90e65b03..35227cf502b4 100644
--- a/app-crypt/gnupg/gnupg-1.4.0.ebuild
+++ b/app-crypt/gnupg/gnupg-1.4.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# 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.0.ebuild,v 1.1 2004/12/19 03:19:32 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-1.4.0.ebuild,v 1.2 2004/12/31 14:50:11 dragonheart Exp $
 
 inherit eutils flag-o-matic
 
@@ -12,8 +12,12 @@ SRC_URI="ftp://ftp.gnupg.org/gcrypt/gnupg/${P}.tar.bz2
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc-macos ~s390 ~sparc ~x86 ~ia64 ~mips ~ppc64"
-IUSE="X ldap nls smartcard readline caps zlib idea bzip2 selinux"
+IUSE="ldap nls readline caps zlib idea bzip2 selinux"
 #static not working yet
+#
+# Disabling X and usb until dependancies has sufficient keywords
+# X
+# smartcard
 
 #!static? (
 #			ldap? ( net-nds/openldap )
@@ -25,12 +29,14 @@ RDEPEND="
 	ldap? ( net-nds/openldap )
 	bzip2? ( app-arch/bzip2 )
 	zlib? ( sys-libs/zlib )
-	!X? ( media-gfx/xloadimage media-gfx/xli )
 	nls? ( sys-devel/gettext )
-	smartcard? ( dev-libs/libusb )
 	virtual/libc
 	readline? ( sys-libs/readline )"
 
+
+#	X? ( media-gfx/xloadimage media-gfx/xli )
+#	smartcard? ( dev-libs/libusb )
+
 # 	dev-lang/perl
 #	virtual/mta
 
@@ -39,10 +45,11 @@ DEPEND="ldap? ( net-nds/openldap )
 	nls? ( sys-devel/gettext )
 	zlib? ( sys-libs/zlib )
 	bzip2? ( app-arch/bzip2 )
-	smartcard? ( dev-libs/libusb )
 	dev-lang/perl
 	virtual/libc"
 
+#	smartcard? ( dev-libs/libusb )
+
 src_unpack() {
 	unpack ${A}
 	# Please read http://www.gnupg.org/why-not-idea.html
diff --git a/app-crypt/gnupg/gnupg-1.9.10.ebuild b/app-crypt/gnupg/gnupg-1.9.10.ebuild
index 3118cce6629d..73e23af5d250 100644
--- a/app-crypt/gnupg/gnupg-1.9.10.ebuild
+++ b/app-crypt/gnupg/gnupg-1.9.10.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# 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.8 2004/12/07 12:54:06 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-1.9.10.ebuild,v 1.9 2004/12/31 14:50:11 dragonheart Exp $
 
 inherit eutils flag-o-matic