Move 1.5 to java-overlay, update homepage, download link and license for 1.6.

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

3 files changed, 11 insertions, 50 deletions

diff --git a/dev-java/sun-jce-bin/ChangeLog b/dev-java/sun-jce-bin/ChangeLog
index e6b33f7ce467..fa3179401a20 100644
--- a/dev-java/sun-jce-bin/ChangeLog
+++ b/dev-java/sun-jce-bin/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/sun-jce-bin
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jce-bin/ChangeLog,v 1.9 2008/06/15 20:50:15 serkan Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jce-bin/ChangeLog,v 1.10 2011/09/08 12:02:23 caster Exp $
+
+  08 Sep 2011; Vlastimil Babka <caster@gentoo.org> -sun-jce-bin-1.5.0.ebuild,
+  sun-jce-bin-1.6.0.ebuild:
+  Move 1.5 to java-overlay, update homepage, download link and license for 1.6.
 
   15 Jun 2008; Serkan Kaba <serkan@gentoo.org> sun-jce-bin-1.5.0.ebuild,
   sun-jce-bin-1.6.0.ebuild:
diff --git a/dev-java/sun-jce-bin/sun-jce-bin-1.5.0.ebuild b/dev-java/sun-jce-bin/sun-jce-bin-1.5.0.ebuild
deleted file mode 100644
index a8e76ef0b856..000000000000
--- a/dev-java/sun-jce-bin/sun-jce-bin-1.5.0.ebuild
+++ /dev/null
@@ -1,43 +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/sun-jce-bin/sun-jce-bin-1.5.0.ebuild,v 1.7 2008/06/15 20:50:15 serkan Exp $
-
-jcefile="jce_policy-1_5_0.zip"
-
-S="${WORKDIR}/jdk${MY_PVL}"
-DESCRIPTION="Sun's J2SE Cryptographic extensions, version ${PV}"
-HOMEPAGE="http://java.sun.com/j2se/1.5.0/"
-SRC_URI="${jcefile}"
-SLOT="1.5"
-LICENSE="sun-bcla-java-vm"
-KEYWORDS="amd64 x86 ~x86-fbsd"
-RESTRICT="fetch"
-IUSE=""
-
-DEPEND="app-arch/unzip"
-RDEPEND=""
-
-FETCH_JCE="https://cds.sun.com/is-bin/INTERSHOP.enfinity/WFS/CDS-CDS_Developer-Site/en_US/-/USD/ViewProductDetail-Start?ProductRef=jce_policy-1.5.0-oth-JPR@CDS-CDS_Developer"
-
-pkg_nofetch() {
-	einfo "Please download ${jcefile} from:"
-	einfo ${FETCH_JCE}
-	einfo "Java(TM) Cryptography Extension (JCE) Unlimited Strength Jurisdiction Policy Files"
-	einfo "and move it to ${DISTDIR}"
-}
-
-src_unpack() {
-	if [ ! -r "${DISTDIR}"/${jcefile} ]; then
-		die "cannot read ${jcefile}. Please check the permission and try again."
-	fi
-}
-
-src_install() {
-
-	dodir /opt/${P}/jre/lib/security
-
-	cd "${D}"/opt/${P}/jre/lib/security
-	unzip "${DISTDIR}"/${jcefile} || die "failed to unzip jce"
-	mv jce unlimited-jce
-	dodir /opt/${P}/jre/lib/security/strong-jce
-}
diff --git a/dev-java/sun-jce-bin/sun-jce-bin-1.6.0.ebuild b/dev-java/sun-jce-bin/sun-jce-bin-1.6.0.ebuild
index e89e73106fd5..0e7f4aab0c3b 100644
--- a/dev-java/sun-jce-bin/sun-jce-bin-1.6.0.ebuild
+++ b/dev-java/sun-jce-bin/sun-jce-bin-1.6.0.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jce-bin/sun-jce-bin-1.6.0.ebuild,v 1.4 2008/06/15 20:50:15 serkan Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jce-bin/sun-jce-bin-1.6.0.ebuild,v 1.5 2011/09/08 12:02:23 caster Exp $
 
 jcefile="jce_policy-6.zip"
 
 DESCRIPTION="Java Cryptography Extension (JCE) Unlimited Strength Jurisdiction Policy Files ${PV}"
-HOMEPAGE="http://java.sun.com/javase/6/"
+HOMEPAGE="http://www.oracle.com/technetwork/java/javase/overview/index-jsp-136246.html"
 SRC_URI="${jcefile}"
 SLOT="1.6"
-LICENSE="sun-bcla-java-vm"
+LICENSE="Oracle-BCLA-JavaSE"
 KEYWORDS="amd64 x86 ~x86-fbsd"
 RESTRICT="fetch"
 IUSE=""
@@ -18,7 +18,7 @@ RDEPEND=""
 
 S="${WORKDIR}/jce"
 
-FETCH_JCE="https://cds.sun.com/is-bin/INTERSHOP.enfinity/WFS/CDS-CDS_Developer-Site/en_US/-/USD/ViewProductDetail-Start?ProductRef=jce_policy-6-oth-JPR@CDS-CDS_Developer"
+FETCH_JCE="http://www.oracle.com/technetwork/java/javase/downloads/jce-6-download-429243.html"
 
 pkg_nofetch() {
 	einfo "Please download ${jcefile} from:"