Version bump. Fixes bug #352522.

Package-Manager: portage-2.2.0_alpha19/cvs/Linux x86_64

5 files changed, 591 insertions, 7 deletions

diff --git a/media-video/jubler/ChangeLog b/media-video/jubler/ChangeLog
index 1bc861bb725b..7bff3d104c74 100644
--- a/media-video/jubler/ChangeLog
+++ b/media-video/jubler/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/jubler
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/jubler/ChangeLog,v 1.34 2010/04/17 04:34:26 serkan Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/jubler/ChangeLog,v 1.35 2011/02/13 13:19:47 serkan Exp $
+
+*jubler-4.6.1 (13 Feb 2011)
+
+  13 Feb 2011; Serkan Kaba <serkan@gentoo.org +jubler-4.6.1.ebuild,
+  +files/jubler-4.6.1-gentoo.patch, +files/update-4.6.1.xml:
+  Version bump. Fixes bug #352522.
 
   17 Apr 2010; Serkan Kaba <serkan@gentoo.org> jubler-4.1.1.ebuild:
   Fixed eclass usage. Remove call to changelog task to fix bug #315403
diff --git a/media-video/jubler/Manifest b/media-video/jubler/Manifest
index f78cf0d0e593..4827b9edd4cc 100644
--- a/media-video/jubler/Manifest
+++ b/media-video/jubler/Manifest
@@ -4,16 +4,20 @@ Hash: SHA1
 AUX jubler-3.9.6-ffmpegfix.patch 6490 RMD160 7d74f58669d432a7ce70712133a7b5b56628dcef SHA1 5621c535b2db6b2ebe84e1cfa04983d422ba710a SHA256 6b7fd1c8d629a8b4ec145eb5d0af6efa23d4c4f7c511c0ed8b1073d3fd6be9e7
 AUX jubler-3.9.6.patch 6234 RMD160 0fa28e9630b9214baa86f0e1de568e1430a30a51 SHA1 78885cef527b52ea759f36e9c5381c123add9330 SHA256 2c9eceec9bda75cba57df9c721eb93a6253f4cd59ea09deb2cb74012d252735e
 AUX jubler-4.0.patch 8113 RMD160 4b4b631625974295126670027a88d0b953b35abf SHA1 0f752b01fc48a015df7d1d815b02c274bbe6a7d1 SHA256 d11d290dc2b026ac2756e00156918eab20096aaa2b8f24313ed5fd5c5882dfc2
+AUX jubler-4.6.1-gentoo.patch 6838 RMD160 012a735b2e648ee0983740eda9672d234dc36326 SHA1 906102b955e3c9bb3afe6b6c30a9c955e0c937e6 SHA256 2df583597d2bee721a99cf6c548fccde24cd117f8d36962165117b6cf2097ec5
+AUX update-4.6.1.xml 20433 RMD160 67ac71b73efeaf2a0eb557b716b758ef316291b8 SHA1 c527f29c140f704212a03cd1e9281f84f4da6c2e SHA256 c133425099109638160243bf299f395cda13fe9e98ee3a6a1322e576f340d78b
+DIST Jubler-source-4.6.1.tar.bz2 1971701 RMD160 40553e1ffd333bbb6ff143a54080e3f5196f5ec2 SHA1 89fb4d0f053fa12837cfc151fa020f85ed52708c SHA256 1aeed14cc500165470b29884585432e9d14940c314bafa0f6318789005dd18f1
 DIST Jubler-src-4.0.tar.bz2 1760172 RMD160 48ac22a534d1f3aa9505d54a2a25e2497471bd5e SHA1 566464fd8282e124d34f28ccf2df03a5c45da2d9 SHA256 988317fdd958112dddc8729dd4093df7da91571e6a587e4492b3049748412501
 DIST Jubler-src-4.1.1.tar.bz2 1760728 RMD160 5254dcdc7d4ed160e907547d7899d898af2e3084 SHA1 2c6e3ce228431501fa9a8f82b074633843739b47 SHA256 cfaec92f344da4b35f312a88328aff88b968b2d09213149a9a7e696c9789f7ca
 EBUILD jubler-4.0.ebuild 2247 RMD160 16099620215ec43a577d1e848590e9a59ed8fe3d SHA1 afb0519765c0c28c81495ab017ae801113ac799c SHA256 b8e2c4db45150ad1cfccb09c786b5803666f6cbacc682dbaa8a558eb9f319d93
 EBUILD jubler-4.1.1.ebuild 2281 RMD160 5673f3d558c2c56ea04da7ec9a0fbb85cddbcd7a SHA1 2dac5b62dd67b6d28c8d257bd4eee1616ef55914 SHA256 84d861668dee12f12f6b2ea9e1883789042d952a2b33ff3162b072ad3066410e
