From 1cfc18a005fc9d2f653f6edc710ccf10f5cde74f Mon Sep 17 00:00:00 2001 From: Matthias Schwarzott Date: Tue, 9 Jan 2007 18:17:12 +0000 Subject: [PATCH] Updated to Version 2.5, thanks to ReneGart, added him as proxied maintainer. Package-Manager: portage-2.1.2_rc4-r7 --- media-tv/tvbrowser/ChangeLog | 9 +- media-tv/tvbrowser/Manifest | 42 +++-- media-tv/tvbrowser/files/digest-tvbrowser-2.5 | 6 + .../files/tvbrowser-2.5-makefiles.patch | 44 ++++++ .../files/tvbrowser-2.5_buildxml.patch | 38 +++++ .../files/tvbrowser-2.5_noWin32.patch | 100 ++++++++++++ media-tv/tvbrowser/metadata.xml | 11 +- media-tv/tvbrowser/tvbrowser-2.5.ebuild | 144 ++++++++++++++++++ 8 files changed, 378 insertions(+), 16 deletions(-) create mode 100644 media-tv/tvbrowser/files/digest-tvbrowser-2.5 create mode 100644 media-tv/tvbrowser/files/tvbrowser-2.5-makefiles.patch create mode 100644 media-tv/tvbrowser/files/tvbrowser-2.5_buildxml.patch create mode 100644 media-tv/tvbrowser/files/tvbrowser-2.5_noWin32.patch create mode 100644 media-tv/tvbrowser/tvbrowser-2.5.ebuild 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 + +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 tvbrowser-2.1.ebuild, tvbrowser-2.2.1.ebuild: diff --git a/media-tv/tvbrowser/Manifest b/media-tv/tvbrowser/Manifest index 08ac9ad76fc3..cbcd6d5ae308 100644 --- a/media-tv/tvbrowser/Manifest +++ b/media-tv/tvbrowser/Manifest @@ -9,9 +9,22 @@ AUX tvbrowser-2.2.1-makefiles.patch 3518 RMD160 c694519a6be2999e87f8d6e87d103c29 MD5 6706987dac25e4d4043bc12fc5c0e282 files/tvbrowser-2.2.1-makefiles.patch 3518 RMD160 c694519a6be2999e87f8d6e87d103c29cf52c3ed files/tvbrowser-2.2.1-makefiles.patch 3518 SHA256 4e7094d7eb3495cac5689c9391bbb1bfcae16da080ef6f3dd9476a6c505d1595 files/tvbrowser-2.2.1-makefiles.patch 3518 +AUX tvbrowser-2.5-makefiles.patch 2244 RMD160 e50f4bcd3342bbba1dee17e64b18fc6aab5a012d SHA1 dbe98e2b92d1beef970226d5d014947ad3f9c553 SHA256 5ceafd294ebeff4bc2356d2db6abd6b74093fc53987842ddba9bc70eb45c613d +MD5 52fe69030cad5afb748a9ffc01cf42a3 files/tvbrowser-2.5-makefiles.patch 2244 +RMD160 e50f4bcd3342bbba1dee17e64b18fc6aab5a012d files/tvbrowser-2.5-makefiles.patch 2244 +SHA256 5ceafd294ebeff4bc2356d2db6abd6b74093fc53987842ddba9bc70eb45c613d files/tvbrowser-2.5-makefiles.patch 2244 +AUX tvbrowser-2.5_buildxml.patch 2333 RMD160 76810c14672c13fdd3f71c71fadb37309154e4ef SHA1 7b8c75598a4b36bb4d706f4cb49445b97d75057f SHA256 0b0cefbfcf6029165c267ab32d0c6147289d355491f989f01e3e63f686e3de74 +MD5 4aab200a74118131175771529bc2ccad files/tvbrowser-2.5_buildxml.patch 2333 +RMD160 76810c14672c13fdd3f71c71fadb37309154e4ef files/tvbrowser-2.5_buildxml.patch 2333 +SHA256 0b0cefbfcf6029165c267ab32d0c6147289d355491f989f01e3e63f686e3de74 files/tvbrowser-2.5_buildxml.patch 2333 +AUX tvbrowser-2.5_noWin32.patch 5655 RMD160 0938e19540b5de8452f41880c344ff6db427c287 SHA1 0a684d71ab8864e0f69d3457a05244564dd5beae SHA256 0fab92d3061bf9a17dcf563c1588c28636750f3de4387cf477519de07ef7ad4c +MD5 594b49c4d70603548076877e991fdb77 files/tvbrowser-2.5_noWin32.patch 5655 +RMD160 0938e19540b5de8452f41880c344ff6db427c287 files/tvbrowser-2.5_noWin32.patch 5655 +SHA256 0fab92d3061bf9a17dcf563c1588c28636750f3de4387cf477519de07ef7ad4c files/tvbrowser-2.5_noWin32.patch 5655 DIST allthemepacks.zip 210954 RMD160 6d456534bd504c98eb57ff39876ee2c2ffabee70 SHA1 1204e5d09c31b5030423eec32433b7410f8edadf SHA256 602d229f734c2fa3e2984a2d86faf6c1825d6db56329b00ce25ba1a2eb5b64b7 DIST tvbrowser-2.1-src.zip 5928402 RMD160 5918840feec2d09fabaa093de744eed4788756f9 SHA1 29c38332d4e44b914bd1e41a1d3ddc1c2f01e7f2 SHA256 8bfec6bd7b7336a6ca539135ec412f968c19ddca7ae13ded9d371c32360467dd DIST tvbrowser-2.2.1-src.zip 8138920 RMD160 e0080a207026ea0d3037e97032fe0451bb973302 SHA1 eb89df02e17205eca92b0fc674fcbdd3c504086c SHA256 bb4217743331f475a666e74ea9f307755f890213514e1c817d5d825a90240499 +DIST tvbrowser-2.5-src.zip 8865427 RMD160 2f47f2a9d56f9fac26dae77f6f34dac06bd17b7d SHA1 a8a3444cfc40f67e16beccfb491121d98f4e0cc1 SHA256 f2f60303a5600dd3bcd94dc681f469f9e0e6e408581db4eccc2bad3cbdbb3c7a EBUILD tvbrowser-2.1.ebuild 3050 RMD160 72a1f3a74350c088f4a2ad8046e562edaac804cf SHA1 dd184eb32d773a29539a669cf714ec66f00d3037 SHA256 67e1de854ac7b66c3c0416bd1e0350483becb3f7bb3c23c2abda335172214d68 MD5 5fdffbb64f48d7399443706dbd6ec420 tvbrowser-2.1.ebuild 3050 RMD160 72a1f3a74350c088f4a2ad8046e562edaac804cf tvbrowser-2.1.ebuild 3050 @@ -20,24 +33,31 @@ EBUILD tvbrowser-2.2.1.ebuild 2929 RMD160 a4441d05e5a7b0b4792122153fe7aaf0a51f50 MD5 187ad8a6d0c9fa1dac187570eca365cf tvbrowser-2.2.1.ebuild 2929 RMD160 a4441d05e5a7b0b4792122153fe7aaf0a51f50c5 tvbrowser-2.2.1.ebuild 2929 SHA256 a85ab64f481335dc4076fd3517f767615dd99d8d1f0ea6e0fd8a7a515687f44c tvbrowser-2.2.1.ebuild 2929 -MISC ChangeLog 1830 RMD160 9f57b58d5a719d2a5387a831f7282e16dbf19fae SHA1 6e5963af60fb08e9bf6ede56639e6c93dc5ec1aa SHA256 ef5c3f9a68fa7680355e0409c8865bdfa5bd762ade51b2454eb00f5f30bba9f6 -MD5 23ba7a349cf411f87d5a9e7926329e2a ChangeLog 1830 -RMD160 9f57b58d5a719d2a5387a831f7282e16dbf19fae ChangeLog 1830 -SHA256 ef5c3f9a68fa7680355e0409c8865bdfa5bd762ade51b2454eb00f5f30bba9f6 ChangeLog 1830 -MISC metadata.xml 300 RMD160 c85719cef743cf573efe73f8f84564292085c91c SHA1 4c00933e1ed60039fae091034d83e28d0890e87c SHA256 29feafd8b7177b65f8bd92553ac96779d9a91e3b7b4eeecfb0924eb7b6979587 -MD5 7c30ab7528b676a1a0c2737821599b29 metadata.xml 300 -RMD160 c85719cef743cf573efe73f8f84564292085c91c metadata.xml 300 -SHA256 29feafd8b7177b65f8bd92553ac96779d9a91e3b7b4eeecfb0924eb7b6979587 metadata.xml 300 +EBUILD tvbrowser-2.5.ebuild 3269 RMD160 7f99c310e0eddbc87b938c1ea2dc8ce9a8ecf442 SHA1 31a6b72048a5a9af4aec04f39a466a70abe3e72b SHA256 ed13f112b24db4e19c7940fd6d7ca08a02316c96d04a9309792190640fc2753e +MD5 be7b8235f127b19374bb91e024c5dd8b tvbrowser-2.5.ebuild 3269 +RMD160 7f99c310e0eddbc87b938c1ea2dc8ce9a8ecf442 tvbrowser-2.5.ebuild 3269 +SHA256 ed13f112b24db4e19c7940fd6d7ca08a02316c96d04a9309792190640fc2753e tvbrowser-2.5.ebuild 3269 +MISC ChangeLog 2145 RMD160 4b9552367478e4738ddc988621848cc4e65e2037 SHA1 b44ba3c20a380cd4d6e18fefced4c8b3b0bcd8e2 SHA256 d51adf84e8e1af6981c46b6bedc0eb1c2ff9ebe8144d88bda71450e283114751 +MD5 7b69da973273cf82a3f7906910a90ed2 ChangeLog 2145 +RMD160 4b9552367478e4738ddc988621848cc4e65e2037 ChangeLog 2145 +SHA256 d51adf84e8e1af6981c46b6bedc0eb1c2ff9ebe8144d88bda71450e283114751 ChangeLog 2145 +MISC metadata.xml 395 RMD160 a22f8ae33da65ccc0ff251b07c15adafd6c1e615 SHA1 5589ca30d70f5334e2003b17f7594d4a283a280b SHA256 d51789b8a015ccbfd70a9b6ba7ca2e8e5022d9d67e008a96f7920fe93f16ff88 +MD5 4c44116c92d8282ca90875480b20a362 metadata.xml 395 +RMD160 a22f8ae33da65ccc0ff251b07c15adafd6c1e615 metadata.xml 395 +SHA256 d51789b8a015ccbfd70a9b6ba7ca2e8e5022d9d67e008a96f7920fe93f16ff88 metadata.xml 395 MD5 157ff2d8ae57cb817f9796cc69b0c45c files/digest-tvbrowser-2.1 479 RMD160 bd0ebbd0e74cb39ef73fc8fdb291bdce60463fee files/digest-tvbrowser-2.1 479 SHA256 a1a1bacee8dd965eb5c6ff448ffe2025a176f449b1728eefa2d4fdf3e8fc00c7 files/digest-tvbrowser-2.1 479 MD5 0bd8ad654d1ad19db531a20b1311d646 files/digest-tvbrowser-2.2.1 485 RMD160 f6c21121b11508d27a957b89d4f1b642b9cdffdb files/digest-tvbrowser-2.2.1 485 SHA256 fc70e99e069aedc9fb22663048ea97fa19354b6ca710828474511266faad8ab5 files/digest-tvbrowser-2.2.1 485 +MD5 76bc03e5e93fb8cad40e4bad9887764b files/digest-tvbrowser-2.5 479 +RMD160 705415ee3ec009d874f6509a93dc04b4d9c90812 files/digest-tvbrowser-2.5 479 +SHA256 cdf4ac7a77d4ddaef54024266241e8731fcbd27348b4d055af262dbe2e992152 files/digest-tvbrowser-2.5 479 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.1 (GNU/Linux) -iD8DBQFFn3Qnt2vP6XvVdOcRAiNSAJ474+aY5cLG1dsN7fPXZ6r8m2apsgCePXMR -jmPp/vVvn7NInOSVpBa7Z5U= -=JsXI +iD8DBQFFo9w0t2vP6XvVdOcRAtc1AJ9c3u+zEpKRa92ef3jxb7oRGU1jcQCglOg4 +Oy7AUVga5IC5OxbkQEFbcBA= +=H8JE -----END PGP SIGNATURE----- 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 + +-#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 @@ + + + +- +- +- +- +- +- + + + + + +- + + + +@@ -339,13 +332,6 @@ + compress="false"> + + +- +- +- +- +- +- + + 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","The Registry value couldn't be changed. Maybe you havn't the right to do it.
If it is so contact you Administrator and let him do it for you.

The following description is for experts. If you change or delete the wrong value in the Registry you could destroy your Windows installation.

To get no warning on TV-Browser start the Registry value WaitToKillAppTimeout in the Registry path
HKEY_CURRENT_USER\\Control Panel\\Desktop have to be at least 5000 or the value for AutoEndTasks in the same path have to be 0."), +- 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 @@ media-tv -zzam@gentoo.org -Matthias Schwarzott + renegart@gmx.de + Mirko Günther + Proxied maintainer + + + zzam@gentoo.org + Matthias Schwarzott - - 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 +} -- 2.26.2