[gentoo-commits] repo/gentoo:master commit in: dev-java/rhino/files/, dev-java/rhino/

[Patrice Clement]

commit:     d53ff204309b1e75190277f93c2eaeea0b4a64a0
Author:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 28 21:00:47 2015 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Wed Oct 28 21:08:41 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d53ff204

dev-java/rhino: Clean up old.

Package-Manager: portage-2.2.20.1
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>

 dev-java/rhino/Manifest                           |  3 -
 dev-java/rhino/files/00_dont-fetch-swing-ex.patch | 10 ---
 dev-java/rhino/files/1.5.5_jdk15.patch            | 23 ------
 dev-java/rhino/files/public-NativeScript.patch    | 11 ---
 dev-java/rhino/files/rhino-1.6-noget.patch        | 12 ---
 dev-java/rhino/rhino-1.6.5.ebuild                 | 61 --------------
 dev-java/rhino/rhino-1.7.2-r2.ebuild              | 63 ---------------
 dev-java/rhino/rhino-1.7.7.ebuild                 | 98 -----------------------
 8 files changed, 281 deletions(-)

diff --git a/dev-java/rhino/Manifest b/dev-java/rhino/Manifest
index 69f4fab..3fc41b1 100644
--- a/dev-java/rhino/Manifest
+++ b/dev-java/rhino/Manifest
@@ -1,4 +1 @@
 DIST Rhino1_7_7_RELEASE.zip 6059127 SHA256 0ef505aee093c690025c4484ce108b6e735e05baa3181bb56fdec4cb6b8b0107 SHA512 ce89b6a153d62dd459a86360c67d6db4b05922d8ab49a8d45ccb0deb0f639cd819f0ad75cb4929eda6b7f0fd6ddb5879a4035de6968283317bfd0e93d2bb744e WHIRLPOOL 0f54840077e46a6ac31e23784b3c13881a774356df14274fc9ffdf93eb3d7b92e8666630d8e51494931819a609a971bb6744cf961c2c168bb94b4e42d3eb0896
-DIST rhino-swing-ex-1.0.zip 19708 SHA256 062837ddb18951ace41ba0050aec95a690c00190a6218e5c9591c381035dfa7d SHA512 f2c1f970595cb08ac301d2fc21e0a2f1090b2007c849d993094ef3215a39456a5865bcaaf9424da93a09d6f0d151be6ec77f844bde2540d725c85c4b54a5f248 WHIRLPOOL 4dd40c1c80a70cd08584ac44abd3b42a790080f93449da8e241ed568ff5b3a5ac6cef12951632eba91547845be49401102d072b05a83a3ed78705acd768b1ced
-DIST rhino1_6R5.zip 1822832 SHA256 02a4f17121f148c94ac65fb6d9eb4a817ce86c378c96cc94e9fc1b087b34526f SHA512 bd10b2e687925e06a5a4da5bc0e29a65cff08fc26792e3183f2ab28efb71efcdbc2fb08142be2fd2622c0b94dfa2691ce898ba847935def780e8686a879720f0 WHIRLPOOL 5fda95c5a99a6e99322a81fda513135cece56df0c7d17efcaea0b5f9f8f63b3adccd47bf30f26521b36e33f34e642e05107d7e0f202b8d532356884954d01049
-DIST rhino1_7R2.zip 2996867 SHA256 677f7dc1b67a1587bc03974d5f0720474a56b8f29835e1d860739908df8462dc SHA512 e4472e11377e93b64df3a2a9f266956d86ba78c85ceba57ff05c983d577143351fcbbbc0b63f7034718fd74c13a9e50bac6e8813f320b86fcd09b571e919b858 WHIRLPOOL 546f9a0e565881dd6128e000ca8c8e017cf7432e40df885268c4827e2dbd28f86cde37dbc7284bd1b08b062060eca1465716f850dbd54f176ead475b4b55351d

