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

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

6 files changed, 18 insertions, 57 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/Manifest b/dev-java/java-sdk-docs/Manifest
index 176106f52bbb..9ce1ce6e3b89 100644
--- a/dev-java/java-sdk-docs/Manifest
+++ b/dev-java/java-sdk-docs/Manifest
@@ -1,10 +1,8 @@
 DIST j2sdk-1_4_2-doc.zip 34397778 RMD160 0c7646893ee73988327ebd97bf9ff6469c0bb7ff SHA1 498cbabb3cfa9e130dce1bed521effd7431ff3d7 SHA256 5d7ef04d1a9fa721f03eca7751f8eaaebd0de2d629ff90dc1a0d5628bc64ba58
 DIST jdk-1_5_0-doc-r1.zip 46191338 RMD160 d783f2175f84d76f867b7358705a2819be5afb68 SHA1 86e30770a4ecc395bf8fbaea1bdef4d2a81df877 SHA256 accb7b36442ac5bed7a3091abedf4e29ba06e23b541f4faa1d0632a3d02053cc
-DIST jdk-6-doc-r1.zip 54898268 RMD160 d23c95a90cbf92206499f2c73b2f66b61d8363da SHA1 e27ea67e6a1691cd01046804462bec79ec9440e8 SHA256 30df77761591681cbb259dce028a728926813fcd18e7f87ad9631f64fe7f08bd
 DIST jdk-6u10-docs.zip 58890428 RMD160 c01d0a80f606ee59f70525e723814f38b2c53e4b SHA1 5390e7dbb566b0fa8cc491bdf102fe5a53e483cf SHA256 429e805af7d8c01f357e3ae2c600a0913b17f207b35f7f9f3b22cdcea6476481
-EBUILD java-sdk-docs-1.4.2.ebuild 867 RMD160 b65d0d3f905d420298af9b1e59263a44d79b3c6f SHA1 64f6f25cf8f9143efb9ac643c97c6642e7540742 SHA256 4748dd12bda22e721ba7a1661da18c82620e7bfae98c9a984e4a6865b0769e99
-EBUILD java-sdk-docs-1.5.0-r1.ebuild 1571 RMD160 c8a9ea3333fa6488712a690249d417a250227f79 SHA1 2109cbaadcafcc11fff94f66dfaccc284bc7d2fb SHA256 90679ce7bc09568f67351837bdd52134bf3a59b58c4326a62f1e6136ffb32acb
-EBUILD java-sdk-docs-1.6.0-r1.ebuild 1564 RMD160 366f8996b954e7987a3632464bc51324c7906b15 SHA1 8408f94e3e05e6818d5fa0b0cc682471a2822dc6 SHA256 9498022e7bfedcc118bc7db76c9603decfc32b2f15bf9ebaa49cc90d5ac2da97
-EBUILD java-sdk-docs-1.6.0.10.ebuild 1550 RMD160 868f3207e8cbec5a76a691d16eb554c3c323fb50 SHA1 9384a5a597c325852d61f660f39b269fa0558f8b SHA256 799cf2f8cf2b55202a8896405accb34073c07d795ff7d5257ff7a572a2d62e51
-MISC ChangeLog 9312 RMD160 552ee42d5cb3b37c0d359794f054ce28d1a143e9 SHA1 2cefa37a616ea74ccc18cc3ede3ac8ee7e9e5ee3 SHA256 b3f0c6d742b1f02bd4780232fb432471fe366a4d28e2ddb4d89ebe7be4b0828e
+EBUILD java-sdk-docs-1.4.2.ebuild 886 RMD160 4399350bc73201bdd7802acfbe4009a70aa78772 SHA1 97922217b405748ce1dd29d154bc863546c8224b SHA256 09d1b90444fc7dac7d0d536a67380125b28a6fbb95173c156f370058b7e43f30
+EBUILD java-sdk-docs-1.5.0-r1.ebuild 1584 RMD160 b9a20a5a4c9c6b0fd35f2f18d9a3c11fefabb7e2 SHA1 cbdf80b3e8c0f6ec32dc0058fe6555aab6769a66 SHA256 2cd389433a0a46ea3a46ea04290fc5163a85a40545a4aaa9507dbde4755581a8
+EBUILD java-sdk-docs-1.6.0.10.ebuild 1539 RMD160 b33468051db1a8c9d868dcf5bbecbcaab517d31b SHA1 ec04fb72fcb2fb46ebcf5412e1949db0596f7ec8 SHA256 769d1144e29f14ed4aeb8e5b744faa620ff998f64635703fab1a10672faaddcd
+MISC ChangeLog 9560 RMD160 f6614dbf341f6856752593ef16f06f93b80e1237 SHA1 b37116cdfd0c499bc50397bd07d63cebcdb0d12d SHA256 51aca38d1b6735f1dff83674a85fe8cfb08147f9dc6e2eb0bc4b74e00ed63277
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
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"