Version bump. Remove old.

(Portage version: 2.2_rc17/cvs/Linux 2.6.27-gentoo-r2 x86_64)

4 files changed, 259 insertions, 214 deletions

diff --git a/media-video/jubler/ChangeLog b/media-video/jubler/ChangeLog
index a701c2955ccb..ba44e0eb4bfc 100644
--- a/media-video/jubler/ChangeLog
+++ b/media-video/jubler/ChangeLog
@@ -1,6 +1,12 @@
 # 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.26 2008/12/20 00:54:50 gentoofan23 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/jubler/ChangeLog,v 1.27 2008/12/20 04:17:17 serkan Exp $
+
+*jubler-4.0 (20 Dec 2008)
+
+  20 Dec 2008; Serkan Kaba <serkan@gentoo.org> -files/jubler-3.9.0.patch,
+  +files/jubler-4.0.patch, -jubler-3.9.0.ebuild, +jubler-4.0.ebuild:
+  Version bump. Remove old.
 
   20 Dec 2008; Thomas Anderson <gentoofan23@gentoo.org> jubler-3.9.6.ebuild:
   stable amd64, bug 245532
diff --git a/media-video/jubler/files/jubler-3.9.0.patch b/media-video/jubler/files/jubler-3.9.0.patch
deleted file mode 100644
index 348d1a186622..000000000000
--- a/media-video/jubler/files/jubler-3.9.0.patch
+++ /dev/null
@@ -1,189 +0,0 @@
-diff -Nur 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-24 11:58:56.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.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-24 12:00:50.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
- 
- 
-@@ -115,7 +111,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
-@@ -157,7 +153,6 @@
- 
- ${LIBNAME}:${LIBRARYREQ} ${OBJS} ${RANLIBREQ}
- 	${LD} ${GCCOPTS} -o ${LIBNAME} ${OBJS} ${LIBS}
--	${STRIP} ${LIBNAME}
- 
- 
- clean:
-diff -Nur 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-24 11:58:56.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.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-24 11:58:56.000000000 +0300
-@@ -84,17 +84,9 @@
-         /* Load arguments, in a mac way */
-         SystemDependent.initApplication();
- 
--        /* Check current version in a new thread */
--        Thread versioncheck = new Thread() {
--            public void run() {
--                StaticJubler.initVersion();
--            }
--        };
--
-         new Jubler();   // Display initial Jubler window
-         splash.dispose();   // Hide splash screen
-         loader.start();     // initialize loader
--        versioncheck.start();
-                 
-     }
-         
-diff -Nur Jubler-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-24 11:58:56.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;
-@@ -110,10 +106,6 @@
-     
-     
-     public static void initApplication() {
--        /* In Linux this is a dummy function */
--        if (isMacOSX()) {
--            JublerApp japp = new JublerApp();
--        }
-     }
-     
-     
-@@ -328,36 +320,3 @@
-         return home+".jubler/output.log";
-     }
- }
--
--
--
--class JublerApp extends Application {
--    public JublerApp() {
--        setEnabledPreferencesMenu(true);
--        addApplicationListener(new ApplicationHandler());
--    }
--}
--
--class ApplicationHandler extends ApplicationAdapter {
--    
--    public ApplicationHandler() {}
--    
--    public void handleAbout(ApplicationEvent event) {
--        StaticJubler.showAbout();
--        event.setHandled(true);
--    }
--    
--    public void handlePreferences(ApplicationEvent event) {
--        Jubler.prefs.showPreferencesDialog();
--        event.setHandled(true);
--    }
--    
--    public void handleQuit(ApplicationEvent event) {
--        StaticJubler.quitAll();
--        event.setHandled(false);
--    }
--    
--    public void handleOpenFile(ApplicationEvent event) {
--        Main.asyncAddSubtitle(event.getFilename());
--    }
--}
-diff -Nur Jubler-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-24 11:58:56.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
new file mode 100644
index 000000000000..cd71f057d0a4
--- /dev/null
+++ b/media-video/jubler/files/jubler-4.0.patch
@@ -0,0 +1,233 @@
+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-3.9.0.ebuild b/media-video/jubler/jubler-4.0.ebuild
index dd07405a5c37..3ff5e034f6d3 100644
--- a/media-video/jubler/jubler-3.9.0.ebuild
+++ b/media-video/jubler/jubler-4.0.ebuild
@@ -1,7 +1,8 @@
 # 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.6 2008/12/02 19:36:16 serkan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/jubler/jubler-4.0.ebuild,v 1.1 2008/12/20 04:17:17 serkan Exp $
 
+EAPI="2"
 inherit gnome2 eutils java-pkg-2 java-ant-2 toolchain-funcs
 
 MY_PN=${PN/#j/J}
@@ -11,51 +12,43 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_PN}-src-${PV}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64"
 IUSE="mplayer nls spell"
 
 RDEPEND=">=virtual/jre-1.5
-	<media-video/ffmpeg-0.4.9_p20080206
-	mplayer? ( media-video/mplayer )
+	>=media-video/ffmpeg-0.4.9_p20080326
+	mplayer? ( media-video/mplayer[ass] )
 	spell?
 	(
 		app-text/aspell
-		>=dev-java/zemberek-2.0
-	)"
+		>=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 )"
+	nls? ( sys-devel/gettext )
+	dev-java/jupidator"
 
 S=${WORKDIR}/${MY_PN}-${PV}
 
-pkg_setup() {
-	if use spell && ! built_with_use dev-java/zemberek linguas_tr; then
-		die "dev-java/zemberek should be built with Turkish language support"
-	fi
-	if use mplayer && ! built_with_use -o media-video/mplayer srt ass; 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}"
+	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 $(use nls && echo i18n) jar faq || die "eant failed"
+	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) emake linuxdyn || die "make failed"
+	CC=$(tc-getCC) NOSTRIP=true emake linuxdyn || die "make failed"
 }
 
 src_install() {
@@ -70,9 +63,11 @@ src_install() {
 	rm -vr "${D}/usr/share/menu" || die
 
 	java-pkg_dolauncher jubler --main com.panayotis.jubler.Main
-	doman resources/installers/linux/jubler.1
+	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/*
+	doins dist/help/* || die "doins failed"
 }
 
 pkg_preinst() {