Updated x11-misc/xloadimage to media-gfx/xloadimage and added media-gfx/xli as second candidate. See bug #26751

6 files changed, 28 insertions, 17 deletions

diff --git a/app-crypt/gnupg/ChangeLog b/app-crypt/gnupg/ChangeLog
index 182f0a8aba6d..0804501d5257 100644
--- a/app-crypt/gnupg/ChangeLog
+++ b/app-crypt/gnupg/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-crypt/gnupg
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/ChangeLog,v 1.52 2004/03/09 23:10:02 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/ChangeLog,v 1.53 2004/03/13 12:37:48 usata Exp $
+
+  13 Mar 2004; Mamoru KOMACHI <usata@gentoo.org> gnupg-1.2.3-r2.ebuild,
+  gnupg-1.2.3-r5.ebuild, gnupg-1.2.4.ebuild, gnupg-1.9.0.ebuild:
+  Updated x11-misc/xloadimage to media-gfx/xloadimage and added
+  media-gfx/xli as second candidate. See bug #26751
 
   09 Mar 2004; <agriffis@gentoo.org> gnupg-1.2.4.ebuild:
   stable on alpha and ia64
diff --git a/app-crypt/gnupg/Manifest b/app-crypt/gnupg/Manifest
index da44cc560df4..1e8546c84797 100644
--- a/app-crypt/gnupg/Manifest
+++ b/app-crypt/gnupg/Manifest
@@ -1,12 +1,12 @@
-MD5 467e96cadbcbe9ecdee0821d94ac3b9b ChangeLog 8251
-MD5 072f61d866c10a92551a18359b94954e gnupg-1.2.3-r2.ebuild 1634
+MD5 f87545872e379995cdccf6fe7e144c66 gnupg-1.2.3-r2.ebuild 1653
+MD5 b1ea12e4f45be6b44b4b704f394d5985 ChangeLog 8502
+MD5 2b8240836f86729adb0c218f9bb7df37 gnupg-1.2.3-r5.ebuild 3649
+MD5 dd3ebd73274ade440300f5f85758a3b8 gnupg-1.2.4.ebuild 4210
 MD5 ad53378ee0bb633bb019209272913196 metadata.xml 484
-MD5 7b65b4c459a23ff71288da7d9c42fd09 gnupg-1.2.4.ebuild 4191
-MD5 05a3b45417e616636aabbfba6c7fbc75 gnupg-1.2.3-r5.ebuild 3631
-MD5 76eafb32c57c24658d25591609cfc21a gnupg-1.9.0.ebuild 2784
-MD5 7f0e728ae9c6810cb9c61500fdc39fc9 files/digest-gnupg-1.2.4 117
+MD5 4b330ca7675fe5ac0f2278819ba1eb08 gnupg-1.9.0.ebuild 2921
 MD5 eecb1b58574b61ddac7c3d12b0143b7d files/digest-gnupg-1.2.3-r2 65
-MD5 df557d150f1c32564de9c0f66b47997a files/digest-gnupg-1.9.0 116
 MD5 eecb1b58574b61ddac7c3d12b0143b7d files/digest-gnupg-1.2.3-r5 65
+MD5 7f0e728ae9c6810cb9c61500fdc39fc9 files/digest-gnupg-1.2.4 117
 MD5 b12193638991111d4dc2c9864fa8e15a files/gnupg-1.2.3-disable-elgamal.diff 12554
 MD5 db3c4c4fe234f87d269216f6e0be8817 files/gnupg-1.2.3-hkp-format-string.diff 922
+MD5 df557d150f1c32564de9c0f66b47997a files/digest-gnupg-1.9.0 116
diff --git a/app-crypt/gnupg/gnupg-1.2.3-r2.ebuild b/app-crypt/gnupg/gnupg-1.2.3-r2.ebuild
index 678c0bcaa3ed..3e544b6bb76e 100644
--- a/app-crypt/gnupg/gnupg-1.2.3-r2.ebuild
+++ b/app-crypt/gnupg/gnupg-1.2.3-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-1.2.3-r2.ebuild,v 1.9 2004/02/23 12:49:07 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-1.2.3-r2.ebuild,v 1.10 2004/03/13 12:37:49 usata Exp $
 
 DESCRIPTION="The GNU Privacy Guard, a GPL pgp replacement"
 HOMEPAGE="http://www.gnupg.org/"
