Version bump for Java 7.

(Portage version: 2.2.0_alpha51/cvs/Linux x86_64)

4 files changed, 49 insertions, 88 deletions

diff --git a/dev-java/java-sdk-docs/ChangeLog b/dev-java/java-sdk-docs/ChangeLog
index 05973a740376..2981b63c7201 100644
--- a/dev-java/java-sdk-docs/ChangeLog
+++ b/dev-java/java-sdk-docs/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-java/java-sdk-docs
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/java-sdk-docs/ChangeLog,v 1.76 2011/08/12 18:22:20 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/java-sdk-docs/ChangeLog,v 1.77 2011/09/02 22:38:42 caster Exp $
+
+*java-sdk-docs-1.7.0 (02 Sep 2011)
+
+  02 Sep 2011; Vlastimil Babka <caster@gentoo.org>
+  -java-sdk-docs-1.6.0.10.ebuild, -java-sdk-docs-1.6.0.18.ebuild,
+  +java-sdk-docs-1.7.0.ebuild:
+  Version bump for Java 7.
 
 *java-sdk-docs-1.6.0.25 (12 Aug 2011)
 
diff --git a/dev-java/java-sdk-docs/java-sdk-docs-1.6.0.10.ebuild b/dev-java/java-sdk-docs/java-sdk-docs-1.6.0.10.ebuild
deleted file mode 100644
index dbb8ed09d316..000000000000
--- a/dev-java/java-sdk-docs/java-sdk-docs-1.6.0.10.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/java-sdk-docs/java-sdk-docs-1.6.0.10.ebuild,v 1.8 2010/05/13 20:28:33 nelchael Exp $
-
-ORIG_NAME="jdk-6u10-docs.zip"
-SRC_URI="jdk-6u10-docs.zip"
-DESCRIPTION="Sun's documentation bundle (including API) for Java SE"
-HOMEPAGE="http://java.sun.com/javase/6/docs/"
-LICENSE="sun-j2sl-6"
-SLOT="1.6.0"
-KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE=""
-DEPEND="app-arch/unzip"
-RDEPEND=""
-RESTRICT="fetch"
-
-DOWNLOAD_URL="https://cds.sun.com/is-bin/INTERSHOP.enfinity/WFS/CDS-CDS_Developer-Site/en_US/-/USD/ViewProductDetail-Start?ProductRef=jdk-6u10-docs-oth-JPR@CDS-CDS_Developer"
-S="${WORKDIR}/docs"
-
-pkg_nofetch() {
-	einfo "Please download ${ORIG_NAME} from "
-	einfo "${DOWNLOAD_URL}"
-	einfo "(select English and agree to the license) and place it in ${DISTDIR} named as"
-	einfo "${SRC_URI}. Because Sun changes the doc zip file"
-	einfo "without changing the filename, we have to resort to renaming to keep"
-	einfo "the md5sum verification working for existing and new downloads."
-	einfo ""
-	einfo "If emerge fails because of a md5sum error it is possible that Sun"
-	einfo "has again changed the upstream release, try downloading the file"
-	einfo "again or a newer revision if available. Otherwise report this to"
-	einfo "http://bugs.gentoo.org/67266 and we will make a new revision."
-}
-
-src_install(){
-	insinto /usr/share/doc/${P}/html
-	doins index.html
-
-	for i in *; do
-		[[ -d $i ]] && doins -r $i
-	done
-}
diff --git a/dev-java/java-sdk-docs/java-sdk-docs-1.6.0.18.ebuild b/dev-java/java-sdk-docs/java-sdk-docs-1.6.0.18.ebuild
deleted file mode 100644
index 9c495d8d5fac..000000000000
--- a/dev-java/java-sdk-docs/java-sdk-docs-1.6.0.18.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/java-sdk-docs/java-sdk-docs-1.6.0.18.ebuild,v 1.2 2010/05/13 20:28:33 nelchael Exp $
-
-ORIG_NAME="jdk-6u18-docs.zip"
-SRC_URI="jdk-6u18-docs.zip"
-DESCRIPTION="Sun's documentation bundle (including API) for Java SE"
-HOMEPAGE="http://java.sun.com/javase/6/docs/"
-LICENSE="sun-j2sl-6"
-SLOT="1.6.0"
-KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE=""
-DEPEND="app-arch/unzip"
-RDEPEND=""
-RESTRICT="fetch"
-
-DOWNLOAD_URL="https://cds.sun.com/is-bin/INTERSHOP.enfinity/WFS/CDS-CDS_Developer-Site/en_US/-/USD/ViewProductDetail-Start?ProductRef=jdk-6u18-docs-oth-JPR@CDS-CDS_Developer"
-S="${WORKDIR}/docs"
-
-pkg_nofetch() {
-	einfo "Please download ${ORIG_NAME} from "
-	einfo "${DOWNLOAD_URL}"
-	einfo "(select English and agree to the license) and place it in ${DISTDIR}"
-
-# It appears they at least bump the filename nowadays
-#	einfo "named as ${SRC_URI}. Because Sun changes the doc zip file"
-#	einfo "without changing the filename, we have to resort to renaming to keep"
-#	einfo "the md5sum verification working for existing and new downloads."
-#	einfo ""
-
-	einfo "If you find the file on the download page replaced with a higher"
-	einfo "version, please report to the bug 67266 (link below)."
-	einfo "If emerge fails because of a checksum error it is possible that"
-	einfo "the upstream release changed without renaming. Try downloading the file"
-	einfo "again (or a newer revision if available). Otherwise report this to"
-	einfo "http://bugs.gentoo.org/67266 and we will make a new revision."
-}
-
-src_install(){
-	insinto /usr/share/doc/${P}/html
-	doins index.html
-
-	for i in *; do
-		[[ -d $i ]] && doins -r $i
-	done
-}
diff --git a/dev-java/java-sdk-docs/java-sdk-docs-1.7.0.ebuild b/dev-java/java-sdk-docs/java-sdk-docs-1.7.0.ebuild
new file mode 100644
index 000000000000..bfa54c10ad1c
--- /dev/null
+++ b/dev-java/java-sdk-docs/java-sdk-docs-1.7.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/java-sdk-docs/java-sdk-docs-1.7.0.ebuild,v 1.1 2011/09/02 22:38:42 caster Exp $
+
+ORIG_NAME="jdk-7-fcs-bin-b147-apidocs-27_jun_2011.zip"
+SRC_URI="${ORIG_NAME}"
+
+DESCRIPTION="Oracle's documentation bundle (including API) for Java SE"
+HOMEPAGE="http://download.oracle.com/javase/7/docs/"
+LICENSE="oracle-java-documentation-7"
+SLOT="1.7"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+DEPEND="app-arch/unzip"
+RDEPEND=""
+RESTRICT="fetch"
+
+DOWNLOAD_URL="http://www.oracle.com/technetwork/java/javase/documentation/java-se-7-doc-download-435117.html"
+S="${WORKDIR}/docs"
+
+pkg_nofetch() {
+	einfo "Please download ${ORIG_NAME} from "
+	einfo "${DOWNLOAD_URL}"
+	einfo "(agree to the license) and place it in ${DISTDIR}"
+
+	einfo "If you find the file on the download page replaced with a higher"
+	einfo "version, please report to the bug 67266 (link below)."
+	einfo "If emerge fails because of a checksum error it is possible that"
+	einfo "the upstream release changed without renaming. Try downloading the file"
+	einfo "again (or a newer revision if available). Otherwise report this to"
+	einfo "http://bugs.gentoo.org/67266 and we will make a new revision."
+}
+
+src_install(){
+	insinto /usr/share/doc/${P}/html
+	doins index.html
+
+	for i in *; do
+		[[ -d $i ]] && doins -r $i
+	done
+}