From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1264654-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by finch.gentoo.org (Postfix) with ESMTPS id 8E6581382C5
	for <garchives@archives.gentoo.org>; Sat, 27 Mar 2021 08:01:00 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id CD968E07B3;
	Sat, 27 Mar 2021 08:00:59 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
	(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
	(No client certificate requested)
	by pigeon.gentoo.org (Postfix) with ESMTPS id A42B3E07B3
	for <gentoo-commits@lists.gentoo.org>; Sat, 27 Mar 2021 08:00:59 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
	(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id 46B9A335D02
	for <gentoo-commits@lists.gentoo.org>; Sat, 27 Mar 2021 08:00:58 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id C371F592
	for <gentoo-commits@lists.gentoo.org>; Sat, 27 Mar 2021 08:00:56 +0000 (UTC)
From: "Miroslav Šulc" <fordfrog@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Miroslav Šulc" <fordfrog@gentoo.org>
Message-ID: <1616832042.0b3e51b091a0c2fba14c8cc8f193e851eea4f4fe.fordfrog@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-java/hamcrest-library/files/, dev-java/hamcrest-library/
X-VCS-Repository: repo/gentoo
X-VCS-Files: dev-java/hamcrest-library/files/1.3-remove-targets.patch dev-java/hamcrest-library/hamcrest-library-1.3-r1.ebuild
X-VCS-Directories: dev-java/hamcrest-library/ dev-java/hamcrest-library/files/
X-VCS-Committer: fordfrog
X-VCS-Committer-Name: Miroslav Šulc
X-VCS-Revision: 0b3e51b091a0c2fba14c8cc8f193e851eea4f4fe
X-VCS-Branch: master
Date: Sat, 27 Mar 2021 08:00:56 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: c78b7204-2284-4c7e-810b-5ca4a3ed67a6
X-Archives-Hash: 8ed686b33226a3831d5e1dc8139c25e3

commit:     0b3e51b091a0c2fba14c8cc8f193e851eea4f4fe
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 27 08:00:42 2021 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sat Mar 27 08:00:42 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b3e51b0

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 <AT> gentoo.org>

 .../files/1.3-remove-targets.patch                 | 47 -------------------
 .../hamcrest-library-1.3-r1.ebuild                 | 52 ----------------------
 2 files changed, 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 6923b0bcc68..00000000000
--- 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 b26fd124cfc..00000000000
--- 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
-}