diff options
author | Miroslav Šulc <fordfrog@gentoo.org> | 2021-03-27 09:00:42 +0100 |
---|---|---|
committer | Miroslav Šulc <fordfrog@gentoo.org> | 2021-03-27 09:00:42 +0100 |
commit | 0b3e51b091a0c2fba14c8cc8f193e851eea4f4fe (patch) | |
tree | 1cc865ea591f4f334af5b73ee46c366e52e1f38a /dev-java/hamcrest-library | |
parent | dev-java/hamcrest-core: removed obsolete 1.1-r3 and 1.3-r1 (diff) | |
download | gentoo-0b3e51b091a0c2fba14c8cc8f193e851eea4f4fe.tar.gz gentoo-0b3e51b091a0c2fba14c8cc8f193e851eea4f4fe.tar.bz2 gentoo-0b3e51b091a0c2fba14c8cc8f193e851eea4f4fe.zip |
dev-java/hamcrest-library: removed obsolete 1.3-r1
Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Miroslav Šulc <fordfrog@gentoo.org>
Diffstat (limited to 'dev-java/hamcrest-library')
-rw-r--r-- | dev-java/hamcrest-library/files/1.3-remove-targets.patch | 47 | ||||
-rw-r--r-- | dev-java/hamcrest-library/hamcrest-library-1.3-r1.ebuild | 52 |
2 files changed, 0 insertions, 99 deletions
diff --git a/dev-java/hamcrest-library/files/1.3-remove-targets.patch b/dev-java/hamcrest-library/files/1.3-remove-targets.patch deleted file mode 100644 index 6923b0bcc68e..000000000000 --- a/dev-java/hamcrest-library/files/1.3-remove-targets.patch +++ /dev/null @@ -1,47 +0,0 @@ -diff --git a/build.xml b/build.xml -index 1cfd4fb..185c563 100644 ---- a/build.xml -+++ b/build.xml -@@ -12,42 +12,9 @@ - </target>
-
- <target name="generator" description="Build code generator tool">
-- <java-to-jar srcdir="hamcrest-generator/src/main/java"
-- modulename="hamcrest-generator-nodeps"
-- classpath="lib/generator/qdox-1.12.jar"/>
--
-- <!-- Bundle QDox classes in hamcrest-generator.jar using JarJar to place classes under a different package -->
-- <taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask" classpath="lib/generator/jarjar-1.3.jar"/>
-- <jarjar jarfile="build/hamcrest-generator-${version}.jar">
-- <zipfileset src="build/hamcrest-generator-nodeps-${version}.jar"/>
-- <zipfileset src="lib/generator/qdox-1.12.jar"/>
-- <rule pattern="com.thoughtworks.qdox.**" result="org.hamcrest.generator.qdox.@1"/>
-- </jarjar>
-- <copy file="build/hamcrest-generator-nodeps-${version}-sources.jar" tofile="build/hamcrest-generator-${version}-sources.jar"/>
- </target>
-
- <target name="core" depends="generator" description="Build core Hamcrest library">
-- <java-to-jar srcdir="hamcrest-core/src/main/java" modulename="hamcrest-core"/>
--
-- <!-- Generate one class with all static imports -->
-- <mkdir dir="build/temp/hamcrest-core/generated-code"/>
--
-- <java classname="org.hamcrest.generator.config.XmlConfigurator"
-- fork="yes"
-- failonerror="yes"
-- classpath="
-- build/hamcrest-core-${version}.jar;
-- build/hamcrest-generator-${version}.jar;
-- ">
-- <arg value="core-matchers.xml"/>
-- <arg value="hamcrest-core/src/main/java"/>
-- <arg value="org.hamcrest.CoreMatchers"/>
-- <arg value="build/temp/hamcrest-core/generated-code"/>
-- </java>
-- <!-- Append to core jar -->
-- <java-to-jar srcdir="build/temp/hamcrest-core/generated-code"
-- modulename="hamcrest-core"
-- classpath="build/hamcrest-core-${version}.jar"/>
- </target>
-
- <target name="library"
diff --git a/dev-java/hamcrest-library/hamcrest-library-1.3-r1.ebuild b/dev-java/hamcrest-library/hamcrest-library-1.3-r1.ebuild deleted file mode 100644 index b26fd124cfcb..000000000000 --- a/dev-java/hamcrest-library/hamcrest-library-1.3-r1.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -JAVA_PKG_IUSE="source" - -inherit java-pkg-2 java-ant-2 - -MY_PN=${PN/-library} -MY_P="${MY_PN}-${PV}" -S="${WORKDIR}/${MY_P}" - -DESCRIPTION="Core library of matchers for building test expressions" -HOMEPAGE="https://github.com/hamcrest" -SRC_URI="https://${MY_PN}.googlecode.com/files/${MY_P}.tgz" - -LICENSE="BSD-2" -SLOT="${PV}" -KEYWORDS="amd64 ~arm ~arm64 ppc64 x86" - -CDEPEND=" - dev-java/hamcrest-generator:${SLOT} - dev-java/hamcrest-core:${SLOT} - dev-java/qdox:1.12 -" -DEPEND=">=virtual/jdk-1.6 - userland_GNU? ( sys-apps/findutils ) - ${CDEPEND}" - -RDEPEND=">=virtual/jre-1.6 - ${CDEPEND}" - -JAVA_ANT_REWRITE_CLASSPATH="true" -JAVA_ANT_CLASSPATH_TAGS="${JAVA_ANT_CLASSPATH_TAGS} java java-to-jar" -EANT_GENTOO_CLASSPATH="hamcrest-generator-${SLOT},hamcrest-core-${SLOT},qdox-1.12" -EANT_BUILD_TARGET="library" -EANT_EXTRA_ARGS="-Dversion=${PV}" -EANT_GENTOO_CLASSPATH_EXTRA="build/${P}.jar" - -java_prepare() { - # remove core+generator target as they are already built. - epatch "${FILESDIR}/${PV}-remove-targets.patch" - - find -iname "*.jar" -exec rm -v {} + || die "Unable to clean bundled JAR files" -} - -src_install() { - java-pkg_newjar build/${PN/core/library}-${PV}.jar ${PN/core/library}.jar - - use source && java-pkg_dosrc ${PN}/src/main/java/org -} |