Install a revdep-rebuild control files to prevent revdep-rebuild from complaining about things like libjawt.so that are loaded by the vm. Fixes bug #152039.

Package-Manager: portage-2.1.2-r12

5 files changed, 100 insertions, 8 deletions

diff --git a/dev-java/java-config/ChangeLog b/dev-java/java-config/ChangeLog
index 76372f6221d3..7111376e1daf 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-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/java-config/ChangeLog,v 1.143 2007/02/28 10:40:47 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/java-config/ChangeLog,v 1.144 2007/03/05 10:07:59 betelgeuse Exp $
+
+*java-config-2.0.31-r4 (05 Mar 2007)
+
+  05 Mar 2007; Petteri Räty <betelgeuse@gentoo.org> +files/60-java,
+  +java-config-2.0.31-r4.ebuild:
+  Install a revdep-rebuild control files to prevent revdep-rebuild from
+  complaining about things like libjawt.so that are loaded by the vm. Fixes
+  bug #152039.
 
   28 Feb 2007; Petteri Räty <betelgeuse@gentoo.org>
   java-config-2.0.31-r3.ebuild:
diff --git a/dev-java/java-config/Manifest b/dev-java/java-config/Manifest
index 30134939256b..07a5accb85c4 100644
--- a/dev-java/java-config/Manifest
+++ b/dev-java/java-config/Manifest
@@ -1,6 +1,10 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX 60-java 382 RMD160 0794d1592b0e5999effcfa630f6b002d2f172631 SHA1 beaaaa5297bc180a78730661a273fa8d109e03b2 SHA256 06e30c66084aa7fac580004b71c739c09d7ee147ff4a46b4b8a0ea43aaa9738d
+MD5 bff6d7769967e9d0387aa46ca3dda6d4 files/60-java 382
+RMD160 0794d1592b0e5999effcfa630f6b002d2f172631 files/60-java 382
+SHA256 06e30c66084aa7fac580004b71c739c09d7ee147ff4a46b4b8a0ea43aaa9738d files/60-java 382
 AUX java-config-1.2.11-shebang.patch 229 RMD160 e201dafad76307123139861371ade56f03887342 SHA1 e91f77077bb0b5793bda7ffc58442019dc66db09 SHA256 4068a51515b7510260de57a5872d6e04b1a33d2f9728d77ed00fe7f41cced83a
 MD5 882665d94cc943f315ec729d990afadf files/java-config-1.2.11-shebang.patch 229
 RMD160 e201dafad76307123139861371ade56f03887342 files/java-config-1.2.11-shebang.patch 229
@@ -49,14 +53,18 @@ EBUILD java-config-2.0.31-r3.ebuild 1902 RMD160 630294cc24078656b47f5b9af527b05f
 MD5 bd190dfc3e8a182f4cb86b23d02ef384 java-config-2.0.31-r3.ebuild 1902
 RMD160 630294cc24078656b47f5b9af527b05fc0edaf6f java-config-2.0.31-r3.ebuild 1902
 SHA256 c98d852738c0885ce24752b7e119bc7d7181422d74ee41c80997312d07dab6f9 java-config-2.0.31-r3.ebuild 1902
+EBUILD java-config-2.0.31-r4.ebuild 1969 RMD160 8bf3aca117c6dd1a095de18b7d05d338d66a06b9 SHA1 4d51b8e5545db44861f645f22a3aa52759a150f7 SHA256 a1f9a2b7730afce36163a81abeb83bce1e944ab529e5cb43bf8f470746ba8083
+MD5 f789cbc4b3952038f762b6c265d355a2 java-config-2.0.31-r4.ebuild 1969
+RMD160 8bf3aca117c6dd1a095de18b7d05d338d66a06b9 java-config-2.0.31-r4.ebuild 1969
+SHA256 a1f9a2b7730afce36163a81abeb83bce1e944ab529e5cb43bf8f470746ba8083 java-config-2.0.31-r4.ebuild 1969
 EBUILD java-config-2.0.31.ebuild 1768 RMD160 fb4fc772ab3f037563227d9d8493380b207c6e8a SHA1 76d8f0f064375530a499e89505f52aae9273b5bd SHA256 b0f01c5f5b91e16227d43cea36bb86de6e2e65c6b0367e03d9b66c143cceea52
 MD5 e9e581857d3006bf91a9c4dfd067013a java-config-2.0.31.ebuild 1768
 RMD160 fb4fc772ab3f037563227d9d8493380b207c6e8a java-config-2.0.31.ebuild 1768
 SHA256 b0f01c5f5b91e16227d43cea36bb86de6e2e65c6b0367e03d9b66c143cceea52 java-config-2.0.31.ebuild 1768
-MISC ChangeLog 27093 RMD160 95f5925769030628ea45a4670f44cf4ac837187a SHA1 1998e93bc83691b019750cc97bc8a40f1db9d785 SHA256 fb576f0d5cb0a33969e3902a31308b722659e6e3ad939e44f107eaf771dac6d0
-MD5 5a766e92ca03be6cdfeaef0d8aa56974 ChangeLog 27093
-RMD160 95f5925769030628ea45a4670f44cf4ac837187a ChangeLog 27093
-SHA256 fb576f0d5cb0a33969e3902a31308b722659e6e3ad939e44f107eaf771dac6d0 ChangeLog 27093
+MISC ChangeLog 27397 RMD160 f7fcd2b8a7cf68fad03a34f97f7905b1677ec83b SHA1 2b7a2f3a080c7235686f6005f7300bf5fb05d1a3 SHA256 7f5b5c23127a6a92871f52549541afce374518a2061f8365e086179557b53c5e
+MD5 e9242e6da6fdaefdf710efdfb9728482 ChangeLog 27397
+RMD160 f7fcd2b8a7cf68fad03a34f97f7905b1677ec83b ChangeLog 27397
+SHA256 7f5b5c23127a6a92871f52549541afce374518a2061f8365e086179557b53c5e ChangeLog 27397
 MISC metadata.xml 482 RMD160 b060f8a2492170d8513e1b2d03512d8b565b5045 SHA1 b154d3e425be12942f183a7ad1a37fecc215e4b4 SHA256 f80d3cd5afabd0dc4d177925c3715c464288e5ec3ed1ca809a7f7a66ee3907a5
 MD5 b4d3814b9ce4be88a25d99b3cfe2c076 metadata.xml 482
 RMD160 b060f8a2492170d8513e1b2d03512d8b565b5045 metadata.xml 482
