monsieurp 15/05/27 09:47:54 Modified: jarjar-1.4.ebuild ChangeLog Log: Disable tests altogether with RESTRICT=test. Signed-off-by: Patrice Clement <[email protected]> (Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 93491BB8)
Revision Changes Path 1.4 dev-java/jarjar/jarjar-1.4.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/jarjar/jarjar-1.4.ebuild?rev=1.4&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/jarjar/jarjar-1.4.ebuild?rev=1.4&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/jarjar/jarjar-1.4.ebuild?r1=1.3&r2=1.4 Index: jarjar-1.4.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-java/jarjar/jarjar-1.4.ebuild,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- jarjar-1.4.ebuild 27 May 2015 09:33:52 -0000 1.3 +++ jarjar-1.4.ebuild 27 May 2015 09:47:54 -0000 1.4 @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/jarjar/jarjar-1.4.ebuild,v 1.3 2015/05/27 09:33:52 monsieurp Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/jarjar/jarjar-1.4.ebuild,v 1.4 2015/05/27 09:47:54 monsieurp Exp $ EAPI=5 JAVA_PKG_IUSE="doc source test" @@ -24,10 +24,22 @@ RDEPEND=">=virtual/jre-1.6 ${CDEPEND}" DEPEND=">=virtual/jdk-1.6 - test? ( dev-java/ant-junit ) app-arch/unzip ${CDEPEND}" +RESTRICT='test' + +# FIXME: tests fail to pass. +#src_test() { +# # regenerates this +# cp -i dist/${P}.jar "${T}" || die +# cd lib || die +# java-pkg_jar-from junit +# cd .. +# ANT_TASKS="ant-junit" eant test +# cp "${T}/${P}.jar" dist || die +#} + src_unpack() { unpack ${A} @@ -53,17 +65,6 @@ ANT_TASKS="none" EANT_BUILD_TARGET="jar-nojarjar" -# FIXME: tests fail to pass. -#src_test() { -# # regenerates this -# cp -i dist/${P}.jar "${T}" || die -# cd lib || die -# java-pkg_jar-from junit -# cd .. -# ANT_TASKS="ant-junit" eant test -# cp "${T}/${P}.jar" dist || die -#} - src_install() { java-pkg_newjar dist/${P}.jar ${PN}.jar java-pkg_register-ant-task 1.39 dev-java/jarjar/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/jarjar/ChangeLog?rev=1.39&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/jarjar/ChangeLog?rev=1.39&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/jarjar/ChangeLog?r1=1.38&r2=1.39 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-java/jarjar/ChangeLog,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- ChangeLog 27 May 2015 09:33:52 -0000 1.38 +++ ChangeLog 27 May 2015 09:47:54 -0000 1.39 @@ -1,6 +1,9 @@ # ChangeLog for dev-java/jarjar # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/jarjar/ChangeLog,v 1.38 2015/05/27 09:33:52 monsieurp Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/jarjar/ChangeLog,v 1.39 2015/05/27 09:47:54 monsieurp Exp $ + + 27 May 2015; Patrice Clement <[email protected]> jarjar-1.4.ebuild: + Disable tests altogether with RESTRICT=test. 27 May 2015; Patrice Clement <[email protected]> jarjar-1.4.ebuild: Declare dependencies with SLOTs to avoid java-pkg_ensure-dep QA warnings. Fix
