diff options
Diffstat (limited to 'app-emulation')
4 files changed, 39 insertions, 46 deletions
diff --git a/app-emulation/emul-linux-x86-java/ChangeLog b/app-emulation/emul-linux-x86-java/ChangeLog index 281d555506ef..f48694ad30b6 100644 --- a/app-emulation/emul-linux-x86-java/ChangeLog +++ b/app-emulation/emul-linux-x86-java/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-emulation/emul-linux-x86-java # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-java/ChangeLog,v 1.34 2007/07/12 21:16:22 betelgeuse Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-java/ChangeLog,v 1.35 2007/07/22 09:18:53 omp Exp $ + + 22 Jul 2007; David Shakaryan <omp@gentoo.org> + emul-linux-x86-java-1.5.0.11.ebuild, emul-linux-x86-java-1.6.0.ebuild, + emul-linux-x86-java-1.6.0-r1.ebuild: + Remove virtual/x11 from dependencies. 12 Jul 2007; Petteri Räty <betelgeuse@gentoo.org> metadata.xml: Remove herbs from metadata.xml as in reality this has been maintained by us diff --git a/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.5.0.11.ebuild b/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.5.0.11.ebuild index e8bd75a8ca1f..e2d43551271d 100644 --- a/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.5.0.11.ebuild +++ b/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.5.0.11.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.5.0.11.ebuild,v 1.4 2007/07/02 13:54:09 peper Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.5.0.11.ebuild,v 1.5 2007/07/22 09:18:53 omp Exp $ inherit java-vm-2 eutils @@ -21,20 +21,16 @@ IUSE="X alsa nsplugin" JAVA_VM_NO_GENERATION1=true RDEPEND="alsa? ( media-libs/alsa-lib ) - X? ( || ( ( x11-libs/libICE - x11-libs/libSM - x11-libs/libX11 - x11-libs/libXau - x11-libs/libXdmcp - x11-libs/libXext - x11-libs/libXi - x11-libs/libXp - x11-libs/libXt - x11-libs/libXtst - ) - virtual/x11 - ) - )" + X? ( x11-libs/libICE + x11-libs/libSM + x11-libs/libX11 + x11-libs/libXau + x11-libs/libXdmcp + x11-libs/libXext + x11-libs/libXi + x11-libs/libXp + x11-libs/libXt + x11-libs/libXtst )" JAVA_PROVIDE="jdbc-stdext jdbc-rowset" diff --git a/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0-r1.ebuild b/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0-r1.ebuild index bb742f44d2d0..806263cddf83 100644 --- a/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0-r1.ebuild +++ b/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0-r1.ebuild,v 1.2 2007/07/02 13:54:09 peper Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0-r1.ebuild,v 1.3 2007/07/22 09:18:53 omp Exp $ inherit pax-utils java-vm-2 eutils @@ -22,20 +22,16 @@ IUSE="X alsa nsplugin" JAVA_VM_NO_GENERATION1=true RDEPEND="alsa? ( media-libs/alsa-lib ) - X? ( || ( ( x11-libs/libICE - x11-libs/libSM - x11-libs/libX11 - x11-libs/libXau - x11-libs/libXdmcp - x11-libs/libXext - x11-libs/libXi - x11-libs/libXp - x11-libs/libXt - x11-libs/libXtst - ) - virtual/x11 - ) - )" + X? ( x11-libs/libICE + x11-libs/libSM + x11-libs/libX11 + x11-libs/libXau + x11-libs/libXdmcp + x11-libs/libXext + x11-libs/libXi + x11-libs/libXp + x11-libs/libXt + x11-libs/libXtst )" JAVA_PROVIDE="jdbc-stdext jdbc-rowset" diff --git a/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.ebuild b/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.ebuild index 74ee4d2a58a2..2054ef05f92d 100644 --- a/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.ebuild +++ b/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.ebuild,v 1.4 2007/07/02 13:54:09 peper Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.ebuild,v 1.5 2007/07/22 09:18:53 omp Exp $ inherit java-vm-2 eutils @@ -22,20 +22,16 @@ IUSE="X alsa nsplugin" JAVA_VM_NO_GENERATION1=true RDEPEND="alsa? ( media-libs/alsa-lib ) - X? ( || ( ( x11-libs/libICE - x11-libs/libSM - x11-libs/libX11 - x11-libs/libXau - x11-libs/libXdmcp - x11-libs/libXext - x11-libs/libXi - x11-libs/libXp - x11-libs/libXt - x11-libs/libXtst - ) - virtual/x11 - ) - )" + X? ( x11-libs/libICE + x11-libs/libSM + x11-libs/libX11 + x11-libs/libXau + x11-libs/libXdmcp + x11-libs/libXext + x11-libs/libXi + x11-libs/libXp + x11-libs/libXt + x11-libs/libXtst )" JAVA_PROVIDE="jdbc-stdext jdbc-rowset" |