Version bump. Fixes bug #35024 and bug #211454.

Package-Manager: portage-2.1.4.4

3 files changed, 71 insertions, 2 deletions

diff --git a/dev-java/java-config/ChangeLog b/dev-java/java-config/ChangeLog
index 0818b261a56d..f77bd32a36d8 100644
--- a/dev-java/java-config/ChangeLog
+++ b/dev-java/java-config/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/java-config
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/java-config/ChangeLog,v 1.184 2008/02/21 10:56:53 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/java-config/ChangeLog,v 1.185 2008/02/26 18:15:03 betelgeuse Exp $
+
+*java-config-2.1.5 (26 Feb 2008)
+
+  26 Feb 2008; Petteri Räty <betelgeuse@gentoo.org>
+  +java-config-2.1.5.ebuild:
+  Version bump. Fixes bug #35024 and bug #211454.
 
   21 Feb 2008; Raúl Porcel <armin76@gentoo.org> java-config-2.1.4.ebuild:
   ia64 stable wrt #204252
diff --git a/dev-java/java-config/Manifest b/dev-java/java-config/Manifest
index 8e7441523e77..90ba0a1d7c83 100644
--- a/dev-java/java-config/Manifest
+++ b/dev-java/java-config/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX java-config-1.2.11-shebang.patch 229 RMD160 e201dafad76307123139861371ade56f03887342 SHA1 e91f77077bb0b5793bda7ffc58442019dc66db09 SHA256 4068a51515b7510260de57a5872d6e04b1a33d2f9728d77ed00fe7f41cced83a
 AUX java-config-2.0.33-r1.patch 4424 RMD160 896e66d699863e31181ac9584805ece0d42fb30c SHA1 fb141b627f9e17b61347b24a112d1f2d1e6df028 SHA256 bc96b7478e57f1e86f3b7a2d97f8cfa5ec0df072fd6ef1c0ca647266a5c47cb6
 AUX java-config-2.1.2-r1.patch 372 RMD160 9db4f747b6e7eccae3408e7aa0ec7e9b636b5eab SHA1 fea6717969effdb0ec0177ba3a78d9852db0e53a SHA256 fc99c0f972fe99d3db34a2c130115b72d6adde910a42b1b4d0a1bfed9f3d2c23
@@ -6,10 +9,19 @@ DIST java-config-1.3.7.tar.bz2 14362 RMD160 243739cdef9ea5b2baa708eabd5358d18046
 DIST java-config-2.0.33.tar.bz2 25491 RMD160 f8ac8a9c8707ccc62e6258935b4578260f60eaf2 SHA1 57c998c09de0dbea08026d9bc8712abc0cfbe767 SHA256 3576c22ffd474b02080f257f6ddedd92c453c786f29d893f2d4f7bafc98194da
 DIST java-config-2.1.3.tar.bz2 22096 RMD160 8cb28f737bcda24107f85d6b321ae34d5690ec63 SHA1 5eb5321d807a68f58112ba70348868717f317d6c SHA256 b4fd7600ffe432737a899eeec0ac6909c7d8b06c6ac6bc10af3870fce30517b0
 DIST java-config-2.1.4.tar.bz2 41558 RMD160 3b8533ecabc7eaf729e3a46009dcfe96b10f57ae SHA1 40a5fb44b800b347a02830dde0bd24ef6a621800 SHA256 e5dc436cb1927989769097941af8758e7070fc5c1e984d7b421bebcf0e816509
