Now Upstream

This commit is contained in:
Mario Fetka 2012-10-16 17:58:31 +02:00
parent fc3cde9776
commit 20176d3ed5
11 changed files with 0 additions and 1557 deletions

File diff suppressed because it is too large Load Diff

View File

@ -1,12 +0,0 @@
AUX java-config-2.1.11-python3.patch 525 RMD160 8a9a9693ea2d9e7a77b4a6803ad627a2bbaf3f5c SHA1 7c483602718877ab11d1793d99b6a16458264a4c SHA256 fbcc731ea0bca626855212f9e1af5fcda538743e5f23e0229a5bbfbd56c619a8
AUX jdk-defaults-arm.conf 71 RMD160 5d2cbc1a4300baf05c871a0991b46a9c1685ad40 SHA1 4f52ddda48a478ec1747695478d1bfe09693a4f9 SHA256 bd6791555fc860455531da04226adf700f30d227ff8e478c4a294e4b5c87b454
AUX python-abi-support.patch 1558 RMD160 cd73b97cfaed4071ba020fd4c647a713484dbf86 SHA1 b0068c5b9b4bb97c05b8911f86d7cb5a08122a13 SHA256 790b68ae41fa48587bbf29ae8e8466305b8f29d4d122d3a6551cf9a627d6163b
DIST java-config-2.1.10.tar.bz2 45507 RMD160 55fc34441a1553035c3e4ae674756df494a1705a SHA1 e78a8032a436a63a583960fe85bd5396144f8a97 SHA256 d0afa1279a2bf91a307e54a78227fe413aad12c1a1beaac4ee90b39cc1485ba5
DIST java-config-2.1.11.tar.bz2 60763 RMD160 35f62025fe9843769fe164d9bb50419fd2fc7e34 SHA1 df62f76957343108d1b27687132958853434982c SHA256 ffc90aac716f6edc2f99f70e4947eab606e3a70dadb90328dedda16345796bbe
EBUILD java-config-2.1.10.ebuild 1428 RMD160 d64f011f9339768496d45970eb7649928c1b8fd9 SHA1 9b31fd299b679ae3370886dcf38133a17426549a SHA256 7301421273f2c728d8087f10ff18a9e504b394523d99e80b6b11fc0ae9c84918
EBUILD java-config-2.1.11-r1.ebuild 1423 RMD160 cc2d034a436552d133c349665e54cdaae39ab588 SHA1 2aa349faea010d396dd104854d5f11d15219320c SHA256 6f2a0428f55764bb5c15e70516604ae5455d39774dcc3c5eb9d90d429b55670b
EBUILD java-config-2.1.11-r2.ebuild 1463 RMD160 69e418c5c208ae97a633d6af52d2ae38bbbaad6e SHA1 5d971aee881dd591671b5ae8cee5d768f78ddff5 SHA256 77e70c444a8b81c527581789e6e8e3b849c533ecda6bc3e28be537ab6a5e6ea9
EBUILD java-config-2.1.11-r3.ebuild 1557 RMD160 fd11bde38075f9a71848db312f98966f5a74006f SHA1 cd828c12b61fb787bf7bcee15b9c5fe227cd0540 SHA256 014ec50f42cccd6d2b8eaf2b2a91bab462121380d373c9c03f8ec5034895f76a
EBUILD java-config-2.1.11.ebuild 1346 RMD160 b28fc231606f91271656429c00de38ae3522cbd4 SHA1 2f1f4ba9732c1d4ac096d984c549f3d815c462e4 SHA256 82b14c946a8f28f0d873a7217102626c9a543fee4a5c6f1c40dffe7e59602b6c
MISC ChangeLog 41832 RMD160 f69231b3266e710aad00bae5ec86723a479ffbae SHA1 8c690dbf58a76ad4608c780e5d2de670a708ac59 SHA256 dd2c517ed424d38942887f7443918ccab72880cc65ae32bbd4b4be819bf3d41b
MISC metadata.xml 482 RMD160 b060f8a2492170d8513e1b2d03512d8b565b5045 SHA1 b154d3e425be12942f183a7ad1a37fecc215e4b4 SHA256 f80d3cd5afabd0dc4d177925c3715c464288e5ec3ed1ca809a7f7a66ee3907a5

View File

@ -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()

View File

