monsieurp 15/05/12 17:03:34 Modified: pdfbox-1.8.8.ebuild ChangeLog Log: Add RESTRICT=test back and turn off tests. Correct wrong slots. Fix bug 549110. Signed-off-by: Patrice Clement <[email protected]> (Portage version: 2.2.14/cvs/Linux i686, signed Manifest commit with key 93491BB8)
Revision Changes Path 1.4 dev-java/pdfbox/pdfbox-1.8.8.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/pdfbox/pdfbox-1.8.8.ebuild?rev=1.4&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/pdfbox/pdfbox-1.8.8.ebuild?rev=1.4&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/pdfbox/pdfbox-1.8.8.ebuild?r1=1.3&r2=1.4 Index: pdfbox-1.8.8.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-java/pdfbox/pdfbox-1.8.8.ebuild,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- pdfbox-1.8.8.ebuild 2 Apr 2015 18:33:40 -0000 1.3 +++ pdfbox-1.8.8.ebuild 12 May 2015 17:03:34 -0000 1.4 @@ -1,9 +1,9 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/pdfbox/pdfbox-1.8.8.ebuild,v 1.3 2015/04/02 18:33:40 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/pdfbox/pdfbox-1.8.8.ebuild,v 1.4 2015/05/12 17:03:34 monsieurp Exp $ EAPI=5 -JAVA_PKG_IUSE="doc source test" +JAVA_PKG_IUSE="source test" inherit java-pkg-2 java-ant-2 DESCRIPTION="Java library and utilities for working with PDF documents" @@ -16,11 +16,11 @@ KEYWORDS="~x86 ~amd64" IUSE="" -CDEPEND=">=dev-java/bcprov-1.50 +CDEPEND="dev-java/icu4j:4 + dev-java/junit:4 + dev-java/bcprov:1.45 dev-java/bcmail:1.45 - >=dev-java/commons-logging-1.1.1:0 - dev-java/icu4j:4 - dev-java/junit:4" + >=dev-java/commons-logging-1.1.1:0" RDEPEND=">=virtual/jre-1.7 ${CDEPEND}" DEPEND=">=virtual/jdk-1.7 @@ -33,45 +33,30 @@ JAVA_ANT_REWRITE_CLASSPATH="yes" -EANT_GENTOO_CLASSPATH="bcprov,bcmail-1.45,commons-logging,junit-4,icu4j-4" +EANT_GENTOO_CLASSPATH="bcprov-1.45,bcmail-1.45,commons-logging,junit-4,icu4j-4" EANT_BUILD_TARGET="pdfbox.package" WANT_ANT_TASKS="ant-nodeps" -EANT_TEST_GENTOO_CLASSPATH="ant-junit,junit-4" -EANT_TEST_TARGET="test" +RESTRICT="test" src_unpack() { unpack ${A} } java_prepare() { - # Correct version number in build.xml. - # Silly typo from upstream (version mismatch) but as a result, - # the generated jar bears version 1.8.7 instead of 1.8.8 :[ + # This patch: + # - turns off downloads + # - increments version number (silly mistake from upstream) epatch "${FILESDIR}"/${P}-build.xml.patch - mkdir -v download external - ln -s "${DISTDIR}/${ADOBE_FILES}" download } -src_test() { - # For some reason that I have YET to figure out, - # running the junit tests delete the jar file (!?) - # (well I guess everything inside target/*) - - # So let's move our precious jar to another dir +src_compile() { + java-pkg-2_src_compile mv target/${P}.jar ${P}.jar - - # TODO: not all tests pass; investigate why. - # (is it our business or upstream's?) - java-pkg-2_src_test } src_install() { - java-pkg_newjar target/${P}.jar ${PN}.jar - - if use doc; then - java-pkg_dojavadoc target/site/apidocs - fi + java-pkg_newjar ${P}.jar ${PN}.jar if use source; then java-pkg_dosrc src/main/java/org 1.31 dev-java/pdfbox/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/pdfbox/ChangeLog?rev=1.31&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/pdfbox/ChangeLog?rev=1.31&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/pdfbox/ChangeLog?r1=1.30&r2=1.31 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-java/pdfbox/ChangeLog,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- ChangeLog 22 Feb 2015 12:01:04 -0000 1.30 +++ ChangeLog 12 May 2015 17:03:34 -0000 1.31 @@ -1,6 +1,11 @@ # ChangeLog for dev-java/pdfbox # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/pdfbox/ChangeLog,v 1.30 2015/02/22 12:01:04 fordfrog Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/pdfbox/ChangeLog,v 1.31 2015/05/12 17:03:34 monsieurp Exp $ + + 12 May 2015; Patrice Clement <[email protected]> + files/pdfbox-1.8.8-build.xml.patch, pdfbox-1.8.8.ebuild: + Add RESTRICT=test back and turn off tests. Correct wrong slots. Fix bug + 549110. 22 Feb 2015; Miroslav Šulc <[email protected]> pdfbox-1.8.8.ebuild: fixed installation of jar file (bug #540998)
