Add icedtea-web:7 slot for icedtea-7.

Package-Manager: portage-2.2.0_alpha68/cvs/Linux x86_64

4 files changed, 170 insertions, 4 deletions

diff --git a/dev-java/icedtea-web/ChangeLog b/dev-java/icedtea-web/ChangeLog
index 169c19237ea9..7e5f894b4efa 100644
--- a/dev-java/icedtea-web/ChangeLog
+++ b/dev-java/icedtea-web/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/icedtea-web
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-web/ChangeLog,v 1.12 2011/11/04 09:39:42 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-web/ChangeLog,v 1.13 2011/11/04 11:19:09 caster Exp $
+
+*icedtea-web-1.1.3-r7 (04 Nov 2011)
+
+  04 Nov 2011; Vlastimil Babka <caster@gentoo.org>
+  +icedtea-web-1.1.3-r7.ebuild:
+  Add icedtea-web:7 slot for icedtea-7.
 
   04 Nov 2011; Vlastimil Babka <caster@gentoo.org> -icedtea-web-1.1.1.ebuild,
   -icedtea-web-1.1.2.ebuild, -icedtea-web-1.1.2-r1.ebuild,
diff --git a/dev-java/icedtea-web/Manifest b/dev-java/icedtea-web/Manifest
index 6150be62b0f8..b0d5f4f3a8f2 100644
--- a/dev-java/icedtea-web/Manifest
+++ b/dev-java/icedtea-web/Manifest
@@ -1,6 +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 4181 RMD160 e00225202a42928da0c5007efe54b5ef9cc43319 SHA1 86ab788a03698618752ba4fccd1fbf2df69f4d3c SHA256 b2a42f38617eb633d2affcbdae3716c9c8e44a160bb5247d8eed90ce3e88ddd0
 EBUILD icedtea-web-1.1.3.ebuild 4195 RMD160 1d61450b58ec4fec85f91f990373754d0f7723da SHA1 6f6ccc4c3e3639583672f52931fbec4be4bd0a82 SHA256 e704b48597cdf1a6538cc1a37f7b938e60de88a6cf435adec9dd2cffba195df4
