Cleanup.

(Portage version: 2.2_rc50/cvs/Linux i686)

20 files changed, 18 insertions, 1974 deletions

diff --git a/media-tv/tvbrowser/ChangeLog b/media-tv/tvbrowser/ChangeLog
index 38679e6330b2..d7c09e485473 100644
--- a/media-tv/tvbrowser/ChangeLog
+++ b/media-tv/tvbrowser/ChangeLog
@@ -1,6 +1,21 @@
 # ChangeLog for media-tv/tvbrowser
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/tvbrowser/ChangeLog,v 1.30 2009/11/16 10:05:00 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/tvbrowser/ChangeLog,v 1.31 2009/11/16 10:24:48 zzam Exp $
+
+  16 Nov 2009; Matthias Schwarzott <zzam@gentoo.org>
+  -files/tvbrowser-2.1-makefiles.patch, -tvbrowser-2.2.1.ebuild,
+  -files/tvbrowser-2.2.1-makefiles.patch, -tvbrowser-2.5.ebuild,
+  -tvbrowser-2.5-r1.ebuild, -tvbrowser-2.5.2.ebuild,
+  -files/tvbrowser-2.5.2_buildxml.patch,
+  -files/tvbrowser-2.5.2_noWin32.patch, -tvbrowser-2.5.3.ebuild,
+  -files/tvbrowser-2.5.3_buildxml.patch,
+  -files/tvbrowser-2.5.3_noWin32.patch,
+  -files/tvbrowser-2.5-makefiles.patch,
+  -files/tvbrowser-2.5_Localizer.patch, -files/tvbrowser-2.5_buildxml.patch,
+  -files/tvbrowser-2.5_noWin32.patch, -tvbrowser-2.6.2.ebuild,
+  -tvbrowser-2.6.3.ebuild, -files/tvbrowser-2.6._Localizer.patch,
+  tvbrowser-2.7.1.ebuild:
+  Cleanup.
 
 *tvbrowser-2.7.4 (16 Nov 2009)
 
diff --git a/media-tv/tvbrowser/files/tvbrowser-2.1-makefiles.patch b/media-tv/tvbrowser/files/tvbrowser-2.1-makefiles.patch
deleted file mode 100644
index fe66053d28e3..000000000000
--- a/media-tv/tvbrowser/files/tvbrowser-2.1-makefiles.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-diff -ru tvbrowser-2.1-orig/deployment/x11/configure tvbrowser-2.1/deployment/x11/configure
---- tvbrowser-2.1-orig/deployment/x11/configure	2006-01-21 21:26:40.665900000 +0100
-+++ tvbrowser-2.1/deployment/x11/configure	2006-01-21 21:28:27.268562250 +0100
-@@ -19809,7 +19809,7 @@
- 
- 
- 
--                                        ac_config_files="$ac_config_files Makefile src/Makefile src/eclipse_java/Makefile src/logger/Makefile"
-+                                        ac_config_files="$ac_config_files Makefile src/Makefile src/logger/Makefile"
- cat >confcache <<\_ACEOF
- # This file is a shell script that caches the results of configure
- # tests run on this system so they can be shared between configure
-@@ -20368,7 +20368,6 @@
-   # Handling of arguments.
-   "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-   "src/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
--  "src/eclipse_java/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/eclipse_java/Makefile" ;;
-   "src/logger/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/logger/Makefile" ;;
-   "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
-   "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
-diff -ru tvbrowser-2.1-orig/deployment/x11/configure.in tvbrowser-2.1/deployment/x11/configure.in
---- tvbrowser-2.1-orig/deployment/x11/configure.in	2006-01-21 21:26:40.665900000 +0100
-+++ tvbrowser-2.1/deployment/x11/configure.in	2006-01-21 21:27:27.444823500 +0100
-@@ -7,4 +7,4 @@
- AC_PROG_CC
- AM_PROG_LIBTOOL
- 
--AC_OUTPUT(Makefile src/Makefile src/eclipse_java/Makefile src/logger/Makefile)
-+AC_OUTPUT(Makefile src/Makefile src/logger/Makefile)
-diff -ru tvbrowser-2.1-orig/deployment/x11/src/jni_wrapper.c tvbrowser-2.1/deployment/x11/src/jni_wrapper.c
---- tvbrowser-2.1-orig/deployment/x11/src/jni_wrapper.c	2006-01-21 21:26:40.669900250 +0100
-+++ tvbrowser-2.1/deployment/x11/src/jni_wrapper.c	2006-01-21 21:27:40.025609750 +0100
-@@ -22,7 +22,6 @@
- 
- #include <jni.h>
- 
--#include "eclipse_java/com_gc_systray_X11SystrayManager.h"
- #include "x11_systray_window.h"
- 
- #include "logger/logger.h"
-diff -ru tvbrowser-2.1-orig/deployment/x11/src/Makefile.am tvbrowser-2.1/deployment/x11/src/Makefile.am
---- tvbrowser-2.1-orig/deployment/x11/src/Makefile.am	2006-01-21 21:26:40.669900250 +0100
-+++ tvbrowser-2.1/deployment/x11/src/Makefile.am	2006-01-21 21:27:08.755655500 +0100
-@@ -7,7 +7,7 @@
- noinst_PROGRAMS = libDesktopIndicator.so
- libDesktopIndicator_so_SOURCES = jni_wrapper.c x11_systray_window.c
- 
--SUBDIRS = eclipse_java logger
-+SUBDIRS = logger
- noinst_HEADERS = x11_systray_window.h
- libDesktopIndicator_so_LDADD = $(top_builddir)/src/logger/liblogger.a \
- 	-L/usr/X11R6/lib -lX11 -lm -lc -L$(JAVA_HOME)/jre/lib/i386/ -ljawt
-diff -ru tvbrowser-2.1-orig/deployment/x11/src/Makefile.in tvbrowser-2.1/deployment/x11/src/Makefile.in
---- tvbrowser-2.1-orig/deployment/x11/src/Makefile.in	2006-01-21 21:26:40.669900250 +0100
-+++ tvbrowser-2.1/deployment/x11/src/Makefile.in	2006-01-21 21:27:48.698151750 +0100
-@@ -183,7 +183,7 @@
- # the library search path.
- libDesktopIndicator_so_LDFLAGS = -shared -Wl
- libDesktopIndicator_so_SOURCES = jni_wrapper.c x11_systray_window.c
--SUBDIRS = eclipse_java logger
-+SUBDIRS = logger
- noinst_HEADERS = x11_systray_window.h
- libDesktopIndicator_so_LDADD = $(top_builddir)/src/logger/liblogger.a \
- 	-L/usr/X11R6/lib -lX11 -lm -lc -L$(JAVA_HOME)/jre/lib/i386/ -ljawt
diff --git a/media-tv/tvbrowser/files/tvbrowser-2.2.1-makefiles.patch b/media-tv/tvbrowser/files/tvbrowser-2.2.1-makefiles.patch
deleted file mode 100644
index 4758e98ac539..000000000000
--- a/media-tv/tvbrowser/files/tvbrowser-2.2.1-makefiles.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-diff -uwNr ./tvbrowser-2.2.1-orig/deployment/x11/configure ./tvbrowser-2.2.1/deployment/x11/configure
---- ./tvbrowser-2.2.1-orig/deployment/x11/configure	2006-07-18 19:52:50.000000000 +0200
-+++ ./tvbrowser-2.2.1/deployment/x11/configure	2006-08-07 02:01:29.000000000 +0200
-@@ -19809,7 +19809,7 @@
- 

