commit: a1667b044adf03e480debf1680f9a21a3540a0cb
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 7 09:58:24 2016 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Thu Apr 7 09:58:52 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a1667b04
dev-java/junit: Remove old 4.10 and 4.11
Package-Manager: portage-2.2.28
dev-java/junit/Manifest | 2 -
dev-java/junit/files/gentoo-manifest.mf | 1 -
...junit-4.11-do-not-unpack-hamcrest-sources.patch | 19 ----
dev-java/junit/junit-4.10.ebuild | 86 ------------------
dev-java/junit/junit-4.11.ebuild | 100 ---------------------
5 files changed, 208 deletions(-)
diff --git a/dev-java/junit/Manifest b/dev-java/junit/Manifest
index 204b4dc..78e5fa0 100644
--- a/dev-java/junit/Manifest
+++ b/dev-java/junit/Manifest
@@ -1,4 +1,2 @@
DIST junit3.8.2.zip 461426 SHA256
aae23d20e6f4dc45b4bf0b10fedcbd209c100342a0cafce1aa07d2da6da1f24a SHA512
f203332ccc2bdc38c683a95bdbe448f38cbfbeea81ecc431bf9ebf0a3292f0150fcfe5cd5dd6da481be034366820f95775a33581931aed9e4cc12a6ff27e3930
WHIRLPOOL
284a51a8b659b8dbce378a381475ae2bcedb78231cfe5435382053335ebe5d44b4eec90b9f14bc510fd5b9060b44672896fe0bfad57743e5aca0128f006781d8
DIST junit4-r4.12.tar.gz 443804 SHA256
9a5b458258c6537df0d2df7122a06895a26b9c7c8061e5991a0be81d76b10d24 SHA512
ba612598fa6c328e8f4bbea3afda08b459a110837ca3805a62e811535f7bca8d04509f8fe51a413c7bc855fccee35d6946c9eece4dd01726d12454c002a4de32
WHIRLPOOL
14eda410942900d8be21ea29096c387384634ce9f679348d5bf4dbb11d22e23e1be990486ae8a6004b95f3a9383644e4f70988f84312cf16d5e4462c64b26814
-DIST junit4.10.zip 1781594 SHA256
49d1e176f518730c0d34a361932d9bd79d1bebd555126d95337ad7ad6fc9c6b6 SHA512
07cb518b684a254325d8972132f44dda8f8b52b627232b480bd90766a0f14afc6d8751e44b4162305cf9ab3cedd2858fcd7d388ab01b4f67b706dddb696a8cf6
WHIRLPOOL
72e3f6a3615d1e7f98ac24e7e7f4f634c93cdfdadcaafc0d59d7a1c8b218f019f821d2683c932f3716f1d69b9f0cf5c0fd664be6c35a0f297976b8a745ef612b
-DIST junit4.11.zip 2043600 SHA256
0bbf3818026984fd0c9c4f3cb1a9083d2be545147e13ba1cb101ee14161a3487 SHA512
947ba504aa009afc0773189e6ec89e34d5ff844430b0656cabc7b9f3fe5651c08b5b3c25b848454ee7f0a85e7573155d2c0c86e0ca5502c6e1bb573c970ade62
WHIRLPOOL
bf21e351dd47099d3e7c280fe62192aa175c1f251ae4157971cfb69602af2724e6dfcb0592bb6fc8227548abe713c9f1056a22ee49446f48bb00e19ef0fa537b
diff --git a/dev-java/junit/files/gentoo-manifest.mf
b/dev-java/junit/files/gentoo-manifest.mf
deleted file mode 100644
index f784744..0000000
--- a/dev-java/junit/files/gentoo-manifest.mf
+++ /dev/null
@@ -1 +0,0 @@
-Class-Path: ../../hamcrest-core/lib/hamcrest-core.jar
diff --git
a/dev-java/junit/files/junit-4.11-do-not-unpack-hamcrest-sources.patch
b/dev-java/junit/files/junit-4.11-do-not-unpack-hamcrest-sources.patch
deleted file mode 100644
index d2d6f85..0000000
--- a/dev-java/junit/files/junit-4.11-do-not-unpack-hamcrest-sources.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/build.xml 2012-11-14 20:23:00.000000000 +0100
-+++ b/build.xml 2013-06-15 23:12:30.981988033 +0200
-@@ -138,7 +138,7 @@
- </exec>
- </target>
-
-- <target name="javadoc" depends="unjar.hamcrest">
-+ <target name="javadoc">
- <javadoc destdir="${javadocdir}"
- author="false"
- version="false"
-@@ -151,7 +151,6 @@
- <excludepackage name="org.junit.experimental.theories.internal.*" />
-
- <sourcepath location="${src}" />
-- <sourcepath location="${hamcrestsrc}" />
- <link href="http://java.sun.com/javase/6/docs/api/"; />
- </javadoc>
- </target>
diff --git a/dev-java/junit/junit-4.10.ebuild b/dev-java/junit/junit-4.10.ebuild
deleted file mode 100644
index 2571b0b..0000000
--- a/dev-java/junit/junit-4.10.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-# WARNING: JUNIT.JAR IS _NOT_ SYMLINKED TO ANT-CORE LIB FOLDER AS JUNIT3 IS
-
-EAPI="3"
-JAVA_PKG_IUSE="doc examples source test"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Simple framework to write repeatable tests"
-SRC_URI="mirror://github/KentBeck/${PN}/${PN}${PV}.zip"
-HOMEPAGE="http://www.junit.org/";
-LICENSE="CPL-1.0"
-SLOT="4"
-KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd
~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-CDEPEND="dev-java/hamcrest-core:0"
-RDEPEND=">=virtual/jre-1.5
- ${CDEPEND}"
-DEPEND=">=virtual/jdk-1.5
- ${CDEPEND}"
-
-S="${WORKDIR}/${PN}${PV}"
-
-EANT_BUILD_TARGET="jars"
-
-src_unpack() {
- default
-
- # Unpack source JAR
- mkdir -p "${S}/src/main/java" "${S}/src/test/java" \
- || die "Unable to create source directories"
- pushd "${S}/src/main/java" >/dev/null
- jar xf "${S}/${P}-src.jar" || die "Unable to unpack sources."
- popd >/dev/null
-
- # copy Gentoo manifest to working directory
- cp "${FILESDIR}/gentoo-manifest.mf" "${S}" || die
-}
-
-java_prepare() {
- # fix javadoc compilation
- if use doc ; then
- cp "${S}"/javadoc/stylesheet.css "${S}" \
- || die "Unable to copy Javdoc stylesheet"
- fi
-
- # remove binary and other generated files
- rm -rf javadoc temp.hamcrest.source *.jar \
- || die "Unable to clean generated files."
- find . -name "*.class" -delete \
- || die "Unable to remove distributed class files"
-
- # Let Ant know where its hamcrest went
- EANT_EXTRA_ARGS="-Dhamcrestlib=$(java-pkg_getjars hamcrest-core)"
-
- # Add Gentoo manifest information to generated JAR files
- java-ant_xml-rewrite -f build.xml -c \
- -e jar -a manifest -v "gentoo-manifest.mf"
-}
-
-src_test() {
- mkdir classes || die "Unable to create build directory for tests"
-
- local cp=$(java-pkg_getjars
hamcrest-core):${S}/${PN}${PV}/${PN}-dep-${PV}.jar
- ejavac -classpath ${cp} -d classes $(find junit/tests org/junit/tests
-name "*.java")
-
- java -classpath ${cp}:classes org.junit.runner.JUnitCore
junit.tests.AllTests \
- || die "Tests failed."
-}
-
-src_install() {
- java-pkg_newjar ${PN}${PV}/${PN}-dep-${PV}.jar
- dodoc README.html doc/ReleaseNotes${PV}.txt || die
-
- use examples && java-pkg_doexamples org/junit/samples
- use source && java-pkg_dosrc src/main/java/org src/main/java/junit
-
- if use doc; then
- dohtml -r doc/*
- java-pkg_dojavadoc ${PN}${PV}/javadoc
- fi
-}
diff --git a/dev-java/junit/junit-4.11.ebuild b/dev-java/junit/junit-4.11.ebuild
deleted file mode 100644
index 06eda28..0000000
--- a/dev-java/junit/junit-4.11.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-# WARNING: JUNIT.JAR IS _NOT_ SYMLINKED TO ANT-CORE LIB FOLDER AS JUNIT3 IS
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc examples source test"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Simple framework to write repeatable tests"
-SRC_URI="mirror://github/${PN}-team/${PN}/${PN}${PV}.zip"
-HOMEPAGE="http://www.junit.org/";
-
-LICENSE="CPL-1.0"
-SLOT="4"
-
-KEYWORDS="amd64 ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd
~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris
~x64-solaris ~x86-solaris"
-
-CDEPEND="dev-java/hamcrest-core:1.3"
-
-RDEPEND=">=virtual/jre-1.5
- ${CDEPEND}"
-
-DEPEND=">=virtual/jdk-1.5
- ${CDEPEND}"
-
-S="${WORKDIR}/${PN}${PV}"
-
-EANT_BUILD_TARGET="jars samples-and-tests"
-
-src_unpack() {
- default
-
- # Unpack the source JAR.
- mkdir -p "${S}/src/main/java" "${S}/src/test/java" \
- || die "Unable to create source directories"
-
- pushd "${S}/src/main/java" > /dev/null
- jar xf "${S}/${P}-src.jar" || die "Unable to unpack sources."
- popd >/dev/null
-
- # Copy the Gentoo manifest to the working directory.
- cp "${FILESDIR}/gentoo-manifest.mf" "${S}" || die
-}
-
-java_prepare() {
- epatch "${FILESDIR}"/${P}-do-not-unpack-hamcrest-sources.patch
-
- mkdir lib || die
- java-pkg_jar-from --into lib hamcrest-core{-1.3,.jar,-1.3.jar}
-
- # Fix javadoc compilation.
- if use doc ; then
- cp "${S}"/javadoc/stylesheet.css "${S}" \
- || die "Unable to copy Javdoc stylesheet"
- fi
-
- # Remove binary and other generated files.
- rm -rf javadoc temp.hamcrest.source *.jar \
- || die "Unable to clean generated files."
- find . -name "*.class" -delete \
- || die "Unable to remove distributed class files"
-
- # Let Ant know where its hamcrest went.
- EANT_EXTRA_ARGS="-Dhamcrestlib=$(java-pkg_getjars hamcrest-core-1.3)"
-
- # Add Gentoo manifest information to generated JAR files.
- java-ant_xml-rewrite -f build.xml -c \
- -e jar -a manifest -v "gentoo-manifest.mf"
-}
-
-src_test() {
- mkdir classes || die "Unable to create build directory for tests."
-
- local cp=$(java-pkg_getjars hamcrest-core-1.3):"${S}"/target/main
-
- ejavac -classpath ${cp} \
- -d classes $(find org/junit/internal -name "*.java")
- ejavac -classpath ${cp}:"${S}/classes" \
- -d classes $(find junit/tests org/junit/tests -name "*.java")
-
- java -classpath ${cp}:classes \
- org.junit.runner.JUnitCore junit.tests.AllTests || die "Tests
failed."
-}
-
-src_install() {
- java-pkg_newjar ${PN}${PV}-SNAPSHOT/${PN}-dep-${PV}-SNAPSHOT.jar
- dodoc README.html doc/ReleaseNotes${PV}.txt
-
- use examples && java-pkg_doexamples org/junit/samples
- use source && java-pkg_dosrc src/main/java/org src/main/java/junit
-
- if use doc; then
- dohtml -r doc/*
- java-pkg_dojavadoc ${PN}${PV}-SNAPSHOT/javadoc
- fi
-}
