Version bumped, bug #186824.

Package-Manager: portage-2.1.3_rc9

6 files changed, 434 insertions, 5 deletions

diff --git a/media-tv/tvbrowser/ChangeLog b/media-tv/tvbrowser/ChangeLog
index a318c34857bb..4305cf24d93a 100644
--- a/media-tv/tvbrowser/ChangeLog
+++ b/media-tv/tvbrowser/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-tv/tvbrowser
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/tvbrowser/ChangeLog,v 1.17 2007/07/22 09:01:22 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/tvbrowser/ChangeLog,v 1.18 2007/07/30 12:52:29 zzam Exp $
+
+*tvbrowser-2.5.3 (30 Jul 2007)
+
+  30 Jul 2007; Matthias Schwarzott <zzam@gentoo.org>
+  +files/tvbrowser-2.5.3_buildxml.patch,
+  +files/tvbrowser-2.5.3_noWin32.patch, +tvbrowser-2.5.3.ebuild:
+  Version bumped, bug #186824.
 
   22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>; tvbrowser-2.1.ebuild,
   tvbrowser-2.2.1.ebuild, tvbrowser-2.5.ebuild, tvbrowser-2.5-r1.ebuild:
diff --git a/media-tv/tvbrowser/Manifest b/media-tv/tvbrowser/Manifest
index de73b5fd3066..02ed208f9f2d 100644
--- a/media-tv/tvbrowser/Manifest
+++ b/media-tv/tvbrowser/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX tvbrowser-2.1-makefiles.patch 3385 RMD160 dc09af2ddba09eb90657c9b61eead3e40002cd00 SHA1 836ca66cc7bd1fdd7fac5c71ba68e60b495b3d52 SHA256 e33caa5f099590fa3c0da2ccbff7189a442f12404775ee19b26319747c7613ed
 MD5 2a50d11a23b770a3d4b7b34bbaca2c36 files/tvbrowser-2.1-makefiles.patch 3385
 RMD160 dc09af2ddba09eb90657c9b61eead3e40002cd00 files/tvbrowser-2.1-makefiles.patch 3385
@@ -18,6 +21,14 @@ AUX tvbrowser-2.5.2_noWin32.patch 6618 RMD160 ee9d50ca3906a01f6249ebe52260d3046c
 MD5 6e7063f52b7c06ad7052750fbc3fda63 files/tvbrowser-2.5.2_noWin32.patch 6618
 RMD160 ee9d50ca3906a01f6249ebe52260d3046cee767b files/tvbrowser-2.5.2_noWin32.patch 6618
 SHA256 6149c7b93018a29cf7e1a3d6181c81a4e6bb21d52746ee22a0e5479a6eb8976b files/tvbrowser-2.5.2_noWin32.patch 6618
+AUX tvbrowser-2.5.3_buildxml.patch 6500 RMD160 e0f4bfe53cb8bf848a8a28882472d845f5921b9a SHA1 5b41a05b7e03edece59673860f47c79dab7a81a0 SHA256 cdffec831b14458b88954eaa0d46008789473da28805bf114864db7e4c0fde06
+MD5 872f9d5062ea70fd3a2114b2297d1fcf files/tvbrowser-2.5.3_buildxml.patch 6500
+RMD160 e0f4bfe53cb8bf848a8a28882472d845f5921b9a files/tvbrowser-2.5.3_buildxml.patch 6500
+SHA256 cdffec831b14458b88954eaa0d46008789473da28805bf114864db7e4c0fde06 files/tvbrowser-2.5.3_buildxml.patch 6500
+AUX tvbrowser-2.5.3_noWin32.patch 6895 RMD160 a0034919b4a79a218d7a8af6110feb0dad3968da SHA1 99736a4e50e9ee36873ad9eb7107c2604cb41e88 SHA256 c4787dbadf113236250dbf0140ca83cae47899701e13515ae1541d393633306d
+MD5 22e2d662f0178cb523a12de25a9a1ec2 files/tvbrowser-2.5.3_noWin32.patch 6895
+RMD160 a0034919b4a79a218d7a8af6110feb0dad3968da files/tvbrowser-2.5.3_noWin32.patch 6895
+SHA256 c4787dbadf113236250dbf0140ca83cae47899701e13515ae1541d393633306d files/tvbrowser-2.5.3_noWin32.patch 6895
 AUX tvbrowser-2.5_Localizer.patch 582 RMD160 f4819fef17b1d5c639d271c38b126598f75af9e9 SHA1 87c323f13d8465c9cb9dd8f962441db9b859cb51 SHA256 19ef0fc4ccbea0dab3fe014022402a0ccda09c191adf5bffb470f6e8f96a32b9
 MD5 44680445916b2e138444ca5b0973145b files/tvbrowser-2.5_Localizer.patch 582
 RMD160 f4819fef17b1d5c639d271c38b126598f75af9e9 files/tvbrowser-2.5_Localizer.patch 582