@@ -12,7 +12,7 @@ KEYWORDS="x86 alpha ~sparc hppa ia64"
 IUSE="X zlib ldap nls"
 
 DEPEND="dev-lang/perl
-	X? ( x11-misc/xloadimage )
+	X? ( || ( media-gfx/xloadimage media-gfx/xli ) )
 	zlib? ( sys-libs/zlib )
 	ldap? ( net-nds/openldap )"
 RDEPEND="nls? ( sys-devel/gettext )"
diff --git a/app-crypt/gnupg/gnupg-1.2.3-r5.ebuild b/app-crypt/gnupg/gnupg-1.2.3-r5.ebuild
index 2cf7fd8bd344..ba8da13294a5 100644
--- a/app-crypt/gnupg/gnupg-1.2.3-r5.ebuild
+++ b/app-crypt/gnupg/gnupg-1.2.3-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-1.2.3-r5.ebuild,v 1.7 2004/02/23 12:49:07 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-1.2.3-r5.ebuild,v 1.8 2004/03/13 12:37:49 usata Exp $
 
 inherit eutils flag-o-matic
 
@@ -15,7 +15,7 @@ IUSE="X ldap nls static caps"
 RDEPEND="!static? ( ldap? ( net-nds/openldap )
 		caps? ( sys-libs/libcap )
 		sys-libs/zlib )
-	X? ( x11-misc/xloadimage )
+	X? ( || ( media-gfx/xloadimage media-gfx/xli ) )
 	nls? ( sys-devel/gettext )
 	virtual/glibc
 	dev-lang/perl
diff --git a/app-crypt/gnupg/gnupg-1.2.4.ebuild b/app-crypt/gnupg/gnupg-1.2.4.ebuild
index a105285b386b..1bc68da7c5e3 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 Technologies, Inc.
 # 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.11 2004/03/09 23:10:02 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-1.2.4.ebuild,v 1.12 2004/03/13 12:37:49 usata Exp $
 
 inherit eutils flag-o-matic
 
@@ -23,7 +23,7 @@ RDEPEND="!static? ( ldap? ( net-nds/openldap )
 		caps? ( sys-libs/libcap )
 		app-arch/bzip2
 		sys-libs/zlib )
-	X? ( x11-misc/xloadimage )
+	X? ( || ( media-gfx/xloadimage media-gfx/xli ) )
 	nls? ( sys-devel/gettext )
 	virtual/glibc
 	dev-lang/perl"
diff --git a/app-crypt/gnupg/gnupg-1.9.0.ebuild b/app-crypt/gnupg/gnupg-1.9.0.ebuild
index f17ff7a6bc42..a98be2792cdb 100644
--- a/app-crypt/gnupg/gnupg-1.9.0.ebuild
+++ b/app-crypt/gnupg/gnupg-1.9.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-1.9.0.ebuild,v 1.1 2004/01/06 17:46:23 taviso Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-1.9.0.ebuild,v 1.2 2004/03/13 12:37:49 usata Exp $
 
 inherit eutils
 
@@ -21,7 +21,7 @@ IUSE="X ldap nls caps"
 RDEPEND="!static? ( ldap? ( net-nds/openldap )
 		caps? ( sys-libs/libcap )
 		sys-libs/zlib )
-	X? ( x11-misc/xloadimage )
+	X? ( || ( media-gfx/xloadimage media-gfx/xli ) )
 	nls? ( sys-devel/gettext )
 	>=dev-libs/libgcrypt-1.1.42
 	>=dev-libs/libksba-0.4.7
@@ -55,7 +55,13 @@ src_compile() {
 	fi
 
 	if use X; then
-		myconf="${myconf} --with-photo-viewer=/usr/bin/xloadimage"
+		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