-MISC ChangeLog 2483 RMD160 aa7746dcf7c4dd8fed0611653471f1fd69b68b1f SHA1 179f9632bcdfcd17e72b785f14ffe832515bcef3 SHA256 35dadcfdc6fd10c68401277cacc05744facc85f498adc16f58bffbf75f9462ac
+MISC ChangeLog 2644 RMD160 fd7f7ca708301640b0f5ece075693596ca8309e6 SHA1 9ad0a9628072781483ac259653316dcaca90186d SHA256 5a7252b99aeeeff1e93f78059405c629c7cbc3fcc623672e20296df96e8892d7
 MISC metadata.xml 666 RMD160 0b4a727787334a8fb0755705a9a9abbea0ed2540 SHA1 529ff0c8f099d6b65d47880b4f5a338ef94c63fd SHA256 39c40293e8df643512c54fdfe6c2cae952fa38229b137c039c1477e4fb758bb6
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
new file mode 100644
index 000000000000..52ffe6ae8a95
--- /dev/null
+++ b/dev-java/icedtea-web/icedtea-web-1.1.3-r7.ebuild
@@ -0,0 +1,149 @@
+# Copyright 1999-2011 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.1.3-r7.ebuild,v 1.1 2011/11/04 11:19:09 caster Exp $
+# Build written by Andrew John Hughes (ahughes@redhat.com)
+
+EAPI="2"
+
+inherit autotools eutils java-pkg-2 java-vm-2
+
+LICENSE="GPL-2 GPL-2-with-linking-exception LGPL-2"
+SLOT="7"
+KEYWORDS="~amd64"
+
+DESCRIPTION="FOSS Java browser plugin and Web Start implementation"
+SRC_URI="http://icedtea.classpath.org/download/source/${P}.tar.gz"
+HOMEPAGE="http://icedtea.classpath.org"
+
+IUSE="build doc +nsplugin"
+
+RDEPEND="dev-java/icedtea:${SLOT}"
+DEPEND="${RDEPEND}
+	nsplugin? (
+		|| ( net-misc/npapi-sdk
+			>=net-libs/xulrunner-1.9.1 ) )"
+
+# 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() {
+	# 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"
+	elif has_version dev-java/icedtea:${SLOT}; then
+		# 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
+		DIE_IF_NOT_BINPKG=true
+	fi
+
+	# if the previous failed, don't even run java eclasses pkg_setup
+	# as it might also die when no VM is present
+	if [[ -n "${JAVA_PKG_FORCE_VM}" ]]; then
+		einfo "Forced vm ${JAVA_PKG_FORCE_VM}"
+		java-vm-2_pkg_setup
+		java-pkg-2_pkg_setup
+	fi
+}
+
+unset_vars() {
+	unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS
+}
+
+src_unpack() {
+	if [[ -n ${DIE_IF_NOT_BINPKG} ]]; then
+		die "Unable to find a supported VM for building"
+	fi
+
+	default
+}
+
+src_prepare() {
+	# bug #356645
+	epatch "${FILESDIR}"/0002-Respect-LDFLAGS.patch
+	eautoreconf
+}
+
+src_configure() {
+	local vmhome=$(java-config -O)
+
+	if use build; then
+		icedteadir="${ICEDTEA_BIN_DIR}"
+		installdir="/opt/icedtea${SLOT}-web-bin"
+	else
+		icedteadir="/usr/$(get_libdir)/icedtea${SLOT}"
+		installdir="/usr/$(get_libdir)/icedtea${SLOT}-web"
+	fi
+
+	unset_vars
+
+	if use build || [[ ${vmhome} == ${icedteadir} ]] ; then
+		VMHANDLE="icedtea${SLOT}"
+	else
+		die "Unexpected install location of IcedTea${SLOT}"
+	fi
+
+	einfo "Installing IcedTea-Web in ${installdir}"
+	einfo "Installing IcedTea-Web for Icedtea${SLOT} in ${icedteadir}"
+	if [ ! -e ${vmhome} ] ; then
+		eerror "Could not find JDK install directory ${vmhome}."
+		die
+	fi
+
+	# we need to override all *dir variables that econf sets
+	# man page (javaws) is installed directly to icedteadir because it's easier than symlinking, as we don't know
+	# the suffix the man page will end up compressed with, anyway
+	econf \
+		--prefix=${installdir} --mandir=${icedteadir}/man --infodir=${installdir}/share/info --datadir=${installdir}/share \
+		--with-jdk-home=${icedteadir} \
+		$(use_enable doc docs) \
+		$(use_enable nsplugin plugin) \
+		|| die "configure failed"
+}
+
+src_compile() {
+	# we need this to override the src_compile from java-pkg-2
+	default
+}
+
+src_install() {
+	# parallel make problem bug #372235
+	emake -j1 DESTDIR="${D}" install || die "Install failed"
+	dodoc AUTHORS README NEWS || die
+
+	if use nsplugin; then
+		local arch=${ARCH};
+		use x86 && arch=i386;
+		install_mozilla_plugin "${installdir}/$(get_libdir)/IcedTeaPlugin.so";
+	fi
+
+	for binary in javaws itweb-settings; do
+		dosym ${installdir}/bin/${binary} ${icedteadir}/bin/${binary}
+		dosym ${installdir}/bin/${binary} ${icedteadir}/jre/bin/${binary}
+	done
+}
+
+pkg_postinst() {
+	java-vm_check-nsplugin
+	java_mozilla_clean_
+
+	if use nsplugin; then
+		elog "The icedtea browser plugin (NPPlugin) can be enabled using eselect java-nsplugin"
+		elog "Note that the plugin works only in browsers based on xulrunner-1.9.1 or later"
+		elog "such as Firefox 3.5+, Chromium and perhaps some others too."
+	fi
+}
+
+pkg_prerm() {
+	# override the java-vm-2 eclass check for removing a system VM, as it doesn't make sense here
+	:;
+}
diff --git a/dev-java/icedtea/Manifest b/dev-java/icedtea/Manifest
index 24cd29b7052a..6e54420ebc3c 100644
--- a/dev-java/icedtea/Manifest
+++ b/dev-java/icedtea/Manifest
@@ -1,8 +1,17 @@
 AUX generate-cacerts.pl 11051 RMD160 9b874c62ffa0afe16353f1e7b32f124f1d31356f SHA1 65e55b84506ecf14711db0996eccf3cfba2fe9e3 SHA256 6ee6fb155e3fa85d0a7e9015b53ebd55948c6599d100fdb69b574b6d11f73433
 AUX icedtea.env 1014 RMD160 566c46cd11c9d9b18d600702b1d4857cacc824ec SHA1 fb2439f39863088b5525102946d154fc54f14c08 SHA256 63d0c03dce0d546bcd9f52ebf7abb56e61f9acaeb659c9fbf19fec315a0cf5ae