@@ -35,6 +46,7 @@ DIST tvbrowser-2.1-src.zip 5928402 RMD160 5918840feec2d09fabaa093de744eed4788756
 DIST tvbrowser-2.2.1-src.zip 8138920 RMD160 e0080a207026ea0d3037e97032fe0451bb973302 SHA1 eb89df02e17205eca92b0fc674fcbdd3c504086c SHA256 bb4217743331f475a666e74ea9f307755f890213514e1c817d5d825a90240499
 DIST tvbrowser-2.5-src.zip 8865427 RMD160 2f47f2a9d56f9fac26dae77f6f34dac06bd17b7d SHA1 a8a3444cfc40f67e16beccfb491121d98f4e0cc1 SHA256 f2f60303a5600dd3bcd94dc681f469f9e0e6e408581db4eccc2bad3cbdbb3c7a
 DIST tvbrowser-2.5.2-src.zip 9237691 RMD160 6b0b219535606897bfc8b15858e3cc8eb153fe4a SHA1 569052af3744938c1ae432ec04dcdc7c85e9f99a SHA256 7355ed9887fc3ea833c9f8296a513eb864605f85646fbb4bb9a83be128c24d8e
+DIST tvbrowser-2.5.3-src.zip 9290454 RMD160 9138e33dd1fbe887353a8ac5eecd7e9cb7b1fd0f SHA1 979d9dc437e28aff5eb5853b7637e244871d2eee SHA256 e3dbabedb9e16b73f11828f5b5654034055638387be7f1b89db1b8b00d7bcea8
 EBUILD tvbrowser-2.1.ebuild 3013 RMD160 32bcbb6dbe7b3e4153e4fb1e184028c1e5b789a4 SHA1 7a5bab14cfb2e408046c1def39b5bda968db8e00 SHA256 874609da15975a990d0cbeb13bab149fc94f11e08330e4d95e5afa61647311ad
 MD5 496f1325621fae7ddf108538ba533fa8 tvbrowser-2.1.ebuild 3013
 RMD160 32bcbb6dbe7b3e4153e4fb1e184028c1e5b789a4 tvbrowser-2.1.ebuild 3013
@@ -51,14 +63,18 @@ EBUILD tvbrowser-2.5.2.ebuild 3616 RMD160 c6e39625daf6301b48641cdf5615ca14a572b2
 MD5 69c5f709a979c9558a564e1d416d68df tvbrowser-2.5.2.ebuild 3616
 RMD160 c6e39625daf6301b48641cdf5615ca14a572b2d4 tvbrowser-2.5.2.ebuild 3616
 SHA256 6c9966014e659dd21ad3edbcc5a2e3e786cef7012a8ba63673c743af8aeddd54 tvbrowser-2.5.2.ebuild 3616
+EBUILD tvbrowser-2.5.3.ebuild 3611 RMD160 4571391f757aec23adb62b2e4e4ee1e34e837588 SHA1 2459998bd011babf6f084d9803a2059e2ff5d81c SHA256 ca5112fe6dc6114b73d420c63a1caf1bb2fb0804615cc7d0383c2c30ac70586a
+MD5 2b187bb03ff409a8362c266d3c89408a tvbrowser-2.5.3.ebuild 3611
+RMD160 4571391f757aec23adb62b2e4e4ee1e34e837588 tvbrowser-2.5.3.ebuild 3611
+SHA256 ca5112fe6dc6114b73d420c63a1caf1bb2fb0804615cc7d0383c2c30ac70586a tvbrowser-2.5.3.ebuild 3611
 EBUILD tvbrowser-2.5.ebuild 3231 RMD160 f0ca8c0af12b97e90f55edbf2559cf14158c86f9 SHA1 f6a8fdd0e5e16786a551121c736de67a0091cf8c SHA256 e2493121d4de0385ae5c874f83b38d66dfdd30747706224623b72c4e8f561488
 MD5 a7caf6b67bedef605f61e79d63d4512f tvbrowser-2.5.ebuild 3231
 RMD160 f0ca8c0af12b97e90f55edbf2559cf14158c86f9 tvbrowser-2.5.ebuild 3231
 SHA256 e2493121d4de0385ae5c874f83b38d66dfdd30747706224623b72c4e8f561488 tvbrowser-2.5.ebuild 3231
-MISC ChangeLog 3511 RMD160 1a0499983fc45359540761feaf1b1a542329606b SHA1 69c3545b10666b8dff0b937dd860da663ecd460c SHA256 7de471bce215a33c39e29eed51720fc88857998721f664fd20832fedf9e3a18e
-MD5 c07867d1590f83265092e3bbb0b4d0c6 ChangeLog 3511
-RMD160 1a0499983fc45359540761feaf1b1a542329606b ChangeLog 3511
-SHA256 7de471bce215a33c39e29eed51720fc88857998721f664fd20832fedf9e3a18e ChangeLog 3511
+MISC ChangeLog 3729 RMD160 238cf09c2a37f6e84ffaea2e9a10dcd126dbe4c5 SHA1 8d234f48d42ada1b202f6586b8da1a5ef6893823 SHA256 23a140e8deee67b201de7072468a60366d43f415addb946777f3c6e23b2904e7
+MD5 de3e3c664fe2ce608e3f04ee549a541b ChangeLog 3729
+RMD160 238cf09c2a37f6e84ffaea2e9a10dcd126dbe4c5 ChangeLog 3729
+SHA256 23a140e8deee67b201de7072468a60366d43f415addb946777f3c6e23b2904e7 ChangeLog 3729
 MISC metadata.xml 437 RMD160 fa0a4e1d3225b61ff69426a3b7994353474eb3b6 SHA1 9c88f63415dc76c616ed7c09706939b07c311225 SHA256 d249b340ae05ef3fce3fcf4e4352c69b566fe16f6cd80f34b28a17a4ba068259
 MD5 ab9a5a08dc409da5c9928d07cbea5725 metadata.xml 437
 RMD160 fa0a4e1d3225b61ff69426a3b7994353474eb3b6 metadata.xml 437
@@ -78,3 +94,13 @@ SHA256 cdf4ac7a77d4ddaef54024266241e8731fcbd27348b4d055af262dbe2e992152 files/di
 MD5 8a2eeec72ecee0b30c6f8a2440942f89 files/digest-tvbrowser-2.5.2 485
 RMD160 3d1cfad6b792b0b6d47f7779da27e5d0ba5c64f9 files/digest-tvbrowser-2.5.2 485
 SHA256 9077f1ef73f1d1d33ce47076a7b20c0931242be1e69101dfbd1ed13f3e3d9cb9 files/digest-tvbrowser-2.5.2 485
+MD5 8cd3ff362e2fc971d115fec308df8a24 files/digest-tvbrowser-2.5.3 485
+RMD160 a40de90005a1d2695a6f87a8fe42c22129931fed files/digest-tvbrowser-2.5.3 485
+SHA256 a565524bfc27d1bc64ee3b8170e390762b3db0f81edd69e4ea310c5ba1b4d96f files/digest-tvbrowser-2.5.3 485
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.5 (GNU/Linux)
+
+iD8DBQFGrd8st2vP6XvVdOcRAnqUAKChXmwdurpTYIm4MggbXe4aEWyfTgCfZVr6
+20yW2eOwChoaW3Yi7X/lgKU=
+=LYKk
+-----END PGP SIGNATURE-----
diff --git a/media-tv/tvbrowser/files/digest-tvbrowser-2.5.3 b/media-tv/tvbrowser/files/digest-tvbrowser-2.5.3
new file mode 100644
index 000000000000..9f114728495e
--- /dev/null
+++ b/media-tv/tvbrowser/files/digest-tvbrowser-2.5.3
@@ -0,0 +1,6 @@
+MD5 672a2f53c54511ced3f796c65a9183f7 allthemepacks.zip 210954
+RMD160 6d456534bd504c98eb57ff39876ee2c2ffabee70 allthemepacks.zip 210954
+SHA256 602d229f734c2fa3e2984a2d86faf6c1825d6db56329b00ce25ba1a2eb5b64b7 allthemepacks.zip 210954
+MD5 ba0daacd91a48e4998e8de8b9c66daf9 tvbrowser-2.5.3-src.zip 9290454
+RMD160 9138e33dd1fbe887353a8ac5eecd7e9cb7b1fd0f tvbrowser-2.5.3-src.zip 9290454
+SHA256 e3dbabedb9e16b73f11828f5b5654034055638387be7f1b89db1b8b00d7bcea8 tvbrowser-2.5.3-src.zip 9290454
diff --git a/media-tv/tvbrowser/files/tvbrowser-2.5.3_buildxml.patch b/media-tv/tvbrowser/files/tvbrowser-2.5.3_buildxml.patch
new file mode 100644
index 000000000000..e1ab44087168
--- /dev/null
+++ b/media-tv/tvbrowser/files/tvbrowser-2.5.3_buildxml.patch
@@ -0,0 +1,123 @@
+diff -ru tvbrowser-2.5.3-orig/build.xml tvbrowser-2.5.3/build.xml
+--- tvbrowser-2.5.3-orig/build.xml	2007-07-30 13:32:29.368999217 +0200
++++ tvbrowser-2.5.3/build.xml	2007-07-30 13:36:32.393941090 +0200
+@@ -99,15 +99,6 @@
+ |

+ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->

+ 

+-  <!-- Creates an .app file for Mac OS X  -->

+-  <taskdef name="jarbundler"

+-           classpath="deployment/macosx/jarbundler-1.4.jar"

+-           classname="com.loomcom.ant.tasks.jarbundler.JarBundler"/>

+-  

+-  <!-- Creates a Windows Executable using launch4j (http://launch4j.sf.net) -->

+-	<taskdef name="launch4j"

+-	    classname="net.sf.launch4j.ant.Launch4jTask"

+-	    classpath="${deployment.dir}/win/launch4j/launch4j.jar:${deployment.dir}/win/launch4j/lib/xstream.jar" />

+   <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

+ |

+ |  Display all targets

+@@ -292,39 +283,18 @@
+     <mkdir dir="${tvbrowser-default.runtime.dir}"/>

+ 	<mkdir dir="${tvbrowser-default.runtime.dir}/plugins"/>

+ 

+-    <!-- Extract the libraries for the tvbrowser.jar into the temp.dir -->

+-    <mkdir dir="${unpacked.dir}/skinlf.jar"/>

+-    <unjar src="${lib.dir}/skinlf.jar" dest="${unpacked.dir}/skinlf.jar"/>

+-    <unjar src="${lib.dir}/bsh-2.0b4.jar" dest="${unpacked.dir}/bsh-2.0b4.jar"/>

+-    <unjar src="${lib.dir}/forms-1.1.0.jar" dest="${unpacked.dir}/forms-1.1.0.jar"/>

+-    <unjar src="${lib.dir}/looks-2.1.4.jar" dest="${unpacked.dir}/looks-2.1.4.jar"/>

+-    <unjar src="${lib.dir}/l2fprod-common-tasks.jar" dest="${unpacked.dir}/l2fprod-common-tasks.jar"/>

+-    <unjar src="${lib.dir}/jRegistryKey.jar" dest="${unpacked.dir}/jRegistryKey.jar" /> 	 

+-    <unjar src="${lib.dir}/TVAnytimeAPI.jar" dest="${unpacked.dir}/TVAnytimeAPI.jar" /> 	 

+-    <unjar src="${lib.dir}/commons-compress-20050911.jar" dest="${unpacked.dir}/commons-compress-20050911.jar" />

+-    <unjar src="${lib.dir}/gdata-calendar-1.0.jar" dest="${unpacked.dir}/gdata-calendar-1.0.jar" /> 	 

+-    <unjar src="${lib.dir}/gdata-client-1.0.jar" dest="${unpacked.dir}/gdata-client-1.0.jar" /> 	   	

+-    <unjar src="${lib.dir}/jcom.jar" dest="${unpacked.dir}/jcom.jar" />

+-

+     <!-- Pack the tvbrowser.jar -->

+     <jar jarfile="${tvbrowser-default.runtime.dir}/tvbrowser.jar"

+-         compress="false"

+-         index="true">

++         compress="false">

+       <manifest>

+         <attribute name="Main-Class" value="tvbrowser.TVBrowser"/>

++	<attribute name="Class-Path" value="file:///usr/share/jgoodies-looks-2.0/lib/looks.jar file:///usr/share/skinlf/lib/skinlf.jar file:///usr/share/bsh/lib/bsh.jar file:///usr/share/jgoodies-forms/lib/forms.jar file:///usr/share/l2fprod-common/lib/l2fprod-common-tasks.jar file:///usr/share/commons-net/lib/commons-net.jar"/>

+       </manifest>

+       <fileset dir="${classes.dir}" includes="tvbrowser/**"/>

+       <fileset dir="${classes.dir}" includes="devplugin/**"/>

+       <fileset dir="${classes.dir}" includes="tvdataservice/**"/>

+       <fileset dir="${classes.dir}" includes="util/**"/>

+       <fileset dir="${classes.dir}" includes="com/**"/>

+-      <fileset dir="${unpacked.dir}/skinlf.jar" includes="com/**"/>

+-   	  <fileset dir="${unpacked.dir}/skinlf.jar" includes="org/**"/>

+-      <fileset dir="${unpacked.dir}/bsh-2.0b4.jar" includes="bsh/**"/>

+-      <fileset dir="${unpacked.dir}/forms-1.1.0.jar" includes="com/**"/>

+-      <fileset dir="${unpacked.dir}/looks-2.1.4.jar" includes="com/**"/>

+-      <fileset dir="${unpacked.dir}/l2fprod-common-tasks.jar" includes="com/**"/>

+-      <fileset dir="${unpacked.dir}/jRegistryKey.jar" includes="ca/**" />

+     </jar>

+ 

+     <!-- Pack the plugin jars -->

+@@ -350,13 +320,6 @@
+          compress="false">

+       <fileset dir="${classes.dir}" includes="newsplugin/**"/>

+     </jar>

+-    <jar jarfile="${tvbrowser-default.runtime.dir}/plugins/CalendarExportPlugin.jar"

+-         compress="false">

+-        <fileset dir="${classes.dir}" includes="calendarexportplugin/**"/>

+-        <fileset dir="${unpacked.dir}/gdata-calendar-1.0.jar" includes="**" /> 	 

+-        <fileset dir="${unpacked.dir}/gdata-client-1.0.jar" includes="**" /> 	 

+-        <fileset dir="${unpacked.dir}/jcom.jar" includes="**" />

+-    </jar>

+     <jar jarfile="${tvbrowser-default.runtime.dir}/plugins/ClipboardPlugin.jar"

+          compress="false">

+       <fileset dir="${classes.dir}" includes="clipboardplugin/**"/>

+@@ -454,10 +417,6 @@
+ 	    <fileset dir="images/themes" includes="**/*"/>

+     </copy>

+ 

+-    <!-- Extract the libraries for the tvbrowser.jar into the temp.dir -->

+-    <mkdir dir="${unpacked.dir}/commons-net.jar"/>

+-    <unjar src="${lib.dir}/commons-net.jar" dest="${unpacked.dir}/commons-net.jar"/>

+-

+   </target>

+ 

+ 

+@@ -555,11 +514,6 @@
+     <mkdir dir="${tvdatatools.runtime.dir}"/>

+     <mkdir dir="${tvdatatools.runtime.dir}/prepared"/>

+ 

+-    <!-- Extract the libraries for the jars into the temp.dir -->

+-    <mkdir dir="${unpacked.dir}/commons-net.jar"/>

+-    <unjar src="${lib.dir}/commons-net.jar" dest="${unpacked.dir}/commons-net.jar"/>

+-    <unjar src="${lib.dir}/looks-2.1.4.jar" dest="${unpacked.dir}/looks-2.1.4.jar"/>

+-

+     <!-- Pack the MirrorUpdater.jar -->

+     <jar jarfile="${tvdatatools.runtime.dir}/MirrorUpdater.jar"

+          compress="false"

+@@ -578,8 +532,6 @@
+       <fileset dir="${classes.dir}" includes="tvbrowser/core/Settings*"/>

+       <fileset dir="${classes.dir}" includes="tvbrowser/core/plugin/DefaultSettings*"/>-->

+       <fileset dir="${classes.dir}" includes="tvbrowser/**"/>

+-      <fileset dir="${unpacked.dir}/commons-net.jar" includes="org/**"/>

+-      <fileset dir="${unpacked.dir}/looks-2.1.4.jar" includes="com/**"/>

+     </jar>

+ 

+     <!-- Pack the PrimaryDataManager.jar -->

+@@ -597,7 +549,6 @@
+       <fileset dir="${classes.dir}" includes="devplugin/**"/>

+       <fileset dir="${classes.dir}" includes="util/**"/>

+       <fileset dir="${classes.dir}" includes="tvbrowser/**"/>

+-      <fileset dir="${unpacked.dir}/looks-2.1.4.jar" includes="com/**"/>

+     </jar>

+ 

+     <!-- Pack the PDSRunner.jar -->

+@@ -615,7 +566,6 @@
+       <fileset dir="${classes.dir}" includes="devplugin/**"/>

+       <fileset dir="${classes.dir}" includes="util/**"/>

+       <fileset dir="${classes.dir}" includes="tvbrowser/**"/>

+-      <fileset dir="${unpacked.dir}/looks-2.1.4.jar" includes="com/**"/>

+     </jar>

+ 

+     <!-- Copy the file(s) -->

diff --git a/media-tv/tvbrowser/files/tvbrowser-2.5.3_noWin32.patch b/media-tv/tvbrowser/files/tvbrowser-2.5.3_noWin32.patch
new file mode 100644
index 000000000000..e67b8d614cdf
--- /dev/null
+++ b/media-tv/tvbrowser/files/tvbrowser-2.5.3_noWin32.patch
@@ -0,0 +1,118 @@
+diff -ru tvbrowser-2.5.3-orig/src/tvbrowser/TVBrowser.java tvbrowser-2.5.3/src/tvbrowser/TVBrowser.java
+--- tvbrowser-2.5.3-orig/src/tvbrowser/TVBrowser.java	2007-07-30 13:26:54.836657357 +0200
++++ tvbrowser-2.5.3/src/tvbrowser/TVBrowser.java	2007-07-30 13:28:39.845848269 +0200
+@@ -88,10 +88,6 @@
+ import util.ui.UiUtilities;

+ import util.ui.textcomponentpopup.TextComponentPopupEventQueue;

+ 

+-import ca.beq.util.win32.registry.RegistryKey;

+-import ca.beq.util.win32.registry.RegistryValue;

+-import ca.beq.util.win32.registry.RootKey;

+-

+ import com.jgoodies.looks.LookUtils;

+ import com.jgoodies.looks.Options;

+ import com.l2fprod.gui.plaf.skin.SkinLookAndFeel;

+@@ -397,53 +393,6 @@
+             }.start();

+             ChannelList.completeChannelLoading();

+             

+-            if(Launch.isOsWindowsNtBranch()) {

+-              try {

+-                RegistryKey desktopSettings = new RegistryKey(RootKey.HKEY_CURRENT_USER, "Control Panel\\Desktop");

+-                RegistryValue autoEnd = desktopSettings.getValue("AutoEndTasks");

+-              

+-                if(autoEnd.getData().equals("1")) {

+-                  RegistryValue killWait = desktopSettings.getValue("WaitToKillAppTimeout");

+-              

+-                  int i = Integer.parseInt(killWait.getData().toString());

+-              

+-                  if(i < 5000) {

+-                    JOptionPane pane = new JOptionPane();

+-                    

+-                    String cancel = mLocalizer.msg("registryCancel","Close TV-Browser");

+-                    String dontDoIt = mLocalizer.msg("registryJumpOver","Not this time");

+-                    

+-                    pane.setOptions(new String[] {Localizer.getLocalization(Localizer.I18N_OK),dontDoIt,cancel});

+-                    pane.setOptionType(JOptionPane.YES_NO_CANCEL_OPTION);

+-                    pane.setMessageType(JOptionPane.WARNING_MESSAGE);

+-                    pane.setMessage(mLocalizer.msg("registryWarning","The fast shutdown of Windows is activated.\nThe timeout to wait for before Windows is closing an application is too short,\nto give TV-Browser enough time to save all settings.\n\nThe setting hasn't the default value. It was changed by a tool or by you.\nTV-Browser will now try to change the timeout.\n\nIf you don't want to change this timeout select 'Not this time' or 'Close TV-Browser'."));

+-                    

+-                    pane.setInitialValue(mLocalizer.msg("registryCancel","Close TV-Browser"));

+-                    

+-                    JDialog d = pane.createDialog(UiUtilities.getLastModalChildOf(mainFrame), UIManager.getString("OptionPane.messageDialogTitle"));

+-                    d.setModal(true);

+-                    UiUtilities.centerAndShow(d);

+-                    

+-                    if(pane.getValue() == null || pane.getValue().equals(cancel)) {

+-                      mainFrame.quit();

+-                    }

+-                    else if(!pane.getValue().equals(dontDoIt)) {

+-                      try {

+-                        killWait.setData("5000");

+-                        desktopSettings.setValue(killWait);

+-                        JOptionPane.showMessageDialog(UiUtilities.getLastModalChildOf(mainFrame),

+-                            mLocalizer.msg("registryChanged","The timeout was changed successfully.\nPlease reboot Windows!"));

+-                      }catch(Exception registySetting) {

+-                        JOptionPane.showMessageDialog(UiUtilities.getLastModalChildOf(mainFrame),

+-                            mLocalizer.msg("registryNotChanged","<html>The Registry value couldn't be changed. Maybe you haven't the right to do it.<br>If it is so contact you Administrator and let him do it for you.<br><br><b><Attention:/b> The following description is for experts. If you change or delete the wrong value in the Registry you could destroy your Windows installation.<br><br>To get no warning on TV-Browser start the Registry value <b>WaitToKillAppTimeout</b> in the Registry path<br><b>HKEY_CURRENT_USER\\Control Panel\\Desktop</b> have to be at least <b>5000</b> or the value for <b>AutoEndTasks</b> in the same path have to be <b>0</b>.</html>"),

+-                            Localizer.getLocalization(Localizer.I18N_ERROR),JOptionPane.ERROR_MESSAGE);

+-                      }

+-                    }

+-                  }

+-                }

+-              }catch(Throwable registry) {}

+-            }

+-            

+             // check if user should select picture settings

+             if(currentVersion != null && currentVersion.compareTo(new Version(2,22))<0) {

+               TvBrowserPictureSettingsUpdateDialog.createAndShow(mainFrame);

+Nur in tvbrowser-2.5.3/src/tvbrowser: TVBrowser.java.orig.
+diff -ru tvbrowser-2.5.3-orig/src/tvbrowser/ui/settings/StartupSettingsTab.java tvbrowser-2.5.3/src/tvbrowser/ui/settings/StartupSettingsTab.java
+--- tvbrowser-2.5.3-orig/src/tvbrowser/ui/settings/StartupSettingsTab.java	2007-07-30 13:26:54.836657357 +0200
++++ tvbrowser-2.5.3/src/tvbrowser/ui/settings/StartupSettingsTab.java	2007-07-30 13:27:38.340420377 +0200
+@@ -39,9 +39,6 @@
+ import util.ui.Localizer;

+ import util.ui.UiUtilities;

+ 

+-import ca.beq.util.win32.registry.RegistryKey;

+-import ca.beq.util.win32.registry.RootKey;

+-

+ import com.jgoodies.forms.factories.Borders;

+ import com.jgoodies.forms.factories.DefaultComponentFactory;

+ import com.jgoodies.forms.layout.CellConstraints;

+@@ -92,35 +89,6 @@
+         .getBoolean());

+     mSettingsPn.add(mShowSplashChB, cc.xy(2, 5));

+ 

+-    if (System.getProperty("os.name").toLowerCase().startsWith("windows") && !TVBrowser.isTransportable()) {

+-      layout.appendRow(new RowSpec("3dlu"));

+-      layout.appendRow(new RowSpec("pref"));

+-      

+-      try {

+-        RegistryKey shellFolders = new RegistryKey(RootKey.HKEY_CURRENT_USER, "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Shell Folders");

+-        String path = shellFolders.getValue("Startup").getData().toString();

+-        

+-        if(path == null || path.length() < 1 || !(new File(path)).isDirectory())

+-          throw new Exception();

+-        

+-        mLinkFile = new File(path,"TV-Browser.url");        

+-        mLinkUrl = new UrlFile(mLinkFile);

+-          

+-        if(mLinkFile.exists())

+-          try {

+-            if (!mLinkUrl.getUrl().equals((new File("tvbrowser.exe")).getAbsoluteFile().toURL()))

+-              createLink(mLinkUrl);

+-          }catch(Exception linkException) {

+-            mLinkFile.delete();

+-          }

+-

+-        mAutostartWithWindows = new JCheckBox(mLocalizer.msg("autostart","Start TV-Browser with Windows"),

+-            mLinkFile.isFile());

+-        

+-        mSettingsPn.add(mAutostartWithWindows, cc.xy(2, 7));

+-      } catch (Throwable e) {}

+-    }

+-

+     return mSettingsPn;

+   }

+ 

