Proxy commit for Mirko Günther: Version bumped. Cleanup of bundled jars. Register lib instead of manually tweaking the libpath. Bug #170947.

Package-Manager: portage-2.1.2.2

6 files changed, 437 insertions, 8 deletions

diff --git a/media-tv/tvbrowser/ChangeLog b/media-tv/tvbrowser/ChangeLog
index a1b8ece11557..6982e601da7a 100644
--- a/media-tv/tvbrowser/ChangeLog
+++ b/media-tv/tvbrowser/ChangeLog
@@ -1,6 +1,14 @@
 # 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.11 2007/03/11 16:15:16 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/tvbrowser/ChangeLog,v 1.12 2007/03/27 13:46:50 zzam Exp $
+
+*tvbrowser-2.5.2 (27 Mar 2007)
+
+  27 Mar 2007; Matthias Schwarzott <zzam@gentoo.org>
+  +files/tvbrowser-2.5.2_buildxml.patch,
+  +files/tvbrowser-2.5.2_noWin32.patch, +tvbrowser-2.5.2.ebuild:
+  Proxy commit for Mirko Günther: Version bumped. Cleanup of bundled jars.
+  Register lib instead of manually tweaking the libpath. Bug #170947.
 
 *tvbrowser-2.5-r1 (11 Mar 2007)
 
diff --git a/media-tv/tvbrowser/Manifest b/media-tv/tvbrowser/Manifest
index d6d780c2d5db..1fe8939a4ebe 100644
--- a/media-tv/tvbrowser/Manifest
+++ b/media-tv/tvbrowser/Manifest
@@ -13,6 +13,14 @@ AUX tvbrowser-2.5-makefiles.patch 2244 RMD160 e50f4bcd3342bbba1dee17e64b18fc6aab
 MD5 52fe69030cad5afb748a9ffc01cf42a3 files/tvbrowser-2.5-makefiles.patch 2244
 RMD160 e50f4bcd3342bbba1dee17e64b18fc6aab5a012d files/tvbrowser-2.5-makefiles.patch 2244
 SHA256 5ceafd294ebeff4bc2356d2db6abd6b74093fc53987842ddba9bc70eb45c613d files/tvbrowser-2.5-makefiles.patch 2244
+AUX tvbrowser-2.5.2_buildxml.patch 6517 RMD160 4f5e14f9ee08a60aada0e708537e127329495086 SHA1 5ab65155344eb8c65aa7112c0c0b7e2de922ef20 SHA256 c78eb3e4d3965e2a5dcd9ae20a5504c4c2764aabba8ed97a0166ac428cc6eb72
+MD5 9c30c660a0b8838097c728c4057a3468 files/tvbrowser-2.5.2_buildxml.patch 6517
+RMD160 4f5e14f9ee08a60aada0e708537e127329495086 files/tvbrowser-2.5.2_buildxml.patch 6517
+SHA256 c78eb3e4d3965e2a5dcd9ae20a5504c4c2764aabba8ed97a0166ac428cc6eb72 files/tvbrowser-2.5.2_buildxml.patch 6517
+AUX tvbrowser-2.5.2_noWin32.patch 6618 RMD160 ee9d50ca3906a01f6249ebe52260d3046cee767b SHA1 1c3ca6aab475780b1caa97431044913bc124bdab SHA256 6149c7b93018a29cf7e1a3d6181c81a4e6bb21d52746ee22a0e5479a6eb8976b
+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_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
@@ -29,6 +37,7 @@ DIST allthemepacks.zip 210954 RMD160 6d456534bd504c98eb57ff39876ee2c2ffabee70 SH
 DIST tvbrowser-2.1-src.zip 5928402 RMD160 5918840feec2d09fabaa093de744eed4788756f9 SHA1 29c38332d4e44b914bd1e41a1d3ddc1c2f01e7f2 SHA256 8bfec6bd7b7336a6ca539135ec412f968c19ddca7ae13ded9d371c32360467dd
 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
 EBUILD tvbrowser-2.1.ebuild 3050 RMD160 72a1f3a74350c088f4a2ad8046e562edaac804cf SHA1 dd184eb32d773a29539a669cf714ec66f00d3037 SHA256 67e1de854ac7b66c3c0416bd1e0350483becb3f7bb3c23c2abda335172214d68
 MD5 5fdffbb64f48d7399443706dbd6ec420 tvbrowser-2.1.ebuild 3050
 RMD160 72a1f3a74350c088f4a2ad8046e562edaac804cf tvbrowser-2.1.ebuild 3050
