Updated to the latest files from svn.

Package-Manager: portage-2.1.3.3

4 files changed, 42 insertions, 21 deletions

diff --git a/media-video/jubler/ChangeLog b/media-video/jubler/ChangeLog
index 0ce0d1f21610..3e1b3976b9bb 100644
--- a/media-video/jubler/ChangeLog
+++ b/media-video/jubler/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/jubler
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/jubler/ChangeLog,v 1.1 2007/08/04 18:45:49 fordfrog Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/jubler/ChangeLog,v 1.2 2007/08/04 18:51:09 fordfrog Exp $
+
+  04 Aug 2007; Miroslav Šulc <fordfrog@gentoo.org>
+  files/jubler-3.3.0.patch, jubler-3.3.0.ebuild:
+  Updated to the latest files from svn.
 
 *jubler-3.3.0 (04 Aug 2007)
 
diff --git a/media-video/jubler/Manifest b/media-video/jubler/Manifest
index 23efb8316f2d..9db65452fa20 100644
--- a/media-video/jubler/Manifest
+++ b/media-video/jubler/Manifest
@@ -1,16 +1,16 @@
-AUX jubler-3.3.0.patch 11428 RMD160 957506b555d13d13c8a15b4bd39e0924ee1b1ea5 SHA1 f3a0f7e108afc02b1504ebeeecf7d31816c057f5 SHA256 4592b74b38267c7bb39fa872a9c620095d5dbce3124cb06100c9970ceca16f11
-MD5 e63d3eaeda765325bd184282edc3a46e files/jubler-3.3.0.patch 11428
-RMD160 957506b555d13d13c8a15b4bd39e0924ee1b1ea5 files/jubler-3.3.0.patch 11428
-SHA256 4592b74b38267c7bb39fa872a9c620095d5dbce3124cb06100c9970ceca16f11 files/jubler-3.3.0.patch 11428
+AUX jubler-3.3.0.patch 11997 RMD160 d136352edebfa59603d3894f73ef2b118926b612 SHA1 cbf60201f14c4108855c5bf66b5f4d89584203cf SHA256 6c591e09a25e5dc07690e753770d2735bca6906f2f0689bc5e157cb30d0e1c2d
+MD5 c62bd858115401bfc60ef70f43d8e6b8 files/jubler-3.3.0.patch 11997
+RMD160 d136352edebfa59603d3894f73ef2b118926b612 files/jubler-3.3.0.patch 11997
+SHA256 6c591e09a25e5dc07690e753770d2735bca6906f2f0689bc5e157cb30d0e1c2d files/jubler-3.3.0.patch 11997
 DIST Jubler-src-3.3.0.tar.bz2 1707747 RMD160 0af1db4e41b56acc0b9c80ad3e45e0090043914b SHA1 68ab46ba172755217f49df582babd260f7687707 SHA256 48b431600210160b2643a794bcf4054b6a12553c5d3daad16b4ab991f269c16c
-EBUILD jubler-3.3.0.ebuild 1932 RMD160 747d3dcf33d54dcef1770ede6020ee3a147819d7 SHA1 1af341d50a4dfb657eedfc577e4d160d4fe2a429 SHA256 af5da2e00f9f38aa7253d8d7e433a57e525e0d926cb2aed0f4dc0bf624e1a122
-MD5 3d584745d8494ac72b1745220b7f9fe5 jubler-3.3.0.ebuild 1932
-RMD160 747d3dcf33d54dcef1770ede6020ee3a147819d7 jubler-3.3.0.ebuild 1932
-SHA256 af5da2e00f9f38aa7253d8d7e433a57e525e0d926cb2aed0f4dc0bf624e1a122 jubler-3.3.0.ebuild 1932
-MISC ChangeLog 440 RMD160 ce633cadc54d81931559050e693ce64cbab90adb SHA1 2c8313cd9c3f52ba86da756ba9909002466d1108 SHA256 3087b0b6bdbec9c03b7e2161070ecd62b25bb1f633349a901aac97fe34ff9c5c
-MD5 4227bd70928284f221dc3ed4f9f6d560 ChangeLog 440
-RMD160 ce633cadc54d81931559050e693ce64cbab90adb ChangeLog 440
-SHA256 3087b0b6bdbec9c03b7e2161070ecd62b25bb1f633349a901aac97fe34ff9c5c ChangeLog 440
+EBUILD jubler-3.3.0.ebuild 1956 RMD160 3a9ea79e7e644018a61cb5cee7ac9939a2a561fb SHA1 faa706ca7a3db0031c8d6bf152686112aff226ad SHA256 b839605aed26e00881ae5775b7977696d8099bcad1dec98bee4a5c133fe32ff8
+MD5 fbbed6c8dba9272b69fe6723ed20a1d2 jubler-3.3.0.ebuild 1956
+RMD160 3a9ea79e7e644018a61cb5cee7ac9939a2a561fb jubler-3.3.0.ebuild 1956
+SHA256 b839605aed26e00881ae5775b7977696d8099bcad1dec98bee4a5c133fe32ff8 jubler-3.3.0.ebuild 1956
+MISC ChangeLog 582 RMD160 097b7816ccbc74ed9fa6baf19932822b84654e61 SHA1 d561ac5f957b3a51ddf8090863a716eb7aa47da4 SHA256 c903c7588ce22351e50489f3998445f8b337356d6fa8cec7d8eb9f0237d325dc
+MD5 1668d269839d65ad279dcf0cbb72876f ChangeLog 582
+RMD160 097b7816ccbc74ed9fa6baf19932822b84654e61 ChangeLog 582
+SHA256 c903c7588ce22351e50489f3998445f8b337356d6fa8cec7d8eb9f0237d325dc ChangeLog 582
 MISC metadata.xml 216 RMD160 05d4d9c2f1c459ea9309346016001e26bad574ce SHA1 98783559fec44d27f1294db2e9549af2fe38f1b3 SHA256 94b55a2ec67c524728d32249d59a6a1545fd37d61c83259b5f05163ca47e87e1
 MD5 f975e6f37c20a73d4d486a0c24ff4c78 metadata.xml 216
 RMD160 05d4d9c2f1c459ea9309346016001e26bad574ce metadata.xml 216
diff --git a/media-video/jubler/files/jubler-3.3.0.patch b/media-video/jubler/files/jubler-3.3.0.patch
index f14189beb618..86d681d02c88 100644
--- a/media-video/jubler/files/jubler-3.3.0.patch
+++ b/media-video/jubler/files/jubler-3.3.0.patch
@@ -1,6 +1,6 @@
 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 03:00:30.000000000 +0300
++++ Jubler-3.3.0_patched/build.xml	2007-08-04 19:30:49.000000000 +0300
 @@ -69,22 +69,6 @@
  
  
@@ -36,7 +36,7 @@ diff -Nur Jubler-3.3.0/build.xml Jubler-3.3.0_patched/build.xml
  	<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 05:13:00.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
@@ -80,7 +80,7 @@ diff -Nur Jubler-3.3.0/resources/ffdecode/Makefile Jubler-3.3.0_patched/resource
  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 03:18:39.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>();
@@ -90,9 +90,26 @@ diff -Nur Jubler-3.3.0/src/com/panayotis/jubler/information/HelpBrowser.java Jub
          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 03:39:16.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._;
@@ -326,7 +343,7 @@ diff -Nur Jubler-3.3.0/src/com/panayotis/jubler/os/SystemDependent.java Jubler-3
 -}
 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 03:34:35.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 @@
      }
      
diff --git a/media-video/jubler/jubler-3.3.0.ebuild b/media-video/jubler/jubler-3.3.0.ebuild
index 03734f08c50a..bfa09916aaab 100644
--- a/media-video/jubler/jubler-3.3.0.ebuild
+++ b/media-video/jubler/jubler-3.3.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/jubler/jubler-3.3.0.ebuild,v 1.1 2007/08/04 18:45:49 fordfrog Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/jubler/jubler-3.3.0.ebuild,v 1.2 2007/08/04 18:51:09 fordfrog Exp $
 
 inherit eutils java-pkg-2 java-utils-2 java-ant-2 toolchain-funcs flag-o-matic
 
@@ -48,8 +48,8 @@ src_compile() {
 	use nls && anttasks_opt="i18n"
 	eant ${anttasks_opt} jar faq || die "eant failed"
 	cp -v dist/help/jubler-faq.html build/classes/help || die "cp failed"
-	cd resources/ffdecode
-	CC=$(tc-getCC) emake linuxdyn
+	cd resources/ffdecode || die
+	CC=$(tc-getCC) emake linuxdyn || "make failed"
 }
 
 src_install() {