[gentoo-commits] repo/gentoo:master commit in: app-eselect/eselect-java/

[Robin H. Johnson]

commit:     b0e0734184c491a61ed0f397e5e23cf4a5e6a3d6
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 11 16:58:02 2016 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Mon Jul 11 16:58:15 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0e07341

app-eselect/eselect-java: bug #549498: less spam from "eselect $x show".

Package-Manager: portage-2.2.28

 .../eselect-java/eselect-java-0.2.0-r1.ebuild      | 46 ++++++++++++++++++++++
 1 file changed, 46 insertions(+)

diff --git a/app-eselect/eselect-java/eselect-java-0.2.0-r1.ebuild b/app-eselect/eselect-java/eselect-java-0.2.0-r1.ebuild
new file mode 100644
index 0000000..8207580
--- /dev/null
+++ b/app-eselect/eselect-java/eselect-java-0.2.0-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit autotools
+
+DESCRIPTION="A set of eselect modules for Java"
+HOMEPAGE="https://www.gentoo.org/proj/en/java/"
+SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND="
+	!app-eselect/eselect-ecj
+	!app-eselect/eselect-maven
+	!<dev-java/java-config-2.2
+	app-admin/eselect"
+
+src_prepare() {
+	eautoreconf
+
+	# Bug 549498: "eselect XXX show" should never send output to stderr.
+	sed -i \
+		-e '/^do_show.. {$/,/^}$/{ /echo/s,>&2$,, }' \
+		"${S}"/src/modules/maven.eselect.in \
+		"${S}"/src/modules/ecj.eselect.in
+}
+
+pkg_postinst() {
+	local REMOVED=0
+
+	rm -v "${EROOT}"usr/lib*/nsbrowser/plugins/javaplugin.so 2>/dev/null && REMOVED=1
+	rm -v "${EROOT}"etc/java-config-2/current-icedtea-web-vm 2>/dev/null && REMOVED=1
+
+	if [[ "${REMOVED}" = 1 ]]; then
+		elog "The eselect java-nsplugin module has been removed and your configuration"
+		elog "has been cleaned up. From now on, you may only install either Oracle or"
+		elog "IcedTea's plugin but not both. Note you can use IcedTea's plugin with an"
+		elog "Oracle VM. See the README installed with icedtea-web for more details."
+	fi
+}