From df2736187a2d48042985fbb68d958d035d5a91d6 Mon Sep 17 00:00:00 2001
From: Hans Wurst <hans@wurst.com>
Date: Thu, 6 Aug 2015 20:08:59 +0200
Subject: [PATCH] committing changes in /etc after emerge run

Package changes:
---
 env.d/20java-config         |  1 -
 profile.d/java-config-2.csh | 21 ---------------------
 profile.d/java-config-2.sh  | 33 ---------------------------------
 revdep-rebuild/60-java      |  9 ---------
 4 files changed, 64 deletions(-)
 delete mode 100644 env.d/20java-config
 delete mode 100644 profile.d/java-config-2.csh
 delete mode 100644 profile.d/java-config-2.sh
 delete mode 100644 revdep-rebuild/60-java

diff --git a/env.d/20java-config b/env.d/20java-config
deleted file mode 100644
index 1128b5d..0000000
--- a/env.d/20java-config
+++ /dev/null
@@ -1 +0,0 @@
-MANPATH="/etc/java-config-2/current-system-vm/man/"
diff --git a/profile.d/java-config-2.csh b/profile.d/java-config-2.csh
deleted file mode 100644
index cd68c2a..0000000
--- a/profile.d/java-config-2.csh
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License, v2 or later
-
-set gentoo_user_vm = "${HOME}/.gentoo/java-config-2/current-user-vm"
-set gentoo_system_vm = "/etc/java-config-2/current-system-vm"
-
-## If we have a current-user-vm (and aren't root)... set it to JAVA_HOME
-## Otherwise set to the current system vm
-if ( ( "$uid" != "0" ) && ( -l $gentoo_user_vm ) ) then
-    setenv JAVA_HOME $gentoo_user_vm
-else if ( -l $gentoo_system_vm ) then
-    setenv JAVA_HOME $gentoo_system_vm
-endif
-unset gentoo_user_vm gentoo_system_vm
-
-if ( $?JAVA_HOME ) then
-	# prepending to come before generation 1
-	setenv MANPATH "${JAVA_HOME}/man:${MANPATH}"
-	setenv JDK_HOME $JAVA_HOME
-	setenv JAVAC ${JDK_HOME}/bin/javac
-endif
diff --git a/profile.d/java-config-2.sh b/profile.d/java-config-2.sh
deleted file mode 100644
index 532fc86..0000000
--- a/profile.d/java-config-2.sh
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License, v2 or later
-
-# If we have a current-user-vm (and aren't root)... set it to JAVA_HOME
-gentoo_user_vm="${HOME}/.gentoo/java-config-2/current-user-vm"
-gentoo_system_vm="/etc/java-config-2/current-system-vm"
-
-# Please make sure that this script is POSIX compliant
-# See https://bugs.gentoo.org/show_bug.cgi?id=169925
-# for more details"
-
-if [ -z "${UID}" ] ; then
-	# id lives in /usr/bin which might not be mounted
-	if type id >/dev/null 2>/dev/null ; then
-		user_id=$(id -u)
-	else
-		[ "${USER}" = "root" ] && user_id=0
-	fi
-fi
-
-# The root user uses the system vm
-if [ "${user_id}" != 0 -a -L "${gentoo_user_vm}" ]; then
-	export JAVA_HOME=${gentoo_user_vm}
-# Otherwise set to the current system vm
-elif [ -L "/etc/java-config-2/current-system-vm" ]; then
-	export JAVA_HOME=${gentoo_system_vm}
-fi
-
-# prepending to come before generation 1
-export MANPATH="${JAVA_HOME}/man:${MANPATH}"
-export JDK_HOME=${JAVA_HOME}
-export JAVAC=${JDK_HOME}/bin/javac
-unset gentoo_user_vm gentoo_system_vm user_id
diff --git a/revdep-rebuild/60-java b/revdep-rebuild/60-java
deleted file mode 100644
index 1aca594..0000000
--- a/revdep-rebuild/60-java
+++ /dev/null
@@ -1,9 +0,0 @@
-# The VM dynamically loads these at runtime so they will end up as missing
-# but actually work just fine. See for example
-# https://bugs.gentoo.org/show_bug.cgi?id=152039
-#
-# This file should only have files the are used by things like swt. If there
-# are "broken" links inside the jre itself, the jre should install it's own
-# control file.
-
-LD_LIBRARY_MASK="libjvm.so libjawt.so"