Bump to 1.0.2_p20110131 from new upstream. Fixes building with linux-headers-2.6.38 and newer autoconf. Closes bug 359743 by Billy DeVincentis.

(Portage version: 2.2.0_alpha37/cvs/Linux x86_64)

6 files changed, 256 insertions, 3 deletions

diff --git a/media-tv/tvtime/ChangeLog b/media-tv/tvtime/ChangeLog
index 885c812a334d..2b8ec10e4242 100644
--- a/media-tv/tvtime/ChangeLog
+++ b/media-tv/tvtime/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for media-tv/tvtime
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/tvtime/ChangeLog,v 1.48 2010/12/01 05:10:42 flameeyes Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-tv/tvtime/ChangeLog,v 1.49 2011/05/29 22:08:33 a3li Exp $
+
+*tvtime-1.0.2_p20110131 (29 May 2011)
+
+  29 May 2011; Alex Legler <a3li@gentoo.org> +tvtime-1.0.2_p20110131.ebuild,
+  +files/tvtime-1.0.2_p20110131-autotools.patch,
+  +files/tvtime-1.0.2_p20110131-gettext.patch,
+  +files/tvtime-1.0.2_p20110131-libsupc++.patch, metadata.xml:
+  Bump to 1.0.2_p20110131 from new upstream. Fixes building with
+  linux-headers-2.6.38 and newer autoconf. Closes bug 359743 by Billy
+  DeVincentis.
 
   01 Dec 2010; Diego E. Pettenò <flameeyes@gentoo.org> tvtime-1.0.2-r2.ebuild,
   +files/tvtime-1.0.2-autotools.patch:
diff --git a/media-tv/tvtime/files/tvtime-1.0.2_p20110131-autotools.patch b/media-tv/tvtime/files/tvtime-1.0.2_p20110131-autotools.patch
new file mode 100644
index 000000000000..81afa786afc1
--- /dev/null
+++ b/media-tv/tvtime/files/tvtime-1.0.2_p20110131-autotools.patch
@@ -0,0 +1,69 @@
+diff -Naur tvtime.orig/configure.ac tvtime/configure.ac
+--- tvtime.orig/configure.ac	2011-02-01 02:35:26.000000000 +0100
++++ tvtime/configure.ac	2011-05-29 21:45:16.825993007 +0200
+@@ -10,6 +10,7 @@
+ 
+ # Check for compilers.
+ AC_PROG_CC
++AM_PROG_CC_C_O
+ AC_CHECK_PROG(found_cc, "$CC", yes, no)
+ test "x$found_cc" = "xyes" || exit 1
+ 
+@@ -18,7 +19,6 @@
+ test "x$found_cxx" = "xyes" || exit 1
+ 
+ # Check for libtool.
+-AC_PROG_LIBTOOL
+ 
+ # Checks for header files.
+ AC_HEADER_STDC
+@@ -67,10 +67,7 @@
+ dnl freetype
+ dnl ---------------------------------------------
+ dnl Test for freetype
+-AC_PATH_PROG(FREETYPE_CONFIG, freetype-config, no)
+-if test "$FREETYPE_CONFIG" = "no" ; then
+-  AC_MSG_ERROR(freetype2 needed and freetype-config not found)
+-fi
++PKG_CHECK_MODULES([TTF], [freetype2])
+ 
+ dnl ---------------------------------------------
+ dnl libxml2
+diff -Naur tvtime.orig/src/Makefile.am tvtime/src/Makefile.am
+--- tvtime.orig/src/Makefile.am	2011-02-01 02:35:26.000000000 +0100
++++ tvtime/src/Makefile.am	2011-05-29 21:42:32.156993111 +0200
+@@ -19,9 +19,6 @@
+ tmpdir = /tmp
+ localedir = $(datadir)/locale
+ 
+-TTF_CFLAGS = `$(FREETYPE_CONFIG) --cflags`
+-TTF_LIBS = `$(FREETYPE_CONFIG) --libs`
+-
+ # Set the following if you want to specify an additional font directory
+ # FONT_CFLAGS = -DFONTDIR='/usr/share/fonts/truetype/freefont/'
+ 
+@@ -76,20 +73,20 @@
+ tvtime_CFLAGS = $(TTF_CFLAGS) $(PNG_CFLAGS) $(OPT_CFLAGS) \
+ 	$(PLUGIN_CFLAGS) $(X11_CFLAGS) $(XML2_FLAG) \
+ 	$(FONT_CFLAGS) $(AM_CFLAGS)
+-tvtime_LDFLAGS  = $(TTF_LIBS) $(ZLIB_LIBS) $(PNG_LIBS) \
++tvtime_LDADD  = $(TTF_LIBS) $(ZLIB_LIBS) $(PNG_LIBS) \
+ 	$(X11_LIBS) $(XML2_LIBS) $(ASOUND_LIBS) -lm -lsupc++
+ 
+ tvtime_command_SOURCES = utils.h utils.c tvtimeconf.h tvtimeconf.c \
+ 	tvtime-command.c
+ tvtime_command_CFLAGS = $(OPT_CFLAGS) $(XML2_FLAG) $(AM_CFLAGS)
+-tvtime_command_LDFLAGS  = $(ZLIB_LIBS) $(XML2_LIBS)
++tvtime_command_LDADD  = $(ZLIB_LIBS) $(XML2_LIBS)
+ tvtime_configure_SOURCES = utils.h utils.c tvtimeconf.h tvtimeconf.c \
+ 	tvtime-configure.c
+ tvtime_configure_CFLAGS = $(OPT_CFLAGS) $(XML2_FLAG) $(AM_CFLAGS)
+-tvtime_configure_LDFLAGS  = $(ZLIB_LIBS) $(XML2_LIBS)
++tvtime_configure_LDADD  = $(ZLIB_LIBS) $(XML2_LIBS)
+ tvtime_scanner_SOURCES = utils.h utils.c videoinput.h videoinput.c \
+ 	tvtimeconf.h tvtimeconf.c station.h station.c tvtime-scanner.c \
+ 	mixer.h mixer.c
+ tvtime_scanner_CFLAGS = $(OPT_CFLAGS) $(XML2_FLAG) $(AM_CFLAGS)
+-tvtime_scanner_LDFLAGS  = $(ZLIB_LIBS) $(XML2_LIBS)
++tvtime_scanner_LDADD  = $(ZLIB_LIBS) $(XML2_LIBS)
+ 
diff --git a/media-tv/tvtime/files/tvtime-1.0.2_p20110131-gettext.patch b/media-tv/tvtime/files/tvtime-1.0.2_p20110131-gettext.patch
new file mode 100644
index 000000000000..8a3de541a5aa
--- /dev/null
+++ b/media-tv/tvtime/files/tvtime-1.0.2_p20110131-gettext.patch
@@ -0,0 +1,71 @@
+Quick fix for building with newer autoconf where mkinstalldirs is no longer
+available.
+
+Upstream: no
+Author: Alex Legler <a3li@gentoo.org>
+
+diff -Naur tvtime.orig/po/Makefile.in.in tvtime/po/Makefile.in.in
+--- tvtime.orig/po/Makefile.in.in	2011-02-01 02:35:26.000000000 +0100
++++ tvtime/po/Makefile.in.in	2011-05-29 22:16:54.093991811 +0200
+@@ -26,8 +26,11 @@
+ 
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+-MKINSTALLDIRS = @MKINSTALLDIRS@
+-mkinstalldirs = $(SHELL) $(MKINSTALLDIRS)
++
++mkdir_p = $(SHELL) @install_sh@ -d
++install_sh = $(SHELL) @install_sh@
++MKDIR_P = @MKDIR_P@
++mkdir_p = @mkdir_p@
+ 
+ GMSGFMT = @GMSGFMT@
+ MSGFMT = @MSGFMT@
+@@ -137,7 +140,7 @@
+ install-exec:
+ install-data: install-data-@USE_NLS@
+ 	if test "$(PACKAGE)" = "gettext-tools"; then \
+-	  $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \
++	  $(mkdir_p) $(DESTDIR)$(gettextsrcdir); \
+ 	  for file in $(DISTFILES.common) Makevars.template; do \
+ 	    $(INSTALL_DATA) $(srcdir)/$$file \
+ 			    $(DESTDIR)$(gettextsrcdir)/$$file; \
+@@ -150,13 +153,13 @@
+ 	fi
+ install-data-no: all
+ install-data-yes: all
+-	$(mkinstalldirs) $(DESTDIR)$(datadir)
++	$(mkdir_p) $(DESTDIR)$(datadir)
+ 	@catalogs='$(CATALOGS)'; \
+ 	for cat in $$catalogs; do \
+ 	  cat=`basename $$cat`; \
+ 	  lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
+ 	  dir=$(localedir)/$$lang/LC_MESSAGES; \
+-	  $(mkinstalldirs) $(DESTDIR)$$dir; \
++	  $(mkdir_p) $(DESTDIR)$$dir; \
+ 	  if test -r $$cat; then realcat=$$cat; else realcat=$(srcdir)/$$cat; fi; \
+ 	  $(INSTALL_DATA) $$realcat $(DESTDIR)$$dir/$(DOMAIN).mo; \
+ 	  echo "installing $$realcat as $(DESTDIR)$$dir/$(DOMAIN).mo"; \
+@@ -196,19 +199,19 @@
+ installdirs-exec:
+ installdirs-data: installdirs-data-@USE_NLS@
+ 	if test "$(PACKAGE)" = "gettext-tools"; then \
+-	  $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \
++	  $(mkdir_p) $(DESTDIR)$(gettextsrcdir); \
+ 	else \
+ 	  : ; \
+ 	fi
+ installdirs-data-no:
+ installdirs-data-yes:
+-	$(mkinstalldirs) $(DESTDIR)$(datadir)
++	$(mkdir_p) $(DESTDIR)$(datadir)
+ 	@catalogs='$(CATALOGS)'; \
+ 	for cat in $$catalogs; do \
+ 	  cat=`basename $$cat`; \
+ 	  lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
+ 	  dir=$(localedir)/$$lang/LC_MESSAGES; \
+-	  $(mkinstalldirs) $(DESTDIR)$$dir; \
++	  $(mkdir_p) $(DESTDIR)$$dir; \
+ 	  for lc in '' $(EXTRA_LOCALE_CATEGORIES); do \
+ 	    if test -n "$$lc"; then \
+ 	      if (cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc 2>/dev/null) | grep ' -> ' >/dev/null; then \
diff --git a/media-tv/tvtime/files/tvtime-1.0.2_p20110131-libsupc++.patch b/media-tv/tvtime/files/tvtime-1.0.2_p20110131-libsupc++.patch
new file mode 100644
index 000000000000..00043eabc541
--- /dev/null
+++ b/media-tv/tvtime/files/tvtime-1.0.2_p20110131-libsupc++.patch
@@ -0,0 +1,12 @@
+diff -Naur tvtime.orig/src/Makefile.am tvtime/src/Makefile.am
+--- tvtime.orig/src/Makefile.am	2011-02-01 02:35:26.000000000 +0100
++++ tvtime/src/Makefile.am	2011-05-29 21:39:08.739993239 +0200
+@@ -77,7 +77,7 @@
+ 	$(PLUGIN_CFLAGS) $(X11_CFLAGS) $(XML2_FLAG) \
+ 	$(FONT_CFLAGS) $(AM_CFLAGS)
+ tvtime_LDFLAGS  = $(TTF_LIBS) $(ZLIB_LIBS) $(PNG_LIBS) \
+-	$(X11_LIBS) $(XML2_LIBS) $(ASOUND_LIBS) -lm -lstdc++
++	$(X11_LIBS) $(XML2_LIBS) $(ASOUND_LIBS) -lm -lsupc++
+ 
+ tvtime_command_SOURCES = utils.h utils.c tvtimeconf.h tvtimeconf.c \
+ 	tvtime-command.c
diff --git a/media-tv/tvtime/metadata.xml b/media-tv/tvtime/metadata.xml
index a6b9e38a1b93..987c4080e67d 100644
--- a/media-tv/tvtime/metadata.xml
+++ b/media-tv/tvtime/metadata.xml
@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>media-tv</herd>
+	<herd>media-tv</herd>
+	<maintainer>
+		<email>a3li@gentoo.org</email>
+		<name>Alex Legler</name>
+		<description>Please CC on bugs</description>
+	</maintainer>
 </pkgmetadata>
