[gentoo-commits] repo/gentoo:master commit in: dev-java/spring-aop/, dev-java/spring-instrument/, dev-java/spring-beans/, ...

[Michał Górny]

commit:     fe2b5d8efef5a681b8b1576bb88467b3fa11411c
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 29 10:20:01 2018 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Sep 29 10:22:48 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe2b5d8e

dev-java/spring-*: Remove last-rited packages

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 dev-java/spring-aop/Manifest                       |   2 -
 dev-java/spring-aop/metadata.xml                   |  18 ----
 dev-java/spring-aop/spring-aop-3.2.4.ebuild        |  72 --------------
 dev-java/spring-beans/Manifest                     |   2 -
 dev-java/spring-beans/metadata.xml                 |  18 ----
 dev-java/spring-beans/spring-beans-3.2.4.ebuild    |  63 ------------
 dev-java/spring-core/Manifest                      |   2 -
 dev-java/spring-core/metadata.xml                  |  18 ----
 dev-java/spring-core/spring-core-3.2.4.ebuild      |  83 ----------------
 dev-java/spring-expression/Manifest                |   2 -
 dev-java/spring-expression/metadata.xml            |  18 ----
 .../spring-expression-3.2.4.ebuild                 |  60 ------------
 dev-java/spring-instrument/Manifest                |   2 -
 .../files/spring-instrument-3.2.4-build.xml        | 109 ---------------------
 dev-java/spring-instrument/metadata.xml            |  18 ----
 .../spring-instrument-3.2.4.ebuild                 |  61 ------------
 profiles/package.mask                              |  11 ---
 17 files changed, 559 deletions(-)

diff --git a/dev-java/spring-aop/Manifest b/dev-java/spring-aop/Manifest
deleted file mode 100644
index f63921fef4c..00000000000
--- a/dev-java/spring-aop/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST spring-framework-3.2.4-buildscripts.tar.bz2 2894 BLAKE2B da3bc9130a054c874303fa10d796566cc1a7a043adce0aa15fdcf67b4bb529a97af9611357f3a8c2e192b0bf89fa0e2877416d19a1a742891de74d2b7acac1a2 SHA512 003551ffd37501c8b8dceba7ca484709cdf05f96c893d35c33161288770d72f70c092917f79216aa71742e045cb71ddcb17e6b58a2221fe2c153a70e5e0346b9
-DIST spring-framework-3.2.4.tar.gz 8925304 BLAKE2B ecc8b52f8dad35f7118f1231355f71a2f1e89afe4d1105afe3878e9f9150f519eae6660403856af09b79f178870bfa99657f3502389d2192f6c9860f6e6e35b6 SHA512 6a8fe58213f105deaa982b188e7b49a5bd9e0cf32917c568423509fed6b7c708cb5ca42ee7b3818327d673e59e7af7c67c13707e8a635329540b2febddda0f1b

diff --git a/dev-java/spring-aop/metadata.xml b/dev-java/spring-aop/metadata.xml
deleted file mode 100644
index 73672eec8b7..00000000000
--- a/dev-java/spring-aop/metadata.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>java@g.o</email>
-		<name>Java</name>
-	</maintainer>
-	<longdescription>
-		The Spring Framework provides a comprehensive programming and configuration model for
-		modern Java-based enterprise applications - on any kind of deployment platform. A key
-		element of Spring is infrastructural support at the application level: Spring focuses
-		on the "plumbing" of enterprise applications so that teams can focus on application-level
-		business logic, without unnecessary ties to specific deployment environments.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">SpringSource/spring-framework</remote-id>
-	</upstream>
-</pkgmetadata>

