From: Caleb Tennis Date: Wed, 15 Mar 2006 16:01:00 +0000 (+0000) Subject: Fixing modular X dep X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=9357dbb95c10bb036b085c5d27d487c79d6bb796;p=gentoo.git Fixing modular X dep Package-Manager: portage-2.1_pre6-r3 --- diff --git a/app-misc/joy2key/ChangeLog b/app-misc/joy2key/ChangeLog index 771ca603b3ba..e10ba7b4269f 100644 --- 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 joy2key-1.6.ebuild, + joy2key-1.6.1.ebuild: + Fixing modular X dep 31 Jul 2005; David Holm 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 35e1b454209d..856469b6ab21 100644 --- 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 50c54512677b..bcb14cc98a52 100644 --- 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}