Remove old versions, remove version from DESCRIPTION - bug #186276.

(Portage version: 2.2_rc33/cvs/Linux x86_64)

5 files changed, 14 insertions, 51 deletions

diff --git a/dev-java/java-sdk-docs/ChangeLog b/dev-java/java-sdk-docs/ChangeLog
index d541cce2a6cf..74265e502425 100644
--- a/dev-java/java-sdk-docs/ChangeLog
+++ b/dev-java/java-sdk-docs/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/java-sdk-docs
-# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/java-sdk-docs/ChangeLog,v 1.66 2009/04/27 00:01:38 ranger Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/java-sdk-docs/ChangeLog,v 1.67 2009/05/29 20:51:48 caster Exp $
+
+  29 May 2009; Vlastimil Babka <caster@gentoo.org>
+  java-sdk-docs-1.4.2.ebuild, java-sdk-docs-1.5.0-r1.ebuild,
+  -java-sdk-docs-1.6.0-r1.ebuild, java-sdk-docs-1.6.0.10.ebuild:
+  Remove old versions, remove version from DESCRIPTION - bug #186276.
 
   26 Apr 2009; Brent Baude <ranger@gentoo.org>
   java-sdk-docs-1.6.0.10.ebuild:
diff --git a/dev-java/java-sdk-docs/java-sdk-docs-1.4.2.ebuild b/dev-java/java-sdk-docs/java-sdk-docs-1.4.2.ebuild
index b4c1b2c8f911..329aa02f0442 100644
--- a/dev-java/java-sdk-docs/java-sdk-docs-1.4.2.ebuild
+++ b/dev-java/java-sdk-docs/java-sdk-docs-1.4.2.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2009 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.4.2.ebuild,v 1.23 2009/03/02 18:50:18 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/java-sdk-docs/java-sdk-docs-1.4.2.ebuild,v 1.24 2009/05/29 20:51:48 caster Exp $
 
 At="j2sdk-1_4_2-doc.zip"
 S="${WORKDIR}/docs"
 SRC_URI="j2sdk-1_4_2-doc.zip"
-DESCRIPTION="Javadoc for Java SDK version 1.4.2"
+DESCRIPTION="Sun's documentation bundle (including API) for Java SE"
 HOMEPAGE="http://java.sun.com/j2se/1.4.2/download.html"
 LICENSE="sun-j2sl"
 SLOT="1.4.2"
diff --git a/dev-java/java-sdk-docs/java-sdk-docs-1.5.0-r1.ebuild b/dev-java/java-sdk-docs/java-sdk-docs-1.5.0-r1.ebuild
index aedc48d893d5..f963a428392a 100644
--- a/dev-java/java-sdk-docs/java-sdk-docs-1.5.0-r1.ebuild
+++ b/dev-java/java-sdk-docs/java-sdk-docs-1.5.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 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.5.0-r1.ebuild,v 1.10 2008/05/20 14:36:58 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/java-sdk-docs/java-sdk-docs-1.5.0-r1.ebuild,v 1.11 2009/05/29 20:51:48 caster Exp $
 
 SRC_URI="jdk-1_5_0-doc-${PR}.zip"
-DESCRIPTION="Javadoc for Java SDK version 1.5.0 Beta 2"
+DESCRIPTION="Sun's documentation bundle (including API) for Java SE"
 HOMEPAGE="http://java.sun.com/j2se/1.5.0/"
 LICENSE="sun-j2sl"
 SLOT="1.5.0"
diff --git a/dev-java/java-sdk-docs/java-sdk-docs-1.6.0-r1.ebuild b/dev-java/java-sdk-docs/java-sdk-docs-1.6.0-r1.ebuild
deleted file mode 100644
index 1dfd0f623fbb..000000000000
--- a/dev-java/java-sdk-docs/java-sdk-docs-1.6.0-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2008 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-r1.ebuild,v 1.11 2008/05/20 14:36:58 caster Exp $
-
-ORIG_NAME="jdk-6-doc.zip"
-SRC_URI="jdk-6-doc-${PR}.zip"
-DESCRIPTION="Documentation (including API Javadocs) for Java SDK version ${PV}"
-HOMEPAGE="http://java.sun.com/javase/6/docs/"
-LICENSE="sun-j2sl-6"
-SLOT="1.6.0"
-KEYWORDS="amd64 ppc ppc64 x86"
-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-6-doc-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 licence) and place it in ${DISTDIR} named as"
-	einfo "${SRC_URI}. Notice the ${PR}. 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.10.ebuild b/dev-java/java-sdk-docs/java-sdk-docs-1.6.0.10.ebuild
index 4e65ef143377..d186a8badce8 100644
--- 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
@@ -1,10 +1,10 @@
 # Copyright 1999-2009 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.5 2009/04/27 00:01:38 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/java-sdk-docs/java-sdk-docs-1.6.0.10.ebuild,v 1.6 2009/05/29 20:51:48 caster Exp $
 
 ORIG_NAME="jdk-6u10-docs.zip"
 SRC_URI="jdk-6u10-docs.zip"
-DESCRIPTION="Documentation (including API Javadocs) for Java SDK version ${PV}"
+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"