diff --git a/dev-java/spring-aop/spring-aop-3.2.4.ebuild b/dev-java/spring-aop/spring-aop-3.2.4.ebuild
deleted file mode 100644
index 66f482a9c87..00000000000
--- a/dev-java/spring-aop/spring-aop-3.2.4.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="A comprehensive programming and configuration model for enterprise applications"
-HOMEPAGE="http://www.springsource.org/spring-framework"
-SRC_URI="https://github.com/SpringSource/spring-framework/archive/v${PV}.RELEASE.tar.gz -> spring-framework-${PV}.tar.gz
-		https://dev.gentoo.org/~ercpe/distfiles/dev-java/spring-framework/spring-framework-${PV}-buildscripts.tar.bz2"
-
-LICENSE="Apache-2.0"
-SLOT="3.2"
-KEYWORDS="~amd64 ~x86"
-
-IUSE=""
-
-CDEPEND="dev-java/spring-core:${SLOT}
-	dev-java/spring-beans:${SLOT}
-	dev-java/aopalliance:1
-	dev-java/aspectj:0
-	dev-java/commons-logging:0
-	dev-java/commons-pool:0
-	dev-java/jamon:1"
-
-DEPEND=">=virtual/jdk-1.7
-	test? (
-		dev-java/hamcrest-core:1.3
-		dev-java/hamcrest-library:1.3
-		dev-java/junit:4
-		dev-java/mockito:0
-		dev-java/ant-junit4:0
-		dev-java/xmlunit:1
-	)
-	${CDEPEND}"
-
-RDEPEND=">=virtual/jre-1.7
-	${CDEPEND}"
-
-S="${WORKDIR}/spring-framework-${PV}.RELEASE/"
-
-EANT_BUILD_XML=${S}/${PN}/build.xml
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_GENTOO_CLASSPATH="spring-core-${SLOT}
-	spring-beans-${SLOT}
-	aopalliance-1
-	aspectj
-	commons-logging
-	commons-pool
-	jamon-1"
-
-EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH}
-	hamcrest-library-1.3
-	hamcrest-core-1.3
-	junit-4
-	mockito
-	xmlunit-1"
-
-src_install() {
-	java-pkg_dojar "${S}"/${PN}/dist/${PN}.jar
-
-	use source && java-pkg_dosrc "${S}"/${PN}/src/main/java/org/
-	use doc && java-pkg_dojavadoc "${S}"/${PN}/dist/apidocs/
-}
-
-src_test() {
-	java-pkg-2_src_test
-}

diff --git a/dev-java/spring-beans/Manifest b/dev-java/spring-beans/Manifest
deleted file mode 100644
index f63921fef4c..00000000000
--- a/dev-java/spring-beans/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST spring-framework-3.2.4-buildscripts.tar.bz2 2894 BLAKE2B da3bc9130a054c874303fa10d796566cc1a7a043adce0aa15fdcf67b4bb529a97af9611357f3a8c2e192b0bf89fa0e2877416d19a1a742891de74d2b7acac1a2 SHA512 003551ffd37501c8b8dceba7ca484709cdf05f96c893d35c33161288770d72f70c092917f79216aa71742e045cb71ddcb17e6b58a2221fe2c153a70e5e0346b9
-DIST spring-framework-3.2.4.tar.gz 8925304 BLAKE2B ecc8b52f8dad35f7118f1231355f71a2f1e89afe4d1105afe3878e9f9150f519eae6660403856af09b79f178870bfa99657f3502389d2192f6c9860f6e6e35b6 SHA512 6a8fe58213f105deaa982b188e7b49a5bd9e0cf32917c568423509fed6b7c708cb5ca42ee7b3818327d673e59e7af7c67c13707e8a635329540b2febddda0f1b

diff --git a/dev-java/spring-beans/metadata.xml b/dev-java/spring-beans/metadata.xml
deleted file mode 100644
index 73672eec8b7..00000000000
--- a/dev-java/spring-beans/metadata.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>java@g.o</email>
-		<name>Java</name>
-	</maintainer>
-	<longdescription>
-		The Spring Framework provides a comprehensive programming and configuration model for
-		modern Java-based enterprise applications - on any kind of deployment platform. A key
-		element of Spring is infrastructural support at the application level: Spring focuses
-		on the "plumbing" of enterprise applications so that teams can focus on application-level
-		business logic, without unnecessary ties to specific deployment environments.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">SpringSource/spring-framework</remote-id>
-	</upstream>
-</pkgmetadata>

