diff options
author | Matthias Schwarzott <zzam@gentoo.org> | 2006-10-18 18:16:53 +0000 |
---|---|---|
committer | Matthias Schwarzott <zzam@gentoo.org> | 2006-10-18 18:16:53 +0000 |
commit | caa87b635ac6f5bfc827d1745d53c3fbfb682057 (patch) | |
tree | ef3ace258bf00fdfbb48120640839f2a2f818208 | |
parent | Initial import (fixes bug #118130). (diff) | |
download | gentoo-2-caa87b635ac6f5bfc827d1745d53c3fbfb682057.tar.gz gentoo-2-caa87b635ac6f5bfc827d1745d53c3fbfb682057.tar.bz2 gentoo-2-caa87b635ac6f5bfc827d1745d53c3fbfb682057.zip |
Version bumped. This needs a load of new depends. Thanks to spiralvoice <spiralvoice@hotmail.com> for noticing, Bug #135554. Removed amd64-keyword until dependencies are keyworded.
(Portage version: 2.1.2_pre3-r4)
-rw-r--r-- | media-tv/tvbrowser/ChangeLog | 10 | ||||
-rw-r--r-- | media-tv/tvbrowser/files/digest-tvbrowser-2.1 | 4 | ||||
-rw-r--r-- | media-tv/tvbrowser/files/digest-tvbrowser-2.2.1 | 3 | ||||
-rw-r--r-- | media-tv/tvbrowser/files/tvbrowser-2.2.1-makefiles.patch | 64 | ||||
-rw-r--r-- | media-tv/tvbrowser/tvbrowser-2.2.1.ebuild | 135 |
5 files changed, 215 insertions, 1 deletions
diff --git a/media-tv/tvbrowser/ChangeLog b/media-tv/tvbrowser/ChangeLog index f1e0b7d74c6b..3c332ec48882 100644 --- a/media-tv/tvbrowser/ChangeLog +++ b/media-tv/tvbrowser/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for media-tv/tvbrowser # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-tv/tvbrowser/ChangeLog,v 1.3 2006/02/02 16:34:12 chutzpah Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-tv/tvbrowser/ChangeLog,v 1.4 2006/10/18 18:16:53 zzam Exp $ + +*tvbrowser-2.2.1 (18 Oct 2006) + + 18 Oct 2006; Matthias Schwarzott <zzam@gentoo.org> + +files/tvbrowser-2.2.1-makefiles.patch, +tvbrowser-2.2.1.ebuild: + Version bumped. This needs a load of new depends. Thanks to spiralvoice + <spiralvoice@hotmail.com> for noticing, Bug #135554. Removed amd64-keyword + until dependencies are keyworded. 02 Feb 2006; Patrick McLean <chutzpah@gentoo.org> tvbrowser-2.1.ebuild: Add ~amd64 keyword (but #120087) and port to modular X. The dependencies for diff --git a/media-tv/tvbrowser/files/digest-tvbrowser-2.1 b/media-tv/tvbrowser/files/digest-tvbrowser-2.1 index 4f8ca653021a..e890de83d58f 100644 --- a/media-tv/tvbrowser/files/digest-tvbrowser-2.1 +++ b/media-tv/tvbrowser/files/digest-tvbrowser-2.1 @@ -1,2 +1,6 @@ MD5 672a2f53c54511ced3f796c65a9183f7 allthemepacks.zip 210954 +RMD160 6d456534bd504c98eb57ff39876ee2c2ffabee70 allthemepacks.zip 210954 +SHA256 602d229f734c2fa3e2984a2d86faf6c1825d6db56329b00ce25ba1a2eb5b64b7 allthemepacks.zip 210954 MD5 8852d24f3796e2b104edeee3b59cc0cc tvbrowser-2.1-src.zip 5928402 +RMD160 5918840feec2d09fabaa093de744eed4788756f9 tvbrowser-2.1-src.zip 5928402 +SHA256 8bfec6bd7b7336a6ca539135ec412f968c19ddca7ae13ded9d371c32360467dd tvbrowser-2.1-src.zip 5928402 diff --git a/media-tv/tvbrowser/files/digest-tvbrowser-2.2.1 b/media-tv/tvbrowser/files/digest-tvbrowser-2.2.1 new file mode 100644 index 000000000000..a9d128bee411 --- /dev/null +++ b/media-tv/tvbrowser/files/digest-tvbrowser-2.2.1 @@ -0,0 +1,3 @@ +MD5 2016dd8ab726494b4f8ad215fd4f8569 tvbrowser-2.2.1-src.zip 8138920 +RMD160 e0080a207026ea0d3037e97032fe0451bb973302 tvbrowser-2.2.1-src.zip 8138920 +SHA256 bb4217743331f475a666e74ea9f307755f890213514e1c817d5d825a90240499 tvbrowser-2.2.1-src.zip 8138920 diff --git a/media-tv/tvbrowser/files/tvbrowser-2.2.1-makefiles.patch b/media-tv/tvbrowser/files/tvbrowser-2.2.1-makefiles.patch new file mode 100644 index 000000000000..4758e98ac539 --- /dev/null +++ b/media-tv/tvbrowser/files/tvbrowser-2.2.1-makefiles.patch @@ -0,0 +1,64 @@ +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/tvbrowser-2.2.1.ebuild b/media-tv/tvbrowser/tvbrowser-2.2.1.ebuild new file mode 100644 index 000000000000..17a78f349543 --- /dev/null +++ b/media-tv/tvbrowser/tvbrowser-2.2.1.ebuild @@ -0,0 +1,135 @@ +# Copyright 1999-2006 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.1 2006/10/18 18:16:53 zzam Exp $ + +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" + +SLOT="0" +KEYWORDS="~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/x11 + ) + >=virtual/jre-1.4 + 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.4 + ${RDEPEND} + >=dev-java/ant-core-1.5.4 + app-arch/unzip + source? ( app-arch/zip )" + +LICENSE="GPL-2" + +IUSE="doc jikes themes source" + +src_unpack() { + unpack ${A} + + 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 + local f + for f in missing depcomp; do + sed -i ${f} -e 's#\r$##' + done + + eautoreconf +} + +src_compile() { + local antflags="runtime-linux" + use doc && antflags="${antflags} public-doc" + use jikes && antflags="${antflags} -Dbuild.compiler=jikes" + 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} + + mkdir "${D}/usr/share/${PN}-themepacks" + cp themepacks/themepack.zip "${D}/usr/share/${PN}-themepacks" + + 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() { + einfo + einfo "If you want Systray you have to use a jre >= 1.5 !" + einfo +} |