Revision bump. Fixes underlinking, bug 370025 by flameeyes; Adds alsa patches, bug 323797 by Henrik Johansson; Renames desktop file, bug 308297 by Florian Scandella. Add dependency on alsa, and die more.

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

3 files changed, 113 insertions, 5 deletions

diff --git a/media-tv/tvtime/ChangeLog b/media-tv/tvtime/ChangeLog
index 984017613115..82b9ed33d7d7 100644
--- a/media-tv/tvtime/ChangeLog
+++ b/media-tv/tvtime/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-tv/tvtime
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/tvtime/ChangeLog,v 1.50 2011/06/02 11:41:44 a3li Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/tvtime/ChangeLog,v 1.51 2011/08/14 10:42:15 a3li Exp $
+
+*tvtime-1.0.2_p20110131-r1 (14 Aug 2011)
+
+  14 Aug 2011; Alex Legler <a3li@gentoo.org> +tvtime-1.0.2_p20110131-r1.ebuild:
+  Revision bump. Fixes underlinking, bug 370025 by flameeyes; Adds alsa
+  patches, bug 323797 by Henrik Johansson; Renames desktop file, bug 308297 by
+  Florian Scandella. Add dependency on alsa, and die more.
 
   02 Jun 2011; Alex Legler <a3li@gentoo.org> tvtime-1.0.2_p20110131.ebuild,
   +files/tvtime-libpng-1.5.patch:
diff --git a/media-tv/tvtime/Manifest b/media-tv/tvtime/Manifest
index 823e5799ca51..3511521cc9b4 100644
--- a/media-tv/tvtime/Manifest
+++ b/media-tv/tvtime/Manifest
@@ -12,16 +12,19 @@ AUX tvtime-1.0.2_p20110131-gettext.patch 2443 RMD160 0f28fdbc151dce2a3f78d8e77a2
 AUX tvtime-1.0.2_p20110131-libsupc++.patch 548 RMD160 af77a599ae572ada34825b6bb97675698f30cecf SHA1 e75c9fbbdc99d51fa9477ec4ff518340ddbc488e SHA256 3d155f21cd03bb98020504105768fb71922835f7180f454728b1e9637acddd7b
 AUX tvtime-libpng-1.5.patch 449 RMD160 b5281d06d1365d0ed297497c96ba93ff497325b2 SHA1 ccd0506c59dd954e2fe2cc66033592185fc524ac SHA256 ab9842e0da83371d74bb75a67cc81fb056eeefbd1eaf592458e6e9986f38b27e
 AUX tvtime-pic.patch 254 RMD160 31f3fb8937ae15c28ade1f55a1a6947bf31766cf SHA1 3d90369da57861933b7cb99597d85de60416a358 SHA256 db033fc267bf72034f49705680ced9d086b413efc9f947bd94b4e9117f808d41
+DIST tvtime-1.0.2-alsa.patch 17011 RMD160 b9e7e94c918990eb0e88ffc009f77f5e4322fa0d SHA1 139f714083a565cf3a65ab769857608c4d1bb9e3 SHA256 24cc62ee831dbaeb51ef374cf4622dec4b570985df1059f46bab1fe6880469d7
+DIST tvtime-1.0.2-alsamixer.patch 36484 RMD160 22237eb387403804ef86dc01ffdae7f0661be1cf SHA1 2c330d430714cbadb0653a8987a3dd9c2ca9cfdb SHA256 a03605fe8b8444895d57012f30137a2f0a4a5b736c59ec84b1d631427f9ff58e
 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
+EBUILD tvtime-1.0.2_p20110131-r1.ebuild 2647 RMD160 cb0c1592ca0aa92206b3335f8bfb5285a6a3be54 SHA1 db541ab01363e045d9a6cc4e39f5dc45339bda17 SHA256 5525132db787f7269fb6c746293859f15a44d57f716c53ad96fcb88cdb865140
 EBUILD tvtime-1.0.2_p20110131.ebuild 2161 RMD160 8d05c44a9bd42adea025ce2a20ec93d35e4b15b7 SHA1 5c73173ffb6b069fa45472562be851bbe6abc355 SHA256 c6707f855c83ca0b50fb86396739d0b1ca2a9714d768283f393683c711d29f0e