diff --git a/dev-java/spring-beans/spring-beans-3.2.4.ebuild b/dev-java/spring-beans/spring-beans-3.2.4.ebuild
deleted file mode 100644
index faa27415ff9..00000000000
--- a/dev-java/spring-beans/spring-beans-3.2.4.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="A comprehensive programming and configuration model for enterprise applications"
-HOMEPAGE="http://www.springsource.org/spring-framework"
-SRC_URI="https://github.com/SpringSource/spring-framework/archive/v${PV}.RELEASE.tar.gz -> spring-framework-${PV}.tar.gz
-		https://dev.gentoo.org/~ercpe/distfiles/dev-java/spring-framework/spring-framework-${PV}-buildscripts.tar.bz2"
-
-LICENSE="Apache-2.0"
-SLOT="3.2"
-KEYWORDS="amd64 x86"
-
-IUSE=""
-
-CDEPEND="
-	dev-java/commons-logging:0
-	java-virtuals/servlet-api:3.0
-	dev-java/javax-inject:0
-	dev-java/spring-core:${SLOT}"
-
-DEPEND=">=virtual/jdk-1.7
-	test? (
-		dev-java/hamcrest-core:1.3
-		dev-java/hamcrest-library:1.3
-		dev-java/junit:4
-		dev-java/mockito:0
-		dev-java/ant-junit4:0
-		dev-java/xmlunit:1
-	)
-	${CDEPEND}"
-
-RDEPEND=">=virtual/jre-1.7
-	${CDEPEND}"
-
-S="${WORKDIR}/spring-framework-${PV}.RELEASE/"
-
-EANT_BUILD_XML=${S}/${PN}/build.xml
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_GENTOO_CLASSPATH="spring-core-${SLOT},commons-logging,servlet-api-3.0,javax-inject"
-EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH}
-	hamcrest-library-1.3
-	hamcrest-core-1.3
-	junit-4
-	mockito
-	xmlunit-1"
-
-src_install() {
-	java-pkg_dojar "${S}"/${PN}/dist/${PN}.jar
-
-	use source && java-pkg_dosrc "${S}"/${PN}/src/main/java/org/
-	use doc && java-pkg_dojavadoc "${S}"/${PN}/dist/apidocs/
-}
-
-src_test() {
-	java-pkg-2_src_test
-}

diff --git a/dev-java/spring-core/Manifest b/dev-java/spring-core/Manifest
deleted file mode 100644
index f63921fef4c..00000000000
--- a/dev-java/spring-core/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST spring-framework-3.2.4-buildscripts.tar.bz2 2894 BLAKE2B da3bc9130a054c874303fa10d796566cc1a7a043adce0aa15fdcf67b4bb529a97af9611357f3a8c2e192b0bf89fa0e2877416d19a1a742891de74d2b7acac1a2 SHA512 003551ffd37501c8b8dceba7ca484709cdf05f96c893d35c33161288770d72f70c092917f79216aa71742e045cb71ddcb17e6b58a2221fe2c153a70e5e0346b9
-DIST spring-framework-3.2.4.tar.gz 8925304 BLAKE2B ecc8b52f8dad35f7118f1231355f71a2f1e89afe4d1105afe3878e9f9150f519eae6660403856af09b79f178870bfa99657f3502389d2192f6c9860f6e6e35b6 SHA512 6a8fe58213f105deaa982b188e7b49a5bd9e0cf32917c568423509fed6b7c708cb5ca42ee7b3818327d673e59e7af7c67c13707e8a635329540b2febddda0f1b

diff --git a/dev-java/spring-core/metadata.xml b/dev-java/spring-core/metadata.xml
deleted file mode 100644
index 73672eec8b7..00000000000
--- a/dev-java/spring-core/metadata.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>java@g.o</email>
-		<name>Java</name>
-	</maintainer>
-	<longdescription>
-		The Spring Framework provides a comprehensive programming and configuration model for
-		modern Java-based enterprise applications - on any kind of deployment platform. A key
-		element of Spring is infrastructural support at the application level: Spring focuses
-		on the "plumbing" of enterprise applications so that teams can focus on application-level
-		business logic, without unnecessary ties to specific deployment environments.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">SpringSource/spring-framework</remote-id>
-	</upstream>
-</pkgmetadata>

