Version bump. Remove old patches. Fixes bug #222139.

(Portage version: 2.1.4.4)

5 files changed, 123 insertions, 581 deletions

diff --git a/media-video/jubler/ChangeLog b/media-video/jubler/ChangeLog
index 6209f52d00c0..803cb5e89b13 100644
--- a/media-video/jubler/ChangeLog
+++ b/media-video/jubler/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-video/jubler
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/jubler/ChangeLog,v 1.16 2008/04/28 21:33:07 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/jubler/ChangeLog,v 1.17 2008/05/24 06:50:01 serkan Exp $
+
+*jubler-3.9.0 (22 May 2008)
+
+  22 May 2008; Serkan Kaba <serkan@gentoo.org> -files/jubler-3.3.0.patch,
+  -files/jubler-3.4.0-freedesktop.patch, -files/jubler-3.4.0.patch,
+  +files/jubler-3.9.0.patch, +jubler-3.9.0.ebuild:
+  Version bump. Remove old patches. Fixes bug #222139.
 
   28 Apr 2008; Petteri Räty <betelgeuse@gentoo.org>
   -jubler-3.3.0-r1.ebuild, -jubler-3.4.0.ebuild:
diff --git a/media-video/jubler/files/jubler-3.3.0.patch b/media-video/jubler/files/jubler-3.3.0.patch
deleted file mode 100644
index 86d681d02c88..000000000000
--- a/media-video/jubler/files/jubler-3.3.0.patch
+++ /dev/null
@@ -1,363 +0,0 @@
-diff -Nur Jubler-3.3.0/build.xml Jubler-3.3.0_patched/build.xml
---- Jubler-3.3.0/build.xml	2007-07-21 19:32:19.000000000 +0300
-+++ Jubler-3.3.0_patched/build.xml	2007-08-04 19:30:49.000000000 +0300
-@@ -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" />
- 
- 
- 
-@@ -407,9 +391,6 @@
- 	</target>
- 	
- 	<target name="noMacSystem" depends="findsystem" if="isNotMac">
--		<copy todir="src/com">
--			<fileset dir="resources/system/no_mac"/>
--		</copy>
- 	</target>
- 
- 	<target name="MacSystem" depends="findsystem" if="isMac">
-diff -Nur Jubler-3.3.0/resources/ffdecode/Makefile Jubler-3.3.0_patched/resources/ffdecode/Makefile
---- Jubler-3.3.0/resources/ffdecode/Makefile	2007-07-19 01:30:08.000000000 +0300
-+++ Jubler-3.3.0_patched/resources/ffdecode/Makefile	2007-08-04 19:30:49.000000000 +0300
-@@ -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
- 
-@@ -41,11 +38,7 @@
- OBJS=${SRCS:.c=.o}
- 
- 
--ifeq (${CFLAGS},)
--	COMPFLAGS=-std=c99 -pedantic -O3 -Wall
--else
--	COMPFLAGS=${CFLAGS}
--endif
-+COMPFLAGS=${CFLAGS} -std=c99 -pedantic -Wall -fPIC
- 
- ifeq (${STATIC},no)
- 	FFMPEGREQ=
-@@ -101,7 +94,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 ${ARCH}
- RANLIB=${PREF}ranlib
- 
- 
-@@ -155,8 +147,7 @@
- LIB:${LIBNAME}
- 
- ${LIBNAME}:${FFMPEGREQ} ${OBJS} ${RANLIBREQ}
--	${LD} ${ARCH} -o ${LIBNAME} ${OBJS} ${LIBS}
--	${STRIP} ${LIBNAME}
-+	${LD} -o ${LIBNAME} ${OBJS} ${LIBS}
- 
- 
- clean:
-diff -Nur Jubler-3.3.0/src/com/panayotis/jubler/information/HelpBrowser.java Jubler-3.3.0_patched/src/com/panayotis/jubler/information/HelpBrowser.java
---- Jubler-3.3.0/src/com/panayotis/jubler/information/HelpBrowser.java	2007-07-19 01:30:05.000000000 +0300
-+++ Jubler-3.3.0_patched/src/com/panayotis/jubler/information/HelpBrowser.java	2007-08-04 19:30:49.000000000 +0300
-@@ -31,7 +31,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-3.3.0/src/com/panayotis/jubler/Main.java Jubler-3.3.0_patched/src/com/panayotis/jubler/Main.java
---- Jubler-3.3.0/src/com/panayotis/jubler/Main.java	2007-07-19 01:30:07.000000000 +0300
-+++ Jubler-3.3.0_patched/src/com/panayotis/jubler/Main.java	2007-08-04 19:35:01.000000000 +0300
-@@ -97,13 +97,6 @@
-         }
-         splash.dispose();
-         loader.start();
--        
--        Thread t = new Thread() {
--            public void run() {
--                StaticJubler.initVersion();
--            }
--        };
--        t.start();
-     }
-     
-     
-diff -Nur Jubler-3.3.0/src/com/panayotis/jubler/os/SystemDependent.java Jubler-3.3.0_patched/src/com/panayotis/jubler/os/SystemDependent.java
---- Jubler-3.3.0/src/com/panayotis/jubler/os/SystemDependent.java	2007-07-21 19:23:13.000000000 +0300
-+++ Jubler-3.3.0_patched/src/com/panayotis/jubler/os/SystemDependent.java	2007-08-04 19:30:49.000000000 +0300
-@@ -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;
-@@ -50,23 +46,6 @@
-  */
- public class SystemDependent {
-     
--    private final static String OS;
--    
--    static {
--        OS = System.getProperty("os.name").toLowerCase();
--    }
--    
--    private static boolean isLinux() {
--        return OS.indexOf("linux") >= 0;
--    }
--    
--    private static boolean isWindows() {
--        return OS.indexOf("windows") >= 0;
--    }
--    private static boolean isMacOSX() {
--        return OS.indexOf("mac") >= 0;
--    }
--    
-     public static int getSliderLOffset() {
-         return 7;
-     }
-@@ -77,15 +56,6 @@
-     
-     
-     public final static void setLookAndFeel() {
--        try {
--            if (isWindows() || isMacOSX()) {
--                UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
--            }
--        } catch ( ClassNotFoundException e ) {
--        } catch ( InstantiationException e ) {
--        } catch (IllegalAccessException e) {
--        } catch (UnsupportedLookAndFeelException e) {
--        }
-     }
-     
-     
-@@ -95,25 +65,16 @@
-      * In Unix-like O.S. there shouldn't be a problem.
-      */
-     public static boolean shouldWaitForProccess() {
--        return !isWindows();
-+        return true;
-     }
-     
-     
-     
-     public static void hideSystemMenus(JMenuItem about, JMenuItem prefs, JMenuItem quit) {
--        if (isMacOSX()) {
--            about.setVisible(false);
--            prefs.setVisible(false);
--            quit.setVisible(false);
--        }
-     }
-     
-     
-     public static void initApplication() {
--        /* In Linux this is a dummy function */
--        if (isMacOSX()) {
--            JublerApp japp = new JublerApp();
--        }
-     }
-     
-     
-@@ -121,16 +82,6 @@
-         return 4;
-     }
-     public static String getKeyMods(boolean [] mods) {
--        if (isMacOSX()) {
--            StringBuffer res = new StringBuffer();
--            if (mods[0]) res.append("\u2318");
--            if (mods[1]) res.append("\u2325");
--            if (mods[2]) res.append("\u2303");
--            if (mods[3]) res.append("\u21e7");
--            if (res.length()>0) res.append(' ');
--            return res.toString();
--        }
--        
-         StringBuffer res = new StringBuffer();
-         if (mods[0]) res.append("+Meta");
-         if (mods[1]) res.append("+Alt");
-@@ -144,29 +95,19 @@
-     }
-     
-     public static int getDefaultKeyModifier() {
--        if (isMacOSX()) return 0;
-         return 2;
-     }
-     
-     public static String getCanonicalFilename(String filename) {
--        if (isWindows()) return filename.toLowerCase()+".exe";
-         return filename.toLowerCase();
-     }
-     
-     public static int getBundleOrFileID() {
--        if (isMacOSX()) return ExtPath.BUNDLE_ONLY;
-         return ExtPath.FILE_ONLY;
-     }
-     
-     public static void openURL(String url) {
-         try {
--            if (isMacOSX()) {
--                Class fileMgr = Class.forName("com.apple.eio.FileManager");
--                Method openURL = fileMgr.getDeclaredMethod("openURL", new Class[] {String.class});
--                openURL.invoke(null, new Object[] {url});
--            } else if (isWindows())
--                Runtime.getRuntime().exec("rundll32 url.dll,FileProtocolHandler " + url);
--            else { //assume Unix or Linux
-                 String[] browsers = {
-                     "firefox", "konqueror", "opera", "epiphany", "mozilla", "netscape" };
-                 String browser = null;
-@@ -178,30 +119,14 @@
-                     throw new Exception(_("Could not find web browser"));
-                 else
-                     Runtime.getRuntime().exec(new String[] {browser, url});
--            }
-         } catch (Exception e) {
-             DEBUG.warning("URL selected: " + url);
-         }
-     }
-     
-     public static String getDefaultMPlayerArgs() {
--        String fontconfig = "";
--        String font = "";
--        
--        if (isLinux()) {
--            font = " -font %f";
--            fontconfig=" -fontconfig";
--        } else {
--            if (isWindows()) {
--                font=" -font c:\\Windows\\fonts\\arial.ttf";
--            } else {
--                File freesans = new File(SystemFileFinder.getJublerAppPath()+"/lib/freesans.ttf");
--                if (freesans.exists()) {
--                    font = " -font %j/lib/freesans.ttf";
--                }
--            }
--        }
--        
-+        String font = " -font %f";
-+        String fontconfig=" -fontconfig";
-         return "%p -slave -identify -ontop -utf8 -noquiet -nofs"+fontconfig+" -subfont-autoscale 0 -volstep 10"+
-                 " -sub %s -ss %t -geometry +%x+%y"+font+" -subfont-text-scale %z %(-audiofile %a%) %v";
-     }
-@@ -209,7 +134,7 @@
-     
-     /* Force ASpell to use UTF-8 encoding - broken on Windows */
-     public static boolean forceASpellEncoding() {
--        return !isWindows();
-+        return true;
-     }
-     
-     
-@@ -218,26 +143,9 @@
-      * Under other platforms does not do anything
-      */
-     public static void appendSpotlightApplication(String name, Vector<ExtPath> res) {
--        if (!isMacOSX()) return;
--        if (name==null) return;
--        Process proc = null;
--        String[] cmd = new String[2];
--        cmd[0] = "mdfind";
--        cmd[1] = "kMDItemDisplayName == '"+name+"*'";   // Use this trick to avoid spaces problems inside the filename
--        try {
--            String line;
--            proc = Runtime.getRuntime().exec(cmd);
--            proc.waitFor();
--            BufferedReader in = new BufferedReader(new InputStreamReader(proc.getInputStream()));
--            while ( (line = in.readLine()) != null) {
--                if (line.endsWith(".app"))
--                    res.add(new ExtPath(line, ExtPath.BUNDLE_ONLY));
--            }
--        } catch (Exception ex) {}
-     }
-     
-     public static void appendLocateApplication(String name, Vector<ExtPath> res) {
--        if (isWindows()) return;
-         if (name==null) return;
-         
-         name = name.toLowerCase();
-@@ -271,36 +179,3 @@
-     }
-     
- }
--
--
--
--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(true);
--    }
--    
--    public void handleOpenFile(ApplicationEvent event) {
--        Main.asyncAddSubtitle(event.getFilename());
--    }
--}
-diff -Nur Jubler-3.3.0/src/com/panayotis/jubler/os/SystemFileFinder.java Jubler-3.3.0_patched/src/com/panayotis/jubler/os/SystemFileFinder.java
---- Jubler-3.3.0/src/com/panayotis/jubler/os/SystemFileFinder.java	2007-07-19 01:30:05.000000000 +0300
-+++ Jubler-3.3.0_patched/src/com/panayotis/jubler/os/SystemFileFinder.java	2007-08-04 19:30:49.000000000 +0300
-@@ -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/files/jubler-3.4.0-freedesktop.patch b/media-video/jubler/files/jubler-3.4.0-freedesktop.patch
deleted file mode 100644
index e0c13cfcbc09..000000000000
--- a/media-video/jubler/files/jubler-3.4.0-freedesktop.patch
+++ /dev/null
@@ -1,170 +0,0 @@
-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.9.0.patch
index f0f0560b0ce3..3d9ac2928590 100644
--- a/media-video/jubler/files/jubler-3.4.0.patch
+++ b/media-video/jubler/files/jubler-3.9.0.patch
@@ -1,6 +1,6 @@
-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
+diff -Nur -x '*.orig' Jubler-3.9.0/build.xml Jubler-3.9.0_patched/build.xml
+--- Jubler-3.9.0/build.xml	2008-05-14 16:13:30.000000000 +0300
++++ Jubler-3.9.0_patched/build.xml	2008-05-14 22:22:23.000000000 +0300
 @@ -69,22 +69,6 @@
  
  
@@ -24,17 +24,19 @@ diff -Nur jubler/build.xml jubler_fixed/build.xml
  
  
  
-@@ -393,7 +377,6 @@
+@@ -397,9 +381,6 @@
+ 	
  
  	
- 	<target name="-pre-compile">
+-	<target name="-pre-compile">
 -		<copy todir="src/com"> <fileset dir="resources/system/no_mac"/> </copy>
- 	</target>
+-	</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
+ 		<delete dir="src/com/apple" failonerror="false"/>
+diff -Nur -x '*.orig' Jubler-3.9.0/resources/ffdecode/Makefile Jubler-3.9.0_patched/resources/ffdecode/Makefile
+--- Jubler-3.9.0/resources/ffdecode/Makefile	2008-03-18 00:01:03.000000000 +0200
++++ Jubler-3.9.0_patched/resources/ffdecode/Makefile	2008-05-14 22:19:47.000000000 +0300
 @@ -12,9 +12,6 @@
  # Name of the produced library
  PROJ=ffdecode
@@ -42,39 +44,29 @@ diff -Nur jubler/resources/ffdecode/Makefile jubler_fixed/resources/ffdecode/Mak
 -# 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 @@
+ # Current Path
+ CPATH=${shell pwd}
  
- 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
+@@ -106,7 +103,6 @@
+ CCPREF_NOS=${shell echo ${CCPREF} | sed -e 's/-$$//g' }
+ DCONFIG=--with-mp4v2 --host=${CCPREF_NOS}
  
--CC=${PREF}gcc ${COMPARCH}
- RANLIB=${PREF}ranlib
+-CC=${CCPREF}gcc
+ RANLIB=${CCPREF}ranlib
  
  
-@@ -152,8 +148,7 @@
- LIB:${LIBNAME}
+@@ -115,7 +111,7 @@
+ .SUFFIXES:.o .c
  
- ${LIBNAME}:${FFMPEGREQ} ${OBJS} ${RANLIBREQ}
--	${LD} ${COMPARCH} -o ${LIBNAME} ${OBJS} ${LIBS}
--	${STRIP} ${LIBNAME}
-+	${LD} -o ${LIBNAME} ${OBJS} ${LIBS}
+ .c.o:
+-	${CC} ${CFLAGS} ${GCCOPTS} -std=c99 -pedantic -O3 -Wall ${INCS} -I${JAVA_HOME}/include -I${JAVA_HOME}/include/${SYSTEM} -c -o $@ $?
++	${CC} ${CFLAGS} ${GCCOPTS} -std=c99 -pedantic -Wall ${INCS} -I${JAVA_HOME}/include -I${JAVA_HOME}/include/${SYSTEM} -c -o $@ $?
  
  
- 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
+ develop:javacheck
+diff -Nur -x '*.orig' Jubler-3.9.0/src/com/panayotis/jubler/information/HelpBrowser.java Jubler-3.9.0_patched/src/com/panayotis/jubler/information/HelpBrowser.java
+--- Jubler-3.9.0/src/com/panayotis/jubler/information/HelpBrowser.java	2008-03-30 23:04:05.000000000 +0300
++++ Jubler-3.9.0_patched/src/com/panayotis/jubler/information/HelpBrowser.java	2008-05-14 22:22:23.000000000 +0300
 @@ -47,7 +47,7 @@
          
          history = new ArrayList<String>();
