Fixed a stacktrace that occurs when trying to set the system vm.

Package-Manager: portage-2.1.1_rc1-r2

diff --git a/dev-java/java-config/ChangeLog b/dev-java/java-config/ChangeLog
index d17b6cb6519c3735a35037c4966e1de85775ad47..cdcb3011a8a69420f605f5d4da9e2e9a3ffd8161 100644 (file)
--- a/dev-java/java-config/ChangeLog
+++ b/dev-java/java-config/ChangeLog
@@ -1,6 +1,13 @@
 # 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.111 2006/09/06 03:15:02 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/java-config/ChangeLog,v 1.112 2006/09/06 13:03:55 nichoj Exp $
+
+*java-config-1.3.5-r1 (06 Sep 2006)
+
+  06 Sep 2006; Joshua Nichols <nichoj@gentoo.org>
+  +files/java-config-1.3.5-javahomestacktrace.patch,
+  +java-config-1.3.5-r1.ebuild:
+  Fixed a stacktrace that occurs when trying to set the system vm.
 
 *java-config-1.3.5 (06 Sep 2006)
 

diff --git a/dev-java/java-config/Manifest b/dev-java/java-config/Manifest
index 8ce992a0b1355af6a77430f960e319bf309609c6..875a0f3968ae438b35ed5d21e532e19756066713 100644 (file)
--- a/dev-java/java-config/Manifest
+++ b/dev-java/java-config/Manifest
@@ -6,6 +6,10 @@ AUX java-config-1.3.1-no20java.patch 442 RMD160 1503372c629889537c2c36cd06e7a595
 MD5 eb3ef22e8c274e9794ed0409e2463d83 files/java-config-1.3.1-no20java.patch 442
 RMD160 1503372c629889537c2c36cd06e7a59527a71de3 files/java-config-1.3.1-no20java.patch 442
 SHA256 7506e7fccae674f9a1d32029fef7013cdda7818f0b60811924d21f1242e41818 files/java-config-1.3.1-no20java.patch 442
+AUX java-config-1.3.5-javahomestacktrace.patch 465 RMD160 2e03cb746f0562ab7d8ed3ac7bcfa3386998ba1f SHA1 75dfa8823846e3cc683eb4eea77c90cd5aaf854b SHA256 0c0326e1455a53799826e9ad12fce49bcddb79059336a425fa1dd0ac3cdb8d25
+MD5 8eef5fd7ef4dc501db35f9f82e8cb87f files/java-config-1.3.5-javahomestacktrace.patch 465
+RMD160 2e03cb746f0562ab7d8ed3ac7bcfa3386998ba1f files/java-config-1.3.5-javahomestacktrace.patch 465
+SHA256 0c0326e1455a53799826e9ad12fce49bcddb79059336a425fa1dd0ac3cdb8d25 files/java-config-1.3.5-javahomestacktrace.patch 465
 AUX java-config-2.profiled 762 RMD160 07d9d403a9adb62ecb5bb10a91bee81e6be1ac4e SHA1 2b26f31322dea6b74ca7208b346194bdb13da9b4 SHA256 47a56170921e2f806efa0b3cc76f84db75f212cf687f019052cfb56de49c6e81
 MD5 93060fff650a2b3577256baebaf8ea64 files/java-config-2.profiled 762
 RMD160 07d9d403a9adb62ecb5bb10a91bee81e6be1ac4e files/java-config-2.profiled 762
@@ -17,6 +21,10 @@ EBUILD java-config-1.2.11-r1.ebuild 874 RMD160 caf41840d1b96596b88464edf9e476e8d
 MD5 7e9562363f495fbef6591ad21366d0a4 java-config-1.2.11-r1.ebuild 874
 RMD160 caf41840d1b96596b88464edf9e476e8debe621d java-config-1.2.11-r1.ebuild 874
 SHA256 abf7e6e4ebc06bcd838ab4e9466d7c8e076d6f808242203693c46cdddb9c081f java-config-1.2.11-r1.ebuild 874