@@ -76,10 +84,13 @@ SHA256 fb9fdda52fe83303015b76545968d59324e286959171bb5dc01dd094e11cd8e0 files/di
 MD5 c38ff0fcf6539f0bf10d2750b97c1dae files/digest-java-config-2.0.31-r3 256
 RMD160 dcdc28e10c1f81f64e372c24f7fd50330fcf4b15 files/digest-java-config-2.0.31-r3 256
 SHA256 fb9fdda52fe83303015b76545968d59324e286959171bb5dc01dd094e11cd8e0 files/digest-java-config-2.0.31-r3 256
+MD5 c38ff0fcf6539f0bf10d2750b97c1dae files/digest-java-config-2.0.31-r4 256
+RMD160 dcdc28e10c1f81f64e372c24f7fd50330fcf4b15 files/digest-java-config-2.0.31-r4 256
+SHA256 fb9fdda52fe83303015b76545968d59324e286959171bb5dc01dd094e11cd8e0 files/digest-java-config-2.0.31-r4 256
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.2 (GNU/Linux)
 
-iD8DBQFF5Vg7cxLzpIGCsLQRAh6AAKCMl6qYjLsIwona9G/KLs5MelIgawCfTyXg
-9sx+e7ZPehxwKczSwwLkieo=
-=SZz1
+iD8DBQFF6+krcxLzpIGCsLQRAh1QAJ4ujsInZel+iYenYimhNt4MXjVq+gCfb/4G
+ivpfr0i4s+tMcJZbwuvLYk8=
+=saSF
 -----END PGP SIGNATURE-----
diff --git a/dev-java/java-config/files/60-java b/dev-java/java-config/files/60-java
new file mode 100644
index 000000000000..1aca594a8ece
--- /dev/null
+++ b/dev-java/java-config/files/60-java
@@ -0,0 +1,9 @@
+# The VM dynamically loads these at runtime so they will end up as missing
+# but actually work just fine. See for example
+# https://bugs.gentoo.org/show_bug.cgi?id=152039
+#
+# This file should only have files the are used by things like swt. If there
+# are "broken" links inside the jre itself, the jre should install it's own
+# control file.
+
+LD_LIBRARY_MASK="libjvm.so libjawt.so"
diff --git a/dev-java/java-config/files/digest-java-config-2.0.31-r4 b/dev-java/java-config/files/digest-java-config-2.0.31-r4
new file mode 100644
index 000000000000..393d9dbec4ef
--- /dev/null
+++ b/dev-java/java-config/files/digest-java-config-2.0.31-r4
@@ -0,0 +1,3 @@
+MD5 36b7893b20b9f4b6f0af6dd632703745 java-config-2.0.31.tar.bz2 17001
+RMD160 4b3d8362538b435a642312ee7289824d6662e309 java-config-2.0.31.tar.bz2 17001
+SHA256 314ec1783da8190d60e757aaef2af8eae7281c3c9754024e3e59643ce7a30752 java-config-2.0.31.tar.bz2 17001
diff --git a/dev-java/java-config/java-config-2.0.31-r4.ebuild b/dev-java/java-config/java-config-2.0.31-r4.ebuild
new file mode 100644
index 000000000000..e20c814c477c
--- /dev/null
+++ b/dev-java/java-config/java-config-2.0.31-r4.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2007 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.31-r4.ebuild,v 1.1 2007/03/05 10:07:59 betelgeuse 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 ~x86 ~x86-fbsd"
+IUSE=""
+
+DEPEND="dev-lang/python"
+RDEPEND="${DEPEND}
+	dev-java/java-config-wrapper"
+
+src_install() {
+	distutils_src_install
+
+	insinto /usr/share/java-config-2/config/
+	for i in alpha amd64 hppa ia64 ppc ppc64 sparc x86 x86-fbsd; 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.sh ${PN}-${SLOT}.sh || die "newexe failed"
+	newexe ${FILESDIR}/${PN}-${SLOT}.profiled.csh ${PN}-${SLOT}.csh || die "newexe failed"
+
+	insinto /etc/revdep-rebuild/
+	doins "${FILESDIR}/60-java" || die
+}
+
+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
+
+	elog "The way Java is handled on Gentoo has been recently updated."
+	elog "If you have not done so already, you should follow the"
+	elog "instructions available at:"
+	elog "\thttp://www.gentoo.org/proj/en/java/java-upgrade.xml"
+	elog
+	elog "While we are moving towards the new Java system, we only allow"
+	elog "1.3 or 1.4 JDKs to be used with java-config-1 to ensure"
+	elog "backwards compatibility with the old system."
+	elog "For more details about this, please see:"
+	elog "\thttps://overlays.gentoo.org/proj/java/wiki/Why_We_Need_Java14"
+}