monsieurp 15/06/22 14:03:38 Modified: batik-1.8.ebuild ChangeLog Log: Rework jars installation logic. Symlinking to lib/lib isn't necessary in this version so let's do away with it. Fix bug 552830. Signed-off-by: Patrice Clement <[email protected]> (Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 93491BB8)
Revision Changes Path 1.7 dev-java/batik/batik-1.8.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/batik/batik-1.8.ebuild?rev=1.7&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/batik/batik-1.8.ebuild?rev=1.7&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/batik/batik-1.8.ebuild?r1=1.6&r2=1.7 Index: batik-1.8.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-java/batik/batik-1.8.ebuild,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- batik-1.8.ebuild 22 Jun 2015 08:23:58 -0000 1.6 +++ batik-1.8.ebuild 22 Jun 2015 14:03:37 -0000 1.7 @@ -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/batik/batik-1.8.ebuild,v 1.6 2015/06/22 08:23:58 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/batik/batik-1.8.ebuild,v 1.7 2015/06/22 14:03:37 monsieurp Exp $ EAPI=5 JAVA_PKG_IUSE="doc" @@ -66,23 +66,32 @@ eant jars all-jar $(use_doc) cd contrib/rasterizertask || die eant -Dgentoo.classpath="$(java-pkg_getjar ant-core ant.jar):../../classes" jar $(use_doc) + + cd "${S}"/"${P}/lib" || die + + # batik-all-1.8.jar is a all-in-one jar that contains all other jars. + # We don't want to package it. + rm -v ${PN}-all-${PV}.jar } src_install() { - cd ${P} - # Unversion all jars in ${P}. - for jar in *.jar; do - newj="${jar%-*}.jar" - java-pkg_newjar ${jar} ${newj} - dosym ${newj} /usr/share/${PN}-${SLOT}/lib/lib/${jar} - done - - # needed because batik expects this layout: - # batik.jar lib/*.jar - # there are hardcoded classpaths in the manifest :( - dodir /usr/share/${PN}-${SLOT}/lib/lib/ + batik_unversion_jars() { + for jar in batik-*.jar; do + newj="${jar%-*}.jar" + java-pkg_newjar ${jar} ${newj} + done + } + + # First unversion jars in ${P}/lib + cd "${S}"/"${P}"/lib || die + batik_unversion_jars + + # Then, only those in ${P} + cd "${S}"/"${P}" || die + batik_unversion_jars - cd "${S}" + # Proceed with documentation installation + cd "${S}" || die dodoc README CHANGES use doc && java-pkg_dojavadoc ${P}/docs/javadoc 1.81 dev-java/batik/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/batik/ChangeLog?rev=1.81&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/batik/ChangeLog?rev=1.81&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/batik/ChangeLog?r1=1.80&r2=1.81 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-java/batik/ChangeLog,v retrieving revision 1.80 retrieving revision 1.81 diff -u -r1.80 -r1.81 --- ChangeLog 22 Jun 2015 12:03:55 -0000 1.80 +++ ChangeLog 22 Jun 2015 14:03:37 -0000 1.81 @@ -1,6 +1,11 @@ # ChangeLog for dev-java/batik # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/batik/ChangeLog,v 1.80 2015/06/22 12:03:55 monsieurp Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/batik/ChangeLog,v 1.81 2015/06/22 14:03:37 monsieurp Exp $ + + 22 Jun 2015; Patrice Clement <[email protected]> batik-1.7-r3.ebuild, + batik-1.8.ebuild: + Rework jars installation logic. Symlinking to lib/lib isn't necessary in this + version so let's do away with it. Fix bug 552830. *batik-1.7-r3 (22 Jun 2015)