+DIST java-config-2.1.5.tar.bz2 38919 RMD160 cd497153a25db1ce8894f29448be4ee3df288716 SHA1 a28e001845f578a5f0b650483541634e4dfda8f6 SHA256 5c78f0baad213a6474c5faa289db95d6ee3aaa79b76d7fafb4f10790c6c3981d
 EBUILD java-config-1.2.11-r1.ebuild 853 RMD160 dbee4fb27b32124fc6a3ad13451e30b0fdf5c372 SHA1 7f29b8997f5f53ceca38ec663a86be97674e7ed4 SHA256 d28d85e6fdd7b6aac8e72b09f6a2a72cefa729ea1941ecea615cc074f521daff
 EBUILD java-config-1.3.7.ebuild 1224 RMD160 7571952e5e0d9dcd7c4cc240124b6622e06eead8 SHA1 ce38b32ab3aaf6bc80f85b17a6c707fa105e8311 SHA256 8b14160ddedf1a26fb092de9b104f4ca547e39af45bf5b78a710790a22f47add
 EBUILD java-config-2.0.33-r1.ebuild 1539 RMD160 9fe1756599d998facfb7bbe4d09382748faf0c9a SHA1 6b111e8325d6e99842d7413acb957bc2d3bf81a8 SHA256 89dccb3d649562fdbf26af1f7eb9c99dc149f856c425dc1f40a0ff431cb43c5a
 EBUILD java-config-2.1.3.ebuild 1421 RMD160 ca58bc011f2d18d13345647522dffeda5e74a02e SHA1 28f0e57779901da38e5ead136fb8721152f0716a SHA256 4556ba43d0608b9319063f9ea2428459bdd65169f01b5b1351c5ba3d92188421
 EBUILD java-config-2.1.4.ebuild 1418 RMD160 a964f9dd05282ce3cb7756d649348a3118b67a84 SHA1 6df4338ada6e8cd5b64bb3e4ced2675c549eb53b SHA256 fe489069c14b617aa0cd96e4422436ae0383263d72960726970673bee481f036
-MISC ChangeLog 33689 RMD160 67a70f48add8a9eca8e172485ae6c7aa7d513155 SHA1 b4bb982f05e8354a989df624e37c3c35d8093296 SHA256 9560c17270cb89d771df1d2ce4c96f05949da6d306477a702a899d50204a8fc3
+EBUILD java-config-2.1.5.ebuild 1563 RMD160 3269ec062c5e3f0dcc8fa652407586668f3b5f9e SHA1 2df18dc578f5a3fb094861395f5853d7e5f3f4ba SHA256 75dfdbc10ad208f884c3e363cef4e30fc6446213eb7c76b617cdc52984f06884
+MISC ChangeLog 33859 RMD160 418ad7f000963d0512b5cae44997dca6c23ef5cf SHA1 30ad6471295502a39937e6ab5da4fff1601a887b SHA256 528f136823769899cf55aee794124686d4390eef3169906fc89514507f294c09
 MISC metadata.xml 482 RMD160 b060f8a2492170d8513e1b2d03512d8b565b5045 SHA1 b154d3e425be12942f183a7ad1a37fecc215e4b4 SHA256 f80d3cd5afabd0dc4d177925c3715c464288e5ec3ed1ca809a7f7a66ee3907a5
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHxFc1cxLzpIGCsLQRAnWgAJ0cKU4Jis+4ffTYjSYbREXtN7XhAwCfQLIC
+UF3ERHcHDPeGLWwGWGWp6rk=
+=Xrf8
+-----END PGP SIGNATURE-----
diff --git a/dev-java/java-config/java-config-2.1.5.ebuild b/dev-java/java-config/java-config-2.1.5.ebuild
new file mode 100644
index 000000000000..eaed7ec668fa
--- /dev/null
+++ b/dev-java/java-config/java-config-2.1.5.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2008 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.5.ebuild,v 1.1 2008/02/26 18:15:03 betelgeuse Exp $
+
+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 ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE=""
+
+DEPEND="dev-lang/python"
+RDEPEND="${DEPEND}
+	>=dev-java/java-config-wrapper-0.15"
+
+PYTHON_MODNAME="java_config_2"
+
+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_python_version
+	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
+
+	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 "\thttp://www.gentoo.org/proj/en/java/why-we-need-java-14.xml"
+}