* [gentoo-commits] repo/gentoo:master commit in: dev-java/icedtea-web/, dev-java/icedtea-web/files/
@ 2016-05-17 21:43 James Le Cuirot
0 siblings, 0 replies; 2+ messages in thread
From: James Le Cuirot @ 2016-05-17 21:43 UTC (permalink / raw
To: gentoo-commits
commit: e839e9cfd9750a50fd522374d3e40d032607ae19
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Tue May 17 21:09:39 2016 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Tue May 17 21:36:53 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e839e9cf
dev-java/icedtea-web: Remove old 1.5.1-r1
Closes bugs #569784, #581628.
Package-Manager: portage-2.3.0_rc1
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 | 113 ---------------------
dev-java/icedtea-web/metadata.xml | 1 -
5 files changed, 147 deletions(-)
diff --git a/dev-java/icedtea-web/Manifest b/dev-java/icedtea-web/Manifest
index cb9393d..9aab84a 100644
--- a/dev-java/icedtea-web/Manifest
+++ b/dev-java/icedtea-web/Manifest
@@ -1,2 +1 @@
-DIST icedtea-web-1.5.1.tar.gz 1616344 SHA256 03f16356fa84564f1ae32286e0a090a464c87ec123b40602dcea925757900195 SHA512 ef47eecbbb52fcb44ec9585db4c4428025201b04968dfcfc26061160d80b29ee649752f21ffe891cfa5c6bf775d0bc1dbb7dbd9a79794e052bb8b865fa94d039 WHIRLPOOL 955b5cc565fa62d2f5eb85a3253751cd284a4cb926619afe60920123878281a77f348a7c26cdafea2c6d4cd760fe4d399041b665b86ff1bbaf441e25f9f18379
DIST icedtea-web-1.6.1.tar.gz 1776222 SHA256 a9b46ab6c9dc303c89651143596bc5abea29242b9bdcabdd2dab7c606592c920 SHA512 dae39818f74a098289acd0736d27c2e68b10b603a3fb0a180cf4b6444345cbe71ab1ba77dfb198f053f9567bb18aa96de09049c3b595b3d292d142a7ae7d3ef9 WHIRLPOOL 96826d17daee16dfa99f6439678cc509c94556955839b7e8bc43c1993ee04740f35b0547d56649bb9f7a625b5b2515be9d173b642ccb15cb1dead83a03586a6e
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 0435ab8..0000000
--- a/dev-java/icedtea-web/icedtea-web-1.5.1-r1.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-# Build written by Andrew John Hughes (ahughes@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 ~arm x86"
-IUSE="doc +icedtea7 javascript nsplugin tagsoup test"
-RESTRICT="test"
-
-COMMON_DEP="
- 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-7 icedtea-bin-7"
- if ! use icedtea7; then
- JAVA_PKG_WANT_BUILD_VM="${JAVA_PKG_WANT_BUILD_VM} icedtea-6 icedtea-bin-6"
- 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
index 21a181f..a073aa0 100644
--- a/dev-java/icedtea-web/metadata.xml
+++ b/dev-java/icedtea-web/metadata.xml
@@ -10,7 +10,6 @@
</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="nsplugin">Enable the browser plugin (NPPlugin).</flag>
<flag name="tagsoup">Depend on dev-java/tagsoup which allows parsing malformed .jnlp files</flag>
</use>
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/icedtea-web/, dev-java/icedtea-web/files/
@ 2020-09-05 5:24 Georgy Yakovlev
0 siblings, 0 replies; 2+ messages in thread
From: Georgy Yakovlev @ 2020-09-05 5:24 UTC (permalink / raw
To: gentoo-commits
commit: d79c65a0c600776066d2e0ebe2d261a41c345d57
Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 5 04:32:54 2020 +0000
Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Sat Sep 5 05:23:43 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d79c65a0
dev-java/icedtea-web: fix multiple qa issues in 1.8.4
disabled a lot of useless/old functionality
Bug: https://bugs.gentoo.org/711392
Closes: https://bugs.gentoo.org/715316
Closes: https://bugs.gentoo.org/684330
Closes: https://github.com/gentoo/gentoo/pull/17413
Package-Manager: Portage-3.0.5, Repoman-3.0.1
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>
dev-java/icedtea-web/files/README.gentoo-r2 | 14 +++++
dev-java/icedtea-web/icedtea-web-1.8.4.ebuild | 88 +++++++++++++--------------
2 files changed, 57 insertions(+), 45 deletions(-)
diff --git a/dev-java/icedtea-web/files/README.gentoo-r2 b/dev-java/icedtea-web/files/README.gentoo-r2
new file mode 100644
index 00000000000..4644f988e7e
--- /dev/null
+++ b/dev-java/icedtea-web/files/README.gentoo-r2
@@ -0,0 +1,14 @@
+Browser plugin
+--------------
+
+The IcedTea browser plugin (NPPlugin) is no longer available,
+as modern browsers no longer support this plugin format.
+
+JVM selection
+-------------
+
+By default, Web Start uses the JVM
+selected via eselect environment variable.
+Note that this doesn't have to be an IcedTea. Openjdk will also work.
+The choice can be overridden using the itweb-settings program.
+Simply blank out the field to restore the default behaviour.
diff --git a/dev-java/icedtea-web/icedtea-web-1.8.4.ebuild b/dev-java/icedtea-web/icedtea-web-1.8.4.ebuild
index 4f1ee675217..47e9c74510e 100644
--- a/dev-java/icedtea-web/icedtea-web-1.8.4.ebuild
+++ b/dev-java/icedtea-web/icedtea-web-1.8.4.ebuild
@@ -1,12 +1,12 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI="7"
+EAPI=7
-README_GENTOO_SUFFIX="-r1"
+README_GENTOO_SUFFIX="-r2"
CRATES="dunce-0.1.1"
-inherit autotools eutils multilib readme.gentoo-r1 java-pkg-2 cargo xdg-utils
+inherit autotools cargo readme.gentoo-r1
DESCRIPTION="FOSS Java browser plugin and Web Start implementation"
HOMEPAGE="http://icedtea.classpath.org"
@@ -14,79 +14,77 @@ SRC_URI="https://github.com/AdoptOpenJDK/${PN}/archive/${P}.tar.gz
$(cargo_crate_uris ${CRATES})"
LICENSE="GPL-2 GPL-2-with-linking-exception LGPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="doc javascript nsplugin tagsoup test"
-RESTRICT="test"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="doc"
-CDEPEND="javascript? ( dev-java/rhino:1.6 )
- nsplugin? ( >=dev-libs/glib-2.16:2= )
- tagsoup? ( dev-java/tagsoup:0 )"
+# tests require ton of java deps we don't have packaged/working
+# but rust tests pass.
+RESTRICT="test"
-DEPEND="${CDEPEND}
+BDEPEND="
app-arch/zip
- >=virtual/jdk-1.7
+ >=virtual/jdk-1.8
virtual/pkgconfig
virtual/rust
- nsplugin? ( net-misc/npapi-sdk )
- test? ( >=dev-java/junit-4.8:4 )"
+ doc? ( sys-devel/bc )
+"
-RDEPEND="${CDEPEND}
+RDEPEND="
>=app-eselect/eselect-java-0.2.0
- >=virtual/jre-1.7
- nsplugin? (
- !dev-java/oracle-jdk-bin[nsplugin]
- !dev-java/oracle-jre-bin[nsplugin]
- )"
+ >=virtual/jre-1.8
+"
S="${WORKDIR}/IcedTea-Web-${P}"
+QA_FLAGS_IGNORED="usr/bin/.*"
+
src_prepare() {
eapply_user
-
- if java-pkg_is-vm-version-ge "1.8" ; then
- sed -i 's/JAVADOC_OPTS=/\0-Xdoclint:none /g' Makefile.am || die
- fi
-
+ sed -i 's/JAVADOC_OPTS=/\0-Xdoclint:none /g' Makefile.am || die
eautoreconf
cargo_gen_config
}
src_configure() {
- local tagsoup
- use tagsoup && tagsoup="$(java-pkg_getjars tagsoup)"
-
- local config=(
- # Rename javaws to itweb-javaws as eselect java-vm manages
- # javaws to prevent a clash with Oracle's implementation.
+ # some functionality (tagsoup rhino) is disabled, because dev-java is
+ # unmaintained and a lot of things simply does not build anymore.
+ # native plugins also disabled, modern browsers no longer support it.
+ local myconf=(
+ --disable-native-plugin
--program-transform-name='s/^javaws$/itweb-javaws/'
- --libdir="${EPREFIX}"/usr/$(get_libdir)/nsbrowser/plugins
- --with-java="${EPREFIX}"/usr/bin/java
- --with-jdk-home="${JAVA_HOME}"
+ --with-java="${EPREFIX}/usr/bin/java"
+ --with-jdk-home="${EPREFIX}/etc/java-config-2/current-system-vm"
--with-itw-libs=DISTRIBUTION
+ --without-rhino
+ --without-tagsoup
$(use_enable doc docs)
- $(use_enable nsplugin native-plugin)
- $(use_with javascript rhino)
- $(use_with tagsoup tagsoup "${tagsoup}")
)
-
- # See bug #573060.
- xdg_environment_reset
-
- # Rely on the --with-jdk-home option given above.
- unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS
-
- CONFIG_SHELL="${BASH}" econf "${config[@]}"
+ export CARGO_HOME="${ECARGO_HOME}"
+ CONFIG_SHELL="${EPREFIX}/bin/bash" econf "${myconf[@]}"
}
src_compile() {
- emake CARGO_HOME="${ECARGO_HOME}"
+ # races in makefile
+ emake -j1 #nowarn
}
src_install() {
default
+ rm -v "${ED}/usr/bin/itw-modularjdk.args" || die
+ rename -v '.bash' '' "${ED}/usr/share/bash-completion/completions/"*.bash || die
+ rename -v 'javaws' 'itweb-javaws' "${ED}/usr/share/man/man1/"javaws.1* || die
+ mv -v "${ED}/usr/share/bash-completion/completions/"{javaws,itweb-javaws} || die
+ sed -i 's/javaws/itweb-javaws/g' \
+ "${ED}/usr/share/bash-completion/completions/itweb-javaws" || die
+
readme.gentoo_create_doc
}
+src_test() {
+ # we want to override cargo.eclass' src_test
+ :
+}
+
pkg_postinst() {
readme.gentoo_print_elog
}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-09-05 5:24 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-05-17 21:43 [gentoo-commits] repo/gentoo:master commit in: dev-java/icedtea-web/, dev-java/icedtea-web/files/ James Le Cuirot
-- strict thread matches above, loose matches on Subject: below --
2020-09-05 5:24 Georgy Yakovlev
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox