Gen-1 punt.

(Portage version: 2.1.2.7)

4 files changed, 5 insertions, 122 deletions

diff --git a/dev-java/castor/ChangeLog b/dev-java/castor/ChangeLog
index 756b0d1c1ed3..1d02a291be5f 100644
--- a/dev-java/castor/ChangeLog
+++ b/dev-java/castor/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/castor
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/castor/ChangeLog,v 1.32 2007/05/19 17:01:57 welp Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/castor/ChangeLog,v 1.33 2007/05/20 17:09:08 caster Exp $
+
+  20 May 2007; Vlastimil Babka <caster@gentoo.org> -files/build-xml.patch,
+  -castor-0.9.9.1.ebuild:
+  Gen-1 punt.
 
   19 May 2007; Peter Weller <welp@gentoo.org> castor-0.9.9.1-r1.ebuild:
   Stable on amd64 wrt bug 176017
diff --git a/dev-java/castor/castor-0.9.9.1.ebuild b/dev-java/castor/castor-0.9.9.1.ebuild
deleted file mode 100644
index 48f091722f17..000000000000
--- a/dev-java/castor/castor-0.9.9.1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/castor/castor-0.9.9.1.ebuild,v 1.2 2006/02/09 02:42:25 nichoj Exp $
-
-inherit eutils java-pkg
-
-DESCRIPTION="Data binding framework for Java"
-SRC_URI="http://dist.codehaus.org/${PN}/${PV}/${P}-src.tgz"
-HOMEPAGE="http://www.castor.org"
-LICENSE="Exolab"
-KEYWORDS="amd64 x86"
-SLOT="0.9"
-IUSE="doc jikes postgres source"
-
-RDEPEND=">=virtual/jre-1.4
-	>=dev-java/adaptx-0.9.5.3
-	>=dev-java/commons-logging-1.0.4
-	=dev-java/jakarta-oro-2.0*
-	=dev-java/jakarta-regexp-1.3*
-	>=dev-java/ldapsdk-4.1.7
-	>=dev-java/junit-3.8
-	=dev-java/servletapi-2.3*
-	=dev-java/xerces-1.3*
-	=dev-java/cglib-2.0*
-	postgres? ( =dev-java/jdbc2-postgresql-7.3* )"
-
-DEPEND=">=virtual/jdk-1.4
-	>=dev-java/ant-core-1.5
-	${RDEPEND}"
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-	# TODO this should be filed upstream
-	epatch ${FILESDIR}/0.9.5.3-jikes.patch
-
-	cd ${S}/src
-	#This patch is taken care of by axxo-overlay and 1.5 is not
-	#supported.
-	#epatch ${FILESDIR}/build-xml.patch
-
-	cd ${S}/lib
-	rm -f *.jar
-	java-pkg_jar-from adaptx-0.9
-	java-pkg_jar-from commons-logging
-	java-pkg_jar-from cglib-2
-	java-pkg_jar-from jakarta-oro-2.0 jakarta-oro.jar oro.jar
-	java-pkg_jar-from jakarta-regexp-1.3 jakarta-regexp.jar regexp.jar
-	java-pkg_jar-from junit
-	java-pkg_jar-from servletapi-2.3
-	java-pkg_jar-from xerces-1.3
-	java-pkg_jar-from ldapsdk-4.1 ldapjdk.jar
-	use postgres && java-pkg_jar-from jdbc2-postgresql-5
-}
-
-src_compile() {
-	cd ${S}/src
-	local antflags="jar"
-	use doc && antflags="${antflags} javadoc"
-	use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
-	ant ${antflags} || die "compile failed"
-}
-
-src_install() {
-	java-pkg_newjar dist/${P}-xml.jar ${PN}-xml.jar
-	java-pkg_newjar dist/${P}.jar ${PN}.jar
-
-	use doc && java-pkg_dohtml -r build/doc/javadoc/*
-	use source && java-pkg_dosrc src/main/*
-}
diff --git a/dev-java/castor/files/build-xml.patch b/dev-java/castor/files/build-xml.patch
deleted file mode 100644
index 283ee0aff0bc..000000000000
--- a/dev-java/castor/files/build-xml.patch
+++ /dev/null
@@ -1,47 +0,0 @@
---- build.xml.orig	2004-12-12 13:56:30.000000000 +0100
-+++ build.xml	2004-12-13 17:56:46.220717520 +0100
-@@ -148,7 +148,7 @@
- 

-     <target name="main" depends="prepare"

-             description="The default target for compilation; includes debug and deprecation info">

--        <javac srcdir="${main}" destdir="${classes}" excludes="${excludes}" debug="on" deprecation="${deprecation}">

-+        <javac srcdir="${main}" destdir="${classes}" excludes="${excludes}" debug="on" deprecation="${deprecation}" source="1.4" target="1.4">

-             <classpath refid="build.classpath"/>

-         </javac>

-         <copy todir="${classes}">

-@@ -163,7 +163,7 @@
- 

-     <target name="main.opt" depends="prepare"

-             description="Same as the default target, but with optimization, no debug and no deprecation">

--        <javac srcdir="${main}" destdir="${classes}" excludes="${excludes}" debug="${main.opt.debug}" deprecation="off" optimize="on">

-+        <javac srcdir="${main}" destdir="${classes}" excludes="${excludes}" debug="${main.opt.debug}" deprecation="off" optimize="on"  source="1.4" target="1.4">

-             <classpath refid="build.classpath"/>

-         </javac>

-         <copy todir="${classes}">

-@@ -176,7 +176,7 @@
-     <target name="examples" depends="prepare, main"

-             description="Builds the example packages (including debugging info) and creates the webapp war file for the servlet example">

-         <mkdir dir="${build}/examples"/>

--        <javac srcdir="${source}/examples" destdir="${build}/examples" debug="on" deprecation="${deprecation}" excludes="${exampleexcludes}">

-+        <javac srcdir="${source}/examples" destdir="${build}/examples" debug="on" deprecation="${deprecation}" excludes="${exampleexcludes}"  source="1.4" target="1.4">

-         <classpath refid="build.classpath"/>

-     </javac>

- 

-@@ -219,7 +219,7 @@
- 

-     <target name="tests" depends="prepare" description="Build the tests packages">

-         <mkdir dir="${build}/tests"/>

--        <javac srcdir="${source}/tests" destdir="${build}/tests" excludes="${testexcludes}" debug="on" deprecation="${deprecation}">

-+        <javac srcdir="${source}/tests" destdir="${build}/tests" excludes="${testexcludes}" debug="on" deprecation="${deprecation}"  source="1.4" target="1.4">

-         <classpath refid="build.classpath"/>

-     </javac>

- 

-@@ -467,7 +467,7 @@
-             <arg value="-types"/>

-             <arg value="j2"/>

-         </java>

--        <javac destdir="${classes}" excludes="${excludes}" debug="${main.opt.debug}" deprecation="off" optimize="on">

-+        <javac destdir="${classes}" excludes="${excludes}" debug="${main.opt.debug}" deprecation="off" optimize="on"  source="1.4" target="1.4">

-             <src path="${gen.src}" />

-             <classpath refid="build.classpath"/>

-         </javac>

diff --git a/dev-java/castor/files/digest-castor-0.9.9.1 b/dev-java/castor/files/digest-castor-0.9.9.1
deleted file mode 100644
index ef46289f4e37..000000000000
--- a/dev-java/castor/files/digest-castor-0.9.9.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 09e276d0819e522ef171e7385517b004 castor-0.9.9.1-src.tgz 6794995
-RMD160 b308fa49edb708963f6abbde2719b7995ba168ed castor-0.9.9.1-src.tgz 6794995
-SHA256 df569ab985714477956e68ed497ac1fa9fde5f95a8bc0264ee2d31125a970f81 castor-0.9.9.1-src.tgz 6794995