Drop old.

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

18 files changed, 64 insertions, 626 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
-}
diff --git a/dev-java/guice/ChangeLog b/dev-java/guice/ChangeLog
index dc64248c9695..6a46523a9ea7 100644
--- a/dev-java/guice/ChangeLog
+++ b/dev-java/guice/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/guice
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/guice/ChangeLog,v 1.7 2015/06/13 11:37:25 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/guice/ChangeLog,v 1.8 2015/06/13 23:39:34 monsieurp Exp $
+
+  13 Jun 2015; Patrice Clement <monsieurp@gentoo.org> -guice-2.0.ebuild,
+  -guice-3.0.ebuild:
+  Drop old.
 
   13 Jun 2015; Agostino Sarubbo <ago@gentoo.org> guice-2.0-r1.ebuild,
   guice-3.0-r1.ebuild:
diff --git a/dev-java/guice/Manifest b/dev-java/guice/Manifest
index 0e58db9073a0..f846e2ff7c93 100644
--- a/dev-java/guice/Manifest
+++ b/dev-java/guice/Manifest
@@ -8,25 +8,17 @@ AUX 3.0-common.xml.patch 1562 SHA256 39b1cc3190d17232d3064bdf47c411eb861f7a5c199
 DIST guice-2.0-src.zip 17342981 SHA256 7f836156d9d6b7688d373a4c70971b8b42e3a553e26a8f98a110a868eb749394 SHA512 61e1c5b6bbd7db5017a99b2998b706071717781360ab8d622d163be2cc954d9b34ab8b68d2ab02f29bb1a8b640ac25350dca302c390855641ca3e4cc4438a1b9 WHIRLPOOL 7be8673b603ad1aa722ddb76cefaec5e1d03e9a4199d25cbb1a58a31f89c33ac1d9e0a479951b5412cc2c94504d46afd56f42a57f3d87ef3915554fbf821d506
 DIST guice-3.0-src.zip 24396399 SHA256 aaa4da9c2d588018b69a757879966da7fcaa02b4a6b208f1300a313c1a426eba SHA512 2918a2ec1c355025d789c6de4275e1b87fa0263e4529813b9758f219d9faeb08cdcba5a82962c3ec632fbdb31376c03198d12599ce6b2ae872cf8b252edd7a05 WHIRLPOOL e2b602bff8e85c6223f05bc750b912e1068f8546cc78fc31957107b6e9e8d0d23e99ea9e94b51562882ccabab14485245207f6754137d33d5e8cc6358e3e9402
 EBUILD guice-2.0-r1.ebuild 1321 SHA256 b7bf9aaa57e6cbfd346222f49f6483d0859213635d981764444b1bc1a885f2bd SHA512 0d1b7b1431d5985af8bb63524e976f360cbdb4119e692f872421039b5a5c1865dd00983fac7e335997acb6883fc7b16d977f323c3fec07e12557b32c68cb4709 WHIRLPOOL d01cce94f417676c130ad8c7a6cd340c7b7085baa76d137a3d80f40a76b7ccafc598ea97982df15ef2cd67ae309086b955b97f104c743c3a02f4ac5819bb5af6
-EBUILD guice-2.0.ebuild 1288 SHA256 1066331bb8c089cfd90d6581af60fc88a71d0dbe19829d54d854ddba558719fe SHA512 8f06187cb9f6040f7fe553d17d237f5d7e26c12aa63eaef7249f874497862a2517807e7a85e0d0f8253d3c96c4bd8a79ad7d0c9dc5fd77fc5032238c2a3dbfa1 WHIRLPOOL b713268a2105df0b4a4e6c89a740102e1c03e3ac5bb79e7632c43d4c59bcb47974ac1eed854acb298bede4955f428fa606f87bc425290241380208550bf7aa12
 EBUILD guice-3.0-r1.ebuild 1235 SHA256 16a02bcca0079decd0e8e194cddc5c43dd804541a702d51717efa22f9db41976 SHA512 ebdfcd3a8ffeabba4cd6970bf932384100e1ca09a129997b73867ffd1a7e7cd7758540c3a762cd83d826943b39c9bdc89f9028d1dd669d7f583ae302e7fef31d WHIRLPOOL 080ab2b50f9bafb882f57ba9a7d5f47c2e94f35b9f990b06597eaf4d7ab765b4b2044688dd032fb093a2ff9ccdc82579f4e158cdf13297a5d9795a3a47bb2b44
