Gen-1 punt.

Package-Manager: portage-2.1.2.7

5 files changed, 9 insertions, 137 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/Manifest b/dev-java/castor/Manifest
index b4ca35684c7e..74bc8b75cc17 100644
--- a/dev-java/castor/Manifest
+++ b/dev-java/castor/Manifest
@@ -2,35 +2,24 @@ AUX 0.9.5.3-jikes.patch 1316 RMD160 aee024aa5b1ec75cba60c1f6b27e213178fee51f SHA
 MD5 a07a47cbd64524563caccf7a0f649553 files/0.9.5.3-jikes.patch 1316
 RMD160 aee024aa5b1ec75cba60c1f6b27e213178fee51f files/0.9.5.3-jikes.patch 1316
 SHA256 e6e7b56cdf09eedef1e09bb4599d60837af1cc4251cfa0ac637c3994a135519f files/0.9.5.3-jikes.patch 1316
-AUX build-xml.patch 2859 RMD160 1b29d4aa69e6b502b0b8d1e2ab4ca0fbb84b5523 SHA1 cb31143aafdd84fc2b17220ecc26805e8f1180b7 SHA256 94364861d56145529dfa279e20d5dc77be738049fd51bd389c8fad41dc6a8cf1
-MD5 925da383ab0658b27587273d0f315f06 files/build-xml.patch 2859
-RMD160 1b29d4aa69e6b502b0b8d1e2ab4ca0fbb84b5523 files/build-xml.patch 2859
-SHA256 94364861d56145529dfa279e20d5dc77be738049fd51bd389c8fad41dc6a8cf1 files/build-xml.patch 2859
 DIST castor-0.9.9.1-src.tgz 6794995 RMD160 b308fa49edb708963f6abbde2719b7995ba168ed SHA1 e7baee694f48b56b20af77adead2144cb7b70bca SHA256 df569ab985714477956e68ed497ac1fa9fde5f95a8bc0264ee2d31125a970f81
 DIST castor-1.0.5-src.tgz 8883719 RMD160 9c2d8445fe2a7c7d7dd991b8d5350b0de1cb41ec SHA1 2962857f98fe9e04c1709e60278164e7b1b64eea SHA256 364c4bd8ed29f0b2b9e9f7acda31cf2e9f8f3a9a7a8cb12ac457f3ad091b7505
 EBUILD castor-0.9.9.1-r1.ebuild 1825 RMD160 ecd1ba62a7845a69f96977fefb26c552176d24a4 SHA1 e13674726adb4133c5a8741ec7cb16c473cc3929 SHA256 b27c3d666b4fea34a1943c5758c8945afd7f17cd7cb0ceaf437ad6de4ab38909
 MD5 670762e429c63933bd18512363faf0a2 castor-0.9.9.1-r1.ebuild 1825
 RMD160 ecd1ba62a7845a69f96977fefb26c552176d24a4 castor-0.9.9.1-r1.ebuild 1825
 SHA256 b27c3d666b4fea34a1943c5758c8945afd7f17cd7cb0ceaf437ad6de4ab38909 castor-0.9.9.1-r1.ebuild 1825
-EBUILD castor-0.9.9.1.ebuild 1923 RMD160 043aafdf94b06ebf4efdf65eb9974be5583a05e0 SHA1 1d7a1c8622d634fb971698caa53473e0639e1def SHA256 fc5ca37cc683f57fe6194ffcc6426af1501b825a78831143fc56e4111437fc47
-MD5 abdf5831bef36bf5679d5315dd090ed2 castor-0.9.9.1.ebuild 1923
-RMD160 043aafdf94b06ebf4efdf65eb9974be5583a05e0 castor-0.9.9.1.ebuild 1923
-SHA256 fc5ca37cc683f57fe6194ffcc6426af1501b825a78831143fc56e4111437fc47 castor-0.9.9.1.ebuild 1923
 EBUILD castor-1.0.5.ebuild 2173 RMD160 69b689da2d78b91d962372849d4f8f10a116ab76 SHA1 a29b16623a42482a471301e7e92fff84fa35d7fe SHA256 3c18ad9b8e9233462f15aa7d37b9dcec822db54d6b2f1d908ee2f95d54a6c84d
 MD5 012c7e401e046b1bd40524ead48a4038 castor-1.0.5.ebuild 2173
 RMD160 69b689da2d78b91d962372849d4f8f10a116ab76 castor-1.0.5.ebuild 2173
 SHA256 3c18ad9b8e9233462f15aa7d37b9dcec822db54d6b2f1d908ee2f95d54a6c84d castor-1.0.5.ebuild 2173
-MISC ChangeLog 4043 RMD160 7730b7086639a60703d0de1b02d5bfdfe1b47691 SHA1 e0a6fd866bfe8d77929b674dbc19066d7370beb6 SHA256 607da2cc32a11cf9bbd2e9eeeba175b8eefdce0faa0d5bb6ac9401b57d3fc866
-MD5 1e0e5be7f60dd4c9b20fedcfa5aaf37b ChangeLog 4043
-RMD160 7730b7086639a60703d0de1b02d5bfdfe1b47691 ChangeLog 4043
-SHA256 607da2cc32a11cf9bbd2e9eeeba175b8eefdce0faa0d5bb6ac9401b57d3fc866 ChangeLog 4043
+MISC ChangeLog 4161 RMD160 9ed8d0a2681631f65fe444bdab7326e4804b84bb SHA1 4415f0df01ed57c4b65e46c57f58e9c1526cc5f6 SHA256 f04bc79a1211f16c046c0bd01e5672a09fe569f50a95db233d1f9a6e6a770203
+MD5 d6f3f14affdda8c4bbd2e9025dabc25e ChangeLog 4161
+RMD160 9ed8d0a2681631f65fe444bdab7326e4804b84bb ChangeLog 4161
+SHA256 f04bc79a1211f16c046c0bd01e5672a09fe569f50a95db233d1f9a6e6a770203 ChangeLog 4161
 MISC metadata.xml 548 RMD160 fb4d494db7afbed22d95c58c03fefe9841b6a5f6 SHA1 06ec09b73d1cc9dd371d40c457009fef05e51f6b SHA256 7ea9ff276b4c62bee306d6c5516de76bf19ee62642072dc3817c62ac5c858d33
 MD5 0020d457065666c2b9679d99cc335c51 metadata.xml 548
 RMD160 fb4d494db7afbed22d95c58c03fefe9841b6a5f6 metadata.xml 548
 SHA256 7ea9ff276b4c62bee306d6c5516de76bf19ee62642072dc3817c62ac5c858d33 metadata.xml 548
-MD5 b2ca7926d0f0016b2aeb096aa097e866 files/digest-castor-0.9.9.1 250
-RMD160 85d65d9edcdae82f7c55fb3a79598dc5a6bda753 files/digest-castor-0.9.9.1 250
-SHA256 888c6364180de0495e2654c7734bb3d13822f99e4cf957cdc160bc7fb1308dad files/digest-castor-0.9.9.1 250
 MD5 b2ca7926d0f0016b2aeb096aa097e866 files/digest-castor-0.9.9.1-r1 250
 RMD160 85d65d9edcdae82f7c55fb3a79598dc5a6bda753 files/digest-castor-0.9.9.1-r1 250
 SHA256 888c6364180de0495e2654c7734bb3d13822f99e4cf957cdc160bc7fb1308dad files/digest-castor-0.9.9.1-r1 250
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