@@ -41,14 +50,18 @@ EBUILD tvbrowser-2.5-r1.ebuild 3458 RMD160 878d3d0b015711d358e5af61fed86a1fd87f7
 MD5 ef7313a5be60b01fd2ddffbc102c4081 tvbrowser-2.5-r1.ebuild 3458
 RMD160 878d3d0b015711d358e5af61fed86a1fd87f7777 tvbrowser-2.5-r1.ebuild 3458
 SHA256 a0bbf99459751560f42b3d556a05f67669ca0c10adf72859b5446a4b7689c281 tvbrowser-2.5-r1.ebuild 3458
+EBUILD tvbrowser-2.5.2.ebuild 3672 RMD160 44966ef30377164fb36462b08067af05d1e16cfc SHA1 899e6fd88d2ee1a0c3d87f09d1d9ae65d8cf4ba7 SHA256 8e2f9d9bb5b0f28b2dcaf22c5711b0d24c32143fefc5a0dff6853ba163279be7
+MD5 faf7a90e7da309e8964b61a1f585a2cb tvbrowser-2.5.2.ebuild 3672
+RMD160 44966ef30377164fb36462b08067af05d1e16cfc tvbrowser-2.5.2.ebuild 3672
+SHA256 8e2f9d9bb5b0f28b2dcaf22c5711b0d24c32143fefc5a0dff6853ba163279be7 tvbrowser-2.5.2.ebuild 3672
 EBUILD tvbrowser-2.5.ebuild 3269 RMD160 7f99c310e0eddbc87b938c1ea2dc8ce9a8ecf442 SHA1 31a6b72048a5a9af4aec04f39a466a70abe3e72b SHA256 ed13f112b24db4e19c7940fd6d7ca08a02316c96d04a9309792190640fc2753e
 MD5 be7b8235f127b19374bb91e024c5dd8b tvbrowser-2.5.ebuild 3269
 RMD160 7f99c310e0eddbc87b938c1ea2dc8ce9a8ecf442 tvbrowser-2.5.ebuild 3269
 SHA256 ed13f112b24db4e19c7940fd6d7ca08a02316c96d04a9309792190640fc2753e tvbrowser-2.5.ebuild 3269
-MISC ChangeLog 2524 RMD160 b17c9a46b36f7ab2c4660aeec436bd467efbfa31 SHA1 4cc49230c21ec802390275c56e0515c5dbec7bb4 SHA256 dd1d89214e8d4107f352bf6079ec9d3e15584143750c9b0cd77dc9e3caf3e3e9
-MD5 5ff941099697e2d82e88c8083cfedfbb ChangeLog 2524
-RMD160 b17c9a46b36f7ab2c4660aeec436bd467efbfa31 ChangeLog 2524
-SHA256 dd1d89214e8d4107f352bf6079ec9d3e15584143750c9b0cd77dc9e3caf3e3e9 ChangeLog 2524
+MISC ChangeLog 2862 RMD160 941f1cff2230727ccc6893099955e0b69c48debe SHA1 6ee7861941c1990eb2cf6bf35256b2768d15cfad SHA256 c14c1e8af8f1c5d134b039f8a287624052c41c5f3e1cc084b10c09eb89711d64
+MD5 dbe45cf85983ae20c9cb7542e4c7ca3f ChangeLog 2862
+RMD160 941f1cff2230727ccc6893099955e0b69c48debe ChangeLog 2862
+SHA256 c14c1e8af8f1c5d134b039f8a287624052c41c5f3e1cc084b10c09eb89711d64 ChangeLog 2862
 MISC metadata.xml 395 RMD160 a22f8ae33da65ccc0ff251b07c15adafd6c1e615 SHA1 5589ca30d70f5334e2003b17f7594d4a283a280b SHA256 d51789b8a015ccbfd70a9b6ba7ca2e8e5022d9d67e008a96f7920fe93f16ff88
 MD5 4c44116c92d8282ca90875480b20a362 metadata.xml 395
 RMD160 a22f8ae33da65ccc0ff251b07c15adafd6c1e615 metadata.xml 395