-MISC ChangeLog 5459 RMD160 7f7bcb8f4f04dfbfe9d9b18f550077d3523ffd25 SHA1 91c263156bbbfa014edf509f4c8bb0703fd0e517 SHA256 7f5fd32b1a0e6341ff69f8601aa66c8c1c5a2802f1c0a1470ff652f07a1f6699
+EBUILD jubler-4.6.1.ebuild 2865 RMD160 5de946bdc773c3a82197e7b5c8f9419ebf8ff12e SHA1 f095ca45cb10d022ec73bc309d2707958cb9ba17 SHA256 05a71c5f80832a69712692c7b8b51ab7b30478f0dc9124feea33f99237fb4f53
+MISC ChangeLog 5653 RMD160 44e440e60bc0a828b375c4340317ec7ef3964e74 SHA1 872cbb4e6ae076abc91cbe2c2f929f2b0e9dd3f8 SHA256 58ac8eedcd4ce33284e42be2727a6c3956e744b89363fb9a1533cf3e6f86c0d0
 MISC metadata.xml 216 RMD160 05d4d9c2f1c459ea9309346016001e26bad574ce SHA1 98783559fec44d27f1294db2e9549af2fe38f1b3 SHA256 94b55a2ec67c524728d32249d59a6a1545fd37d61c83259b5f05163ca47e87e1
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
+Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkvJOmIACgkQRh6X64ivZaK2CACffvWosCxsBjBkad1gWQXgrbjG
-pzAAn3se9934fovY8r+hNtXABHpCCiwT
-=0l72
+iEYEARECAAYFAk1X2nkACgkQRh6X64ivZaIBlQCfZOG2tytP4Xy67bIon5OSrrX4
+CM0Ani9GVOurCF/3dOZeC+AhlOXxJLDW
+=36PZ
 -----END PGP SIGNATURE-----