-EBUILD guice-3.0.ebuild 1241 SHA256 42c00f10ff32972966380b315cc93ebb520a84dee9d7ff69b6aab3d2202d386f SHA512 cd10203dabdc243d2546ac6fe6f3ccc063fab706799c9c292cf0a01a2289f7174d33d6902ab528656222beb4fc064276313392e63379670c2177317f3b91423d WHIRLPOOL 32e5cb82c61330a19da304afd42a5fa06fdfae77660649efc8b8473bdd4d8d7c9b6534d4247321fc2e68439c0feb15da9148706220ddf5ba7fc6f93dd5a56159
-MISC ChangeLog 1355 SHA256 dfa3348e8c33cb2cd5dcc6922f345f3a0077601492a4ae9335ae579c899be021 SHA512 14c65dbf0cdabdcece51de158a9fe31acc83833ff18769ae62cebf0063a77f5fffbdcadbda79646d5ff295f9a8235eaebf0a502891cbf9bf60eb3b75cb143ad5 WHIRLPOOL 299169b2f03ea4fb6bfad7efd01c0f94b411bde35a010eb035d677fd5936bbe9449338bae62b06311d3f47bca3ac2b0fc875a8fb87c8a5b82b5b55f59609f90e
+MISC ChangeLog 1468 SHA256 faec21058d38136b1b400dc97aad91738a76bf4d9ff3148d6357f11b5fe955bf SHA512 aa3d920c4a5e0b38baa5b50332f9022976f7e55505fbfb2147412684aaed5f528b669c605fb0ef95154790fbf3da12bd988799b23a83b555bebe19096a935172 WHIRLPOOL 2d540f99db190942f3e45915350b61244c184af919479c08404607ccad0727ed30d8ccd4df2c8856e74742f482b98f603612c513a7ec0c4b36074f4e068aaf5a
 MISC metadata.xml 241 SHA256 06abd52331abac969df4f818ffe7047e0cc3fdfc1a243cec03e53b5a665cfdb1 SHA512 2aab29c42487d867d041d8753ad7fa8261f418a14aa8981c169955c6ccca991e1fd5b7c83a451fb1dc724c5a94ac28a552fff7eb9a78ea5988a1916a1803246f WHIRLPOOL c53ad30024ef34350c7759715758ec6b8296d5dcbd322724c0e0c3ee5a3a6f4fbfddd7d2d605bd08d605103c56e05e7e9038e12074a623631d2c542898581850
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJVfBX2AAoJELp701BxlEWf9ZcQAJXDpU3ncRXi040ZI33aPonr
-SYMqfulVcSV/cBYoWr9k55vsyMVOyjPfFR2FRSuWf5/SRkwTN8V9MFSMZ5bkuFzd
-Ni8Rgpto8omdKtfcTQFFsFpNls71pnY6j+U+VlGbeNljj1YIL6P5YuUWHyLtBdqg
-D7/YTM+61D5FOQ8HAHy/PLAIrSmRl5wEhQNj+g4qNHAahUkXgsu7zaGFOdbGODn2
-XayGWazVnFL65+fUYiND8WE11U1cIVRaYv1dzrP0HlgqPXRM+q02DZarzkZAye8Z
-Ul1umZ7eJcPJSSIyt/wBybOksiYoj5IiAq96tbGvuNeWtL9Fzd5ptmpIMOWfVS6y
-EY/Vgm/3uNDZn35PCY+pZIwjiL5CHUvfz/4z/p8UorfX3k1JIhVsV/l2ymuov0Zk
-RwyvTuzrbtaGMxruZ8x5G2V7S3H4jKgaNpces/jZvxqIigs9w38S1dBec5Wke5h1
-wn8mR6L1hOqTCpYNikFM10QJsLnznTJe5bImT/VC8AyTzpNfvux0IgeTWjnI7F4W
-hGjDMmy8iSxeukRrBkvuiKMy+vOCPRCCGhiq7yhzILjQsXN/57Xfsk7eu9Ma6U0z
-NNyvwdXl0UD/SbMYVyL0hywJxg21IJE0evHxPnccgxyG7XHQJJPJBQISs/5O4EbU
-2NPneTKseLZDBTbBW9lA
-=t7x+
+iQEcBAEBCAAGBQJVfL6tAAoJEJGRpfGTSRu4yV8H/0437GRzFlXapzNaXcYtW6YA
+HIY6SijdFkUqRyrSN+r0aOwcu+DhlpOYnO1u7+fZ8FCPsUCwkn3TgeJCglUBSOPW
++gwf1TL6o9qoYhpLvriICDznVlXhMMlUoaeW45sWrgrhj1tiQRMtozJ/d1c7LvVe
+6m5PBnxAGbgYLQTvLLiz7jF2p5RayKlYEG5jR5HHXiW+brcPdK46jOute99wWqrs
+LkU2v5zauuMssIRhvFed0aB+g9pOKfWWUNCgMgDYcgg6cux8YkEl2TUi1DizlS0Q
++1co+nOPbZGUS7XUjXvq4I4eDZK4EDN3sx+9cdg7qb8HQduV1037O11feNeJ6vY=
+=3x8K
 -----END PGP SIGNATURE-----
