commit: 956b5cc9299a3512767caa29c374bf2ca102583d
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 27 07:57:53 2021 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sat Mar 27 07:57:53 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=956b5cc9
dev-java/hamcrest-core: removed obsolete 1.1-r3 and 1.3-r1
Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
.../files/hamcrest-1.3-empty_generator.patch | 21 ---------
.../files/hamcrest-core-1.3-fix_javadoc.patch | 49 --------------------
dev-java/hamcrest-core/hamcrest-core-1.1-r3.ebuild | 35 --------------
dev-java/hamcrest-core/hamcrest-core-1.3-r1.ebuild | 54 ----------------------
4 files changed, 159 deletions(-)
diff --git a/dev-java/hamcrest-core/files/hamcrest-1.3-empty_generator.patch
b/dev-java/hamcrest-core/files/hamcrest-1.3-empty_generator.patch
deleted file mode 100644
index 709bca62c02..00000000000
--- a/dev-java/hamcrest-core/files/hamcrest-1.3-empty_generator.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/build.xml 2012-07-02 21:14:09.000000000 +0200
-+++ b/build.xml 2013-06-15 22:00:19.919038284 +0200
-@@ -12,18 +12,6 @@
- </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">
diff --git a/dev-java/hamcrest-core/files/hamcrest-core-1.3-fix_javadoc.patch
b/dev-java/hamcrest-core/files/hamcrest-core-1.3-fix_javadoc.patch
deleted file mode 100644
index 4f210ca3380..00000000000
--- a/dev-java/hamcrest-core/files/hamcrest-core-1.3-fix_javadoc.patch
+++ /dev/null
@@ -1,49 +0,0 @@
---- a/build.xml 2013-06-15 22:29:44.445548674 +0200
-++- b/build.xml 2013-06-15 22:30:45.098876635 +0200
-@@ -132,30 +132,15 @@
- </target>
-
- <target name="javadoc" description="build javadoc jars">
-- <java-to-javadoc-jar modulename="hamcrest-generator-nodeps"/>
- <java-to-javadoc-jar modulename="hamcrest-core"/>
-- <java-to-javadoc-jar modulename="hamcrest-library"/>
-- <java-to-javadoc-jar modulename="hamcrest-integration"/>
-- <copy file="build/hamcrest-generator-nodeps-${version}-javadoc.jar"
tofile="build/hamcrest-generator-${version}-javadoc.jar"/>
-
- <javadoc packagenames="org.hamcrest.*" defaultexcludes="yes"
-
destdir="build/temp/hamcrest-all-${version}-javadoc.jar.contents" author="true"
version="true" use="true"
-- windowtitle="Hamcrest" source="1.6" failonerror="yes"
overview="overview.html">
-+ windowtitle="Hamcrest" source="1.6" failonerror="yes">
-- <classpath>
-- <fileset dir="lib/integration">
-- <include name="*.jar"/>
-- </fileset>
-- </classpath>
- <packageset
dir="build/temp/hamcrest-core-${version}-sources.jar.contents"/>
-- <packageset
dir="build/temp/hamcrest-library-${version}-sources.jar.contents"
excludes="org/hamcrest/internal"/>
-- <packageset
dir="build/temp/hamcrest-integration-${version}-sources.jar.contents"/>
-
- <group title="Hamcrest API and Utility Classes"
packages="org.hamcrest"/>
- <group title="Matcher Library" packages="org.hamcrest.*"/>
-- <group title="Integration" packages="org.hamcrest.integration,
org.hamcrest.integration.*"/>
--
-- <link offline="false"
href="http://www.junit.org/junit/javadoc/3.8.1/"/>
-- <link offline="false"
href="http://kentbeck.github.com/junit/javadoc/latest/"/>
- </javadoc>
- <jar jarfile="build/hamcrest-all-${version}-javadoc.jar">
- <fileset
dir="build/temp/hamcrest-all-${version}-javadoc.jar.contents"/>
-@@ -302,14 +287,7 @@
-
destdir="build/temp/@{modulename}-${version}-javadoc.jar.contents"
author="true" version="true" use="true"
- windowtitle="Hamcrest" source="1.6" failonerror="yes">
- <classpath>
-- <fileset dir="lib/integration">
-- <include name="*.jar"/>
-- </fileset>
-- <fileset file="lib/generator/qdox-1.12.jar"/>
- <fileset file="build/hamcrest-core-${version}.jar"/>
-- <fileset file="build/hamcrest-library-${version}.jar"/>
-- <fileset file="build/hamcrest-generator-${version}.jar"/>
-- <fileset
file="build/hamcrest-integration-${version}.jar"/>
- </classpath>
- </javadoc>
- <jar jarfile="build/@{modulename}-${version}-javadoc.jar">
diff --git a/dev-java/hamcrest-core/hamcrest-core-1.1-r3.ebuild
b/dev-java/hamcrest-core/hamcrest-core-1.1-r3.ebuild
deleted file mode 100644
index 5d747d9d15f..00000000000
--- a/dev-java/hamcrest-core/hamcrest-core-1.1-r3.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-MY_PN="hamcrest"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Library of matchers for building test expressions"
-HOMEPAGE="https://github.com/hamcrest";
-SRC_URI="https://github.com/${MY_PN}/JavaHamcrest/archive/${MY_PN}-java-${PV}.tar.gz
-> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x64-solaris"
-IUSE=""
-
-RDEPEND="
- >=virtual/jre-1.8"
-
-DEPEND="
- virtual/jdk:1.8
- source? ( app-arch/zip )"
-
-S="${WORKDIR}/JavaHamcrest-${MY_PN}-java-${PV}"
-
-JAVA_SRC_DIR="${PN}/src"
-
-java_prepare() {
- java-pkg_clean
-}
diff --git a/dev-java/hamcrest-core/hamcrest-core-1.3-r1.ebuild
b/dev-java/hamcrest-core/hamcrest-core-1.3-r1.ebuild
deleted file mode 100644
index 977e37eca2f..00000000000
--- a/dev-java/hamcrest-core/hamcrest-core-1.3-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2
-
-MY_PN="hamcrest"
-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 ~ppc-macos ~x64-macos"
-
-DEPEND="virtual/jdk:1.8
- ~dev-java/hamcrest-generator-${PV}:1.3
- userland_GNU? ( sys-apps/findutils )"
-
-RDEPEND=">=virtual/jre-1.8"
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-JAVA_ANT_CLASSPATH_TAGS="${JAVA_ANT_CLASSPATH_TAGS} java java-to-jar"
-
-EANT_BUILD_TARGET="core"
-
-java_prepare() {
- # Empty out the contents of the generator target; it has already been
built.
- epatch "${FILESDIR}/hamcrest-1.3-empty_generator.patch"
-
- # Fix problems with Javadoc target.
- epatch "${FILESDIR}/hamcrest-core-1.3-fix_javadoc.patch"
-
- find -iname "*.jar" -exec rm -v {} + || die "Unable to clean bundled
JAR files"
-
- local cp="build/${P}.jar"
- cp="${cp}:$(java-pkg_getjars --build-only --with-dependencies
hamcrest-generator-${SLOT})"
- EANT_EXTRA_ARGS="-Dversion=${PV} -Dgentoo.classpath=${cp}"
-}
-
-src_install() {
- java-pkg_newjar build/${PN}-${PV}.jar ${PN}.jar
-
- dodoc README.txt CHANGES.txt
-
- use doc && java-pkg_dojavadoc
build/temp/hamcrest-all-${PV}-javadoc.jar.contents
- use source && java-pkg_dosrc ${PN}/src/main/java/org
-}