diff --git a/media-tv/tvtime/tvtime-1.0.2_p20110131.ebuild b/media-tv/tvtime/tvtime-1.0.2_p20110131.ebuild
new file mode 100644
index 000000000000..1f511798240e
--- /dev/null
+++ b/media-tv/tvtime/tvtime-1.0.2_p20110131.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-tv/tvtime/tvtime-1.0.2_p20110131.ebuild,v 1.1 2011/05/29 22:08:33 a3li Exp $
+
+EAPI=4
+inherit eutils autotools
+
+TVTIME_HGREV="111b28cca42d"
+
+DESCRIPTION="High quality television application for use with video capture cards"
+HOMEPAGE="http://tvtime.sourceforge.net/"
+SRC_URI="http://www.kernellabs.com/hg/~dheitmueller/tvtime/archive/${TVTIME_HGREV}.tar.bz2 -> ${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="nls xinerama"
+
+RDEPEND="x11-libs/libSM
+	x11-libs/libICE
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXv
+	x11-libs/libXxf86vm
+	xinerama? ( x11-libs/libXinerama )
+	x11-libs/libXtst
+	x11-libs/libXau
+	x11-libs/libXdmcp
+	>=media-libs/freetype-2
+	>=sys-libs/zlib-1.1.4
+	>=media-libs/libpng-1.2
+	>=dev-libs/libxml2-2.5.11
+	nls? ( virtual/libintl )"
+
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )
+	dev-util/pkgconfig"
+
+S="${WORKDIR}/${PN}-${TVTIME_HGREV}"
+
+src_prepare() {
+	# use 'tvtime' for the application icon see bug #66293
+	sed -i -e "s/tvtime.png/tvtime/" docs/net-tvtime.desktop
+
+	# patch to adapt to PIC or __PIC__ for pic support
+	epatch "${FILESDIR}"/${PN}-pic.patch #74227
+
+	epatch "${FILESDIR}/${PN}-1.0.2-xinerama.patch"
+
+	# Remove linux headers and patch to build with 2.6.18 headers
+	rm -f "${S}"/src/{videodev.h,videodev2.h}
+
+	epatch "${FILESDIR}/${P}-libsupc++.patch"
+
+	epatch "${FILESDIR}/${P}-autotools.patch"
+	epatch "${FILESDIR}/${P}-gettext.patch"
+
+	AT_M4DIR="m4" eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable nls) \
+		$(use_with xinerama) || die "econf failed"
+}
+
+src_compile() {
+	emake || die "compile problem"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "make install failed"
+
+	dohtml docs/html/*
+	dodoc ChangeLog AUTHORS NEWS README
+}
+
+pkg_postinst() {
+	elog "A default setup for ${PN} has been saved as"
+	elog "/etc/tvtime/tvtime.xml. You may need to modify it"
+	elog "for your needs."
+	elog
+	elog "Detailed information on ${PN} setup can be"
+	elog "found at ${HOMEPAGE}help.html"
+	echo
+}