diff --git a/dev-java/spring-core/spring-core-3.2.4.ebuild b/dev-java/spring-core/spring-core-3.2.4.ebuild
deleted file mode 100644
index 6d952cd9bc7..00000000000
--- a/dev-java/spring-core/spring-core-3.2.4.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc source test"
-WANT_ANT_TASKS="dev-java/jarjar:1 dev-java/ant-junit:0"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="A comprehensive programming and configuration model for enterprise applications"
-HOMEPAGE="http://www.springsource.org/spring-framework"
-SRC_URI="https://github.com/SpringSource/spring-framework/archive/v${PV}.RELEASE.tar.gz -> spring-framework-${PV}.tar.gz
-		https://dev.gentoo.org/~ercpe/distfiles/dev-java/spring-framework/spring-framework-${PV}-buildscripts.tar.bz2"
-
-LICENSE="Apache-2.0"
-SLOT="3.2"
-KEYWORDS="amd64 x86"
-
-IUSE=""
-
-CDEPEND="
-	dev-java/commons-logging:0
-	dev-java/log4j:0
-	dev-java/aspectj:0
-	dev-java/asm:4
-	dev-java/cglib:3
-	dev-java/jopt-simple:4.4
-"
-
-DEPEND=">=virtual/jdk-1.7
-	test? (
-		>=dev-java/junit-4.11:4
-		dev-java/hamcrest-core:1.3
-		dev-java/hamcrest-library:1.3
-		dev-java/mockito:0
-		dev-java/xmlunit:1
-	)
-	${CDEPEND}"
-
-RDEPEND=">=virtual/jre-1.7
-	${CDEPEND}"
-
-S="${WORKDIR}/spring-framework-${PV}.RELEASE/"
-
-EANT_BUILD_XML=${S}/${PN}/build.xml
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_GENTOO_CLASSPATH="
-	commons-logging
-	log4j
-	aspectj
-	jopt-simple-4.4
-	asm-4"
-
-EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH}
-	hamcrest-library-1.3
-	hamcrest-core-1.3
-	junit-4
-	mockito
-	xmlunit-1
-	junit-4"
-
-java_prepare() {
-	# see build.xml
-	mkdir "${S}/${PN}/lib/" || die
-	java-pkg_jar-from --build-only --into "${S}/${PN}/lib/" asm-4
-	java-pkg_jar-from --build-only --into "${S}/${PN}/lib/" cglib-3 cglib.jar
-
-	# broken test.
-	rm -v ${PN}/src/test/java/org/springframework/core/annotation/AnnotationUtilsTests.java
-}
-
-src_install() {
-	java-pkg_dojar "${S}"/${PN}/dist/{${PN},asm-renamed,cglib-renamed}.jar
-
-	use source && java-pkg_dosrc "${S}"/${PN}/src/main/java/org/
-	use doc && java-pkg_dojavadoc "${S}"/${PN}/dist/apidocs/
-}
-
-src_test() {
-	java-pkg-2_src_test
-}

diff --git a/dev-java/spring-expression/Manifest b/dev-java/spring-expression/Manifest
deleted file mode 100644
index f63921fef4c..00000000000
--- a/dev-java/spring-expression/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST spring-framework-3.2.4-buildscripts.tar.bz2 2894 BLAKE2B da3bc9130a054c874303fa10d796566cc1a7a043adce0aa15fdcf67b4bb529a97af9611357f3a8c2e192b0bf89fa0e2877416d19a1a742891de74d2b7acac1a2 SHA512 003551ffd37501c8b8dceba7ca484709cdf05f96c893d35c33161288770d72f70c092917f79216aa71742e045cb71ddcb17e6b58a2221fe2c153a70e5e0346b9
-DIST spring-framework-3.2.4.tar.gz 8925304 BLAKE2B ecc8b52f8dad35f7118f1231355f71a2f1e89afe4d1105afe3878e9f9150f519eae6660403856af09b79f178870bfa99657f3502389d2192f6c9860f6e6e35b6 SHA512 6a8fe58213f105deaa982b188e7b49a5bd9e0cf32917c568423509fed6b7c708cb5ca42ee7b3818327d673e59e7af7c67c13707e8a635329540b2febddda0f1b

