Version bump. Support building against npapi-sdk instead of xulrunner, bug #381957. Also remove xulrunner from RDEPEND in all older versions, bug #381147.

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

4 files changed, 41 insertions, 19 deletions

diff --git a/dev-java/icedtea-web/ChangeLog b/dev-java/icedtea-web/ChangeLog
index e4a2e8d88d62..a1f03cacae95 100644
--- a/dev-java/icedtea-web/ChangeLog
+++ b/dev-java/icedtea-web/ChangeLog
@@ -1,6 +1,14 @@
 # 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.7 2011/07/22 09:08:37 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-web/ChangeLog,v 1.8 2011/09/06 09:57:09 caster Exp $
+
+*icedtea-web-1.1.2 (06 Sep 2011)
+
+  06 Sep 2011; Vlastimil Babka <caster@gentoo.org> -icedtea-web-1.1.ebuild,
+  icedtea-web-1.1.1.ebuild, +icedtea-web-1.1.2.ebuild:
+  Version bump. Support building against npapi-sdk instead of xulrunner, bug
+  #381957. Also remove xulrunner from RDEPEND in all older versions, bug
+  #381147.
 
 *icedtea-web-1.1.1 (22 Jul 2011)
 
diff --git a/dev-java/icedtea-web/Manifest b/dev-java/icedtea-web/Manifest
index 3a8b7051ff1d..78dd03430373 100644
--- a/dev-java/icedtea-web/Manifest
+++ b/dev-java/icedtea-web/Manifest
@@ -1,6 +1,6 @@
 DIST icedtea-web-1.1.1.tar.gz 806633 RMD160 7267f279726bc1aa70f298721f757822b5189cfb SHA1 332874daf5f01fd6db3e60b4dbe3b40b8b269014 SHA256 0051005302e698f2468e6cae275b8c58869c85be04c269f2f266389a4e6a66c7
-DIST icedtea-web-1.1.tar.gz 794939 RMD160 1930d9683889f2b383e7cd4a9957d6c8119e34ca SHA1 243bc20e26637df5d5b3cd52c60c84e564cd3134 SHA256 9ab60926f5d455d51e8e62120f71a12b1f18b20f599477d55dd71282a8055675
-EBUILD icedtea-web-1.1.1.ebuild 3939 RMD160 5c9b89c18766dde518b8f6f5a442464a5cff1d80 SHA1 cab1ac9021a1adcb1d237dc11224c08143481423 SHA256 cf529d6217d81edfbe9bdf40e4a36bfef0e84352c553e2120b76814a661e63b4
-EBUILD icedtea-web-1.1.ebuild 3736 RMD160 96eb90f54f69ba599fecf5332ddae987e09cb11c SHA1 33f23b8040b126d1c4cbcfb1ef6f06c91cb680fb SHA256 d0b927ea89531434da24bb6250a6290b03277e9bf16314badb0195a16dc26312
-MISC ChangeLog 1413 RMD160 cb52d1e7cb9e664ea991b17dff713755c4d4bcd1 SHA1 4f4114348bf2f04a14bc932f099ccb864e7a9bab SHA256 1a165c78f22ce4824409665b98cde59a918a4fd1e6a43b087a41c393a0084a3a
+DIST icedtea-web-1.1.2.tar.gz 807736 RMD160 7ca33e6759aec27567a22b07f02afc775339d513 SHA1 f862220b4504e688706b743f68f62c81e57bc183 SHA256 3051f3bf1e1d07ad7aaa28b204821a7c0631848d20ba7942fc23440e774649e4
+EBUILD icedtea-web-1.1.1.ebuild 3939 RMD160 b3eef443697d0cafb9e1a70c6bb9c93c33038584 SHA1 ff96d27e0bb41d218706a41ad5350d77d17ac2dd SHA256 25a42a88413bdd32f83517ed201ccccfb216407f3e2ac6e2653bb57c91b0ea43
+EBUILD icedtea-web-1.1.2.ebuild 4097 RMD160 4afc897e9040e85afc810a82e21632cfbc8641da SHA1 49521a25026cf2d15b37270e251e3a8fe1a35258 SHA256 d42f088e62c25c0fa3b134c364a5b941d360f4bfe78cc292e31bbb94222420b4
+MISC ChangeLog 1740 RMD160 a27b4c7a3fab4d24430b4ed0260b41cbe0c684c9 SHA1 cd869f27eba7eb755b47335cec5d753cede9d2b5 SHA256 f234970c180a4a2f18d707f4458b5df0eacf0c1ba8d0873bf2923d19c1af5e57
 MISC metadata.xml 666 RMD160 0b4a727787334a8fb0755705a9a9abbea0ed2540 SHA1 529ff0c8f099d6b65d47880b4f5a338ef94c63fd SHA256 39c40293e8df643512c54fdfe6c2cae952fa38229b137c039c1477e4fb758bb6
