Fixed pkg_postinst.

Package-Manager: portage-2.1.1_pre2-r2

3 files changed, 11 insertions, 64 deletions

diff --git a/dev-java/java-config/Manifest b/dev-java/java-config/Manifest
index 6a777f8c513f..9cbe1ba21639 100644
--- a/dev-java/java-config/Manifest
+++ b/dev-java/java-config/Manifest
@@ -25,14 +25,14 @@ EBUILD java-config-1.3.0-r2.ebuild 1001 RMD160 7ca9ab07253a977c15065e91ed21aaf11
 MD5 018240958b15bc966672fec3a0056828 java-config-1.3.0-r2.ebuild 1001
 RMD160 7ca9ab07253a977c15065e91ed21aaf11ae9057c java-config-1.3.0-r2.ebuild 1001
 SHA256 f55317c135b328f0b17f19186fccf2d25e71461900298dca2f04f761fb681b62 java-config-1.3.0-r2.ebuild 1001
-EBUILD java-config-2.0.26-r2.ebuild 1422 RMD160 7089a22114465cc359ae7ae05b91b695fed615bb SHA1 8eacc6dcc640b8269fddbc5408e1be6aaf9b77ba SHA256 63770b43391644118d3214a8b13fc35992bab066d2881cfe7ef598752b22385e
-MD5 ad614afc12a82ebd9d3ebd3f5a755dc1 java-config-2.0.26-r2.ebuild 1422
-RMD160 7089a22114465cc359ae7ae05b91b695fed615bb java-config-2.0.26-r2.ebuild 1422
-SHA256 63770b43391644118d3214a8b13fc35992bab066d2881cfe7ef598752b22385e java-config-2.0.26-r2.ebuild 1422
-MISC ChangeLog 15501 RMD160 ceba6e12dfd9fb15e223c4b0ec20b5e6ea6714ce SHA1 6b5f868930bade28c803ca10c61d13f16efccb37 SHA256 ac43883321eac3dbcc7b0d1bb00ee849533074421100012ac6b63a978fa5f81b
-MD5 693d158ea89df722f751a9d96e97813f ChangeLog 15501
-RMD160 ceba6e12dfd9fb15e223c4b0ec20b5e6ea6714ce ChangeLog 15501
-SHA256 ac43883321eac3dbcc7b0d1bb00ee849533074421100012ac6b63a978fa5f81b ChangeLog 15501
+EBUILD java-config-2.0.26-r3.ebuild 1403 RMD160 5541bdd42fe0af594d093ad31835c67bba1d8771 SHA1 c26b7d547a2169c0cf577ca117e1530c417105c7 SHA256 4b69a007cad0ac10b4d5ef4cc5232940ce8d37b68ebfd2b8d04f94c20532df90
+MD5 76688dcb188814050aacdc9d8d49c189 java-config-2.0.26-r3.ebuild 1403
+RMD160 5541bdd42fe0af594d093ad31835c67bba1d8771 java-config-2.0.26-r3.ebuild 1403
+SHA256 4b69a007cad0ac10b4d5ef4cc5232940ce8d37b68ebfd2b8d04f94c20532df90 java-config-2.0.26-r3.ebuild 1403
+MISC ChangeLog 15678 RMD160 f316bea168bbb93198d21515204d07adaa86e187 SHA1 7f16eeec084d735f2a7ed7019702579ccbb1f053 SHA256 091a745d10490667fb953b7ebde4641a40eb06a2dd75216871ad04473af2aa49
+MD5 b4443baff11e9cbf35a0d648e4c38794 ChangeLog 15678
+RMD160 f316bea168bbb93198d21515204d07adaa86e187 ChangeLog 15678
+SHA256 091a745d10490667fb953b7ebde4641a40eb06a2dd75216871ad04473af2aa49 ChangeLog 15678
 MISC metadata.xml 486 RMD160 158f1d9652c83644739d40c8014d65d487dca4e6 SHA1 1561f2727694d8312adbda18294f690116ab3c84 SHA256 5d3e4a1780efad67e6265b82a4397a2b4fe26c2c0785ee65a3390dd8218c82ce
 MD5 ff83dbd41edf207798f367c723ab813f metadata.xml 486
 RMD160 158f1d9652c83644739d40c8014d65d487dca4e6 metadata.xml 486
@@ -43,6 +43,6 @@ SHA256 da2af16dd2d187eb5301706d751663c290362f05f8a84eed14ecf5c21284c7da files/di
 MD5 43fb58eb5b3d48f906399c953fc29651 files/digest-java-config-1.3.0-r2 253
 RMD160 6ccd4638f2a01e9f60536a2d2d76be5a404a97fc files/digest-java-config-1.3.0-r2 253
 SHA256 8e829d236fd6326f55c2679229926adcba694b4a8f19387bfbb731dc6be1da67 files/digest-java-config-1.3.0-r2 253
-MD5 ca47623e6607ec52d4a845512fe4478c files/digest-java-config-2.0.26-r2 256
-RMD160 42089f4f980238fe6c10497e9b8a659518ef4b19 files/digest-java-config-2.0.26-r2 256
-SHA256 02c0d98b5c9c0116316da2f68ccfd05f449c43e493b30e3e55dcf07cd7a0ffe7 files/digest-java-config-2.0.26-r2 256
+MD5 ca47623e6607ec52d4a845512fe4478c files/digest-java-config-2.0.26-r3 256
+RMD160 42089f4f980238fe6c10497e9b8a659518ef4b19 files/digest-java-config-2.0.26-r3 256
+SHA256 02c0d98b5c9c0116316da2f68ccfd05f449c43e493b30e3e55dcf07cd7a0ffe7 files/digest-java-config-2.0.26-r3 256
diff --git a/dev-java/java-config/files/digest-java-config-2.0.26-r2 b/dev-java/java-config/files/digest-java-config-2.0.26-r2
deleted file mode 100644
index 56c0f4186bc9..000000000000
--- a/dev-java/java-config/files/digest-java-config-2.0.26-r2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 60221d65176ceb2e2ef4edf7c1724ad0 java-config-2.0.26.tar.bz2 15298
-RMD160 9f6724af6c6d274c02171aab992e9165e5abc738 java-config-2.0.26.tar.bz2 15298
-SHA256 03e828568b5f965a59a2db57597d1b45e14ba8e89acca65d3082fb7ee4ef578c java-config-2.0.26.tar.bz2 15298
diff --git a/dev-java/java-config/java-config-2.0.26-r2.ebuild b/dev-java/java-config/java-config-2.0.26-r2.ebuild
deleted file mode 100644
index 61047303e97d..000000000000
--- a/dev-java/java-config/java-config-2.0.26-r2.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# 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.26-r2.ebuild,v 1.1 2006/07/03 17:18:14 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="2"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-DEPEND="virtual/python"
-RDEPEND="virtual/python
-	dev-java/java-config-wrapper"
-
-PATCHES="${FILESDIR}/${P}-nsplugin.patch ${FILESDIR}/${P}-set_number.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
-}
-
-pkg_postinst() {
-	python_mod_optimize /usr/share/java-config-2/pym/java_config
-}
-
-pkg_postrm() {
-	python_mod_cleanup /usr/share/java-config-2/pym/java_config
-}
-
-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 "http://www.gentoo.org/proj/en/java/java-upgrade.xml"
-}