- 

- 

--                                        ac_config_files="$ac_config_files Makefile src/Makefile src/eclipse_java/Makefile src/logger/Makefile"

-+                                        ac_config_files="$ac_config_files Makefile src/Makefile src/logger/Makefile"

- cat >confcache <<\_ACEOF

- # This file is a shell script that caches the results of configure

- # tests run on this system so they can be shared between configure

-@@ -20368,7 +20368,6 @@
-   # Handling of arguments.

-   "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;

-   "src/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;

--  "src/eclipse_java/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/eclipse_java/Makefile" ;;

-   "src/logger/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/logger/Makefile" ;;

-   "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;

-   "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;

-diff -uwNr ./tvbrowser-2.2.1-orig/deployment/x11/configure.in ./tvbrowser-2.2.1/deployment/x11/configure.in
---- ./tvbrowser-2.2.1-orig/deployment/x11/configure.in	2006-07-18 19:52:50.000000000 +0200
-+++ ./tvbrowser-2.2.1/deployment/x11/configure.in	2006-08-07 02:01:39.000000000 +0200
-@@ -7,4 +7,4 @@
- AC_PROG_CC

- AM_PROG_LIBTOOL

- 

--AC_OUTPUT(Makefile src/Makefile src/eclipse_java/Makefile src/logger/Makefile)

-+AC_OUTPUT(Makefile src/Makefile src/logger/Makefile)

-diff -uwNr ./tvbrowser-2.2.1-orig/deployment/x11/src/jni_wrapper.c ./tvbrowser-2.2.1/deployment/x11/src/jni_wrapper.c
---- ./tvbrowser-2.2.1-orig/deployment/x11/src/jni_wrapper.c	2006-07-18 19:52:36.000000000 +0200
-+++ ./tvbrowser-2.2.1/deployment/x11/src/jni_wrapper.c	2006-08-07 02:01:56.000000000 +0200
-@@ -22,7 +22,6 @@
- 

- #include <jni.h>

- 

--#include "eclipse_java/com_gc_systray_X11SystrayManager.h"

- #include "x11_systray_window.h"

- 

- #include "logger/logger.h"

-diff -uwNr ./tvbrowser-2.2.1-orig/deployment/x11/src/Makefile.am ./tvbrowser-2.2.1/deployment/x11/src/Makefile.am
---- ./tvbrowser-2.2.1-orig/deployment/x11/src/Makefile.am	2006-07-18 19:52:36.000000000 +0200
-+++ ./tvbrowser-2.2.1/deployment/x11/src/Makefile.am	2006-08-07 02:02:06.000000000 +0200
-@@ -7,7 +7,7 @@
- noinst_PROGRAMS = libDesktopIndicator.so

- libDesktopIndicator_so_SOURCES = jni_wrapper.c x11_systray_window.c

- 

--SUBDIRS = eclipse_java logger

-+SUBDIRS = logger

- noinst_HEADERS = x11_systray_window.h

- libDesktopIndicator_so_LDADD = $(top_builddir)/src/logger/liblogger.a \

- 	-L/usr/X11R6/lib -lX11 -lm -lc -L$(JAVA_HOME)/jre/lib/i386/ -ljawt

-diff -uwNr ./tvbrowser-2.2.1-orig/deployment/x11/src/Makefile.in ./tvbrowser-2.2.1/deployment/x11/src/Makefile.in
---- ./tvbrowser-2.2.1-orig/deployment/x11/src/Makefile.in	2006-07-18 19:52:36.000000000 +0200
-+++ ./tvbrowser-2.2.1/deployment/x11/src/Makefile.in	2006-08-07 02:02:15.000000000 +0200
-@@ -183,7 +183,7 @@
- # the library search path.

- libDesktopIndicator_so_LDFLAGS = -shared -Wl

- libDesktopIndicator_so_SOURCES = jni_wrapper.c x11_systray_window.c

--SUBDIRS = eclipse_java logger

-+SUBDIRS = logger

- noinst_HEADERS = x11_systray_window.h

- libDesktopIndicator_so_LDADD = $(top_builddir)/src/logger/liblogger.a \

- 	-L/usr/X11R6/lib -lX11 -lm -lc -L$(JAVA_HOME)/jre/lib/i386/ -ljawt

diff --git a/media-tv/tvbrowser/files/tvbrowser-2.5-makefiles.patch b/media-tv/tvbrowser/files/tvbrowser-2.5-makefiles.patch
deleted file mode 100644
index 49ceaa8de529..000000000000
--- a/media-tv/tvbrowser/files/tvbrowser-2.5-makefiles.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-diff -uwNr tvbrowser-2.5_orig/deployment/x11/configure.in tvbrowser-2.5/deployment/x11/configure.in
---- tvbrowser-2.5_orig/deployment/x11/configure.in	2006-10-03 15:36:18.000000000 +0200
-+++ tvbrowser-2.5/deployment/x11/configure.in	2007-01-08 17:06:48.000000000 +0100
-@@ -7,4 +7,4 @@
- AC_PROG_CC

- AM_PROG_LIBTOOL

- 

--AC_OUTPUT(Makefile src/Makefile src/eclipse_java/Makefile src/logger/Makefile)

-+AC_OUTPUT(Makefile src/Makefile src/logger/Makefile)

-diff -uwNr tvbrowser-2.5_orig/deployment/x11/src/jni_wrapper.c tvbrowser-2.5/deployment/x11/src/jni_wrapper.c
---- tvbrowser-2.5_orig/deployment/x11/src/jni_wrapper.c	2006-10-03 15:36:06.000000000 +0200
-+++ tvbrowser-2.5/deployment/x11/src/jni_wrapper.c	2007-01-08 17:05:50.000000000 +0100
-@@ -22,7 +22,6 @@
- 

- #include <jni.h>

- 

--#include "eclipse_java/com_gc_systray_X11SystrayManager.h"

- #include "x11_systray_window.h"

- 

- #include "logger/logger.h"

-diff -uwNr tvbrowser-2.5_orig/deployment/x11/src/Makefile.am tvbrowser-2.5/deployment/x11/src/Makefile.am
---- tvbrowser-2.5_orig/deployment/x11/src/Makefile.am	2006-10-03 15:36:06.000000000 +0200
-+++ tvbrowser-2.5/deployment/x11/src/Makefile.am	2007-01-08 17:04:58.000000000 +0100
-@@ -7,7 +7,7 @@
- noinst_PROGRAMS = libDesktopIndicator.so

- libDesktopIndicator_so_SOURCES = jni_wrapper.c x11_systray_window.c

- 

--SUBDIRS = eclipse_java logger

-+SUBDIRS = logger

- noinst_HEADERS = x11_systray_window.h

- libDesktopIndicator_so_LDADD = $(top_builddir)/src/logger/liblogger.a \

- 	-L/usr/X11R6/lib -lX11 -lm -lc -L$(JAVA_HOME)/jre/lib/i386/ -ljawt

-diff -uwNr tvbrowser-2.5_orig/deployment/x11/src/Makefile.in tvbrowser-2.5/deployment/x11/src/Makefile.in
---- tvbrowser-2.5_orig/deployment/x11/src/Makefile.in	2006-10-03 15:36:06.000000000 +0200
-+++ tvbrowser-2.5/deployment/x11/src/Makefile.in	2007-01-08 17:05:20.000000000 +0100
-@@ -183,7 +183,7 @@
- # the library search path.

- libDesktopIndicator_so_LDFLAGS = -shared -Wl

- libDesktopIndicator_so_SOURCES = jni_wrapper.c x11_systray_window.c

--SUBDIRS = eclipse_java logger

-+SUBDIRS = logger

- noinst_HEADERS = x11_systray_window.h

- libDesktopIndicator_so_LDADD = $(top_builddir)/src/logger/liblogger.a \

- 	-L/usr/X11R6/lib -lX11 -lm -lc -L$(JAVA_HOME)/jre/lib/i386/ -ljawt