diff --git a/dev-java/icedtea-web/icedtea-web-1.1.1.ebuild b/dev-java/icedtea-web/icedtea-web-1.1.1.ebuild
index a9fe3110aaab..e68dac07c5e6 100644
--- a/dev-java/icedtea-web/icedtea-web-1.1.1.ebuild
+++ b/dev-java/icedtea-web/icedtea-web-1.1.1.ebuild
@@ -1,6 +1,6 @@
 # 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.1.ebuild,v 1.1 2011/07/22 09:08:37 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-web/icedtea-web-1.1.1.ebuild,v 1.2 2011/09/06 09:57:09 caster Exp $
 # Build written by Andrew John Hughes (ahughes@redhat.com)
 
 EAPI="2"
@@ -17,9 +17,9 @@ HOMEPAGE="http://icedtea.classpath.org"
 
 IUSE="build doc +nsplugin"
 
-RDEPEND="dev-java/icedtea:${SLOT}
+RDEPEND="dev-java/icedtea:${SLOT}"
+DEPEND="${RDEPEND}
 	 nsplugin? ( >=net-libs/xulrunner-1.9.1 )"
-DEPEND="${RDEPEND}"
 
 # a bit of hack so the VM switching is triggered without causing dependency troubles
 JAVA_PKG_NV_DEPEND=">=virtual/jdk-1.6"
diff --git a/dev-java/icedtea-web/icedtea-web-1.1.ebuild b/dev-java/icedtea-web/icedtea-web-1.1.2.ebuild
index 6ebc9fa2fe63..3b54b93cd9ed 100644
--- a/dev-java/icedtea-web/icedtea-web-1.1.ebuild
+++ b/dev-java/icedtea-web/icedtea-web-1.1.2.ebuild
@@ -1,11 +1,11 @@
 # 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.ebuild,v 1.2 2011/06/20 12:34:46 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-web/icedtea-web-1.1.2.ebuild,v 1.1 2011/09/06 09:57:09 caster Exp $
 # Build written by Andrew John Hughes (ahughes@redhat.com)
 
 EAPI="2"
 
-inherit eutils java-pkg-2 java-vm-2
+inherit autotools eutils java-pkg-2 java-vm-2
 
 LICENSE="GPL-2 GPL-2-with-linking-exception LGPL-2"
 SLOT="6"
@@ -15,11 +15,13 @@ 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="doc +nsplugin"
+IUSE="build doc +nsplugin"
 
-RDEPEND="dev-java/icedtea:${SLOT}
-	 nsplugin? ( >=net-libs/xulrunner-1.9.1 )"
-DEPEND="${RDEPEND}"
+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"
@@ -60,20 +62,32 @@ src_unpack() {
 	default
 }
 
+src_prepare() {
+	epatch "${FILESDIR}"/0001-Support-using-NPAPI-SDK-headers-instead-of-whole-xul.patch
+	eautoreconf
+}
+
 src_configure() {
 	local vmhome=$(java-config -O)
-	icedteadir="/usr/$(get_libdir)/icedtea${SLOT}"
+
+	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 [[ ${vmhome} == ${icedteadir} ]] ; then
-		installdir="/usr/$(get_libdir)/icedtea${SLOT}-web"
+	if use build || [[ ${vmhome} == ${icedteadir} ]] ; then
 		VMHANDLE="icedtea${SLOT}"
 	else
 		die "Unexpected install location of IcedTea${SLOT}"
 	fi
 
-	elog "Installing IcedTea-Web in ${installdir}"
+	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
@@ -84,7 +98,7 @@ src_configure() {
 	# 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=${vmhome} \
+		--with-jdk-home=${icedteadir} \
 		$(use_enable doc docs) \
 		$(use_enable nsplugin plugin) \
 		|| die "configure failed"