1 |
commit: 65d5d6c23def721688b6b20d575b1a42ee144aec |
2 |
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Jan 4 22:38:28 2016 +0000 |
4 |
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Jan 4 22:38:28 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/java.git/commit/?id=65d5d6c2 |
7 |
|
8 |
dev-java/icedtea-web: Remove forked "icedtea8" version |
9 |
|
10 |
1.6.1 in the tree works with any VM. |
11 |
|
12 |
dev-java/icedtea-web/Manifest | 1 - |
13 |
dev-java/icedtea-web/files/README.gentoo | 21 ---- |
14 |
.../files/icedtea-web-1.5-respect-ldflags.patch | 11 -- |
15 |
dev-java/icedtea-web/icedtea-web-1.5.1-r1.ebuild | 122 --------------------- |
16 |
dev-java/icedtea-web/metadata.xml | 15 --- |
17 |
5 files changed, 170 deletions(-) |
18 |
|
19 |
diff --git a/dev-java/icedtea-web/Manifest b/dev-java/icedtea-web/Manifest |
20 |
deleted file mode 100644 |
21 |
index 6b08126..0000000 |
22 |
--- a/dev-java/icedtea-web/Manifest |
23 |
+++ /dev/null |
24 |
@@ -1 +0,0 @@ |
25 |
-DIST icedtea-web-1.5.1.tar.gz 1616344 SHA256 03f16356fa84564f1ae32286e0a090a464c87ec123b40602dcea925757900195 SHA512 ef47eecbbb52fcb44ec9585db4c4428025201b04968dfcfc26061160d80b29ee649752f21ffe891cfa5c6bf775d0bc1dbb7dbd9a79794e052bb8b865fa94d039 WHIRLPOOL 955b5cc565fa62d2f5eb85a3253751cd284a4cb926619afe60920123878281a77f348a7c26cdafea2c6d4cd760fe4d399041b665b86ff1bbaf441e25f9f18379 |
26 |
|
27 |
diff --git a/dev-java/icedtea-web/files/README.gentoo b/dev-java/icedtea-web/files/README.gentoo |
28 |
deleted file mode 100644 |
29 |
index 0b4b644..0000000 |
30 |
--- a/dev-java/icedtea-web/files/README.gentoo |
31 |
+++ /dev/null |
32 |
@@ -1,21 +0,0 @@ |
33 |
-Manage Plugin |
34 |
-------------- |
35 |
-The IcedTea browser plugin (NPPlugin) can be enabled using |
36 |
-eselect java-nsplugin. |
37 |
- |
38 |
-Select JVM |
39 |
----------- |
40 |
-IcedTea-Web (>=1.4) supports selecting the JVM to use for the plugin. Currently |
41 |
-works for all IcedTea releases. The eselect module java-nsplugin in |
42 |
->=eselect-java-0.1.0 added support for this. |
43 |
- |
44 |
-Per user configuration |
45 |
----------------------- |
46 |
-IcedTea-Web also supports per user configuration which takes precedence over the |
47 |
-global choice of JVM managed by the java-nsplugin module. If you made use of |
48 |
-itweb-settings as user to set a JVM for instance and want to give control back |
49 |
-to java-nsplugin to manage the JVM to use run as your user: |
50 |
-'sed -i -e "/^deployment.jre.dir=/d" ~/.icedtea/deployment.properties' |
51 |
- |
52 |
-Per user plugin selection via eselect java-nsplugin is a longstanding feature |
53 |
-request. Bug 148632 |
54 |
|
55 |
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 |
56 |
deleted file mode 100644 |
57 |
index 72ee9eb..0000000 |
58 |
--- a/dev-java/icedtea-web/files/icedtea-web-1.5-respect-ldflags.patch |
59 |
+++ /dev/null |
60 |
@@ -1,11 +0,0 @@ |
61 |
---- Makefile.am.orig 2014-08-14 12:15:46.000000000 +0200 |
62 |
-+++ Makefile.am 2014-11-01 23:09:49.543555638 +0100 |
63 |
-@@ -322,7 +322,7 @@ |
64 |
- |
65 |
- $(PLUGIN_DIR)/$(BUILT_PLUGIN_LIBRARY): $(addprefix $(PLUGIN_DIR)/,$(PLUGIN_OBJECTS)) |
66 |
- cd $(PLUGIN_DIR) && \ |
67 |
-- $(CXX) $(CXXFLAGS) \ |
68 |
-+ $(CXX) $(CXXFLAGS) $(LDFLAGS) \ |
69 |
- $(PLUGIN_OBJECTS) \ |
70 |
- $(GLIB_LIBS) \ |
71 |
- $(MOZILLA_LIBS) \ |
72 |
|
73 |
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 |
74 |
deleted file mode 100644 |
75 |
index 0e0dda1..0000000 |
76 |
--- a/dev-java/icedtea-web/icedtea-web-1.5.1-r1.ebuild |
77 |
+++ /dev/null |
78 |
@@ -1,122 +0,0 @@ |
79 |
-# Copyright 1999-2015 Gentoo Foundation |
80 |
-# Distributed under the terms of the GNU General Public License v2 |
81 |
-# $Id$ |
82 |
-# Build written by Andrew John Hughes (ahughes@××××××.com) |
83 |
- |
84 |
-EAPI="5" |
85 |
- |
86 |
-inherit autotools eutils readme.gentoo java-pkg-2 java-vm-2 |
87 |
- |
88 |
-DESCRIPTION="FOSS Java browser plugin and Web Start implementation" |
89 |
-HOMEPAGE="http://icedtea.classpath.org" |
90 |
-SRC_URI="http://icedtea.classpath.org/download/source/${P}.tar.gz" |
91 |
- |
92 |
-LICENSE="GPL-2 GPL-2-with-linking-exception LGPL-2" |
93 |
-SLOT="0" |
94 |
-KEYWORDS="~amd64" |
95 |
- |
96 |
-IUSE="doc +icedtea7 +icedtea8 javascript +nsplugin tagsoup test" |
97 |
- |
98 |
-COMMON_DEP=" |
99 |
- icedtea8? ( || ( |
100 |
- dev-java/icedtea:8 dev-java/icedtea-bin:8 |
101 |
- ) ) |
102 |
- !icedtea8? ( || ( |
103 |
- icedtea7? ( || ( |
104 |
- dev-java/icedtea:7 dev-java/icedtea-bin:7 |
105 |
- ) ) |
106 |
- !icedtea7? ( || ( |
107 |
- dev-java/icedtea:7 dev-java/icedtea-bin:7 |
108 |
- dev-java/icedtea:6 dev-java/icedtea-bin:6 |
109 |
- ) ) |
110 |
- ) ) |
111 |
- app-eselect/eselect-java |
112 |
- tagsoup? ( dev-java/tagsoup ) |
113 |
- nsplugin? ( |
114 |
- >=dev-libs/glib-2.16 |
115 |
- )" |
116 |
-RDEPEND="${COMMON_DEP}" |
117 |
-# Need system junit 4.8+. Bug #389795 |
118 |
-DEPEND="${COMMON_DEP} |
119 |
- virtual/pkgconfig |
120 |
- app-arch/zip |
121 |
- javascript? ( dev-java/rhino:1.6 ) |
122 |
- nsplugin? ( net-misc/npapi-sdk ) |
123 |
- test? ( >=dev-java/junit-4.8:4 )" |
124 |
- |
125 |
-# http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2010-December/011221.html |
126 |
-pkg_setup() { |
127 |
- JAVA_PKG_WANT_BUILD_VM="icedtea-8 icedtea-bin-8" |
128 |
- if ! use icedtea8; then |
129 |
- JAVA_PKG_WANT_BUILD_VM="${JAVA_PKG_WANT_BUILD_VM} icedtea-7 icedtea-bin-7" |
130 |
- if ! use icedtea7; then |
131 |
- JAVA_PKG_WANT_BUILD_VM="${JAVA_PKG_WANT_BUILD_VM} icedtea-6 icedtea-bin-6" |
132 |
- fi |
133 |
- fi |
134 |
- JAVA_PKG_WANT_SOURCE="1.6" |
135 |
- JAVA_PKG_WANT_TARGET="1.6" |
136 |
- |
137 |
- java-pkg-2_pkg_setup |
138 |
- java-vm-2_pkg_setup |
139 |
-} |
140 |
- |
141 |
-src_prepare() { |
142 |
- epatch "${FILESDIR}"/${PN}-1.5-respect-ldflags.patch # bug #356645 |
143 |
- eautoreconf |
144 |
-} |
145 |
- |
146 |
-src_configure() { |
147 |
- local tagsoup_jar |
148 |
- local config |
149 |
- |
150 |
- # bug #527962 |
151 |
- use tagsoup && tagsoup_jar="$(java-pkg_getjars tagsoup)" |
152 |
- |
153 |
- config=( |
154 |
- # javaws is managed by eselect java-vm and symlinked to by icedtea so |
155 |
- # move it out of the way and symlink itweb-settings back to bin |
156 |
- --bindir="${EPREFIX}"/usr/libexec/${PN} |
157 |
- --with-jdk-home="${JAVA_HOME}" |
158 |
- $(use_enable doc docs) |
159 |
- $(use_enable nsplugin plugin) |
160 |
- $(use_with javascript rhino) |
161 |
- $(use_with tagsoup tagsoup ${tagsoup_jar}) |
162 |
- ) |
163 |
- |
164 |
- unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS |
165 |
- econf "${config[@]}" |
166 |
-} |
167 |
- |
168 |
-src_compile() { |
169 |
- default |
170 |
-} |
171 |
- |
172 |
-src_install() { |
173 |
- default |
174 |
- |
175 |
- if use nsplugin; then |
176 |
- install_mozilla_plugin "/usr/$(get_libdir)/IcedTeaPlugin.so" |
177 |
- fi |
178 |
- |
179 |
- mkdir -p "${ED}"/usr/bin || die |
180 |
- dosym /usr/libexec/${PN}/itweb-settings /usr/bin/itweb-settings || die |
181 |
- |
182 |
- # Should we patch system default lookup instead? |
183 |
- mkdir -p "${ED}"/etc/.java/deployment/ || die |
184 |
- echo "deployment.jre.dir=/etc/java-config-2/current-icedtea-web-vm" \ |
185 |
- > "${ED}"/etc/.java/deployment/deployment.properties || die |
186 |
- |
187 |
- readme.gentoo_create_doc |
188 |
-} |
189 |
- |
190 |
-pkg_postinst() { |
191 |
- VMHANDLE="icedtea-web@${GENTOO_VM}" java-vm_check-nsplugin |
192 |
- java_mozilla_clean_ |
193 |
- readme.gentoo_print_elog |
194 |
-} |
195 |
- |
196 |
-pkg_prerm() { |
197 |
- # override the java-vm-2 eclass check for removing a system VM, as it |
198 |
- # doesn't make sense here. |
199 |
- :; |
200 |
-} |
201 |
|
202 |
diff --git a/dev-java/icedtea-web/metadata.xml b/dev-java/icedtea-web/metadata.xml |
203 |
deleted file mode 100644 |
204 |
index d5339a7..0000000 |
205 |
--- a/dev-java/icedtea-web/metadata.xml |
206 |
+++ /dev/null |
207 |
@@ -1,15 +0,0 @@ |
208 |
-<?xml version="1.0" encoding="UTF-8"?> |
209 |
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
210 |
-<pkgmetadata> |
211 |
- <herd>java</herd> |
212 |
- <longdescription> |
213 |
- FOSS Java Web Start and optional browser plugin implementation based on NetX, to be used with icedtea. |
214 |
- </longdescription> |
215 |
- <use> |
216 |
- <flag name="javascript">Enable support for using proxy auto config (PAC) files.</flag> |
217 |
- <flag name="icedtea7">Build icedtea-7 support in addition to icedtea-6 support. Requires icedtea{-bin}-7</flag> |
218 |
- <flag name="icedtea8">Build icedtea-8 support in addition to icedtea-6 and icedtea-7 support. Requires icedtea{-bin}-8</flag> |
219 |
- <flag name="nsplugin">Enable the browser plugin (NPPlugin).</flag> |
220 |
- <flag name="tagsoup">Depend on dev-java/tagsoup which allows parsing malformed .jnlp files</flag> |
221 |
- </use> |
222 |
-</pkgmetadata> |