diff --git a/media-tv/tvbrowser/tvbrowser-2.5.3.ebuild b/media-tv/tvbrowser/tvbrowser-2.5.3.ebuild
new file mode 100644
index 000000000000..eb57a52617ec
--- /dev/null
+++ b/media-tv/tvbrowser/tvbrowser-2.5.3.ebuild
@@ -0,0 +1,149 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-tv/tvbrowser/tvbrowser-2.5.3.ebuild,v 1.1 2007/07/30 12:52:29 zzam Exp $
+
+WANT_AUTOCONF="latest"
+WANT_AUTOMAKE="latest"
+JAVA_PKG_IUSE="doc source"
+
+inherit eutils java-pkg-2 java-ant-2 autotools flag-o-matic
+
+DESCRIPTION="Themeable and easy to use TV Guide - written in Java"
+HOMEPAGE="http://www.tvbrowser.org/"
+SRC_URI="mirror://sourceforge/${PN}/${P}-src.zip
+themes? ( http://www.tvbrowser.org/downloads/themepacks/allthemepacks.zip )"
+
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+
+# missing dependencies commons-compress, TVAnytimeAPI, jRegistryKey , gdata-calendar, gdata-client and jcom
+
+RDEPEND="
+	>=virtual/jre-1.5
+	x11-libs/libXt
+	x11-libs/libSM
+	x11-libs/libICE
+	x11-libs/libXext
+	x11-libs/libXtst
+	x11-libs/libX11
+	x11-libs/libXau
+	x11-libs/libXdmcp
+	dev-java/junit
+	dev-java/commons-net
+	>=dev-java/jgoodies-forms-1.0.7
+	>=dev-java/jgoodies-looks-2.0
+	>=dev-java/bsh-2.0_beta1
+	>=dev-java/skinlf-6.7
+	dev-java/l2fprod-common
+	>=dev-java/poi-2.5.1
+	>=dev-java/xerces-2.6.2"
+
+DEPEND=">=virtual/jdk-1.5
+	${RDEPEND}
+	app-arch/unzip"
+
+LICENSE="GPL-2"
+
+IUSE="themes"
+
+src_unpack() {
+	unpack ${P}-src.zip
+
+	cd "${S}"
+	epatch "${FILESDIR}/tvbrowser-2.5-makefiles.patch"
+	epatch "${FILESDIR}/${P}_noWin32.patch"
+	epatch "${FILESDIR}/${P}_buildxml.patch"
+
+	#fix bug #170363
+	epatch "${FILESDIR}/tvbrowser-2.5_Localizer.patch"
+
+	# missing commons-compress, gdata-calendar, gdata-client
+	rm -r "${S}/src/calendarexportplugin"
+	rm -r "${S}/src/bbcbackstagedataservice"
+
+	#we don't need this stuff
+	rm -r "${S}/deployment/win"
+	rm -r "${S}/deployment/macosx"
+
+	local J_ARCH
+	case "${ARCH}" in
+		x86)	J_ARCH=i386 ;;
+		amd64)	J_ARCH=amd64 ;;
+		*) die "not supported arch for this ebuild" ;;
+	esac
+
+	sed -i "${S}/deployment/x11/src/Makefile.am" \
+		-e "s-/lib/i386/-/lib/${J_ARCH}/-"
+
+	cd "${S}/tvdatakit/workspace/lib"
+	rm -v *.jar || die
+
+	java-pkg_jar-from poi
+	java-pkg_jar-from xerces-2
+
+	cd "${S}/lib"
+	rm -v *.jar || die
+
+	java-pkg_jar-from junit
+	java-pkg_jar-from commons-net
+	java-pkg_jar-from jgoodies-forms forms.jar forms-1.0.7.jar
+	java-pkg_jar-from jgoodies-looks-2.0 looks.jar looks-2.0.4.jar
+	java-pkg_jar-from bsh bsh.jar bsh-2.0b1.jar
+	java-pkg_jar-from skinlf
+	java-pkg_jar-from l2fprod-common l2fprod-common-tasks.jar
+
+	# Fails to create javadocs without this
+	mkdir "${S}/public"
+
+	#fix bug #170364
+	cd "${S}/deployment/x11"
+	chmod u+x configure
+	rm src/libDesktopIndicator.so || die
+
+	# converting to unix line-endings
+	edos2unix missing depcomp
+
+	eautoreconf
+}
+
+src_compile() {
+	eant runtime-linux $(use_doc public-doc)
+
+	# second part: DesktopIndicator
+	cd "${S}/deployment/x11"
+	append-flags -fPIC
+	econf || die "econf failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	use source && java-pkg_dosrc src/*
+	use doc && java-pkg_dojavadoc doc
+	cd runtime/${PN}_linux || die
+
+	java-pkg_dojar ${PN}.jar
+
+	local todir="${JAVA_PKG_SHAREPATH}"
+
+	cp -a imgs "${D}/${todir}" || die
+	cp -a icons "${D}/${todir}" || die
+	cp -a plugins "${D}/${todir}" || die
+	cp linux.properties "${D}/${todir}" || die
+
+	insinto "${todir}/themepacks"
+	doins themepacks/themepack.zip || die
+
+	if use themes; then
+		cd "${D}/${todir}/themepacks"
+		unpack allthemepacks.zip
+	fi
+
+	java-pkg_doso "${S}/deployment/x11/src/libDesktopIndicator.so"
+
+	java-pkg_dolauncher "tvbrowser" \
+		--jar ${todir}/lib/tvbrowser.jar \
+		--pwd ${todir} \
+		--java_args " -Dpropertiesfile=${todir}/linux.properties"
+
+	make_desktop_entry ${PN} "TV Browser" /usr/share/tvbrowser/imgs/tvbrowser128.png
+}