From: Vlastimil Babka <caster@gentoo.org>
Date: Mon, 24 May 2010 15:05:23 +0000 (+0000)
Subject: Remove old.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=8ee9e0da49a3d227fd044e7916c6aa3d9fb3a21f;p=gentoo.git

Remove old.
Package-Manager: portage-2.2_rc67/cvs/Linux x86_64
---

diff --git a/dev-java/commons-jelly/ChangeLog b/dev-java/commons-jelly/ChangeLog
index d3b45b0b3947..401a0e695880 100644
--- a/dev-java/commons-jelly/ChangeLog
+++ b/dev-java/commons-jelly/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/commons-jelly
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-jelly/ChangeLog,v 1.15 2010/05/22 20:06:49 ken69267 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-jelly/ChangeLog,v 1.16 2010/05/24 15:00:56 caster Exp $
+
+  24 May 2010; Vlastimil Babka <caster@gentoo.org>
+  -commons-jelly-1.0-r3.ebuild:
+  Remove old.
 
   22 May 2010; Kenneth Prugh <ken69267@gentoo.org>
   commons-jelly-1.0-r4.ebuild:
diff --git a/dev-java/commons-jelly/commons-jelly-1.0-r3.ebuild b/dev-java/commons-jelly/commons-jelly-1.0-r3.ebuild
deleted file mode 100644
index e95a4bd78d41..000000000000
--- a/dev-java/commons-jelly/commons-jelly-1.0-r3.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-jelly/commons-jelly-1.0-r3.ebuild,v 1.4 2010/03/20 10:39:16 betelgeuse Exp $
-
-EAPI=1
-
-inherit java-pkg-2 java-ant-2 eutils
-
-MY_P="${P}-src"
-DESCRIPTION="A Java and XML based scripting and processing engine"
-HOMEPAGE="http://commons.apache.org/jelly/"
-SRC_URI="mirror://apache/jakarta/commons/jelly/source/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="1"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test source"
-
-RDEPEND=">=virtual/jre-1.4
-	java-virtuals/servlet-api:2.3
-	dev-java/commons-cli:1
-	dev-java/commons-lang:0
-	dev-java/commons-discovery:0
-	dev-java/forehead:0
-	dev-java/jakarta-jstl:0
-	dev-java/commons-jexl:1.0
-	dev-java/commons-beanutils:1.6
-	dev-java/commons-collections:0
-	dev-java/dom4j:1
-	dev-java/jaxen:1.1
-	>=dev-java/xerces-2.7:2
-	dev-java/junit:0
-	dev-java/commons-logging:0"
-
-DEPEND=">=virtual/jdk-1.4
-	dev-java/ant-core
-	test? ( dev-java/ant-junit )
-	${RDEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	# disables dependency fetching, and remove tests as a dependency of jar
-	epatch "${FILESDIR}/${P}-gentoo.patch"
-
-	mkdir -p "${S}/lib"
-	cd "${S}/lib"
-	java-pkg_jar-from --virtual servlet-api-2.3
-	java-pkg_jar-from commons-cli-1,commons-lang
-	java-pkg_jar-from commons-discovery,forehead,jakarta-jstl,commons-jexl-1.0
-	java-pkg_jar-from commons-beanutils-1.6,commons-collections
-	java-pkg_jar-from dom4j-1,jaxen-1.1,xerces-2
-	java-pkg_jar-from commons-logging,junit
-}
-
-src_compile() {
-	eant -Dlibdir=lib jar $(use_doc)
-}
-
-src_test() {
-	ANT_TASKS="ant-junit" eant test -Dlibdir=lib
-}
-
-src_install() {
-	java-pkg_newjar target/${P}.jar ${PN}.jar
-
-	dodoc NOTICE.txt README.txt RELEASE-NOTES.txt || die
-
-	use doc && java-pkg_dojavadoc dist/docs/api
-	use source && java-pkg_dosrc src/java/*
-}
diff --git a/dev-java/jcifs/ChangeLog b/dev-java/jcifs/ChangeLog
index 8fa65182a3a6..90a391323391 100644
--- a/dev-java/jcifs/ChangeLog
+++ b/dev-java/jcifs/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/jcifs
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jcifs/ChangeLog,v 1.23 2010/05/23 17:47:41 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jcifs/ChangeLog,v 1.24 2010/05/24 14:59:40 caster Exp $
+
+  24 May 2010; Vlastimil Babka <caster@gentoo.org> -jcifs-1.3.2.ebuild:
+  Remove old.
 
   23 May 2010; Pacho Ramos <pacho@gentoo.org> jcifs-1.3.13.ebuild:
   stable amd64, bug 306605
diff --git a/dev-java/jcifs/jcifs-1.3.2.ebuild b/dev-java/jcifs/jcifs-1.3.2.ebuild
deleted file mode 100644
index 23bbbe1986f0..000000000000
--- a/dev-java/jcifs/jcifs-1.3.2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jcifs/jcifs-1.3.2.ebuild,v 1.3 2010/02/15 18:54:51 josejx Exp $
-
-JAVA_PKG_IUSE="doc examples source"
-
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Library that implements the CIFS/SMB networking protocol in Java"
-SRC_URI="http://jcifs.samba.org/src/${P}.tgz"
-HOMEPAGE="http://jcifs.samba.org/"
-LICENSE="LGPL-2.1"
-SLOT="1.1"
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd"
-RDEPEND=">=virtual/jre-1.4
-	=dev-java/servletapi-2.4*"
-DEPEND=">=virtual/jdk-1.4
-	${RDEPEND}"
-IUSE=""
-
-S=${WORKDIR}/${P/-/_}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	java-ant_rewrite-classpath
-	rm -v *.jar || die
-}
-
-EANT_EXTRA_ARGS="-DhasServlet=true"
-EANT_GENTOO_CLASSPATH="servletapi-2.4"
-
-src_install() {
-	java-pkg_newjar ${P}.jar
-
-	dodoc README.txt || die
-	# other stuff besides javadocs
-	use doc && java-pkg_dohtml -r docs/*
-	use source && java-pkg_dosrc src/*
-	use examples && java-pkg_doexamples examples
-}
diff --git a/dev-java/jlayer/ChangeLog b/dev-java/jlayer/ChangeLog
index 594053819e70..14bc88a6913d 100644
--- a/dev-java/jlayer/ChangeLog
+++ b/dev-java/jlayer/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/jlayer
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jlayer/ChangeLog,v 1.8 2010/05/22 05:21:20 ken69267 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jlayer/ChangeLog,v 1.9 2010/05/24 15:05:23 caster Exp $
+
+  24 May 2010; Vlastimil Babka <caster@gentoo.org> -jlayer-1.0.ebuild:
+  Remove old.
 
   22 May 2010; Kenneth Prugh <ken69267@gentoo.org> jlayer-1.0.1.ebuild:
   amd64 stable, bug #309227
diff --git a/dev-java/jlayer/jlayer-1.0.ebuild b/dev-java/jlayer/jlayer-1.0.ebuild
deleted file mode 100644
index 35f0f25999aa..000000000000
--- a/dev-java/jlayer/jlayer-1.0.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jlayer/jlayer-1.0.ebuild,v 1.5 2010/02/13 16:53:03 serkan Exp $
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="MP3 decoder/player/converter library for Java"
-HOMEPAGE="http://www.javazoom.net/javalayer/javalayer.html"
-
-SRC_URI="mirror://sourceforge/javalayer/${PN}${PV}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-IUSE=""
-
-RDEPEND=">=virtual/jre-1.4"
-DEPEND=">=virtual/jdk-1.4
-		app-arch/unzip
-		${RDEPEND}"
-
-S=${WORKDIR}/JLayer${PV}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	rm -v *.jar || die
-	# build expects classes to exist
-	rm -vr classes/* || die
-}
-
-src_compile() {
-	eant dist
-}
-
-# Needs a test mp3 c:/data/test.mp3
-RESTRICT="test"
-src_test() {
-	cd srctest
-	local jar="../jl${PV}.jar"
-	ejavac -cp $(java-pkg_getjars junit):${jar} $(find . -name "*.java")
-	ejunit -cp ${jar}:. AllTests
-}
-
-src_install(){
-	java-pkg_newjar jl${PV}.jar
-	dodoc README.txt CHANGES.txt || die
-	dohtml playerapplet.html || die
-	use doc && java-pkg_dojavadoc doc
-	use source && java-pkg_dosrc src/*
-
-	# the MP3TOWAV converte
-	java-pkg_dolauncher jl-converter \
-		--main javazoom.jl.converter.jlc
-
-	# the simple MP3 player
-	java-pkg_dolauncher jl-player \
-		--main javazoom.jl.player.jlp
-
-	# the advanced (threaded) MP3 player
-	java-pkg_dolauncher jl-advanced-player \
-		--main javazoom.jl.player.advanced.jlap
-}
diff --git a/dev-java/sablecc/ChangeLog b/dev-java/sablecc/ChangeLog
index 63ef75e39a45..45a744bb1e13 100644
--- a/dev-java/sablecc/ChangeLog
+++ b/dev-java/sablecc/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/sablecc
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sablecc/ChangeLog,v 1.21 2010/05/22 13:42:17 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sablecc/ChangeLog,v 1.22 2010/05/24 15:03:12 caster Exp $
+
+  24 May 2010; Vlastimil Babka <caster@gentoo.org> -sablecc-3.1-r1.ebuild:
+  Remove old.
 
   22 May 2010; Pacho Ramos <pacho@gentoo.org> sablecc-3.2.ebuild:
   stable amd64, bug 227209
diff --git a/dev-java/sablecc/sablecc-3.1-r1.ebuild b/dev-java/sablecc/sablecc-3.1-r1.ebuild
deleted file mode 100644
index 4cc2a7b0081e..000000000000
--- a/dev-java/sablecc/sablecc-3.1-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sablecc/sablecc-3.1-r1.ebuild,v 1.5 2007/10/24 06:02:23 wltjr Exp $
-
-JAVA_PKG_IUSE="source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Java based compiler / parser generator"
-HOMEPAGE="http://www.sablecc.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-
-RDEPEND=">=virtual/jre-1.4"
-DEPEND=">=virtual/jdk-1.4"
-
-src_unpack() {
-	unpack "${A}"
-	rm -v "${S}"/lib/*.jar || die
-}
-
-JAVA_PKG_FILTER_COMPILER="jikes"
-
-src_install() {
-	java-pkg_dojar lib/*
-
-	dobin "${FILESDIR}"/${PN}
-
-	dodoc AUTHORS THANKS || die
-	dohtml README.html || die
-	use source && java-pkg_dosrc src/*
-}
diff --git a/dev-java/xmlc/ChangeLog b/dev-java/xmlc/ChangeLog
index 6b077eb3ed8a..534034420a8d 100644
--- a/dev-java/xmlc/ChangeLog
+++ b/dev-java/xmlc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/xmlc
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/xmlc/ChangeLog,v 1.17 2010/05/22 05:16:22 ken69267 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xmlc/ChangeLog,v 1.18 2010/05/24 15:04:53 caster Exp $
+
+  24 May 2010; Vlastimil Babka <caster@gentoo.org> -xmlc-2.3.ebuild,
+  -files/xmlc-2.3-build.xml.patch:
+  Remove old.
 
   22 May 2010; Kenneth Prugh <ken69267@gentoo.org> xmlc-2.3.1.ebuild:
   amd64 stable, bug #308239
diff --git a/dev-java/xmlc/files/xmlc-2.3-build.xml.patch b/dev-java/xmlc/files/xmlc-2.3-build.xml.patch
deleted file mode 100644
index 125fd3862a58..000000000000
--- a/dev-java/xmlc/files/xmlc-2.3-build.xml.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-diff -Naur xmlc-src-2.3.orig/xmlc/modules/taskdef/build-default.properties xmlc-src-2.3/xmlc/modules/taskdef/build-default.properties
---- xmlc-src-2.3.orig/xmlc/modules/taskdef/build-default.properties	2007-04-22 00:40:58.000000000 +0200
-+++ xmlc-src-2.3/xmlc/modules/taskdef/build-default.properties	2008-02-02 10:41:25.000000000 +0100
-@@ -37,7 +37,7 @@
- # Comma seperated list of libraries (or more exactly, include patterns) this
- # module depends on for building.
- # They are searched relative to ${lib.dir}
--module.depends=xmlc.jar
-+module.depends=xmlc.jar,ant.jar
- 
- # Javadoc settings
- javadoc.packages=org.enhydra.*
-diff -Naur xmlc-src-2.3.orig/xmlc/modules/xmlc/build.xml xmlc-src-2.3/xmlc/modules/xmlc/build.xml
---- xmlc-src-2.3.orig/xmlc/modules/xmlc/build.xml	2007-04-23 00:08:08.000000000 +0200
-+++ xmlc-src-2.3/xmlc/modules/xmlc/build.xml	2008-02-02 10:32:19.000000000 +0100
-@@ -148,15 +148,12 @@
- 	  description="Build the module .jar file">
-   	<tstamp/>
-   	<delete file="${module.jar}"/>
--  	<taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask" classpath="${build.lib.dir}/jarjar.jar"/>
--  	<jarjar jarfile="${module.jar}"><!-- index="true"-->
-+  	<jar destfile="${module.jar}"><!-- index="true"-->
-       <fileset file="${dist.root}/../LICENSE-xmlc"/>
-       <fileset dir="${build.classes}" />
-       <fileset dir="${src.dir}"
- 	    includes="${module.lib.extra.includes}"
- 	    excludes="${module.lib.extra.excludes}" />
--      <zipfileset src="${build.lib.dir}/asm.jar"/>
--      <rule pattern="org.objectweb.asm.**" result="org.enhydra.xml.xmlc.deferredparsing.asm.@1"/>
-       <manifest>
-         <attribute name="Built-By" value="${user.name}"/>
-         <attribute name="Built-On" value="${TODAY}"/>
-@@ -172,17 +169,12 @@
-           <attribute name="Implementation-Vendor-Id" value="org.objectweb"/>
-           <attribute name="Implementation-URL" value="http://www.enhydra.org/tech/xmlc/"/>
-         </section>
--      	<section name="org/enhydra/xml/xmlc/deferredparsing/asm/">
--          <attribute name="Implementation-Title" value="ASM"/>
--          <attribute name="Implementation-Version" value="3.0"/> 
--          <attribute name="Implementation-Vendor" value="France Telecom R&amp;D"/>
--      	</section>
-       </manifest>
-       <!--indexjars>
-         <fileset dir="${dist.root}/lib" includes="*.jar"/>
-         <fileset dir="${dist.root}/build-lib" includes="*.jar"/>
-       </indexjars-->
--    </jarjar>
-+    </jar>
-   </target>
- 
-   <target name="lib-tests" depends="init,compile-tests" unless="lib-test.skip"
diff --git a/dev-java/xmlc/xmlc-2.3.ebuild b/dev-java/xmlc/xmlc-2.3.ebuild
deleted file mode 100644
index fc670b6728d3..000000000000
--- a/dev-java/xmlc/xmlc-2.3.ebuild
+++ /dev/null
@@ -1,70 +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/xmlc/xmlc-2.3.ebuild,v 1.5 2008/07/27 07:37:00 nixnut Exp $
-
-EAPI="1"
-JAVA_PKG_IUSE="doc"
-
-inherit java-pkg-2 java-ant-2
-
-MY_P="${PN}-src-${PV}"
-DESCRIPTION="Open Source Java/XML Presentation Compiler"
-HOMEPAGE="http://xmlc.objectweb.org/"
-SRC_URI="http://download.forge.objectweb.org/${PN}/${MY_P}.zip
-	http://download.us.forge.objectweb.org/${PN}/${MY_P}.zip"
-
-COMMON_DEP="dev-java/xerces:2
-	dev-java/gnu-regexp:1
-	java-virtuals/servlet-api:2.3
-	dev-java/log4j:0
-	dev-java/xml-commons-resolver:0
-	dev-java/nekohtml:0
-	dev-java/asm:3"
-RDEPEND=">=virtual/jre-1.4
-	${COMMON_DEP}"
-DEPEND=">=virtual/jdk-1.4
-	app-arch/unzip
-	${COMMON_DEP}"
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-S="${WORKDIR}/${MY_P}/"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# get rid of jarjar, and add ant.jar to the taskdef module's classpath
-	epatch "${FILESDIR}/${P}-build.xml.patch"
-
-	cd "${S}"/release/build-lib/ || die
-	rm -v *.jar || die
-
-	java-pkg_jar-from xerces-2,gnu-regexp-1,log4j,nekohtml,asm-3
-	java-pkg_jar-from xml-commons-resolver xml-commons-resolver.jar resolver.jar
-	java-pkg_jar-from --virtual servlet-api-2.3 servlet.jar
-	java-pkg_jar-from --build-only ant-core ant.jar
-}
-
-EANT_BUILD_TARGET="all-libs"
-
-src_install() {
-	# the rest of jars are included in all-runtime
-	java-pkg_dojar release/lib/{xmlc-all-runtime,xmlc-taskdef}.jar
-	java-pkg_register-ant-task
-
-	newdoc xmlc/modules/xmlc/README.XMLC README || die
-	dodoc xmlc/modules/xmlc/ChangeLog || die
-	dohtml release/release-notes/xmlc-${PV/./-}-release-note.html \
-		xmlc/bugs/bugs.html || die
-
-	# move the generated documentation around
-	if use doc; then
-		mv ${PN}/modules/taskdef/doc ${PN}/modules/${PN}/doc/taskdef || die
-		mv ${PN}/modules/wireless/doc ${PN}/modules/${PN}/doc/wireless || die
-		mv ${PN}/modules/xhtml/doc ${PN}/modules/${PN}/doc/xhtml || die
-		java-pkg_dohtml -r ${PN}/modules/xmlc/doc/* || die "Failed to install documentation"
-	fi
-}