diff --git a/dev-java/rhino/files/00_dont-fetch-swing-ex.patch b/dev-java/rhino/files/00_dont-fetch-swing-ex.patch
deleted file mode 100644
index 9949751..0000000
--- a/dev-java/rhino/files/00_dont-fetch-swing-ex.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- toolsrc/build.xml	2004-03-25 15:54:34.000000000 +0100
-+++ toolsrc/build-patch.xml	2004-06-19 23:48:07.225123288 +0200
-@@ -20,7 +20,6 @@
-     <!-- Download source from Sun's site, unzip it, remove
-          the files we don't need, and change the package
-     -->
--    <get src="http://java.sun.com/products/jfc/tsc/articles/treetable2/downloads/src.zip" dest="${nest}/${build.dir}/swingExSrc.zip"/>
-     <unzip src="${nest}/${build.dir}/swingExSrc.zip" dest="${src.debugger}"/>
-     <delete file="${src.debugger}/FileSystemModel2.java" />
-     <delete file="${src.debugger}/MergeSort.java" />

diff --git a/dev-java/rhino/files/1.5.5_jdk15.patch b/dev-java/rhino/files/1.5.5_jdk15.patch
deleted file mode 100644
index 0948921..0000000
--- a/dev-java/rhino/files/1.5.5_jdk15.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -urpN rhino1_5R5.old/toolsrc/org/mozilla/javascript/tools/shell/JavaPolicySecurity.java rhino1_5R5/toolsrc/org/mozilla/javascript/tools/shell/JavaPolicySecurity.java
---- rhino1_5R5.old/toolsrc/org/mozilla/javascript/tools/shell/JavaPolicySecurity.java	2004-03-25 15:54:34.000000000 +0100
-+++ rhino1_5R5/toolsrc/org/mozilla/javascript/tools/shell/JavaPolicySecurity.java	2005-02-01 13:58:26.521223264 +0100
-@@ -124,7 +124,7 @@ public class JavaPolicySecurity extends 
- 
-     public JavaPolicySecurity() {
-         // To trigger error on jdk-1.1 with lazy load
--        new CodeSource(null, null);
-+        new CodeSource(null, (java.security.cert.Certificate[])null);
-     }
- 
-     protected void callProcessFileSecure(final Context cx,
-@@ -167,8 +167,8 @@ public class JavaPolicySecurity extends 
-     }
- 
-     private ProtectionDomain getUrlDomain(URL url) {
--        CodeSource cs = new CodeSource(url, null);
--        PermissionCollection pc = Policy.getPolicy().getPermissions(cs);
-+        CodeSource cs = new CodeSource(url, (java.security.cert.Certificate[])null);
-+	PermissionCollection pc = Policy.getPolicy().getPermissions(cs);
-         return new ProtectionDomain(cs, pc);
-     }
- 