@@ -65,10 +78,13 @@ SHA256 cdf4ac7a77d4ddaef54024266241e8731fcbd27348b4d055af262dbe2e992152 files/di
 MD5 76bc03e5e93fb8cad40e4bad9887764b files/digest-tvbrowser-2.5-r1 479
 RMD160 705415ee3ec009d874f6509a93dc04b4d9c90812 files/digest-tvbrowser-2.5-r1 479
 SHA256 cdf4ac7a77d4ddaef54024266241e8731fcbd27348b4d055af262dbe2e992152 files/digest-tvbrowser-2.5-r1 479
+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
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.3 (GNU/Linux)
 
-iD8DBQFF9Csct2vP6XvVdOcRAmjgAJ4tE6vMcZoG8uvq1CXPZkDSf2h1AgCfe50J
-CZxoiqs+8FV2ig9cfX1702A=
-=PzhZ
+iD8DBQFGCSBZt2vP6XvVdOcRAiWBAJ9Aijv/XiatBa7Rcxbm93zVMkKTzACgvo17
+ZZymc0pmdfU/cV7Dp/HWRqQ=
+=8NxV
 -----END PGP SIGNATURE-----
diff --git a/media-tv/tvbrowser/files/digest-tvbrowser-2.5.2 b/media-tv/tvbrowser/files/digest-tvbrowser-2.5.2
new file mode 100644
index 000000000000..e13e4f92c604
--- /dev/null
+++ b/media-tv/tvbrowser/files/digest-tvbrowser-2.5.2
@@ -0,0 +1,6 @@
+MD5 672a2f53c54511ced3f796c65a9183f7 allthemepacks.zip 210954
+RMD160 6d456534bd504c98eb57ff39876ee2c2ffabee70 allthemepacks.zip 210954
+SHA256 602d229f734c2fa3e2984a2d86faf6c1825d6db56329b00ce25ba1a2eb5b64b7 allthemepacks.zip 210954
+MD5 a44a647c34a2428bcae83d165c3af399 tvbrowser-2.5.2-src.zip 9237691
+RMD160 6b0b219535606897bfc8b15858e3cc8eb153fe4a tvbrowser-2.5.2-src.zip 9237691
+SHA256 7355ed9887fc3ea833c9f8296a513eb864605f85646fbb4bb9a83be128c24d8e tvbrowser-2.5.2-src.zip 9237691
diff --git a/media-tv/tvbrowser/files/tvbrowser-2.5.2_buildxml.patch b/media-tv/tvbrowser/files/tvbrowser-2.5.2_buildxml.patch
new file mode 100644
index 000000000000..38e8ed12bd09
--- /dev/null
+++ b/media-tv/tvbrowser/files/tvbrowser-2.5.2_buildxml.patch
@@ -0,0 +1,123 @@
+diff -uwNr tvbrowser-2.5.2_orig/build.xml tvbrowser-2.5.2_src/build.xml
+--- tvbrowser-2.5.2_orig/build.xml	2007-03-21 23:02:14.000000000 +0100
++++ tvbrowser-2.5.2_src/build.xml	2007-03-27 12:12:08.000000000 +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.0b1.jar" dest="${unpacked.dir}/bsh-2.0b1.jar"/>

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

+-    <unjar src="${lib.dir}/looks-2.0.4.jar" dest="${unpacked.dir}/looks-2.0.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.0b1.jar" includes="bsh/**"/>

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

+-      <fileset dir="${unpacked.dir}/looks-2.0.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.0.4.jar" dest="${unpacked.dir}/looks-2.0.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.0.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.0.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.0.4.jar" includes="com/**"/>

+     </jar>

+ 

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

