aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVlastimil Babka <caster@gentoo.org>2012-02-13 21:20:38 +0000
committerVlastimil Babka <caster@gentoo.org>2012-02-13 21:20:38 +0000
commiteae6260a5ef30cf0784c60b3a9383f813d9814be (patch)
tree13bb62fa223fcf3870ab774d89e1788204319f97
parentUpdate installdir with USE=build, die when users set the flag. (diff)
downloadjava-eae6260a5ef30cf0784c60b3a9383f813d9814be.tar.gz
java-eae6260a5ef30cf0784c60b3a9383f813d9814be.tar.bz2
java-eae6260a5ef30cf0784c60b3a9383f813d9814be.zip
Remove old.
(Portage version: 2.2.0_alpha85/svn/Linux x86_64, unsigned Manifest commit) svn path=/java-overlay/; revision=8972
-rw-r--r--dev-java/icedtea-web/ChangeLog4
-rw-r--r--dev-java/icedtea-web/Manifest6
-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.ebuild150
-rw-r--r--dev-java/icedtea-web/icedtea-web-1.1.3.ebuild150
5 files changed, 5 insertions, 343 deletions
diff --git a/dev-java/icedtea-web/ChangeLog b/dev-java/icedtea-web/ChangeLog
index 417d3d0d..cf36d4b5 100644
--- a/dev-java/icedtea-web/ChangeLog
+++ b/dev-java/icedtea-web/ChangeLog
@@ -2,6 +2,10 @@
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 13 Feb 2012; Vlastimil Babka <caster@gentoo.org>
+ -files/0001-Support-using-NPAPI-SDK-headers-instead-of-whole-xul.patch:
+ Remove old.
+
13 Feb 2012; Vlastimil Babka <caster@gentoo.org> 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:
diff --git a/dev-java/icedtea-web/Manifest b/dev-java/icedtea-web/Manifest
index 88d0d974..005f59e9 100644
--- a/dev-java/icedtea-web/Manifest
+++ b/dev-java/icedtea-web/Manifest
@@ -1,10 +1,6 @@
-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
DIST icedtea-web-1.1.4.tar.gz 812273 RMD160 2aac06c05d4513694968f86861225b5329307781 SHA1 9389030878d7c3aee17f641e3095830fe722fb60 SHA256 b17a742af0153b7887cf667a160f8519afad125bc515b0f4783c66e7ee1a7f26
-EBUILD icedtea-web-1.1.3-r7.ebuild 4277 RMD160 9d55f9a1f5fd762b7225168d445c9eaa7be25eb1 SHA1 8274ad585b36cf093ac3c03832d8598e993bc8e2 SHA256 4e67a6bc0b3b0e5e6357114ffc986f6022ad0307e3760683341626d44e83aae2
-EBUILD icedtea-web-1.1.3.ebuild 4289 RMD160 9ddbdfba8a90b62fe4bf9710b46c4e57baa6709c SHA1 2f3009af4bfe6fb99cf1370f7685037c6a821450 SHA256 d0fbc2a7df6b23c088721396a039187df2ab360faf4890b80558c0deab997f1d
EBUILD icedtea-web-1.1.4-r7.ebuild 3947 RMD160 c2ca94f363127be835030b371e23eabdf0cdfbc5 SHA1 06d72d0ac062153b4e10e224becb85af5acf123f SHA256 658a99feffd54753b9ea3718e2870aa33cb9097578775448729b8e24c0c45ec5
EBUILD icedtea-web-1.1.4.ebuild 3956 RMD160 97b5d4c531d8bd0856407a305119b28a14ef5e27 SHA1 3fd09263950f4d062bdc4b3b207545cb6c14dd05 SHA256 324335acb6270fa0e32ab905f885b828fe1e1c0964182725179f3f2df90a2cc6
-MISC ChangeLog 5183 RMD160 4f4a760c15f3b59f7f7f5c8e065ea5822c40629a SHA1 26637256db8410644bb94a646bce41439075e8da SHA256 945e0ee3c828a336d93ce158d09636b29a0ae080ea34a45a0ee142c58a9e2a20
+MISC ChangeLog 5323 RMD160 6698995c96fb9069bb8540cbedf1f8f554fb71ca SHA1 527e029ea6e447a9a75559f079de3633df430628 SHA256 d6ff443a1e625c08571bb81d47328f3034c8dd7a721d0114543b7c04552a940c
MISC metadata.xml 532 RMD160 475b5d799d063ecc980d17896d8b591680ac2a7d SHA1 acf45999323b8df83b432973a11d64e2577ff022 SHA256 48eafb34adc623b7f298610feaac56f61a01f52658b83be30e4cc8d3a9b9f1d7
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 5e859614..00000000
--- 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 5b2bcba7..00000000
--- a/dev-java/icedtea-web/icedtea-web-1.1.3-r7.ebuild
+++ /dev/null
@@ -1,150 +0,0 @@
-# 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.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 ~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}"
- [[ -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"
- 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 ad283401..00000000
--- a/dev-java/icedtea-web/icedtea-web-1.1.3.ebuild
+++ /dev/null
@@ -1,150 +0,0 @@
-# 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.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
- # 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}"
- [[ -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"
- 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
- :;
-}