diff options
author | Dylan Carlson <absinthe@gentoo.org> | 2003-05-24 06:19:48 +0000 |
---|---|---|
committer | Dylan Carlson <absinthe@gentoo.org> | 2003-05-24 06:19:48 +0000 |
commit | c5c2822c47a25cecb198caf251b9463f37dd311f (patch) | |
tree | 97a54352c82e6e823c3325ba693cba9c90f27ca9 /dev-java | |
parent | Version bump and license fixes. (diff) | |
download | gentoo-2-c5c2822c47a25cecb198caf251b9463f37dd311f.tar.gz gentoo-2-c5c2822c47a25cecb198caf251b9463f37dd311f.tar.bz2 gentoo-2-c5c2822c47a25cecb198caf251b9463f37dd311f.zip |
Version bump and license fixes.
Diffstat (limited to 'dev-java')
-rw-r--r-- | dev-java/sun-jdk/ChangeLog | 18 | ||||
-rw-r--r-- | dev-java/sun-jdk/Manifest | 10 | ||||
-rw-r--r-- | dev-java/sun-jdk/files/digest-sun-jdk-1.3.1.08 (renamed from dev-java/sun-jdk/files/digest-sun-jdk-1.3.1.07) | 0 | ||||
-rw-r--r-- | dev-java/sun-jdk/files/sun-jdk-1.3.1.08 (renamed from dev-java/sun-jdk/files/sun-jdk-1.3.1.07) | 2 | ||||
-rw-r--r-- | dev-java/sun-jdk/sun-jdk-1.3.1.08.ebuild (renamed from dev-java/sun-jdk/sun-jdk-1.3.1.07.ebuild) | 36 | ||||
-rw-r--r-- | dev-java/sun-jdk/sun-jdk-1.4.1.02-r1.ebuild | 4 | ||||
-rw-r--r-- | dev-java/sun-jdk/sun-jdk-1.4.1.02.ebuild | 4 |
7 files changed, 54 insertions, 20 deletions
diff --git a/dev-java/sun-jdk/ChangeLog b/dev-java/sun-jdk/ChangeLog index 9bc4b664ebe9..3b2a0ad540fb 100644 --- a/dev-java/sun-jdk/ChangeLog +++ b/dev-java/sun-jdk/ChangeLog @@ -1,7 +1,21 @@ # ChangeLog for dev-java/sun-jdk # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.41 2003/04/23 20:21:28 strider Exp $ - +# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.42 2003/05/24 06:19:45 absinthe Exp $ + +*sun-jdk-1.3.1.08 (24 May 2003) + + 24 May 2003; Dylan Carlson <absinthe@gentoo.org> sun-jdk-1.3.1.07.ebuild, + sun-jdk-1.3.1.07.ebuild, sun-jdk-1.3.1.08.ebuild, + 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 + bug #19944. + 15 Dec 2002; Adrian Almenar <strider@gentoo.org>: Correct formating for all ebuilds so lintool doesnt complain. (Make them policy compliant). diff --git a/dev-java/sun-jdk/Manifest b/dev-java/sun-jdk/Manifest index 23121ee13ce7..739acd787e1f 100644 --- a/dev-java/sun-jdk/Manifest +++ b/dev-java/sun-jdk/Manifest @@ -1,8 +1,8 @@ -MD5 79b6925858c9e64eca61ffe59c41f463 sun-jdk-1.4.1.02.ebuild 1950 -MD5 950e9c476f129559793b8d8be32e98ca sun-jdk-1.3.1.08.ebuild 2251 -MD5 382402cd68bf2b64c2734a70dfec1786 sun-jdk-1.4.1.02-r1.ebuild 1637 -MD5 236d021f006e0f73ce469e18a98b131e ChangeLog 9850 -MD5 3a0697725161316dba0bc889e84e551c files/sun-jdk-1.3.1.08 624 +MD5 c8c85ae5ea7c90b74058b3161a7d113e sun-jdk-1.4.1.02.ebuild 1951 +MD5 ddf63ab506724620f31c5c0128f4d080 sun-jdk-1.3.1.08.ebuild 2252 +MD5 497bb12bcd594ebfe5f7237849a4d2db sun-jdk-1.4.1.02-r1.ebuild 1638 +MD5 74aa29cb477cc9b92b7a0b38547de4e3 ChangeLog 10349 +MD5 8a81df1198a6df40e3b76b671c047f56 files/sun-jdk-1.3.1.08 625 MD5 8aecab67055fb9e0d652f5aa66162ad9 files/sun-jdk-1.4.1.02 602 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-sun-jdk-1.4.1.02-r1 0 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-sun-jdk-1.3.1.08 0 diff --git a/dev-java/sun-jdk/files/digest-sun-jdk-1.3.1.07 b/dev-java/sun-jdk/files/digest-sun-jdk-1.3.1.08 index e69de29bb2d1..e69de29bb2d1 100644 --- a/dev-java/sun-jdk/files/digest-sun-jdk-1.3.1.07 +++ b/dev-java/sun-jdk/files/digest-sun-jdk-1.3.1.08 diff --git a/dev-java/sun-jdk/files/sun-jdk-1.3.1.07 b/dev-java/sun-jdk/files/sun-jdk-1.3.1.08 index 007d50123edf..85abfe739487 100644 --- a/dev-java/sun-jdk/files/sun-jdk-1.3.1.07 +++ b/dev-java/sun-jdk/files/sun-jdk-1.3.1.08 @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License, v2 or later # Author: Karl Trygve Kalleberg # Maintainer: Tools Team <tools@gentoo.org> -# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/files/sun-jdk-1.3.1.07,v 1.1 2003/04/23 06:16:50 strider Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/files/sun-jdk-1.3.1.08,v 1.1 2003/05/24 06:19:45 absinthe Exp $ VERSION="Sun JDK @PV@" JAVA_HOME=/opt/@P@ diff --git a/dev-java/sun-jdk/sun-jdk-1.3.1.07.ebuild b/dev-java/sun-jdk/sun-jdk-1.3.1.08.ebuild index 6850189fa9e0..c2b7905b9582 100644 --- a/dev-java/sun-jdk/sun-jdk-1.3.1.07.ebuild +++ b/dev-java/sun-jdk/sun-jdk-1.3.1.08.ebuild @@ -1,15 +1,15 @@ # Copyright 1999-2003 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.3.1.07.ebuild,v 1.2 2003/04/23 20:21:28 strider Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.3.1.08.ebuild,v 1.1 2003/05/24 06:19:45 absinthe Exp $ IUSE="doc" inherit java nsplugins -At="j2sdk-1_3_1_07-linux-i586.bin" -S="${WORKDIR}/jdk1.3.1_07" +At="j2sdk-1_3_1_08-linux-i586.bin" +S="${WORKDIR}/jdk1.3.1_08" SRC_URI="" -DESCRIPTION="Sun Java Development Kit 1.3.1_07" +DESCRIPTION="Sun Java Development Kit 1.3.1_08" HOMEPAGE="http://java.sun.com/j2se/1.3/download.html" DEPEND="virtual/glibc >=dev-java/java-config-0.2.7 @@ -18,7 +18,7 @@ RDEPEND="$DEPEND" PROVIDE="virtual/jre-1.3.1 virtual/jdk-1.3.1 virtual/java-scheme-2" -LICENSE="sun-bcla" +LICENSE="sun-bcla-java-vm" SLOT="1.3" KEYWORDS="x86 -ppc -sparc -alpha -mips -hppa -arm" @@ -26,7 +26,7 @@ src_unpack() { if [ ! -f ${DISTDIR}/${At} ] ; then die "Please download ${At} from ${HOMEPAGE} (select the \"Linux self-extracting file\" package format of the SDK) and move it to ${DISTDIR}. Note: You can find archived releases from http://java.sun.com/products/archive/" fi - tail +293 ${DISTDIR}/${At} > install.sfx + tail +296 ${DISTDIR}/${At} > install.sfx chmod +x install.sfx ./install.sfx rm install.sfx @@ -36,8 +36,28 @@ src_install () { local dirs="bin include include-old jre lib" dodir /opt/${P} - for i in $dirs ; do - cp -a $i ${D}/opt/${P}/ + for i in ${dirs} ; do + if [ "${i}" == "bin" ] ; then + dodir /opt/${P}/${i} + cp -a ${i}/.java_wrapper ${D}/opt/${P}/bin/ + cp -a ${i}/* ${D}/opt/${P}/bin/ + elif [ "${i}" == "jre" ] ; then + dodir /opt/${P}/${i} + dodir /opt/${P}/${i}/bin + cp -a ${i}/bin/.java_wrapper ${D}/opt/${P}/${i}/bin/ + cp -a ${i}/bin/* ${D}/opt/${P}/${i}/bin/ + cp -a ${i}/CHANGES \ + ${i}/COPYRIGHT \ + ${i}/ControlPanel.html \ + ${i}/LICENSE \ + ${i}/README \ + ${i}/Welcome.html \ + ${i}/lib \ + ${i}/plugin \ + ${D}/opt/${P}/${i}/ + else + cp -a ${i} ${D}/opt/${P}/ + fi done dodoc COPYRIGHT README LICENSE diff --git a/dev-java/sun-jdk/sun-jdk-1.4.1.02-r1.ebuild b/dev-java/sun-jdk/sun-jdk-1.4.1.02-r1.ebuild index 0a7c169258b9..6751675fe1ce 100644 --- a/dev-java/sun-jdk/sun-jdk-1.4.1.02-r1.ebuild +++ b/dev-java/sun-jdk/sun-jdk-1.4.1.02-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2003 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.4.1.02-r1.ebuild,v 1.1 2003/04/23 20:21:29 strider Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.4.1.02-r1.ebuild,v 1.2 2003/05/24 06:19:45 absinthe Exp $ IUSE="doc" @@ -13,7 +13,7 @@ HOMEPAGE="http://java.sun.com/j2se/1.4.1/download.html" SRC_URI="" SLOT="1.4" -LICENSE="sun-bcla" +LICENSE="sun-bcla-java-vm" KEYWORDS="x86 -ppc -sparc -alpha -mips -hppa -arm" DEPEND=">=dev-java/java-config-0.2.5 diff --git a/dev-java/sun-jdk/sun-jdk-1.4.1.02.ebuild b/dev-java/sun-jdk/sun-jdk-1.4.1.02.ebuild index b9d5a35d7ccf..50340760c780 100644 --- a/dev-java/sun-jdk/sun-jdk-1.4.1.02.ebuild +++ b/dev-java/sun-jdk/sun-jdk-1.4.1.02.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2003 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.4.1.02.ebuild,v 1.3 2003/03/17 15:26:09 strider Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.4.1.02.ebuild,v 1.4 2003/05/24 06:19:45 absinthe Exp $ IUSE="doc mozilla" @@ -13,7 +13,7 @@ HOMEPAGE="http://java.sun.com/j2se/1.4.1/download.html" SRC_URI="" SLOT="1.4" -LICENSE="sun-bcla" +LICENSE="sun-bcla-java-vm" KEYWORDS="x86 -ppc -sparc -alpha -mips -hppa -arm" DEPEND=">=dev-java/java-config-0.2.5 |