Realy fix #103938

(Portage version: 2.0.52-r1)

4 files changed, 12 insertions, 19 deletions

diff --git a/app-misc/gallery-remote/ChangeLog b/app-misc/gallery-remote/ChangeLog
index 41ae123512df..62d785bf5068 100644
--- a/app-misc/gallery-remote/ChangeLog
+++ b/app-misc/gallery-remote/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-misc/gallery-remote
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/gallery-remote/ChangeLog,v 1.9 2005/09/09 14:03:28 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/gallery-remote/ChangeLog,v 1.10 2005/09/14 21:43:57 axxo Exp $
+
+*gallery-remote-1.4.1-r3 (14 Sep 2005)
+
+  14 Sep 2005; Thomas Matthijs <axxo@gentoo.org>
+  -gallery-remote-1.4.1-r2.ebuild, +gallery-remote-1.4.1-r3.ebuild:
+  Realy fix #103938
 
 *gallery-remote-1.4.1-r2 (09 Sep 2005)
 
diff --git a/app-misc/gallery-remote/Manifest b/app-misc/gallery-remote/Manifest
index e1a657b8659f..10803461a5f8 100644
--- a/app-misc/gallery-remote/Manifest
+++ b/app-misc/gallery-remote/Manifest
@@ -1,17 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+MD5 8255bc68e9287ab69a56b9e3dc12bc88 gallery-remote-1.4.1-r3.ebuild 1888
 MD5 8d901509915f147e995103c3d14f05bd gallery-remote-1.4.1.ebuild 1799
-MD5 2c899b6f96c2eca12c017f3fd3262290 gallery-remote-1.4.1-r2.ebuild 1964
-MD5 aff13e6e7b267bc204f1faaf0695e2ed ChangeLog 1248
+MD5 1d714102aafab2c9b1a19f72448acd66 ChangeLog 1426
 MD5 794d84e96c85c480965fda1c9319b24f metadata.xml 256
 MD5 df0456549df4f97a4b46faf9b0c155c3 files/digest-gallery-remote-1.4.1-r2 85
+MD5 df0456549df4f97a4b46faf9b0c155c3 files/digest-gallery-remote-1.4.1-r3 85
 MD5 df0456549df4f97a4b46faf9b0c155c3 files/digest-gallery-remote-1.4.1 85
 MD5 0ecf06ec29fc94fb87eff8f73989989b files/1.4.1.patch 1125
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDIZZH/rLF9B432nYRAoZgAJ9+B0wSYP0CCQAa0PELQ2ifuBgMogCeNdc0
-JK9vJwarkglCJy8XaA5k4Iw=
-=vUoa
------END PGP SIGNATURE-----
diff --git a/app-misc/gallery-remote/files/digest-gallery-remote-1.4.1-r2 b/app-misc/gallery-remote/files/digest-gallery-remote-1.4.1-r3
index eb935cccd6ac..eb935cccd6ac 100644
--- a/app-misc/gallery-remote/files/digest-gallery-remote-1.4.1-r2
+++ b/app-misc/gallery-remote/files/digest-gallery-remote-1.4.1-r3
diff --git a/app-misc/gallery-remote/gallery-remote-1.4.1-r2.ebuild b/app-misc/gallery-remote/gallery-remote-1.4.1-r3.ebuild
index 853bd1c50ef3..65e2a3e91e1a 100644
--- a/app-misc/gallery-remote/gallery-remote-1.4.1-r2.ebuild
+++ b/app-misc/gallery-remote/gallery-remote-1.4.1-r3.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/app-misc/gallery-remote/gallery-remote-1.4.1-r2.ebuild,v 1.1 2005/09/09 14:03:28 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/gallery-remote/gallery-remote-1.4.1-r3.ebuild,v 1.1 2005/09/14 21:43:57 axxo Exp $
 
 inherit java-pkg eutils
 
@@ -47,13 +47,9 @@ src_install() {
 	cp jpegtran/jpegtran.preinstalled ${D}/usr/share/gallery-remote/jpegtran/jpegtran.properties
 	cp -r img ${D}/usr/share/gallery-remote/
 
-	# temp hack
-	cd ${D}/usr/share/gallery-remote/lib/
-	java-pkg_jar-from metadata-extractor metadata-extractor.jar	metadata-extractor-2.1.jar
-	cd ${S}
 
 	echo "#!/bin/bash" > gallery-remote
 	echo "cd /usr/share/gallery-remote/" >> gallery-remote
-	echo "java -jar lib/GalleryRemote.jar"  >> gallery-remote
+	echo "java -cp \$(java-config -p ${PN},metadata-extractor):img/ com.gallery.GalleryRemote.GalleryRemote \${@} "  >> gallery-remote
 	dobin gallery-remote
 }