diff options
| author |   Ralph Sennhauser <sera@gentoo.org> | 2012-03-14 16:54:54 +0000 |
|---|---|---|
| committer | Ralph Sennhauser <sera@gentoo.org> | 2012-03-14 16:54:54 +0000 |
| commit | 4ba953e20941b6fc19db973bf6649a611e943611 (patch) | |
| tree | 37032fe0faea987e1709140c5a6923e4aa7fd518 /dev-java | |
| parent | Version bumped. Fixed emacs and xemacs related issue, bug #406053. Added ruby... (diff) | |
| download | gentoo-2-4ba953e20941b6fc19db973bf6649a611e943611.tar.gz gentoo-2-4ba953e20941b6fc19db973bf6649a611e943611.tar.bz2 gentoo-2-4ba953e20941b6fc19db973bf6649a611e943611.zip | |
Use JAVA_PKG_WANT_BUILD_VM for selecting VM. Obsoletes handle migration code.
(Portage version: 2.1.10.49/cvs/Linux x86_64)
Diffstat (limited to 'dev-java')
| -rw-r--r-- | dev-java/icedtea-web/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-java/icedtea-web/icedtea-web-1.2-r7.ebuild | 25 | ||||
| -rw-r--r-- | dev-java/icedtea-web/icedtea-web-1.2.ebuild | 25 |
3 files changed, 13 insertions, 43 deletions
diff --git a/dev-java/icedtea-web/ChangeLog b/dev-java/icedtea-web/ChangeLog index 6d0c6b672a90..6b9c0a357d75 100644 --- a/dev-java/icedtea-web/ChangeLog +++ b/dev-java/icedtea-web/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-java/icedtea-web # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-web/ChangeLog,v 1.19 2012/03/06 09:24:22 sera Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-web/ChangeLog,v 1.20 2012/03/14 16:54:54 sera Exp $ + + 14 Mar 2012; Ralph Sennhauser <sera@gentoo.org> icedtea-web-1.2.ebuild, + icedtea-web-1.2-r7.ebuild: + Use JAVA_PKG_WANT_BUILD_VM for selecting VM. Obsoletes handle migration code. *icedtea-web-1.2-r7 (06 Mar 2012) *icedtea-web-1.2 (06 Mar 2012) diff --git a/dev-java/icedtea-web/icedtea-web-1.2-r7.ebuild b/dev-java/icedtea-web/icedtea-web-1.2-r7.ebuild index 5ef2bff1df70..269122674e5f 100644 --- a/dev-java/icedtea-web/icedtea-web-1.2-r7.ebuild +++ b/dev-java/icedtea-web/icedtea-web-1.2-r7.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 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.2-r7.ebuild,v 1.1 2012/03/06 09:24:22 sera Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-web/icedtea-web-1.2-r7.ebuild,v 1.2 2012/03/14 16:54:54 sera Exp $ # Build written by Andrew John Hughes (ahughes@redhat.com) EAPI="4" @@ -26,28 +26,11 @@ DEPEND="${RDEPEND} >=net-libs/xulrunner-1.9.1 ) ) test? ( >=dev-java/junit-4.8:4 )" -# a bit of hack so the VM switching is triggered without causing dependency troubles -JAVA_PKG_NV_DEPEND=">=virtual/jdk-1.6" -JAVA_PKG_WANT_SOURCE="1.6" -JAVA_PKG_WANT_TARGET="1.6" - pkg_setup() { - [[ "${MERGE_TYPE}" == "binary" ]] && return # bug 258423 - - # quite a hack since java-config does not provide a way for a package - # to limit supported VM's for building and their preferred order - if [[ -n "${JAVA_PKG_FORCE_VM}" ]]; then - einfo "Honoring user-set JAVA_PKG_FORCE_VM" - else - # migration logic - if [[ -L /usr/lib/jvm/icedtea${SLOT} ]]; then - JAVA_PKG_FORCE_VM="icedtea${SLOT}" - else - JAVA_PKG_FORCE_VM="icedtea-${SLOT}" - fi - fi + JAVA_PKG_WANT_BUILD_VM="icedtea-7 icedtea7" + JAVA_PKG_WANT_SOURCE="1.6" + JAVA_PKG_WANT_TARGET="1.6" - einfo "Forced vm ${JAVA_PKG_FORCE_VM}" java-vm-2_pkg_setup java-pkg-2_pkg_setup } diff --git a/dev-java/icedtea-web/icedtea-web-1.2.ebuild b/dev-java/icedtea-web/icedtea-web-1.2.ebuild index 614615ad12b5..ef8a381a6271 100644 --- a/dev-java/icedtea-web/icedtea-web-1.2.ebuild +++ b/dev-java/icedtea-web/icedtea-web-1.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 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.2.ebuild,v 1.1 2012/03/06 09:24:22 sera Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-web/icedtea-web-1.2.ebuild,v 1.2 2012/03/14 16:54:54 sera Exp $ # Build written by Andrew John Hughes (ahughes@redhat.com) EAPI="4" @@ -26,28 +26,11 @@ DEPEND="${RDEPEND} >=net-libs/xulrunner-1.9.1 ) ) test? ( >=dev-java/junit-4.8:4 )" -# a bit of hack so the VM switching is triggered without causing dependency troubles -JAVA_PKG_NV_DEPEND=">=virtual/jdk-1.6" -JAVA_PKG_WANT_SOURCE="1.6" -JAVA_PKG_WANT_TARGET="1.6" - pkg_setup() { - [[ "${MERGE_TYPE}" == "binary" ]] && return # bug 258423 - - # quite a hack since java-config does not provide a way for a package - # to limit supported VM's for building and their preferred order - if [[ -n "${JAVA_PKG_FORCE_VM}" ]]; then - einfo "Honoring user-set JAVA_PKG_FORCE_VM" - else - # migration logic - if [[ -L /usr/lib/jvm/icedtea${SLOT} ]]; then - JAVA_PKG_FORCE_VM="icedtea${SLOT}" - else - JAVA_PKG_FORCE_VM="icedtea-${SLOT}" - fi - fi + JAVA_PKG_WANT_BUILD_VM="icedtea-6 icedtea6" + JAVA_PKG_WANT_SOURCE="1.6" + JAVA_PKG_WANT_TARGET="1.6" - einfo "Forced vm ${JAVA_PKG_FORCE_VM}" java-vm-2_pkg_setup java-pkg-2_pkg_setup } |