commit: 65d5d6c23def721688b6b20d575b1a42ee144aec Author: James Le Cuirot <chewi <AT> gentoo <DOT> org> AuthorDate: Mon Jan 4 22:38:28 2016 +0000 Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> CommitDate: Mon Jan 4 22:38:28 2016 +0000 URL: https://gitweb.gentoo.org/proj/java.git/commit/?id=65d5d6c2
dev-java/icedtea-web: Remove forked "icedtea8" version 1.6.1 in the tree works with any VM. dev-java/icedtea-web/Manifest | 1 - dev-java/icedtea-web/files/README.gentoo | 21 ---- .../files/icedtea-web-1.5-respect-ldflags.patch | 11 -- dev-java/icedtea-web/icedtea-web-1.5.1-r1.ebuild | 122 --------------------- dev-java/icedtea-web/metadata.xml | 15 --- 5 files changed, 170 deletions(-) diff --git a/dev-java/icedtea-web/Manifest b/dev-java/icedtea-web/Manifest deleted file mode 100644 index 6b08126..0000000 --- a/dev-java/icedtea-web/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST icedtea-web-1.5.1.tar.gz 1616344 SHA256 03f16356fa84564f1ae32286e0a090a464c87ec123b40602dcea925757900195 SHA512 ef47eecbbb52fcb44ec9585db4c4428025201b04968dfcfc26061160d80b29ee649752f21ffe891cfa5c6bf775d0bc1dbb7dbd9a79794e052bb8b865fa94d039 WHIRLPOOL 955b5cc565fa62d2f5eb85a3253751cd284a4cb926619afe60920123878281a77f348a7c26cdafea2c6d4cd760fe4d399041b665b86ff1bbaf441e25f9f18379 diff --git a/dev-java/icedtea-web/files/README.gentoo b/dev-java/icedtea-web/files/README.gentoo deleted file mode 100644 index 0b4b644..0000000 --- a/dev-java/icedtea-web/files/README.gentoo +++ /dev/null @@ -1,21 +0,0 @@ -Manage Plugin -------------- -The IcedTea browser plugin (NPPlugin) can be enabled using -eselect java-nsplugin. - -Select JVM ----------- -IcedTea-Web (>=1.4) supports selecting the JVM to use for the plugin. Currently -works for all IcedTea releases. The eselect module java-nsplugin in ->=eselect-java-0.1.0 added support for this. - -Per user configuration ----------------------- -IcedTea-Web also supports per user configuration which takes precedence over the -global choice of JVM managed by the java-nsplugin module. If you made use of -itweb-settings as user to set a JVM for instance and want to give control back -to java-nsplugin to manage the JVM to use run as your user: -'sed -i -e "/^deployment.jre.dir=/d" ~/.icedtea/deployment.properties' - -Per user plugin selection via eselect java-nsplugin is a longstanding feature -request. Bug 148632 diff --git a/dev-java/icedtea-web/files/icedtea-web-1.5-respect-ldflags.patch b/dev-java/icedtea-web/files/icedtea-web-1.5-respect-ldflags.patch deleted file mode 100644 index 72ee9eb..0000000 --- a/dev-java/icedtea-web/files/icedtea-web-1.5-respect-ldflags.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- Makefile.am.orig 2014-08-14 12:15:46.000000000 +0200 -+++ Makefile.am 2014-11-01 23:09:49.543555638 +0100 -@@ -322,7 +322,7 @@ - - $(PLUGIN_DIR)/$(BUILT_PLUGIN_LIBRARY): $(addprefix $(PLUGIN_DIR)/,$(PLUGIN_OBJECTS)) - cd $(PLUGIN_DIR) && \ -- $(CXX) $(CXXFLAGS) \ -+ $(CXX) $(CXXFLAGS) $(LDFLAGS) \ - $(PLUGIN_OBJECTS) \ - $(GLIB_LIBS) \ - $(MOZILLA_LIBS) \ diff --git a/dev-java/icedtea-web/icedtea-web-1.5.1-r1.ebuild b/dev-java/icedtea-web/icedtea-web-1.5.1-r1.ebuild deleted file mode 100644 index 0e0dda1..0000000 --- a/dev-java/icedtea-web/icedtea-web-1.5.1-r1.ebuild +++ /dev/null @@ -1,122 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ -# Build written by Andrew John Hughes (ahug...@redhat.com) - -EAPI="5" - -inherit autotools eutils readme.gentoo java-pkg-2 java-vm-2 - -DESCRIPTION="FOSS Java browser plugin and Web Start implementation" -HOMEPAGE="http://icedtea.classpath.org"; -SRC_URI="http://icedtea.classpath.org/download/source/${P}.tar.gz"; - -LICENSE="GPL-2 GPL-2-with-linking-exception LGPL-2" -SLOT="0" -KEYWORDS="~amd64" - -IUSE="doc +icedtea7 +icedtea8 javascript +nsplugin tagsoup test" - -COMMON_DEP=" - icedtea8? ( || ( - dev-java/icedtea:8 dev-java/icedtea-bin:8 - ) ) - !icedtea8? ( || ( - icedtea7? ( || ( - dev-java/icedtea:7 dev-java/icedtea-bin:7 - ) ) - !icedtea7? ( || ( - dev-java/icedtea:7 dev-java/icedtea-bin:7 - dev-java/icedtea:6 dev-java/icedtea-bin:6 - ) ) - ) ) - app-eselect/eselect-java - tagsoup? ( dev-java/tagsoup ) - nsplugin? ( - >=dev-libs/glib-2.16 - )" -RDEPEND="${COMMON_DEP}" -# Need system junit 4.8+. Bug #389795 -DEPEND="${COMMON_DEP} - virtual/pkgconfig - app-arch/zip - javascript? ( dev-java/rhino:1.6 ) - nsplugin? ( net-misc/npapi-sdk ) - test? ( >=dev-java/junit-4.8:4 )" - -# http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2010-December/011221.html -pkg_setup() { - JAVA_PKG_WANT_BUILD_VM="icedtea-8 icedtea-bin-8" - if ! use icedtea8; then - JAVA_PKG_WANT_BUILD_VM="${JAVA_PKG_WANT_BUILD_VM} icedtea-7 icedtea-bin-7" - if ! use icedtea7; then - JAVA_PKG_WANT_BUILD_VM="${JAVA_PKG_WANT_BUILD_VM} icedtea-6 icedtea-bin-6" - fi - fi - JAVA_PKG_WANT_SOURCE="1.6" - JAVA_PKG_WANT_TARGET="1.6" - - java-pkg-2_pkg_setup - java-vm-2_pkg_setup -} - -src_prepare() { - epatch "${FILESDIR}"/${PN}-1.5-respect-ldflags.patch # bug #356645 - eautoreconf -} - -src_configure() { - local tagsoup_jar - local config - - # bug #527962 - use tagsoup && tagsoup_jar="$(java-pkg_getjars tagsoup)" - - config=( - # javaws is managed by eselect java-vm and symlinked to by icedtea so - # move it out of the way and symlink itweb-settings back to bin - --bindir="${EPREFIX}"/usr/libexec/${PN} - --with-jdk-home="${JAVA_HOME}" - $(use_enable doc docs) - $(use_enable nsplugin plugin) - $(use_with javascript rhino) - $(use_with tagsoup tagsoup ${tagsoup_jar}) - ) - - unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS - econf "${config[@]}" -} - -src_compile() { - default -} - -src_install() { - default - - if use nsplugin; then - install_mozilla_plugin "/usr/$(get_libdir)/IcedTeaPlugin.so" - fi - - mkdir -p "${ED}"/usr/bin || die - dosym /usr/libexec/${PN}/itweb-settings /usr/bin/itweb-settings || die - - # Should we patch system default lookup instead? - mkdir -p "${ED}"/etc/.java/deployment/ || die - echo "deployment.jre.dir=/etc/java-config-2/current-icedtea-web-vm" \ - > "${ED}"/etc/.java/deployment/deployment.properties || die - - readme.gentoo_create_doc -} - -pkg_postinst() { - VMHANDLE="icedtea-web@${GENTOO_VM}" java-vm_check-nsplugin - java_mozilla_clean_ - readme.gentoo_print_elog -} - -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/metadata.xml b/dev-java/icedtea-web/metadata.xml deleted file mode 100644 index d5339a7..0000000 --- a/dev-java/icedtea-web/metadata.xml +++ /dev/null @@ -1,15 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> - <herd>java</herd> - <longdescription> - FOSS Java Web Start and optional browser plugin implementation based on NetX, to be used with icedtea. - </longdescription> - <use> - <flag name="javascript">Enable support for using proxy auto config (PAC) files.</flag> - <flag name="icedtea7">Build icedtea-7 support in addition to icedtea-6 support. Requires icedtea{-bin}-7</flag> - <flag name="icedtea8">Build icedtea-8 support in addition to icedtea-6 and icedtea-7 support. Requires icedtea{-bin}-8</flag> - <flag name="nsplugin">Enable the browser plugin (NPPlugin).</flag> - <flag name="tagsoup">Depend on dev-java/tagsoup which allows parsing malformed .jnlp files</flag> - </use> -</pkgmetadata>