diff --git a/dev-java/rhino/files/public-NativeScript.patch b/dev-java/rhino/files/public-NativeScript.patch
deleted file mode 100644
index 026bced..0000000
--- a/dev-java/rhino/files/public-NativeScript.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- rhino1_5R5/src/org/mozilla/javascript/NativeScript.java.orig	2006-05-31 14:01:06.000000000 +0200
-+++ rhino1_5R5/src/org/mozilla/javascript/NativeScript.java	2006-05-31 14:03:37.000000000 +0200
-@@ -55,7 +55,7 @@
-  * @author Norris Boyd
-  */
- 
--class NativeScript extends NativeFunction implements Script
-+public class NativeScript extends NativeFunction implements Script
- {
- 
-     static void init(Context cx, Scriptable scope, boolean sealed)

diff --git a/dev-java/rhino/files/rhino-1.6-noget.patch b/dev-java/rhino/files/rhino-1.6-noget.patch
deleted file mode 100644
index 2350914..0000000
--- a/dev-java/rhino/files/rhino-1.6-noget.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/toolsrc/org/mozilla/javascript/tools/debugger/build.xml b/toolsrc/org/mozilla/javascript/tools/debugger/build.xml
-index 7ed0236..5f7db6e 100644
---- a/toolsrc/org/mozilla/javascript/tools/debugger/build.xml
-+++ b/toolsrc/org/mozilla/javascript/tools/debugger/build.xml
-@@ -47,7 +47,6 @@
-          the files we don't need, and change the package
-     -->
-     <mkdir dir="downloaded"/>
--    <get src="${swing-ex-url}" dest="downloaded/swingExSrc.zip"/>
-     <unzip src="downloaded/swingExSrc.zip" dest="downloaded/">
-       <patternset>
-           <include name="AbstractCellEditor.java"/>

diff --git a/dev-java/rhino/rhino-1.6.5.ebuild b/dev-java/rhino/rhino-1.6.5.ebuild
deleted file mode 100644
index 4c59f25..0000000
--- a/dev-java/rhino/rhino-1.6.5.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-JAVA_PKG_IUSE="doc examples source"
-inherit java-pkg-2 java-ant-2 eutils versionator
-
-MY_P="${PN}$(replace_version_separator 1 _ $(replace_version_separator 2 R))"
-
-DESCRIPTION="An open-source implementation of JavaScript written in Java"
-SRC_URI="ftp://ftp.mozilla.org/pub/mozilla.org/js/${MY_P}.zip
-	mirror://gentoo/rhino-swing-ex-1.0.zip"
-HOMEPAGE="http://www.mozilla.org/rhino/"
-# dual license for rhino and BSD-2 for the swing-ex from Sun's tutorial
-LICENSE="|| ( MPL-1.1 GPL-2 ) BSD-2"
-SLOT="1.6"
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos"
-IUSE=""
-
-S="${WORKDIR}/${MY_P}"
-
-CDEPEND="=dev-java/xml-xmlbeans-1*"
-RDEPEND=">=virtual/jre-1.4
-	${CDEPEND}"
-DEPEND=">=virtual/jdk-1.4
-	app-arch/unzip
-	${CDEPEND}"
-
-src_unpack() {
-	unpack ${MY_P}.zip
-	cd "${S}"
-
-	# don't download src.zip from Sun
-	epatch "${FILESDIR}/rhino-1.6-noget.patch"
-
-	rm -v *.jar || die
-	rm -rf docs/apidocs || die
-
-	local dir="toolsrc/org/mozilla/javascript/tools/debugger/downloaded"
-	mkdir ${dir} || die
-	cp "${DISTDIR}/rhino-swing-ex-1.0.zip" ${dir}/swingExSrc.zip || die
-
-	mkdir lib/ && cd lib/ || die
-	java-pkg_jar-from xml-xmlbeans-1 xbean.jar
-}
-
-src_install() {
-	java-pkg_dojar build/${MY_P}/js.jar
-
-	java-pkg_dolauncher jsscript-${SLOT} \
-		--main org.mozilla.javascript.tools.shell.Main
-
-	if use doc; then
-		local dir="build/${MY_P}/docs"
-		mv "${dir}"/{apidocs,api} || die
-		java-pkg_dohtml -r "${dir}"/*
-		dosym /usr/share/doc/${PF}/html/{api,apidocs} || die
-	fi
-	use examples && java-pkg_doexamples examples
-	use source && java-pkg_dosrc {src,toolsrc,xmlimplsrc}/org
-}

diff --git a/dev-java/rhino/rhino-1.7.2-r2.ebuild b/dev-java/rhino/rhino-1.7.2-r2.ebuild
deleted file mode 100644
index b6e779c..0000000
--- a/dev-java/rhino/rhino-1.7.2-r2.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="1"
-JAVA_PKG_IUSE="doc examples source"
-inherit java-pkg-2 java-ant-2 eutils versionator
-
-MY_P="${PN}$(replace_version_separator 1 _ $(replace_version_separator 2 R))"
-
-DESCRIPTION="An open-source implementation of JavaScript written in Java"
-SRC_URI="ftp://ftp.mozilla.org/pub/mozilla.org/js/${MY_P}.zip
-	mirror://gentoo/rhino-swing-ex-1.0.zip"
-HOMEPAGE="http://www.mozilla.org/rhino/"
-# dual license for rhino and BSD-2 for the swing-ex from Sun's tutorial
-LICENSE="|| ( MPL-1.1 GPL-2 ) BSD-2"
-SLOT="1.6"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
-
-S="${WORKDIR}/${MY_P}"
-
-CDEPEND="=dev-java/xml-xmlbeans-1*"
-RDEPEND=">=virtual/jre-1.5
-	${CDEPEND}"
-DEPEND=">=virtual/jdk-1.5
-	app-arch/unzip
-	${CDEPEND}"
-
-src_unpack() {
-	unpack ${MY_P}.zip
-	cd "${S}"
-
-	# don't download src.zip from Sun
-	epatch "${FILESDIR}/rhino-1.6-noget.patch"
-
-	rm -v *.jar || die
-	rm -rf docs/apidocs || die
-
-	local dir="toolsrc/org/mozilla/javascript/tools/debugger/downloaded"
-	mkdir ${dir} || die
-	cp "${DISTDIR}/rhino-swing-ex-1.0.zip" ${dir}/swingExSrc.zip || die
-
-	mkdir lib/ && cd lib/ || die
-	java-pkg_jar-from xml-xmlbeans-1 xbean.jar
-
-	# Stop downloading of deps
-	cd "${S}"
-	mkdir -p build/tmp-xbean
-	touch build/tmp-xbean/xbean.zip
-	touch lib/jsr173_1.0_api.jar
-}
-
-src_install() {
-	java-pkg_dojar build/${MY_P}/js.jar
-
-	java-pkg_dolauncher jsscript-${SLOT} \
-		--main org.mozilla.javascript.tools.shell.Main
-
-	use doc && java-pkg_dojavadoc "build/${MY_P}/javadoc"
-	use examples && java-pkg_doexamples examples
-	use source && java-pkg_dosrc {src,toolsrc,xmlimplsrc}/org
-}

diff --git a/dev-java/rhino/rhino-1.7.7.ebuild b/dev-java/rhino/rhino-1.7.7.ebuild
deleted file mode 100644
index 9a61bd7..0000000
--- a/dev-java/rhino/rhino-1.7.7.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-JAVA_PKG_IUSE="doc examples source test"
-inherit java-pkg-2 java-ant-2 versionator
-
-# rhino -> Rhino
-MY_PN="${PN^}"
-
-# 1.7.7 -> 1_7_7
-MY_PV="$(replace_all_version_separators _ ${PV})"
-
-# rhino1.7.7
-MY_P="${PN}${PV}"
-
-# Rhino1_7_7_RELEASE
-MY_RELEASE="${MY_PN}${MY_PV}_RELEASE"
-
-DESCRIPTION="An open-source implementation of JavaScript written in Java"
-SRC_URI="https://github.com/mozilla/${PN}/archive/${MY_RELEASE}.zip"
-HOMEPAGE="http://www.mozilla.org/rhino/"
-
-LICENSE="MPL-1.1 GPL-2"
-SLOT="1.7"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-# ../rhino-Rhino1_7_7_RELEASE
-S="${WORKDIR}/${PN}-${MY_RELEASE}"
-
-CDEPEND=""
-RDEPEND=">=virtual/jre-1.6
-	${CDEPEND}"
-DEPEND=">=virtual/jdk-1.6
-	test? (
-		dev-java/emma:0
-		dev-java/junit:4
-		dev-java/ant-junit:0
-		dev-java/hamcrest-core:1.3
-	)
-	${CDEPEND}"
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-testsrc-build.xml.patch
-)
-
-EANT_TEST_TARGET="junit"
-
-# StackOverFlow errors arise on some tests.
-# Further, the test suite takes way too much time (> 5 min).
-# Maybe reduce the numbers of tests?
-RESTRICT="test"
-
-java_prepare() {
-	find . \
-		-type f \
-		-name \*.jar \
-		-print \
-		-exec rm -v {} \; || die "Couldn't delete bundled jar files."
-
-	epatch ${PATCHES[@]}
-
-	if use test; then
-		mkdir lib || die
-		java-pkg_jar-from --build-only emma emma.jar lib/emma.jar
-		java-pkg_jar-from --build-only emma emma_ant.jar lib/emma_ant.jar
-		java-pkg_jar-from --build-only hamcrest-core-1.3 hamcrest-core.jar lib/hamcrest.jar
-		java-pkg_jar-from --build-only junit-4 junit.jar lib/junit.jar
-	fi
-}
-
-src_compile() {
-	java-pkg-2_src_compile
-
-	if use source; then
-		EANT_BUILD_TARGET="source-zip" \
-			java-pkg-2_src_compile
-	fi
-}
-
-src_test() {
-	java-pkg-2_src_test
-}
-
-src_install() {
-	java-pkg_dojar build/${MY_P}/js.jar
-
-	java-pkg_dolauncher jsscript-${SLOT} \
-		--main org.mozilla.javascript.tools.shell.Main
-
-	use doc && java-pkg_dojavadoc "build/${MY_P}/javadoc"
-	use examples && java-pkg_doexamples examples
-	use source && java-pkg_dosrc {src,toolsrc,xmlimplsrc}/org
-}