Fix dependencies. Tidy up launcher/jar installation java-pkg_* functions.

Package-Manager: portage-2.2.14/cvs/Linux x86_64

3 files changed, 33 insertions, 15 deletions

diff --git a/dev-util/fujaba/ChangeLog b/dev-util/fujaba/ChangeLog
index 7ffa95867bf5..461b93d93664 100644
--- a/dev-util/fujaba/ChangeLog
+++ b/dev-util/fujaba/ChangeLog
@@ -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 <monsieurp@gentoo.org> fujaba-4.2.0.ebuild:
+  Fix dependencies. Tidy up launcher/jar installation java-pkg_* functions.
 
   19 Jan 2015; Patrice Clement <monsieurp@gentoo.org> fujaba-4.2.0.ebuild:
   Fix bug 536924: HOMEPAGE update, EAPI bump to v5, package cleanup.
diff --git a/dev-util/fujaba/Manifest b/dev-util/fujaba/Manifest
index 15068f30b332..cb144d33c3cb 100644
--- a/dev-util/fujaba/Manifest
+++ b/dev-util/fujaba/Manifest
@@ -1,4 +1,4 @@
 DIST FujabaToolSuite_Developer4_2_0.jar 19262108 SHA256 085f46432153e1b93c472f3582cd4feccf2c63a17390b80991dcf323f49119bb SHA512 3046c7e3dbe98528931645bb1208a4ef8f13ef737318004d2afa99ab821c13fa01b992ecfcd76ea226c90e69abb4797ee96ec11dfbb2c42a40cd3c3283f1e6ae WHIRLPOOL d96a341187541cd5fa11f4d7eb827fdfb0765fab087a9a937002a3d467a6bbc08c78ebd7946ee3333e68157740e77306208619a4490c19d3e9e45e1f24a0545e
-EBUILD fujaba-4.2.0.ebuild 1633 SHA256 6acd1628d53dca35ad3204a730f7b526eddcbafce1512f2ab0b1f949f44adf2c SHA512 b12a31a1b90c7a56b95f597b4f6e26eb948c26dc7bf953bc85b2516bd84f515a4702d0906fc85fe238b7fa14840825795f362d4fbdb7cedefe002a2205a8c86b WHIRLPOOL 210d01fa8f350fd66a064f8eabc2b8dd40eaf86c811db8e46f8cbfaed0ce877e849005ebd191f392c2607953ec376d3d9e6078837224d6b2bb59e5aa38c0e3ab
-MISC ChangeLog 1867 SHA256 5009fbd28d59c622aac1425d83d4cce64d25ebd79c3702920fc2d1fba35da87d SHA512 fc671a9c856b7189391e02b721c40741dda7619d9fbd1b540783a15c59ab6b60f6eff629edff6d5175abb72a6d6b732fdd8cfd6dfe61844d8241aa2e3f73b1f9 WHIRLPOOL 7cb80729686ba8af9c006af1559aa77d379ccdee17e2233bf05ead1c6fa24d02eb14c6ccff74ecb0c4e6a220c92f153a44f856a95c1b2e6026891bdd165b044b
+EBUILD fujaba-4.2.0.ebuild 2150 SHA256 e3ac9124cdac1bf0514375e4f2aae6fffa9857539028e5272a10d4addd053b08 SHA512 d69886ba0ea8319cc6d0222d5bb6c92822d9e88fec3dbb0705698a2bc18c8fb932064f1c2103f584402c4e2d25154930cfae7b407cbec007b628ea37a2976adc WHIRLPOOL b2054472f47862736abb92cac5f826a00a5c0942ef852f82ae3078bbfcb4d95d13bd19e3f4260ed4dd518be73ef7b816dffeb1ff27da532223a6fb17178663e2
+MISC ChangeLog 2019 SHA256 b4e5f336a20cd0f49ba18a400cb681723036e6360b78ba0a05ebf932955c47ef SHA512 6933c940df967b33e325d7032ac1e245894f5cfa33bd7909c2ae03ff21ad977bc550fb8328385cd327acb764ee8aafd261d52c38397b11ae2984f43e5295b2e7 WHIRLPOOL 7ca90dc0ee65b8d7b544ed5d5240341f37b881894dcb6d547f800a64cb5e59b19641607231a8c6d0b0636cef1603efc1cd1ccb442ba6995020df988b497d634f
 MISC metadata.xml 157 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9 SHA512 bbae663e26f48fdc5e272adc2b06c14f77f34c53caf84acb53908ff036e7c12a3edbbc0929d2db56bee861a453381d979c7e0983a23716f629ed2135c22ffece WHIRLPOOL 887e153e2481e7d76f0f1b67a395f10f0328b93930185ecdb8fcb5fe3c50f839086a18831d61cf45b34657aaffca6c3b7900cf3c04b712846a05027a84602448
diff --git a/dev-util/fujaba/fujaba-4.2.0.ebuild b/dev-util/fujaba/fujaba-4.2.0.ebuild
index aa9028f1242c..726d905cfc0a 100644
--- a/dev-util/fujaba/fujaba-4.2.0.ebuild
+++ b/dev-util/fujaba/fujaba-4.2.0.ebuild
@@ -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 @@ RDEPEND=">=virtual/jre-1.4
 	=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 @@ src_install() {
 	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
+	# 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"
 
-	into /opt
-	dobin ${PN}
+	# 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"
 }