diff --git a/dev-java/guice/guice-2.0.ebuild b/dev-java/guice/guice-2.0.ebuild
deleted file mode 100644
index 26bd7df87cee..000000000000
--- a/dev-java/guice/guice-2.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/guice/guice-2.0.ebuild,v 1.2 2015/04/11 22:25:46 monsieurp Exp $
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Guice is a lightweight dependency injection framework for Java 5 and above"
-HOMEPAGE="http://code.google.com/p/google-guice/"
-SRC_URI="http://google-guice.googlecode.com/files/${P}-src.zip"
-
-LICENSE="Apache-2.0"
-SLOT="2"
-KEYWORDS="~amd64 ~x86"
-
-IUSE=""
-
-COMMON_DEPEND="dev-java/aopalliance:1
-	dev-java/asm:3
-	dev-java/cglib:2.2"
-RDEPEND=">=virtual/jre-1.5
-	${COMMON_DEPEND}"
-DEPEND=">=virtual/jdk-1.5
-	${COMMON_DEPEND}"
-
-S="${WORKDIR}/${P}-src/"
-
-RESTRICT="test"
-
-JAVA_PKG_BSFIX_NAME="build.xml common.xml servlet/build.xml"
-JAVA_ANT_CLASSPATH_TAGS="${JAVA_ANT_CLASSPATH_TAGS} javadoc"
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-EANT_GENTOO_CLASSPATH="aopalliance-1,asm-3,cglib-2.2"
-
-java_prepare() {
-	find . -name '*.jar' -delete || die
-	find . -name '*.class' -delete || die
-	epatch "${FILESDIR}"/${PV}-common.xml.patch
-	epatch "${FILESDIR}"/${PV}-build.xml.patch
-}
-
-src_install() {
-	java-pkg_dojar build/${PN}.jar
-
-	use doc && java-pkg_dojavadoc javadoc/
-	use source && java-pkg_dosrc src/com
-}
diff --git a/dev-java/guice/guice-3.0.ebuild b/dev-java/guice/guice-3.0.ebuild
deleted file mode 100644
index 2d46db7b675a..000000000000
--- a/dev-java/guice/guice-3.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/guice/guice-3.0.ebuild,v 1.2 2014/08/10 20:13:56 slyfox Exp $
-
-EAPI="5"
-
-JAVA_PKG_IUSE="source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Guice is a lightweight dependency injection framework for Java 5 and above"
-HOMEPAGE="http://code.google.com/p/google-guice/"
-SRC_URI="http://google-guice.googlecode.com/files/${P}-src.zip"
-
-LICENSE="Apache-2.0"
-SLOT="3"
-KEYWORDS="~amd64 ~x86"
-
-IUSE=""
-
-COMMON_DEPEND="dev-java/aopalliance:1
-	dev-java/javax-inject:0
-	dev-java/asm:3
-	dev-java/cglib:2.2"
-
-RDEPEND=">=virtual/jre-1.5
-	${COMMON_DEPEND}"
-
-DEPEND=">=virtual/jdk-1.5
-	${COMMON_DEPEND}"
-
-RESTRICT="test"
-
-S="${WORKDIR}/${P}-src/"
-
-JAVA_PKG_BSFIX_NAME="build.xml common.xml servlet/build.xml"
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-EANT_GENTOO_CLASSPATH="aopalliance-1,asm-3,cglib-2.2,javax-inject"
-
-java_prepare() {
-	find . -name '*.jar' -exec rm -v {} + || die
-	find . -name '*.class' -exec rm -v {} + || die
-	epatch "${FILESDIR}"/${PV}-common.xml.patch
-	epatch "${FILESDIR}"/${PV}-build.xml.patch
-}
-
-src_install() {
-	java-pkg_dojar build/${PN}.jar
-	use source && java-pkg_dosrc core/src/com
-}
diff --git a/dev-java/hibernate/ChangeLog b/dev-java/hibernate/ChangeLog
index e5aac9bf15da..12b67d674ba8 100644
--- a/dev-java/hibernate/ChangeLog
+++ b/dev-java/hibernate/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/hibernate
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/hibernate/ChangeLog,v 1.51 2015/06/13 11:37:30 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/hibernate/ChangeLog,v 1.52 2015/06/13 23:41:39 monsieurp Exp $
+
+  13 Jun 2015; Patrice Clement <monsieurp@gentoo.org>
+  -hibernate-3.1.3-r3.ebuild:
+  Drop old.
 
   13 Jun 2015; Agostino Sarubbo <ago@gentoo.org> hibernate-3.1.3-r4.ebuild:
   Stable for x86, wrt bug #551524
diff --git a/dev-java/hibernate/Manifest b/dev-java/hibernate/Manifest
index f0f6745efba7..464b15736ad0 100644
--- a/dev-java/hibernate/Manifest
+++ b/dev-java/hibernate/Manifest
@@ -2,24 +2,17 @@
 Hash: SHA256
 
 DIST hibernate-3.1.3.tar.gz 18529984 SHA256 e34feddabd7e1a432f11c670d08338720beb6c1dc5bb62952612f05260944c49 SHA512 5a5acf5abc82bbc38313148dc73cea981f69c68fb6b3023f1c6261a392853b5bd4a9852991011891e8b678ff0c35aea9554ebdd17e0da1b8fdf816ffcaca4dea WHIRLPOOL 0c2c6d5f0d5c04e9cb5e10f9eb22dbb796133791a57b8c4c18e780aa8eb637fd5fe2fa793da4885fdfe8902f7676bcce8e740219afc5176be4284bb575c99497
-EBUILD hibernate-3.1.3-r3.ebuild 1814 SHA256 a4b7efe4361a88cbab9d04ccd1ee2a8ad2407102d4c123e20a8c137340874906 SHA512 564220817c4fad1e8b55c7474a0b6e90de1ca74e5065074f901f76692f00dd7991fa040906944d9f5ae9c6697eb57200eec4fffe04e1361de169d757b0ab0e26 WHIRLPOOL 3c149dddb422fad3f18a74a3413f0ff7c2a3fa14bdb33bcf464e48bbab071331c847adfb7ca754113c5e57257fa4b0049947b6ecfa7ae58a6b67db5bcb1ff563
 EBUILD hibernate-3.1.3-r4.ebuild 2100 SHA256 802570db64b6a68119c64e320f561fb5aa2304bf5bd91827bfb8b09783b5514c SHA512 17b6403ce5fdb125f4dee8e13f4756567ea62b6e2735a9151b073fa2e79bb39788c07a1d0874e683d40af9fd96a864389ff08c2a08657d3ad0a2f797070bfc94 WHIRLPOOL 96e78048a164a079446470490426d7581d8238b92ef51487133943c2e778ae8abef316a11185661aa74cb1d2eaf791b6962eee021bc5bdfd972be646fb0b7250
