chewi 15/07/20 21:46:23 Modified: ChangeLog Added: junit-4.12-r1.ebuild Removed: junit-4.12.ebuild Log: Rewrite using java-pkg-simple to avoid a generated build.xml file and a cyclic dependency when testing. Fixes bug #554876. I notice that the previous 4.12 ebuild didn't apply the gentoo-manifest.mf file like earlier versions did. I doubt this is needed any more and it was broken in 4.11 anyway because it was pointing at the wrong hamcrest-core SLOT. I'll leave it out and see what happens. (Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 9C6D7DE4)
Revision Changes Path 1.89 dev-java/junit/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/junit/ChangeLog?rev=1.89&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/junit/ChangeLog?rev=1.89&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/junit/ChangeLog?r1=1.88&r2=1.89 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-java/junit/ChangeLog,v retrieving revision 1.88 retrieving revision 1.89 diff -u -r1.88 -r1.89 --- ChangeLog 12 Jul 2015 12:19:16 -0000 1.88 +++ ChangeLog 20 Jul 2015 21:46:23 -0000 1.89 @@ -1,6 +1,17 @@ # ChangeLog for dev-java/junit # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/junit/ChangeLog,v 1.88 2015/07/12 12:19:16 monsieurp Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/junit/ChangeLog,v 1.89 2015/07/20 21:46:23 chewi Exp $ + +*junit-4.12-r1 (20 Jul 2015) + + 20 Jul 2015; James Le Cuirot <[email protected]> +junit-4.12-r1.ebuild, + -files/junit-4.12-build.xml, -junit-4.12.ebuild: + Rewrite using java-pkg-simple to avoid a generated build.xml file and a cyclic + dependency when testing. Fixes bug #554876. I notice that the previous 4.12 + ebuild didn't apply the gentoo-manifest.mf file like earlier versions did. I + doubt this is needed any more and it was broken in 4.11 anyway because it was + pointing at the wrong hamcrest-core SLOT. I'll leave it out and see what + happens. 12 Jul 2015; Patrice Clement <[email protected]> files/junit-4.12-build.xml, junit-4.12.ebuild: 1.1 dev-java/junit/junit-4.12-r1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/junit/junit-4.12-r1.ebuild?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/junit/junit-4.12-r1.ebuild?rev=1.1&content-type=text/plain Index: junit-4.12-r1.ebuild =================================================================== # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/dev-java/junit/junit-4.12-r1.ebuild,v 1.1 2015/07/20 21:46:23 chewi Exp $ EAPI=5 JAVA_PKG_IUSE="doc source" inherit java-pkg-2 java-pkg-simple DESCRIPTION="Simple framework to write repeatable tests" SRC_URI="https://github.com/${PN}-team/${PN}/archive/r${PV}.zip"; HOMEPAGE="http://junit.org/"; LICENSE="EPL-1.0" SLOT="4" KEYWORDS="~amd64 ~ppc ~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="examples" CDEPEND="dev-java/hamcrest-core:1.3" RDEPEND=">=virtual/jre-1.6 ${CDEPEND}" DEPEND=">=virtual/jdk-1.6 ${CDEPEND}" S="${WORKDIR}/${PN}-r${PV}" JAVA_SRC_DIR="src/main/java" JAVA_GENTOO_CLASSPATH="hamcrest-core-1.3" java_prepare() { rm -v lib/*.jar || die } src_compile() { java-pkg-simple_src_compile java-pkg_addres ${PN}.jar src/main/resources } src_install() { java-pkg-simple_src_install dodoc {acknowledgements,{LEGACY_,}CODING_STYLE,NOTICE,to-do}.txt {CONTRIBUTING,README,doc/ReleaseNotes${PV}}.md use examples && java-pkg_doexamples src/test/java/org/junit/samples } src_test() { cd src/test/java || die local CP=".:../resources:${S}/${PN}.jar:$(java-pkg_getjars ${JAVA_GENTOO_CLASSPATH})" ejavac -cp "${CP}" -d . $(find * -name "*.java") java -cp "${CP}" -Djava.awt.headless=true org.junit.runner.JUnitCore junit.tests.AllTests || die "Running junit failed" }