-MISC ChangeLog 9218 RMD160 9423d1a1603b5d618d7674ab54d7890569bfbdb7 SHA1 cbb0581115f2e82a02c63a4504b5c300681fff82 SHA256 bb6e4791aa3e823f23bd2f4eae6696e9f57c3c8cf3934b496ceca903add18ed4
+MISC ChangeLog 9551 RMD160 9637e6d8959843b645a2644702d8597b3e4f1fba SHA1 53592f9bba86df76304af52bc5ce2e02b6eaad45 SHA256 1519e3c30b7c0bc83f6400f01b6ee50416a2aae8882666e12c05fb6244d43e62
 MISC metadata.xml 298 RMD160 b3c50e3158896716b3eed3bf8a2592979388b8c0 SHA1 63ef4f15859c74802318b2caa220040a02e6863f SHA256 d3ccf40b1c0e6e264c8771fe382756028d2eaefa0bfa5c69900c6fe152db158c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF0EAREIAAYFAk3ndvEACgkQ3Ca6Xy8+rvSouwD/aqoU2ElP6DHF6/bMnOpZJ2EB
-FVvRi0GlnHi2CaE4WQUA9iMvneOkBsRf5nVmD/JbdC2tydWvuWtQIRPITO3aj5Y=
-=UcOk
+iF4EAREIAAYFAk5HpgoACgkQ3Ca6Xy8+rvTw6AD9FZ5otREaUZ7wbzqmNaV1y6mp
+FuM9zR18h4lp9VcTIxsA/2iwFrvQoIJVxzQBaW0Khugn1Rthc9MQ3p9tPD/ViGSb
+=u4ce
 -----END PGP SIGNATURE-----
diff --git a/media-tv/tvtime/tvtime-1.0.2_p20110131-r1.ebuild b/media-tv/tvtime/tvtime-1.0.2_p20110131-r1.ebuild
new file mode 100644
index 000000000000..abf3e3d62d34
--- /dev/null
+++ b/media-tv/tvtime/tvtime-1.0.2_p20110131-r1.ebuild
@@ -0,0 +1,98 @@
+# 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-r1.ebuild,v 1.1 2011/08/14 10:42:15 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
+http://dev.gentoo.org/~a3li/distfiles/${PN}-1.0.2-alsa.patch
+http://dev.gentoo.org/~a3li/distfiles/${PN}-1.0.2-alsamixer.patch"
+
+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
+	media-libs/alsa-lib
+	nls? ( virtual/libintl )"
+
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )
+	dev-util/pkgconfig"
+
+S="${WORKDIR}/${PN}-${TVTIME_HGREV}"
+
+src_prepare() {
+	# Rename the desktop file, bug #308297
+	mv docs/net-tvtime.desktop docs/tvtime.desktop || die
+	sed -i -e "s/net-tvtime.desktop/tvtime.desktop/g" docs/Makefile.am || die
+
+	# use 'tvtime' for the application icon see bug #66293
+	sed -i -e "s/tvtime.png/tvtime/" docs/tvtime.desktop || die
+
+	# 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} || die
+
+	epatch "${FILESDIR}/${P}-libsupc++.patch"
+
+	epatch "${FILESDIR}/${P}-autotools.patch"
+	epatch "${FILESDIR}/${P}-gettext.patch"
+	epatch "${FILESDIR}/${PN}-libpng-1.5.patch"
+
+	epatch "${DISTDIR}/${PN}-1.0.2-alsa.patch"
+	epatch "${DISTDIR}/${PN}-1.0.2-alsamixer.patch"
+
+	AT_M4DIR="m4" eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable nls) \
+		$(use_with xinerama) || die "econf failed"
+}
+
+src_compile() {
+	# Fix underlinking, #370025
+	emake LDFLAGS="${LDFLAGS} -lpthread" || 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
+}