From ec7230c4c80c2d113acf5c51fd3bb0d7e1fa0030 Mon Sep 17 00:00:00 2001 From: Vlastimil Babka Date: Sun, 30 Oct 2011 09:55:15 +0000 Subject: Prepare for icedtea VMHANDLE changes. (Portage version: 2.2.0_alpha68/svn/Linux x86_64, RepoMan options: --force, unsigned Manifest commit) svn path=/java-overlay/; revision=8868 --- dev-java/icedtea-web/icedtea-web-1.1.3-r7.ebuild | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'dev-java/icedtea-web/icedtea-web-1.1.3-r7.ebuild') diff --git a/dev-java/icedtea-web/icedtea-web-1.1.3-r7.ebuild b/dev-java/icedtea-web/icedtea-web-1.1.3-r7.ebuild index 4d4b3720..d81960c3 100644 --- a/dev-java/icedtea-web/icedtea-web-1.1.3-r7.ebuild +++ b/dev-java/icedtea-web/icedtea-web-1.1.3-r7.ebuild @@ -34,7 +34,12 @@ pkg_setup() { if [[ -n "${JAVA_PKG_FORCE_VM}" ]]; then einfo "Honoring user-set JAVA_PKG_FORCE_VM" elif has_version dev-java/icedtea:${SLOT}; then - JAVA_PKG_FORCE_VM="icedtea${SLOT}" + # migration logic + if [[ -L /usr/lib/jvm/icedtea${SLOT} ]]; then + JAVA_PKG_FORCE_VM="icedtea${SLOT}" + else + JAVA_PKG_FORCE_VM="icedtea-${SLOT}" + fi else JAVA_PKG_FORCE_VM="" # don't die just yet if merging a binpkg - bug #258423 -- cgit v1.2.3-65-gdbad