diff options
author | Vlastimil Babka <caster@gentoo.org> | 2006-09-12 14:17:38 +0000 |
---|---|---|
committer | Vlastimil Babka <caster@gentoo.org> | 2006-09-12 14:17:38 +0000 |
commit | 3d6abe38d73350812fcdaaf11ee2a562858cdc19 (patch) | |
tree | e2a003577f38dde60a8872e4c1d9305e839d9fe6 /dev-java/java-config | |
parent | Doesn't need popt anymore (diff) | |
download | gentoo-2-3d6abe38d73350812fcdaaf11ee2a562858cdc19.tar.gz gentoo-2-3d6abe38d73350812fcdaaf11ee2a562858cdc19.tar.bz2 gentoo-2-3d6abe38d73350812fcdaaf11ee2a562858cdc19.zip |
Fixed the gjl launcher traceback for cases when CLASSPATH env is completely unset
(Portage version: 2.1.1)
Diffstat (limited to 'dev-java/java-config')
-rw-r--r-- | dev-java/java-config/ChangeLog | 10 | ||||
-rw-r--r-- | dev-java/java-config/files/digest-java-config-2.0.28-r1 | 3 | ||||
-rw-r--r-- | dev-java/java-config/files/java-config-2.0.28-classpath.patch | 8 | ||||
-rw-r--r-- | dev-java/java-config/java-config-2.0.28-r1.ebuild | 60 |
4 files changed, 76 insertions, 5 deletions
diff --git a/dev-java/java-config/ChangeLog b/dev-java/java-config/ChangeLog index 6b476e0521d4..3be679837492 100644 --- a/dev-java/java-config/ChangeLog +++ b/dev-java/java-config/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for dev-java/java-config # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/java-config/ChangeLog,v 1.116 2006/09/11 18:04:47 nichoj Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/java-config/ChangeLog,v 1.117 2006/09/12 14:17:38 caster Exp $ + +*java-config-2.0.28-r1 (12 Sep 2006) + + 12 Sep 2006; Vlastimil Babka <caster@gentoo.org> + files/java-config-2.0.28-classpath.patch, -java-config-2.0.28.ebuild, + +java-config-2.0.28-r1.ebuild: + Fixed the gjl launcher traceback for cases when CLASSPATH env is completely + unset *java-config-1.3.6-r1 (11 Sep 2006) diff --git a/dev-java/java-config/files/digest-java-config-2.0.28-r1 b/dev-java/java-config/files/digest-java-config-2.0.28-r1 new file mode 100644 index 000000000000..cc0cfdd22bfe --- /dev/null +++ b/dev-java/java-config/files/digest-java-config-2.0.28-r1 @@ -0,0 +1,3 @@ +MD5 4103c5b3b0c596de8d45306235d4e78c java-config-2.0.28.tar.bz2 15883 +RMD160 5a4eb2918207423e79587b7a68927fcf96eaa8fd java-config-2.0.28.tar.bz2 15883 +SHA256 cdbb37251686c82b715fb9a8ea98437611d5f30a649bc7e78294de6f41742005 java-config-2.0.28.tar.bz2 15883 diff --git a/dev-java/java-config/files/java-config-2.0.28-classpath.patch b/dev-java/java-config/files/java-config-2.0.28-classpath.patch index 9c72c0535d18..1ba6afb625eb 100644 --- a/dev-java/java-config/files/java-config-2.0.28-classpath.patch +++ b/dev-java/java-config/files/java-config-2.0.28-classpath.patch @@ -1,12 +1,12 @@ -Index: gjl +Index: src/gjl =================================================================== ---- src/gjl (revision 2713) -+++ src/gjl (revision 2714) +--- src/gjl (revision 2712) ++++ src/gjl (working copy) @@ -89,6 +89,11 @@ classpath, library = get_pkg_args(pkg) if classpath: -+ envcp = os.environ['CLASSPATH'] ++ envcp = os.getenv('CLASSPATH') + + if envcp: + classpath = ':'.join((envcp, classpath)) diff --git a/dev-java/java-config/java-config-2.0.28-r1.ebuild b/dev-java/java-config/java-config-2.0.28-r1.ebuild new file mode 100644 index 000000000000..84c5d1fe1294 --- /dev/null +++ b/dev-java/java-config/java-config-2.0.28-r1.ebuild @@ -0,0 +1,60 @@ +# Copyright 1999-2006 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.0.28-r1.ebuild,v 1.1 2006/09/12 14:17:38 caster Exp $ + +inherit base 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 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" +IUSE="" + +DEPEND="virtual/python" +RDEPEND="virtual/python + dev-java/java-config-wrapper" + +PATCHES="${FILESDIR}/${P}-classpath.patch" + +src_install() { + distutils_src_install + + insinto /usr/share/java-config-2/config/ + for i in alpha amd64 hppa ia64 ppc ppc64 sparc x86; do + if use ${i}; then + newins config/jdk-defaults-${i}.conf jdk-defaults.conf || die "arch config not found" + fi + done + + for tool in $(< config/symlink-tools); do + dosym /usr/bin/run-java-tool /usr/bin/${tool} + done + + # Install profile.d for setting JAVA_HOME + dodir /etc/profile.d + exeinto /etc/profile.d + newexe ${FILESDIR}/${PN}-${SLOT}.profiled ${PN}-${SLOT}.sh || die "newexe failed" +} + + +pkg_postrm() { + python_mod_cleanup /usr/share/java-config-2/pym/java_config +} + +pkg_postinst() { + python_mod_optimize /usr/share/java-config-2/pym/java_config + + einfo "The way Java is handled on Gentoo has been recently updated." + einfo "If you have not done so already, you should follow the" + einfo "instructions available at:" + einfo "\thttp://www.gentoo.org/proj/en/java/java-upgrade.xml" + echo + einfo "While we moving towards the new Java system, we require" + einfo "a 1.3 or 1.4 JDK to be installed to ensure backwards compatibility" + einfo "with the old system." + einfo "For more details about this, please see:" + einfo "\thttps://overlays.gentoo.org/proj/java/wiki/Why_We_Need_Java14" +} |