diff --git a/media-tv/tvbrowser/files/tvbrowser-2.5.2_buildxml.patch b/media-tv/tvbrowser/files/tvbrowser-2.5.2_buildxml.patch
deleted file mode 100644
index 38e8ed12bd09..000000000000
--- a/media-tv/tvbrowser/files/tvbrowser-2.5.2_buildxml.patch
+++ /dev/null
@@ -1,123 +0,0 @@
-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
deleted file mode 100644
index 61a703aa460f..000000000000
--- a/media-tv/tvbrowser/files/tvbrowser-2.5.2_noWin32.patch
+++ /dev/null
@@ -1,116 +0,0 @@
-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/files/tvbrowser-2.5.3_buildxml.patch b/media-tv/tvbrowser/files/tvbrowser-2.5.3_buildxml.patch
deleted file mode 100644
index e1ab44087168..000000000000
--- a/media-tv/tvbrowser/files/tvbrowser-2.5.3_buildxml.patch
+++ /dev/null
@@ -1,123 +0,0 @@
-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
deleted file mode 100644
index e67b8d614cdf..000000000000
--- a/media-tv/tvbrowser/files/tvbrowser-2.5.3_noWin32.patch
+++ /dev/null
@@ -1,118 +0,0 @@
-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/files/tvbrowser-2.5_Localizer.patch b/media-tv/tvbrowser/files/tvbrowser-2.5_Localizer.patch
deleted file mode 100644
index f3065dcf9504..000000000000
--- a/media-tv/tvbrowser/files/tvbrowser-2.5_Localizer.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ru tvbrowser-2.5-orig/src/util/ui/Localizer.java tvbrowser-2.5/src/util/ui/Localizer.java
---- tvbrowser-2.5-orig/src/util/ui/Localizer.java	2007-03-11 17:03:17.662679355 +0100
-+++ tvbrowser-2.5/src/util/ui/Localizer.java	2007-03-11 17:03:39.741495254 +0100
-@@ -348,7 +348,7 @@
-       langArray.add(Locale.ENGLISH);

-       

-       // First Step: look into tvbrowser.jar

--      JarFile file = new JarFile(new File("tvbrowser.jar"));

-+      JarFile file = new JarFile(new File("lib/tvbrowser.jar"));

-       

-       Enumeration<JarEntry> entries = file.entries();

-       

diff --git a/media-tv/tvbrowser/files/tvbrowser-2.5_buildxml.patch b/media-tv/tvbrowser/files/tvbrowser-2.5_buildxml.patch
deleted file mode 100644
index 343fa4909803..000000000000
--- a/media-tv/tvbrowser/files/tvbrowser-2.5_buildxml.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-diff -uwNr tvbrowser-2.5_orig/build.xml tvbrowser-2.5_build/build.xml
---- tvbrowser-2.5_orig/build.xml	2006-11-18 20:41:34.000000000 +0100
-+++ tvbrowser-2.5_build/build.xml	2007-01-09 17:45:11.000000000 +0100
-@@ -288,12 +288,6 @@
-     <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"

-@@ -313,7 +307,6 @@
-       <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 -->

