Updated to Version 2.5, thanks to ReneGart, added him as proxied maintainer.

(Portage version: 2.1.2_rc4-r7)

7 files changed, 347 insertions, 5 deletions

diff --git a/media-tv/tvbrowser/ChangeLog b/media-tv/tvbrowser/ChangeLog
index 43f83c7d1456..98082afd7505 100644
--- a/media-tv/tvbrowser/ChangeLog
+++ b/media-tv/tvbrowser/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-tv/tvbrowser
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/tvbrowser/ChangeLog,v 1.8 2007/01/06 10:04:10 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/tvbrowser/ChangeLog,v 1.9 2007/01/09 18:17:12 zzam Exp $
+
+*tvbrowser-2.5 (09 Jan 2007)
+
+  09 Jan 2007; Matthias Schwarzott <zzam@gentoo.org>
+  +files/tvbrowser-2.5-makefiles.patch, +files/tvbrowser-2.5_buildxml.patch,
+  +files/tvbrowser-2.5_noWin32.patch, metadata.xml, +tvbrowser-2.5.ebuild:
+  Updated to Version 2.5, thanks to ReneGart, added him as proxied maintainer.
 
   06 Jan 2007; Matthias Schwarzott <zzam@gentoo.org> tvbrowser-2.1.ebuild,
   tvbrowser-2.2.1.ebuild:
diff --git a/media-tv/tvbrowser/files/digest-tvbrowser-2.5 b/media-tv/tvbrowser/files/digest-tvbrowser-2.5
new file mode 100644
index 000000000000..5eaf2ca3a1f3
--- /dev/null
+++ b/media-tv/tvbrowser/files/digest-tvbrowser-2.5
@@ -0,0 +1,6 @@
+MD5 672a2f53c54511ced3f796c65a9183f7 allthemepacks.zip 210954
+RMD160 6d456534bd504c98eb57ff39876ee2c2ffabee70 allthemepacks.zip 210954
+SHA256 602d229f734c2fa3e2984a2d86faf6c1825d6db56329b00ce25ba1a2eb5b64b7 allthemepacks.zip 210954
+MD5 a37f6a90cbe52077308649da4dcfe8ae tvbrowser-2.5-src.zip 8865427
+RMD160 2f47f2a9d56f9fac26dae77f6f34dac06bd17b7d tvbrowser-2.5-src.zip 8865427
+SHA256 f2f60303a5600dd3bcd94dc681f469f9e0e6e408581db4eccc2bad3cbdbb3c7a tvbrowser-2.5-src.zip 8865427
diff --git a/media-tv/tvbrowser/files/tvbrowser-2.5-makefiles.patch b/media-tv/tvbrowser/files/tvbrowser-2.5-makefiles.patch
new file mode 100644
index 000000000000..49ceaa8de529
--- /dev/null
+++ b/media-tv/tvbrowser/files/tvbrowser-2.5-makefiles.patch
@@ -0,0 +1,44 @@
+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_buildxml.patch b/media-tv/tvbrowser/files/tvbrowser-2.5_buildxml.patch
new file mode 100644
index 000000000000..343fa4909803
--- /dev/null
+++ b/media-tv/tvbrowser/files/tvbrowser-2.5_buildxml.patch
@@ -0,0 +1,38 @@
+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
new file mode 100644
index 000000000000..8ce05e3c9766
--- /dev/null
+++ b/media-tv/tvbrowser/files/tvbrowser-2.5_noWin32.patch
@@ -0,0 +1,100 @@
+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/metadata.xml b/media-tv/tvbrowser/metadata.xml
index 3aaff838ed8d..3ea4c620becf 100644
--- a/media-tv/tvbrowser/metadata.xml
+++ b/media-tv/tvbrowser/metadata.xml
@@ -3,10 +3,13 @@
 <pkgmetadata>
 <herd>media-tv</herd>
 <maintainer>
-<email>zzam@gentoo.org</email>
-<name>Matthias Schwarzott</name>
+  <email>renegart@gmx.de</email>
+  <name>Mirko Günther</name>
+  <description>Proxied maintainer</description>
+</maintainer>
+<maintainer>
+  <email>zzam@gentoo.org</email>
+  <name>Matthias Schwarzott</name>
 </maintainer>
-<longdescription lang="en">
-</longdescription>
 </pkgmetadata>
 
diff --git a/media-tv/tvbrowser/tvbrowser-2.5.ebuild b/media-tv/tvbrowser/tvbrowser-2.5.ebuild
new file mode 100644
index 000000000000..eac4db3f2e0e
--- /dev/null
+++ b/media-tv/tvbrowser/tvbrowser-2.5.ebuild
@@ -0,0 +1,144 @@
+# 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.ebuild,v 1.1 2007/01/09 18:17:12 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
+	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
+}