-MISC ChangeLog 7411 SHA256 a705d04d8ff32447a277c8c8736502637a00ee66bd77ae4199dfeed794957460 SHA512 b1a53f141c8f285ce40aa052a372de9de99206433587b6f3a9d06e65fee305fea3f6e003b3adc446e91217240789b88180dc952138611fec3990709acf7ff5fd WHIRLPOOL d67324472e707de40662de69f1d28a258cb77595c2ee399b90668e63ee6a6ebef1b75c159cea18f6f76d5db76a4fad3ca5023eaaf332ca6aeed07e894a43b50c
+MISC ChangeLog 7514 SHA256 4c53bd7e1f06627ddf320f9f572b20258e4904343873fd170ea350554c21507c SHA512 8032578450ebc68cdaa08ae2879d3bf80c46c25b106280f34b805bfff059875b82ca05b536b5bec2bd996df91fcb4f4ab47011f35f0cda89d4dd1a7911ab67f1 WHIRLPOOL b18b1e043e828932ef119c419aa2cac30bcb90206dbe2f9b3f7ec8b1efab4ead8db97b773def5cba6d24fcb0d78cd3c147474206a52a8cf306a4dd08c24d80b8
 MISC metadata.xml 237 SHA256 42328874e697e7f822c6da29d0e674d25838616c12310070cfab28643b7a3461 SHA512 4214b2ee41cce5ccae91dc40a9925a97910dbc7ab1656b721aebfb820a602d0b1361c595158aca36832834121351ea9e92273abf8c7140a544c527b8103c2284 WHIRLPOOL 1e34df891ff004359e883337870d9566016d96955af654127724f43eff372b055093d47447363e1930fa16c8a0669bcd9e31a3315ac0150b3e9b46ed4a601654
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJVfBX7AAoJELp701BxlEWfwMwQAMEDUeMUblirHg+hkEmVj8Hy
-U6oTtXoYGhVI3rsnN6qWohz+ZHVrVjXok4FiteUfq0m1Jafoismvy585sLbTg0s0
-/6bjfIHfi+DB2RyEW1gFXOtyRAXhVSteEIGabwYvJSCpshvPTBMt3I9PPoz8fGEa
-Axh+b7C85tQOZ1TGbxI9scJGxyBcwQkq4jZ2pj2ul+RIWdR9DTcqocu9YUjRtvv2
-ih37qjqwWFSmLOKt43PuTuibuyqUBypOfWHitq/wxu8o8hbzzO1AIt0+cvm9Q29y
-uN+I4MuSVeVdMTPrikjmHPwmnbe1pJRL+2dpNZNkBuD65BkmWRDOXXckpj5MM0+F
-lZ66nPcG9Slm8X1eVd/K5Gjj+zqkb26osp5r8KKm1dBDk3QPNgRSuGGXOzbyYfNO
-8Nljee97i4+wI826bJWt8ZdNyxCA7Y5MRtV4/7h5Ly8DuvRGvIduTLKtBe26TKC3
-Od/DAZudvKVnvskDM+dUKWrFE2tS1+BFQHrkktAXIp58rgub3LBqXPimNR3dAB5x
-D3wSqiQ9KP7u01MPPXiqUVScqGGKMzyuFeCXJGWNApfn9BU5hmjQwCKywQ9kgii4
-La3B3ns0cjHzJyfxRZJ+CxCD5Yd0Y/ZvXCm6ZdzFa9XyetNWeZ6nswY7rw0LxfzA
-1qBk17R+EHkv11lEUJo5
-=rj5w
+iQEcBAEBCAAGBQJVfL86AAoJEJGRpfGTSRu4o3sIAJHgDkM1M+fudugyaMRyANKD
+3VBFnhPCp5NFi4HauHnQIKmUsHbgKnTD8mnXDjUEtDNpq6lQV/PegiA0Dz+O1s8c
++Z7aDf557zA2wkSl9IDEtmxR9+LBaSVPaU4grvQJ0SVclM84xN98qxne0ZDRFM1U
+kS+JW3kJwdqCTv9Ml9I69+Aw+JN61+ayV17cWkhjLrpNkue51noLeaqHMwPLwHpT
+yAJea26Ho6wZE+gKQRyCTAtNCXc8npxupPrMPbJ8sl04MzVu7JERWJddmWGNqPd9
+EMYVd3DMbGq+rudL2i/w6ZMYEgaGd2x3sErSNHA6Bx86GfQwzSK31ZH9hJiqZxY=
+=huoT
 -----END PGP SIGNATURE-----