-@@ -339,13 +332,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/**"/>

diff --git a/media-tv/tvbrowser/files/tvbrowser-2.5_noWin32.patch b/media-tv/tvbrowser/files/tvbrowser-2.5_noWin32.patch
deleted file mode 100644
index 8ce05e3c9766..000000000000
--- a/media-tv/tvbrowser/files/tvbrowser-2.5_noWin32.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-diff -uwNr tvbrowser-2.5_orig2/src/tvbrowser/TVBrowser.java tvbrowser-2.5/src/tvbrowser/TVBrowser.java
---- tvbrowser-2.5_orig2/src/tvbrowser/TVBrowser.java	2006-12-26 16:47:10.000000000 +0100
-+++ tvbrowser-2.5/src/tvbrowser/TVBrowser.java	2007-01-09 17:27:21.000000000 +0100
-@@ -81,10 +81,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;

-@@ -362,36 +358,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.showMessageDialog(UiUtilities.getLastModalChildOf(mainFrame),

--                    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."),

--                    UIManager.getString("OptionPane.messageDialogTitle"),JOptionPane.WARNING_MESSAGE);

--                    

--                    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 havn'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(Exception registry) {}

--            }

--            

-             // check if user should select picture settings

-             if(currentVersion.compareTo(new Version(2,22))<0) {

-               TvBrowserPictureSettingsUpdateDialog.createAndShow(mainFrame);

-diff -uwNr tvbrowser-2.5_orig2/src/tvbrowser/ui/settings/StartupSettingsTab.java tvbrowser-2.5/src/tvbrowser/ui/settings/StartupSettingsTab.java
---- tvbrowser-2.5_orig2/src/tvbrowser/ui/settings/StartupSettingsTab.java	2006-10-29 22:41:14.000000000 +0100
-+++ tvbrowser-2.5/src/tvbrowser/ui/settings/StartupSettingsTab.java	2007-01-09 17:28:52.000000000 +0100
-@@ -38,9 +38,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;

-@@ -91,35 +88,6 @@
-         .getBoolean());

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

- 

--    if (System.getProperty("os.name").toLowerCase().startsWith("windows")) {

--      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 (Exception e) {}

--    }

--

-     return mSettingsPn;

-   }

- 

diff --git a/media-tv/tvbrowser/files/tvbrowser-2.6._Localizer.patch b/media-tv/tvbrowser/files/tvbrowser-2.6._Localizer.patch
deleted file mode 100644
index dfbe837b6560..000000000000
--- a/media-tv/tvbrowser/files/tvbrowser-2.6._Localizer.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur tvbrowser-2.6.2.orig/src/util/ui/Localizer.java tvbrowser-2.6.2/src/util/ui/Localizer.java
---- tvbrowser-2.6.2.orig/src/util/ui/Localizer.java	2008-01-13 22:09:32.000000000 +0100
-+++ tvbrowser-2.6.2/src/util/ui/Localizer.java	2008-01-13 22:10:08.000000000 +0100
-@@ -364,7 +364,7 @@
-     langArray.add(Locale.ENGLISH);

- 

-     try {

--      File jar = new File("tvbrowser.jar");

-+      File jar = new File("lib/tvbrowser.jar");

- 

-       if (!jar.exists()) {

-         URL url = getClass().getProtectionDomain().getCodeSource().getLocation();

diff --git a/media-tv/tvbrowser/tvbrowser-2.2.1.ebuild b/media-tv/tvbrowser/tvbrowser-2.2.1.ebuild
deleted file mode 100644
index 0a948e37b804..000000000000
--- a/media-tv/tvbrowser/tvbrowser-2.2.1.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/tvbrowser/tvbrowser-2.2.1.ebuild,v 1.9 2008/01/10 22:42:11 caster 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="~amd64 ~x86"
-
-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/jre-1.4
-	=dev-java/junit-3.8*
-	dev-java/commons-net
-	>=dev-java/jgoodies-forms-1.0.7
-	>=dev-java/jgoodies-looks-2.0
-	dev-java/bsh
-	dev-java/skinlf
-	dev-java/l2fprod-common"
-
-DEPEND=">=virtual/jdk-1.4
-	${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
-
-	epatch "${FILESDIR}"/${P}-makefiles.patch
-
-	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}"/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.6.jar
-	java-pkg_jar-from jgoodies-looks-2.0 looks.jar looks-2.0.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
-
-	cd "${S}"/deployment/x11
-	rm src/libDesktopIndicator.so
-	rm configure
-
-	# 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_dolauncher "tvbrowser" \
-		--jar ${todir}/lib/tvbrowser.jar \
-		--pwd ${todir}
-
-	cp "${S}"/deployment/x11/src/libDesktopIndicator.so "${D}"/${todir}
-}
-
-pkg_postinst() {
-	elog
-	elog "If you want Systray you have to use a jre >= 1.5 !"
-	elog
-}
diff --git a/media-tv/tvbrowser/tvbrowser-2.5-r1.ebuild b/media-tv/tvbrowser/tvbrowser-2.5-r1.ebuild
deleted file mode 100644
index a0f5ca4bb0d8..000000000000
--- a/media-tv/tvbrowser/tvbrowser-2.5-r1.ebuild
+++ /dev/null
@@ -1,145 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/tvbrowser/tvbrowser-2.5-r1.ebuild,v 1.4 2008/01/10 22:42:11 caster 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/jre-1.5
-	=dev-java/junit-3.8*
-	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"
-
-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}"/${P}-makefiles.patch
-	epatch "${FILESDIR}"/${P}_noWin32.patch
-	epatch "${FILESDIR}"/${P}_buildxml.patch
-
-	#fix bug #170363
-	epatch "${FILESDIR}"/${P}_Localizer.patch
-
-	# missing commons-compress, gdata-calendar, gdata-client
-	rm -r "${S}"/src/calendarexportplugin
-	rm -r "${S}"/src/bbcbackstagedataservice
-
-	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}"/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_dolauncher "tvbrowser" \
-		--jar ${todir}/lib/tvbrowser.jar \
-		--pwd ${todir} \
-		--java_args "-Djava.library.path=${todir} -Dpropertiesfile=${todir}/linux.properties"
-
-	cp "${S}"/deployment/x11/src/libDesktopIndicator.so "${D}"/${todir}
-}
-
-pkg_postinst() {
-	elog
-	elog "If you want Systray you have to use a jre >= 1.5 !"
-	elog
-}
diff --git a/media-tv/tvbrowser/tvbrowser-2.5.2.ebuild b/media-tv/tvbrowser/tvbrowser-2.5.2.ebuild
deleted file mode 100644
index 4c279a013f33..000000000000
--- a/media-tv/tvbrowser/tvbrowser-2.5.2.ebuild
+++ /dev/null
@@ -1,150 +0,0 @@
-# Copyright 1999-2008 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.8 2008/10/22 12:20:52 fordfrog Exp $
-
-EAPI="1"
-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:0
-	x11-libs/libSM:0
-	x11-libs/libICE:0
-	x11-libs/libXext:0
-	x11-libs/libXtst:0
-	x11-libs/libX11:0
-	x11-libs/libXau:0
-	x11-libs/libXdmcp:0
-	>=dev-java/junit-3.8:0
-	dev-java/commons-net:0
-	>=dev-java/jgoodies-forms-1.0.7:0
-	>=dev-java/jgoodies-looks-2.0:2.0
-	>=dev-java/bsh-2.0_beta1:0
-	>=dev-java/skinlf-6.7:0
-	dev-java/l2fprod-common:0
-	>=dev-java/poi-2.5.1:0
-	>=dev-java/xerces-2.8:2"
-
-DEPEND=">=virtual/jdk-1.5
-	${RDEPEND}
-	app-arch/unzip:0"
-
-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
-}
diff --git a/media-tv/tvbrowser/tvbrowser-2.5.3.ebuild b/media-tv/tvbrowser/tvbrowser-2.5.3.ebuild
deleted file mode 100644
index 5970a670e5dc..000000000000
--- a/media-tv/tvbrowser/tvbrowser-2.5.3.ebuild
+++ /dev/null
@@ -1,150 +0,0 @@
-# Copyright 1999-2008 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.4 2008/10/22 12:20:52 fordfrog Exp $
-
-EAPI="1"
-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:0
-	x11-libs/libSM:0
-	x11-libs/libICE:0
-	x11-libs/libXext:0
-	x11-libs/libXtst:0
-	x11-libs/libX11:0
-	x11-libs/libXau:0
-	x11-libs/libXdmcp:0
-	>=dev-java/junit-3.8:0
-	dev-java/commons-net:0
-	>=dev-java/jgoodies-forms-1.0.7:0
-	>=dev-java/jgoodies-looks-2.0:2.0
-	>=dev-java/bsh-2.0_beta1:0
-	>=dev-java/skinlf-6.7:0
-	dev-java/l2fprod-common:0
-	>=dev-java/poi-2.5.1:0
-	>=dev-java/xerces-2.8:2"
-
-DEPEND=">=virtual/jdk-1.5
-	${RDEPEND}
-	app-arch/unzip:0"
-
-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
-}
diff --git a/media-tv/tvbrowser/tvbrowser-2.5.ebuild b/media-tv/tvbrowser/tvbrowser-2.5.ebuild
deleted file mode 100644
index 259d4b9f30c6..000000000000
--- a/media-tv/tvbrowser/tvbrowser-2.5.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/tvbrowser/tvbrowser-2.5.ebuild,v 1.5 2008/01/10 22:42:11 caster 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/jre-1.5
-	=dev-java/junit-3.8*
-	dev-java/commons-net
-	>=dev-java/jgoodies-forms-1.0.7
-	>=dev-java/jgoodies-looks-2.0
-	dev-java/bsh
-	dev-java/skinlf
-	dev-java/l2fprod-common"
-
-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}"/${P}-makefiles.patch
-	epatch "${FILESDIR}"/${P}_noWin32.patch
-	epatch "${FILESDIR}"/${P}_buildxml.patch
-
-	# missing commons-compress, gdata-calendar, gdata-client
-	rm -r "${S}"/src/calendarexportplugin
-	rm -r "${S}"/src/bbcbackstagedataservice
-
-	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}"/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
-
-	cd "${S}"/deployment/x11
-	rm src/libDesktopIndicator.so
-	rm configure
-
-	# 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_dolauncher "tvbrowser" \
-		--jar ${todir}/lib/tvbrowser.jar \
-		--pwd ${todir}
-
-	cp "${S}"/deployment/x11/src/libDesktopIndicator.so "${D}"/${todir}
-}
-
-pkg_postinst() {
-	elog
-	elog "If you want Systray you have to use a jre >= 1.5 !"
-	elog
-}
diff --git a/media-tv/tvbrowser/tvbrowser-2.6.2.ebuild b/media-tv/tvbrowser/tvbrowser-2.6.2.ebuild
deleted file mode 100644
index 90e8a09d69d3..000000000000
--- a/media-tv/tvbrowser/tvbrowser-2.6.2.ebuild
+++ /dev/null
@@ -1,220 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/tvbrowser/tvbrowser-2.6.2.ebuild,v 1.4 2008/10/22 12:20:52 fordfrog Exp $
-
-EAPI="1"
-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://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/midnightthemepack.zip
-http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/roueBrownthemepack.zip
-http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/roueBluethemepack.zip
-http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/roueGreenthemepack.zip
-http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/blueTurquesathemepack.zip
-http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/gorillathemepack.zip
-http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/BeOSthemepack.zip
-http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/crystal2themepack.zip
-http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/opusOSDeepthemepack.zip
-http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/chaNinja-Bluethemepack.zip
-http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/amarachthemepack.zip
-http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/quickSilverRthemepack.zip
-http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/gfxOasisthemepack.zip
-http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/underlingthemepack.zip
-http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/coronaHthemepack.zip
-http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/cougarthemepack.zip
-http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/royalInspiratthemepack.zip
-http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/tigerthemepack.zip
-http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/mmMagra-Xthemepack.zip
-http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/iBarthemepack.zip
-http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/solunaRthemepack.zip
-http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/fatalEthemepack.zip
-http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/blueMetalthemepack.zip
-http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/b0sumithemepack.zip
-http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/b0sumiErgothempack.zip
-http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/oliveGreenLunaXPthemepack.zip
-http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/silverLunaXPthemepack.zip
-http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/architectBluethemepack.zip
-http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/architectOlivethemepack.zip
-http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/hmmXPBluethemepack.zip
-http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/hmmXPMonoBluethemepack.zip
-http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/tigerGraphitethemepack.zip
-http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/opusOSBluethemepack.zip
-http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/opusOSOlivethemepack.zip
-http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/opusLunaSilverthemepack.zip
-http://www.tvbrowser.org/downloads/CrystalClear.zip
-http://www.tvbrowser.org/downloads/noia.zip
-http://www.tvbrowser.org/downloads/nuvola.zip
-http://www.tvbrowser.org/downloads/tulliana.zip
-)"
-
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-
-# missing dependencies commons-compress, TVAnytimeAPI, jRegistryKey , gdata-calendar, gdata-client and jcom
-# use local jar files
-
-RDEPEND=">=virtual/jre-1.5
-	x11-libs/libXt:0
-	x11-libs/libSM:0
-	x11-libs/libICE:0
-	x11-libs/libXext:0
-	x11-libs/libXtst:0
-	x11-libs/libX11:0
-	x11-libs/libXau:0
-	x11-libs/libXdmcp:0
-	dev-java/junit:0
-	dev-java/commons-net:0
-	>=dev-java/jgoodies-forms-1.1.0:0
-	>=dev-java/jgoodies-looks-2.0:2.0
-	dev-java/bsh:0
-	dev-java/l2fprod-common:0
-	>=dev-java/jakarta-oro-2.0:2.0
-	>=dev-java/poi-2.5.1:0
-	>=dev-java/xerces-2.8:2"
-
-DEPEND=">=virtual/jdk-1.5
-	${RDEPEND}
-	app-arch/unzip:0
-	source? ( app-arch/zip:0 )"
-
-LICENSE="GPL-2"
-
-IUSE="doc themes source"
-
-src_unpack() {
-	unpack ${P}-src.zip
-
-	cd "${S}"
-	epatch "${FILESDIR}"/tvbrowser-2.5-makefiles.patch
-
-	# fix bug #170363
-	epatch "${FILESDIR}/tvbrowser-2.6._Localizer.patch"
-
-	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 junit.jar commons-net-1.4.1.jar forms-1.1.0.jar looks-2.1.4.jar \
-		bsh-2.0b4.jar l2fprod-common-tasks.jar jakarta-oro-2.0.8.jar
-
-	java-pkg_jar-from junit
-	java-pkg_jar-from commons-net commons-net.jar commons-net-1.4.1.jar
-	java-pkg_jar-from jgoodies-forms forms.jar forms-1.1.0.jar
-	java-pkg_jar-from jgoodies-looks-2.0 looks.jar looks-2.1.4.jar
-	java-pkg_jar-from bsh bsh.jar bsh-2.0b4.jar
-	java-pkg_jar-from l2fprod-common l2fprod-common-tasks.jar
-	java-pkg_jar-from jakarta-oro-2.0 jakarta-oro.jar jakarta-oro-2.0.8.jar
-
-	# themepacks don't work with system skinlf
-	#java-pkg_jarfrom skinlf
-
-	# Fails to create javadocs without this
-	mkdir "${S}/public"
-
-	# 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() {
-	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 "${DISTDIR}"
-		doins midnightthemepack.zip \
-			roueBrownthemepack.zip \
-			roueBluethemepack.zip \
-			roueGreenthemepack.zip \
-			blueTurquesathemepack.zip \
-			gorillathemepack.zip \
-			BeOSthemepack.zip \
-			crystal2themepack.zip \
-			opusOSDeepthemepack.zip \
-			chaNinja-Bluethemepack.zip \
-			amarachthemepack.zip \
-			quickSilverRthemepack.zip \
-			gfxOasisthemepack.zip \
-			underlingthemepack.zip \
-			coronaHthemepack.zip \
-			cougarthemepack.zip \
-			royalInspiratthemepack.zip \
-			tigerthemepack.zip \
-			mmMagra-Xthemepack.zip \
-			iBarthemepack.zip \
-			solunaRthemepack.zip \
-			fatalEthemepack.zip \
-			blueMetalthemepack.zip \
-			b0sumithemepack.zip \
-			b0sumiErgothempack.zip \
-			oliveGreenLunaXPthemepack.zip \
-			silverLunaXPthemepack.zip \
-			architectBluethemepack.zip \
-			architectOlivethemepack.zip \
-			hmmXPBluethemepack.zip \
-			hmmXPMonoBluethemepack.zip \
-			tigerGraphitethemepack.zip \
-			opusOSBluethemepack.zip \
-			opusOSOlivethemepack.zip \
-			opusLunaSilverthemepack.zip || die
-		insinto "${todir}/icons"
-		doins CrystalClear.zip noia.zip nuvola.zip tulliana.zip || die
-	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
-}
diff --git a/media-tv/tvbrowser/tvbrowser-2.6.3.ebuild b/media-tv/tvbrowser/tvbrowser-2.6.3.ebuild
deleted file mode 100644
index 5773bc2bc2ee..000000000000
--- a/media-tv/tvbrowser/tvbrowser-2.6.3.ebuild
+++ /dev/null
@@ -1,214 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/tvbrowser/tvbrowser-2.6.3.ebuild,v 1.1 2008/01/22 00:05:15 caster Exp $
-
-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://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/midnightthemepack.zip
-http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/roueBrownthemepack.zip
-http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/roueBluethemepack.zip
-http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/roueGreenthemepack.zip
-http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/blueTurquesathemepack.zip
-http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/gorillathemepack.zip
-http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/BeOSthemepack.zip
-http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/crystal2themepack.zip
-http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/opusOSDeepthemepack.zip
-http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/chaNinja-Bluethemepack.zip
-http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/amarachthemepack.zip
-http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/quickSilverRthemepack.zip
-http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/gfxOasisthemepack.zip
-http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/underlingthemepack.zip
-http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/coronaHthemepack.zip
-http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/cougarthemepack.zip
-http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/royalInspiratthemepack.zip
-http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/tigerthemepack.zip
-http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/mmMagra-Xthemepack.zip
-http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/iBarthemepack.zip
-http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/solunaRthemepack.zip
-http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/fatalEthemepack.zip
-http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/blueMetalthemepack.zip
-http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/b0sumithemepack.zip
-http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/b0sumiErgothempack.zip
-http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/oliveGreenLunaXPthemepack.zip
-http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/silverLunaXPthemepack.zip
-http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/architectBluethemepack.zip
-http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/architectOlivethemepack.zip
-http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/hmmXPBluethemepack.zip
-http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/hmmXPMonoBluethemepack.zip
-http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/tigerGraphitethemepack.zip
-http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/opusOSBluethemepack.zip
-http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/opusOSOlivethemepack.zip
-http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/opusLunaSilverthemepack.zip
-http://www.tvbrowser.org/downloads/CrystalClear.zip
-http://www.tvbrowser.org/downloads/noia.zip
-http://www.tvbrowser.org/downloads/nuvola.zip
-http://www.tvbrowser.org/downloads/tulliana.zip
-)"
-
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-
-COMMON_DEP="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-codec
-	dev-java/commons-net
-	>=dev-java/jgoodies-forms-1.1.0
-	>=dev-java/jgoodies-looks-2.0
-	dev-java/bsh
-	dev-java/l2fprod-common
-	>=dev-java/jakarta-oro-2.0
-	dev-java/skinlf"
-DEPEND=">=virtual/jdk-1.5
-	app-arch/unzip
-	${COMMON_DEP}"
-RDEPEND=">=virtual/jre-1.5
-	${COMMON_DEP}"
-
-LICENSE="GPL-2"
-
-IUSE="themes"
-
-src_unpack() {
-	unpack ${P}-src.zip
-	cd "${S}"
-
-	epatch "${FILESDIR}/tvbrowser-2.5-makefiles.patch"
-
-	# fix bug #170363
-	epatch "${FILESDIR}/tvbrowser-2.6._Localizer.patch"
-
-	# now that's a rather nasty trick that removes exactly the lines that unjar
-	# dependencies and include them to tvbrowser's jars
-	# when bumping, check that it doesn't affect lines it shouldn't!
-	sed "/unpacked.dir/d" -i build.xml || die
-
-	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}/:" || die
-
-	# who knows what were those for
-	rm -v "${S}"/tvdatakit/workspace/lib/*.jar || die
-
-	cd "${S}"/lib || die
-	rm -v junit.jar commons-net-1.4.1.jar forms-1.1.0.jar looks-2.1.4.jar \
-		bsh-2.0b4.jar l2fprod-common-tasks.jar jakarta-oro-2.0.8.jar skinlf.jar \
-		commons-codec-1.3.jar || die
-
-	# missing dependencies commons-compress, TVAnytimeAPI, jRegistryKey, gdata-calendar, gdata-client and jcom
-	# use local jar files for these, and also those in deployment
-	# some are win32/mac only, so we will let tvbrowser build against them (no need to patch stuff out of sources)
-	# but won't install the bundled jars, because their codepath won't be executed on linux anyway
-	java-pkg_jar-from junit,commons-codec,commons-net,jgoodies-forms,jgoodies-looks-2.0,bsh,l2fprod-common,skinlf
-
-	# Fails to create javadocs without this
-	mkdir "${S}/public" || die
-
-	# 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() {
-	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
-	java-pkg_dojar "${S}"/lib/{TVAnytimeAPI.jar,commons-compress-20050911.jar,gdata-calendar-1.0.jar,gdata-client-1.0.jar,gdata-core-1.0.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 "${DISTDIR}"
-		doins midnightthemepack.zip \
-			roueBrownthemepack.zip \
-			roueBluethemepack.zip \
-			roueGreenthemepack.zip \
-			blueTurquesathemepack.zip \
-			gorillathemepack.zip \
-			BeOSthemepack.zip \
-			crystal2themepack.zip \
-			opusOSDeepthemepack.zip \
-			chaNinja-Bluethemepack.zip \
-			amarachthemepack.zip \
-			quickSilverRthemepack.zip \
-			gfxOasisthemepack.zip \
-			underlingthemepack.zip \
-			coronaHthemepack.zip \
-			cougarthemepack.zip \
-			royalInspiratthemepack.zip \
-			tigerthemepack.zip \
-			mmMagra-Xthemepack.zip \
-			iBarthemepack.zip \
-			solunaRthemepack.zip \
-			fatalEthemepack.zip \
-			blueMetalthemepack.zip \
-			b0sumithemepack.zip \
-			b0sumiErgothempack.zip \
-			oliveGreenLunaXPthemepack.zip \
-			silverLunaXPthemepack.zip \
-			architectBluethemepack.zip \
-			architectOlivethemepack.zip \
-			hmmXPBluethemepack.zip \
-			hmmXPMonoBluethemepack.zip \
-			tigerGraphitethemepack.zip \
-			opusOSBluethemepack.zip \
-			opusOSOlivethemepack.zip \
-			opusLunaSilverthemepack.zip || die
-		insinto "${todir}/icons"
-		doins CrystalClear.zip noia.zip nuvola.zip tulliana.zip || die
-	fi
-
-	java-pkg_doso "${S}/deployment/x11/src/libDesktopIndicator.so"
-
-	java-pkg_dolauncher "tvbrowser" \
-		--main tvbrowser.TVBrowser \
-		--pwd ${todir} \
-		--java_args " -Dpropertiesfile=${todir}/linux.properties"
-
-	make_desktop_entry ${PN} "TV Browser" /usr/share/tvbrowser/imgs/tvbrowser128.png
-}
diff --git a/media-tv/tvbrowser/tvbrowser-2.7.1.ebuild b/media-tv/tvbrowser/tvbrowser-2.7.1.ebuild
index 02675d875c04..bb191317e6c3 100644
--- a/media-tv/tvbrowser/tvbrowser-2.7.1.ebuild
+++ b/media-tv/tvbrowser/tvbrowser-2.7.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/tvbrowser/tvbrowser-2.7.1.ebuild,v 1.2 2008/11/09 03:23:46 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/tvbrowser/tvbrowser-2.7.1.ebuild,v 1.3 2009/11/16 10:24:48 zzam Exp $
 
 JAVA_PKG_IUSE="doc source"
 #WANT_ANT_TASKS="ant-junit"
@@ -94,13 +94,6 @@ src_unpack() {
 	# when bumping, check that it doesn't affect lines it shouldn't!
 	sed "/unpacked.dir/d" -i build.xml || die
 
-	local J_ARCH
-	case "${ARCH}" in
-		x86)	J_ARCH=i386 ;;
-		amd64)	J_ARCH=amd64 ;;
-		*) die "not supported arch for this ebuild" ;;
-	esac
-
 	# disable running of junit tests, because tvbrowserdataservice.file.ChannelListTest fails always
 	sed -i "${S}"/build.xml -e"s:, test: :"