monsieurp 15/06/08 12:53:18 Modified: jaffl-0.5.11.ebuild ChangeLog Log: Mend Makefile to get tests to pass. Update dependencies. Set patches in order. Fix bug 551494. 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.3 dev-java/jaffl/jaffl-0.5.11.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/jaffl/jaffl-0.5.11.ebuild?rev=1.3&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/jaffl/jaffl-0.5.11.ebuild?rev=1.3&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/jaffl/jaffl-0.5.11.ebuild?r1=1.2&r2=1.3 Index: jaffl-0.5.11.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-java/jaffl/jaffl-0.5.11.ebuild,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- jaffl-0.5.11.ebuild 23 Jul 2013 17:23:33 -0000 1.2 +++ jaffl-0.5.11.ebuild 8 Jun 2015 12:53:18 -0000 1.3 @@ -1,6 +1,6 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/jaffl/jaffl-0.5.11.ebuild,v 1.2 2013/07/23 17:23:33 vincent Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/jaffl/jaffl-0.5.11.ebuild,v 1.3 2015/06/08 12:53:18 monsieurp Exp $ EAPI="5" @@ -18,19 +18,19 @@ SLOT="0" KEYWORDS="~amd64 ~ppc ~x86" -CDEPEND="dev-java/jffi:0.4 +CDEPEND="dev-java/jffi:1.2 dev-java/jnr-x86asm:0 dev-java/asm:3" -RDEPEND=">=virtual/jre-1.5 +RDEPEND=">=virtual/jre-1.6 ${CDEPEND}" -DEPEND=">=virtual/jdk-1.5 +DEPEND=">=virtual/jdk-1.6 app-arch/unzip ${CDEPEND} test? ( dev-java/junit:4 - dev-java/ant-junit4:0 + dev-java/ant-junit:0 dev-java/hamcrest-core:0 )" @@ -45,9 +45,10 @@ java_prepare() { rm -vf lib/{.,junit*}/*.jar - epatch "${FILESDIR}/library-path-0.5.9.patch" + epatch "${FILESDIR}"/${P}-library-path.patch + epatch "${FILESDIR}"/${P}-GNUmakefile.patch - java-pkg_jar-from --into lib jffi-0.4 + java-pkg_jar-from --into lib jffi-1.2 java-pkg_jar-from --into lib jnr-x86asm java-pkg_jar-from --into lib asm-3 asm.jar asm-3.2.jar java-pkg_jar-from --into lib asm-3 asm-analysis.jar asm-analysis-3.2.jar @@ -64,9 +65,9 @@ -D\"already.built.${S}\"=true" src_test() { - local paths="$(java-config -di jnr-x86asm,jffi-0.4):${S}/build" + local paths="$(java-config -di jnr-x86asm,jffi-1.2):${S}/build" - ANT_TASKS="ant-junit4 ant-nodeps" eant test \ + ANT_TASKS="ant-junit ant-nodeps" eant test \ -Drun.jvmargs="-Djava.library.path=${paths}" \ -Dlibs.junit_4.classpath="$(java-pkg_getjars junit-4,hamcrest-core)" ${EANT_EXTRA_ARGS} } 1.12 dev-java/jaffl/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/jaffl/ChangeLog?rev=1.12&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/jaffl/ChangeLog?rev=1.12&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/jaffl/ChangeLog?r1=1.11&r2=1.12 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-java/jaffl/ChangeLog,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- ChangeLog 7 Jun 2015 08:31:03 -0000 1.11 +++ ChangeLog 8 Jun 2015 12:53:18 -0000 1.12 @@ -1,6 +1,13 @@ # ChangeLog for dev-java/jaffl # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/jaffl/ChangeLog,v 1.11 2015/06/07 08:31:03 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/jaffl/ChangeLog,v 1.12 2015/06/08 12:53:18 monsieurp Exp $ + + 08 Jun 2015; Patrice Clement <[email protected]> + +files/jaffl-0.5.11-GNUmakefile.patch, +files/jaffl-0.5.11-library-path.patch, + -files/library-path-0.5.9.patch, -files/library-path.patch, + jaffl-0.5.11.ebuild: + Mend Makefile to get tests to pass. Update dependencies. Set patches in order. + Fix bug 551494. 07 Jun 2015; Justin Lecher <[email protected]> metadata.xml: Add github to remote-id in metadata.xml
