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

Package-Manager: portage-2.2.0_alpha51/cvs/Linux x86_64

4 files changed, 13 insertions, 64 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/Manifest b/dev-java/sun-jce-bin/Manifest
index 34a4ea4baa1c..085ee266cf13 100644
--- a/dev-java/sun-jce-bin/Manifest
+++ b/dev-java/sun-jce-bin/Manifest
@@ -1,16 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-DIST jce_policy-1_5_0.zip 8826 RMD160 eb12d0333c3ddbbba57a0e825a6891a75ec485c0 SHA1 f0e887b91b4499142285633e65c5710c3a133a16 SHA256 4de78da737c6d66b74eb6caebf6bdb0648825a95e2909e815678a0d306bf6d8b
 DIST jce_policy-6.zip 9101 RMD160 6f45ce5f3c067e186554f79b3f1a61e4d7d22aae SHA1 7b1b021bd63152b93a16c96bb3a64f0e685fc425 SHA256 d0c2258c3364120b4dbf7dd1655c967eee7057ac6ae6334b5ea8ceb8bafb9262
-EBUILD sun-jce-bin-1.5.0.ebuild 1290 RMD160 ee913661669be1540ca7f96ef3834b6ee368e049 SHA1 e41aa9ed273b2fd05e6476666bbf10d661afe6e4 SHA256 2806bd1dbed9b57713e9cd5c89fa776d8724eba911cf6e7c58a8574eb977adf4
-EBUILD sun-jce-bin-1.6.0.ebuild 1243 RMD160 82dfa4c9b407494fe956aba4aba1a85223b7cab1 SHA1 8b1a568f4fa46c87d7f881f980aff4cb430bb88c SHA256 a96065501b2e0db2355d9477b43995a84b08b91652ee5cb46ee9c9b9321f2d3b
-MISC ChangeLog 1513 RMD160 c8600cb822c9ce356007723823c9741be9fb53a3 SHA1 66aee868bc9a44997f28160b7d50681fac47a486 SHA256 69f9b8ec8b41670764dca97c79650552789ce7af2cb2e01682a3eed551422d11
+EBUILD sun-jce-bin-1.6.0.ebuild 1216 RMD160 d067031c0ee2ca6e39d55342a660af0638dc0663 SHA1 40a9ff76e56096226e0858d97ae2f31a29939d6f SHA256 342499c24a9d1ac829486aa50b71765fe4159137f76771166f5ec8812a0b298d
+MISC ChangeLog 1701 RMD160 2d9f0a4d826c248708c8f9e9075343a0ff7a1827 SHA1 23c9cd86326f0c2922e6d7912752cd6790f62aa8 SHA256 593066283f211cb8ec6eb8536445a53fdb14485774c8cdbb2b6ffd5262dd1c63
 MISC metadata.xml 158 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 SHA1 77cd509a8b3c377b9a24480b48a5d5481b7874f1 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkhVgJEACgkQRh6X64ivZaIPJACffhHhqbfAu2RSSGvvqB9pSJOs
-lwEAn03xDgyKzis97pXog1TpwwoM15BC
-=6vYF
------END PGP SIGNATURE-----
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:"