diff --git a/dev-java/spring-expression/metadata.xml b/dev-java/spring-expression/metadata.xml
deleted file mode 100644
index 73672eec8b7..00000000000
--- a/dev-java/spring-expression/metadata.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>java@g.o</email>
-		<name>Java</name>
-	</maintainer>
-	<longdescription>
-		The Spring Framework provides a comprehensive programming and configuration model for
-		modern Java-based enterprise applications - on any kind of deployment platform. A key
-		element of Spring is infrastructural support at the application level: Spring focuses
-		on the "plumbing" of enterprise applications so that teams can focus on application-level
-		business logic, without unnecessary ties to specific deployment environments.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">SpringSource/spring-framework</remote-id>
-	</upstream>
-</pkgmetadata>

diff --git a/dev-java/spring-expression/spring-expression-3.2.4.ebuild b/dev-java/spring-expression/spring-expression-3.2.4.ebuild
deleted file mode 100644
index 28c4fb28511..00000000000
--- a/dev-java/spring-expression/spring-expression-3.2.4.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="A comprehensive programming and configuration model for enterprise applications"
-HOMEPAGE="http://www.springsource.org/spring-framework"
-SRC_URI="https://github.com/SpringSource/spring-framework/archive/v${PV}.RELEASE.tar.gz -> spring-framework-${PV}.tar.gz
-		https://dev.gentoo.org/~ercpe/distfiles/dev-java/spring-framework/spring-framework-${PV}-buildscripts.tar.bz2"
-
-LICENSE="Apache-2.0"
-SLOT="3.2"
-KEYWORDS="~amd64 ~x86"
-
-IUSE=""
-
-CDEPEND="dev-java/spring-core:${SLOT}"
-
-DEPEND=">=virtual/jdk-1.7
-	test? (
-		dev-java/hamcrest-core:1.3
-		dev-java/hamcrest-library:1.3
-		dev-java/junit:4
-		dev-java/mockito:0
-		dev-java/ant-junit4:0
-		dev-java/xmlunit:1
-	)
-	${CDEPEND}"
-
-RDEPEND=">=virtual/jre-1.7
-	${CDEPEND}"
-
-S="${WORKDIR}/spring-framework-${PV}.RELEASE/"
-
-EANT_BUILD_XML=${S}/${PN}/build.xml
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-EANT_GENTOO_CLASSPATH="spring-core-${SLOT}"
-
-EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH}
-	hamcrest-library-1.3
-	hamcrest-core-1.3
-	junit-4
-	mockito
-	xmlunit-1"
-
-src_install() {
-	java-pkg_dojar "${S}"/${PN}/dist/${PN}.jar
-
-	use source && java-pkg_dosrc "${S}"/${PN}/src/main/java/org/
-	use doc && java-pkg_dojavadoc "${S}"/${PN}/dist/apidocs/
-}
-
-src_test() {
-	java-pkg-2_src_test
-}

diff --git a/dev-java/spring-instrument/Manifest b/dev-java/spring-instrument/Manifest
deleted file mode 100644
index f63921fef4c..00000000000
--- a/dev-java/spring-instrument/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST spring-framework-3.2.4-buildscripts.tar.bz2 2894 BLAKE2B da3bc9130a054c874303fa10d796566cc1a7a043adce0aa15fdcf67b4bb529a97af9611357f3a8c2e192b0bf89fa0e2877416d19a1a742891de74d2b7acac1a2 SHA512 003551ffd37501c8b8dceba7ca484709cdf05f96c893d35c33161288770d72f70c092917f79216aa71742e045cb71ddcb17e6b58a2221fe2c153a70e5e0346b9
-DIST spring-framework-3.2.4.tar.gz 8925304 BLAKE2B ecc8b52f8dad35f7118f1231355f71a2f1e89afe4d1105afe3878e9f9150f519eae6660403856af09b79f178870bfa99657f3502389d2192f6c9860f6e6e35b6 SHA512 6a8fe58213f105deaa982b188e7b49a5bd9e0cf32917c568423509fed6b7c708cb5ca42ee7b3818327d673e59e7af7c67c13707e8a635329540b2febddda0f1b