+DIST 0a76e5390e68.tar.gz 128547 RMD160 ea975ce953ec0eb5751ea2aee8d3dc98da6933ff SHA1 9fc523399df6a8736ce540f7d7f0412188eb8b51 SHA256 bb47d452a61ed154fad98fda35f93e6e0f3328632ef2cf0afa1d95cd6264071e
+DIST 2054526dd141.tar.gz 43372283 RMD160 8dc2e49901a76819b1ea4f19df2d0a826e8cc323 SHA1 ea2662295c3c248f932df56a13993c4efdc78397 SHA256 4cd94391909ca86d2a5e25e3378c8fde1b1368076577fc58fed57097932750e1
+DIST 4d9e4fb8af09.tar.gz 1446705 RMD160 47c78ad3fa6ae5b70438e3bf3560f86fd60a08ae SHA1 435c9064ab69c970068f116da1abc78d66978283 SHA256 9579b9f47c45d4e6f4eb080a7a27886163691a77c193d83423389cb87656aec5
+DIST 948e734135ea.tar.gz 3985662 RMD160 52725423b92b5e6f5a6d80525732c8bb1c4ff2be SHA1 9fe3684ab2a2346fe66d84d04a3df97d03e093a6 SHA256 66948dee25e0224b12587ba150b21dab2e21b260a853bd1272e07c8d08d2e586
+DIST 9b85f1265346.tar.gz 2276207 RMD160 39bad7830bb5848efae424192ba54811f6285dbe SHA1 0ccfa5cc21437854e081aa1c5bf87fd272f3232d SHA256 03a256afc7371b3b0fbbbfd80a318e22984f6cbff26082948e8d5845ba193aee
+DIST a2ebfdc9db7e.tar.gz 2760030 RMD160 b1e678045ed8f8c4047760799bc25f94083a76f3 SHA1 830de9e94c710eb38f2ca029de4166fd5672412c SHA256 6edd17ac49c33a32538262486c0b8147954100cab43a6ee7023789f3840f22a8
+DIST b28ae681bae0.tar.gz 9000397 RMD160 0044bc2978f1eab6fb81b5181049f52a5447522d SHA1 4bbcfed2cec6e34bd6c3880d272be742c058c019 SHA256 dcb5a8d4a0a466e3673f891cea40ce163c02f26b0054dfc41c30e0f87c5c2f64
 DIST c7bf150bfa46.tar.gz 4210056 RMD160 f0afca5b073dba922eebbbbd6a9be1725ccaf86e SHA1 d192a1f7ba73346c86e71a295587381f8a4b2bce SHA256 73629f5ac9514afbcf63b6cdf58556e889a5f6a22d4bd70de1dd2816c6500aee
 DIST f0f676c5a2c6.tar.gz 8506038 RMD160 e00e7b602758eaa6cfdd04b109d99694ce2ae94c SHA1 bdc450f5a1b75b2445c960f43dbc7f605042a3c8 SHA256 aaa322239c181e50a61ec71869843eee7a0a82a9b80f113d32faf2a59d7ba5c4
+DIST icedtea-2.0.tar.gz 4516180 RMD160 91e75405713ead34c7831fd23ce66871bf888427 SHA1 aa2399f951044b82f5ecf7318a8358eb08413afb SHA256 2485d5e7807658bc3488c7e6d4720ef1261a31dd698ce2641f541119e0c2387a
 DIST icedtea6-1.10.4.tar.gz 6821129 RMD160 4de37c2086ddcebd2e48004aaa6035870394265c SHA1 b38818a80f2635e21457c6230031e5f7493e6acd SHA256 15491d7f2f81436aaf87f964d923b95b4bda8f6689198b4999961070b6c68851
