NM: Cleanup superseeded ebuilds.

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key )

4 files changed, 6 insertions, 261 deletions

diff --git a/dev-java/rhino/ChangeLog b/dev-java/rhino/ChangeLog
index 98429eb67663..241a84c9201a 100644
--- a/dev-java/rhino/ChangeLog
+++ b/dev-java/rhino/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/rhino
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/rhino/ChangeLog,v 1.74 2013/07/28 09:38:57 grobian Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/rhino/ChangeLog,v 1.75 2014/06/17 10:34:38 mrueg Exp $
+
+  17 Jun 2014; Manuel Rüger <mrueg@gentoo.org> -files/rhino-1.6-gentoo.patch,
+  -rhino-1.7.2-r1.ebuild, -rhino-1.7.2.ebuild:
+  NM: Cleanup superseeded ebuilds.
 
   28 Jul 2013; Fabian Groffen <grobian@gentoo.org> rhino-1.7.2-r2.ebuild:
   Marked ~x64-macos, bug #435528
diff --git a/dev-java/rhino/files/rhino-1.6-gentoo.patch b/dev-java/rhino/files/rhino-1.6-gentoo.patch
deleted file mode 100644
index 26111dc7728c..000000000000
--- a/dev-java/rhino/files/rhino-1.6-gentoo.patch
+++ /dev/null
@@ -1,139 +0,0 @@
-diff -uprN rhino1_6R1.orig/build.properties rhino1_6R1/build.properties
---- rhino1_6R1.orig/build.properties	2004-11-30 22:11:12.000000000 +0100
-+++ rhino1_6R1/build.properties	2004-12-22 19:41:54.452624448 +0100
-@@ -49,6 +49,7 @@ classes: ${build.dir}/classes
- # compilation settings
- debug: on
- target-jvm: 1.1
-+source-jvm: 1.3
- 
- # jar generation settings 
- jar-compression: true
-diff -uprN rhino1_6R1.orig/src/build.xml rhino1_6R1/src/build.xml
---- rhino1_6R1.orig/src/build.xml	2004-11-30 22:11:12.000000000 +0100
-+++ rhino1_6R1/src/build.xml	2004-12-22 19:42:23.355230584 +0100
-@@ -15,6 +15,7 @@ Requires Ant version 1.2
-            deprecation="on"
-            debug="${debug}"
- 	   target="${target-jvm}"
-+	   source="${source-jvm}"
- 	   >
-     </javac>
-     <copy todir="${classes}">
-diff -uprN rhino1_6R1.orig/toolsrc/build.xml rhino1_6R1/toolsrc/build.xml
---- rhino1_6R1.orig/toolsrc/build.xml	2004-11-30 22:11:12.000000000 +0100
-+++ rhino1_6R1/toolsrc/build.xml	2004-12-22 19:42:40.661599616 +0100
-@@ -18,7 +18,8 @@ Requires Ant version 1.2
-            destdir="${classes}"
-            includes="org/**/*.java"
-            deprecation="on"
--           debug="${debug}"
-+	   debug="${debug}"
-+	   source="${source-jvm}"
- 	   target="${target-jvm}">
-     </javac>
-     <copy todir="${classes}">
-diff -uprN rhino1_6R1.orig/toolsrc/org/mozilla/javascript/tools/debugger/build.xml rhino1_6R1/toolsrc/org/mozilla/javascript/tools/debugger/build.xml
---- rhino1_6R1.orig/toolsrc/org/mozilla/javascript/tools/debugger/build.xml	2004-11-30 22:11:12.000000000 +0100
-+++ rhino1_6R1/toolsrc/org/mozilla/javascript/tools/debugger/build.xml	2004-12-22 19:06:04.299497408 +0100
-@@ -3,7 +3,6 @@
- <project name="toolsrc" default="help" basedir=".">
- 
-   <target name="properties">
--    <property name="swing-ex-url" value="http://java.sun.com/products/jfc/tsc/articles/treetable2/downloads/src.zip"/>
-     <available file="downloaded/AbstractCellEditor.java"
-                property="swing-ex-available"/>
-   </target>
-@@ -13,8 +12,7 @@
-          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/">
-+    <unzip src="../../../../../../swingExSrc.zip" dest="downloaded/">
-       <patternset>
-           <include name="AbstractCellEditor.java"/>
-           <include name="JTreeTable.java"/>
-diff -uprN rhino1_6R1.orig/xmlimplsrc/build.xml rhino1_6R1/xmlimplsrc/build.xml
---- rhino1_6R1.orig/xmlimplsrc/build.xml	2004-11-30 22:11:12.000000000 +0100
-+++ rhino1_6R1/xmlimplsrc/build.xml	2004-12-22 19:42:52.882741720 +0100
-@@ -12,7 +12,6 @@
-   <target name="compile" unless="without-xmlimpl">
- 
-     <available property="xbean-present?" file="${xbean.jar}" /> 
--    <antcall target="xbean-get" />
- 
-     <condition property="xmlimpl-compile?">
-       <and>
-@@ -35,7 +34,6 @@
-     </condition>
- 
-     <antcall target="do-compile" />
--    <antcall target="do-not-compile" />
-   
-   </target>
-     
-@@ -48,6 +46,7 @@
-            deprecation="on"
-            debug="${debug}"
- 	   target="${target-jvm}"
-+	   source="${source-jvm}"
- 	   classpathref="xmlimpl.classpath"
- 	   failonerror="${xmlimpl.compile.failonerror}"
- 	   >
-@@ -55,15 +54,6 @@
- 
-   </target>
- 
--  <target name="do-not-compile" unless="xmlimpl-compile?">
--
--<echo>
--Skipping compilation of E4X implementation due to lack of 
--javax.xml.namespace.*, org.apache.xmlbeans.*  classes
--</echo>
--
--  </target>
--
-   <target name="copy-source">
-     <mkdir dir="${dist.dir}/xmlimplsrc"/>
-     <copy todir="${dist.dir}/xmlimplsrc">
-@@ -79,39 +69,4 @@ javax.xml.namespace.*, org.apache.xmlbea
-                includes="org/mozilla/javascript/xmlimpl/**"/>
-     </delete>
-   </target>
--
--
--  <target name="xbean-get" unless="xbean-present?">
--  
--    <property 
--     name="xbean.url" 
--     value="http://www.apache.org/dist/xml/xmlbeans/xmlbeans-current.zip"
--     />
--
--    <property name="xbean.tmp" location="${build.dir}/tmp-xbean" /> 
--    <property name="xbean.zip" location="${xbean.tmp}/xbean.zip" /> 
--
--    <mkdir dir="${xbean.tmp}"/>
--    <get src="${xbean.url}" dest="${xbean.zip}" ignoreerrors="true" />
--
--    <available property="xbean-zip-present?" file="${xbean.zip}" /> 
--    
--    <antcall target="xbean-unzip" />
--  </target>
--
--  <target name="xbean-unzip" if="xbean-zip-present?">
--    
--    <unzip src="${xbean.zip}" dest="${xbean.tmp}">
--      <patternset includes="xmlbeans-*/lib/xbean.jar" />
--    </unzip>
--    <mkdir dir="${lib}" />
--    <copy tofile="${xbean.jar}">
--      <fileset dir="${xbean.tmp}" includes="xmlbeans-*/lib/xbean.jar" />
--    </copy>
--
--    <delete dir="${xbean.tmp}" />
--  </target>
--
--
--
- </project>
diff --git a/dev-java/rhino/rhino-1.7.2-r1.ebuild b/dev-java/rhino/rhino-1.7.2-r1.ebuild
deleted file mode 100644
index 7eb5bf8c4de6..000000000000
--- a/dev-java/rhino/rhino-1.7.2-r1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/rhino/rhino-1.7.2-r1.ebuild,v 1.2 2012/01/01 12:28:23 sera Exp $
-
-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 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos"
-IUSE=""
-
-S="${WORKDIR}/${MY_P}"
-
-CDEPEND="=dev-java/xml-xmlbeans-1*
-	dev-java/jsr173:0"
-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
-	java-pkg_jar-from jsr173 jsr173.jar jsr173_1.0_api.jar
-
-	# Stop downloading of deps
-	cd "${S}"
-	mkdir -p build/tmp-xbean
-	touch build/tmp-xbean/xbean.zip
-}
-
-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.2.ebuild b/dev-java/rhino/rhino-1.7.2.ebuild
deleted file mode 100644
index 9ad96c9b2476..000000000000
--- a/dev-java/rhino/rhino-1.7.2.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/rhino/rhino-1.7.2.ebuild,v 1.2 2012/01/01 12:28:23 sera Exp $
-
-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.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
-}
-
-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
-}