diff --git a/dev-java/spring-instrument/files/spring-instrument-3.2.4-build.xml b/dev-java/spring-instrument/files/spring-instrument-3.2.4-build.xml
deleted file mode 100644
index 3175f36774f..00000000000
--- a/dev-java/spring-instrument/files/spring-instrument-3.2.4-build.xml
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<project name="spring-instrument" default="jar" basedir=".">
-
-	<property name="src.dir" value="${basedir}/src/main/java" />
-	<property name="resources.dir" value="${basedir}/src/main/resources" />
-
-	<property name="test.src.dir" value="${basedir}/src/test/java" />
-	<property name="test.resources.dir" value="${basedir}/src/test/resources" />
-	
-	<property name="reports.tests" value="${basedir}/test-output" />
-	<property name="classes.dir" value="${basedir}/classes" />
-	<property name="classes.dir.test" value="${basedir}/classes-test" />
-	<property name="dist.dir" value="${basedir}/dist" />
-
-	<property name="jar.file" value="${dist.dir}/${ant.project.name}.jar" />
-	
-	<target name="clean" description="Clean the output directory">
-		<delete dir="${classes.dir}" />
-	</target>
-
-	<target name="compile" depends="clean">
-		<mkdir dir="${classes.dir}" />
-
-		<javac destdir="${classes.dir}" nowarn="false" debug="true" optimize="true" deprecation="false" target="1.5" verbose="false" fork="false" source="1.5">
-			<src>
-				<pathelement location="${src.dir}" />
-			</src>
-		</javac>
-	</target>
-
-	<!-- this target gets called from the other spring-* build.xml files to compile the required test utils -->
-	<target name="compile-instrument-testutils">
-		<mkdir dir="${classes.dir.test}" />
-		<javac destdir="${classes.dir.test}" nowarn="false" debug="true" optimize="true" deprecation="false" target="1.5" verbose="false" fork="false" source="1.5">
-			<src path="${test.src.dir}" />
-
-			<!-- these excludes are a little bit fuzzy, but they should work -->
-			<exclude name="org/springframework/**/*Tests.java"/>
-			<exclude name="org/springframework/**/*TestCase.java"/>
-
-			<classpath>
-				<pathelement location="${classes.dir}" />
-			</classpath>
-		</javac>
-		
-		<copy todir="${classes.dir.test}" verbose="true">
-			<fileset dir="${test.resources.dir}"/>
-		</copy>
-	</target>
-
-	<target name="compile-tests" depends="compile-instrument-testutils">
-		<ant antfile="${basedir}/../spring-core/build.xml" target="compile-core-testutils" dir="${basedir}/../spring-core/" inheritall="false" />
-
-		<mkdir dir="${classes.dir.test}" />
-		<javac destdir="${classes.dir.test}" nowarn="false" debug="true" optimize="true" deprecation="false" target="1.5" verbose="false" fork="false" source="1.5">
-			<src path="${test.src.dir}" />
-			<exclude name="**/DirectFieldAccessorTests.java"/> <!-- tries to instantiate a JPanel which needs an X-Server -->
-
-			<classpath>
-				<pathelement location="${classes.dir}" />
-
-				<pathelement location="${basedir}/../spring-core/classes-test" />
-			</classpath>
-		</javac>
-
-		<copy todir="${classes.dir.test}" verbose="true">
-			<fileset dir="${test.resources.dir}"/>
-		</copy>
-	</target>
-
-	<target name="test" depends="jar, compile-tests">
-		<mkdir dir="${reports.tests}" />
-		<junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="true" dir=".">
-			<sysproperty key="log4j.configuration" value="log4j.xml"/>
-
-			<classpath>
-				<pathelement location="${jar.file}" />
-				<pathelement location="${classes.dir.test}" />
-				<pathelement location="${test.src.dir}" />
-
-				<pathelement location="${basedir}/../spring-core/classes-test" />
-			</classpath>
-
-			<sysproperty key="basedir" value="." />
-
-			<formatter type="xml" />
-			<formatter type="plain" usefile="false" />
-
-			<batchtest todir="${reports.tests}">
-				<fileset dir="${classes.dir.test}">
-					<include name="**/*Tests.class" />
-					<exclude name="**/*Abstract*.*" />
-					<exclude name="**/*$*.class" />
-					
-					<exclude name="**/org/springframework/beans/factory/support/security/CallbacksSecurityTests*" />
-				</fileset>
-			</batchtest>
-		</junit>
-	</target>
-
-	<target name="javadoc">
-		<javadoc sourcepath="${src.dir}" packagenames="*" destdir="${dist.dir}/apidocs" />
-	</target>
-
-	<target name="jar" depends="compile">
-		<jar jarfile="${jar.file}" compress="true" index="false" basedir="${classes.dir}" excludes="**/package.html" />
-	</target>
-</project>

