monsieurp 15/01/24 11:30:47 Modified: fujaba-4.2.0.ebuild ChangeLog Log: Fix dependencies. Tidy up launcher/jar installation java-pkg_* functions. (Portage version: 2.2.14/cvs/Linux x86_64, unsigned Manifest commit)
Revision Changes Path 1.10 dev-util/fujaba/fujaba-4.2.0.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/fujaba/fujaba-4.2.0.ebuild?rev=1.10&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/fujaba/fujaba-4.2.0.ebuild?rev=1.10&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/fujaba/fujaba-4.2.0.ebuild?r1=1.9&r2=1.10 Index: fujaba-4.2.0.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-util/fujaba/fujaba-4.2.0.ebuild,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- fujaba-4.2.0.ebuild 19 Jan 2015 19:41:29 -0000 1.9 +++ fujaba-4.2.0.ebuild 24 Jan 2015 11:30:47 -0000 1.10 @@ -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-util/fujaba/fujaba-4.2.0.ebuild,v 1.9 2015/01/19 19:41:29 monsieurp Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/fujaba/fujaba-4.2.0.ebuild,v 1.10 2015/01/24 11:30:47 monsieurp Exp $ EAPI="5" -inherit java-pkg-2 +inherit java-pkg-2 java-utils-2 MY_PV="${PV//./_}" MY_PNB="Fujaba_${PV:0:1}" @@ -19,11 +19,12 @@ =dev-java/junit-3.8* dev-java/log4j ~dev-java/jdom-1.0_beta10 - =dev-java/xerces-1.3*" + dev-java/xerces:1.3 + dev-java/xml-commons-external:1.4" DEPEND=">=virtual/jdk-1.4 ${RDEPEND}" -S=${WORKDIR} +S="${WORKDIR}" src_unpack () { jar xf "${DISTDIR}"/${A} @@ -41,14 +42,28 @@ cd 'C_/Dokumente und Einstellungen/Lothar/Eigene Dateien/Deployment/Fujaba 4.2.0/' || die "failed to cd into package" cp -pPR . "${D}"/opt/${PN} || die "failed to copy" - chmod -R 755 "${D}"/opt/${PN}/ + chmod -R 755 "${D}"/opt/${PN}/ || die "failed to chmod" - cat > ${PN} << EOF -#!/bin/sh" -cd /opt/${PN}/Deploymentdata" -'${JAVA_HOME}'/bin/java -classpath .:\$(java-config -p xerces-1.3,log4j,junit,jdom-1.0_beta10):fujaba.jar:libs/libCoObRA.jar:libs/libXMLReflect.jar:libs/RuntimeTools.jar:libs/upb.jar de.uni_paderborn.fujaba.app.FujabaApp \$*" -EOF - - into /opt - dobin ${PN} + # Install bundled jars in /opt/${PN}/lib + java-pkg_jarinto /opt/${PN}/lib + dojar_list=$(find . -type f -name \*.jar) + java-pkg_dojar ${dojar_list} || die "failed to java-pkg_dojar" + + # Register them in package.env + java-pkg_regjar "${D}"/opt/"${PN}"/lib/*.jar || die "failed to java-pkg_regjar" + + # Add additional jars to CP + cpjar_list=/usr/share + cpjar_list="${cpjar_list}/log4j/lib/log4j.jar + ${cpjar_list}/xerces-2/lib/xercesImpl.jar + ${cpjar_list}/xml-commons-external-1.4/lib/xml-apis.jar" + + for _jar in ${cpjar_list}; do + [[ -f ${_jar} ]] && java-pkg_addcp ${_jar} || \ + die "failed to add ${_jar} to CP" + done + + # Create launcher + java-pkg_dolauncher "${PN}" --main de.uni_paderborn.fujaba.app.FujabaApp || \ + die "failed to java-pkg_dolauncher" } 1.16 dev-util/fujaba/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/fujaba/ChangeLog?rev=1.16&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/fujaba/ChangeLog?rev=1.16&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/fujaba/ChangeLog?r1=1.15&r2=1.16 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-util/fujaba/ChangeLog,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- ChangeLog 19 Jan 2015 19:41:29 -0000 1.15 +++ ChangeLog 24 Jan 2015 11:30:47 -0000 1.16 @@ -1,6 +1,9 @@ # ChangeLog for dev-util/fujaba # Copyright 2000-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/fujaba/ChangeLog,v 1.15 2015/01/19 19:41:29 monsieurp Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/fujaba/ChangeLog,v 1.16 2015/01/24 11:30:47 monsieurp Exp $ + + 24 Jan 2015; Patrice Clement <[email protected]> fujaba-4.2.0.ebuild: + Fix dependencies. Tidy up launcher/jar installation java-pkg_* functions. 19 Jan 2015; Patrice Clement <[email protected]> fujaba-4.2.0.ebuild: Fix bug 536924: HOMEPAGE update, EAPI bump to v5, package cleanup.
