From 18d6ee3819ab02ce8baa36f4803be80d6f1e4455 Mon Sep 17 00:00:00 2001 From: frank Date: Mon, 16 Jan 2012 00:54:27 +0100 Subject: [PATCH] committing changes in /etc after emerge run Package changes: +dev-java/java-config-2.1.11-r3 --- .etckeeper | 9 ++++++++ env.d/20java-config | 2 ++ java-config-2/build/compilers.conf | 5 +++++ java-config-2/build/jdk.conf | 12 +++++++++++ java-config-2/virtuals | 4 ++++ profile.d/java-config-2.csh | 22 +++++++++++++++++++ profile.d/java-config-2.sh | 34 ++++++++++++++++++++++++++++++ revdep-rebuild/60-java | 9 ++++++++ 8 files changed, 97 insertions(+) create mode 100644 env.d/20java-config create mode 100644 java-config-2/build/compilers.conf create mode 100644 java-config-2/build/jdk.conf create mode 100644 java-config-2/virtuals create mode 100644 profile.d/java-config-2.csh create mode 100644 profile.d/java-config-2.sh create mode 100644 revdep-rebuild/60-java diff --git a/.etckeeper b/.etckeeper index 38841797..8c8798cd 100755 --- a/.etckeeper +++ b/.etckeeper @@ -110,6 +110,7 @@ maybe chmod 0644 './env.d/04multilib' maybe chmod 0644 './env.d/05binutils' maybe chmod 0644 './env.d/05gcc-x86_64-pc-linux-gnu' maybe chmod 0644 './env.d/09sandbox' +maybe chmod 0644 './env.d/20java-config' maybe chmod 0644 './env.d/30xdg-data-local' maybe chmod 0644 './env.d/37fontconfig' maybe chmod 0644 './env.d/44qt4' @@ -308,6 +309,11 @@ maybe chmod 0644 './iproute2/rt_scopes' maybe chmod 0644 './iproute2/rt_tables' maybe chmod 0644 './issue' maybe chmod 0644 './issue.logo' +maybe chmod 0755 './java-config-2' +maybe chmod 0755 './java-config-2/build' +maybe chmod 0644 './java-config-2/build/compilers.conf' +maybe chmod 0644 './java-config-2/build/jdk.conf' +maybe chmod 0644 './java-config-2/virtuals' maybe chmod 0755 './kernel' maybe chmod 0755 './kernel/postinst.d' maybe chmod 0644 './kernel/postinst.d/.keep_sys-apps_debianutils-0' @@ -419,6 +425,8 @@ maybe chmod 0644 './profile' maybe chmod 0755 './profile.d' maybe chmod 0644 './profile.d/.keep' maybe chmod 0644 './profile.d/bash-completion.sh' +maybe chmod 0644 './profile.d/java-config-2.csh' +maybe chmod 0644 './profile.d/java-config-2.sh' maybe chmod 0644 './profile.env' maybe chmod 0644 './protocols' maybe chmod 0755 './qt4' @@ -427,6 +435,7 @@ maybe chmod 0644 './rc.conf' maybe chmod 0644 './request-key.conf' maybe chmod 0644 './resolv.conf' maybe chmod 0755 './revdep-rebuild' +maybe chmod 0644 './revdep-rebuild/60-java' maybe chmod 0644 './revdep-rebuild/99revdep-rebuild' maybe chmod 0755 './rmt' maybe chmod 0644 './rpc' diff --git a/env.d/20java-config b/env.d/20java-config new file mode 100644 index 00000000..d4357333 --- /dev/null +++ b/env.d/20java-config @@ -0,0 +1,2 @@ +MANPATH=/etc/java-config/system-vm/man/ +CONFIG_PROTECT_MASK="/etc/env.d/java/" diff --git a/java-config-2/build/compilers.conf b/java-config-2/build/compilers.conf new file mode 100644 index 00000000..2a615cfd --- /dev/null +++ b/java-config-2/build/compilers.conf @@ -0,0 +1,5 @@ +# If the ebuild supports it +# it will check the COMPILERS var front to back and +# use the fist compiler that is installed + +#COMPILERS="ecj-3.1 jikes javac" diff --git a/java-config-2/build/jdk.conf b/java-config-2/build/jdk.conf new file mode 100644 index 00000000..0c42763d --- /dev/null +++ b/java-config-2/build/jdk.conf @@ -0,0 +1,12 @@ +# User jdk configuration file +# You can specify which jdk you prefer to use +# see http://www.gentoo.org/doc/en/java.xml#doc_chap4_sect3 for more info +# +# example: + +#1.3=sun-jdk-1.4 ibm-jdk-bin +#1.4=blackdown-jdk +#1.5=sun-jdk + +#or if you want everything with sun-jdk +#*=sun-jdk diff --git a/java-config-2/virtuals b/java-config-2/virtuals new file mode 100644 index 00000000..c2e39928 --- /dev/null +++ b/java-config-2/virtuals @@ -0,0 +1,4 @@ +# Example: +# +#javamail=gnu-javamail-1 +#javamail=sun-javamail diff --git a/profile.d/java-config-2.csh b/profile.d/java-config-2.csh new file mode 100644 index 00000000..517a0540 --- /dev/null +++ b/profile.d/java-config-2.csh @@ -0,0 +1,22 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License, v2 or later +# $Header: /var/cvsroot/gentoo-x86/dev-java/java-config/files/java-config-2.profiled.csh,v 1.3 2007/01/13 17:17:08 grobian Exp $ + +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 new file mode 100644 index 00000000..49155d10 --- /dev/null +++ b/profile.d/java-config-2.sh @@ -0,0 +1,34 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License, v2 or later +# $Header: /var/cvsroot/gentoo-x86/dev-java/java-config/files/java-config-2.profiled.sh-r1,v 1.1 2007/03/16 11:13:16 betelgeuse Exp $ + +# 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 new file mode 100644 index 00000000..1aca594a --- /dev/null +++ b/revdep-rebuild/60-java @@ -0,0 +1,9 @@ +# 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" -- 2.39.5