Revbump to respect LDFLAGS, bug #356645.

(Portage version: 2.2.0_alpha54/svn/Linux x86_64, RepoMan options: --force)

svn path=/java-overlay/; revision=8813

4 files changed, 297 insertions, 1 deletions

diff --git a/dev-java/icedtea-web/ChangeLog b/dev-java/icedtea-web/ChangeLog
index ac524fb2..a08e01fd 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: $
 
+  18 Sep 2011; Vlastimil Babka <caster@gentoo.org>
+  +icedtea-web-1.1.2-r1.ebuild, +icedtea-web-1.1.2-r8.ebuild:
+  Revbump to respect LDFLAGS, bug #356645.
+
   06 Sep 2011; Vlastimil Babka <caster@gentoo.org> icedtea-web-1.0.4.ebuild,
   icedtea-web-1.0.4-r7.ebuild,
   +files/0001-Support-using-NPAPI-SDK-headers-instead-of-whole-xul.patch,
diff --git a/dev-java/icedtea-web/Manifest b/dev-java/icedtea-web/Manifest
index b9ac73ae..70acd7fe 100644
--- a/dev-java/icedtea-web/Manifest
+++ b/dev-java/icedtea-web/Manifest
@@ -6,7 +6,9 @@ EBUILD icedtea-web-1.0.4-r7.ebuild 3040 RMD160 54cfaab237025a54ace6c3ad465025dce
 EBUILD icedtea-web-1.0.4.ebuild 3038 RMD160 90669a807f2160d4f1061d0c6b592422220d7d05 SHA1 b222c3f754ab65feb81bdfd2806e0a5c7c75ce87 SHA256 80cdf6727094ae66bca47ba326a3ed677bd7bf5e47d519692ca55177e385ab6d
 EBUILD icedtea-web-1.1.1-r7.ebuild 3832 RMD160 780514d0814550b672cc07da61bb18cba20b836f SHA1 14fb64de0770c764d9f794104f2c2b84f44781e6 SHA256 7cb365b3d699c555e489c8aec7c34e121af1c0f031ca2911be612488e53f6844
 EBUILD icedtea-web-1.1.1.ebuild 3832 RMD160 a3c0642419bd9ab1617aa48d028aa191ff0ed0da SHA1 f8af5f96c63b93e1699eb8986011d8da23735d55 SHA256 3518b6986253380bf7f6c687f0ca70f9628e395538da61b2c34e13c861a47307
+EBUILD icedtea-web-1.1.2-r1.ebuild 4164 RMD160 bdc174191805228a6dce4c9fdaf787abf1ef3049 SHA1 819a5d3b8d59ac436ff62b48ea1a824de7a98d7e SHA256 d31679bb1080ea28d5697ab14a5939dd93d12fe31071ea5375d83a3f1cb1e869
 EBUILD icedtea-web-1.1.2-r7.ebuild 3990 RMD160 6922f8a1d4568b049b2ad89016a17a6ec8b28cce SHA1 43b27e6ae1afe3708e99a91788fb906c1d5bdaa5 SHA256 16d738240a4cad4fda3316c402c53d856139239408072d5839c805c8e4f2b425
+EBUILD icedtea-web-1.1.2-r8.ebuild 4164 RMD160 df43ecf7acd7e875f239d19be47129c0e7b86150 SHA1 32b21fbce3d596c47f43676478502cac04752514 SHA256 f9041c6ff956c2f3e9d937bbb5620b3394421be06981de33d632621f0bcaaa2b
 EBUILD icedtea-web-1.1.2.ebuild 3990 RMD160 874138b0474cf405c08cd2049b5f9ef7194ef400 SHA1 8cc99e868b60d32fd6eeec1f26a3b0ec8b21e9b9 SHA256 77d97f9f526296109deceb9188b9cef51ce8998aff9ee50efd651d87bd51ec32
-MISC ChangeLog 3376 RMD160 47d23228c92fac2bfa2640d3be3f9ac34065f70c SHA1 581c1fdfaff18010dc1eeee5f49ff6f4fdd744a8 SHA256 3e2e0e26f94042f30824cf0a7fee66f2462ed19c7fec73c6297f72e161ac603c
+MISC ChangeLog 3533 RMD160 a636d88de85d4882101fc647cb5d4ec5077f0280 SHA1 e6da0c0bfb984692db0a642fd2d26fccff87210d SHA256 5ebff2dd824a033b97c9bf1409989ad15f93568606b8673a394d916f47bea437
 MISC metadata.xml 443 RMD160 a2bfb7f863c94745550d4aebc1f19564fa09314c SHA1 09a86a74d70473db1f0a54d30a6097643b05a763 SHA256 7cf17d4708e0cb7051686986429baa43dc1345d3f295e57d7a020a637473e217
diff --git a/dev-java/icedtea-web/icedtea-web-1.1.2-r1.ebuild b/dev-java/icedtea-web/icedtea-web-1.1.2-r1.ebuild
new file mode 100644
index 00000000..761bc26c
--- /dev/null
+++ b/dev-java/icedtea-web/icedtea-web-1.1.2-r1.ebuild
@@ -0,0 +1,145 @@
+# 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.2-r1.ebuild,v 1.1 2011/09/18 21:53:18 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="6"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+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
+		JAVA_PKG_FORCE_VM="icedtea${SLOT}"
+	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() {
+	epatch "${FILESDIR}"/0001-Support-using-NPAPI-SDK-headers-instead-of-whole-xul.patch
+	# 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-web/icedtea-web-1.1.2-r8.ebuild b/dev-java/icedtea-web/icedtea-web-1.1.2-r8.ebuild
new file mode 100644
index 00000000..8160cf67
--- /dev/null
+++ b/dev-java/icedtea-web/icedtea-web-1.1.2-r8.ebuild
@@ -0,0 +1,145 @@
+# 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.2-r1.ebuild,v 1.1 2011/09/18 21:53:18 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 ~ppc ~ppc64 ~x86"
+
+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
+		JAVA_PKG_FORCE_VM="icedtea${SLOT}"
+	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() {
+	epatch "${FILESDIR}"/0001-Support-using-NPAPI-SDK-headers-instead-of-whole-xul.patch
+	# 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
+	:;
+}