Version bump. Patched to support shared-mime-info spec and otherwise follow freedesktop specs. Fixes bug #199626.

Package-Manager: portage-2.1.3.19

6 files changed, 466 insertions, 9 deletions

diff --git a/media-video/jubler/ChangeLog b/media-video/jubler/ChangeLog
index 33fba6078412..b4b427371eab 100644
--- a/media-video/jubler/ChangeLog
+++ b/media-video/jubler/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-video/jubler
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/jubler/ChangeLog,v 1.4 2007/10/24 23:38:31 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/jubler/ChangeLog,v 1.5 2007/11/21 21:11:22 betelgeuse Exp $
+
+*jubler-3.4.0 (21 Nov 2007)
+
+  21 Nov 2007; Petteri Räty <betelgeuse@gentoo.org>
+  +files/jubler-3.4.0-freedesktop.patch, +files/jubler-3.4.0.patch,
+  +jubler-3.4.0.ebuild:
+  Version bump. Patched to support shared-mime-info spec and otherwise follow
+  freedesktop specs. Fixes bug #199626.
 
 *jubler-3.3.0-r1 (24 Oct 2007)
 
diff --git a/media-video/jubler/Manifest b/media-video/jubler/Manifest
index 2c6877902604..4ed4802bfd21 100644
--- a/media-video/jubler/Manifest
+++ b/media-video/jubler/Manifest
@@ -5,7 +5,16 @@ AUX jubler-3.3.0.patch 11997 RMD160 d136352edebfa59603d3894f73ef2b118926b612 SHA
 MD5 c62bd858115401bfc60ef70f43d8e6b8 files/jubler-3.3.0.patch 11997
 RMD160 d136352edebfa59603d3894f73ef2b118926b612 files/jubler-3.3.0.patch 11997
 SHA256 6c591e09a25e5dc07690e753770d2735bca6906f2f0689bc5e157cb30d0e1c2d files/jubler-3.3.0.patch 11997
+AUX jubler-3.4.0-freedesktop.patch 6964 RMD160 c4b68d8044cda105c060d6639bdaf1e7a7367a10 SHA1 c66e61aa953262bce4bcc3d71cfdb9e1f80086ec SHA256 541ac4a024e40602cb1603ac7fab5ebc8a4995f16a9d316063ee6570a331ddf1
+MD5 e6a2f4687d0097bae8dc660fcdc9f63d files/jubler-3.4.0-freedesktop.patch 6964
+RMD160 c4b68d8044cda105c060d6639bdaf1e7a7367a10 files/jubler-3.4.0-freedesktop.patch 6964
+SHA256 541ac4a024e40602cb1603ac7fab5ebc8a4995f16a9d316063ee6570a331ddf1 files/jubler-3.4.0-freedesktop.patch 6964
+AUX jubler-3.4.0.patch 6349 RMD160 4e06077a055970fd9b71b60f7e8a9be9247b75b3 SHA1 f28c80881602b2714e21dca67a74b360d7b528fb SHA256 6542d024c80c4ab1a5deaf3bfb51695cffe6cb0c02912ea6dad96461807573eb
+MD5 f1d7c41f4252cd7e17f91cb6fd2b4ed1 files/jubler-3.4.0.patch 6349
+RMD160 4e06077a055970fd9b71b60f7e8a9be9247b75b3 files/jubler-3.4.0.patch 6349
+SHA256 6542d024c80c4ab1a5deaf3bfb51695cffe6cb0c02912ea6dad96461807573eb files/jubler-3.4.0.patch 6349
 DIST Jubler-src-3.3.0.tar.bz2 1707747 RMD160 0af1db4e41b56acc0b9c80ad3e45e0090043914b SHA1 68ab46ba172755217f49df582babd260f7687707 SHA256 48b431600210160b2643a794bcf4054b6a12553c5d3daad16b4ab991f269c16c
+DIST Jubler-src-3.4.0.tar.bz2 1701860 RMD160 58acd6d5745c34ae2d2fa5a06c92d068528e51ad SHA1 f5a4bf057f78a0d498f82f12fba795d36ef6bbc2 SHA256 f52b5d06488e25eb35d04356a6ba424d4c862c76d32213a8ea624d227fa8cceb
 EBUILD jubler-3.3.0-r1.ebuild 2007 RMD160 e847a4da2ec3f920af94fc152f5c143f7221b2b5 SHA1 47ca6ad7af4f1b5ccdc0b258c5f07bf25dd726fb SHA256 6e1738204059a8c3c78c0b12d623d29a5fee7fcc26c78527a6019d9159dc5598
 MD5 4759cd55df733d6c76420201807f3f68 jubler-3.3.0-r1.ebuild 2007
 RMD160 e847a4da2ec3f920af94fc152f5c143f7221b2b5 jubler-3.3.0-r1.ebuild 2007
@@ -14,10 +23,14 @@ EBUILD jubler-3.3.0.ebuild 1965 RMD160 3b941564046823a8308ba7d00b4f717d683099b2
 MD5 27a1dee70d6f00040e90b84514b9e5cf jubler-3.3.0.ebuild 1965
 RMD160 3b941564046823a8308ba7d00b4f717d683099b2 jubler-3.3.0.ebuild 1965
 SHA256 8416ae056dad09272b7d2535dd0f667c0334f0a0f457fbc7357fad2dd5030e00 jubler-3.3.0.ebuild 1965
-MISC ChangeLog 855 RMD160 ade2ea76f49967b684b303d3ebb0567e3509a1ee SHA1 9ebb3b36c0ad5ea25eb8ec10ebded1d43043be51 SHA256 7e5d6b827269dd1209846e763b6b1fbd6e4702e19d63a66eaf974d3ff6fd7adb
-MD5 fe5f578ab9388c315b5f5062edc8c01c ChangeLog 855
-RMD160 ade2ea76f49967b684b303d3ebb0567e3509a1ee ChangeLog 855
-SHA256 7e5d6b827269dd1209846e763b6b1fbd6e4702e19d63a66eaf974d3ff6fd7adb ChangeLog 855
+EBUILD jubler-3.4.0.ebuild 1976 RMD160 11cbd9dcba94f587a58bd8208d59f56ce3f8fa4e SHA1 520b743b65012f0841bfc736e83f498a3355e2d3 SHA256 0854a95a7f2b9e90e1e167930ad522a74fc8d7e5ce3e42d7d6d937b305df3592
+MD5 b42d9f0343535512833dc8ed62510c53 jubler-3.4.0.ebuild 1976
+RMD160 11cbd9dcba94f587a58bd8208d59f56ce3f8fa4e jubler-3.4.0.ebuild 1976
+SHA256 0854a95a7f2b9e90e1e167930ad522a74fc8d7e5ce3e42d7d6d937b305df3592 jubler-3.4.0.ebuild 1976
+MISC ChangeLog 1148 RMD160 7d3927b82727e5a17f05001a7cf15ec9a4ba811e SHA1 2f1fe84846b62e7ba2e5c9c31577e9abe9e6a521 SHA256 f9504ca0dbbd323c53e37b64ea334b44d2f81bb3065ab5ea8cbf9c1ced6a108c
+MD5 fc8efc621f2bdcf2a26b0d1f324e984e ChangeLog 1148
+RMD160 7d3927b82727e5a17f05001a7cf15ec9a4ba811e ChangeLog 1148
+SHA256 f9504ca0dbbd323c53e37b64ea334b44d2f81bb3065ab5ea8cbf9c1ced6a108c ChangeLog 1148
 MISC metadata.xml 216 RMD160 05d4d9c2f1c459ea9309346016001e26bad574ce SHA1 98783559fec44d27f1294db2e9549af2fe38f1b3 SHA256 94b55a2ec67c524728d32249d59a6a1545fd37d61c83259b5f05163ca47e87e1
 MD5 f975e6f37c20a73d4d486a0c24ff4c78 metadata.xml 216
 RMD160 05d4d9c2f1c459ea9309346016001e26bad574ce metadata.xml 216
@@ -28,10 +41,13 @@ SHA256 185a1c17b28d13e72293e0d93cc09eb4b9962947a3f5c7113806bfdf317e1811 files/di
 MD5 e1ead37e38523b99793852a8fd27b7d5 files/digest-jubler-3.3.0-r1 256
 RMD160 ed2ebdc7f9856d1dc327c60abb53eb8804043b73 files/digest-jubler-3.3.0-r1 256
 SHA256 185a1c17b28d13e72293e0d93cc09eb4b9962947a3f5c7113806bfdf317e1811 files/digest-jubler-3.3.0-r1 256
+MD5 9ea9ba6b92c8fbef46b48bd8b20c56de files/digest-jubler-3.4.0 256
+RMD160 7d68805c3953a91057a4f558201c23bd58df143e files/digest-jubler-3.4.0 256
+SHA256 b376bd3bad6c652ec0d00615461fd6b6c5e5ea390d1fce62e3d45d91f91b888d files/digest-jubler-3.4.0 256
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.4 (GNU/Linux)
+Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFHH9d5cxLzpIGCsLQRAliVAJwO3KMz44bAL5ES6sxa8GK1jYeJJQCggKdG
-JmXZLCN68yXdaKSlgDS9n6Q=
-=a+Ci
+iD8DBQFHRJ7OcxLzpIGCsLQRAuvwAJ44V5yTtHyZ04Zd2v/zLJ8lVQ9O+gCfQ69n
+YJm8/CyDUGXOsvQcqc60PfE=
+=xYra
 -----END PGP SIGNATURE-----
diff --git a/media-video/jubler/files/digest-jubler-3.4.0 b/media-video/jubler/files/digest-jubler-3.4.0
new file mode 100644
index 000000000000..f9ff124f5a8f
--- /dev/null
+++ b/media-video/jubler/files/digest-jubler-3.4.0
@@ -0,0 +1,3 @@
+MD5 4fa800dc0ae3fb15a87736a0fedcf207 Jubler-src-3.4.0.tar.bz2 1701860
+RMD160 58acd6d5745c34ae2d2fa5a06c92d068528e51ad Jubler-src-3.4.0.tar.bz2 1701860
+SHA256 f52b5d06488e25eb35d04356a6ba424d4c862c76d32213a8ea624d227fa8cceb Jubler-src-3.4.0.tar.bz2 1701860
diff --git a/media-video/jubler/files/jubler-3.4.0-freedesktop.patch b/media-video/jubler/files/jubler-3.4.0-freedesktop.patch
new file mode 100644
index 000000000000..e0c13cfcbc09
--- /dev/null
+++ b/media-video/jubler/files/jubler-3.4.0-freedesktop.patch
@@ -0,0 +1,170 @@
+Index: resources/installers/linux/iconinstall
+===================================================================
+--- resources/installers/linux/iconinstall	(revision 0)
++++ resources/installers/linux/iconinstall	(revision 0)
+@@ -0,0 +1,13 @@
++#!/bin/bash
++dir=$(dirname ${0})
++target=${1}
++[[ ${target} ]] || { echo "No target given!"; exit 1; }
++
++for size in 32 128; do
++	icondir="${target}/${size}x${size}/mimetypes/"
++	mkdir -pv "${icondir}"
++	cp -v "${dir}/subtitle-${size}.png" "${icondir}/subtitle.png"
++	for mime in srt ssa ass sub; do
++		ln -sv subtitle.png "${icondir}/application-x-${mime}.png"
++	done
++done
+
+Property changes on: resources/installers/linux/iconinstall
+___________________________________________________________________
+Name: svn:executable
+   + *
+
+Index: resources/installers/linux/jubler.xml
+===================================================================
+--- resources/installers/linux/jubler.xml	(revision 0)
++++ resources/installers/linux/jubler.xml	(revision 0)
+@@ -0,0 +1,18 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
++	<mime-type type="application/x-ass">
++		<comment xml:lang="en">ASS subtitle</comment>
++		<glob pattern="*.ass"/>
++		<sub-class-of type="text/plain" />
++	</mime-type>
++	<mime-type type="application/x-ssa">
++		<comment xml:lang="en">SSA subtitle</comment>
++		<glob pattern="*.ssa"/>
++		<sub-class-of type="text/plain" />
++	</mime-type>
++	<mime-type type="application/x-sub">
++		<comment xml:lang="en">SUB subtitle</comment>
++		<glob pattern="*.sub"/>
++		<sub-class-of type="text/plain" />
++	</mime-type>
++</mime-info>
+Index: resources/installers/linux/sub-ass.desktop
+===================================================================
+--- resources/installers/linux/sub-ass.desktop	(revision 344)
++++ resources/installers/linux/sub-ass.desktop	(working copy)
+@@ -1,6 +1,6 @@
+ [Desktop Entry]
+ Type=MimeType
+-MimeType=application/sub-ass
++MimeType=application/x-ass
+ Icon=subtitle
+ Patterns=*.ass;
+ DefaultApp=jubler
+Index: resources/installers/linux/sub-ssa.desktop
+===================================================================
+--- resources/installers/linux/sub-ssa.desktop	(revision 344)
++++ resources/installers/linux/sub-ssa.desktop	(working copy)
+@@ -1,6 +1,6 @@
+ [Desktop Entry]
+ Type=MimeType
+-MimeType=application/sub-ssa
++MimeType=application/x-ssa
+ Icon=subtitle
+ Patterns=*.ssa;
+ DefaultApp=jubler
+Index: resources/installers/linux/sub-sub.desktop
+===================================================================
+--- resources/installers/linux/sub-sub.desktop	(revision 344)
++++ resources/installers/linux/sub-sub.desktop	(working copy)
+@@ -1,6 +1,6 @@
+ [Desktop Entry]
+ Type=MimeType
+-MimeType=application/sub-sub
++MimeType=application/x-sub
+ Icon=subtitle
+ Patterns=*.sub;
+ DefaultApp=jubler
+Index: resources/installers/linux/jubler.desktop
+===================================================================
+--- resources/installers/linux/jubler.desktop	(revision 344)
++++ resources/installers/linux/jubler.desktop	(working copy)
+@@ -1,11 +1,10 @@
+ [Desktop Entry]
+-Categories=AudioVideo;;
++Categories=AudioVideo;
+ Comment=Subtitle editor and authoring tool
+-Encoding=UTF-8
+ Exec=jubler %f
+ GenericName=Jubler subtitle editor
+ Icon=jubler
+-MimeType=application/sub-srt;application/sub-sub;application/sub-ssa;application/sub-ass
++MimeType=application/x-srt;application/x-sub;application/x-ssa;application/x-ass;
+ Name=Jubler
+ Terminal=false
+ Type=Application
+Index: resources/installers/linux/sub-srt.desktop
+===================================================================
+--- resources/installers/linux/sub-srt.desktop	(revision 344)
++++ resources/installers/linux/sub-srt.desktop	(working copy)
+@@ -1,6 +1,6 @@
+ [Desktop Entry]
+ Type=MimeType
+-MimeType=application/sub-srt
++MimeType=application/x-srt
+ Icon=subtitle
+ Patterns=*.srt;
+ DefaultApp=jubler
+Index: build.xml
+===================================================================
+--- build.xml	(revision 344)
++++ build.xml	(working copy)
+@@ -228,11 +228,29 @@
+ 		<property name="mimedir" value="${sharedir}/mimelnk/application"/>
+ 	</target>
+ 
+-
+-	<target name="linuxinstall" depends="linuxproperties">
++	<target name="cleandestdir" depends="linuxproperties">
+ 		<!-- Cleanup -->
+ 		<exec executable="rm" failonerror="true"><arg line="-rf ${destdir}"/></exec>
++	</target>
+ 
++	<target name="linuxdesktopintegration" depends="linuxproperties">
++		<!-- Icon files -->
++		<copy file="resources/installers/linux/jubler.menu" tofile="${sharedir}/menu/jubler"/>
++		<copy file="resources/installers/linux/jubler.xpm" todir="${sharedir}/pixmaps"/>
++		<copy file="resources/installers/linux/jubler.png" todir="${sharedir}/icons/hicolor/32x32/apps"/>
++		<exec executable="resources/installers/linux/iconinstall" failonerror="true"><arg line="${sharedir}/icons/hicolor/"/></exec>
++		<copy file="resources/installers/linux/jubler.desktop" todir="${sharedir}/applications"/>
++
++		<!-- Mimetypes -->
++		<copy file="resources/installers/linux/sub-srt.desktop" todir="${mimedir}"/>
++		<copy file="resources/installers/linux/sub-sub.desktop" todir="${mimedir}"/>
++		<copy file="resources/installers/linux/sub-ass.desktop" todir="${mimedir}"/>
++		<copy file="resources/installers/linux/sub-ssa.desktop" todir="${mimedir}"/>
++		<copy file="resources/installers/linux/jubler.xml" todir="${sharedir}/mime/packages"/>
++	</target>
++
++	<target name="linuxinstall" depends="linuxproperties, cleandestdir, linuxdesktopintegration">
++
+ 		<!-- Basic Jubler files -->
+ 		<copy file="dist/Jubler.jar" todir="${libdir}"/>
+ 		<copy file="resources/system/findjava.sh" todir="${libdir}"/>
+@@ -251,20 +269,6 @@
+ 		<exec executable="ln" failonerror="true"><arg line="-s ${reldocdir} ${libdir}/help"/></exec>
+ 		<copy file="resources/installers/linux/jubler.1" todir="${mandir}"/>
+ 		<exec executable="gzip" failonerror="true"><arg line="-v -9 ${mandir}/jubler.1"/></exec>
+-		
+-		<!-- Icon files -->
+-		<copy file="resources/installers/linux/jubler.menu" tofile="${sharedir}/menu/jubler"/>
+-		<copy file="resources/installers/linux/jubler.xpm" todir="${sharedir}/pixmaps"/>
+-		<copy file="resources/installers/linux/jubler.png" todir="${sharedir}/icons/hicolor/32x32/apps"/>
+-		<copy file="resources/installers/linux/subtitle-128.png" tofile="${sharedir}/icons/hicolor/128x128/mimetypes/subtitle.png"/>
+-		<copy file="resources/installers/linux/subtitle-32.png" tofile="${sharedir}/icons/hicolor/32x32/mimetypes/subtitle.png"/>
+-		<copy file="resources/installers/linux/jubler.desktop" todir="${sharedir}/applications"/>
+-
+-		<!-- Mimetypes -->
+-		<copy file="resources/installers/linux/sub-srt.desktop" todir="${mimedir}"/>
+-		<copy file="resources/installers/linux/sub-sub.desktop" todir="${mimedir}"/>
+-		<copy file="resources/installers/linux/sub-ass.desktop" todir="${mimedir}"/>
+-		<copy file="resources/installers/linux/sub-ssa.desktop" todir="${mimedir}"/>
+ 	</target>
+ 
+ 
diff --git a/media-video/jubler/files/jubler-3.4.0.patch b/media-video/jubler/files/jubler-3.4.0.patch
new file mode 100644
index 000000000000..f0f0560b0ce3
--- /dev/null
+++ b/media-video/jubler/files/jubler-3.4.0.patch
@@ -0,0 +1,189 @@
+diff -Nur jubler/build.xml jubler_fixed/build.xml
+--- jubler/build.xml	2007-11-18 18:13:00.000000000 +0200
++++ jubler_fixed/build.xml	2007-11-18 18:16:11.000000000 +0200
+@@ -69,22 +69,6 @@
+ 
+ 
+ 
+-	<!-- Define new ant tasks -->
+-
+-	<taskdef name="izpack"
+-		onerror="report"
+-		classpath="../TOOLS/IzPack/standalone-compiler.jar"
+-		classname="com.izforge.izpack.ant.IzPackTask"/>
+-
+-	<taskdef name="launch4j"
+-		onerror="report"
+-		classpath="../TOOLS/launch4j/launch4j.jar:../TOOLS/launch4j/lib/xstream.jar" 
+-		classname="net.sf.launch4j.ant.Launch4jTask"/>
+-	
+-	<taskdef name="jarbundler"
+-		onerror="report"
+-		classpath="../TOOLS/jarbundler/jarbundler-1.9.jar"
+-		classname="net.sourceforge.jarbundler.JarBundler" />
+ 
+ 
+ 
+@@ -393,7 +377,6 @@
+ 
+ 	
+ 	<target name="-pre-compile">
+-		<copy todir="src/com"> <fileset dir="resources/system/no_mac"/> </copy>
+ 	</target>
+ 	<target name="-post-compile">
+ 		<delete dir="build/classes/com/apple" failonerror="false"/>
+diff -Nur jubler/resources/ffdecode/Makefile jubler_fixed/resources/ffdecode/Makefile
+--- jubler/resources/ffdecode/Makefile	2007-11-12 22:43:21.000000000 +0200
++++ jubler_fixed/resources/ffdecode/Makefile	2007-11-18 18:18:00.000000000 +0200
+@@ -12,9 +12,6 @@
+ # Name of the produced library
+ PROJ=ffdecode
+ 
+-# Paths of include files
+-JAVA_HOME=${shell /bin/sh ../system/findjava.sh -j}
+-
+ # Path of the local ffmpeg source structure (already inside the source version of Jubler)
+ FFMPEG=../ffmpeg-svn
+ 
+@@ -40,7 +37,7 @@
+ SRCS=${shell ls 2>/dev/null *.c}
+ OBJS=${SRCS:.c=.o}
+ 
+-COMPFLAGS=${CFLAGS} -std=c99 -pedantic -O3 -Wall -fPIC
++COMPFLAGS=${CFLAGS} -std=c99 -pedantic -Wall -fPIC
+ 
+ ifeq (${STATIC},no)
+ 	FFMPEGREQ=
+@@ -98,7 +95,6 @@
+ 
+ FCONFCOMMON=--disable-debug --enable-gpl --enable-a52 --disable-ffmpeg --disable-ffserver --disable-ffplay --disable-encoders --disable-vhook --disable-ipv6 --disable-network --disable-dv1394 --disable-bktr --disable-v4l2 --disable-v4l --disable-audio-beos --disable-audio-oss
+ 
+-CC=${PREF}gcc ${COMPARCH}
+ RANLIB=${PREF}ranlib
+ 
+ 
+@@ -152,8 +148,7 @@
+ LIB:${LIBNAME}
+ 
+ ${LIBNAME}:${FFMPEGREQ} ${OBJS} ${RANLIBREQ}
+-	${LD} ${COMPARCH} -o ${LIBNAME} ${OBJS} ${LIBS}
+-	${STRIP} ${LIBNAME}
++	${LD} -o ${LIBNAME} ${OBJS} ${LIBS}
+ 
+ 
+ clean:
+diff -Nur jubler/src/com/panayotis/jubler/information/HelpBrowser.java jubler_fixed/src/com/panayotis/jubler/information/HelpBrowser.java
+--- jubler/src/com/panayotis/jubler/information/HelpBrowser.java	2007-11-18 18:12:50.000000000 +0200
++++ jubler_fixed/src/com/panayotis/jubler/information/HelpBrowser.java	2007-11-18 18:18:44.000000000 +0200
+@@ -47,7 +47,7 @@
+         
+         history = new ArrayList<String>();
+         
+-        String initpage = "file:"+SystemFileFinder.getJublerAppPath()+"/help/jubler-faq.html";
++        String initpage = "file:"+SystemFileFinder.getJublerAppPath()+"/../help/jubler-faq.html";
+         setPage(initpage);
+         history.add(initpage);
+         
+diff -Nur jubler/src/com/panayotis/jubler/Main.java jubler_fixed/src/com/panayotis/jubler/Main.java
+--- jubler/src/com/panayotis/jubler/Main.java	2007-11-18 18:12:50.000000000 +0200
++++ jubler_fixed/src/com/panayotis/jubler/Main.java	2007-11-19 06:10:30.000000000 +0200
+@@ -86,17 +86,9 @@
+         /* Load arguments, in a mac way */
+         SystemDependent.initApplication();
+ 
+-        /* Check current version in a new thread */
+-        Thread versioncheck = new Thread() {
+-            public void run() {
+-                StaticJubler.initVersion();
+-            }
+-        };
+-
+         new Jubler();   // Display initial Jubler window
+         splash.dispose();   // Hide splash screen
+         loader.start();     // initialize loader
+-        versioncheck.start();
+                 
+     }
+         
+diff -Nur jubler/src/com/panayotis/jubler/os/SystemDependent.java jubler_fixed/src/com/panayotis/jubler/os/SystemDependent.java
+--- jubler/src/com/panayotis/jubler/os/SystemDependent.java	2007-11-18 18:12:50.000000000 +0200
++++ jubler_fixed/src/com/panayotis/jubler/os/SystemDependent.java	2007-11-18 18:23:47.000000000 +0200
+@@ -25,10 +25,6 @@
+ 
+ import static com.panayotis.jubler.i18n.I18N._;
+ 
+-import com.apple.eawt.Application;
+-import com.apple.eawt.ApplicationAdapter;
+-import com.apple.eawt.ApplicationEvent;
+-
+ import com.panayotis.jubler.Jubler;
+ import com.panayotis.jubler.Main;
+ import com.panayotis.jubler.StaticJubler;
+@@ -104,10 +100,6 @@
+     
+     
+     public static void initApplication() {
+-        /* In Linux this is a dummy function */
+-        if (isMacOSX()) {
+-            JublerApp japp = new JublerApp();
+-        }
+     }
+     
+     
+@@ -322,36 +314,3 @@
+         return home+".jubler/output.log";
+     }
+ }
+-
+-
+-
+-class JublerApp extends Application {
+-    public JublerApp() {
+-        setEnabledPreferencesMenu(true);
+-        addApplicationListener(new ApplicationHandler());
+-    }
+-}
+-
+-class ApplicationHandler extends ApplicationAdapter {
+-    
+-    public ApplicationHandler() {}
+-    
+-    public void handleAbout(ApplicationEvent event) {
+-        StaticJubler.showAbout();
+-        event.setHandled(true);
+-    }
+-    
+-    public void handlePreferences(ApplicationEvent event) {
+-        Jubler.prefs.showPreferencesDialog();
+-        event.setHandled(true);
+-    }
+-    
+-    public void handleQuit(ApplicationEvent event) {
+-        StaticJubler.quitAll();
+-        event.setHandled(false);
+-    }
+-    
+-    public void handleOpenFile(ApplicationEvent event) {
+-        Main.asyncAddSubtitle(event.getFilename());
+-    }
+-}
+diff -Nur jubler/src/com/panayotis/jubler/os/SystemFileFinder.java jubler_fixed/src/com/panayotis/jubler/os/SystemFileFinder.java
+--- jubler/src/com/panayotis/jubler/os/SystemFileFinder.java	2007-11-18 18:12:50.000000000 +0200
++++ jubler_fixed/src/com/panayotis/jubler/os/SystemFileFinder.java	2007-11-19 06:06:58.000000000 +0200
+@@ -58,15 +58,12 @@
+     }
+     
+     public static boolean loadLibrary(String name) {
+-        File libfile = findFile("lib"+pathseparator+System.mapLibraryName(name));
+-        if (libfile!=null) {
+             try {
+-                System.load(libfile.getAbsolutePath());
++                System.loadLibrary(name);
+                 return true;
+             } catch (UnsatisfiedLinkError e) {
+                 e.printStackTrace();
+             }
+-        }
+         return false;
+     }
+     
diff --git a/media-video/jubler/jubler-3.4.0.ebuild b/media-video/jubler/jubler-3.4.0.ebuild
new file mode 100644
index 000000000000..faff0bb0c7f3
--- /dev/null
+++ b/media-video/jubler/jubler-3.4.0.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/jubler/jubler-3.4.0.ebuild,v 1.1 2007/11/21 21:11:22 betelgeuse Exp $
+
+inherit gnome2 eutils java-pkg-2 java-utils-2 java-ant-2 toolchain-funcs
+
+MY_PN=${PN/#j/J}
+DESCRIPTION="Java subtitle editor"
+HOMEPAGE="http://www.jubler.org/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_PN}-src-${PV}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE="mplayer nls spell kde"
+
+RDEPEND=">=virtual/jre-1.5
+	media-video/ffmpeg
+	mplayer? ( media-video/mplayer )
+	spell?
+	(
+		app-text/aspell
+		>=dev-java/zemberek-2.0
+	)"
+
+DEPEND=">=virtual/jdk-1.5
+	media-video/ffmpeg
+	app-text/docbook-sgml-utils
+	dev-util/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+S=${WORKDIR}/${MY_PN}-${PV}
+
+pkg_setup() {
+	if use spell && ! built_with_use dev-java/zemberek linguas_tr; then
+		die "Zemberek should be built with Turkish language support"
+	fi
+	java-pkg-2_pkg_setup
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${P}.patch"
+	epatch "${FILESDIR}/${P}-freedesktop.patch"
+	chmod +x resources/installers/linux/iconinstall
+}
+
+src_compile() {
+	eant $(use nls && echo i18n) jar faq || die "eant failed"
+	cp -v dist/help/jubler-faq.html build/classes/help || die "cp failed"
+	cd resources/ffdecode || die
+	CC=$(tc-getCC) emake linuxdyn || die "make failed"
+}
+
+src_install() {
+	java-pkg_dojar dist/Jubler.jar
+	use spell && java-pkg_register-dependency zemberek zemberek2-cekirdek.jar
+	use spell && java-pkg_register-dependency zemberek zemberek2-tr.jar
+	java-pkg_doso resources/ffdecode/libffdecode.so
+	doicon resources/installers/linux/jubler.png
+	domenu resources/installers/linux/jubler.desktop
+
+	DESTDIR="${D}" eant linuxdesktopintegration
+	rm -vr "${D}/usr/share/menu" || die
+
+	java-pkg_dolauncher jubler --main com.panayotis.jubler.Main
+	doman resources/installers/linux/jubler.1
+	insinto /usr/share/jubler/help
+	doins dist/help/*
+}