diff options
| -rw-r--r-- | dev-java/icedtea-web/ChangeLog | 4 | ||||
| -rw-r--r-- | dev-java/icedtea-web/Manifest | 6 | ||||
| -rw-r--r-- | dev-java/icedtea-web/icedtea-web-1.1.3-r7.ebuild | 7 | ||||
| -rw-r--r-- | dev-java/icedtea-web/icedtea-web-1.1.3.ebuild | 7 |
4 files changed, 19 insertions, 5 deletions
diff --git a/dev-java/icedtea-web/ChangeLog b/dev-java/icedtea-web/ChangeLog index 7c94dd0f..036138f4 100644 --- a/dev-java/icedtea-web/ChangeLog +++ b/dev-java/icedtea-web/ChangeLog @@ -2,6 +2,10 @@ # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 30 Oct 2011; Vlastimil Babka <caster@gentoo.org> icedtea-web-1.1.3.ebuild, + icedtea-web-1.1.3-r7.ebuild: + Prepare for icedtea VMHANDLE changes. + 30 Oct 2011; Vlastimil Babka <caster@gentoo.org> -icedtea-web-1.0.4.ebuild, -icedtea-web-1.0.4-r7.ebuild, -icedtea-web-1.1.1.ebuild, -icedtea-web-1.1.1-r7.ebuild, -icedtea-web-1.1.2.ebuild, diff --git a/dev-java/icedtea-web/Manifest b/dev-java/icedtea-web/Manifest index bd849cdd..ede63700 100644 --- a/dev-java/icedtea-web/Manifest +++ b/dev-java/icedtea-web/Manifest @@ -1,7 +1,7 @@ AUX 0001-Support-using-NPAPI-SDK-headers-instead-of-whole-xul.patch 1210 RMD160 d151ee610070429d73d676e07a4bc9b876f1b5b0 SHA1 3a9983dabe0387e9bc396326d937e98830fdaf34 SHA256 90ad27ff80dc42159aef9f4950511328f4ed78941911ce1f89608c08632808c7 AUX 0002-Respect-LDFLAGS.patch 352 RMD160 350d3e85929372dc4193834e6994787aceed7003 SHA1 66a60a87bf6b5487a55e036bef9df42918988b9d SHA256 3e4660e84420e2ae85b00eef40e7e20c0df2c6965fda6827ab025e8167e8f866 DIST icedtea-web-1.1.3.tar.gz 810141 RMD160 7f3c7063e538d15730337e1991fe9f1038cf83fe SHA1 5c8d8fbbdc9db0b7113a6cced751c428b4d3ea37 SHA256 012390dfa8bb9a4b17b30640dfc21011c848f5017d2a21d945e933f5d514edb3 -EBUILD icedtea-web-1.1.3-r7.ebuild 4166 RMD160 3b6eede244d97b9c605c5edd78e67c3f32bbf120 SHA1 72ac0a7cfb5c306de52261732acedca45fe3a0ed SHA256 d1df5e1090536da012ad9b01c1972b21a7bab28c5f2e8f92ea038978ca219713 -EBUILD icedtea-web-1.1.3.ebuild 4078 RMD160 1d6a5e1da68dfb05333ae057dafa7376e63363c4 SHA1 a70db8bdb07a7d9a50891d471aae4428b5ea8bdd SHA256 df54544b42efa9687b423b3daad11dc0a293c755993b9578e26f294a9df3ed05 -MISC ChangeLog 4260 RMD160 fcef2de457d751ff8814a100ff25db82758b7419 SHA1 09bc66d92589e807324a402763091fbc06a0186e SHA256 2a2f17007432bd5b21a4d5a1e7233711bff7a82e3f3be5f06d694eda2fc145bb +EBUILD icedtea-web-1.1.3-r7.ebuild 4286 RMD160 0da15b4f67d0d206b80dbe55e7c2bc6e7e692d48 SHA1 2b6d34894e2a6d79d4728d6d0d8f284e702b1dc8 SHA256 78e8bbbb79ac316740465e429caefc1998252c0ef0a3519a66523bf1fa5a4618 +EBUILD icedtea-web-1.1.3.ebuild 4198 RMD160 73959cfae00182f961c2f89a0f2301f4c886ff82 SHA1 3c163f9d96c36453cbbbe7a99425dc5de9265ff1 SHA256 ea7f81251fc65490e5b32c12ba5080160626a13d0614fa0cb11598c3ce10cd68 +MISC ChangeLog 4409 RMD160 667e22072a4bed0bd027920a8b6ad8d647225286 SHA1 a197283d0675c6bc360ef3e1b01475155b61c492 SHA256 9ba09bb944cbde7ef458282a32669376cb82085ab7a92090090e6b6d04eeff24 MISC metadata.xml 443 RMD160 a2bfb7f863c94745550d4aebc1f19564fa09314c SHA1 09a86a74d70473db1f0a54d30a6097643b05a763 SHA256 7cf17d4708e0cb7051686986429baa43dc1345d3f295e57d7a020a637473e217 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 diff --git a/dev-java/icedtea-web/icedtea-web-1.1.3.ebuild b/dev-java/icedtea-web/icedtea-web-1.1.3.ebuild index 8230355c..29d36f25 100644 --- a/dev-java/icedtea-web/icedtea-web-1.1.3.ebuild +++ b/dev-java/icedtea-web/icedtea-web-1.1.3.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 |