* [gentoo-commits] proj/java:master commit in: dev-java/icedtea-web/, dev-java/icedtea-web/files/
@ 2015-06-25 1:14 Andrew John Hughes
0 siblings, 0 replies; 2+ messages in thread
From: Andrew John Hughes @ 2015-06-25 1:14 UTC (permalink / raw
To: gentoo-commits
commit: 7aee1adb8aae20ff1d9093dae2f92e7c4774bc15
Author: Andrew John Hughes <gnu_andrew <AT> member <DOT> fsf <DOT> org>
AuthorDate: Wed Jun 24 22:24:11 2015 +0000
Commit: Andrew John Hughes <gnu_andrew <AT> member <DOT> fsf <DOT> org>
CommitDate: Wed Jun 24 22:24:11 2015 +0000
URL: https://gitweb.gentoo.org/proj/java.git/commit/?id=7aee1adb
Add IcedTea:8 support to IcedTea-Web.
Package-Manager: portage-2.2.17
Manifest-Sign-Key: 35964222
dev-java/icedtea-web/ChangeLog | 283 +++++++++++++++++++++
dev-java/icedtea-web/Manifest | 16 ++
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 ++
6 files changed, 468 insertions(+)
diff --git a/dev-java/icedtea-web/ChangeLog b/dev-java/icedtea-web/ChangeLog
new file mode 100644
index 0000000..09ab9ee
--- /dev/null
+++ b/dev-java/icedtea-web/ChangeLog
@@ -0,0 +1,283 @@
+# ChangeLog for dev-java/icedtea-web
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-web/ChangeLog,v 1.53 2015/05/23 23:08:15 chewi Exp $
+
+ 23 May 2015; James Le Cuirot <chewi@gentoo.org> icedtea-web-1.5.1-r1.ebuild:
+ ~arm keyword.
+
+ 20 May 2015; James Le Cuirot <chewi@gentoo.org> icedtea-web-1.5.1-r1.ebuild:
+ ~ppc keyword.
+
+ 10 May 2015; James Le Cuirot <chewi@gentoo.org>
+ -files/0001-Fix-parallel-install.-BGO-440906.patch,
+ -files/0002-Respect-LDFLAGS.patch,
+ -files/icedtea-web-1.3.2-openjdk-build-25.patch, -icedtea-web-1.3.2-r7.ebuild,
+ -icedtea-web-1.3.2.ebuild, -icedtea-web-1.4.2-r1.ebuild,
+ -icedtea-web-1.4.2.ebuild:
+ Remove old versions. Unfortunately this means dropping some keywords but the
+ non-0 SLOTs have not mergeable for some time due to blockers.
+
+ 26 Apr 2015; Pacho Ramos <pacho@gentoo.org> icedtea-web-1.5.1-r1.ebuild:
+ amd64/x86 stable, bug #546902
+
+ 31 Mar 2015; Ulrich Müller <ulm@gentoo.org> icedtea-web-1.4.2.ebuild,
+ icedtea-web-1.4.2-r1.ebuild, icedtea-web-1.5.1-r1.ebuild:
+ Update dependency after package move of eselect modules to app-eselect.
+
+ 18 Feb 2015; Michał Górny <mgorny@gentoo.org> files/README.gentoo:
+ Fix typos in README.gentoo, https://github.com/gentoo/gentoo-portage-rsync-
+ mirror/pull/20 by Elias Probst.
+
+ 02 Nov 2014; Vlastimil Babka <caster@gentoo.org> -icedtea-web-1.5.1.ebuild,
+ icedtea-web-1.5.1-r1.ebuild:
+ Reintroduce USE=tagsoup and fix building with USE="-tagsoup" properly, bug
+ #527962.
+
+*icedtea-web-1.5.1-r1 (02 Nov 2014)
+
+ 02 Nov 2014; Patrick Lauer <patrick@gentoo.org> +icedtea-web-1.5.1-r1.ebuild:
+ Add ebuild for 1.5.1 that unconditionally depends on tagsoup #527962
+
+*icedtea-web-1.5.1 (01 Nov 2014)
+
+ 01 Nov 2014; Vlastimil Babka <caster@gentoo.org> -icedtea-web-1.4.1.ebuild,
+ icedtea-web-1.4.2-r1.ebuild, +icedtea-web-1.5.1.ebuild,
+ +files/icedtea-web-1.5-respect-ldflags.patch, metadata.xml:
+ Version bump, bug #512094. Adds optional USE=tagsoup which should allow
+ parsing malformed .jnlp files, at the cost of 35 java packages in
+ build-deptree. Depend on app-arch/zip, bug #516696.
+
+ 01 Nov 2014; Vlastimil Babka <caster@gentoo.org> icedtea-web-1.3.2-r7.ebuild:
+ Block >=icedtea-7.2.5.3 to make the block mutual.
+
+ 01 Nov 2014; Vlastimil Babka <caster@gentoo.org> icedtea-web-1.3.2.ebuild:
+ Block >=icedtea-6.1.13.5-r1 to make the block mutual.
+
+ 01 Jul 2014; Agostino Sarubbo <ago@gentoo.org> icedtea-web-1.4.2.ebuild:
+ Stable for x86, wrt bug #501472
+
+ 01 Jul 2014; Agostino Sarubbo <ago@gentoo.org> icedtea-web-1.4.2.ebuild:
+ Stable for amd64, wrt bug #501472
+
+*icedtea-web-1.4.2-r1 (27 Jun 2014)
+
+ 27 Jun 2014; Vlastimil Babka <caster@gentoo.org> icedtea-web-1.4.2.ebuild,
+ +icedtea-web-1.4.2-r1.ebuild:
+ Revbump the current icedtea-web-1.4.2 to 1.4.2-r1 without change. Then remove
+ icedtea7 USE flag and associated dependency from -r0, so it can be
+ stabilized. Security bug #501472.
+
+*icedtea-web-1.4.2 (01 Jun 2014)
+
+ 01 Jun 2014; Vlastimil Babka <caster@gentoo.org> +icedtea-web-1.4.2.ebuild:
+ Version bump, security bug #501472.
+
+ 30 Dec 2013; Tom Wijsman <TomWij@gentoo.org> -icedtea-web-1.3.1-r7.ebuild,
+ -icedtea-web-1.3.1.ebuild, metadata.xml:
+ Dropped vulnerable 1.3.1* (and unused local USE-descriptions gtk2 and gtk3)
+ for security bug #483198.
+
+ 11 Nov 2013; Vlastimil Babka <caster@gentoo.org> icedtea-web-1.4.1.ebuild,
+ metadata.xml:
+ Introduce icedtea7 USE flag, as it turns out that icedtea-web built with
+ icedtea-6 is missing a class necessary for icedtea-7. When built with
+ icedtea-7, it works with both versions.
+
+ 09 Nov 2013; Vlastimil Babka <caster@gentoo.org> icedtea-web-1.4.1.ebuild:
+ Correct VMHANDLE to make automatic nsplugin activation work.
+
+*icedtea-web-1.4.1 (25 Oct 2013)
+
+ 25 Oct 2013; Ralph Sennhauser <sera@gentoo.org> +icedtea-web-1.4.1.ebuild,
+ +files/0001-Fix-parallel-install.-BGO-440906.patch, +files/README.gentoo:
+ Version bump.
+ Adds ability to switch JVM.
+ Adds README.gentoo
+ Fix parallel install. Bug #440906
+
+ 19 Sep 2013; Tom Wijsman <TomWij@gentoo.org> metadata.xml:
+ gnu_andrew never wanted to be a proxied maintainer for this package and has
+ asked to be removed.
+
+*icedtea-web-1.3.2-r7 (23 Jul 2013)
+*icedtea-web-1.3.2 (23 Jul 2013)
+
+ 23 Jul 2013; Vlastimil Babka <caster@gentoo.org> -icedtea-web-1.3.ebuild,
+ -icedtea-web-1.3-r7.ebuild, +icedtea-web-1.3.2.ebuild,
+ +icedtea-web-1.3.2-r7.ebuild,
+ +files/icedtea-web-1.3.2-openjdk-build-25.patch:
+ Version bump with upstream patch to work with latest icedtea. See
+ http://blog.fuseyism.com/index.php/2013/06/19/imminent-icedtea-web-breakage/
+
+ 17 Mar 2013; Markos Chandras <hwoarang@gentoo.org> metadata.xml:
+ Add proxy-maintainers to metadata.xml
+
+ 05 Feb 2013; Rick Farina <zerochaos@gentoo.org> icedtea-web-1.3.1.ebuild:
+ adding ~arm
+
+*icedtea-web-1.3.1-r7 (14 Nov 2012)
+*icedtea-web-1.3.1 (14 Nov 2012)
+
+ 14 Nov 2012; Vlastimil Babka <caster@gentoo.org>
+ -icedtea-web-1.2.1-r1.ebuild, -icedtea-web-1.2.1-r8.ebuild,
+ -files/icedtea-web-1.2.1-memcpy.patch, +icedtea-web-1.3.1.ebuild,
+ +icedtea-web-1.3.1-r7.ebuild, -files/fix-plugin-in-icedtea-7.patch:
+ Version bump, security bug #442478. Install with -j1 for bug #440906.
+
+ 25 Sep 2012; Ralph Sennhauser <sera@gentoo.org> -icedtea-web-1.2.ebuild,
+ -icedtea-web-1.2-r7.ebuild, -icedtea-web-1.2.1.ebuild,
+ -icedtea-web-1.2.1-r7.ebuild:
+ Remove old, vulnarable. #429522
+
+*icedtea-web-1.3-r7 (25 Sep 2012)
+*icedtea-web-1.3 (25 Sep 2012)
+
+ 25 Sep 2012; Ralph Sennhauser <sera@gentoo.org> +icedtea-web-1.3.ebuild,
+ +icedtea-web-1.3-r7.ebuild, metadata.xml:
+ Version bump. #434094
+ Add missing dependencies on glib, gtk+ and pkgconfig.
+ Add gtk+:2/gtk+:3 support.
+ Simplyfy src_configure and src_install.
+
+ 06 Sep 2012; Jeroen Roovers <jer@gentoo.org> metadata.xml:
+ Spelling.
+
+*icedtea-web-1.2.1-r8 (03 Aug 2012)
+*icedtea-web-1.2.1-r1 (03 Aug 2012)
+
+ 03 Aug 2012; Vlastimil Babka <caster@gentoo.org>
+ +icedtea-web-1.2.1-r1.ebuild, +icedtea-web-1.2.1-r8.ebuild,
+ +files/icedtea-web-1.2.1-memcpy.patch:
+ Patch a buffer overflow in memcpy causing crashes with e.g. recent firefox
+ versions. See http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1106
+
+*icedtea-web-1.2.1-r7 (02 Aug 2012)
+*icedtea-web-1.2.1 (02 Aug 2012)
+
+ 02 Aug 2012; Ralph Sennhauser <sera@gentoo.org> +icedtea-web-1.2.1.ebuild,
+ +icedtea-web-1.2.1-r7.ebuild:
+ Security and bugfix release. #429522
+
+ 21 Jul 2012; Ralph Sennhauser <sera@gentoo.org> -icedtea-web-1.1.4.ebuild,
+ -icedtea-web-1.1.4-r7.ebuild, -icedtea-web-1.1.4-r8.ebuild,
+ icedtea-web-1.2.ebuild, icedtea-web-1.2-r7.ebuild:
+ Drop elog message about old browsers not working. #427458
+ Remove old.
+
+ 21 May 2012; Samuli Suominen <ssuominen@gentoo.org> icedtea-web-1.1.4.ebuild,
+ icedtea-web-1.1.4-r7.ebuild, icedtea-web-1.1.4-r8.ebuild,
+ icedtea-web-1.2.ebuild, icedtea-web-1.2-r7.ebuild:
+ Force net-misc/npapi-sdk for USE="nsplugin" instead of having || ( )
+ dependency block with net-libs/xulrunner which is obsolete and vulnerable.
+
+ 15 Apr 2012; Mike Frysinger <vapier@gentoo.org> icedtea-web-1.2.ebuild:
+ Add back ia64 love #349020 by Dennis Schridde.
+
+ 15 Apr 2012; Mike Frysinger <vapier@gentoo.org> icedtea-web-1.2-r7.ebuild:
+ Add back ia64 love #349020 by Dennis Schridde.
+
+ 14 Mar 2012; Ralph Sennhauser <sera@gentoo.org> icedtea-web-1.2.ebuild,
+ icedtea-web-1.2-r7.ebuild:
+ Use JAVA_PKG_WANT_BUILD_VM for selecting VM. Obsoletes handle migration code.
+
+*icedtea-web-1.2-r7 (06 Mar 2012)
+*icedtea-web-1.2 (06 Mar 2012)
+
+ 06 Mar 2012; Ralph Sennhauser <sera@gentoo.org> +icedtea-web-1.2.ebuild,
+ +icedtea-web-1.2-r7.ebuild:
+ Version bump
+
+ 03 Mar 2012; Vlastimil Babka <caster@gentoo.org> icedtea-web-1.1.4-r8.ebuild,
+ files/fix-plugin-in-icedtea-7.patch:
+ Fix the patch, bug #406715. Thanks to Flameeyes.
+
+*icedtea-web-1.1.4-r8 (02 Mar 2012)
+
+ 02 Mar 2012; Vlastimil Babka <caster@gentoo.org>
+ +icedtea-web-1.1.4-r8.ebuild, +files/fix-plugin-in-icedtea-7.patch:
+ Revbump with upstream patch to fix plugin initialization.
+
+ 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)
+
+ 24 Nov 2011; Ralph Sennhauser <sera@gentoo.org> +icedtea-web-1.1.4.ebuild,
+ +icedtea-web-1.1.4-r7.ebuild, metadata.xml:
+ Version and EAPI bump.
+ Finish VMHANDLE migration.
+ Add missing dependencies. Bug #389795
+
+ 04 Nov 2011; Vlastimil Babka <caster@gentoo.org> icedtea-web-1.1.3-r7.ebuild:
+ Add ~x86 keyword.
+
+*icedtea-web-1.1.3-r7 (04 Nov 2011)
+
+ 04 Nov 2011; Vlastimil Babka <caster@gentoo.org>
+ +icedtea-web-1.1.3-r7.ebuild:
+ Add icedtea-web:7 slot for icedtea-7.
+
+ 04 Nov 2011; Vlastimil Babka <caster@gentoo.org> -icedtea-web-1.1.1.ebuild,
+ -icedtea-web-1.1.2.ebuild, -icedtea-web-1.1.2-r1.ebuild,
+ icedtea-web-1.1.3.ebuild:
+ Prepare for icedtea VMHANDLE change. Remove old.
+
+*icedtea-web-1.1.3 (29 Sep 2011)
+
+ 29 Sep 2011; Vlastimil Babka <caster@gentoo.org> +icedtea-web-1.1.3.ebuild:
+ Version bump, npapi-sdk support now upstream.
+
+*icedtea-web-1.1.2-r1 (18 Sep 2011)
+
+ 18 Sep 2011; Vlastimil Babka <caster@gentoo.org>
+ +files/0002-Respect-LDFLAGS.patch, +icedtea-web-1.1.2-r1.ebuild:
+ Revbump to respect LDFLAGS, bug #356645.
+
+ 06 Sep 2011; Vlastimil Babka <caster@gentoo.org>
+ +files/0001-Support-using-NPAPI-SDK-headers-instead-of-whole-xul.patch:
+ Add missing patch, thanks to marienz
+
+*icedtea-web-1.1.2 (06 Sep 2011)
+
+ 06 Sep 2011; Vlastimil Babka <caster@gentoo.org> -icedtea-web-1.1.ebuild,
+ icedtea-web-1.1.1.ebuild, +icedtea-web-1.1.2.ebuild:
+ Version bump. Support building against npapi-sdk instead of xulrunner, bug
+ #381957. Also remove xulrunner from RDEPEND in all older versions, bug
+ #381147.
+
+*icedtea-web-1.1.1 (22 Jul 2011)
+
+ 22 Jul 2011; Vlastimil Babka <caster@gentoo.org> -icedtea-web-1.0.1.ebuild,
+ -icedtea-web-1.0.2.ebuild, +icedtea-web-1.1.1.ebuild:
+ Version bump, security bug #375977.
+
+ 20 Jun 2011; Vlastimil Babka <caster@gentoo.org> icedtea-web-1.1.ebuild:
+ Disable parallel make install until bug #372235 is resolved.
+
+*icedtea-web-1.1 (13 Jun 2011)
+
+ 13 Jun 2011; Vlastimil Babka <caster@gentoo.org> +icedtea-web-1.1.ebuild:
+ Version bump, security bug #370787.
+
+*icedtea-web-1.0.2 (08 Apr 2011)
+
+ 08 Apr 2011; Vlastimil Babka <caster@gentoo.org> +icedtea-web-1.0.2.ebuild:
+ Version bump, bug #361921.
+
+ 30 Mar 2011; Vlastimil Babka <caster@gentoo.org> icedtea-web-1.0.1.ebuild:
+ Remove -j1 from src_install as there should be no problem now that
+ compilation is properly in src_compile.
+
+ 30 Mar 2011; Vlastimil Babka <caster@gentoo.org> icedtea-web-1.0.1.ebuild:
+ Add src_compile() phase to override the one from java-pkg-2.
+
+*icedtea-web-1.0.1 (18 Feb 2011)
+
+ 18 Feb 2011; Vlastimil Babka <caster@gentoo.org> +icedtea-web-1.0.1.ebuild,
+ +metadata.xml:
+ Initial import from java-overlay, proxy-maintained by Andrew John Hughes
+ <gnu_andrew@member.fsf.org>
diff --git a/dev-java/icedtea-web/Manifest b/dev-java/icedtea-web/Manifest
new file mode 100644
index 0000000..9f66ab0
--- /dev/null
+++ b/dev-java/icedtea-web/Manifest
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX README.gentoo 840 SHA256 518db1165a213ed3aa8e3a77dd7cadcb8c4d204a2a424a291fd45512a7fcf0a0 SHA512 f9c7f80884bd1ff6ec4c7975a061298901fb3952e76ad48489059e1eab2b9a6bbe07a7d30709d84b18cf595f1022cc336493886dba04d3d6b9052e6cf71c74c8 WHIRLPOOL 31a5fe351356e3d665b9397ee6f17041d9e93846783e00a5582a42dfbe74e1f0361b92358ec99518b93091492e6d0c3e619ec4246636e55fa17f749f9d05b86f
+AUX icedtea-web-1.5-respect-ldflags.patch 363 SHA256 6513aee301cfc4209d5c7e45c229bc58a8b5027bdd0c231f9c6eb9fe7607fb7f SHA512 e1b7dc25e06d0f9a4c8de294823df3de61ebffd4cbae4ef1aee51c1424e1843fe54751e02da341e90f03d99891deff2605d3aaa556782c10bb01bc1ff99e7fdf WHIRLPOOL d4d31e1341a40ca642a7858afd7b358d0cf6daf6f7d7d6a2ce36d16a75b810bc1875006f37873bfce5b639c5a8e7d6484e5b5bf6fb6e022287f3bdcfae8420ea
+DIST icedtea-web-1.5.1.tar.gz 1616344 SHA256 03f16356fa84564f1ae32286e0a090a464c87ec123b40602dcea925757900195 SHA512 ef47eecbbb52fcb44ec9585db4c4428025201b04968dfcfc26061160d80b29ee649752f21ffe891cfa5c6bf775d0bc1dbb7dbd9a79794e052bb8b865fa94d039 WHIRLPOOL 955b5cc565fa62d2f5eb85a3253751cd284a4cb926619afe60920123878281a77f348a7c26cdafea2c6d4cd760fe4d399041b665b86ff1bbaf441e25f9f18379
+EBUILD icedtea-web-1.5.1-r1.ebuild 3188 SHA256 3f371e34035405ea15802f5859f9dffea05b2f492c8748cf243280104e106360 SHA512 370565701edfb4719bb2e95d40ffeb372d6cf50148c297b06640d35cd8ddbb24326362d4f250363318cb0bc589e9a7dfdd7027bd046b1b433411b3675f09dbb0 WHIRLPOOL 0316a74af9131b8f41e06723bd90c29b682de2286843d57809b6c6e6d9f23c96f87e3b927c1b1f161180e0f41d9f06d307d6d150e6007c3cedb892037fa5004d
+MISC ChangeLog 11234 SHA256 d93afdfa0df31bde4f0897f7a163a25d2f1df616776d578662dade828ad2aa76 SHA512 6f68d71a6ab21659ce5d382ba30819e383663f6ce9d18952096859e641fbf1d77b6fedbb9ae55ac48fbab1250108b3c6a5dc29c3f300e4b088571fd2e73ee213 WHIRLPOOL 111286273235046a468ab1a1a71264a5323115cf4c310606786a281d42c1b6db648d25ce1538a7ab50af0d8acbbc67725f9f1bfe705b41ccef29af9ade63b2e3
+MISC metadata.xml 831 SHA256 37a6402202fb192b67459c7b1eed5c1527cf8c5de4f08fb1b13b7d8bf21315e0 SHA512 407f8f919fec40fbf87e3ad9541f33968e183a86e33e82047cb8972c8383701382342988b8366b0a41dc15ee4354387331fc5487430434a90263bb489c63b249 WHIRLPOOL 37d3b79fc055cb27292312df8fcffdf7676400cb51ad9cd929611c6f24257ef787102c5094774eef0d4802c645aefec6de1f9e11afdc47ac2954d773de9fa7ca
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iF4EARYIAAYFAlWLLgQACgkQz9oPmzWWQiK4+AD+Np4GdFFKdzV/QC4/A/ZT6MIu
+EFDJm1GoL0KLv3RXb2wA/Awqi0kgVwLWfZiqrKoN9GM/i8zw4b5j45tmxdvRwEoO
+=QVQN
+-----END PGP SIGNATURE-----
diff --git a/dev-java/icedtea-web/files/README.gentoo b/dev-java/icedtea-web/files/README.gentoo
new file mode 100644
index 0000000..0b4b644
--- /dev/null
+++ b/dev-java/icedtea-web/files/README.gentoo
@@ -0,0 +1,21 @@
+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
new file mode 100644
index 0000000..72ee9eb
--- /dev/null
+++ b/dev-java/icedtea-web/files/icedtea-web-1.5-respect-ldflags.patch
@@ -0,0 +1,11 @@
+--- 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
new file mode 100644
index 0000000..ef00246
--- /dev/null
+++ b/dev-java/icedtea-web/icedtea-web-1.5.1-r1.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2015 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.5.1-r1.ebuild,v 1.6 2015/05/23 23:08:15 chewi Exp $
+# 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"
+
+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
new file mode 100644
index 0000000..d5339a7
--- /dev/null
+++ b/dev-java/icedtea-web/metadata.xml
@@ -0,0 +1,15 @@
+<?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>
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] proj/java:master commit in: dev-java/icedtea-web/, dev-java/icedtea-web/files/
@ 2016-01-04 22:40 James Le Cuirot
0 siblings, 0 replies; 2+ messages in thread
From: James Le Cuirot @ 2016-01-04 22:40 UTC (permalink / raw
To: gentoo-commits
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 (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"
-
-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>
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2016-01-04 22:40 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-06-25 1:14 [gentoo-commits] proj/java:master commit in: dev-java/icedtea-web/, dev-java/icedtea-web/files/ Andrew John Hughes
-- strict thread matches above, loose matches on Subject: below --
2016-01-04 22:40 James Le Cuirot
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox