diff options
Diffstat (limited to 'dev-java/icedtea-web/icedtea-web-1.4.2.ebuild')
| -rw-r--r-- | dev-java/icedtea-web/icedtea-web-1.4.2.ebuild | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/dev-java/icedtea-web/icedtea-web-1.4.2.ebuild b/dev-java/icedtea-web/icedtea-web-1.4.2.ebuild index 20bb3764b1c3..111e3eaf261f 100644 --- a/dev-java/icedtea-web/icedtea-web-1.4.2.ebuild +++ b/dev-java/icedtea-web/icedtea-web-1.4.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-web/icedtea-web-1.4.2.ebuild,v 1.1 2014/06/01 20:53:52 caster Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-web/icedtea-web-1.4.2.ebuild,v 1.2 2014/06/27 14:39:37 caster Exp $ # Build written by Andrew John Hughes (ahughes@redhat.com) EAPI="5" @@ -15,16 +15,13 @@ LICENSE="GPL-2 GPL-2-with-linking-exception LGPL-2" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="doc +icedtea7 javascript +nsplugin test" +IUSE="doc javascript +nsplugin test" COMMON_DEP=" - icedtea7? ( || ( - dev-java/icedtea:7 dev-java/icedtea-bin:7 - ) ) - !icedtea7? ( || ( + || ( dev-java/icedtea:7 dev-java/icedtea-bin:7 dev-java/icedtea:6 dev-java/icedtea-bin:6 - ) ) + ) app-admin/eselect-java nsplugin? ( >=dev-libs/glib-2.16 @@ -39,10 +36,7 @@ DEPEND="${COMMON_DEP} # http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2010-December/011221.html pkg_setup() { - JAVA_PKG_WANT_BUILD_VM="icedtea-7 icedtea-bin-7" - if ! use icedtea7; then - JAVA_PKG_WANT_BUILD_VM="${JAVA_PKG_WANT_BUILD_VM} icedtea-6 icedtea-bin-6" - fi + JAVA_PKG_WANT_BUILD_VM="icedtea-7 icedtea-bin-7 icedtea-6 icedtea-bin-6" JAVA_PKG_WANT_SOURCE="1.6" JAVA_PKG_WANT_TARGET="1.6" |