@@ -84,10 +76,10 @@ diff -Nur jubler/src/com/panayotis/jubler/information/HelpBrowser.java jubler_fi
          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 @@
+diff -Nur -x '*.orig' Jubler-3.9.0/src/com/panayotis/jubler/Main.java Jubler-3.9.0_patched/src/com/panayotis/jubler/Main.java
+--- Jubler-3.9.0/src/com/panayotis/jubler/Main.java	2008-03-30 23:04:08.000000000 +0300
++++ Jubler-3.9.0_patched/src/com/panayotis/jubler/Main.java	2008-05-14 22:22:23.000000000 +0300
+@@ -84,17 +84,9 @@
          /* Load arguments, in a mac way */
          SystemDependent.initApplication();
  
@@ -105,9 +97,9 @@ diff -Nur jubler/src/com/panayotis/jubler/Main.java jubler_fixed/src/com/panayot
                  
      }
          
-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
+diff -Nur -x '*.orig' Jubler-3.9.0/src/com/panayotis/jubler/os/SystemDependent.java Jubler-3.9.0_patched/src/com/panayotis/jubler/os/SystemDependent.java
+--- Jubler-3.9.0/src/com/panayotis/jubler/os/SystemDependent.java	2008-03-31 02:00:49.000000000 +0300
++++ Jubler-3.9.0_patched/src/com/panayotis/jubler/os/SystemDependent.java	2008-05-14 22:22:23.000000000 +0300
 @@ -25,10 +25,6 @@
  
  import static com.panayotis.jubler.i18n.I18N._;
