Drop old.

Signed-off-by: Patrice Clement <monsieurp@gentoo.org>
Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0x93491BB8

4 files changed, 13 insertions, 178 deletions

diff --git a/dev-java/castor/ChangeLog b/dev-java/castor/ChangeLog
index 59f14fc3f360..628fa4894f2b 100644
--- a/dev-java/castor/ChangeLog
+++ b/dev-java/castor/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/castor
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/castor/ChangeLog,v 1.60 2015/06/13 11:37:20 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/castor/ChangeLog,v 1.61 2015/06/13 23:38:08 monsieurp Exp $
+
+  13 Jun 2015; Patrice Clement <monsieurp@gentoo.org> -castor-0.9.9.1-r6.ebuild,
+  -castor-1.1.1-r2.ebuild:
+  Drop old.
 
   13 Jun 2015; Agostino Sarubbo <ago@gentoo.org> castor-0.9.9.1-r7.ebuild,
   castor-1.1.1-r3.ebuild:
diff --git a/dev-java/castor/Manifest b/dev-java/castor/Manifest
index f1bbf5ebbab0..20b46017288a 100644
--- a/dev-java/castor/Manifest
+++ b/dev-java/castor/Manifest
@@ -5,26 +5,18 @@ AUX 0.9.5.3-jikes.patch 1316 SHA256 e6e7b56cdf09eedef1e09bb4599d60837af1cc4251cf
 AUX 1.1.1-jdk-1.4.patch 1403 SHA256 5d49640c380ffedbc54223944226f6320636a9996e328abe280b8de9344248dc SHA512 b24b648c6cf4d9a0b2d7c11a6dd41e963c8a6581839d4ee1a2a708776bb0a6f04209e5bbaa48212c4bf6bccd1e9be18c1304385b7500f2273ca1bc5cac62a7fe WHIRLPOOL eb6bf05b7025e88db86e8b0e22cbe314e6fc45bafc35854a1a5f4e9701911e50d301c7b1db5aec2458d8bed7babfac88a386992122e0204f71ea446622722809
 DIST castor-0.9.9.1-src.tgz 6794995 SHA256 df569ab985714477956e68ed497ac1fa9fde5f95a8bc0264ee2d31125a970f81 SHA512 d3150af0fdccf4c477b401fe24c7b429d7573693f697f7e6e2e88a13573ca9aa43749c8ee0d381e5a4fd9cc729719f04cc6efadb3c20426a609fa8217bbc45da WHIRLPOOL 01aa718cc1d819103dbf2c6d52f2301e8144ee941ff7d4e3c5c9548898c7a1e7c3587982183851569c67032b612efdb79ac3068bd72546f5251b405b9df5a41a
 DIST castor-1.1.1-src.tgz 9067936 SHA256 f39f96e7f42cbe429ea8050e2f600783cd04c3b07642486a8c1e23dcf2a1cfda SHA512 ec066a227e71c1884e168dea8f7a3bfbfd3275e4c7b83a07e9673b3f84dc52c734c337694bd725de1db5c7a803cc2dadbdd3d1f7507fadc93687d5c05e3a26d5 WHIRLPOOL 2d5312a5ae2ab6bb86b960d3f9c2cc6e6d9de823ed3b0ce6ffa03570ffcf931b59b67d4ef2e5ddf32f6ae1f791b2e0e7ca51935379a0b54f30959ad844768367
-EBUILD castor-0.9.9.1-r6.ebuild 1815 SHA256 f611daa917beba3e9128ec0a6360d6bb228cae3d26dba186ad468a21a2937f20 SHA512 64a2b87cdeb8966c3ec9a203f62d4d13ee01bc7482cd474c3d6ba5c28c7c58ade5aeb38f382a0d84c785450e23cf500651db5e73b1e81f2b175ea3ab60639b6c WHIRLPOOL ae3a6469bc0453875f5d1dfee0071b765e0bd551bec351eeb820d192b91cbb085eb28781a8ae81c15f7b02d1fec3ecc79bdd3bb668d8ff7ad0cce7cee8ebc4ee
 EBUILD castor-0.9.9.1-r7.ebuild 2111 SHA256 726c46474baa6274d605552b74ea8f3d830a1ebf6777b4f6f3e3280f150dedf7 SHA512 7ecf29c831ee8bc5c0700f51a92360eaf7fd7cf4b07b4298d1811466e1d9355419078faee90dc8a22c59e1931d295c39644b31f6cf1a82473be38bdae3fdafbf WHIRLPOOL 871db5552999e9c66e043292aba57eba9c54ce368e84e1eaaa60311640ce88aa4dd47745be8117f114a00a6f431589b918e4a24e9ed89bd65ee0669416d27b12