+EBUILD java-config-1.3.5-r1.ebuild 1296 RMD160 99341b8f9b9ae937319cbfb8f66f54df563830de SHA1 467307c2a027e10b9760c743b2d925a8890ae218 SHA256 25d24676858b97a71ea68e2b274c258116e30bbf1461e2f2e0836d2be6cb9df4
+MD5 ea6696c0f3cc6535a6320a9135f09d5f java-config-1.3.5-r1.ebuild 1296
+RMD160 99341b8f9b9ae937319cbfb8f66f54df563830de java-config-1.3.5-r1.ebuild 1296
+SHA256 25d24676858b97a71ea68e2b274c258116e30bbf1461e2f2e0836d2be6cb9df4 java-config-1.3.5-r1.ebuild 1296
 EBUILD java-config-1.3.5.ebuild 1224 RMD160 0ab1658d963f9d5197000b8ce27b7be70c5062a3 SHA1 68062cb36b77740bc02d9e2deab0924341fe7667 SHA256 a9a35d275f2cc2ea01a2321320ab61918d8b2098cdf5d5eebb85ccb78140a56c
 MD5 b4d63f0c020a504be189659db35c102d java-config-1.3.5.ebuild 1224
 RMD160 0ab1658d963f9d5197000b8ce27b7be70c5062a3 java-config-1.3.5.ebuild 1224
@@ -29,10 +37,10 @@ EBUILD java-config-2.0.27.ebuild 1462 RMD160 6ec30f9b43365b810f45ad8c095b5e935f3
 MD5 6e88de51ec1788c522efa4b3c2a1ceff java-config-2.0.27.ebuild 1462
 RMD160 6ec30f9b43365b810f45ad8c095b5e935f344769 java-config-2.0.27.ebuild 1462
 SHA256 5a46b2206a1c4cf86e7221d27191110096a0648fa6ea2133691f8fbb3c3467c2 java-config-2.0.27.ebuild 1462
-MISC ChangeLog 20574 RMD160 2444c4c6f6ae5aad0a0807d5efaeecfdd2e90572 SHA1 0cc3a73ca21fb84ff7c5d18cf4b11a3dab91a2c0 SHA256 df61358ccd676e3e55fdd0594792f4057922038c39c7c82ac4ad261ed9947fdf
-MD5 13f74968dcfdaf05498fa97b9506dd62 ChangeLog 20574
-RMD160 2444c4c6f6ae5aad0a0807d5efaeecfdd2e90572 ChangeLog 20574
-SHA256 df61358ccd676e3e55fdd0594792f4057922038c39c7c82ac4ad261ed9947fdf ChangeLog 20574
+MISC ChangeLog 20814 RMD160 c2bb15908ef98861f78178f6c3ea3cdb1b313530 SHA1 5f9edeac4bf0a84bbe9ce413a624e159c235722c SHA256 39720567c87b87570af9f6009a22dd617add0368b721eecc67982aa10d5f031a
+MD5 cf1c3f41b40caab8656496b2922b3952 ChangeLog 20814
+RMD160 c2bb15908ef98861f78178f6c3ea3cdb1b313530 ChangeLog 20814
+SHA256 39720567c87b87570af9f6009a22dd617add0368b721eecc67982aa10d5f031a ChangeLog 20814
 MISC metadata.xml 486 RMD160 158f1d9652c83644739d40c8014d65d487dca4e6 SHA1 1561f2727694d8312adbda18294f690116ab3c84 SHA256 5d3e4a1780efad67e6265b82a4397a2b4fe26c2c0785ee65a3390dd8218c82ce
 MD5 ff83dbd41edf207798f367c723ab813f metadata.xml 486
 RMD160 158f1d9652c83644739d40c8014d65d487dca4e6 metadata.xml 486
@@ -43,6 +51,9 @@ SHA256 da2af16dd2d187eb5301706d751663c290362f05f8a84eed14ecf5c21284c7da files/di
 MD5 8b79f93a4ce4b22f0efb43b48fdf42ff files/digest-java-config-1.3.5 253
 RMD160 2c94dc11c4db7b2d76b51cd0d263001e3ae788b5 files/digest-java-config-1.3.5 253
 SHA256 5b84b2c8c296454e41458060aeca9a46e2f100c6d5c103227e4778fd81494fe7 files/digest-java-config-1.3.5 253
