diff options
author | Miroslav Šulc <fordfrog@gentoo.org> | 2020-10-19 09:10:01 +0200 |
---|---|---|
committer | Miroslav Šulc <fordfrog@gentoo.org> | 2020-10-19 09:10:10 +0200 |
commit | bddc05cdddf8f7619988be67b1c762aeb60522f0 (patch) | |
tree | 4669131546b0bb421cb2e873305402166af156bc /dev-java/hamcrest-generator | |
parent | dev-java/hamcrest-generator: increased min java version to 1.8 (diff) | |
download | gentoo-bddc05cdddf8f7619988be67b1c762aeb60522f0.tar.gz gentoo-bddc05cdddf8f7619988be67b1c762aeb60522f0.tar.bz2 gentoo-bddc05cdddf8f7619988be67b1c762aeb60522f0.zip |
dev-java/hamcrest-generator: removed old 1.1
Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Miroslav Šulc <fordfrog@gentoo.org>
Diffstat (limited to 'dev-java/hamcrest-generator')
-rw-r--r-- | dev-java/hamcrest-generator/Manifest | 1 | ||||
-rw-r--r-- | dev-java/hamcrest-generator/files/1.1-build.xml.patch | 93 | ||||
-rw-r--r-- | dev-java/hamcrest-generator/hamcrest-generator-1.1.ebuild | 52 |
3 files changed, 0 insertions, 146 deletions
diff --git a/dev-java/hamcrest-generator/Manifest b/dev-java/hamcrest-generator/Manifest index 086c45b53bc3..480364f4e8f4 100644 --- a/dev-java/hamcrest-generator/Manifest +++ b/dev-java/hamcrest-generator/Manifest @@ -1,2 +1 @@ -DIST hamcrest-1.1.tgz 1670123 BLAKE2B 2b1242a782949e084374918778c17f20b3b09746521949c12153cf1e599ab38a2a5a2bf0174d9676a8146cfab1e3f7c91a8a1b3ec829dd617f34f92c6852b931 SHA512 07b55c539ffcd3b1d33e94bec518164b95cefa39d96e0c3d02fc97c0a20f71bd8d1dea90a59ffd163e748ed1007b087c3d0d355876a68a429e8e564d0cfd3595 DIST hamcrest-1.3.tgz 3686096 BLAKE2B 38ff91a524064cb00b4d2e82c0a50a2df870bbb0a6e43055f33ce344a1dc8de3760530652691db26aa42890d8517940c038a570b5acaaf91b7e970aca7df3493 SHA512 5672bc627bc71d6fd64b6f776b89ac16ed68819fa4a0748c1250b57f1065c1e7e18ba184d9fe3392e54000ddeb353d0d8d67f4eecdf464974563f05c6b226fc2 diff --git a/dev-java/hamcrest-generator/files/1.1-build.xml.patch b/dev-java/hamcrest-generator/files/1.1-build.xml.patch deleted file mode 100644 index c8f087ba8f12..000000000000 --- a/dev-java/hamcrest-generator/files/1.1-build.xml.patch +++ /dev/null @@ -1,93 +0,0 @@ -diff --git a/hamcrest-1.1/build.xml b/hamcrest-1.1/build.xml -index f819d3d..18fba83 100644 ---- a/hamcrest-1.1/build.xml -+++ b/hamcrest-1.1/build.xml -@@ -28,18 +28,6 @@ - classpath="
- lib/generator/qdox-1.6.1.jar;
- "/>
-- <taskdef name="jarjar"
-- classname="com.tonicsystems.jarjar.JarJarTask"
-- classpath="lib/generator/jarjar-1.0rc3.jar"/>
-- <!-- Bundle QDox classes in hamcrest-generator.jar so user doesn't need to care
-- about it's existence. Uses JarJar to place classes under a different package
-- to prevent conflict. -->
-- <jarjar jarfile="build/hamcrest-generator-${version}.jar">
-- <zipfileset src="build/temp/hamcrest-generator-${version}-nodeps.jar"/>
-- <zipfileset src="lib/generator/qdox-1.6.1.jar"/>
-- <rule pattern="com.thoughtworks.qdox.**"
-- result="org.hamcrest.generator.qdox.@1"/>
-- </jarjar>
- </target>
-
- <target name="core"
-@@ -94,16 +82,16 @@ - classpath="build/hamcrest-core-${version}.jar"/>
- </target>
-
-- <target name="text" -- depends="core, library" -- description="Build text pattern matcher"> -- <java-to-jar srcdir="hamcrest-text/src/main/java" -- destjar="build/hamcrest-text-${version}.jar" -- classpath=" -- build/hamcrest-core-${version}.jar; -- build/hamcrest-library-${version}.jar"/> -- </target> -- -+ <target name="text"
-+ depends="core, library"
-+ description="Build text pattern matcher">
-+ <java-to-jar srcdir="hamcrest-text/src/main/java"
-+ destjar="build/hamcrest-text-${version}.jar"
-+ classpath="
-+ build/hamcrest-core-${version}.jar;
-+ build/hamcrest-library-${version}.jar"/>
-+ </target>
-+
- <target name="integration"
- depends="core, library"
- description="Build integration with external tools">
-@@ -121,7 +109,7 @@ - destjar="build/hamcrest-unit-test-${version}.jar"
- classpath="
- build/hamcrest-core-${version}.jar;
-- build/hamcrest-library-${version}.jar; -+ build/hamcrest-library-${version}.jar;
- build/hamcrest-text-${version}.jar;
- build/hamcrest-integration-${version}.jar;
- build/hamcrest-generator-${version}.jar"/>
-@@ -164,7 +152,7 @@ - <jar jarfile="build/hamcrest-all-${version}.jar" duplicate="preserve">
- <zipfileset src="build/hamcrest-core-${version}.jar"/>
- <zipfileset src="build/hamcrest-library-${version}.jar"/>
-- <zipfileset src="build/hamcrest-text-${version}.jar"/> -+ <zipfileset src="build/hamcrest-text-${version}.jar"/>
- <zipfileset src="build/hamcrest-generator-${version}.jar"/>
- <zipfileset src="build/hamcrest-integration-${version}.jar"/>
- </jar>
-@@ -221,7 +209,7 @@ -
- <packageset dir="hamcrest-core/src/main/java"/>
- <packageset dir="hamcrest-library/src/main/java" excludes="org/hamcrest/internal"/>
-- <packageset dir="hamcrest-text/src/main/java" excludes="**/internal/**"/> -+ <packageset dir="hamcrest-text/src/main/java" excludes="**/internal/**"/>
- <packageset dir="hamcrest-integration/src/main/java"/>
- <packageset dir="build/generated-code"/>
-
-@@ -251,14 +239,10 @@ - </classpath>
- </javac>
- <copy file="LICENSE.txt" todir="build/temp/@{destjar}.contents"/>
-- <!-- Put Java source in Jars for user's convenience. -->
-- <copy todir="build/temp/@{destjar}.contents">
-- <fileset dir="@{srcdir}"/>
-- </copy>
- <jar jarfile="@{destjar}">
- <fileset dir="build/temp/@{destjar}.contents"/>
- </jar>
- </sequential>
- </macrodef>
-
--</project> -+</project>
diff --git a/dev-java/hamcrest-generator/hamcrest-generator-1.1.ebuild b/dev-java/hamcrest-generator/hamcrest-generator-1.1.ebuild deleted file mode 100644 index 19e54674594e..000000000000 --- a/dev-java/hamcrest-generator/hamcrest-generator-1.1.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# 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="hamcrest" -MY_P="${MY_PN}-${PV}" -S="${WORKDIR}/${MY_P}" - -DESCRIPTION="Code generator for Hamcrest's 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="0" -KEYWORDS="~amd64 ~ppc64 ~x86" - -CDEPEND="dev-java/qdox:1.6" - -DEPEND=">=virtual/jdk-1.5 - userland_GNU? ( sys-apps/findutils ) - ${CDEPEND}" - -RDEPEND=">=virtual/jre-1.5 - ${CDEPEND}" - -EANT_BUILD_TARGET="generator" -EANT_TEST_TARGET="unit-test" -EANT_EXTRA_ARGS="-Dversion=${PV}" -EANT_GENTOO_CLASSPATH_EXTRA="${S}/build/temp/${PN}-${PV}-nodeps.jar" - -java_prepare() { - epatch "${FILESDIR}"/${PV}-build.xml.patch - - find -iname "*.jar" -exec rm -v {} + || die "Unable to remove bundled JAR files" - - # These jars must be symlinked. Specifying them using gentoo.classpath - # does not work. - java-pkg_jar-from --into lib/generator qdox-1.6 qdox.jar qdox-1.6.1.jar -} - -src_install() { - java-pkg_newjar build/temp/${PN}-${PV}-nodeps.jar ${PN}.jar - - dodoc README.txt CHANGES.txt - - use source && java-pkg_dosrc ${PN}/src/main/java/org -} |