@ -1,2 +0,0 @@
# This files contain the default support jdk's
*= icedtea icedtea6-bin

View File

@ -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
# --------

View File

@ -1,58 +0,0 @@
# Copyright 1999-2011 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.10.ebuild,v 1.9 2010/07/10 20:21:05 arfrever Exp $
EAPI="2"
PYTHON_DEPEND="2"
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="alpha amd64 arm ia64 ppc ppc64 x86 ~x86-fbsd"
IUSE=""
DEPEND=""
RDEPEND=">=dev-java/java-config-wrapper-0.15"
# Tests fail when java-config isn't already installed.
RESTRICT="test"
RESTRICT_PYTHON_ABIS="3.*"
PYTHON_MODNAME="java_config_2"
src_prepare() {
distutils_src_prepare
sed -e "s/if not self.dry_run/& and not os.path.exists(s)/" -i setup.py || die "sed failed"
cp "${FILESDIR}"/*.conf config
}
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
}

View File

@ -1,59 +0,0 @@
# Copyright 1999-2011 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-r1.ebuild,v 1.2 2010/11/08 11:59:25 phajdan.jr 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 arm ~ia64 ~ppc ~ppc64 x86 ~x86-fbsd"
IUSE=""
DEPEND=""
RDEPEND=">=dev-java/java-config-wrapper-0.15"
# 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"
RESTRICT_PYTHON_ABIS="2.4 2.5"
PYTHON_MODNAME="java_config_2"
src_prepare() {
distutils_src_prepare
cp "${FILESDIR}"/*.conf config
}
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
}

View File

@ -1,60 +0,0 @@
# Copyright 1999-2011 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-r2.ebuild,v 1.1 2010/11/08 18:38:18 arfrever Exp $
EAPI="2"
PYTHON_DEPEND="*:2.6"
SUPPORT_PYTHON_ABIS="1"
inherit distutils 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 ~x86-fbsd"
IUSE=""
DEPEND=""
RDEPEND=">=dev-java/java-config-wrapper-0.15"
# 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"
RESTRICT_PYTHON_ABIS="2.4 2.5"
PYTHON_MODNAME="java_config_2"
src_prepare() {
distutils_src_prepare
epatch "${FILESDIR}/${P}-python3.patch"
cp "${FILESDIR}"/*.conf config
}
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
}

View File

@ -1,62 +0,0 @@
# Copyright 1999-2011 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-r3.ebuild,v 1.6 2011/03/28 08:57:45 ssuominen Exp $
EAPI="2"
PYTHON_DEPEND="*:2.6"
SUPPORT_PYTHON_ABIS="1"
inherit distutils 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 ~x86-fbsd"
IUSE=""
DEPEND=""
RDEPEND=">=dev-java/java-config-wrapper-0.15"
# 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"
RESTRICT_PYTHON_ABIS="2.4 2.5 *-jython"
PYTHON_MODNAME="java_config_2"
src_prepare() {
distutils_src_prepare
epatch "${FILESDIR}/${P}-python3.patch"
epatch "${FILESDIR}/python-abi-support.patch"
cp "${FILESDIR}"/*.conf config
}
src_test() {
testing() {
PYTHONPATH="build-${PYTHON_ABI}/lib" "$(PYTHON)" src/run-test-suite.py
}
python_execute_function testing
}
src_install() {
distutils_src_install
rm -rf "${D}"/usr/share/mimelnk #350459
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
}

View File

@ -1,57 +0,0 @@
# Copyright 1999-2011 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.5 2010/07/25 13:38:11 klausman 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="alpha amd64 arm ~ia64 ~ppc ~ppc64 x86 ~x86-fbsd"
IUSE=""
DEPEND=""
RDEPEND=">=dev-java/java-config-wrapper-0.15"
# Tests fail when java-config isn't already installed.
RESTRICT="test"
RESTRICT_PYTHON_ABIS="2.4 2.5"
PYTHON_MODNAME="java_config_2"
src_prepare() {
distutils_src_prepare
cp "${FILESDIR}"/*.conf config
}
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
}

View File

@ -1,11 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<herd>java</herd>
<longdescription>
java-config is used to configure the Java subsystem on your Gentoo
installation. In particular, it can be used to configure system-wide and
per-user default JVMs, construct classpath env vars from installed java
packages and be used to query for the path to various JDK tools.
</longdescription>
</pkgmetadata>