gentoo resync : 14.07.2018

4 files changed, 0 insertions, 115 deletions

diff --git a/dev-java/hamcrest-library/Manifest b/dev-java/hamcrest-library/Manifest
deleted file mode 100644
index 3256db6d3de8..000000000000
--- a/dev-java/hamcrest-library/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX 1.3-remove-targets.patch 2263 BLAKE2B 17fb19da0f70f8d265a4e68f28ca530748af3372bcace0e7e04e04c46097abe2cf61265dd2b84f56467a83e0dc9c72bda2d94da25fa5abbb88f6f31f04d1321d SHA512 e403068cba91964dc7895c111a292a135ad27790da480c8779961075de559163052fa8ca5a997d3cfc278455ab3b8051bd3d4eb069f850dad2780a7ca974e551
-DIST hamcrest-1.3.tgz 3686096 BLAKE2B 38ff91a524064cb00b4d2e82c0a50a2df870bbb0a6e43055f33ce344a1dc8de3760530652691db26aa42890d8517940c038a570b5acaaf91b7e970aca7df3493 SHA512 5672bc627bc71d6fd64b6f776b89ac16ed68819fa4a0748c1250b57f1065c1e7e18ba184d9fe3392e54000ddeb353d0d8d67f4eecdf464974563f05c6b226fc2
-EBUILD hamcrest-library-1.3-r1.ebuild 1347 BLAKE2B 968339145ca9c96fefdd00cd2a1dc4653ba4233b2519fe4f95b205be42a941701bb54c4fd25506bca0930632544afcb2baaf0d7ebbdc122327b8c010aa0f4752 SHA512 11d211cdf75a7643d4ef7f856ea9200a6f7a14b3fddccd8704fe75e0b2629e0f7700d75a9f36023ad5d74c4596e4f2a09b60893354faa10db48a21e85b9c2a71
-MISC metadata.xml 363 BLAKE2B 949dd901636266a4874e05a9902cabbfa703b665d96402ffa219ca9dfc6d6bb340518ecab596dac5cf38292b3303ebc63ae0831285cf3e6a3b5379c0ed9b7366 SHA512 7c71d7b035ce5a0a53a33932a8e7c90d2c4749deecb2a6e2b1dbaf7183b2526ad18d2233717f8c405039bf7d87939a544092d8f058f006418b8584caaff8fbf8
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 89a57bc7315f..000000000000
--- a/dev-java/hamcrest-library/hamcrest-library-1.3-r1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2017 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=${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 ~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
-}
diff --git a/dev-java/hamcrest-library/metadata.xml b/dev-java/hamcrest-library/metadata.xml
deleted file mode 100644
index b09ef005001e..000000000000
--- a/dev-java/hamcrest-library/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?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>
-	<upstream>
-		<remote-id type="google-code">hamcrest</remote-id>
-		<remote-id type="github">hamcrest/</remote-id>
-	</upstream>
-</pkgmetadata>