* [gentoo-commits] eselect r654 - in trunk/extern: . modules
@ 2009-09-18 16:51 Ulrich Mueller (ulm)
0 siblings, 0 replies; only message in thread
From: Ulrich Mueller (ulm) @ 2009-09-18 16:51 UTC (permalink / raw
To: gentoo-commits
Author: ulm
Date: 2009-09-18 16:51:10 +0000 (Fri, 18 Sep 2009)
New Revision: 654
Removed:
trunk/extern/modules/java-nsplugin.eselect
trunk/extern/modules/java-vm.eselect
Modified:
trunk/extern/ChangeLog
Log:
Remove java-nsplugin and java-vm modules.
Modified: trunk/extern/ChangeLog
===================================================================
--- trunk/extern/ChangeLog 2009-09-17 15:54:23 UTC (rev 653)
+++ trunk/extern/ChangeLog 2009-09-18 16:51:10 UTC (rev 654)
@@ -1,3 +1,10 @@
+2009-09-18 Ulrich Mueller <ulm@gentoo.org>
+
+ * modules/java-nsplugin.eselect, modules/java-vm.eselect:
+ Removed, as discussed with Petteri Räty <betelgeuse@gentoo.org>.
+ The files' new location is in the Java project overlay:
+ <https://overlays.gentoo.org/svn/proj/java/projects/java-config-2>
+
2009-09-17 Ulrich Mueller <ulm@gentoo.org>
* modules/opengl.eselect: Sync with version in Portage, on behalf
Deleted: trunk/extern/modules/java-nsplugin.eselect
===================================================================
--- trunk/extern/modules/java-nsplugin.eselect 2009-09-17 15:54:23 UTC (rev 653)
+++ trunk/extern/modules/java-nsplugin.eselect 2009-09-18 16:51:10 UTC (rev 654)
@@ -1,207 +0,0 @@
-# -*-eselect-*- vim: ft=eselect
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-inherit tests multilib
-
-DESCRIPTION="Manage the Java plugin for Netscape-like Browsers"
-MAINTAINER="java@gentoo.org"
-SVN_DATE='$Date$'
-VERSION=$(svn_date_to_version "${SVN_DATE}" )
-
-
-PLUGINS_HOME="${ROOT}/usr/share/java-config-2/nsplugin"
-SYSTEM_PLUGIN_DIR="${ROOT}/usr/lib/nsbrowser/plugins"
-SYSTEM_PLUGIN_DIR_32="${ROOT}/usr/lib32/nsbrowser/plugins"
-SYSTEM_PLUGIN_DIR_64="${ROOT}/usr/lib64/nsbrowser/plugins"
-SYSTEM_PLUGIN="${SYSTEM_PLUGIN_DIR}/javaplugin.so"
-SYSTEM_PLUGIN_32="${SYSTEM_PLUGIN_DIR_32}/javaplugin.so"
-SYSTEM_PLUGIN_64="${SYSTEM_PLUGIN_DIR_64}/javaplugin.so"
-
-libdirs=$(list_libdirs)
-if has lib32 ${libdirs} && has lib64 ${libdirs}; then
- IS_MULTILIB="true"
-else
- IS_MULTILIB="false"
-fi
-### show action
-
-## {{{ show stuff
-
- describe_show() {
- echo "Show the current Java browser plugin"
- }
-
- do_show() {
- local system_name=$(get_system_plugin_vm)
- write_list_start "Current Java browser plugin"
- if [[ -z "${system_name}" ]] ; then
- write_kv_list_entry "(unset)" ""
- else
- write_kv_list_entry "${system_name}" ""
- fi
- }
-
-## }}}
-
-### list action
-
-
-
-## {{{ list stuff
- describe_list() {
- echo "List available Java browser plugins"
- }
-
- tweak_list_item() {
- local vm=${1}
- local system_name=${2}
- local mark=""
- if [[ ${vm} == ${system_name} ]]; then
- mark="${mark} $(highlight 'current')"
- fi
- echo "${vm} ${mark}"
- }
-
- tweak_list() {
- local targets=( ${@} )
- system_name=$(get_system_plugin_vm)
-
- for (( i = 0 ; i < ${#targets[@]} ; i = i + 1 )) ; do
- twaek_list_item ${targets[${i}]} ${system_name}
- done
- }
-
- do_list() {
- if [[ ${IS_MULTILIB} != "true" ]]; then
- MULTILIB_MODE="none"
- local system_name=$(get_system_plugin_vm)
- local targets=( $(get_targets) )
- for (( i = 0 ; i < ${#targets[@]} ; i = i + 1 )) ; do
- targets[${i}]=$(tweak_list_item ${targets[${i}]} ${system_name})
- done
-
- write_list_start "Available Java browser plugins"
- write_numbered_list "${targets[@]}"
- else
- MULTILIB_MODE="32"
- local system_name_32=$(get_system_plugin_vm)
- local targets_32=( $(get_targets) )
- for (( i = 0 ; i < ${#targets_32[@]} ; i = i + 1 )) ; do
- targets_32[${i}]=$(tweak_list_item ${targets_32[${i}]} ${system_name_32})
- done
- write_list_start "Available 32-bit Java browser plugins"
- write_numbered_list "${targets_32[@]}"
-
- MULTILIB_MODE="64"
- local system_name_64=$(get_system_plugin_vm)
- local targets_64=( $(get_targets) )
- for (( i = 0 ; i < ${#targets_64[@]} ; i = i + 1 )) ; do
- targets_64[${i}]=$(tweak_list_item ${targets_64[${i}]} ${system_name_64})
- done
- write_list_start "Available 64-bit Java browser plugins"
- write_numbered_list "${targets_64[@]}"
- fi
- }
-## }}}
-
-### set action
-
-## {{{ set stuff
- describe_set() {
- echo "Set the system Java browser plugin"
- }
-
- do_set() {
- if [[ ${IS_MULTILIB} != "true" ]]; then
- if [[ ${#} != 1 ]] ; then
- die -q "Usage: set [nsplugin-vm]"
- fi
- MULTILIB_MODE="none"
- else
- if [[ ${#} != 2 ]] ; then
- die -q "Usage: set [32bit or 64bit] [nsplugin-vm]"
- fi
- case ${1} in
- 32bit) ;;
- 64bit) ;;
- *)
- die -q "Usage: set [32bit or 64bit] [nsplugin-vm]"
- ;;
- esac
- MULTILIB_MODE=${1%bit}
- shift
- fi
-
- local vm=${1}
-
- if is_number "${vm}" ; then
- local targets=( $(get_targets) )
- vm=${targets[$(( ${vm} - 1 ))]}
- fi
-
- if [[ -z ${vm} ]] ; then
- die -q "You didn't specify valid plugin number to set"
- fi
-
- local plugin="${PLUGINS_HOME}/${vm}-javaplugin.so"
-
- if [[ ! -f ${plugin} ]]; then
- write_error_msg "Expected \"${plugin}\" to exist, but it doesn't."
- write_error_msg "Perhaps \"${vm}\" isn't a valid name of VM built with nsplugin?"
- return
- fi
-
- local system_plugin
- case ${MULTILIB_MODE} in
- 32) system_plugin=${SYSTEM_PLUGIN_32} ;;
- 64) system_plugin=${SYSTEM_PLUGIN_64} ;;
- none) system_plugin=${SYSTEM_PLUGIN} ;;
- esac
- mkdir -p $(dirname ${system_plugin}) || die -q "Error creating \"$(dirname ${SYSTEM_PLUGIN})\""
- if [[ -w $(dirname ${system_plugin}) ]] ; then
- ln -sf ${plugin} ${system_plugin} || die -q "Error creating nsplugin symlink"
- else
- die -q "Sorry, you don't have enough permission to set nsplugin"
- fi
- }
-## }}}
-
-get_targets() {
- for plugin in $(ls ${PLUGINS_HOME}/*-javaplugin.so 2>/dev/null);
- do
- local vm=$(plugin_to_vm ${plugin})
- local matches=""
- case ${MULTILIB_MODE} in
- 32)
- [[ ${vm} = emul-linux-* ]] && matches="true"
- ;;
- 64)
- [[ ${vm} != emul-linux-* ]] && matches="true"
- ;;
- none)
- matches="true"
- ;;
- esac
- [[ ${matches} == "true" ]] && echo ${vm}
- done
-}
-
-plugin_to_vm() {
- local base=$(basename ${1})
- echo ${base%-javaplugin.so}
-}
-
-get_system_plugin_vm() {
- local plugin;
-
- if [[ ${MULTILIB_MODE} == "32" ]]; then
- plugin=$(readlink ${SYSTEM_PLUGIN_32})
- elif [[ ${MULTILIB_MODE} == "64" ]]; then
- plugin=$(readlink ${SYSTEM_PLUGIN_64})
- else
- plugin=$(readlink ${SYSTEM_PLUGIN})
- fi
- plugin_to_vm ${plugin}
-}
Deleted: trunk/extern/modules/java-vm.eselect
===================================================================
--- trunk/extern/modules/java-vm.eselect 2009-09-17 15:54:23 UTC (rev 653)
+++ trunk/extern/modules/java-vm.eselect 2009-09-18 16:51:10 UTC (rev 654)
@@ -1,144 +0,0 @@
-# -*-eselect-*- vim: ft=eselect
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-# Based on kernel.eselect
-
-DESCRIPTION="Manage the Java system and user VM"
-MAINTAINER="java@gentoo.org"
-SVN_DATE='$Date$'
-VERSION=$(svn_date_to_version "${SVN_DATE}" )
-
-VM_BASE=/usr/lib/jvm/
-VM_SYSTEM="/etc/java-config-2/current-system-vm"
-VM_USER="${HOME}/.gentoo/java-config-2/current-user-vm"
-
-find_targets() {
- local f
- for f in ${VM_BASE}/* ; do
- [[ -L ${f} ]] && echo $(basename ${f})
- done
-}
-
-sym_to_vm() {
- basename $(readlink "${1}")
-}
-
-### show action ###
-
-describe_show() {
- echo "Show the current vm"
-}
-
-do_show() {
- if [[ ${1} == "system" ]]; then
- my_show ${VM_SYSTEM} 'system-vm'
- elif [[ ${1} == "user" ]]; then
- my_show ${VM_USER} 'user-vm'
- else
- my_show ${VM_SYSTEM} 'system-vm'
- my_show ${VM_USER} 'user-vm'
- fi
-}
-
-my_show() {
- local symlink=${1} vm_type=${2}
- write_list_start "Current ${vm_type}"
- if [[ -L "${symlink}" ]] ; then
- write_kv_list_entry "$(sym_to_vm ${symlink})" ""
- else
- write_kv_list_entry "(unset)" ""
- fi
-}
-
-### list action ###
-
-describe_list() {
- echo "List Available Virtual Machines"
-}
-
-do_list() {
- targets=( $(find_targets) )
- write_list_start "Available Java Virtual Machines:"
- if [[ -n ${targets[@]} ]] ; then
- local i system_name user_name
-
- [[ -L ${VM_SYSTEM} ]] && system_name=$(sym_to_vm ${VM_SYSTEM})
- [[ -L ${VM_USER} ]] && user_name=$(sym_to_vm ${VM_USER})
-
- for (( i = 0 ; i < ${#targets[@]} ; i = i + 1 )) ; do
- local mark=""
- if [[ ${targets[${i}]} == ${system_name} ]]; then
- mark="${mark} $(highlight 'system-vm')"
- fi
- if [[ ${targets[${i}]} == ${user_name} ]]; then
- mark="${mark} $(highlight 'user-vm' )"
- fi
- targets[${i}]="${targets[${i}]} ${mark}"
- done
- write_numbered_list "${targets[@]}"
- else
- write_kv_list_entry "(none found)" ""
- fi
-}
-
-### set action ###
-
-describe_set() {
- echo "Set a new system-vm"
-}
-
-do_set() {
- if [[ ${#} != 2 ]]; then
- die -q "Usage [user|system] [vm]"
-
- elif [[ ${1} == "system" ]]; then
- if [[ -w $(dirname ${VM_SYSTEM}) ]]; then
- my_set ${VM_SYSTEM} ${2}
- else
- die -q "Sorry, you don't have enough premission to set system"
- fi
- elif [[ ${1} == "user" ]]; then
- if [[ ${UID} != 0 ]]; then
- my_set ${VM_USER} ${2}
- else
- die -q "Sorry, you cannot set a user vm as root. Set the system vm instead"
- fi
- fi
-}
-
-my_set() {
- local target=${2} symlink=${1}
- if [[ -z ${target} ]] ; then
- die -q "You didn't tell me what to set the symlink to"
-
- elif [[ -L "${symlink}" ]] ; then
- set_symlink "${target}" "${symlink}" || die -q "Couldn't set a new symlink"
-
- elif [[ -e "${symlink}" ]] ; then
- die -q "Target file already exists and is not a symlink: ${symlink}"
-
- else
- set_symlink "${target}" "${symlink}" || die -q "Couldn't set a new symlink"
- fi
-}
-
-set_symlink() {
- local target=${1} symlink=${2}
- if is_number "${target}" ; then
- targets=( $(find_targets) )
- target=${targets[$(( ${target} - 1 ))]}
- fi
- if [[ -z ${target} ]] ; then
- die -q "Target \"${1}\" doesn't appear to be valid!"
- elif [[ -d "${VM_BASE}/${target}" ]] ; then
- local sym_dir=$(dirname ${symlink})
- if [[ ! -d ${sym_dir} ]]; then
- mkdir -p ${sym_dir} || die -q "Could not create ${my_dir}"
- fi
- ln -snf "${VM_BASE}/${target}" "${symlink}"
- else
- die -q "Target \"${1}\" doesn't appear to be valid!"
- fi
-}
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2009-09-18 16:51 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-09-18 16:51 [gentoo-commits] eselect r654 - in trunk/extern: . modules Ulrich Mueller (ulm)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox