Punt overshadowed version so virtual/ffmpeg depending one is only around.

(Portage version: 2.2.0_alpha33/cvs/Linux x86_64)

6 files changed, 6 insertions, 722 deletions

diff --git a/media-video/jubler/ChangeLog b/media-video/jubler/ChangeLog
index e695ecdcd0b6..f624cec3295b 100644
--- a/media-video/jubler/ChangeLog
+++ b/media-video/jubler/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/jubler
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/jubler/ChangeLog,v 1.41 2011/05/15 15:36:12 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/jubler/ChangeLog,v 1.42 2011/05/15 15:38:42 scarabeus Exp $
+
+  15 May 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+  -files/jubler-3.9.6-ffmpegfix.patch, -files/jubler-3.9.6.patch,
+  -jubler-4.0.ebuild, -files/jubler-4.0.patch, -jubler-4.1.1.ebuild:
+  Punt overshadowed version so virtual/ffmpeg depending one is only around.
 
   15 May 2011; Tomáš Chvátal <scarabeus@gentoo.org> jubler-4.6.1-r3.ebuild:
   Depend on virtual/ffmpeg. Per bug #362159.
diff --git a/media-video/jubler/files/jubler-3.9.6-ffmpegfix.patch b/media-video/jubler/files/jubler-3.9.6-ffmpegfix.patch
deleted file mode 100644
index c712cf97dcfc..000000000000
--- a/media-video/jubler/files/jubler-3.9.6-ffmpegfix.patch
+++ /dev/null
@@ -1,155 +0,0 @@
---- Jubler-3.9.6/resources/ffdecode/decodeframe.c	2008-08-10 20:15:55.000000000 +0300
-+++ jubler/resources/ffdecode/decodeframe.c	2008-10-29 06:46:11.000000000 +0200
-@@ -39,19 +39,23 @@
- #include "defaults.h"
- #include "utilities.h"
- 
-+#define MAXSIZE 16383
-+
-+
- AVPicture *decodeFrame(JNIEnv * env, jobject this, const char *input_filename, jlong timepos, jint *width, jint *height, jfloat resize);
- int file_info(JNIEnv * env, jobject this, char *input_filename);
-+void storenumb (jbyte * data, int number);
- 
- static int sws_flags = SWS_BICUBIC;
- 
- 
--JNIEXPORT jintArray JNICALL Java_com_panayotis_jubler_media_preview_decoders_FFMPEG_grabFrame(JNIEnv * env, jobject this, jstring video, jlong time, jfloat resize) {
-+JNIEXPORT jbyteArray JNICALL Java_com_panayotis_jubler_media_preview_decoders_FFMPEG_grabFrame(JNIEnv * env, jobject this, jstring video, jlong time, jfloat resize) {
-     /* Pointers for c-like strings */
-     const char *video_c;
-     
-     /* Here we'll store the frame for java */
--    jintArray matrix = NULL;
--    jint* matrixdata = NULL;
-+    jbyteArray matrix = NULL;
-+    jbyte* matrixdata = NULL;
-     
-     /* Frame raw data */
-     AVPicture* pict;
-@@ -65,18 +69,20 @@
-     if (pict) {
-         
- 		// make array
--        matrix = (*env)->NewIntArray(env, width*height+2);	// 4 bytes per pixel (int) plus picture information
-+        matrix = (*env)->NewByteArray(env, width*height*3+4);	// 3 bytes per pixel + picture width information (2*2)
-         
- 		if (matrix) {
-             /* Find pointer for matrix size */
--            matrixdata = (*env)->GetIntArrayElements(env, matrix, 0);
-+            matrixdata = (*env)->GetByteArrayElements(env, matrix, 0);
-             
--            /* This is a trick: the first 2 elements are not video data but the size of the video */
--            matrixdata[0] = width;
--            matrixdata[1] = height;
--        	memcpy(matrixdata+2, pict->data[0], 4*width*height);
-+            /* This is a trick: the first 4 bytes are not video data but the size of the video */
-+            storenumb(matrixdata, width);
-+            storenumb(matrixdata+2, height);
-+
-+            /* Copy the actual color map to picture buffer */
-+            memcpy(matrixdata+4, pict->data[0], 3*width*height);
-             /* Release the matrix data pointer */
--            (*env)->ReleaseIntArrayElements(env, matrix, matrixdata, 0);
-+            (*env)->ReleaseByteArrayElements(env, matrix, matrixdata, 0);
-         } else {
-             DEBUG(env, this, "grabFrame", "Can not create array into memory.");
-         }
-@@ -206,14 +212,24 @@
-         av_free_packet(&pkt);
-     }
-     if (retflag != FALSE) {
--       	*width = (ccx->width) * resize;
--       	*height = (ccx->height) * resize;
-+        /* Calculating new picture size and keep aspect ratio */
-+        *width = (ccx->width) * resize;
-+       *height = (ccx->height) * resize;
-+        if (*width > MAXSIZE ) {
-+            *height = ( (*height) * MAXSIZE) / (*width);
-+            *width = MAXSIZE;
-+        }
-+        if (*height > MAXSIZE) {
-+            *width = ( (*width) * MAXSIZE) / (*height);
-+            *height = MAXSIZE;
-+        }
-+
- 		DEBUG(env, this, "decodeFrame", "Resampling from (%i,%i) with resize factor %f to (%i,%i)",ccx->width, ccx->height, resize,*width, *height);
-         // Allocate an AVPicture
--        avpicture_alloc(pict, PIX_FMT_RGBA32, *width, *height);
-+        avpicture_alloc(pict, PIX_FMT_RGB24, *width, *height);
- 		swsContext = sws_getCachedContext(swsContext,
- 			ccx->width, ccx->height, ccx->pix_fmt,
--			*width, *height, PIX_FMT_RGBA32,
-+			*width, *height, PIX_FMT_RGB24,
- 			sws_flags, NULL, NULL, NULL);
- 		if (swsContext == NULL) {
- 			DEBUG(env, this, "decodeFrame", "swscale context initialization failed.");
-@@ -264,5 +280,8 @@
-     return 0;
- }
- 
--
-+void storenumb (jbyte * data, int number) {
-+	data[0] = number/128;
-+	data[1] = number % 128;	
-+}
- 
---- Jubler-3.9.6/src/com/panayotis/jubler/media/preview/decoders/FFMPEG.java	2008-09-08 18:22:10.000000000 +0300
-+++ jubler/src/com/panayotis/jubler/media/preview/decoders/FFMPEG.java	2008-10-29 06:46:03.000000000 +0200
-@@ -56,23 +56,8 @@
- public final class FFMPEG extends NativeDecoder {
-     private static boolean library_is_present = false;
-     
--    private static final int[] bitmasks;
--    private static final ColorModel cmodel;
--    
--
-     static {
-         library_is_present = SystemFileFinder.loadLibrary("ffdecode");
--
--        int[] LE_BITMASKS = {0xff0000, 0xff00, 0xff, 0xff000000};
--        int[] BE_BITMASKS = {0xff00, 0xff0000, 0xff000000, 0xff};
--
--        if (ByteOrder.nativeOrder() == ByteOrder.LITTLE_ENDIAN) {
--            bitmasks = LE_BITMASKS;
--            cmodel = ColorModel.getRGBdefault();
--        } else {
--            bitmasks = BE_BITMASKS;
--            cmodel = new DirectColorModel(32, bitmasks[0], bitmasks[1], bitmasks[2], bitmasks[3]);
--        }
-     }
-     
-     /** Creates a new instance of FFMPEG */
-@@ -82,13 +67,16 @@
-         if ( vfile==null || (!isDecoderValid()) ) return null;
-         
-         time *= 1000000;
--        int[] frame = grabFrame(vfile.getPath(), (long)time, resize);
--        if (frame==null) return null;
--        
--        SinglePixelPackedSampleModel model = new SinglePixelPackedSampleModel(DataBuffer.TYPE_INT,frame[0], frame[1], bitmasks);
--        DataBufferInt buffer = new DataBufferInt(frame, frame[0]*frame[1], 2);
--        WritableRaster ras = Raster.createWritableRaster(model, buffer, null);
--        BufferedImage image = new BufferedImage(cmodel, ras, true, null);
-+        byte[] data = grabFrame(vfile.getPath(), (long)time, resize);
-+        if (data==null) return null;
-+
-+        byte[] frame = new byte[data.length-4];
-+        int X = data[0] * 128 + data[1];
-+        int Y = data[2] * 128 + data[3];
-+        System.arraycopy(data, 4, frame, 0, frame.length);
-+        BufferedImage image = new BufferedImage(X, Y, BufferedImage.TYPE_3BYTE_BGR);
-+        WritableRaster raster = image.getRaster();
-+        raster.setDataElements(0, 0, X, Y, frame);
-         return image;
-     }
-     
-@@ -152,7 +140,7 @@
-     }
-     
-     /* Get the image for this timestamp */
--    private native int[] grabFrame(String video, long time, float resize);
-+    private native byte[] grabFrame(String video, long time, float resize);
-     
-     /* Create a wav file from the specified time stamps */
-     private native boolean createClip(String audio, String wav, long from, long to);
diff --git a/media-video/jubler/files/jubler-3.9.6.patch b/media-video/jubler/files/jubler-3.9.6.patch
deleted file mode 100644
index 32cbeb3b601f..000000000000
--- a/media-video/jubler/files/jubler-3.9.6.patch
+++ /dev/null
@@ -1,180 +0,0 @@
-diff -Nur Jubler-3.9.6/build.xml Jubler-3.9.6_patched/build.xml
---- Jubler-3.9.6/build.xml	2008-09-07 02:05:23.000000000 +0300
-+++ Jubler-3.9.6_patched/build.xml	2008-09-22 19:40:36.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" />
- 
- 
- 
-@@ -397,9 +381,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"/>
- 		<delete dir="src/com/apple" failonerror="false"/>
-diff -Nur Jubler-3.9.6/resources/ffdecode/Makefile Jubler-3.9.6_patched/resources/ffdecode/Makefile
---- Jubler-3.9.6/resources/ffdecode/Makefile	2008-09-22 11:01:58.000000000 +0300
-+++ Jubler-3.9.6_patched/resources/ffdecode/Makefile	2008-09-22 19:41:30.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}
--
- # Current Path
- CPATH=${shell pwd}
- 
-@@ -106,7 +103,6 @@
- CCPREF_NOS=${shell echo ${CCPREF} | sed -e 's/-$$//g' }
- DCONFIG=--with-mp4v2 --host=${CCPREF_NOS}
- 
--CC=${CCPREF}gcc
- RANLIB=${CCPREF}ranlib
- 
- ifeq (${NOSTRIP},) 
-@@ -121,7 +117,7 @@
- .SUFFIXES:.o .c
- 
- .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 $@ $?
- 
- 
- develop:javacheck
-diff -Nur Jubler-3.9.6/src/com/panayotis/jubler/information/HelpBrowser.java Jubler-3.9.6_patched/src/com/panayotis/jubler/information/HelpBrowser.java
---- Jubler-3.9.6/src/com/panayotis/jubler/information/HelpBrowser.java	2008-09-08 18:22:32.000000000 +0300
-+++ Jubler-3.9.6_patched/src/com/panayotis/jubler/information/HelpBrowser.java	2008-09-22 19:42:04.000000000 +0300
-@@ -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-3.9.6/src/com/panayotis/jubler/Main.java Jubler-3.9.6_patched/src/com/panayotis/jubler/Main.java
---- Jubler-3.9.6/src/com/panayotis/jubler/Main.java	2008-09-16 12:51:40.000000000 +0300
-+++ Jubler-3.9.6_patched/src/com/panayotis/jubler/Main.java	2008-09-22 19:42:48.000000000 +0300
-@@ -105,17 +105,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();
-     }
-         
-     static private MainSplash splash;
-diff -Nur Jubler-3.9.6/src/com/panayotis/jubler/os/SystemDependent.java Jubler-3.9.6_patched/src/com/panayotis/jubler/os/SystemDependent.java
---- Jubler-3.9.6/src/com/panayotis/jubler/os/SystemDependent.java	2008-09-20 23:59:27.000000000 +0300
-+++ Jubler-3.9.6_patched/src/com/panayotis/jubler/os/SystemDependent.java	2008-09-22 19:43:40.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;
-@@ -113,10 +109,6 @@
-     
-     
-     public static void initApplication() {
--        /* In Linux this is a dummy function */
--        if (isMacOSX()) {
--            JublerApp japp = new JublerApp();
--        }
-     }
-     
-     
-@@ -342,35 +334,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.prepareQuitAll();
--        event.setHandled(false);
--    }
--    
--    public void handleOpenFile(ApplicationEvent event) {
--        Main.asyncAddSubtitle(event.getFilename());
--    }
--}
-diff -Nur Jubler-3.9.6/src/com/panayotis/jubler/os/SystemFileFinder.java Jubler-3.9.6_patched/src/com/panayotis/jubler/os/SystemFileFinder.java
---- Jubler-3.9.6/src/com/panayotis/jubler/os/SystemFileFinder.java	2008-09-08 18:22:32.000000000 +0300
-+++ Jubler-3.9.6_patched/src/com/panayotis/jubler/os/SystemFileFinder.java	2008-09-22 19:44:30.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-4.0.patch b/media-video/jubler/files/jubler-4.0.patch
deleted file mode 100644
index cd71f057d0a4..000000000000
--- a/media-video/jubler/files/jubler-4.0.patch
+++ /dev/null
@@ -1,233 +0,0 @@
-diff -Nur Jubler-4.0/build.xml Jubler-4.0_patched/build.xml
---- Jubler-4.0/build.xml	2008-12-11 12:33:50.000000000 +0200
-+++ Jubler-4.0_patched/build.xml	2008-12-20 03:14:59.000000000 +0200
-@@ -69,25 +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" />
--
--
--
- 	<target name="i18n">
- 		<exec dir="resources/i18n" executable="bash" failonerror="true">
- 			<arg line="compile"/>
-@@ -430,9 +411,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"/>
- 		<delete dir="src/com/apple" failonerror="false"/>
-diff -Nur Jubler-4.0/resources/ffdecode/Makefile Jubler-4.0_patched/resources/ffdecode/Makefile
---- Jubler-4.0/resources/ffdecode/Makefile	2008-12-08 11:16:13.000000000 +0200
-+++ Jubler-4.0_patched/resources/ffdecode/Makefile	2008-12-20 04:50:48.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}
--
- # Current Path
- CPATH=${shell pwd}
- 
-@@ -39,7 +36,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 '/' '.' }
-@@ -106,7 +102,6 @@
- CCPREF_NOS=${shell echo ${CCPREF} | sed -e 's/-$$//g' }
- DCONFIG=--with-mp4v2 --host=${CCPREF_NOS}
- 
--CC=${CCPREF}gcc
- RANLIB=${CCPREF}ranlib
- 
- ifeq (${NOSTRIP},) 
-@@ -121,35 +116,35 @@
- .SUFFIXES:.o .c
- 
- .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 $@ $?
- 
- 
- develop:javacheck
--	make -e `uname -s|tr [A-Z] [a-z]`
-+	$(MAKE) -e `uname -s|tr [A-Z] [a-z]`
- 
- 
- linux:javacheck distclean
--	make -e library MAKESYS=linux
-+	$(MAKE) -e library MAKESYS=linux
- 	rm -rf ${JUBLER}/src/lib
- 
- linuxdyn:javacheck distclean
--	make -e library MAKESYS=linux STATIC=no
-+	$(MAKE) -e library MAKESYS=linux STATIC=no
- 	rm -rf ${Jubler}/src/lib
- 
- win32:javacheck distclean
--	make -e library MAKESYS=win32
-+	$(MAKE) -e library MAKESYS=win32
- 	rm -rf ${JUBLER}/src/lib
- 
- darwin:javacheck
--	make distclean
--	make -e LIB MAKESYS=darwin_ppc
--	make distclean
--	make -e LIB MAKESYS=darwin_i386
--	make distclean
-+	$(MAKE) distclean
-+	$(MAKE) -e LIB MAKESYS=darwin_ppc
-+	$(MAKE) distclean
-+	$(MAKE) -e LIB MAKESYS=darwin_i386
-+	$(MAKE) distclean
- 	lipo ${PROJ}.ppc ${PROJ}.i386 -create -output ${MACLIBNAME}
- 	TIGER=`otool -vR ${MACLIBNAME} | grep UNIX` ; if [ -n "$$TIGER" ] ; then echo "Tiger compatibility problem!" ; echo $$TIGER ; exit 1 ; fi
- 	rm -f ${PROJ}.ppc ${PROJ}.i386
--	make -e libinstall LIBNAME=${MACLIBNAME}
-+	$(MAKE) -e libinstall LIBNAME=${MACLIBNAME}
- 
- library:clean ${LIBNAME} libinstall
- 
-@@ -190,19 +185,19 @@
- 
- 
- ${LIBRARIES}/libfaad${LIBSUF}.a:
--	cd ${FAAD} && CFLAGS="${GCCOPTS}" LDFLAGS="${GCCOPTS}" ./configure ${DCONFIG} && mv frontend/Makefile frontend/Makefile.orig && echo >frontend/Makefile "all:" && make -j3
-+	cd ${FAAD} && CFLAGS="${GCCOPTS}" LDFLAGS="${GCCOPTS}" ./configure ${DCONFIG} && mv frontend/Makefile frontend/Makefile.orig && echo >frontend/Makefile "all:" && $(MAKE) -j3
- 	mkdir -p ${LIBRARIES}
- 	cp ${FAAD}/libfaad/.libs/libfaad.a ${LIBRARIES}/libfaad${LIBSUF}.a
--	cd ${FAAD} && mv frontend/Makefile.orig frontend/Makefile && make distclean
-+	cd ${FAAD} && mv frontend/Makefile.orig frontend/Makefile && $(MAKE) distclean
- 
- ${LIBRARYREQ}: ${LIBRARIES}/libfaad${LIBSUF}.a
- 	mkdir -p ${LIBRARIES}
- 	cd ${LIBRARIES} ; rm -f libfaad.a && ln -s libfaad${LIBSUF}.a libfaad.a
--	cd ${FFMPEG} && ./${FFCONF} ${FCONFIG} && make -j3
-+	cd ${FFMPEG} && ./${FFCONF} ${FCONFIG} && $(MAKE) -j3
- 	cp ${FFMPEG}/libavformat/libavformat.a ${LIBRARIES}/libavformat${LIBSUF}.a
- 	cp ${FFMPEG}/libavcodec/libavcodec.a ${LIBRARIES}/libavcodec${LIBSUF}.a
- 	cp ${FFMPEG}/libavutil/libavutil.a ${LIBRARIES}/libavutil${LIBSUF}.a
--	cd ${FFMPEG} && make distclean
-+	cd ${FFMPEG} && $(MAKE) distclean
- 	rm -f ${LIBRARIES}/libfaad.a
- 
- 
-diff -Nur Jubler-4.0/src/com/panayotis/jubler/information/HelpBrowser.java Jubler-4.0_patched/src/com/panayotis/jubler/information/HelpBrowser.java
---- Jubler-4.0/src/com/panayotis/jubler/information/HelpBrowser.java	2008-11-29 17:13:57.000000000 +0200
-+++ Jubler-4.0_patched/src/com/panayotis/jubler/information/HelpBrowser.java	2008-12-20 02:49:14.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-4.0/src/com/panayotis/jubler/os/SystemDependent.java Jubler-4.0_patched/src/com/panayotis/jubler/os/SystemDependent.java
---- Jubler-4.0/src/com/panayotis/jubler/os/SystemDependent.java	2008-11-29 17:13:57.000000000 +0200
-+++ Jubler-4.0_patched/src/com/panayotis/jubler/os/SystemDependent.java	2008-12-20 02:50:17.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;
-@@ -108,10 +104,6 @@
-     
-     
-     public static void initApplication() {
--        /* In Linux this is a dummy function */
--        if (IS_MACOSX) {
--            JublerApp japp = new JublerApp();
--        }
-     }
-     
-     
-@@ -338,36 +330,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) {
--        if (StaticJubler.requestQuit(null))
--            System.exit(0);
--        event.setHandled(false);
--    }
--    
--    public void handleOpenFile(ApplicationEvent event) {
--        Main.asyncAddSubtitle(event.getFilename());
--    }
--}
-diff -Nur Jubler-4.0/src/com/panayotis/jubler/os/SystemFileFinder.java Jubler-4.0_patched/src/com/panayotis/jubler/os/SystemFileFinder.java
---- Jubler-4.0/src/com/panayotis/jubler/os/SystemFileFinder.java	2008-11-29 17:13:57.000000000 +0200
-+++ Jubler-4.0_patched/src/com/panayotis/jubler/os/SystemFileFinder.java	2008-12-20 02:51:03.000000000 +0200
-@@ -56,15 +56,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-4.0.ebuild b/media-video/jubler/jubler-4.0.ebuild
deleted file mode 100644
index 75fb574cfa0e..000000000000
--- a/media-video/jubler/jubler-4.0.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/jubler/jubler-4.0.ebuild,v 1.3 2009/04/04 15:20:19 maekke Exp $
-
-EAPI="2"
-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-0.4.9_p20080326
-	mplayer? ( media-video/mplayer[ass] )
-	spell?
-	(
-		app-text/aspell
-		>=dev-java/zemberek-2.0[linguas_tr]
-	)
-	dev-java/jupidator"
-
-DEPEND=">=virtual/jdk-1.5
-	media-video/ffmpeg
-	app-text/docbook-sgml-utils
-	dev-util/pkgconfig
-	nls? ( sys-devel/gettext )
-	dev-java/jupidator"
-
-S=${WORKDIR}/${MY_PN}-${PV}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}" || die
-	epatch "${FILESDIR}/${P}.patch"
-	chmod +x resources/installers/linux/iconinstall
-	JAVA_ANT_CLASSPATH_TAGS="java javac" java-ant_rewrite-classpath
-	java-ant_rewrite-classpath nbproject/build-impl.xml
-}
-
-src_compile() {
-	java-pkg_filter-compiler ecj-3.2
-	eant -Dgentoo.classpath="$(java-pkg_getjars jupidator)" distbased $(use nls && echo i18n) jar faq changelog || die "eant failed"
-	cp -v dist/help/jubler-faq.html build/classes/help || die "cp failed"
-	cd resources/ffdecode || die
-	CC=$(tc-getCC) NOSTRIP=true 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
-	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_preinst() {
-	gnome2_pkg_preinst
-	java-pkg-2_pkg_preinst
-}
diff --git a/media-video/jubler/jubler-4.1.1.ebuild b/media-video/jubler/jubler-4.1.1.ebuild
deleted file mode 100644
index 8b338df1e8b2..000000000000
--- a/media-video/jubler/jubler-4.1.1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/jubler/jubler-4.1.1.ebuild,v 1.3 2010/04/17 04:34:26 serkan Exp $
-
-EAPI="2"
-inherit gnome2-utils 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://gentoo/${MY_PN}-src-${PV}.tar.bz2"
-# This is a patched tarball generated from Mercurial.
-
-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]
-	)
-	>=dev-java/jupidator-0.3.0"
-
-DEPEND=">=virtual/jdk-1.5
-	>=media-video/ffmpeg-0.4.9_p20080326
-	app-text/docbook-sgml-utils
-	dev-util/pkgconfig
-	nls? ( sys-devel/gettext )
-	dev-java/jupidator"
-
-S=${WORKDIR}/${MY_PN}-${PV}
-
-java_prepare() {
-	chmod +x resources/installers/linux/iconinstall
-	JAVA_ANT_CLASSPATH_TAGS="java javac" java-ant_rewrite-classpath
-	java-ant_rewrite-classpath nbproject/build-impl.xml
-}
-
-src_compile() {
-	java-pkg_filter-compiler ecj-3.2
-	eant -Dgentoo.classpath="$(java-pkg_getjars jupidator)" distbased $(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) NOSTRIP=true 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
-	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() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}