-EBUILD castor-1.1.1-r2.ebuild 2483 SHA256 c647f145f0662f5dbf3aeba63ce6272a71fb2490e2972ae423f96af11526540e SHA512 83b2c08e2043878873c27d83b5696e40d2c7d48f3c1e74ecd2c3822a7540e3e9b3779598b2077ad28c8d71ba8923a951f8d6d35c1c77c9b0a9200869d6ec1894 WHIRLPOOL f7deb9f08cde940d14cca7e5be144f38d313c8bb2cfd01835378da12ae89d6a71e20ec408893cbb38f0f827680875ddae196b310f7fe1aa596bdae7359fe8673
 EBUILD castor-1.1.1-r3.ebuild 2478 SHA256 67f997c42291bb8373a97fd04aee477cc1408f7257ae358a0e844b45e690df6d SHA512 84c5ee3984f4545d85e0218db0c4a6c90a810c3a22cd85b198cbee547661fd60593fb0af957427af435708509b0e8dc32e15e13ccba12398cb7830f669d2d361 WHIRLPOOL 0beca81a527e9707376f759d1cecc5d1ed8a5d98d6f880296a1a33abfc4be0f93c010cbde13f6a4eeb74250f984f331018223b2bdb77337404801ebecf2b6541
-MISC ChangeLog 8013 SHA256 7c9ba7c01e08e506f05b55566e69228de140ac681e90ab39bc8592cf76660597 SHA512 2065acc9f22e6b7dfbab1ab0e471f89ccfcecc86d70565c76e0af0ca36fd974ed7de3bda804f1f7ac3988f3a8e981aaabd90b04423932c765286f7cb73aa9ba5 WHIRLPOOL 7ce387e7dcf6edae7cf24dd934896a8234fd25e7bb0171eae60f041b301970e2c497070e051e35a7f88878fd864025a04f00f852da4594899e8162e443b09acd
+MISC ChangeLog 8140 SHA256 1dc9db9354217f5ac97d8a58160a9e5821118cc89b32b578ffd7209d586c9f75 SHA512 7eaa90c35a5eee71a0a48b2fbb4480f4f4e30f654e74ae92a3e8e008543939dc1dbc58ac40d22c6e947828fc928c44ab35b94f1fa5dc97e6c2f7e132eafb1da8 WHIRLPOOL 3a516175ac4a1aab0b54eb61c176163d412e92a9388bf21f39b38a0da6d13264b69e56f830384c176ea2b4ac6211370f70a47d2cbf36679edc128440bcb4f7aa
 MISC metadata.xml 414 SHA256 fc981b706c1199b5fdd5636a4514f7e214c5a504e9f44c2a4dcd6ca17946c575 SHA512 0e61c76e21f9c7155b8f0236a0e0e52b05cfd7b6a620d6e406d6fcb54e8a4a857a9822c682363b4e76527d119500f24722454d330692f99dc90d9e20a4d49afd WHIRLPOOL 50e69dc8fef6f1fd7c40c1c09ace4eab370e02f19649859c279dc695bac89c6381edad6d78cabb1ca0034dbe95adc0f12e51dff93215cc17b31a189e812dcb42
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJVfBXxAAoJELp701BxlEWf6CsP/iUKEwFN/3TVtuBWJA4ahE7f
-dwQm4J8uVWoaAbl6Z3NhffcRNbJCR9Mp68LginuOd4DZLZv6Ezc8Pp23CZr2gnh1
-HzmW/1xEEMAxT9sAR2CNKi7d0hNfaBv2wzT4XxPh6sqiynLWS5DAlHy9SdEzioTZ
-7HLDWI09QEs5qVNnInuQ6bhZ5mKqZHb9tBKPyO0F1mOrsuGeeo6TRmZzCJbQ0dPi
-FQXleRlal7yIXWm0IaEsOyVwKWYHyuY90t45lTHnc7t8rOt2NyULWReXPvCfBI6r
-xWoNpy+pvZoa0sN0dDaxADvX4tj3CO3NeiifBrATIxgGs6ED+1ypy/pQONnL5e7e
-hmZYI+W0SBya85fFbxJsCetQbBJ2S1jQgCwu8Ei29K9oyOwDA5UYUsS+gCLQmevA
-cimmCH2ZVd8pA6P33ltWmZoP6+wk5MLguFBR9zG6ZqII2yV4P4mR/fIw9GW9WUB5
-LIjyWOkQ3brQTv7w6H3cs/3DNkjFdX3Q8cSJYD4JaAY7GusyAbJmNts4cAYVe4Ln
-/8DlTFsyYRcBK5LHvAUUkpDvuOFosgusjHKnk7LdweHlZCGaJb/yvkT1hHMYUNxl
-i+1Epi1yPESyj48THLIbIjDR9i6Vdy0wZXUNsDmgdxRvUlgk1Z7tgO28mvG1jXl2
-rKMIqT/hhxc8bYHoAVCf
-=Ld8q
+iQEcBAEBCAAGBQJVfL5VAAoJEJGRpfGTSRu4+NgH/0xu9BfdIbONJGcTujngJ38z
+qGPEt++6zGLoBHzOeECUTeh/UGkKAIhhmgjC682dPK496exPHEdBn0c+xAyhvevA
+EcFMZrvheWuJna237LCxPWhhCU25RwofEISQAoGY9jOBe/G+iCvFS+KpPrkGEVrB
+WDDgdcoChBhF9hFzOUXMMQu1t6SABFDo9aDArTQZ7UOt2M+6IzcR0Owcv6jhky3t
+eD1u8K8f9XLoRhGx1UdKKrYG63FDW8dgWNmVHDhRALZ0R1Arj3yWd47PbTdCn4bU
+SQC/giCIJainAegHdoLNOyLe9YpeZIYLBc4btLCQOCWduEtrfata6+jCehr8f20=
+=h8pF
 -----END PGP SIGNATURE-----
