1 |
commit: 47b7e0290735f8af61a8df3323ff873d4968ce85 |
2 |
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Jan 1 16:20:06 2016 +0000 |
4 |
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Jan 1 22:49:14 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=47b7e029 |
7 |
|
8 |
app-eselect/eselect-java: Version bump |
9 |
|
10 |
This version removes the java-nsplugin module. |
11 |
|
12 |
Package-Manager: portage-2.2.26 |
13 |
|
14 |
app-eselect/eselect-java/Manifest | 1 + |
15 |
app-eselect/eselect-java/eselect-java-0.2.0.ebuild | 40 ++++++++++++++++++++++ |
16 |
2 files changed, 41 insertions(+) |
17 |
|
18 |
diff --git a/app-eselect/eselect-java/Manifest b/app-eselect/eselect-java/Manifest |
19 |
index ed06df7..6d368b4 100644 |
20 |
--- a/app-eselect/eselect-java/Manifest |
21 |
+++ b/app-eselect/eselect-java/Manifest |
22 |
@@ -1,2 +1,3 @@ |
23 |
DIST eselect-java-0.1.0.tar.bz2 14486 SHA256 7dcd2c9d7aa6d693d0b0d558859bdc88c53997d92562a1bf5335de708d19c817 SHA512 4ee13349a9b34cfb007a04423f6961c984ad02135cb1141e504662682dcc35d22f9332b04bad13ec9d538212fe2230407598eed633d5a5edd0633081ec2fa6ae WHIRLPOOL ec94c878f8fab9272b679c25b0ffc553f5fa25dd62dc1a447397befa9a749be3124fc994c34ccc2014e981d088e9cca76beef74356283dee79ec370ea18009c7 |
24 |
DIST eselect-java-0.1.0.tar.gz 72265 SHA256 035b0c2cb9837b8b3b906cf9d72ec9ebf6e0db3d5e296c2b1c640d0e4a4071f2 SHA512 f8099f394303466ce652f099c16581668544cb4c0ab3c7c8af4b56230c6bdd692e72610be5f522227e874650481554f3b7815da2a4e8d090c31478d399c04e95 WHIRLPOOL 4f2b4432fe46023163b8e8421a505422b6f50599b67892f1b7abfb7b46393aab0590f1ecd69526839392703fed80fb099b8f3e273a34b99da39045c7b8a9cb77 |
25 |
+DIST eselect-java-0.2.0.tar.bz2 13353 SHA256 a860fdf1d5d0560e206fee3912eb768492115bcb430cb9eba031d0cbf90499bf SHA512 376c72317461c743dd91f8576cff7b1279b8f1672aa878c492ec3ed0da5f3c8d25cbb5fd4d9120109a01466dadbd049fb75d642187c850676d939925bcb55fdd WHIRLPOOL c45da204c312c1277f532756363932aeb057261728f1264cbcc01da6feb7568673aff880fa611c471b60a878434eacda592e3743022130c78247b047dbf848be |
26 |
|
27 |
diff --git a/app-eselect/eselect-java/eselect-java-0.2.0.ebuild b/app-eselect/eselect-java/eselect-java-0.2.0.ebuild |
28 |
new file mode 100644 |
29 |
index 0000000..a86b534 |
30 |
--- /dev/null |
31 |
+++ b/app-eselect/eselect-java/eselect-java-0.2.0.ebuild |
32 |
@@ -0,0 +1,40 @@ |
33 |
+# Copyright 1999-2016 Gentoo Foundation |
34 |
+# Distributed under the terms of the GNU General Public License v2 |
35 |
+# $Id$ |
36 |
+ |
37 |
+EAPI=5 |
38 |
+ |
39 |
+inherit autotools |
40 |
+ |
41 |
+DESCRIPTION="A set of eselect modules for Java" |
42 |
+HOMEPAGE="https://www.gentoo.org/proj/en/java/" |
43 |
+SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.bz2" |
44 |
+ |
45 |
+LICENSE="GPL-2" |
46 |
+SLOT="0" |
47 |
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
48 |
+IUSE="" |
49 |
+ |
50 |
+RDEPEND=" |
51 |
+ !app-eselect/eselect-ecj |
52 |
+ !app-eselect/eselect-maven |
53 |
+ !<dev-java/java-config-2.2 |
54 |
+ app-admin/eselect" |
55 |
+ |
56 |
+src_prepare() { |
57 |
+ eautoreconf |
58 |
+} |
59 |
+ |
60 |
+pkg_postinst() { |
61 |
+ local REMOVED=0 |
62 |
+ |
63 |
+ rm -v "${EROOT}"usr/lib*/nsbrowser/plugins/javaplugin.so 2>/dev/null && REMOVED=1 |
64 |
+ rm -v "${EROOT}"etc/java-config-2/current-icedtea-web-vm 2>/dev/null && REMOVED=1 |
65 |
+ |
66 |
+ if [[ "${REMOVED}" = 1 ]]; then |
67 |
+ elog "The eselect java-nsplugin module has been removed and your configuration" |
68 |
+ elog "has been cleaned up. From now on, you may only install either Oracle or" |
69 |
+ elog "IcedTea's plugin but not both. Note you can use IcedTea's plugin with an" |
70 |
+ elog "Oracle VM. See the README installed with icedtea-web for more details." |
71 |
+ fi |
72 |
+} |