From 79767640049245cabbef5fc163294bc233fca084 Mon Sep 17 00:00:00 2001 From: James Le Cuirot Date: Sat, 9 May 2015 22:22:51 +0000 Subject: Finally kill off pre-2.2 versions! Dropping sparc support wrt #465136. (Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 9C6D7DE4) --- dev-java/java-config/ChangeLog | 7 ++- .../files/java-config-2.1.11-python3.patch | 22 --------- .../java-config/files/python-abi-support.patch | 37 --------------- dev-java/java-config/java-config-2.1.11.ebuild | 54 ---------------------- dev-java/java-config/java-config-2.1.12-r1.ebuild | 50 -------------------- 5 files changed, 6 insertions(+), 164 deletions(-) delete mode 100644 dev-java/java-config/files/java-config-2.1.11-python3.patch delete mode 100644 dev-java/java-config/files/python-abi-support.patch delete mode 100644 dev-java/java-config/java-config-2.1.11.ebuild delete mode 100644 dev-java/java-config/java-config-2.1.12-r1.ebuild (limited to 'dev-java/java-config') diff --git a/dev-java/java-config/ChangeLog b/dev-java/java-config/ChangeLog index 9a51536786ae..78446d49bc2f 100644 --- a/dev-java/java-config/ChangeLog +++ b/dev-java/java-config/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-java/java-config # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/java-config/ChangeLog,v 1.293 2015/05/04 07:00:08 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/java-config/ChangeLog,v 1.294 2015/05/09 22:22:51 chewi Exp $ + + 09 May 2015; James Le Cuirot + -files/java-config-2.1.11-python3.patch, -files/python-abi-support.patch, + -java-config-2.1.11.ebuild, -java-config-2.1.12-r1.ebuild: + Finally kill off pre-2.2 versions! Dropping sparc support wrt #465136. 04 May 2015; Agostino Sarubbo java-config-2.2.0.ebuild: Add ~ia64, wrt bug #465136 diff --git a/dev-java/java-config/files/java-config-2.1.11-python3.patch b/dev-java/java-config/files/java-config-2.1.11-python3.patch deleted file mode 100644 index bbf56df9af34..000000000000 --- a/dev-java/java-config/files/java-config-2.1.11-python3.patch +++ /dev/null @@ -1,22 +0,0 @@ -http://overlays.gentoo.org/proj/java/changeset/8184 - ---- src/gjl -+++ src/gjl -@@ -23,7 +23,7 @@ - - #Depreciated. - def get_needed_target(pkg): -- highest_target = None -+ highest_target = "" - needs_jdk = False - for pkg in get_needed_packages(pkg): - pkg_needs_jdk = False -@@ -43,7 +43,7 @@ - return highest_target, needs_jdk - - def get_needed_target2(pkg): -- highest_target = None -+ highest_target = "" - needs_jdk = set() - for pkg in get_needed_packages(pkg): - target = pkg.target() diff --git a/dev-java/java-config/files/python-abi-support.patch b/dev-java/java-config/files/python-abi-support.patch deleted file mode 100644 index bff9559021eb..000000000000 --- a/dev-java/java-config/files/python-abi-support.patch +++ /dev/null @@ -1,37 +0,0 @@ ---- src/launcher.bash -+++ src/launcher.bash -@@ -6,6 +6,19 @@ - exit 1 - } - -+# Save Python-specific variables for support for Jython -+# --------------------- -+_EPYTHON="${EPYTHON}" -+_GENTOO_PYTHON_PROCESS_NAME="${GENTOO_PYTHON_PROCESS_NAME}" -+_GENTOO_PYTHON_WRAPPER_SCRIPT_PATH="${GENTOO_PYTHON_WRAPPER_SCRIPT_PATH}" -+_GENTOO_PYTHON_TARGET_SCRIPT_PATH="${GENTOO_PYTHON_TARGET_SCRIPT_PATH}" -+_GENTOO_PYTHON_TARGET_SCRIPT_PATH_VERIFICATION="${GENTOO_PYTHON_TARGET_SCRIPT_PATH_VERIFICATION}" -+unset EPYTHON -+unset GENTOO_PYTHON_PROCESS_NAME -+unset GENTOO_PYTHON_WRAPPER_SCRIPT_PATH -+unset GENTOO_PYTHON_TARGET_SCRIPT_PATH -+unset GENTOO_PYTHON_TARGET_SCRIPT_PATH_VERIFICATION -+ - # Source package env - # --------------------- - gjl_user_env="${HOME}/.gentoo/java-config-2/launcher.d/${gjl_package}" -@@ -54,6 +67,14 @@ - abort "Dont know what to run :((" - fi - -+# Restore Python-specific variables for support for Jython -+# --------------------- -+[[ -n ${_EPYTHON} ]] && export EPYTHON="${_EPYTHON}" -+[[ -n ${_GENTOO_PYTHON_PROCESS_NAME} ]] && export GENTOO_PYTHON_PROCESS_NAME="${_GENTOO_PYTHON_PROCESS_NAME}" -+[[ -n ${_GENTOO_PYTHON_WRAPPER_SCRIPT_PATH} ]] && export GENTOO_PYTHON_WRAPPER_SCRIPT_PATH="${_GENTOO_PYTHON_WRAPPER_SCRIPT_PATH}" -+[[ -n ${_GENTOO_PYTHON_TARGET_SCRIPT_PATH} ]] && export GENTOO_PYTHON_TARGET_SCRIPT_PATH="${_GENTOO_PYTHON_TARGET_SCRIPT_PATH}" -+[[ -n ${_GENTOO_PYTHON_TARGET_SCRIPT_PATH_VERIFICATION} ]] && export GENTOO_PYTHON_TARGET_SCRIPT_PATH_VERIFICATION="${_GENTOO_PYTHON_TARGET_SCRIPT_PATH_VERIFICATION}" -+ - # Run it - # -------- - diff --git a/dev-java/java-config/java-config-2.1.11.ebuild b/dev-java/java-config/java-config-2.1.11.ebuild deleted file mode 100644 index 159a6154acba..000000000000 --- a/dev-java/java-config/java-config-2.1.11.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/java-config/java-config-2.1.11.ebuild,v 1.14 2015/03/31 18:55:04 ulm Exp $ - -EAPI="2" -PYTHON_DEPEND="*:2.6" -SUPPORT_PYTHON_ABIS="1" - -inherit fdo-mime gnome2-utils distutils eutils - -DESCRIPTION="Java environment configuration tool" -HOMEPAGE="http://www.gentoo.org/proj/en/java/" -SRC_URI="mirror://gentoo/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="2" -KEYWORDS="amd64 ppc ppc64 ~sparc x86 ~x86-fbsd" -IUSE="" - -DEPEND="" -RDEPEND=">=dev-java/java-config-wrapper-0.15 - !sys-apps/baselayout-java - !app-eselect/eselect-java" -# Tests fail when java-config isn't already installed. -RESTRICT="test" -RESTRICT_PYTHON_ABIS="2.4 2.5 *-jython" - -PYTHON_MODNAME="java_config_2" - -src_test() { - testing() { - PYTHONPATH="build-${PYTHON_ABI}/lib" "$(PYTHON)" src/run-test-suite.py - } - python_execute_function testing -} - -src_install() { - distutils_src_install - - insinto /usr/share/java-config-2/config/ - newins config/jdk-defaults-${ARCH}.conf jdk-defaults.conf || die "arch config not found" -} - -pkg_postrm() { - distutils_pkg_postrm - fdo-mime_desktop_database_update - gnome2_icon_cache_update -} - -pkg_postinst() { - distutils_pkg_postinst - fdo-mime_desktop_database_update - gnome2_icon_cache_update -} diff --git a/dev-java/java-config/java-config-2.1.12-r1.ebuild b/dev-java/java-config/java-config-2.1.12-r1.ebuild deleted file mode 100644 index 25c48a2dcea5..000000000000 --- a/dev-java/java-config/java-config-2.1.12-r1.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/java-config/java-config-2.1.12-r1.ebuild,v 1.11 2015/04/08 18:09:20 mgorny Exp $ - -EAPI="5" - -# jython depends on java-config, so don't add it or things will breake. -PYTHON_COMPAT=( python{2_7,3_3} ) - -inherit distutils-r1 eutils fdo-mime gnome2-utils - -DESCRIPTION="Java environment configuration tool" -HOMEPAGE="http://www.gentoo.org/proj/en/java/" -SRC_URI="mirror://gentoo/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="2" -KEYWORDS="amd64 ~arm ~ia64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd" -IUSE="" - -DEPEND="" -RDEPEND=">=dev-java/java-config-wrapper-0.15 - !sys-apps/baselayout-java - !app-eselect/eselect-java" -# https://bugs.gentoo.org/show_bug.cgi?id=315229 -PDEPEND=">=virtual/jre-1.5" -# Tests fail when java-config isn't already installed. -RESTRICT="test" - -python_test() { - "${PYTHON}" src/run-test-suite.py || die - "${PYTHON}" src/run-test-suite2.py || die -} - -python_install_all() { - distutils-r1_python_install_all - - insinto /usr/share/java-config-2/config/ - newins config/jdk-defaults-${ARCH}.conf jdk-defaults.conf -} - -pkg_postrm() { - fdo-mime_desktop_database_update - gnome2_icon_cache_update -} - -pkg_postinst() { - fdo-mime_desktop_database_update - gnome2_icon_cache_update -} -- cgit v1.2.3-65-gdbad