@@ -119,7 +111,7 @@ diff -Nur jubler/src/com/panayotis/jubler/os/SystemDependent.java jubler_fixed/s
  import com.panayotis.jubler.Jubler;
  import com.panayotis.jubler.Main;
  import com.panayotis.jubler.StaticJubler;
-@@ -104,10 +100,6 @@
+@@ -110,10 +106,6 @@
      
      
      public static void initApplication() {
@@ -130,7 +122,7 @@ diff -Nur jubler/src/com/panayotis/jubler/os/SystemDependent.java jubler_fixed/s
      }
      
      
-@@ -322,36 +314,3 @@
+@@ -328,36 +320,3 @@
          return home+".jubler/output.log";
      }
  }
@@ -167,9 +159,9 @@ diff -Nur jubler/src/com/panayotis/jubler/os/SystemDependent.java jubler_fixed/s
 -        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
+diff -Nur -x '*.orig' Jubler-3.9.0/src/com/panayotis/jubler/os/SystemFileFinder.java Jubler-3.9.0_patched/src/com/panayotis/jubler/os/SystemFileFinder.java
+--- Jubler-3.9.0/src/com/panayotis/jubler/os/SystemFileFinder.java	2008-03-30 23:04:04.000000000 +0300
++++ Jubler-3.9.0_patched/src/com/panayotis/jubler/os/SystemFileFinder.java	2008-05-14 22:22:23.000000000 +0300
 @@ -58,15 +58,12 @@
      }
      
diff --git a/media-video/jubler/jubler-3.9.0.ebuild b/media-video/jubler/jubler-3.9.0.ebuild
new file mode 100644
index 000000000000..90e835f030ca
--- /dev/null
+++ b/media-video/jubler/jubler-3.9.0.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/jubler/jubler-3.9.0.ebuild,v 1.1 2008/05/24 06:50:01 serkan Exp $
+
+inherit gnome2 eutils java-pkg-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="~amd64 ~x86"
+IUSE="mplayer nls spell"
+
+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
+	if use mplayer && ! built_with_use media-video/mplayer srt; then
+		msg="media-video/mplayer needs to be built with the srt use flag"
+		eerror ${msg}
+		die ${msg}
+	fi
+	java-pkg-2_pkg_setup
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${P}.patch"
+	chmod +x resources/installers/linux/iconinstall
+}
+
+src_compile() {
+	java-pkg_filter-compiler ecj-3.2
+	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/*
+}