removed packed jars issue, fixes #79621. thanks to Arne Mejlholm <aaby@gentoo.org>

Package-Manager: portage-2.0.51-r15

4 files changed, 29 insertions, 10 deletions

diff --git a/dev-util/fujaba/ChangeLog b/dev-util/fujaba/ChangeLog
index 30c3ab7bd52e..122cb3f49bf2 100644
--- a/dev-util/fujaba/ChangeLog
+++ b/dev-util/fujaba/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/fujaba
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/fujaba/ChangeLog,v 1.9 2005/01/26 20:13:45 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/fujaba/ChangeLog,v 1.10 2005/02/06 15:39:50 luckyduck Exp $
+
+*fujaba-4.2.0 (06 Feb 2005)
+
+  06 Feb 2005; Jan Brinkmann <luckyduck@gentoo.org> fujaba-4.2.0.ebuild:
+  removed packed jars issue, fixes #79621. thanks to Arne Mejlholm
+  <aaby@gentoo.org>
 
   26 Jan 2005; Jan Brinkmann <luckyduck@gentoo.org> :
   version bump. fixes #79507.
diff --git a/dev-util/fujaba/Manifest b/dev-util/fujaba/Manifest
index 76923e9fe75e..081a2a08d411 100644
--- a/dev-util/fujaba/Manifest
+++ b/dev-util/fujaba/Manifest
@@ -1,7 +1,7 @@
 MD5 90d86ad0b43ee75fbd0b8516d35d151f fujaba-4.1.0.ebuild 1120
-MD5 4136e572dd31996a4a8aae3ca6c18f37 fujaba-4.2.0.ebuild 1141
+MD5 7b4ed9e73048eb77931eaca5a3b899b8 fujaba-4.2.0.ebuild 1463
 MD5 375311a21094becbf51c27f3fcdc8df3 fujaba-4.0.1.ebuild 902
-MD5 dd461150f53db83055f97effcbe4cfdb ChangeLog 1064
+MD5 f07345c56a5db3d70138f8fc11b12aae ChangeLog 1255
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 MD5 bc7d3c5a2391e2ca7a7370c94a862989 files/digest-fujaba-4.0.1 81
 MD5 5d139b04e0178ac6209b48123ca329df files/digest-fujaba-4.1.0 81
diff --git a/dev-util/fujaba/fujaba-4.2.0.ebuild b/dev-util/fujaba/fujaba-4.2.0.ebuild
index 036cd64c2ef4..2ef1329f7449 100644
--- a/dev-util/fujaba/fujaba-4.2.0.ebuild
+++ b/dev-util/fujaba/fujaba-4.2.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 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.1 2005/01/26 20:13:45 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/fujaba/fujaba-4.2.0.ebuild,v 1.2 2005/02/06 15:39:50 luckyduck Exp $
 
 MY_PV="${PV//./_}"
 MY_PNB="Fujaba_${PV:0:1}"
@@ -12,8 +12,14 @@ LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~x86 ~ppc ~amd64"
 IUSE=""
-RDEPEND=">=virtual/jdk-1.4.1"
-DEPEND="app-arch/unzip"
+RDEPEND=">=virtual/jre-1.4"
+DEPEND=">=virtual/jdk-1.4
+	app-arch/unzip
+	dev-java/java-config
+	dev-java/junit
+	dev-java/log4j
+	~dev-java/jdom-1.0_beta10"
+
 S=${WORKDIR}
 
 src_unpack () {
@@ -25,12 +31,19 @@ src_compile() { :; }
 src_install() {
 	dodir /opt/${PN}
 	cd 'C_/Dokumente und Einstellungen/Lothar/Eigene Dateien/Deployment/Fujaba 4.2.0/' || die "failed to enter die"
+
+	rm -f Deploymentdata/libs/junit.jar
+	rm -f Deploymentdata/libs/log4j.jar
+	rm -f Deploymentdata/libs/jdom.jar
+
 	cp -a . ${D}/opt/${PN} || die "failed too copy"
 	chmod -R 755 ${D}/opt/${PN}/
 
 	echo "#!/bin/sh" > ${PN}
 	echo "cd /opt/${PN}/Deploymentdata" >> ${PN}
-	echo '${JAVA_HOME}'/bin/java -jar ${PN}.jar '$*' >> ${PN}
+	#jdom and java-config doesn't seem to get along
+	echo "'${JAVA_HOME}'/bin/java -classpath .:\$(java-config -p log4j,junit,jdom-1.0_beta10) -jar ${PN}.jar \$*" >> ${PN}
+
 	into /opt
 	dobin ${PN}
 }
diff --git a/dev-util/omake/Manifest b/dev-util/omake/Manifest
index 7f41cd9a1b1d..6eb1bd441ac9 100644
--- a/dev-util/omake/Manifest
+++ b/dev-util/omake/Manifest
@@ -1,4 +1,4 @@
-MD5 64b7c40e29fce7bd92aac8caed498168 omake-0.9.3.ebuild 904
-MD5 984e1293d51aed2f70b49bda79ffbbbb ChangeLog 716
+MD5 2df17be374c492dcc70f5b32519b8704 omake-0.9.4.ebuild 904
+MD5 c6b3cd38f907cc104e237a239c27b9dc ChangeLog 911
 MD5 8b350f19c06fcabf1053b0421b7c3f5a metadata.xml 155
-MD5 7ed9138efd0d44273d5ceeb1ed6b5fa4 files/digest-omake-0.9.3 65
+MD5 b1d686463a3d31d6d3804f7423b030c0 files/digest-omake-0.9.4 66