Remove eclasses that have been marked as deprecated for >=2 years; schedule other deprecated eclasses for removal

1 files changed, 6 insertions, 135 deletions

diff --git a/eclass/java.eclass b/eclass/java.eclass
index 0754bb2ae058..bec651161756 100644
--- a/eclass/java.eclass
+++ b/eclass/java.eclass
@@ -1,38 +1,12 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/java.eclass,v 1.32 2006/10/14 20:27:21 swegener Exp $
-#
-# Author: Karl Trygve Kalleberg <karltk@gentoo.org>
+# $Header: /var/cvsroot/gentoo-x86/eclass/java.eclass,v 1.33 2009/11/30 04:19:36 abcd Exp $
 
-inherit eutils
+# @DEAD
+# To be removed on 2011/11/30.
+ewarn "Please fix your package (${CATEGORY}/${PF}) to not use ${ECLASS}.eclass"
 
-DESCRIPTION="Based on the $ECLASS eclass"
-JAVA_CONFIG_DEP="|| ( =dev-java/java-config-1.3* =dev-java/java-config-1.2* )"
-DEPEND="${JAVA_CONFIG_DEP}
-	sys-apps/findutils"
-RDEPEND="${JAVA_CONFIG_DEP}"
-
-export WANT_JAVA_CONFIG="1"
-
-VMHANDLE=${PN}-${PV}
-
-EXPORT_FUNCTIONS pkg_postinst pkg_prerm
-
-java_pkg_postinst() {
-	local jdk=${PN#*-}
-	if [ ${jdk:0:3} == "jdk" ]; then
-		java_set_default_vm_
-	else
-		# Only install the JRE as the system default if there's no JDK
-		# installed. Installing a JRE over an existing JDK will result
-		# in major breakage, see #9289.
-		if [ ! -f "${JAVAC}" ]; then
-			ewarn "Found no JDK, setting ${VMHANDLE} as default system VM"
-			java_set_default_vm_
-	fi
-	fi
-	java_mozilla_clean_
-}
+EXPORT_FUNCTIONS pkg_prerm
 
 java_pkg_prerm() {
 	if java-config -J | grep -q ${P} ; then
@@ -40,106 +14,3 @@ java_pkg_prerm() {
 		ewarn "Please run java-config -L then java-config -S to set a new system VM!"
 	fi
 }
-
-java_set_default_vm_() {
-	java-config --set-system-vm=${VMHANDLE}
-	/usr/sbin/env-update
-	source /etc/profile
-
-	echo
-	einfo " After installing ${P} this"
-	einfo " was set as the default JVM to run."
-	einfo " When finished please run the following so your"
-	einfo " enviroment gets updated."
-	eerror "	/usr/sbin/env-update && source /etc/profile"
-	einfo " Or use java-config program to set your preferred VM"
-}
-
-system_arch() {
-	local sarch
-	sarch=`echo $ARCH | sed -e s/[i]*.86/i386/ -e s/x86_64/amd64/ -e s/sun4u/sparc/ -e s/sparc64/sparc/ -e s/arm.*/arm/ -e s/sa110/arm/`
-	if [ -z "$sarch" ] ; then
-		sarch=`uname -m | sed -e s/[i]*.86/i386/ -e s/x86_64/amd64/ -e s/sun4u/sparc/ -e s/sparc64/sparc/ -e s/arm.*/arm/ -e s/sa110/arm/`
-	fi
-	echo $sarch
-}
-
-set_java_env() {
-	dodir /etc/env.d/java
-	platform=`system_arch`
-
-	sed \
-		-e "s/@P@/${P}/g" \
-		-e "s/@PN@/${PN}/g" \
-		-e "s/@PV@/${PV}/g" \
-		-e "s/@PF@/${PF}/g" \
-		-e "s/@PLATFORM@/${platform}/g" \
-		-e "/^ADDLDPATH=.*lib\\/\\\"/s|\"\\(.*\\)\"|\"\\1${platform}/:\\1${platform}/server/\"|" \
-		< $1 \
-		> ${D}/etc/env.d/java/20`basename $1` || die
-}
-
-
-java_get_plugin_dir_() {
-	echo /usr/$(get_libdir)/nsbrowser/plugins
-}
-
-install_mozilla_plugin() {
-	if [ ! -f ${D}/$1 ] ; then
-		die "Cannot find mozilla plugin at ${D}/${1}"
-	fi
-
-	local plugin_dir=$(java_get_plugin_dir_)
-	dodir ${plugin_dir}
-	dosym ${1} ${plugin_dir}/javaplugin.so
-}
-
-java_mozilla_clean_() {
-	#Because previously some ebuilds installed symlinks outside of pkg_install
-	#and are left behind, which forces you to manualy remove them to select the
-	#jdk/jre you want to use for java
-	local plugin_dir=$(java_get_plugin_dir_)
-	for file in ${plugin_dir}/javaplugin_*; do
-		rm -f ${file}
-	done
-	for file in ${plugin_dir}/libjavaplugin*; do
-		rm -f ${file}
-	done
-}
-
-# Use this to remove libjsoundalsa.so from ${D}.
-# You generally would want to use this like:
-# use !alsa && java_remove-libjoundalsa /opt/${P}
-java_remove-libjsoundalsa() {
-	[[ ${#} -ne 1 ]] && die "Expected one argument"
-	local search_path="$@"
-	local libs=$(find ${D}/${search_path} -name libjsoundalsa.so)
-	if [[ -n ${libs} ]]; then
-		rm ${libs} || die "Failed to delete ${libs}"
-	fi
-}
-
-# Symlinks i386 to i?86. Updates env file to then use i?86
-# for LD_LIBRARY_PATH. See bug #23579.
-#
-# Takes an argument, which is a directory living in ${D}
-# which has a directory named i386, that should be i686, i486, etc.
-# This argument defaults to /opt/${P}/jre/lib
-fix-i386-dir() {
-	[[ ${#} != 1 ]] && die "Expected one argument"
-	local libdir=${1}
-	if use x86; then
-		local host=${CTARGET:-${CHOST}}
-		host=${host%%-*}
-
-		if [[ ${host} != i386 ]]; then
-			local orig_dir="${libdir}/i386"
-			local new_dir="${libdir}/${host}"
-			dosym i386 ${new_dir} || die "Failed to dosym"
-
-
-			sed -i -e "s/i386/${host}/g" \
-				${D}/etc/env.d/java/20${VMHANDLE} || die "Failed to sed"
-		fi
-	fi
-}