gentoo resync : 14.07.2018

4 files changed, 193 insertions, 0 deletions

diff --git a/dev-java/spring-instrument/Manifest b/dev-java/spring-instrument/Manifest
new file mode 100644
index 000000000000..598820ab7026
--- /dev/null
+++ b/dev-java/spring-instrument/Manifest
@@ -0,0 +1,5 @@
+AUX spring-instrument-3.2.4-build.xml 4010 BLAKE2B 4f7ef7b3fd0e28207892cd7ba09d8162136497d75d9cb1b87e2e698e2e4fc36a0f84e625af72cbdb9beb3373e20de58ecd64fc3f2c866678297e7043dfbe64aa SHA512 1c92972268d7889c568942abf40fb202c05c9a7ca14c34162212f54ec73ebd5160acedd99d96dcf576480afda88d82d57dc79ee087eabed321dd7f81e5a7ac32
+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
+EBUILD spring-instrument-3.2.4.ebuild 1498 BLAKE2B 86a2c152fa8e9ea6efc24fa16a46e858d2f3b6e1f20146bcdcc051639f53467acc2f466a4255e9a9c6fba069ab0fe8bd306a4ae455dea08b3995e966bcfd621d SHA512 22f7bf12c27fbaa7042c06d76257108f5d159bc724174860c63de95262f61d90528a22baf84864c24927a7ac5d3749214796d8d9704796d21daab4c165ee5797
+MISC metadata.xml 805 BLAKE2B 2c05c3f6f6f5a67e33ef1ca66d02b9a8c99671fc12a6adf04ebfdaa945362ae5e9ef19baae4400c944e637db0567190c3606ee54aba5c3d51529afc38f126304 SHA512 76da7349ca93ef13fb154f1531a175e9dba0536614191d9f801c157bdfdbce407eb06a7677224468dc7a19868010604bafd8db2b1348f1fce16b0bd2dd414005
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
new file mode 100644
index 000000000000..3175f36774f8
--- /dev/null
+++ b/dev-java/spring-instrument/files/spring-instrument-3.2.4-build.xml
@@ -0,0 +1,109 @@
+<?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
new file mode 100644
index 000000000000..73672eec8b78
--- /dev/null
+++ b/dev-java/spring-instrument/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</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
new file mode 100644
index 000000000000..5e393cf162e4
--- /dev/null
+++ b/dev-java/spring-instrument/spring-instrument-3.2.4.ebuild
@@ -0,0 +1,61 @@
+# 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/
+}