diff options
| author |   Vlastimil Babka <caster@gentoo.org> | 2010-01-23 22:23:07 +0000 |
|---|---|---|
| committer | Vlastimil Babka <caster@gentoo.org> | 2010-01-23 22:23:07 +0000 |
| commit | e5f3c1783886090063013c79d94c8b8939ecafb3 (patch) | |
| tree | 9d41cb3bc24fe97156b5ec8d8e7d133db0428d9b /dev-java | |
| parent | Add jce also to RDEPEND, as pointed out by Amit Dor-Shifer <amitds@oversi.com>. (diff) | |
| download | gentoo-2-e5f3c1783886090063013c79d94c8b8939ecafb3.tar.gz gentoo-2-e5f3c1783886090063013c79d94c8b8939ecafb3.tar.bz2 gentoo-2-e5f3c1783886090063013c79d94c8b8939ecafb3.zip | |
Add jce USE flag same as sun-jdk has, as suggested by Amit Dor-Shifer <amitds@oversi.com>.
(Portage version: 2.2_rc61/cvs/Linux x86_64)
Diffstat (limited to 'dev-java')
| -rw-r--r-- | dev-java/sun-jre-bin/ChangeLog | 7 | ||||
| -rw-r--r-- | dev-java/sun-jre-bin/metadata.xml | 3 | ||||
| -rw-r--r-- | dev-java/sun-jre-bin/sun-jre-bin-1.6.0.18.ebuild | 20 |
3 files changed, 25 insertions, 5 deletions
diff --git a/dev-java/sun-jre-bin/ChangeLog b/dev-java/sun-jre-bin/ChangeLog index 3e6918e5200e..995ae02083fb 100644 --- a/dev-java/sun-jre-bin/ChangeLog +++ b/dev-java/sun-jre-bin/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-java/sun-jre-bin # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/ChangeLog,v 1.166 2010/01/21 12:54:47 caster Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/ChangeLog,v 1.167 2010/01/23 22:23:07 caster Exp $ + + 23 Jan 2010; Vlastimil Babka <caster@gentoo.org> + sun-jre-bin-1.6.0.18.ebuild, metadata.xml: + Add jce USE flag same as sun-jdk has, as suggested by Amit Dor-Shifer + <amitds@oversi.com>. *sun-jre-bin-1.6.0.18 (21 Jan 2010) diff --git a/dev-java/sun-jre-bin/metadata.xml b/dev-java/sun-jre-bin/metadata.xml index bc8868ff2994..2cd8ee0ff34f 100644 --- a/dev-java/sun-jre-bin/metadata.xml +++ b/dev-java/sun-jre-bin/metadata.xml @@ -3,4 +3,7 @@ <pkgmetadata> <herd>java</herd> <longdescription>Sun Java Resource Package, also known as J2SE</longdescription> + <use> + <flag name="jce">Enable Java Cryptographic Extension Unlimited Strength Policy files</flag> + </use> </pkgmetadata> diff --git a/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.18.ebuild b/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.18.ebuild index 52f4d4de69bd..b26a2383995d 100644 --- a/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.18.ebuild +++ b/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.18.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.18.ebuild,v 1.1 2010/01/21 12:54:47 caster Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.18.ebuild,v 1.2 2010/01/23 22:23:07 caster Exp $ inherit versionator pax-utils eutils java-vm-2 @@ -21,9 +21,11 @@ SLOT="1.6" LICENSE="dlj-1.1" KEYWORDS="-* ~amd64 ~x86" RESTRICT="strip" -IUSE="X alsa nsplugin odbc" +IUSE="X alsa jce nsplugin odbc" -RDEPEND="sys-libs/glibc +DEPEND="jce? ( =dev-java/sun-jce-bin-1.6.0* )" +RDEPEND="${DEPEND} + sys-libs/glibc x86? ( =virtual/libstdc++-3.3 ) alsa? ( media-libs/alsa-lib ) X? ( @@ -35,7 +37,6 @@ RDEPEND="sys-libs/glibc x11-libs/libX11 ) odbc? ( dev-db/unixODBC )" -DEPEND="" JAVA_PROVIDE="jdbc-stdext jdbc-rowset" @@ -79,6 +80,17 @@ src_install() { dohtml Welcome.html || die dodir /opt/${P}/share/ + if use jce; then + cd "${D}/opt/${P}/lib/security" + dodir /opt/${P}/lib/security/strong-jce + mv "${D}"/opt/${P}/lib/security/US_export_policy.jar \ + "${D}"/opt/${P}/lib/security/strong-jce || die + mv "${D}"/opt/${P}/lib/security/local_policy.jar \ + "${D}"/opt/${P}/lib/security/strong-jce || die + dosym /opt/sun-jce-bin-1.6.0/jre/lib/security/unlimited-jce/US_export_policy.jar /opt/${P}/lib/security/ + dosym /opt/sun-jce-bin-1.6.0/jre/lib/security/unlimited-jce/local_policy.jar /opt/${P}/lib/security/ + fi + if use nsplugin; then local plugin_dir="ns7-gcc29" if has_version '>=sys-devel/gcc-3' ; then |