diff --git a/dev-java/hibernate/hibernate-3.1.3-r3.ebuild b/dev-java/hibernate/hibernate-3.1.3-r3.ebuild
deleted file mode 100644
index 862d514911df..000000000000
--- a/dev-java/hibernate/hibernate-3.1.3-r3.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/hibernate/hibernate-3.1.3-r3.ebuild,v 1.3 2014/08/10 20:14:40 slyfox Exp $
-
-EAPI="2"
-WANT_ANT_TASKS="ant-antlr ant-swing ant-junit"
-JAVA_PKG_IUSE="doc source"
-JAVA_PKG_WANT_BOOTCLASSPATH="1.5"
-
-inherit java-pkg-2 java-ant-2
-
-MY_PV="3.1"
-DESCRIPTION="A powerful, ultra-high performance object / relational persistence and query service for Java"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-HOMEPAGE="http://www.hibernate.org"
-LICENSE="LGPL-2"
-IUSE=""
-SLOT="3.1"
-KEYWORDS="amd64 x86"
-
-COMMON_DEPEND="
-	>=dev-java/antlr-2.7.7:0[java]
-	dev-java/c3p0:0
-	dev-java/cglib:2.2
-	dev-java/commons-collections:0
-	dev-java/commons-logging:0
-	dev-java/dom4j:1
-	dev-java/ehcache:0
-	dev-java/oscache:0
-	dev-java/proxool:0
-	dev-java/swarmcache:1.0
-	java-virtuals/transaction-api
-	dev-java/sun-jacc-api:0
-	dev-java/ant-core:0
-	dev-java/asm:2.2"
-RDEPEND=">=virtual/jre-1.5
-	${COMMON_DEPEND}"
-DEPEND=">=virtual/jdk-1.5
-	${COMMON_DEPEND}"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-java_prepare() {
-	java-ant_rewrite-bootclasspath 1.5
-
-	# this depends on jboss
-	rm src/org/hibernate/cache/JndiBoundTreeCacheProvider.java \
-		src/org/hibernate/cache/TreeCache.java \
-		src/org/hibernate/cache/TreeCacheProvider.java
-
-	rm -v *.jar lib/*.jar || die
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_GENTOO_CLASSPATH="
-c3p0,commons-collections,commons-logging,cglib-2.2,transaction-api
-dom4j-1,ehcache,oscache,proxool,swarmcache-1.0
-sun-jacc-api,antlr,ant-core,asm-2.2
-"
-EANT_EXTRA_ARGS="-Dnosplash -Ddist.dir=dist"
-
-src_install() {
-	java-pkg_dojar hibernate3.jar
-	dodoc changelog.txt readme.txt
-	use doc && java-pkg_dohtml -r dist/doc/api doc/other doc/reference
-	use source && java-pkg_dosrc src/*
-}
diff --git a/dev-java/spin/ChangeLog b/dev-java/spin/ChangeLog
index 8905360d7a59..1a76aac252a0 100644
--- a/dev-java/spin/ChangeLog
+++ b/dev-java/spin/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/spin
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/spin/ChangeLog,v 1.23 2015/06/13 11:37:35 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/spin/ChangeLog,v 1.24 2015/06/13 23:42:38 monsieurp Exp $
+
+  13 Jun 2015; Patrice Clement <monsieurp@gentoo.org> -spin-1.5.ebuild:
+  Drop old.
 
   13 Jun 2015; Agostino Sarubbo <ago@gentoo.org> spin-1.5-r1.ebuild:
   Stable for x86, wrt bug #551524
diff --git a/dev-java/spin/Manifest b/dev-java/spin/Manifest
index 0be66057c390..ed947426d6ef 100644
--- a/dev-java/spin/Manifest
+++ b/dev-java/spin/Manifest
@@ -5,23 +5,16 @@ AUX 1.5-build.xml 8638 SHA256 3d12461c120fa893159383093dfe93386741a9b3df44466792
 AUX 1.5-maven-build.properties 673 SHA256 786fa052cb592effe0fa867f8c670665bee7b6770d6e07a8183aa82f1fd599aa SHA512 1004515f5a89a2d22409cd7553fb11767a4580d1288393516f4dc3c0efa0c149d7bc3e46fac93800e6481fc7885302730e52e9e518d6d7224a0d9220d0f3c3a2 WHIRLPOOL 18963767a383a147b3dd054e0da85a15c54d4ce828b481ee83a85ee15e4fab25f1ba16b8115affb09a89951ef077706c24f90ebd0de3d537441988c67708d979
 DIST spin-1.5-all.zip 482286 SHA256 5515bb6b6724c856e94271bc3bd11fcc0170cf37835bf5fd93026b98c6bf3594 SHA512 ce1fad3b138781359d472727b186722d6f1f23b7002dd1ada294efd80b3a9caf5de15207cdd682fcbfcafa85c63895c7dd9683fefb5ce5b09cc4115ae3733466 WHIRLPOOL f5e598f01d923cdc202e776fddcefe34abb1a312b5ec9ba68f3745431faf89fb58d9ee233b62225bd1a549ec0829a13bea126e8a3802ec78a72f9dc6ef01eb88
 EBUILD spin-1.5-r1.ebuild 1116 SHA256 3afc1c09eb27a9fbc0b2fa76fcaeca4796fb6f6c646dbc8eaaeaa303c72b5cc8 SHA512 f9f39b9cebe9afe80868c48dd4ed03032c23875f3229102bde47781bea55923af049ba08bc8491ecf0f7739bc7c3a102ef12b0459e0edb56c9128b658234dec7 WHIRLPOOL 15ca7a77cbe416acffa86b0fb3cbeb39833bee95fc32d56eaa6fe642bfec6d56877ffe34d9ed0830139a9bde1c868660bbc6383570eea6592a7f0c68b323e0c0
-EBUILD spin-1.5.ebuild 1118 SHA256 65cc3fd07446c2333ea9eac10082b80b39e8d44cb1ab8dacb9ac800293cf22be SHA512 4366c0f6a6895aca534d60db5f6bb068ee92a5dfabb5549c7cf8420db0aa1d97ffcba38b0cae834a7e33111fa853d5e16558603b3af706af84a80e567ab8a3f6 WHIRLPOOL be1ca10a7b2a87d13ded53bf002062e80d9627d09cc3d7741a3d3882e5d5d3f9ab746ab1a45f0d182ad8904a85fa92a39790aa40262ac48851078a27619d6390
-MISC ChangeLog 2865 SHA256 acdf194643a1f158d339e2f36dfffed0e6959b689cd1ceb767035b0caff54623 SHA512 8fe9013c447774a38a21765640320daa2debfd67d119d116d485ce4f25ae5d7e42fc7de39697f18f4752312433e6f7e25eefbce4ae3c0f400566899b190c5c17 WHIRLPOOL 0a819d2f65028407a5087c6d021e6758f4f1d53d54b39383ebc35331d38037873b106452a5ee830338d7d7f4d8814943da6a2f73324218d737ecc0a590eb6d22
+MISC ChangeLog 2956 SHA256 aae0a31151eb207feea61e9af63de7e6b982f56979e0090ae0d424b9f1f4c092 SHA512 283ce208fbd55b38d0a6ab6bdd1d507da52b3db747d0710d3d8f6291b0fbaf86a8b9576558de558d91e3b99b779b4c7fe7a7d4e78456642860691f55e7464727 WHIRLPOOL 56e090a63cf601286d36758fae35b714e2990a6c682c3ae642a614d49e36b191780d2d05971800e8573907403f3f8ce8a7543cc4e896d45c14a97db32e4f9e44
 MISC metadata.xml 232 SHA256 3842e9d1d0f702aed57b82ab72bde0dd9c7250e5e32524dcd7d4891a1632ff2a SHA512 261de7095dd63483a3dfdc0ed4e2571c53cd3beb844bd4e0e27990a718128393f29302c2f6516b0de01397b335fff8a334497acb7803d5edd87acdd88f62cf78 WHIRLPOOL 72e4d43324dd88fe6bcd7281e727903e26606722b3cffca2b7cb5a63ecadc203d1f6ef142d6df40b3a9cb22bbfdcf8f8419c67e3f042c78c1d2e533dbc317045
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJVfBYAAAoJELp701BxlEWfwdoQALuIchIGOLtlKitT7xarKAPC
-TSKqILSpEJ92FI4XFnEOMfYW3W9yMJ15Zirf4nqZRQLD8FDNljnwkGlWDLUp9+fX
-Xjl6M/159Rdr8CVlXL40mYKSR2tZPCODjFSPTONA+OEM42Y7tnUe/ibJcV/xgBSV
-qTmbjbkE4dNaaZ7Wuy1WlV1ZeCCPkHoQ0uKhuj6YVRRZ1gnNghokG99NsqHKrXN1
-6qf0o9zNht0rceoGVCoMISbjX77YgO2acjoxOo7O50C98qMcGNxTToZ4UCbg3EGk
-tRT/PLmC8PDU95AncoMMKsNrb8Mc8n+hrASwev+1X3Er2WqA7Io8Sy8Q2+9/7RDK
-NElVrBDYcPbydYBQ/95v6iu6vuOV9SpjmSC+iHDw75qYwh30xV/NfwPVhkanRbVC
-WpHGMfi0fDVIpRnvH0QQn70j+X70HQlv5q+pVa1jCBEEqlHFx4tUBFncSWNs63FB
-V+ZvtCRsW0fce6WvEpReThZ53WbozQ84U2Xt12aZOZqFw43SpRzCt+GgA4wVDWHs
-bzHPrgl48qQnHl4EYRvRlJzyEv5guy9JW48HoN+eBYpvXhEjoLk+Rson2+1T7Kzm
-bdadMjOPs1hQ1rmDnom6oYRJptRYJo1cLtau3EEChkHYnW30AqmsirS78S5wpjNm
-qVGmh/qJ9N8VGIOeqmMS
-=t2g1
+iQEcBAEBCAAGBQJVfL+ZAAoJEJGRpfGTSRu4SlQH/jQ/Tl1e9cChJorDJ9IQ3Gxp
+qR+Takc+HLNWztZqpDtiEHGh6Vw7epCpxCINAnTW4f2G4nenj9tg+6CqS3UUU2Eq
+Hz5827FyQQtTYTYpdpzBefqV0ZTvJZcmD9haaKSIRQNl9Gt1x3konGhReqlPIIzW
+4pFWBZ16V/Jf/1vmwIEplcFu9IZl6a4Eq+SaMhyvTpkuK26cLV4llyE7Hp3HfSUl
+6JHDdR0Jufm1//u0vgynNLHjaVNDjeBkeAC5s8nz7Tu9ZlsvSqwm+CebuJM8pfgs
+fQOzUhvtfkVIrwrZ+B7oqivlmt0K+Qz/bsiPcqBlc6tvpAVZcKSlP+56fDu+ux8=
+=R8Ee
 -----END PGP SIGNATURE-----
diff --git a/dev-java/spin/spin-1.5.ebuild b/dev-java/spin/spin-1.5.ebuild
deleted file mode 100644
index 67ca5fe5eeb4..000000000000
--- a/dev-java/spin/spin-1.5.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/spin/spin-1.5.ebuild,v 1.9 2014/08/10 20:24:10 slyfox Exp $
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Transparent threading solution for non-freezing Swing applications"
-HOMEPAGE="http://spin.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}-all.zip"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-
-COMMON_DEP="=dev-java/cglib-2.1*"
-DEPEND=">=virtual/jdk-1.4
-	app-arch/unzip
-	${COMMON_DEP}"
-RDEPEND=">=virtual/jre-1.4
-	${COMMON_DEP}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	cp "${FILESDIR}/${PV}-build.xml" build.xml || die
-	cp "${FILESDIR}/${PV}-maven-build.properties" maven-build.properties || die
-	rm -v lib/*.jar || die
-	java-pkg_filter-compiler jikes
-}
-
-EANT_GENTOO_CLASSPATH="cglib-2.1"
-
-# Needs X
-RESTRICT="test"
-
-src_test() {
-	ANT_TASKS="ant-junit" eant test
-}
-
-src_install() {
-	java-pkg_newjar target/${P}.jar
-
-	use doc && java-pkg_dojavadoc target/site/apidocs
-	use source && java-pkg_dosrc src/main/java/*
-}
diff --git a/dev-java/xstream/ChangeLog b/dev-java/xstream/ChangeLog
index ab2ebf3485f0..464f170944f9 100644
--- a/dev-java/xstream/ChangeLog
+++ b/dev-java/xstream/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/xstream
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/xstream/ChangeLog,v 1.35 2015/06/13 12:48:37 monsieurp Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xstream/ChangeLog,v 1.36 2015/06/13 23:44:19 monsieurp Exp $
+
+  13 Jun 2015; Patrice Clement <monsieurp@gentoo.org> -xstream-1.3.1-r1.ebuild,
+  -xstream-1.3.1-r2.ebuild:
+  Drop old.
 
 *xstream-1.3.1-r3 (13 Jun 2015)
 
diff --git a/dev-java/xstream/Manifest b/dev-java/xstream/Manifest
index 7d21e1d6e360..5ff96b89f474 100644
--- a/dev-java/xstream/Manifest
+++ b/dev-java/xstream/Manifest
@@ -2,19 +2,17 @@
 Hash: SHA256
 
 DIST xstream-distribution-1.3.1-src.zip 7505723 SHA256 df645ea4e2e16c4a149fb45966ea50d48b54776ead4727837348195daad94f6b SHA512 c8c92879a26599d7444fce0638ba13d185fd3c1f42962b92fe1b984d2ea41f8e434acb6af5613ac9f44354816fb7abc60f751f864f36deb9c2413b0caec5c2ac WHIRLPOOL 13ac006402bbecbf6d3ff9fe30662cc6e3807cdf3a391255f878cea37800842adc929914f2e4aace3a7788294809afb26edd64181f85a7e5dc46f3e1f9c0e9b6
-EBUILD xstream-1.3.1-r1.ebuild 2119 SHA256 1818fbdcc2d8b68d5b2d702a67322efde5d60a325322c12f836c11696430cbbd SHA512 6027eba9cb7e37d2c81a1bebb6a9f5b7eb67b68cdbb363f43978ab584a5680cea82757fe0a255282f8589134bee3ca76d70d20a7d6f97cf86f0c88e9a38e0e6e WHIRLPOOL 59fc0ea003834ab1d54da6c2994b1bfb79c6dd9a0912d4449faef9d3a41f60917683d80a20d70b3a7d3965b9446dd686168beb535b7fd8e9892d8e4b57c1a742
-EBUILD xstream-1.3.1-r2.ebuild 2090 SHA256 9440b782edd144b5fb1a3d7018c40e84da284f8bc3a66504eba04d77e5d705b8 SHA512 7926d05a14a811fe72c72be4be58335b9732ddeb5cfe7d012a663e5d017c104a8a7a9ff718ff9eee6252982f2be43ef6e3bbd435bc5300f7853c6d36b6873ad2 WHIRLPOOL 2300327f5496d8c6a7667b7ac72c3a48b5c5ab64b1838ebcf86096f2bd81b872c59074499c5c3148e441333570fd5d1e30b885fef69538452c60f7618098c3ad
 EBUILD xstream-1.3.1-r3.ebuild 2103 SHA256 3217373aea723d37a13dd9ab313386d3683109a3ad179fe4a267860bcf5d7b65 SHA512 e4731b37a280d964242120c2f480381bd72aed0bd1205e8831afed88fa1261ac118a0d2224094e3637de61f20b0d1dcd820cc0f91f67e40b922e38bdf7f7fcc8 WHIRLPOOL 0f0f9622e8498d628d5ad43963d01af094ad8b7ecd24af012a669cecdddc888f142f6374a5398c41564c3e7a92cbd2f071d2864f4b54de26ce698b8ff36c88d8
-MISC ChangeLog 5064 SHA256 8a084f185f2e3e64e0deb28bf99b0e538fa26befe694eea997244d04e659cf62 SHA512 c194a70fb7f44549627c5ccf8d50fac0c3a6b46eb758b3d4a2f1f16d063b69006ec17b495a654a950b303b98a51a577a194b12deebaddd51e2d0a6ea4172781a WHIRLPOOL 1bc378a012b212dcc8a1ae8335490c7a0346699fca13c4db5dc1fd2b5fe188856a432e134595c57d5718a8236e8af63c0f687517ad67aa134ddb20f50db7b422
+MISC ChangeLog 5185 SHA256 3def9a68afac47493b3312269758e65460d002c7f09f23fad03a87f42179f928 SHA512 33080d11c40f17b35a5f6c18cf1ac0e9bf853c42f68e0120ae32f6afd4d7f3596bfd5e8c2e40e49fb4634244f56c8fed7749a7062c13797c3b155f9665044661 WHIRLPOOL 1cf96f6826eeeb05487ec5dd111b8be89a79472f8db29516714cd077910d10b0af46c8d1c4694b25f9709f04d1f4262510128dcb6408a4ed816689d85459096c
 MISC metadata.xml 158 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb SHA512 54f88fc3270968439ba87295b04365a89101c55d33a8c209a56036dc60244e5c73f78ec09484b3e5af28de9dee2159b1dab670cbd5d80a9e0c4543145c0390a3 WHIRLPOOL fcffc4fb6751b5a6eec33aa833f9d7dea0168d3ab67f7e34565370f92fd917ed882bcc57585481bf4d31e601f83a592d99d1c3f50fc793f1c38cd174cc8b2f26
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJVfCYpAAoJEJGRpfGTSRu4MD4H/3l4t/APPIXEQC9BTDybuMJh
-ZRGZGz1ckU8H9fS4pkKge7Eywx02UvpXFuqk0l9bAQfbYnJr2wRBZ3nwOLJe6i1U
-w9SLZxhX3fOpkB1C13leMtMM/hYWxY/kZSvpgWLQSPaZoU/Akk3yFfQL9ZEwJj1P
-OeuFkC9eLsdZABlIpmtq9XsXO7/89vPEjPX4Hog8bu2lxzEhFvUL5YbPta5YHveY
-FGJMx51Adk+yOKGzvWWcLSQHaZ/onxdQqsKCunVIF6BnAzw64mqn23wVR9xaEL9O
-LRTGTPSm7v0Jg1scahCo+Qqpd68zTmlGuZ/H8fE05dQBkiuGUJZhFrMDxTCiEQo=
-=6DUS
+iQEcBAEBCAAGBQJVfMACAAoJEJGRpfGTSRu4/VUIAJ+KG+TzgU84gGr1AYgdjxbB
+yHiQcvUgjWRHLOl+/+bJl/N5yT6vTzNY3Z6X6q23ogIL13ED0nkvgNzsniK1CuZi
+urbny3McJbfkHKgNhloHsC43g/EKtOcZ6D7Yu9HMkwh+Jq/GeSbldb2MG/WcFELP
+V0IlkcqocltGRQebIiiHDWTgIAbe+0cIf1goLWJx796HUBRo+ZuhEvx9FW0g0chT
+Et+lYYbld/IEQYhRi0lQtp1BlWS5OXdRchmC0z3J+GSVUxS9qiU35E2UQNgACZmL
+8cBrthHlgrtor7JPP8hbsi4g1L18XxI4rh8VKHpIzXSPaUYVRf9yxy5Q3qjLe/w=
+=Z9hl
 -----END PGP SIGNATURE-----
diff --git a/dev-java/xstream/xstream-1.3.1-r1.ebuild b/dev-java/xstream/xstream-1.3.1-r1.ebuild
deleted file mode 100644
index e3d38da604bf..000000000000
--- a/dev-java/xstream/xstream-1.3.1-r1.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/xstream/xstream-1.3.1-r1.ebuild,v 1.9 2014/10/19 04:08:35 patrick Exp $
-
-EAPI=1
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="A text-processing Java classes that serialize objects to XML and back again"
-HOMEPAGE="http://xstream.codehaus.org/index.html"
-SRC_URI="http://repository.codehaus.org/com/thoughtworks/${PN}/${PN}-distribution/${PV}/${PN}-distribution-${PV}-src.zip"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-
-IUSE=""
-
-COMMON_DEPS="
-	dev-java/cglib:2.2
-	dev-java/dom4j:1
-	dev-java/jdom:1.0
-	dev-java/joda-time:0
-	dev-java/xom:0
-	dev-java/xpp3:0
-	dev-java/xml-commons-external:1.3
-	dev-java/jettison:0
-	java-virtuals/stax-api
-	"
-
-DEPEND="
-	>=virtual/jdk-1.5
-	app-arch/unzip
-	test? (
-		dev-java/ant-junit
-		dev-java/ant-trax
-		dev-java/junit:0
-		dev-java/xml-writer:0
-		dev-java/commons-lang:2.1
-		dev-java/jmock:1.0
-		dev-java/jakarta-oro:2.0
-		dev-java/stax:0
-		dev-java/wstx:3.2
-	)
-	${COMMON_DEPS}"
-RDEPEND="
-	>=virtual/jre-1.5
-	${COMMON_DEPS}"
-
-S="${WORKDIR}/${P}/${PN}"
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}/lib"
-	rm -v *.jar || die
-	rm -rf jdk1.3 || die
-}
-
-EANT_GENTOO_CLASSPATH="xpp3,jdom-1.0,xom,dom4j-1,joda-time,cglib-2.2
-xml-commons-external-1.3,jettison,stax-api"
-
-EANT_BUILD_TARGET="benchmark:compile jar"
-EANT_EXTRA_ARGS="-Dversion=${PV}"
-
-src_test(){
-	EANT_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH}
-		junit,jmock-1.0,commons-lang-2.1,xml-writer,wstx-3.2,stax,jakarta-oro-2.0" \
-		ANT_TASKS="ant-junit ant-trax" eant test || die "Tests failed"
-}
-
-src_install(){
-	java-pkg_newjar target/${P}.jar
-	java-pkg_newjar target/${PN}-benchmark-${PV}.jar ${PN}-benchmark.jar
-
-	use doc && java-pkg_dojavadoc target/javadoc
-	use source && java-pkg_dosrc src/java/com
-}
-
-pkg_postinst(){
-	elog "Major Changes from 1.2 See:"
-	elog "http://xstream.codehaus.org/changes.html"
-	elog "to prevent breakage ..."
-}
diff --git a/dev-java/xstream/xstream-1.3.1-r2.ebuild b/dev-java/xstream/xstream-1.3.1-r2.ebuild
deleted file mode 100644
index 862cfdd1b32b..000000000000
--- a/dev-java/xstream/xstream-1.3.1-r2.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/xstream/xstream-1.3.1-r2.ebuild,v 1.3 2015/06/13 11:37:40 ago Exp $
-
-EAPI=5
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="A text-processing Java classes that serialize objects to XML and back again"
-HOMEPAGE="http://xstream.codehaus.org/index.html"
-SRC_URI="http://repository.codehaus.org/com/thoughtworks/${PN}/${PN}-distribution/${PV}/${PN}-distribution-${PV}-src.zip"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-
-IUSE=""
-
-CDEPEND="
-	dev-java/cglib:3
-	dev-java/dom4j:1
-	dev-java/jdom:1.0
-	dev-java/joda-time:0
-	dev-java/xom:0
-	dev-java/xpp3:0
-	dev-java/xml-commons-external:1.3
-	dev-java/jettison:0
-	java-virtuals/stax-api
-	"
-
-DEPEND="
-	>=virtual/jdk-1.6
-	app-arch/unzip
-	test? (
-		dev-java/ant-junit
-		dev-java/ant-trax
-		dev-java/junit:0
-		dev-java/xml-writer:0
-		dev-java/commons-lang:2.1
-		dev-java/jmock:1.0
-		dev-java/jakarta-oro:2.0
-		dev-java/stax:0
-		dev-java/wstx:3.2
-	)
-	${CDEPEND}"
-RDEPEND="
-	>=virtual/jre-1.6
-	${CDEPEND}"
-
-S="${WORKDIR}/${P}/${PN}"
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}/lib"
-	rm -v *.jar || die
-	rm -rf jdk1.3 || die
-}
-
-EANT_GENTOO_CLASSPATH="xpp3,jdom-1.0,xom,dom4j-1,joda-time,cglib-3
-xml-commons-external-1.3,jettison,stax-api"
-
-EANT_BUILD_TARGET="benchmark:compile jar"
-EANT_EXTRA_ARGS="-Dversion=${PV}"
-
-src_test(){
-	EANT_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH}
-		junit,jmock-1.0,commons-lang-2.1,xml-writer,wstx-3.2,stax,jakarta-oro-2.0" \
-		ANT_TASKS="ant-junit ant-trax" eant test || die "Tests failed"
-}
-
-src_install(){
-	java-pkg_newjar target/${P}.jar
-	java-pkg_newjar target/${PN}-benchmark-${PV}.jar ${PN}-benchmark.jar
-
-	use doc && java-pkg_dojavadoc target/javadoc
-	use source && java-pkg_dosrc src/java/com
-}
-
-pkg_postinst(){
-	elog "Major Changes from 1.2 See:"
-	elog "http://xstream.codehaus.org/changes.html"
-	elog "to prevent breakage ..."
-}