summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Matthijs <axxo@gentoo.org>2005-07-11 20:27:59 +0000
committerThomas Matthijs <axxo@gentoo.org>2005-07-11 20:27:59 +0000
commita71feea953aeadae8c1582407c5d53a3a7ec465b (patch)
tree23e4919313e9b929c9ef63d988467dbf97f5d7b6 /app-misc
parentdont install versioned jars (diff)
downloadgentoo-2-a71feea953aeadae8c1582407c5d53a3a7ec465b.tar.gz
gentoo-2-a71feea953aeadae8c1582407c5d53a3a7ec465b.tar.bz2
gentoo-2-a71feea953aeadae8c1582407c5d53a3a7ec465b.zip
cleanup
(Portage version: 2.0.51.22-r1)
Diffstat (limited to 'app-misc')
-rw-r--r--app-misc/gallery-remote/files/1.3.2.patch21
-rw-r--r--app-misc/gallery-remote/files/build.xml.patch25
-rw-r--r--app-misc/gallery-remote/files/digest-gallery-remote-1.3.21
-rw-r--r--app-misc/gallery-remote/gallery-remote-1.3.2.ebuild53
-rw-r--r--app-misc/gallery-remote/gallery-remote-1.4.1.ebuild27
5 files changed, 12 insertions, 115 deletions
diff --git a/app-misc/gallery-remote/files/1.3.2.patch b/app-misc/gallery-remote/files/1.3.2.patch
deleted file mode 100644
index f84b52e2526b..000000000000
--- a/app-misc/gallery-remote/files/1.3.2.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- com/gallery/GalleryRemote/util/ExifImageUtils.java.orig 2004-07-30 05:54:29.074613888 +0200
-+++ com/gallery/GalleryRemote/util/ExifImageUtils.java 2004-07-30 05:54:45.454123824 +0200
-@@ -84,9 +84,6 @@
- Log.log(Log.LEVEL_TRACE, MODULE, "Angle: " + af.angle + " Flipped: " + af.flip);
- return af;
- }
-- } catch (FileNotFoundException e) {
-- Log.logException(Log.LEVEL_ERROR, MODULE, e);
-- return null;
- } catch (JpegProcessingException e) {
- Log.logException(Log.LEVEL_ERROR, MODULE, e);
- return null;
-@@ -107,8 +104,6 @@
-
- // todo: this doesn't do anything at present: the library can only READ
- // EXIF, not write to it...
-- } catch (FileNotFoundException e) {
-- Log.logException(Log.LEVEL_ERROR, MODULE, e);
- } catch (JpegProcessingException e) {
- Log.logException(Log.LEVEL_ERROR, MODULE, e);
- }
diff --git a/app-misc/gallery-remote/files/build.xml.patch b/app-misc/gallery-remote/files/build.xml.patch
deleted file mode 100644
index 8554cd94262d..000000000000
--- a/app-misc/gallery-remote/files/build.xml.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- build.xml.orig 2004-07-30 05:50:41.822161512 +0200
-+++ build.xml 2004-07-30 05:53:17.553486752 +0200
-@@ -25,12 +25,8 @@
- <!-- Compile the java code from ${src} into ${build} -->
- <javac srcdir="${src}" destdir="${build}"
- includes="com/**,HTTPClient/**,edu/**"
-+ classpath="${compile.classpath}"
- listfiles="on" debug="on" source="1.3">
-- <classpath>
-- <pathelement location="lib/JSX1.0.7.4.jar"/>
-- <pathelement location="lib/AppleJavaExtensions.jar"/>
-- <pathelement location="lib/metadata-extractor-2.1.jar"/>
-- </classpath>
- </javac>
-
- <!-- other files needed -->
-@@ -65,7 +61,7 @@
- <manifest>
- <attribute name="Built-By" value="${user.name}" />
- <attribute name="Main-Class" value="com.gallery.GalleryRemote.GalleryRemote" />
-- <attribute name="Class-Path" value="lib/metadata-extractor-2.1.jar lib/JSX1.0.7.4.jar img/" />
-+ <attribute name="Class-Path" value="${compile.classpath} /usr/share/gallery-remote/img/" />
- </manifest>
- </jar>
- </target>
diff --git a/app-misc/gallery-remote/files/digest-gallery-remote-1.3.2 b/app-misc/gallery-remote/files/digest-gallery-remote-1.3.2
deleted file mode 100644
index bf5df0e24936..000000000000
--- a/app-misc/gallery-remote/files/digest-gallery-remote-1.3.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 bb93921f1826dfa790ff59888c445a3b gallery-remote-1.3.2-cvs-gentoo.tar.bz2 340558
diff --git a/app-misc/gallery-remote/gallery-remote-1.3.2.ebuild b/app-misc/gallery-remote/gallery-remote-1.3.2.ebuild
deleted file mode 100644
index 8308737ebec9..000000000000
--- a/app-misc/gallery-remote/gallery-remote-1.3.2.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# 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.3.2.ebuild,v 1.5 2005/01/20 15:33:18 luckyduck Exp $
-
-inherit java-pkg eutils
-
-DESCRIPTION="Gallery Remote is a client-side Java application that provides users with a rich front-end to Gallery. This application makes it easier to upload images to your Gallery."
-HOMEPAGE="http://gallery.sourceforge.net/gallery_remote.php"
-SRC_URI="mirror://gentoo/gallery-remote-${PV}-cvs-gentoo.tar.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86"
-IUSE="jikes"
-DEPEND=">=virtual/jdk-1.4
- dev-java/apple-java-extensions-bin
- dev-java/jsx
- dev-java/metadata-extractor
- dev-java/java-config
- jikes? ( dev-java/jikes )"
-RDEPEND="${DEPEND}
- media-gfx/imagemagick
- media-libs/jpeg"
-
-S=${WORKDIR}/gallery_remote
-
-src_unpack() {
- unpack ${A}
- cd ${S}
- epatch ${FILESDIR}/build.xml.patch
- epatch ${FILESDIR}/1.3.2.patch
-}
-
-src_compile() {
- local antflags="jar -Dcompile.classpath=$(java-config -p apple-java-extensions-bin,jsx,metadata-extractor)"
- use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
- ant ${antflags} || die "failed to compile"
-}
-
-src_install() {
- dodoc ChangeLog LICENSE README
- java-pkg_dojar GalleryRemote.jar
-
- dodir /usr/share/gallery-remote/{imagemagick,jpegtran}
- cp imagemagick/im.properties.preinstalled ${D}/usr/share/gallery-remote/imagemagick/im.properties
- cp jpegtran/jpegtran.preinstalled ${D}/usr/share/gallery-remote/jpegtran/jpegtran.properties
- cp -r img ${D}/usr/share/gallery-remote/
-
- dodir /usr/bin/
- echo "#!/bin/bash" > ${D}/usr/bin/gallery-remote
- echo "cd /usr/share/gallery-remote/" >> ${D}/usr/bin/gallery-remote
- echo "\$(java-config -J) -jar \$(java-config -p gallery-remote)" >> ${D}/usr/bin/gallery-remote
- chmod 755 ${D}/usr/bin/gallery-remote
-}
diff --git a/app-misc/gallery-remote/gallery-remote-1.4.1.ebuild b/app-misc/gallery-remote/gallery-remote-1.4.1.ebuild
index 5899c881054f..8b80c38d2f9f 100644
--- a/app-misc/gallery-remote/gallery-remote-1.4.1.ebuild
+++ b/app-misc/gallery-remote/gallery-remote-1.4.1.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.ebuild,v 1.4 2005/01/20 15:33:18 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/gallery-remote/gallery-remote-1.4.1.ebuild,v 1.5 2005/07/11 20:27:59 axxo Exp $
inherit java-pkg eutils
@@ -11,15 +11,14 @@ LICENSE="GPL-2"
SLOT="0"
KEYWORDS="x86"
IUSE="jikes"
-DEPEND=">=virtual/jdk-1.4
+RDEPEND=">=virtual/jre-1.4
dev-java/apple-java-extensions-bin
- dev-java/jsx
dev-java/metadata-extractor
- dev-java/java-config
- jikes? ( dev-java/jikes )"
-RDEPEND="${DEPEND}
media-gfx/imagemagick
media-libs/jpeg"
+DEPEND=">=virtual/jdk-1.4
+ ${RDEPEND}
+ jikes? ( dev-java/jikes )"
S=${WORKDIR}/gallery_remote
@@ -27,11 +26,10 @@ src_unpack() {
unpack ${A}
cd ${S}
epatch ${FILESDIR}/${PV}.patch
- sed -e "s:lib/metadata-extractor-2.1.jar img/:$(java-config -p metadata-extractor) ../img/:" -i build.xml || die "sed failed"
cd ${S}/lib
+ rm -f *.jar
java-pkg_jar-from apple-java-extensions-bin AppleJavaExtensions.jar
- java-pkg_jar-from jsx jsx.jar JSX1.0.7.4.jar
- java-pkg_jar-from metadata-extractor metadata-extractor-2.2.2.jar metadata-extractor-2.1.jar
+ java-pkg_jar-from metadata-extractor metadata-extractor.jar metadata-extractor-2.1.jar
}
src_compile() {
@@ -41,7 +39,7 @@ src_compile() {
}
src_install() {
- dodoc ChangeLog LICENSE README
+ dodoc ChangeLog README
java-pkg_dojar GalleryRemote.jar
dodir /usr/share/gallery-remote/{imagemagick,jpegtran}
@@ -49,9 +47,8 @@ src_install() {
cp jpegtran/jpegtran.preinstalled ${D}/usr/share/gallery-remote/jpegtran/jpegtran.properties
cp -r img ${D}/usr/share/gallery-remote/
- dodir /usr/bin/
- echo "#!/bin/bash" > ${D}/usr/bin/gallery-remote
- echo "cd /usr/share/gallery-remote/" >> ${D}/usr/bin/gallery-remote
- echo "\$(java-config -J) -jar lib/GalleryRemote.jar" >> ${D}/usr/bin/gallery-remote
- chmod 755 ${D}/usr/bin/gallery-remote
+ echo "#!/bin/bash" > gallery-remote
+ echo "cd /usr/share/gallery-remote/" >> gallery-remote
+ echo "java -jar lib/GalleryRemote.jar" >> gallery-remote
+ dobin gallery-remote
}