From: Petteri Räty Date: Sat, 31 Mar 2007 19:36:59 +0000 (+0000) Subject: Fix jdk-defaults.conf for ia64. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=85996b5d4f23029ba999e891b28ff1cac489aa31;p=gentoo.git Fix jdk-defaults.conf for ia64. Package-Manager: portage-2.1.2.3 --- diff --git a/dev-java/java-config/ChangeLog b/dev-java/java-config/ChangeLog index cc3ed0413b5f..49dea3301176 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-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/java-config/ChangeLog,v 1.147 2007/03/16 11:13:16 betelgeuse Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/java-config/ChangeLog,v 1.148 2007/03/31 19:36:59 betelgeuse Exp $ + +*java-config-2.0.31-r6 (31 Mar 2007) + + 31 Mar 2007; Petteri Räty + +files/jdk-defaults-ia64.conf.patch, +java-config-2.0.31-r6.ebuild: + Fix jdk-defaults.conf for ia64. *java-config-2.0.31-r5 (16 Mar 2007) @@ -346,6 +352,8 @@ keyworded properly, and results in java-config-wrapper not getting installed. Thanks to zlin to tracking this issue down. +*java-config-2.0.26 (30 Jun 2006) + 30 Jun 2006; Joshua Nichols -java-config-2.0.25.ebuild, +java-config-2.0.26.ebuild: Version bump which adds a new eselect module, java-nsplugin diff --git a/dev-java/java-config/Manifest b/dev-java/java-config/Manifest index 71beff180e75..e08162c26b35 100644 --- a/dev-java/java-config/Manifest +++ b/dev-java/java-config/Manifest @@ -33,6 +33,10 @@ AUX java-config-2.profiled.sh-r1 1139 RMD160 83dbba34e93400fd94d901fdf024a44736e MD5 f7056f9411853e9c305f6529b709b45f files/java-config-2.profiled.sh-r1 1139 RMD160 83dbba34e93400fd94d901fdf024a44736e079c5 files/java-config-2.profiled.sh-r1 1139 SHA256 10405838ef2a271c9721ead35cc044f1fd68007e631f7dbb7e507fc7bec33463 files/java-config-2.profiled.sh-r1 1139 +AUX jdk-defaults-ia64.conf.patch 309 RMD160 8a25f9a4463bb5d6f4a4cc33348dbaa13f5d7daf SHA1 dcf925e061b3629690b08de97e2427a8dfdef5d0 SHA256 ccc9074731f23710043b16889ce8810d7af8d6eb303a1b125f775af757dcf24e +MD5 170fa1c47adf0b19a2601c5d0e2046a2 files/jdk-defaults-ia64.conf.patch 309 +RMD160 8a25f9a4463bb5d6f4a4cc33348dbaa13f5d7daf files/jdk-defaults-ia64.conf.patch 309 +SHA256 ccc9074731f23710043b16889ce8810d7af8d6eb303a1b125f775af757dcf24e files/jdk-defaults-ia64.conf.patch 309 AUX jdk-defaults-x86-fbsd.conf 61 RMD160 8bb737a332b445c375aa955f8961eaf587f3903a SHA1 73428cb74571048a86bd9d60fdf64c555a659c7d SHA256 e92e1111a26364f915a6588701f94527f7b3f25bb381edcd490a495393a9b598 MD5 f4a4c2656a71a460f2515085cd37f55a files/jdk-defaults-x86-fbsd.conf 61 RMD160 8bb737a332b445c375aa955f8961eaf587f3903a files/jdk-defaults-x86-fbsd.conf 61 @@ -60,14 +64,18 @@ EBUILD java-config-2.0.31-r5.ebuild 1969 RMD160 ea6fb36fef997a1ce3ec008e6e4a1155 MD5 0f0061b316d454e3825e2a2c678596b5 java-config-2.0.31-r5.ebuild 1969 RMD160 ea6fb36fef997a1ce3ec008e6e4a11557824b8a8 java-config-2.0.31-r5.ebuild 1969 SHA256 45a000cf7151ae5ed238477a680f218ff4dd5d48992125477ee33ae4d818939e java-config-2.0.31-r5.ebuild 1969 +EBUILD java-config-2.0.31-r6.ebuild 1987 RMD160 b2cf1d64d51ba11f5b33c110bafbc8c701a8354c SHA1 f7647fcaf7b513b50a514d536c74542665968dd6 SHA256 a75d73b52560396966be5e3d24c7d78d12a396a558e0e5cce9c023ad9fc27f25 +MD5 3a19a10baf9c6da07a8f577c878821cf java-config-2.0.31-r6.ebuild 1987 +RMD160 b2cf1d64d51ba11f5b33c110bafbc8c701a8354c java-config-2.0.31-r6.ebuild 1987 +SHA256 a75d73b52560396966be5e3d24c7d78d12a396a558e0e5cce9c023ad9fc27f25 java-config-2.0.31-r6.ebuild 1987 EBUILD java-config-2.0.31.ebuild 1768 RMD160 90a7dddfe4a02798f9bbf184ec9da7035f3c04b7 SHA1 ab42bab866354e4ede0ffa47c3beefad46e7a35d SHA256 542b7c046c86437bdc294c40b5812be5a03e0fa1fa677a4828a919bc8e83c8e7 MD5 3e7277b17ad060097322ffc056ddacc4 java-config-2.0.31.ebuild 1768 RMD160 90a7dddfe4a02798f9bbf184ec9da7035f3c04b7 java-config-2.0.31.ebuild 1768 SHA256 542b7c046c86437bdc294c40b5812be5a03e0fa1fa677a4828a919bc8e83c8e7 java-config-2.0.31.ebuild 1768 -MISC ChangeLog 28031 RMD160 a54fb6772d0f86a52dddc4d22069a77f2a6a0e4b SHA1 8165e6fa2699bbee271343bf933afabff844566f SHA256 e119dd0e4cf07249e6d7c5d1dcd2510c894fb3e5f623af4189d10d6bb473d8f0 -MD5 4a6f5fc46b48f04756986ed89a786dc7 ChangeLog 28031 -RMD160 a54fb6772d0f86a52dddc4d22069a77f2a6a0e4b ChangeLog 28031 -SHA256 e119dd0e4cf07249e6d7c5d1dcd2510c894fb3e5f623af4189d10d6bb473d8f0 ChangeLog 28031 +MISC ChangeLog 28262 RMD160 704072a02719f8e0acb603c46c4d0c156d4e64d5 SHA1 7118f9e87f5b7b4453ef4ae48ab85c0236b110e2 SHA256 0ed7b170a73c60a917b490903b93af3ad6370200db5cd32f3fc355e56b58d95d +MD5 178eceab31a21a23c3de4d678f19cfe1 ChangeLog 28262 +RMD160 704072a02719f8e0acb603c46c4d0c156d4e64d5 ChangeLog 28262 +SHA256 0ed7b170a73c60a917b490903b93af3ad6370200db5cd32f3fc355e56b58d95d ChangeLog 28262 MISC metadata.xml 482 RMD160 b060f8a2492170d8513e1b2d03512d8b565b5045 SHA1 b154d3e425be12942f183a7ad1a37fecc215e4b4 SHA256 f80d3cd5afabd0dc4d177925c3715c464288e5ec3ed1ca809a7f7a66ee3907a5 MD5 b4d3814b9ce4be88a25d99b3cfe2c076 metadata.xml 482 RMD160 b060f8a2492170d8513e1b2d03512d8b565b5045 metadata.xml 482 @@ -90,10 +98,13 @@ SHA256 fb9fdda52fe83303015b76545968d59324e286959171bb5dc01dd094e11cd8e0 files/di MD5 c38ff0fcf6539f0bf10d2750b97c1dae files/digest-java-config-2.0.31-r5 256 RMD160 dcdc28e10c1f81f64e372c24f7fd50330fcf4b15 files/digest-java-config-2.0.31-r5 256 SHA256 fb9fdda52fe83303015b76545968d59324e286959171bb5dc01dd094e11cd8e0 files/digest-java-config-2.0.31-r5 256 +MD5 c38ff0fcf6539f0bf10d2750b97c1dae files/digest-java-config-2.0.31-r6 256 +RMD160 dcdc28e10c1f81f64e372c24f7fd50330fcf4b15 files/digest-java-config-2.0.31-r6 256 +SHA256 fb9fdda52fe83303015b76545968d59324e286959171bb5dc01dd094e11cd8e0 files/digest-java-config-2.0.31-r6 256 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.3 (GNU/Linux) -iD8DBQFF+nvScxLzpIGCsLQRAjdXAJsFVqqN5EgNkJVqsyKPY4E8WS6MmQCfZt7+ -y9skp1/tkBiJm4fKuon7IoE= -=2Ug5 +iD8DBQFGDrhfcxLzpIGCsLQRAprMAJ9p5l//SrTGqPtUMqQ+t/21GcAPZQCeOiLu +bqgjdlzs3EILOj7QsKKx11w= +=9V2D -----END PGP SIGNATURE----- diff --git a/dev-java/java-config/files/digest-java-config-2.0.31-r6 b/dev-java/java-config/files/digest-java-config-2.0.31-r6 new file mode 100644 index 000000000000..393d9dbec4ef --- /dev/null +++ b/dev-java/java-config/files/digest-java-config-2.0.31-r6 @@ -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/files/jdk-defaults-ia64.conf.patch b/dev-java/java-config/files/jdk-defaults-ia64.conf.patch new file mode 100644 index 000000000000..2be011bb2f6b --- /dev/null +++ b/dev-java/java-config/files/jdk-defaults-ia64.conf.patch @@ -0,0 +1,8 @@ +Index: config/jdk-defaults-ia64.conf +=================================================================== +--- config/jdk-defaults-ia64.conf (revision 3624) ++++ config/jdk-defaults-ia64.conf (revision 4152) +@@ -1,2 +1,2 @@ + # This files contain the default support jdk's +-*= jrockit-bin-jdk ++*= jrockit-jdk-bin diff --git a/dev-java/java-config/java-config-2.0.31-r6.ebuild b/dev-java/java-config/java-config-2.0.31-r6.ebuild new file mode 100644 index 000000000000..ee5a72949f91 --- /dev/null +++ b/dev-java/java-config/java-config-2.0.31-r6.ebuild @@ -0,0 +1,63 @@ +# 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-r6.ebuild,v 1.1 2007/03/31 19:36: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="~ia64" +IUSE="" + +DEPEND="dev-lang/python" +RDEPEND="${DEPEND} + dev-java/java-config-wrapper" + +PATCHES="${FILESDIR}/jdk-defaults-ia64.conf.patch" + +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-r1 ${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 "\thttp://www.gentoo.org/proj/en/java/why-we-need-java-14.xml" +}