diff --git a/dev-java/castor/castor-0.9.9.1-r6.ebuild b/dev-java/castor/castor-0.9.9.1-r6.ebuild
deleted file mode 100644
index 3bf858e3bd1b..000000000000
--- a/dev-java/castor/castor-0.9.9.1-r6.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2009 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-r6.ebuild,v 1.2 2009/12/09 22:36:25 maekke Exp $
-
-EAPI=2
-JAVA_PKG_IUSE="doc examples source"
-JAVA_PKG_WANT_BOOTCLASSPATH="1.5"
-
-inherit eutils java-pkg-2 java-ant-2
-
-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=""
-
-COMMON_DEP="
-	>=dev-java/commons-logging-1.0.4
-	dev-java/jakarta-oro:2.0
-	dev-java/jakarta-regexp:1.3
-	dev-java/ldapsdk:4.1
-	dev-java/xerces:1.3
-	dev-java/cglib:2
-	java-virtuals/transaction-api"
-RDEPEND=">=virtual/jre-1.5
-	${COMMON_DEP}"
-DEPEND=">=virtual/jdk-1.5
-	${COMMON_DEP}"
-
-java_prepare() {
-	# TODO this should be filed upstream
-	epatch "${FILESDIR}/0.9.5.3-jikes.patch"
-
-	# Does not like Java 1.6's JDBC API
-	java-ant_rewrite-bootclasspath 1.5 src/build.xml
-
-	cd "${S}/lib"
-	rm -v *.jar || die
-	#FIXME: uses these bundled classes
-	rm -v tests/*.jar || die
-	java-pkg_jar-from --build-only ant-core ant.jar
-	#Only used by examples and tests and we aren't building them
-	#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 xerces-1.3
-	java-pkg_jar-from ldapsdk-4.1 ldapjdk.jar
-	java-pkg_jar-from transaction-api
-}
-
-EANT_BUILD_XML="src/build.xml"
-
-src_install() {
-	java-pkg_newjar dist/${P}.jar
-	java-pkg_newjar dist/${P}-xml.jar ${PN}-xml.jar
-
-	use doc && java-pkg_dojavadoc build/doc/javadoc
-	use examples && java-pkg_doexamples src/examples
-	use source && java-pkg_dosrc src/main/org
-}
diff --git a/dev-java/castor/castor-1.1.1-r2.ebuild b/dev-java/castor/castor-1.1.1-r2.ebuild
deleted file mode 100644
index 14e2b7f3c8e6..000000000000
--- a/dev-java/castor/castor-1.1.1-r2.ebuild
+++ /dev/null
@@ -1,97 +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/castor/castor-1.1.1-r2.ebuild,v 1.3 2008/10/24 23:04:21 maekke Exp $
-
-JAVA_PKG_IUSE="doc examples source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Data binding framework for Java"
-HOMEPAGE="http://www.castor.org"
-SRC_URI="http://dist.codehaus.org/${PN}/${PV}/${P}-src.tgz"
-
-#SRC_URI="mirror://gentoo/${P}.tar.bz2"
-# svn co https://svn.codehaus.org/castor/castor/tags/1.0.3/ castor-1.0.3
-# cd castor-1.0.3
-# mvn ant:ant
-# do some magic to build.xml
-# rm lib/*
-# cd ../
-# tar cjvf castor-1.0.3.tar.bz2 --exclude=.svn castor-1.0.3
-
-LICENSE="Exolab"
-SLOT="1.0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-# tests and full documentation when support will be added
-#	dev-java/log4j
-#	~dev-java/servletapi-2.4
-#	dev-java/junit"
-
-COMMON_DEPS="
-	=dev-java/cglib-2.1*
-	dev-java/commons-logging
-	=dev-java/jakarta-oro-2.0*
-	=dev-java/jakarta-regexp-1.3*
-	java-virtuals/transaction-api
-	=dev-java/ldapsdk-4.1*
-	dev-java/ant-core"
-
-DEPEND=">=virtual/jdk-1.4
-	${COMMON_DEPS}"
-RDEPEND=">=virtual/jre-1.4
-	${COMMON_DEPS}"
-
-src_unpack() {
-	unpack ${A}
-
-	java-ant_rewrite-classpath "${S}/anttask/build.xml"
-
-	cd "${S}"
-	# http://jira.codehaus.org/browse/CASTOR-2008
-	epatch "${FILESDIR}/1.1.1-jdk-1.4.patch"
-
-	cd "${S}/lib"
-	rm -v *.jar tests/*.jar
-	java-pkg_jar-from cglib-2.1 cglib.jar
-	java-pkg_jar-from commons-logging \
-		commons-logging-api.jar	commons-logging-1.1.jar
-	java-pkg_jar-from jakarta-oro-2.0
-	java-pkg_jar-from jakarta-regexp-1.3
-	java-pkg_jar-from transaction-api
-	java-pkg_jar-from ldapsdk-4.1 ldapjdk.jar
-	java-pkg_jar-from ant-core ant.jar
-
-	# These are only used for tests or documentation
-	#java-pkg_jar-from junit
-	#java-pkg_jar-from adaptx-0.9
-	#java-pkg_jar-from log4j
-	#java-pkg_jar-from servletapi-2.4 servlet-api.jar
-	use doc && mkdir "${S}/bin/lib"
-	java-pkg_filter-compiler jikes
-}
-
-# clean target is borked
-# http://jira.codehaus.org/browse/CASTOR-2009
-EANT_BUILD_XML="src/build.xml"
-EANT_GENTOO_CLASSPATH="ant-core"
-
-# Needs for example mockejb which is not packaged yet
-#src_test() {
-#	cd "${S}"/src/
-#	eant tests
-#}
-
-src_install() {
-	cd dist
-	for jar in *.jar; do
-		java-pkg_newjar ${jar} ${jar//-${PV}}
-	done
-	cd ..
-	dodoc src/etc/CHANGELOG || die
-	java-pkg_register-ant-task
-	use source && java-pkg_dosrc */main/java/org
-	use doc && java-pkg_dojavadoc build/doc/javadoc
-	use examples && java-pkg_doexamples src/examples
-}