+MD5 8b79f93a4ce4b22f0efb43b48fdf42ff files/digest-java-config-1.3.5-r1 253
+RMD160 2c94dc11c4db7b2d76b51cd0d263001e3ae788b5 files/digest-java-config-1.3.5-r1 253
+SHA256 5b84b2c8c296454e41458060aeca9a46e2f100c6d5c103227e4778fd81494fe7 files/digest-java-config-1.3.5-r1 253
 MD5 1357ec25e19a873bdc1f7c3cb3e4f2db files/digest-java-config-2.0.27 256
 RMD160 7f10fd3d5c792fd693eb171407af65849be4badc files/digest-java-config-2.0.27 256
 SHA256 e63d4b0790075be20dc5ea3a8700d2833f7974553569b6e69072ef1014e77875 files/digest-java-config-2.0.27 256

diff --git a/dev-java/java-config/files/digest-java-config-1.3.5-r1 b/dev-java/java-config/files/digest-java-config-1.3.5-r1
new file mode 100644 (file)
index 0000000..98ac8fc
--- /dev/null
+++ b/dev-java/java-config/files/digest-java-config-1.3.5-r1
@@ -0,0 +1,3 @@
+MD5 901b1246328c2a7dfabfa97dbbdd090e java-config-1.3.5.tar.bz2 14958
+RMD160 92cdcdd12ef5f4bee5d2a170e426f2c2353be3d9 java-config-1.3.5.tar.bz2 14958
+SHA256 2e9e3ecdd3049b8b3f8783af49856083da7e8588807bbfb8fa31cc76e73ec605 java-config-1.3.5.tar.bz2 14958

diff --git a/dev-java/java-config/files/java-config-1.3.5-javahomestacktrace.patch b/dev-java/java-config/files/java-config-1.3.5-javahomestacktrace.patch
new file mode 100644 (file)
index 0000000..a4c9a3f
--- /dev/null
+++ b/dev-java/java-config/files/java-config-1.3.5-javahomestacktrace.patch
@@ -0,0 +1,16 @@
+diff -ru java-config-1.3.5-orig/java_config/jc_util.py java-config-1.3.5/java_config/jc_util.py
+--- java-config-1.3.5-orig/java_config/jc_util.py      2006-09-06 08:52:24.000000000 -0400
++++ java-config-1.3.5/java_config/jc_util.py   2006-09-06 08:56:53.000000000 -0400
+@@ -104,10 +104,10 @@
+       can't be found
+       """
+ 
+-      jh = JAVA_HOME
+-
+       if java_home is not None:
+               jh = java_home
++      else:
++              jh = get_java_home()
+ 
+       exec_0 = jh+'/bin/'+exe
+       exec_1 = jh+'/jre/bin/'+exe

diff --git a/dev-java/java-config/java-config-1.3.5-r1.ebuild b/dev-java/java-config/java-config-1.3.5-r1.ebuild
new file mode 100644 (file)
index 0000000..84aa701
--- /dev/null
+++ b/dev-java/java-config/java-config-1.3.5-r1.ebuild
@@ -0,0 +1,40 @@
+# 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-1.3.5-r1.ebuild,v 1.1 2006/09/06 13:03:55 nichoj 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="0"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND="virtual/python
+       dev-java/java-config-wrapper"
+
+PATCHES="${FILESDIR}/${P}-javahomestacktrace.patch"
+
+src_install() {
+       distutils_src_install
+       newbin java-config java-config-1
+       doman java-config.1
+
+       doenvd 30java-finalclasspath
+}
+
+pkg_postinst() {
+       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 only allow"
+       einfo "1.3 or 1.4 JDKs to be used with java-config-1 to ensure"
+       einfo "backwards compatibility with the old system."
+       einfo "For more details about this, please see:"
+       einfo "\thttps://overlays.gentoo.org/proj/java/wiki/Why_We_Need_Java14"
+}