diff --git a/media-tv/tvbrowser/files/tvbrowser-2.5.2_noWin32.patch b/media-tv/tvbrowser/files/tvbrowser-2.5.2_noWin32.patch
new file mode 100644
index 000000000000..61a703aa460f
--- /dev/null
+++ b/media-tv/tvbrowser/files/tvbrowser-2.5.2_noWin32.patch
@@ -0,0 +1,116 @@
+diff -uwNr tvbrowser-2.5.2_orig/src/tvbrowser/TVBrowser.java tvbrowser-2.5.2_src/src/tvbrowser/TVBrowser.java
+--- tvbrowser-2.5.2_orig/src/tvbrowser/TVBrowser.java	2007-03-22 23:21:48.000000000 +0100
++++ tvbrowser-2.5.2_src/src/tvbrowser/TVBrowser.java	2007-03-25 15:52:34.000000000 +0200
+@@ -85,10 +85,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;

+@@ -383,52 +379,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");

+-                    

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

+-                    pane.setOptionType(JOptionPane.YES_NO_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 shot,\nto let 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."));

+-                    

+-                    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 {

+-                      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);

+diff -uwNr tvbrowser-2.5.2_orig/src/tvbrowser/ui/settings/StartupSettingsTab.java tvbrowser-2.5.2_src/src/tvbrowser/ui/settings/StartupSettingsTab.java
+--- tvbrowser-2.5.2_orig/src/tvbrowser/ui/settings/StartupSettingsTab.java	2007-03-21 17:24:16.000000000 +0100
++++ tvbrowser-2.5.2_src/src/tvbrowser/ui/settings/StartupSettingsTab.java	2007-03-25 15:41:01.000000000 +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.2.ebuild b/media-tv/tvbrowser/tvbrowser-2.5.2.ebuild
new file mode 100644
index 000000000000..4f6a02cac8d7
--- /dev/null
+++ b/media-tv/tvbrowser/tvbrowser-2.5.2.ebuild
@@ -0,0 +1,160 @@
+# 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.2.ebuild,v 1.1 2007/03/27 13:46:50 zzam Exp $
+
+WANT_AUTOCONF="latest"
+WANT_AUTOMAKE="latest"
+
+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="|| ( ( x11-libs/libXt
+			x11-libs/libSM
+			x11-libs/libICE
+			x11-libs/libXext
+			x11-libs/libXtst
+			x11-libs/libX11
+			x11-libs/libXau
+			x11-libs/libXdmcp
+		)
+		virtual/x11
+	)
+	>=virtual/jre-1.5
+	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
+	dev-java/l2fprod-common
+	>=dev-java/poi-2.5.1
+	>=dev-java/xerces-2.6.2"
+
+DEPEND=">=virtual/jdk-1.5
+	${RDEPEND}
+	>=dev-java/ant-core-1.5.4
+	app-arch/unzip
+	source? ( app-arch/zip )"
+
+LICENSE="GPL-2"
+
+IUSE="doc themes source"
+
+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 *.jar
+
+	java-pkg_jar-from poi
+	java-pkg_jar-from xerces-2
+
+	cd ${S}/lib
+	rm *.jar
+
+	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
+
+	#fix bug #170364
+	cd ${S}/deployment/x11
+	chmod u+x configure
+	rm src/libDesktopIndicator.so
+
+	# converting to unix line-endings
+	edos2unix missing depcomp
+
+	eautoreconf
+}
+
+src_compile() {
+	local antflags="runtime-linux"
+	use doc && antflags="${antflags} public-doc"
+	cd ${S}
+	mkdir public
+	eant ${antflags}
+
+	# 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_dohtml -r doc/*
+	cd runtime/${PN}_linux
+
+	java-pkg_dojar ${PN}.jar
+
+	local todir="/usr/share/${PN}"
+	if [ ${SLOT}q != "0q" ] ; then
+		todir="${todir}-${SLOT}"
+	fi
+
+	cp -a imgs ${D}/${todir}
+	cp -a icons ${D}/${todir}
+	cp -a plugins ${D}/${todir}
+	cp linux.properties ${D}/${todir}
+
+	insinto "/usr/share/${PN}/themepacks"
+	doins themepacks/themepack.zip
+
+	if use themes; then
+		cd "${D}/usr/share/${PN}/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"
+}
+
+pkg_postinst() {
+	elog
+	elog "If you want Systray you have to use a jre >= 1.5 !"
+	elog
+}