Bump, bug #67266

(Portage version: 2.1.11.52/cvs/Linux x86_64, signed Manifest commit with key 3C5CF75A)

5 files changed, 20 insertions, 130 deletions

diff --git a/dev-java/java-sdk-docs/ChangeLog b/dev-java/java-sdk-docs/ChangeLog
index cc85ca3d4293..724187c6654c 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-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/java-sdk-docs/ChangeLog,v 1.88 2013/02/14 13:14:36 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/java-sdk-docs/ChangeLog,v 1.89 2013/03/10 12:07:03 sera Exp $
+
+*java-sdk-docs-1.7.0.17 (10 Mar 2013)
+
+  10 Mar 2013; Ralph Sennhauser <sera@gentoo.org> -java-sdk-docs-1.7.0.ebuild,
+  -java-sdk-docs-1.7.0.2.ebuild, -java-sdk-docs-1.7.0.4.ebuild,
+  -java-sdk-docs-1.7.0.6.ebuild, +java-sdk-docs-1.7.0.17.ebuild:
+  Bump, bug #67266
 
   14 Feb 2013; Agostino Sarubbo <ago@gentoo.org> java-sdk-docs-1.7.0.11.ebuild:
   Stable for x86, wrt bug #455174
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.17.ebuild
index bfa54c10ad1c..1597882df258 100644
--- 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.17.ebuild
@@ -1,21 +1,27 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2013 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 $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/java-sdk-docs/java-sdk-docs-1.7.0.17.ebuild,v 1.1 2013/03/10 12:07:03 sera Exp $
 
-ORIG_NAME="jdk-7-fcs-bin-b147-apidocs-27_jun_2011.zip"
-SRC_URI="${ORIG_NAME}"
+EAPI=5
+
+inherit versionator
+
+DOWNLOAD_URL="http://www.oracle.com/technetwork/java/javase/documentation/java-se-7-doc-download-435117.html"
+ORIG_NAME="jdk-7u$(get_version_component_range 4)-apidocs.zip"
 
 DESCRIPTION="Oracle's documentation bundle (including API) for Java SE"
 HOMEPAGE="http://download.oracle.com/javase/7/docs/"
+SRC_URI="${ORIG_NAME}"
+
 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() {
diff --git a/dev-java/java-sdk-docs/java-sdk-docs-1.7.0.2.ebuild b/dev-java/java-sdk-docs/java-sdk-docs-1.7.0.2.ebuild
deleted file mode 100644
index 11cd2014e745..000000000000
--- a/dev-java/java-sdk-docs/java-sdk-docs-1.7.0.2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2012 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.2.ebuild,v 1.2 2012/02/18 15:05:43 phajdan.jr Exp $
-
-ORIG_NAME="jdk-7u2-apidocs.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
-}
diff --git a/dev-java/java-sdk-docs/java-sdk-docs-1.7.0.4.ebuild b/dev-java/java-sdk-docs/java-sdk-docs-1.7.0.4.ebuild
deleted file mode 100644
index fa9cc985b9f7..000000000000
--- a/dev-java/java-sdk-docs/java-sdk-docs-1.7.0.4.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2012 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.4.ebuild,v 1.2 2012/07/09 07:12:15 jdhore Exp $
-
-ORIG_NAME="jdk-7u4-apidocs.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
-}
diff --git a/dev-java/java-sdk-docs/java-sdk-docs-1.7.0.6.ebuild b/dev-java/java-sdk-docs/java-sdk-docs-1.7.0.6.ebuild
deleted file mode 100644
index 987ec04eaf1c..000000000000
--- a/dev-java/java-sdk-docs/java-sdk-docs-1.7.0.6.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2012 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.6.ebuild,v 1.1 2012/08/23 20:31:41 caster Exp $
-
-ORIG_NAME="jdk-7u6-apidocs.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
-}