+DIST jamvm-310c491ddc14e92a6ffff27030a1a1821e6395a8.tar.gz 293833 RMD160 b34f4684e0c918c36d9fb9316a4ae7737b712296 SHA1 60d5782ccb9707699f9dfbfcf647a5c862ef4691 SHA256 b5174f59371017087139fd43d51074ad837ae29340220206ca06769c8329881a
 DIST jamvm-a95ca049d3bb257d730535a5d5ec3f73a943d0aa.tar.gz 288269 RMD160 9f0dafecf766ae27ad19ed1b6d12fdd59104fbd3 SHA1 b5e304b60f274d0ed59c7888e2340a2f043df4f5 SHA256 18bb5c97c03fb73f70b481440e3e11803448d327c024d4570a338b899693fefd
 DIST jaxp144_01.zip 5964803 RMD160 6844ae747a7e7de289ce263ed06050a512416aec SHA1 4f11f9525a83e7842cbd14cc47d967abde093c27 SHA256 d72c2e27a479e7e78e0141cfcf3a9c5dbc5677495bd21b2d52dce85d21322186
 DIST jdk6-jaf-b20.zip 71243 RMD160 40b49d12c39b7010ee917eb671f3c38cd16f271c SHA1 69a54373e169bd7b04a45de6a310a199260424b9 SHA256 78c7b5c9d6271e88ee46abadd018a61f1e9645f8936cc8df1617e5f4f5074012
@@ -10,5 +19,6 @@ DIST jdk6-jaxws-b20.zip 5513069 RMD160 47b2d4fe528d770391e8926299df45cc6f68e9b5
 DIST openjdk-6-src-b22-28_feb_2011.tar.gz 45279689 RMD160 2b8f92cdb4d7dd3eb3cbb800a73e1666ee4bf5b1 SHA1 65a60153adbc8bc47fb95bb2b588a9a0b8701c95 SHA256 14a097d45b8c040e984be164a8cefbf22040a9ad57474fe87dd8cf2d0b08328b
 EBUILD icedtea-6.1.10.4-r1.ebuild 10901 RMD160 35a1922c192469bde056e28556e8a979f4c7a20a SHA1 8106276634f574457bee03144ab065076f60fcf8 SHA256 b5f474d18853e4d0be6b0e1d0a51e100fc02f155aef917969dda30f0c772e395
 EBUILD icedtea-6.1.10.4.ebuild 10669 RMD160 7d9eadb3b2553f8f0e881c5732fa9b8a486f34f4 SHA1 b52ba57da1427d5e0844818a2c2ced43d508dccc SHA256 5bf2ed661c49f530e1b3382454a52149eb6e36b08dcd1e0559bf40d50d1f5349
-MISC ChangeLog 7325 RMD160 038d876bcdfef0454aba2322606b3da0fd2368fe SHA1 edf0a706ddea1d00bed05203d049eed9e09917ab SHA256 6249b5de8ef1714cec4b3c82ec5bc3d759aa1466f5fe610d6cb0a8891d80b30d
-MISC metadata.xml 1631 RMD160 72e61e27b431b353472ca7c0469dc1adaab14971 SHA1 6010b4cfbf447ec6bfce758b42283f3e4d3ffb21 SHA256 dec15c576e0651a896199d0282487de83b2413779097ca4845cde4e85c0a92aa
+EBUILD icedtea-7.2.0-r1.ebuild 11063 RMD160 1aac7c5dd7b1fd660e0667bce25e172b0e145c3a SHA1 7f29ee2444beae2a2f1bc51bae3efb7e6070f33c SHA256 7ba892aa92d08cfc4ea07e4c18b4fc56bfb940f0d07a74b8762ac0b6ee4ef824
+MISC ChangeLog 7487 RMD160 3a8b1dc8f2aa5d0eafb889f828464845a38b7eab SHA1 b60e2e5a188801ac4600ec4cf7aab4c9706c54d2 SHA256 527505cffcf87f08d4dfce227a6500debcc268ac467cb75db460089d806ad8cd
+MISC metadata.xml 1567 RMD160 7cb547ff92d8896cdbb0dd53aa682fe31d027b4e SHA1 c42d533a391f98fa303b591a4ba1471e0de94b7c SHA256 596df17fd33825a2abb567685bda63f6ff56cbfa616911199855e3fac8bec5e4