commit: 5a31a0579e56425a0e1dce5bc9899ff4f3565d05 Author: Justin Lecher <jlec <AT> gentoo <DOT> org> AuthorDate: Mon Nov 3 07:28:44 2014 +0000 Commit: Justin Lecher <jlec <AT> gentoo <DOT> org> CommitDate: Mon Nov 3 07:28:44 2014 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=5a31a057
dev-java/vecmath: Bump to EAPI=5 Package-Manager: portage-2.2.14 --- dev-java/vecmath/ChangeLog | 6 +++++- dev-java/vecmath/metadata.xml | 4 ++-- dev-java/vecmath/vecmath-1.5.1.ebuild | 30 ++++++++++++++++-------------- 3 files changed, 23 insertions(+), 17 deletions(-) diff --git a/dev-java/vecmath/ChangeLog b/dev-java/vecmath/ChangeLog index e691829..1e50f58 100644 --- a/dev-java/vecmath/ChangeLog +++ b/dev-java/vecmath/ChangeLog @@ -1,7 +1,11 @@ # ChangeLog for dev-java/vecmath -# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 +# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 03 Nov 2014; Justin Lecher <[email protected]> vecmath-1.5.1.ebuild, + metadata.xml: + Bump to EAPI=5 + 10 Nov 2009; Vlastimil Babka <[email protected]> -vecmath-1.5.0.ebuild: Remove old. diff --git a/dev-java/vecmath/metadata.xml b/dev-java/vecmath/metadata.xml index 4ea9889..33e85ae 100644 --- a/dev-java/vecmath/metadata.xml +++ b/dev-java/vecmath/metadata.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> <pkgmetadata> - <herd>sci</herd> - <longdescription lang="en"> + <herd>sci</herd> + <longdescription lang="en"> 3D vector math package, javax.vecmath </longdescription> </pkgmetadata> diff --git a/dev-java/vecmath/vecmath-1.5.1.ebuild b/dev-java/vecmath/vecmath-1.5.1.ebuild index 736ebb9..610407b 100644 --- a/dev-java/vecmath/vecmath-1.5.1.ebuild +++ b/dev-java/vecmath/vecmath-1.5.1.ebuild @@ -2,11 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 # $Header: $ -# cvs -d :pserver:[email protected]:/cvs login -# cvs -d :pserver:[email protected]:/cvs export -r rel-1_5_1-fcs vecmath -# tar -cjf vecmath-1.5.1.tar.bz2 vecmath/ -# cvs -d :pserver:[email protected]:/cvs export -r rel-1_5_1-fcs vecmath-test -# tar -cjf vecmath-test-1.5.1.tar.bz2 vecmath-test/ +EAPI=5 JAVA_PKG_IUSE="doc source test" @@ -14,16 +10,22 @@ inherit eutils java-pkg-2 java-ant-2 DESCRIPTION="Sun J3D: 3D vector math package" HOMEPAGE="https://vecmath.dev.java.net/"; - +# cvs -d :pserver:[email protected]:/cvs login +# cvs -d :pserver:[email protected]:/cvs export -r rel-1_5_1-fcs vecmath +# tar -cjf vecmath-1.5.1.tar.bz2 vecmath/ +# cvs -d :pserver:[email protected]:/cvs export -r rel-1_5_1-fcs vecmath-test +# tar -cjf vecmath-test-1.5.1.tar.bz2 vecmath-test/ SRC_URI="http://dev.gentoo.org/~ali_bush/distfiles/${P}.tar.bz2 test? ( http://dev.gentoo.org/~ali_bush/distfiles/${PN}-test-${PV}.tar.bz2 )" KEYWORDS="~amd64 ~x86" SLOT="0" LICENSE="|| ( sun-jrl sun-jdl )" IUSE="" -DEPEND=">=virtual/jdk-1.5 - dev-java/ant-core - test? ( =dev-java/junit-4* )" + +DEPEND=" + >=virtual/jdk-1.5 + dev-java/ant-core + test? ( =dev-java/junit-4* )" RDEPEND=">=virtual/jre-1.5" S=${WORKDIR}/${PN} @@ -32,14 +34,13 @@ S_TEST=${WORKDIR}/${PN}-test EANT_DOC_TARGET="docs" EANT_BUILD_TARGET="jar" -src_unpack() { - unpack ${A} - cd "${S}" +src_prepare() { use test && java-ant_rewrite-classpath "${S_TEST}/build.xml" + java-pkg-2_src_prepare } src_test() { - cd "${S}/../${PN}-test" + cd "${S}/../${PN}-test" || die ANT_TASKS="ant-junit" eant \ -Dgentoo.classpath="$(java-pkg_getjar --build-only junit-4 \ @@ -54,6 +55,7 @@ src_install() { dodoc *.txt docs/*.txt if use doc; then java-pkg_dojavadoc "build/javadocs/" - dohtml -r *.html + docinto html + dodoc -r *.html fi }