diff --git a/media-video/jubler/files/jubler-4.6.1-gentoo.patch b/media-video/jubler/files/jubler-4.6.1-gentoo.patch
new file mode 100644
index 000000000000..3e5675fee7a7
--- /dev/null
+++ b/media-video/jubler/files/jubler-4.6.1-gentoo.patch
@@ -0,0 +1,154 @@
+diff -Nur Jubler-4.6.1/build.xml Jubler-4.6.1_patched/build.xml
+--- Jubler-4.6.1/build.xml	2011-02-05 23:46:03.000000000 +0200
++++ Jubler-4.6.1_patched/build.xml	2011-02-13 14:46:56.562977001 +0200
+@@ -1,36 +1,9 @@
+ <?xml version="1.0" encoding="UTF-8"?>
+-<project name="Jubler" default="dist" basedir=".">
++<project name="Jubler" default="allparts" basedir=".">
+ 	<description>Builds, tests, and runs the project Jubler.</description>
+ 	<property file="core/src/com/panayotis/jubler/information/version.prop" />
+-
+-	<taskdef resource="net/sf/antcontrib/antlib.xml">
+-		<classpath>
+-			<pathelement location="resources/libs/ant-contrib/ant-contrib-1.0b3.jar"/>
+-		</classpath>
+-	</taskdef>
++	<taskdef resource="net/sf/antcontrib/antlib.xml"/>
+ 	
+-	<taskdef name="jarbundler"
+-		onerror="report"
+-		classpath="/opt/local/share/java/jarbundler.jar"
+-		classname="net.sourceforge.jarbundler.JarBundler" />
+-
+-   <taskdef name="izpack"
+-		onerror="report"
+-		classpath="../../Tools/IzPack/standalone-compiler.jar"
+-		classname="com.izforge.izpack.ant.IzPackTask"/>
+-
+-	<taskdef name="launch4j"
+-		onerror="report"
+-		classpath="/opt/local/share/launch4j/launch4j.jar:/opt/local/share/launch4j/lib/xstream.jar" 
+-		classname="net.sf.launch4j.ant.Launch4jTask"/>
+-
+-	<target name="jupidator">
+-		<ant antfile="../jupidator/build.xml" inheritall="false" target="jar"/>
+-		<copy file="../jupidator/dist/jupidator.jar" todir="dist/lib"/>
+-		<ant antfile="../jupidator/build.xml" inheritall="false" target="clean"/>
+-	</target>
+-		
+-
+ 	<target name="i18n">
+ 		<exec dir="resources/i18n" executable="bash" failonerror="true">
+ 			<arg line="compile"/>
+@@ -45,12 +18,14 @@
+ 		<move file="resources/help/jubler-faq.html" todir="dist/help"/>
+ 		<copy file="resources/help/question.png" todir="dist/help"/>
+ 	</target>
+-
++	
++	<target name="jupidator"/>
++	
+ 	<target name="changelog" depends="jupidator">
+ 		<delete file="ChangeLog.html"/>
+ 		<echo message="" file="ChangeLog.html"/>
+-		<java fork="true" classname="com.panayotis.jupidator.helpers.ChangeLogCreator" classpath="dist/lib/jupidator.jar">
+-			<arg value="http://www.jubler.org/files/updates/update.xml"/>
++		<java fork="true" classname="com.panayotis.jupidator.helpers.ChangeLogCreator" classpath="resources/libs/jupidator.jar">
++			<arg value="update-${version}.xml"/>
+ 			<arg value="ChangeLog.html"/>
+ 		</java>
+ 	</target>
+@@ -311,7 +286,7 @@
+ 	</target>
+ 
+ 	<!-- Create an isntallation-like file tree -->
+-	<target name="-linuxinstall" depends="-linuxproperties, -cleandestdir, -linuxdesktopintegration">
++	<target name="-linuxinstall" depends="-linuxproperties, -cleandestdir, linuxdesktopintegration">
+ 		<!-- Basic Jubler files -->
+ 		<copy file="dist/Jubler.jar" todir="${libdir}"/>
+ 		<copy todir="${libdir}/lib">
+@@ -337,7 +312,7 @@
+ 	</target>
+ 
+ 	<!-- Linux desktop intergration -->
+-	<target name="-linuxdesktopintegration" depends="-linuxproperties">
++	<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"/>
+diff -Nur Jubler-4.6.1/core/src/com/panayotis/jubler/information/HelpBrowser.java Jubler-4.6.1_patched/core/src/com/panayotis/jubler/information/HelpBrowser.java
+--- Jubler-4.6.1/core/src/com/panayotis/jubler/information/HelpBrowser.java	2011-01-31 01:19:02.000000000 +0200
++++ Jubler-4.6.1_patched/core/src/com/panayotis/jubler/information/HelpBrowser.java	2011-02-12 14:38:50.220780001 +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-4.6.1/core/src/com/panayotis/jubler/os/SystemDependent.java Jubler-4.6.1_patched/core/src/com/panayotis/jubler/os/SystemDependent.java
+--- Jubler-4.6.1/core/src/com/panayotis/jubler/os/SystemDependent.java	2011-01-31 01:19:02.000000000 +0200
++++ Jubler-4.6.1_patched/core/src/com/panayotis/jubler/os/SystemDependent.java	2011-02-12 14:43:25.740780001 +0200
+@@ -182,7 +182,7 @@
+                 Runtime.getRuntime().exec("rundll32 url.dll,FileProtocolHandler " + url);
+             else { //assume Unix or Linux
+                 String[] browsers = {
+-                    "firefox", "konqueror", "opera", "epiphany", "mozilla", "netscape"};
++                    "xdg-open", "firefox", "konqueror", "opera", "epiphany", "mozilla", "netscape"};
+                 String browser = null;
+                 for (int count = 0; count < browsers.length && browser == null; count++)
+                     if (Runtime.getRuntime().exec(
+diff -Nur Jubler-4.6.1/core/src/com/panayotis/jubler/os/SystemFileFinder.java Jubler-4.6.1_patched/core/src/com/panayotis/jubler/os/SystemFileFinder.java
+--- Jubler-4.6.1/core/src/com/panayotis/jubler/os/SystemFileFinder.java	2011-02-05 01:59:45.000000000 +0200
++++ Jubler-4.6.1_patched/core/src/com/panayotis/jubler/os/SystemFileFinder.java	2011-02-12 14:38:18.520780001 +0200
+@@ -56,9 +56,8 @@
+ 
+     public static boolean loadLibrary(String name) {
+         File libfile = findFile("lib" + FileCommunicator.FS + System.mapLibraryName(name));
+-        if (libfile != null)
+             try {
+-                System.load(libfile.getAbsolutePath());
++                System.loadLibrary(name);
+                 return true;
+             } catch (UnsatisfiedLinkError e) {
+                 DEBUG.debug(e);
+diff -Nur Jubler-4.6.1/resources/ffmpeg/ffdecode/Makefile Jubler-4.6.1_patched/resources/ffmpeg/ffdecode/Makefile
+--- Jubler-4.6.1/resources/ffmpeg/ffdecode/Makefile	2011-01-31 16:26:26.000000000 +0200
++++ Jubler-4.6.1_patched/resources/ffmpeg/ffdecode/Makefile	2011-02-12 14:30:05.612780001 +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}
+-
+ # Current Path
+ CPATH=${shell pwd}
+ 
+@@ -42,7 +39,6 @@
+ # Various options
+ FFCONF=configure
+ LIBSUF=_${SYSTEM}.${ARCH}
+-MAKEOPTS=-j3
+ 
+ # Find requested files
+ NATIVES=${shell cd ../../src && grep -r ' native ' * | grep -v '/.svn/' | gawk -F ':' '{print $$1}' | uniq | sed -e 's/\.java$$//g' | tr '/' '.' }
+@@ -136,7 +132,6 @@
+ CCPREF_NOS=${shell echo ${CCPREF} | sed -e 's/-$$//g' }
+ DCONFIG=--with-mp4v2 --host=${CCPREF_NOS}
+ 
+-CC=${CCPREF}gcc
+ RANLIB=${CCPREF}ranlib
+ 
+ ifeq (${NOSTRIP},) 
+@@ -151,7 +146,7 @@
+ .SUFFIXES:.o .c
+ 
+ .c.o:
+-	${CC} ${CFLAGS} ${GCCOPTS} -std=c99 -pedantic -O3 -Wall ${INCS} ${JINCLUDE} -c -o $@ $?
++	${CC} ${CFLAGS} ${GCCOPTS} -std=c99 -pedantic -Wall ${INCS} ${JINCLUDE} -c -o $@ $?
+ 
+ 
+ develop:javacheck
diff --git a/media-video/jubler/files/update-4.6.1.xml b/media-video/jubler/files/update-4.6.1.xml
new file mode 100644
index 000000000000..130d59aacafb
--- /dev/null
+++ b/media-video/jubler/files/update-4.6.1.xml
@@ -0,0 +1,326 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<updatelist application="Jubler" baseurl="http://www.jubler.org/files/updates" icon="icons/jubler.png" jupidator="600">
+
+	<mirror constructor="${URL}${FILEBASE}-${FILEPATH}${FILEEXT}${FILECOMPR}" url="http://jubler.googlecode.com/files/Jubler-"/>
+
+    <architect tag="any" os="" arch="">
+        <launcher exec="${JAVABIN}">
+            <argument value="-jar"/>
+            <argument value="${APPHOME}/Jubler.jar"/>
+        </launcher>
+    </architect>
+
+    <architect tag="macosx" os="mac" arch="i386">
+        <launcher exec="${APPHOME}/../../MacOS/JavaApplicationStub"/>
+    </architect>
+
+    <architect tag="macosx" os="mac" arch="ppc">
+        <launcher exec="${APPHOME}/../../MacOS/JavaApplicationStub"/>
+    </architect>
+
+    <architect tag="macosx" os="mac" arch="x86">
+        <launcher exec="${APPHOME}/../../MacOS/JavaApplicationStub"/>
+    </architect>
+
+    <architect tag="linux_i386" os="Linux" arch="i386">
+        <launcher exec="${JAVABIN}">
+            <argument value="-jar"/>
+            <argument value="${APPHOME}/Jubler.jar"/>
+        </launcher>
+    </architect>
+
+    <architect tag="linux_amd64" os="Linux" arch="amd64">
+        <launcher exec="${JAVABIN}">
+            <argument value="-jar"/>
+            <argument value="${APPHOME}/Jubler.jar"/>
+        </launcher>
+    </architect>
+
+    <architect tag="win32" os="Windows" arch="x86">
+        <launcher exec="${APPHOME}\Jubler.exe"/>
+    </architect>
+
+	<version release="1106" version="4.6.1">
+		<description>
+			Fixed ffdecode library for 64 bit Mac OS X. Dutch translation.
+		</description>
+		<arch name="win32">
+			<file name="Jubler.exe" sourcedir="4.6.1" destdir="${APPHOME}" size="720681" compress="gz"/>
+		</arch>
+		<arch name="macosx">	
+			<file name="Info.plist" sourcedir="4.6.1" destdir="${APPHOME}/../../" size="601" compress="gz"/>
+			<file name="Jubler.jar" sourcedir="4.6.1" destdir="${APPHOME}" size="675217" compress="gz"/>
+			<file name="libffdecode.jnilib" sourcedir="4.6.1" destdir="${APPHOME}/lib" size="4902215" compress="gz"/>
+		</arch>
+		<arch name="any">
+			<file name="Jubler.jar" sourcedir="4.6.1" destdir="${APPHOME}" size="675217" compress="gz"/>
+		</arch>
+		<arch name="all">
+			<file name="nl.jar" sourcedir="4.6.1" destdir="${APPHOME}/i18n" size="29264" compress="gz"/>
+		</arch>
+	</version>
+
+	<version release="1083" version="4.6">
+		<description>
+			Plugin system introduced. Updates to GoogleTranslate, MPlayer. Many bug fixes ans minor improvements.
+		</description>
+		<arch name="win32">
+			<file name="Jubler.exe" sourcedir="4.6" destdir="${APPHOME}" size="720582" compress="gz"/>
+		</arch>
+		<arch name="macosx">
+			<file name="Info.plist" sourcedir="4.6" destdir="${APPHOME}/../../" size="599" compress="gz"/>
+			<file name="Jubler.jar" sourcedir="4.6" destdir="${APPHOME}" size="675200" compress="gz"/>
+			<file name="macapp.jar" sourcedir="4.6" destdir="${APPHOME}/lib/" size="4565"/>
+		</arch>
+		<arch name="any">
+			<file name="Jubler.jar" sourcedir="4.6" destdir="${APPHOME}" size="675200" compress="gz"/>
+		</arch>
+		<arch name="all">
+			<file name="aspell.jar" sourcedir="4.6" destdir="${APPHOME}/lib/" size="6578"/>
+			<file name="autoupdate.jar" sourcedir="4.6" destdir="${APPHOME}/lib/" size="1940"/>
+			<file name="basetextsubs.jar" sourcedir="4.6" destdir="${APPHOME}/lib/" size="20847"/>
+			<file name="googletranslate.jar" sourcedir="4.6" destdir="${APPHOME}/lib/" size="18881"/>
+			<file name="mplayer.jar" sourcedir="4.6" destdir="${APPHOME}/lib/" size="8032"/>
+			<file name="zemberek.jar" sourcedir="4.6" destdir="${APPHOME}/lib/" size="3193"/>
+			<file name="cs.jar" sourcedir="4.6" destdir="${APPHOME}/i18n/" size="28377"/>
+			<file name="de.jar" sourcedir="4.6" destdir="${APPHOME}/i18n/" size="27379"/>
+			<file name="el.jar" sourcedir="4.6" destdir="${APPHOME}/i18n/" size="33120"/>
+			<file name="es.jar" sourcedir="4.6" destdir="${APPHOME}/i18n/" size="29243"/>
+			<file name="fr.jar" sourcedir="4.6" destdir="${APPHOME}/i18n/" size="30089"/>
+			<file name="it.jar" sourcedir="4.6" destdir="${APPHOME}/i18n/" size="30813"/>
+			<file name="pt.jar" sourcedir="4.6" destdir="${APPHOME}/i18n/" size="29012"/>
+			<file name="sr.jar" sourcedir="4.6" destdir="${APPHOME}/i18n/" size="20194"/>
+			<file name="tr.jar" sourcedir="4.6" destdir="${APPHOME}/i18n/" size="27872"/>
+			<file name="jubler-faq.html" sourcedir="4.6" destdir="${APPHOME}/help/" size="5402" compress="gz"/>
+		</arch>
+	</version>
+
+	<version release="775" version="4.1.3">
+        <description>
+			Fixed Save not wroking. Fixed Recents menu, when display non-existent entries.
+        </description>
+		<arch name="win32">
+            <file name="Jubler.exe" sourcedir="4.1.3" destdir="${APPHOME}" size="750826" compress="gz"/>
+		</arch>
+		<arch name="any">
+            <file name="Jubler.jar" sourcedir="4.1.3" destdir="${APPHOME}" size="706856" compress="gz"/>
+		</arch>
+	</version>
+
+	<version release="684" version="4.1.2">
+        <description>
+			Fixed a bug in x64 version of Windows. Fixed a bug in trimmed 64-bit Leopard.
+        </description>
+		<arch name="win32">
+            <file name="Jubler.exe" sourcedir="4.1.2" destdir="${APPHOME}" size="750138" compress="gz"/>
+		</arch>
+		<arch name="macosx">
+            <file name="Jubler.jar" sourcedir="4.1.2" destdir="${APPHOME}" size="706775" compress="gz"/>
+            <file name="JavaApplicationStub" sourcedir="4.1.2" destdir="${APPHOME}/../../MacOS" size="8714" compress="gz"/>
+            <chmod file="${APPHOME}/../../MacOS/JavaApplicationStub" attr="a+x"/>
+		</arch>
+	</version>
+
+    <version release="681" version="4.1.1">
+        <description>
+			Updated auto-update library. Fixed bug not updating Recents menu. Fixed bug agressively truncating save file name. Modular translation files.
+        </description>
+		<arch name="macosx">
+            <file name="Jubler.jar" sourcedir="4.1.1" destdir="${APPHOME}" size="706794" compress="gz"/>
+            <file name="jupidator.jar" sourcedir="4.1.1" destdir="${APPHOME}/lib" size="121077"/>
+            <file name="cs.jar" sourcedir="4.1.1" destdir="${APPHOME}/i18n" size="28706"/>
+            <file name="de.jar" sourcedir="4.1.1" destdir="${APPHOME}/i18n" size="29094"/>
+            <file name="el.jar" sourcedir="4.1.1" destdir="${APPHOME}/i18n" size="31983"/>
+            <file name="es.jar" sourcedir="4.1.1" destdir="${APPHOME}/i18n" size="29504"/>
+            <file name="fr.jar" sourcedir="4.1.1" destdir="${APPHOME}/i18n" size="21845"/>
+            <file name="pt.jar" sourcedir="4.1.1" destdir="${APPHOME}/i18n" size="29361"/>
+            <file name="sr.jar" sourcedir="4.1.1" destdir="${APPHOME}/i18n" size="20822"/>
+            <file name="tr.jar" sourcedir="4.1.1" destdir="${APPHOME}/i18n" size="29658"/>
+		</arch>
+		<arch name="win32">
+            <file name="Jubler.exe" sourcedir="4.1.1" destdir="${APPHOME}" size="750790" compress="gz"/>
+            <file name="jupidator.jar" sourcedir="4.1.1" destdir="${APPHOME}/lib" size="121077"/>
+            <file name="cs.jar" sourcedir="4.1.1" destdir="${APPHOME}/i18n" size="28706"/>
+            <file name="de.jar" sourcedir="4.1.1" destdir="${APPHOME}/i18n" size="29094"/>
+            <file name="el.jar" sourcedir="4.1.1" destdir="${APPHOME}/i18n" size="31983"/>
+            <file name="es.jar" sourcedir="4.1.1" destdir="${APPHOME}/i18n" size="29504"/>
+            <file name="fr.jar" sourcedir="4.1.1" destdir="${APPHOME}/i18n" size="21845"/>
+            <file name="pt.jar" sourcedir="4.1.1" destdir="${APPHOME}/i18n" size="29361"/>
+            <file name="sr.jar" sourcedir="4.1.1" destdir="${APPHOME}/i18n" size="20822"/>
+            <file name="tr.jar" sourcedir="4.1.1" destdir="${APPHOME}/i18n" size="29658"/>
+		</arch>
+		<arch name="linux_amd64">
+            <file name="Jubler.jar" sourcedir="4.1.1" destdir="${APPHOME}" size="706794" compress="gz"/>
+            <file name="jupidator.jar" sourcedir="4.1.1" destdir="${APPHOME}/lib" size="121077"/>
+            <file name="cs.jar" sourcedir="4.1.1" destdir="${APPHOME}/i18n" size="28706"/>
+            <file name="de.jar" sourcedir="4.1.1" destdir="${APPHOME}/i18n" size="29094"/>
+            <file name="el.jar" sourcedir="4.1.1" destdir="${APPHOME}/i18n" size="31983"/>
+            <file name="es.jar" sourcedir="4.1.1" destdir="${APPHOME}/i18n" size="29504"/>
+            <file name="fr.jar" sourcedir="4.1.1" destdir="${APPHOME}/i18n" size="21845"/>
+            <file name="pt.jar" sourcedir="4.1.1" destdir="${APPHOME}/i18n" size="29361"/>
+            <file name="sr.jar" sourcedir="4.1.1" destdir="${APPHOME}/i18n" size="20822"/>
+            <file name="tr.jar" sourcedir="4.1.1" destdir="${APPHOME}/i18n" size="29658"/>
+		</arch>
+		<arch name="linux_i386">
+            <file name="Jubler.jar" sourcedir="4.1.1" destdir="${APPHOME}" size="706794" compress="gz"/>
+            <file name="jupidator.jar" sourcedir="4.1.1" destdir="${APPHOME}/lib" size="121077"/>
+            <file name="cs.jar" sourcedir="4.1.1" destdir="${APPHOME}/i18n" size="28706"/>
+            <file name="de.jar" sourcedir="4.1.1" destdir="${APPHOME}/i18n" size="29094"/>
+            <file name="el.jar" sourcedir="4.1.1" destdir="${APPHOME}/i18n" size="31983"/>
+            <file name="es.jar" sourcedir="4.1.1" destdir="${APPHOME}/i18n" size="29504"/>
+            <file name="fr.jar" sourcedir="4.1.1" destdir="${APPHOME}/i18n" size="21845"/>
+            <file name="pt.jar" sourcedir="4.1.1" destdir="${APPHOME}/i18n" size="29361"/>
+            <file name="sr.jar" sourcedir="4.1.1" destdir="${APPHOME}/i18n" size="20822"/>
+            <file name="tr.jar" sourcedir="4.1.1" destdir="${APPHOME}/i18n" size="29658"/>
+		</arch>
+		<arch name="any">
+            <file name="Jubler.jar" sourcedir="4.1.1" destdir="${APPHOME}" size="706794" compress="gz"/>
+            <file name="jupidator.jar" sourcedir="4.1.1" destdir="${APPHOME}/lib" size="121077"/>
+            <file name="cs.jar" sourcedir="4.1.1" destdir="${APPHOME}/i18n" size="28706"/>
+            <file name="de.jar" sourcedir="4.1.1" destdir="${APPHOME}/i18n" size="29094"/>
+            <file name="el.jar" sourcedir="4.1.1" destdir="${APPHOME}/i18n" size="31983"/>
+            <file name="es.jar" sourcedir="4.1.1" destdir="${APPHOME}/i18n" size="29504"/>
+            <file name="fr.jar" sourcedir="4.1.1" destdir="${APPHOME}/i18n" size="21845"/>
+            <file name="pt.jar" sourcedir="4.1.1" destdir="${APPHOME}/i18n" size="29361"/>
+            <file name="sr.jar" sourcedir="4.1.1" destdir="${APPHOME}/i18n" size="20822"/>
+            <file name="tr.jar" sourcedir="4.1.1" destdir="${APPHOME}/i18n" size="29658"/>
+		</arch>
+    </version>
+
+    <version release="669" version="4.1">
+        <description>
+            Only one instance of Jubler is now run in a system. Every file remembers loading parameters and uses it when saving. Improved load/save dialog, which encapsulates the information inside the load dialog. General GUI improvements, especially in Mac OSX. Relaxed file loading, when file contains encoding errors. Improved subtitle support. Improved visuals in Video Console window. More compact Preferences dialog. Minor changes and bug fixes.
+        </description>
+		<arch name="macosx">
+            <file name="Jubler.jar" sourcedir="4.1" destdir="${APPHOME}" size="924599" compress="bzip2"/>
+		</arch>
+		<arch name="win32">
+            <file name="Jubler.exe" sourcedir="4.1" destdir="${APPHOME}" size="975784" compress="bzip2"/>
+		</arch>
+		<arch name="linux_i386">
+            <file name="Jubler.jar" sourcedir="4.1" destdir="${APPHOME}" size="924599" compress="bzip2"/>
+		</arch>
+		<arch name="linux_amd64">
+            <file name="Jubler.jar" sourcedir="4.1" destdir="${APPHOME}" size="924599" compress="bzip2"/>
+		</arch>
+		<arch name="any">
+            <file name="Jubler.jar" sourcedir="4.1" destdir="${APPHOME}" size="924599" compress="bzip2"/>
+		</arch>
+    </version>
+
+    <version release="559" version="4.0">
+        <description>
+	Auto-update support. Jubler is able to smart update with minimum user interaction. Improved time fixed tool for overlapping subtitles. Improved FFMPEG color model.
+        </description>
+    </version>
+    <version release="22" version="3.9.6">
+        <description>
+	Improved Google translator parsing engine. Fixed compile issues with ffmpeg under OS X 10.4. Fixed Linux GTK Look and Feel bug with time-spinner under Java 6.0.
+        </description>
+    </version>
+    <version release="21" version="3.9.5">
+        <description>
+	Autosave/recovery of changed subtitles. Automatic translate of subtitles through Google. Updated to latest FFMPEG.  Small GUI improvements. Better SRT support. Minor bug fixes and enhancements.
+        </description>
+    </version>
+    <version release="20" version="3.9.0">
+        <description>
+	Improved user interface. Preview interface integrated inside main Jubler window. Subtitle number is now visible, if desired. Use of preset file encodings. Visual display, using color, of affected subtitles. Maximize waveform visualization. Support of AAC audio streams.
+        </description>
+    </version>
+    <version release="19" version="3.4.1">
+        <description>
+	MPlayer uses threads to properly handle out and error stream. Updated to latest	ffmpeg library. Support of correct MIME type under Linux.
+        </description>
+    </version>
+    <version release="18" version="3.4.0">
+        <description>
+	SRT supports font formatting. Subtitle statistics. Better handling of preview bars. Improved splitting interface. Updated Media files configuration. Display number of lines and characters per line while editing. MPlayer display formatted subtitles - use of ASS format instead of SRT. Linux man and doc paths fixed.  Support for Quicktime Texttrack subtitles. Fixed an error with MPL2 subtitles.  Frame icon now properly display under Windows/Linux. Quit confirmation dialogue properly works under Mac. Check for new version only once per day.  Better display of selected subtitles. Fixed serious memory allocation error in Windows. Various bug fixes and updates.
+        </description>
+    </version>
+    <version release="17" version="3.3.0">
+        <description>
+	Automatic detection of MPlayer/ASpell executables. Preview window GUI updates.  Alt-mousewheel / alt-click slows down rotation in JTimeSpinner boxes.  Support for Spruce DVDMaestro (STL) and MPL2 subtitles (without formatting).  Fixed autoload for Java 1.6 in Linux. Added missing tooltips. Fixed gettext bug with ' character. Improved ffmpeg support. Keep application alive if "Close window" is selected. New window will not fully overlap old one.  Spanish, French and Serbian translations introduced. Czech, German, Portuguese and Greek translation corrections. Various bug fixes and usability improvements.
+        </description>
+    </version>
+    <version release="16" version="3.2.0">
+        <description>
+	Doube click on icons launch Jubler (in Mac OSX, Windows and Debian systems).  MPlayer fixes. Jubler installs in systems with JRE 1.6. MPlayer supports different audio stream. Video playback doesn't change system mixers. FFMPEG time offset and WMV bug fixes. Better handling of audio caches. Updated to newer version of FFMPEG. ASpell updates supported languages when opening preferences. Major internal changes and cleanups. Initial Debian package.
+        </description>
+    </version>
+    <version release="15" version="3.1.0">
+        <description>
+	Read frames per second from the movie now supported. Movie synchronization on the fly, based on time differences between time points supported. Updated recoring of subtitles on the fly. A lot of fine tuning. Zemberek updates.
+        </description>
+    </version>
+    <version release="14" version="3.0.0">
+        <description>
+	FFDecode bugs fixed, preview should be much more stable and accurate. Preview bug fixed, where wrong duration was reported. Tools remember last values.  Column width is now saved. Now it is compatible with latest version of MPlayer.  Updated to newest ffmpeg sources. Turkish translation added. Support for zemberek added. Preliminary built-in FAQ subsystem. Tweaks and code changes.  New icons and splash screen. Linux installation script fixes. Supports cocoASpell under Mac OSX.
+        </description>
+    </version>
+    <version release="13" version="3.0.0-rc4">
+        <description>
+	Fixed bugs: audio line not closing, saving file with an illegal character set, banner not closing, Jubler crashing when audio codec could not be opened, Jubler didn't start under Linux. Mac OSX port is now universal binary.  Synchronize subtitle texts and timestamps. Subtitle preview updates live on key events. Automatic version check through internet. Smaller code changes.
+        </description>
+    </version>
+    <version release="12" version="3.0.0-rc3">
+        <description>
+	Initial Mac OS X version. Big endian bugs fixed. "Quit" introduced. Menu shortcuts are now editable. MPlayer threading issues fixed. Cache is created only when needed. Full AC3 support.
+        </description>
+    </version>
+    <version release="11" version="3.0.0-rc2">
+        <description>
+	Great speedup improvements were made on subtitle preview. Alpha channel values in SSA/ASS format were flipped. MPlayer options may now be edited. Recent items are sorted according to their call. A bug with the installer not properly detecting JRE was fixed. Subtitle preview fixes were done.
+        </description>
+    </version>
+    <version release="10" version="3.0.0-rc1">
+        <description>
+	Czech translation. Subtitle text display on frame preview (draft and full details) using Java 2D. Default display frame when no library is present, or no actual frame preview is required. When FFDecode library is missing, a notice is displayed and no more a popup dialog appers. Subtitle is movable on wave panel too (in preview). Display subtitle time when moving subtitles in preview. Revert, clone and open recent subtitles in File menu. Video preview in normal and half size. Reparent current subtitles (for translations). MPlayer now supports default font size (and font name in Linux). Only static version of ffmpeg for linux is provided. Varius bug fixes.
+        </description>
+    </version>
+    <version release="9" version="2.9.9">
+        <description>
+	Preview of subtitles added (dependance on FFMPEG library). Frame preview of the current frame, waveform preview and waveform listening is supported.  Graphically display of subtitles, which can be moved and resized. Jubler no longer distributed as JAR file but using self expandable platform specific installers (due to FFMPEG). Mouse wheel over subtitle time changes its value.  Various bug fixes and other enchacements.
+        </description>
+    </version>
+    <version release="8" version="2.5.1">
+        <description>
+	Fix while trying to save a splitted subtitle file.
+        </description>
+    </version>
+    <version release="7" version="2.5.0">
+        <description>
+	Suport for SubStation Alpha (SSA), Advanced SubStation (ASS), and SubViewer (1+2) subtitle formats. A German translation. Styles are supported (when saving in SubStation formats). A translating mode. A lot of fine tuning and bugfixes.
+        </description>
+    </version>
+    <version release="6" version="2.0.0">
+        <description>
+	Mostly code cleanup and changes in the "about" box.
+        </description>
+    </version>
+    <version release="5" version="2.0-rc1">
+        <description>
+	This version adds I18n support through gettext.
+        </description>
+    </version>
+    <version release="4" version="1.9.3">
+        <description>
+	Find and replace and global replace features were added. The focus of the subtitle textbox was fixed.
+        </description>
+    </version>
+    <version release="3" version="1.9.1">
+        <description>
+	Enhancements were made to the command line arguments of mplayer in order to play correctly under the Windows ports of MPlayer. A few unimportant corrections were made to the ASpell options.
+        </description>
+    </version>
+    <version release="2" version="1.9.0">
+        <description>
+	This version has great improvements in the mplayer frontend, ASpell support, GUI lifting, and new tools.
+        </description>
+    </version>
+    <version release="1" version="0.9">
+        <description>
+	Initial announcement
+        </description>
+    </version>
+</updatelist>
\ No newline at end of file
diff --git a/media-video/jubler/jubler-4.6.1.ebuild b/media-video/jubler/jubler-4.6.1.ebuild
new file mode 100644
index 000000000000..8a4be62eba53
--- /dev/null
+++ b/media-video/jubler/jubler-4.6.1.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/jubler/jubler-4.6.1.ebuild,v 1.1 2011/02/13 13:19:47 serkan Exp $
+
+EAPI="2"
+WANT_ANT_TASKS="ant-nodeps ant-contrib"
+inherit fdo-mime 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="http://${PN}.googlecode.com/files/${MY_PN}-source-${PV}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="mplayer nls spell"
+
+RDEPEND=">=virtual/jre-1.5
+	>=media-video/ffmpeg-0.4.9_p20080326
+	mplayer? ( media-video/mplayer[ass] )
+	spell?
+	(
+		app-text/aspell
+		>=dev-java/zemberek-2.0[linguas_tr]
+	)"
+
+DEPEND=">=virtual/jdk-1.5
+	>=media-video/ffmpeg-0.4.9_p20080326
+	app-text/xmlto
+	>=dev-java/jupidator-0.6.0
+	dev-util/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+S=${WORKDIR}/${MY_PN}-${PV}
+
+src_unpack() {
+	unpack ${A}
+	cp "${FILESDIR}"/update-${PV}.xml "${S}" || die
+}
+
+java_prepare() {
+	epatch "${FILESDIR}"/${P}-gentoo.patch
+	chmod +x resources/installers/linux/iconinstall
+	#cd resources/libs || die
+	java-pkg_jarfrom --build-only --into resources/libs jupidator
+	rm -R plugins/{autoupdate,macapp} || die "unneeded plugin cleanup failed"
+	rm -R resources/libs/ant-contrib || die "jar cleanup failed"
+	if ! use mplayer; then
+		rm -R plugins/mplayer || die "mplayer plugin removal failed"
+	fi
+	if ! use spell; then
+		rm -R plugins/{zemberek,aspell} || die "spellcheck plugin removal failed"
+	fi
+}
+
+src_compile() {
+	java-pkg_filter-compiler ecj-3.2
+	ANT_TASKS="ant-nodeps ant-contrib" eant $(use nls && echo allparts) $(use nls || echo parts) help changelog || die "eant failed"
+	#cp -v dist/help/jubler-faq.html build/classes/help || die "cp failed"
+	cd resources/ffmpeg/ffdecode || die
+	CC=$(tc-getCC) NOSTRIP=true emake linuxdyn || die "make failed"
+}
+
+src_install() {
+	java-pkg_dojar dist/Jubler.jar
+	use nls && java-pkg_dojar dist/i18n/*.jar
+	#insinto /usr/share/jubler/lib/lib
+	#doins dist/lib/*.jar  || die "Plugin installation failed"
+	java-pkg_dojar dist/lib/*.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/ffmpeg/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 Jubler
+	dohtml ChangeLog.html || die "dohtml failed"
+	dodoc README || die "dodoc failed"
+	doman resources/installers/linux/jubler.1 || die "doman fialed"
+	insinto /usr/share/jubler/help
+	doins dist/help/* || die "doins failed"
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+}