From 7b5fcd293ea9faafed245e927fdc4215e30a74f1 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Petteri=20R=C3=A4ty?= Date: Sat, 7 Apr 2007 19:23:55 +0000 Subject: [PATCH] Cleanup distfile handling. Package-Manager: portage-2.1.2.3 --- dev-java/sun-jdk/ChangeLog | 31 +++++++++++++++--------- dev-java/sun-jdk/Manifest | 24 +++++++++--------- dev-java/sun-jdk/sun-jdk-1.6.0-r1.ebuild | 14 ++++------- 3 files changed, 36 insertions(+), 33 deletions(-) diff --git a/dev-java/sun-jdk/ChangeLog b/dev-java/sun-jdk/ChangeLog index 7cdc758f80b9..0f5f7c96d5b4 100644 --- a/dev-java/sun-jdk/ChangeLog +++ b/dev-java/sun-jdk/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-java/sun-jdk # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.190 2007/04/06 09:30:08 opfer Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.191 2007/04/07 19:23:55 betelgeuse Exp $ + + 07 Apr 2007; Petteri Räty + sun-jdk-1.6.0-r1.ebuild: + Cleanup distfile handling. 06 Apr 2007; Christian Faulhammer sun-jdk-1.5.0.11.ebuild: @@ -197,6 +201,8 @@ sun-jdk-1.3.1.17-r10.ebuild: Removed useless dependencies on virtual/libc. +*sun-jdk-1.3.1.17-r10 (02 Jul 2006) + 02 Jul 2006; Joshua Nichols +sun-jdk-1.3.1.17-r10.ebuild: Updated sun-jdk-1.3 to generation-2 @@ -408,6 +414,7 @@ in 81874 *sun-jdk-1.5.0.02-r1 (25 Mar 2005) +*sun-jdk-1.4.2.07-r1 (25 Mar 2005) 25 Mar 2005; Jan Brinkmann -files/sun-jdk-1.4.2.05, -files/sun-jdk-1.4.2.06, -files/sun-jdk-1.5.0, -files/sun-jdk-1.5.0.01, @@ -536,7 +543,7 @@ 16 Jul 2004; Thomas Matthijs +files/sun-jdk-1.2.2.017, +sun-jdk-1.2.2.017.ebuild: Adding ebuild for 1.2 closes 20117 - Thanks too larry schuler + Thanks too larry schuler and Douglas Pollock 15 Jul 2004; Thomas Matthijs files/sun-jdk-1.3.1.12, @@ -563,12 +570,12 @@ *sun-jdk-1.5.0_beta2-r1 (21 Jun 2004) - 21 Jun 2004; Karl Trygve Kalleberg + 21 Jun 2004; Karl Trygve Kalleberg Added 'jce' flag, fixes #52375, thanks to Thomas Matthijs . *sun-jdk-1.4.2.04-r2 (21 Jun 2004) - 21 Jun 2004; Karl Trygve Kalleberg + 21 Jun 2004; Karl Trygve Kalleberg sun-jdk-1.4.2.04-r2.ebuild: Renamed 'ssl' useflag to 'jce', fixes #54676, thanks to Thomas Matthijs . @@ -715,7 +722,7 @@ Version Bump. Thanks to Carsten Frewert . Fixes bug #23701. *sun-jdk-1.4.1.03 (16 Jun 2003) - + 11 Jul 2003; Daniel Ahlberg : Added missing changelog entry. @@ -734,11 +741,11 @@ sun-jdk-1.4.1.02-r1.ebuild, sun-jdk-1.4.1.02.ebuild, files/sun-jdk-1.3.1.07, files/sun-jdk-1.3.1.08: Version bump -- 1.3.1.08 maintenance release: significant bug fixes. - + Release notes: http://java.sun.com/j2se/1.3/ReleaseNotes.html - - Additionally, license corrections were made for compliance to close out + + Additionally, license corrections were made for compliance to close out bug #19944. 15 Dec 2002; Adrian Almenar : Correct formating for all @@ -796,7 +803,7 @@ *sun-jdk-1.3.1.06 (03 Nov 2002) 15 Dec 2002; Adrian Almenar sun-jdk-1.3.1.06-r1.ebuild: - Fixes #11116. + Fixes #11116. 03 Dec 2002; Adrian Almenar files/sun-jdk-1.3.1.06 Fixes Bug #11555 @@ -873,7 +880,7 @@ New version. Cleaned up ChangeLog a bit. -*sun-jdk-1.4.1_beta (19 August 2002) +*sun-jdk-1.4.1_beta (19 Aug 2002) 26 Aug 2002; Karl Trygve Kalleberg sun-jdk-1.4.1_beta.ebuild: SLOT is now 1.4. If no VM is installed, it becomes default system VM. Added @@ -928,7 +935,7 @@ Also updated the symlink that all browsers use to use the Java Plugin from here because it was broke. - + Also updated the ebuild to conform to lintool. *sun-jdk-1.3.1-r3 (15 Jun 2002) @@ -954,7 +961,7 @@ *sun-jdk-1.4.0-r2 (18 Apr 2002) 18 Apr 2002; Ryan Phillips files/sun-jdk-1.4.0: - Fixed CLASSPATH; pointing to wrong directory. (#1927) + Fixed CLASSPATH; pointing to wrong directory. (#1927) 09 Apr 2002; Karl Trygve Kalleberg sun-jdk-1.4.0-r2.ebuild files/digest-sun-jdk-1.4.0-r2: Fixed missing ROOTPATH. diff --git a/dev-java/sun-jdk/Manifest b/dev-java/sun-jdk/Manifest index ae206c3c58c7..86b2c12f90e9 100644 --- a/dev-java/sun-jdk/Manifest +++ b/dev-java/sun-jdk/Manifest @@ -41,14 +41,14 @@ EBUILD sun-jdk-1.5.0.11.ebuild 4654 RMD160 2982a97f9cadd7b0d05ac2e7b77d9c6791d43 MD5 a5c348a6fd29fd4225cdac6f8537b0a4 sun-jdk-1.5.0.11.ebuild 4654 RMD160 2982a97f9cadd7b0d05ac2e7b77d9c6791d431cb sun-jdk-1.5.0.11.ebuild 4654 SHA256 eb498c7f71537fa90b57556ee81860ccfa0a15b636e9fa105f3ec7d75721f22c sun-jdk-1.5.0.11.ebuild 4654 -EBUILD sun-jdk-1.6.0-r1.ebuild 4871 RMD160 276f9d3f0ec30d01e54114221554f7f0117fbf22 SHA1 e0e2779b97e643fd705a67c6ba9d00afa570bd57 SHA256 001b4b37ae301f42a396d6b304aaf4fe93bf08893da325def1d0c6ae61aaf305 -MD5 81ad16c2173d5c0503577508f71c7cfd sun-jdk-1.6.0-r1.ebuild 4871 -RMD160 276f9d3f0ec30d01e54114221554f7f0117fbf22 sun-jdk-1.6.0-r1.ebuild 4871 -SHA256 001b4b37ae301f42a396d6b304aaf4fe93bf08893da325def1d0c6ae61aaf305 sun-jdk-1.6.0-r1.ebuild 4871 -MISC ChangeLog 37238 RMD160 2efbd0979cfad7252fff360ee04ec55a937a741a SHA1 e67777c046e7ef2eabdff768a794b2bc5569aff9 SHA256 629963b9eab5691a72a4054764c15f02d1926e49f7258680df9f22a80305ff53 -MD5 e6ea0be29930e41dfe4319f07ffb9318 ChangeLog 37238 -RMD160 2efbd0979cfad7252fff360ee04ec55a937a741a ChangeLog 37238 -SHA256 629963b9eab5691a72a4054764c15f02d1926e49f7258680df9f22a80305ff53 ChangeLog 37238 +EBUILD sun-jdk-1.6.0-r1.ebuild 4802 RMD160 51b3b35fdb07034968f5859c27cf672b937d4913 SHA1 cc74741d176816fa2151ce32a7c4eade29255879 SHA256 422b0f6b1b7b6e36bfaf59998e9bede433b17b7f0dfa19c25486d431b28ee753 +MD5 82a5b3f47a0051ce2a06f287c437befd sun-jdk-1.6.0-r1.ebuild 4802 +RMD160 51b3b35fdb07034968f5859c27cf672b937d4913 sun-jdk-1.6.0-r1.ebuild 4802 +SHA256 422b0f6b1b7b6e36bfaf59998e9bede433b17b7f0dfa19c25486d431b28ee753 sun-jdk-1.6.0-r1.ebuild 4802 +MISC ChangeLog 37406 RMD160 02d39bf368b652a8590f81a545717f72208d033a SHA1 f072c1c337a0c9092b945feb1ac275b6d32bb364 SHA256 a668eb0e1e5acddb1e3d4f5032ba200f90d95e5fc9f4c6d88b48177baf5aac56 +MD5 5548613aae0b4c17ca321dbb63075557 ChangeLog 37406 +RMD160 02d39bf368b652a8590f81a545717f72208d033a ChangeLog 37406 +SHA256 a668eb0e1e5acddb1e3d4f5032ba200f90d95e5fc9f4c6d88b48177baf5aac56 ChangeLog 37406 MISC metadata.xml 237 RMD160 e2fa73e8b206c77bc262fd54691289bf05696668 SHA1 47fb9d11272aa2245df406c2156c2482e166a1c3 SHA256 3e53f0c8fb262a6751adb4c188e045e0be6de8739c02ec1af079cba5512e696d MD5 2f36c2b94fc9625e5c96d8e558f6ffba metadata.xml 237 RMD160 e2fa73e8b206c77bc262fd54691289bf05696668 metadata.xml 237 @@ -69,9 +69,9 @@ MD5 7cca7ffac6725b17472340fe8db317f6 files/digest-sun-jdk-1.6.0-r1 521 RMD160 7329a96c4622d1ea677604d88299616019b8f1d2 files/digest-sun-jdk-1.6.0-r1 521 SHA256 d5cebb938ce9873bffbdee08dfc2d4e46c0984e6d420221916b9acd94a0118c4 files/digest-sun-jdk-1.6.0-r1 521 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.6 (GNU/Linux) +Version: GnuPG v2.0.3 (GNU/Linux) -iD8DBQFGFhM+NQqtfCuFneMRAi7bAJ44J2sd0st6iWdV4k6WQrXRWxtsTwCfcr+E -pZEaKayUK6ood4keYvvR6u4= -=DeZW +iD8DBQFGF+/ZcxLzpIGCsLQRAiyhAJ90CZzG95T197YhN+t2OSG0q8d75QCdHM14 +Kg1WDP+rUb8yz3LkHCdpK9Y= +=bH1O -----END PGP SIGNATURE----- diff --git a/dev-java/sun-jdk/sun-jdk-1.6.0-r1.ebuild b/dev-java/sun-jdk/sun-jdk-1.6.0-r1.ebuild index bc63f1dbd0e2..a3b9638642f6 100644 --- a/dev-java/sun-jdk/sun-jdk-1.6.0-r1.ebuild +++ b/dev-java/sun-jdk/sun-jdk-1.6.0-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.6.0-r1.ebuild,v 1.7 2007/02/11 20:41:17 nichoj Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.6.0-r1.ebuild,v 1.8 2007/04/07 19:23:55 betelgeuse Exp $ inherit java-vm-2 eutils pax-utils @@ -10,11 +10,7 @@ S="${WORKDIR}/jdk${PV}" X86_AT="jdk-${MY_PVA}-dlj-linux-i586.bin" AMD64_AT="jdk-${MY_PVA}-dlj-linux-amd64.bin" -if use x86; then - At=${X86_AT} -elif use amd64; then - At=${AMD64_AT} -fi + DESCRIPTION="Sun's J2SE Development Kit, version ${PV}" HOMEPAGE="http://java.sun.com/javase/6/" SRC_URI="x86? ( http://download.java.net/dlj/binaries/${X86_AT} ) @@ -53,11 +49,11 @@ JAVA_PROVIDE="jdbc-stdext jdbc-rowset" PACKED_JARS="lib/tools.jar jre/lib/rt.jar jre/lib/jsse.jar jre/lib/charsets.jar jre/lib/ext/localedata.jar jre/lib/plugin.jar jre/lib/javaws.jar jre/lib/deploy.jar" src_unpack() { - if [ ! -r ${DISTDIR}/${At} ]; then - die "cannot read ${At}. Please check the permission and try again." + if [ ! -r ${DISTDIR}/${A} ]; then + die "cannot read ${A}. Please check the permission and try again." fi - sh ${DISTDIR}/${At} --accept-license --unpack || die "Failed to unpack" + sh ${DISTDIR}/${A} --accept-license --unpack || die "Failed to unpack" } src_install() { -- 2.26.2