diff --git a/dev-java/spring-instrument/metadata.xml b/dev-java/spring-instrument/metadata.xml
deleted file mode 100644
index 73672eec8b7..00000000000
--- a/dev-java/spring-instrument/metadata.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>java@g.o</email>
-		<name>Java</name>
-	</maintainer>
-	<longdescription>
-		The Spring Framework provides a comprehensive programming and configuration model for
-		modern Java-based enterprise applications - on any kind of deployment platform. A key
-		element of Spring is infrastructural support at the application level: Spring focuses
-		on the "plumbing" of enterprise applications so that teams can focus on application-level
-		business logic, without unnecessary ties to specific deployment environments.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">SpringSource/spring-framework</remote-id>
-	</upstream>
-</pkgmetadata>

diff --git a/dev-java/spring-instrument/spring-instrument-3.2.4.ebuild b/dev-java/spring-instrument/spring-instrument-3.2.4.ebuild
deleted file mode 100644
index 5e393cf162e..00000000000
--- a/dev-java/spring-instrument/spring-instrument-3.2.4.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="A comprehensive programming and configuration model for enterprise applications"
-HOMEPAGE="http://www.springsource.org/spring-framework"
-SRC_URI="https://github.com/SpringSource/spring-framework/archive/v${PV}.RELEASE.tar.gz -> spring-framework-${PV}.tar.gz
-	https://dev.gentoo.org/~ercpe/distfiles/dev-java/spring-framework/spring-framework-${PV}-buildscripts.tar.bz2"
-
-LICENSE="Apache-2.0"
-SLOT="3.2"
-KEYWORDS="~amd64"
-
-DEPEND=">=virtual/jdk-1.7
-	test? (
-		dev-java/ant-junit4:0
-		dev-java/hamcrest-core:1.3
-		dev-java/hamcrest-library:1.3
-		dev-java/junit:4
-		dev-java/mockito:0
-		dev-java/spring-core:${SLOT}
-		dev-java/xmlunit:1
-	)"
-
-RDEPEND=">=virtual/jre-1.7"
-
-S="${WORKDIR}/spring-framework-${PV}.RELEASE/"
-
-EANT_BUILD_XML=${S}/${PN}/build.xml
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_GENTOO_CLASSPATH=""
-EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH}
-	hamcrest-library-1.3
-	hamcrest-core-1.3
-	junit-4
-	mockito
-	spring-core-${SLOT}
-	xmlunit-1"
-
-java_prepare() {
-	find . -name '*.jar' -print -delete || die
-
-	cp "${FILESDIR}"/${P}-build.xml "${EANT_BUILD_XML}" || die
-}
-
-src_test() {
-	java-pkg-2_src_test
-}
-
-src_install() {
-	java-pkg_dojar "${S}"/${PN}/dist/${PN}.jar
-
-	use source && java-pkg_dosrc "${S}"/${PN}/src/main/java/org/
-	use doc && java-pkg_dojavadoc "${S}"/${PN}/dist/apidocs/
-}

diff --git a/profiles/package.mask b/profiles/package.mask
index a55ecc710b9..c6ebab13019 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -541,17 +541,6 @@ app-admin/amazon-ec2-init
 # Masked while being tested and reverse deps aren't fully compatible
 =dev-libs/openssl-1.1*
 
-# James Le Cuirot <chewi@g.o> (26 Aug 2018)
-# Although the Spring Framework is very much alive, our packages are
-# ancient and our infrastructure is not ready to update it any time
-# soon. If you want this then join the Java team and be prepared to do
-# a lot of work. Removal in 30 days.
-dev-java/spring-aop
-dev-java/spring-beans
-dev-java/spring-core
-dev-java/spring-expression
-dev-java/spring-instrument
-
 # Andreas K. Hüttel <dilfridge@g.o> (03 Apr 2016)
 # Can exhaust all available memory depending on task
 # but is made available for experts who heed this warning