Fixing modular X dep

Package-Manager: portage-2.1_pre6-r3

diff --git a/app-misc/joy2key/ChangeLog b/app-misc/joy2key/ChangeLog
index 771ca603b3bacf344367b9b01116f8c0f752811e..e10ba7b4269f22a7cd5ea79ebba8616620fa0629 100644 (file)
--- a/app-misc/joy2key/ChangeLog
+++ b/app-misc/joy2key/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-misc/joy2key
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/joy2key/ChangeLog,v 1.12 2005/07/31 11:09:26 dholm Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/joy2key/ChangeLog,v 1.13 2006/03/15 16:01:00 caleb Exp $
+
+  15 Mar 2006; Caleb Tennis <caleb@gentoo.org> joy2key-1.6.ebuild,
+  joy2key-1.6.1.ebuild:
+  Fixing modular X dep
 
   31 Jul 2005; David Holm <dholm@gentoo.org> joy2key-1.6.1.ebuild:
   Added to ~ppc.

diff --git a/app-misc/joy2key/joy2key-1.6.1.ebuild b/app-misc/joy2key/joy2key-1.6.1.ebuild
index 35e1b454209dc8eb8ba8d1fdc861eb714a2d5193..856469b6ab21dd947f1441881c8410409ccaf5c9 100644 (file)
--- a/app-misc/joy2key/joy2key-1.6.1.ebuild
+++ b/app-misc/joy2key/joy2key-1.6.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/joy2key/joy2key-1.6.1.ebuild,v 1.2 2005/07/31 11:09:26 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/joy2key/joy2key-1.6.1.ebuild,v 1.3 2006/03/15 16:01:00 caleb Exp $
 
 inherit eutils
 
@@ -13,7 +13,7 @@ LICENSE="GPL-2"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="X"
 
-DEPEND="X? ( virtual/x11 )"
+DEPEND="X? ( || ( x11-libs/libX11 virtual/x11 ) )"
 
 src_unpack() {
        unpack ${A}

diff --git a/app-misc/joy2key/joy2key-1.6.ebuild b/app-misc/joy2key/joy2key-1.6.ebuild
index 50c54512677b8347d3c77299ae7833cc477c19a0..bcb14cc98a523412a8374b1e7257402159057fbb 100644 (file)
--- a/app-misc/joy2key/joy2key-1.6.ebuild
+++ b/app-misc/joy2key/joy2key-1.6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/joy2key/joy2key-1.6.ebuild,v 1.20 2005/04/21 19:26:23 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/joy2key/joy2key-1.6.ebuild,v 1.21 2006/03/15 16:01:00 caleb Exp $
 
 inherit eutils
 
@@ -13,7 +13,7 @@ LICENSE="GPL-2"
 KEYWORDS="x86 amd64"
 IUSE="X"
 
-DEPEND="X? ( virtual/x11 )"
+DEPEND="X? ( || ( x11-libs/libX11 virtual/x11 ) )"
 
 src_unpack() {
        unpack ${A}