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.

Package-Manager: portage-2.2.0_alpha37/cvs/Linux x86_64

7 files changed, 268 insertions, 10 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/Manifest b/media-tv/tvtime/Manifest
index 237c79d1a738..fb42e9874b27 100644
--- a/media-tv/tvtime/Manifest
+++ b/media-tv/tvtime/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX tvtime-1.0.2+linux-headers-2.6.18.patch 401 RMD160 a299364d7a35d02f67690c1b4df6e41e274ad0f1 SHA1 ca287bed793e153027f071f9153cd9a06c9a7dc6 SHA256 37d61ef2ec6ef32a83221248a1d13090b05e04fb1f47cb204c93d42abbc18e22
 AUX tvtime-1.0.2-autotools.patch 2944 RMD160 ca3d8249d510a6eb6cd76db89434cb283c1a9f12 SHA1 5e9f19996b1d6e7a0bf7333b60de6c9b66a30310 SHA256 e427364797890f9013315ed5b8c19224bdccd5011c6fd3c2aad480ae287dcf67
@@ -7,15 +7,20 @@ AUX tvtime-1.0.2-gcc41.patch 2114 RMD160 9d9068c95fe551cb4d886857b4c24fcebae790a
 AUX tvtime-1.0.2-glibc-2.10.patch 963 RMD160 59acc4bb9a3093065f0cc1d203fb10b20bd5346d SHA1 f6ea443a94b60f2d0a69676a8342aa7581b474cc SHA256 1a0f27df35b8dcf86e1f2163b9739d3a195af3cca4c3f312a2ad9f3d25cbf84d
 AUX tvtime-1.0.2-libsupc++.patch 698 RMD160 70d89fe5a6ea9326f452cd2770f5e2523895ab68 SHA1 dec1f5f56b707da74600c8b5bec1c2927d57729d SHA256 4856a3e362f4a111a36532a89faaf47b958e3f68fd46bd6a74db1236cf5abf2f
 AUX tvtime-1.0.2-xinerama.patch 1292 RMD160 1c725852d9c692786614b0e3710a5c38682c1f5e SHA1 39c51a9f264111b6ca400778113d008231613551 SHA256 8177203fe7109782e9d20afa66456e4c21fc973d1fafaa160409b9be29570e5b
+AUX tvtime-1.0.2_p20110131-autotools.patch 2519 RMD160 2caefca2215a67787774dd096c70d05dcd59f1f0 SHA1 f98c41c2cca295dc06ccdd13f7ab0bb7de7e0483 SHA256 5992ce49c0c76304911145e20c53505cf962f8e78ad0178d10fc177d4669b1b9
+AUX tvtime-1.0.2_p20110131-gettext.patch 2443 RMD160 0f28fdbc151dce2a3f78d8e77a2b806e4280c87e SHA1 dc0a3b184d565ce53ae35f63003b3d8e40f31848 SHA256 efdb636f290ee653eb0215041141ea7c0226396425dbe26ff5c4c9edf86e1ebd
+AUX tvtime-1.0.2_p20110131-libsupc++.patch 548 RMD160 af77a599ae572ada34825b6bb97675698f30cecf SHA1 e75c9fbbdc99d51fa9477ec4ff518340ddbc488e SHA256 3d155f21cd03bb98020504105768fb71922835f7180f454728b1e9637acddd7b
 AUX tvtime-pic.patch 254 RMD160 31f3fb8937ae15c28ade1f55a1a6947bf31766cf SHA1 3d90369da57861933b7cb99597d85de60416a358 SHA256 db033fc267bf72034f49705680ced9d086b413efc9f947bd94b4e9117f808d41
 DIST tvtime-1.0.2.tar.gz 1645742 RMD160 e7d9621054edba5833f4ea002be8979983fbf3dc SHA1 ea609876084b2d627a84a1f77bf81cc2175ee58e SHA256 aef2a4bab084df252428d66cabec61b4c63fab32cdfc0cc6599d82efd77f0523
+DIST tvtime-1.0.2_p20110131.tar.bz2 3800555 RMD160 64d15f09f3ebfe4399115168d355689470a6d03a SHA1 71fddd2624debb719faa3dd03aa827e93d8eb6db SHA256 37f8f87b52519f80e3d49c7a619706da2c45b526f67e13cdda21fbdf17e1c583
 EBUILD tvtime-1.0.2-r2.ebuild 2068 RMD160 ea2287e5b9b11e979da220315bb11df4704829a0 SHA1 1fefc924fa1ebb197d44761c7030bba3418024ec SHA256 1235d436840d4c9be8153e39dbacaad664065c3944785be1a52df79322e6fddb
-MISC ChangeLog 8613 RMD160 a869ff3f3e9754ea247e4496c017aaf68f896029 SHA1 2fec38eb8858e2030148d98e01bbc6f8a68869de SHA256 08c74b990b6765e54b01a9478fa7a3dddcf38cbd977c952587ca20367192c52d
-MISC metadata.xml 161 RMD160 fee76f69ba822cd04301c58fa0c26ecaf8cc8fb9 SHA1 0aee2176f15a238a6d8fbbf83e4e0fd58653a3fa SHA256 82d33b3ca60662bc745d30d53bb20d04ea588d5aae556ed16efcacdcc37fd4bd
+EBUILD tvtime-1.0.2_p20110131.ebuild 2116 RMD160 741fc94dc1be412a34edf25a5cf5fa481630a3ed SHA1 a7afa86516780ce9b79b75e06455018c3dcfe8d2 SHA256 51b48acf5c8be41ed59c3427daae71fe2f9050f67f80aff6a8a41f2f11eaea76
+MISC ChangeLog 9034 RMD160 38474c9278de9066bea8a387bc8cfcf32f78e9df SHA1 9e6f06c7676716d895f0e709f27f4eed5f73e00c SHA256 af64701a079caabb033e6299dfffec4813cf9d1ab056fd9b9b3c9e76ef9809b0
+MISC metadata.xml 298 RMD160 b3c50e3158896716b3eed3bf8a2592979388b8c0 SHA1 63ef4f15859c74802318b2caa220040a02e6863f SHA256 d3ccf40b1c0e6e264c8771fe382756028d2eaefa0bfa5c69900c6fe152db158c
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAkz12HYACgkQAiZjviIA2XgaRwCfQrAJxp6Mj7UEqYKJEVqHu740
-cqMAnioiIDj1p9xaSEgzZSd1o53Nun7z
-=gw72
+iF4EAREIAAYFAk3iw+EACgkQ3Ca6Xy8+rvTg3AD6A5RZGMh5TC49qbnPN5xHqd8d
+dR3o26kMHyYCmJDRuSMA/jZC7QhaQF42toqAJRJdnRDOVSMOhci/ipcXuQP08Xy3
+=gfQh
 -----END PGP SIGNATURE-----
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
+}