summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVlastimil Babka <caster@gentoo.org>2012-02-13 21:19:39 +0000
committerVlastimil Babka <caster@gentoo.org>2012-02-13 21:19:39 +0000
commit699b3577ea9470e74676d94c6d7a147ffea1b30e (patch)
tree1368e9e57107b761734ff57d2bbd1e4764c229c6 /dev-java
parentarm stable, bug #335892 (diff)
downloadgentoo-2-699b3577ea9470e74676d94c6d7a147ffea1b30e.tar.gz
gentoo-2-699b3577ea9470e74676d94c6d7a147ffea1b30e.tar.bz2
gentoo-2-699b3577ea9470e74676d94c6d7a147ffea1b30e.zip
Update installdir with USE=build, die when users set the flag.
(Portage version: 2.2.0_alpha85/cvs/Linux x86_64)
Diffstat (limited to 'dev-java')
-rw-r--r--dev-java/icedtea-web/ChangeLog10
-rw-r--r--dev-java/icedtea-web/files/0001-Support-using-NPAPI-SDK-headers-instead-of-whole-xul.patch38
-rw-r--r--dev-java/icedtea-web/icedtea-web-1.1.3-r7.ebuild149
-rw-r--r--dev-java/icedtea-web/icedtea-web-1.1.3.ebuild149
-rw-r--r--dev-java/icedtea-web/icedtea-web-1.1.4-r7.ebuild7
-rw-r--r--dev-java/icedtea-web/icedtea-web-1.1.4.ebuild7
6 files changed, 16 insertions, 344 deletions
diff --git a/dev-java/icedtea-web/ChangeLog b/dev-java/icedtea-web/ChangeLog
index 631fc5e4812f..d8e9cbf4124b 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.15 2011/11/24 20:57:04 sera Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-web/ChangeLog,v 1.16 2012/02/13 21:19:39 caster Exp $
+
+ 13 Feb 2012; Vlastimil Babka <caster@gentoo.org>
+ -files/0001-Support-using-NPAPI-SDK-headers-instead-of-whole-xul.patch,
+ -icedtea-web-1.1.3.ebuild, -icedtea-web-1.1.3-r7.ebuild,
+ icedtea-web-1.1.4.ebuild, icedtea-web-1.1.4-r7.ebuild:
+ Update installdir with USE=build, die when users set the flag.
*icedtea-web-1.1.4-r7 (24 Nov 2011)
*icedtea-web-1.1.4 (24 Nov 2011)
diff --git a/dev-java/icedtea-web/files/0001-Support-using-NPAPI-SDK-headers-instead-of-whole-xul.patch b/dev-java/icedtea-web/files/0001-Support-using-NPAPI-SDK-headers-instead-of-whole-xul.patch
deleted file mode 100644
index 5e8596146c17..000000000000
--- a/dev-java/icedtea-web/files/0001-Support-using-NPAPI-SDK-headers-instead-of-whole-xul.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 7544a3364642a820737ba8d943e8deb2e39b6aa6 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Mon, 5 Sep 2011 00:26:38 +0200
-Subject: [PATCH] Support using NPAPI-SDK headers instead of whole xulrunner.
-
-The first NPAPI-SDK header package with npapi-sdk.pc comes with libxul 2.0
-headers, thus hardcoded that version into it. But the code should be modified
-to use NPAPI versioning rather than Mozilla one. Or just drop compat with
-ancient versions.
----
- acinclude.m4 | 11 +++++++++--
- 1 files changed, 9 insertions(+), 2 deletions(-)
-
-diff --git a/acinclude.m4 b/acinclude.m4
-index 3c3803b..58482f1 100644
---- a/acinclude.m4
-+++ b/acinclude.m4
-@@ -346,8 +346,15 @@ if test "x${enable_plugin}" = "xyes" ; then
- AC_SUBST(GTK_CFLAGS)
- AC_SUBST(GTK_LIBS)
-
-- PKG_CHECK_MODULES(MOZILLA, mozilla-plugin)
--
-+ PKG_CHECK_MODULES(MOZILLA, npapi-sdk, [
-+ AC_CACHE_CHECK([for xulrunner version], [xulrunner_cv_collapsed_version],[
-+ # XXX: use NPAPI versions instead
-+ xulrunner_cv_collapsed_version=20000000
-+ ])
-+ ], [
-+ PKG_CHECK_MODULES(MOZILLA, mozilla-plugin)
-+ ])
-+
- AC_SUBST(MOZILLA_CFLAGS)
- AC_SUBST(MOZILLA_LIBS)
- fi
---
-1.7.6.1
-
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
deleted file mode 100644
index d97b2700a7e5..000000000000
--- a/dev-java/icedtea-web/icedtea-web-1.1.3-r7.ebuild
+++ /dev/null
@@ -1,149 +0,0 @@
-# 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.2 2011/11/04 14:59:22 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 ~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
- # 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-web/icedtea-web-1.1.3.ebuild b/dev-java/icedtea-web/icedtea-web-1.1.3.ebuild
deleted file mode 100644
index a2551ea24118..000000000000
--- a/dev-java/icedtea-web/icedtea-web-1.1.3.ebuild
+++ /dev/null
@@ -1,149 +0,0 @@
-# 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.ebuild,v 1.2 2011/11/04 09:39:42 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
- # 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-web/icedtea-web-1.1.4-r7.ebuild b/dev-java/icedtea-web/icedtea-web-1.1.4-r7.ebuild
index b8a05bc171d0..3ebdf6e9beca 100644
--- a/dev-java/icedtea-web/icedtea-web-1.1.4-r7.ebuild
+++ b/dev-java/icedtea-web/icedtea-web-1.1.4-r7.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 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.4-r7.ebuild,v 1.1 2011/11/24 20:57:04 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-web/icedtea-web-1.1.4-r7.ebuild,v 1.2 2012/02/13 21:19:39 caster Exp $
# Build written by Andrew John Hughes (ahughes@redhat.com)
EAPI="4"
@@ -67,7 +67,8 @@ src_configure() {
if use build; then
icedteadir="${ICEDTEA_BIN_DIR}"
- installdir="/opt/icedtea${SLOT}-web-bin"
+ [[ -z ${icedteadir} ]] && die "USE=build is an internal flag and should not be enabled"
+ installdir="/opt/icedtea-web-bin-${SLOT}"
else
icedteadir="/usr/$(get_libdir)/icedtea${SLOT}"
installdir="/usr/$(get_libdir)/icedtea${SLOT}-web"
diff --git a/dev-java/icedtea-web/icedtea-web-1.1.4.ebuild b/dev-java/icedtea-web/icedtea-web-1.1.4.ebuild
index 8ffd50d1bbc4..009d9de0b8b6 100644
--- a/dev-java/icedtea-web/icedtea-web-1.1.4.ebuild
+++ b/dev-java/icedtea-web/icedtea-web-1.1.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 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.4.ebuild,v 1.1 2011/11/24 20:57:04 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-web/icedtea-web-1.1.4.ebuild,v 1.2 2012/02/13 21:19:39 caster Exp $
# Build written by Andrew John Hughes (ahughes@redhat.com)
EAPI="4"
@@ -67,7 +67,8 @@ src_configure() {
if use build; then
icedteadir="${ICEDTEA_BIN_DIR}"
- installdir="/opt/icedtea${SLOT}-web-bin"
+ [[ -z ${icedteadir} ]] && die "USE=build is an internal flag and should not be enabled"
+ installdir="/opt/icedtea-web-bin-${SLOT}"
else
icedteadir="/usr/$(get_libdir)/icedtea${SLOT}"
installdir="/usr/$(get_libdir)/icedtea${SLOT}-web"