Revbump, hide unstable alsa patch behind masked use flag until it has matured (and things like bug 384215 don't happen anymore). Removing old versions.

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

3 files changed, 15 insertions, 93 deletions

diff --git a/media-tv/tvtime/ChangeLog b/media-tv/tvtime/ChangeLog
index 67790d93511c..f89063c39f5f 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.52 2011/10/10 18:51:25 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/tvtime/ChangeLog,v 1.53 2011/10/13 08:13:56 a3li Exp $
+
+*tvtime-1.0.2_p20110131-r2 (13 Oct 2011)
+
+  13 Oct 2011; Alex Legler <a3li@gentoo.org> -tvtime-1.0.2_p20110131.ebuild,
+  -tvtime-1.0.2_p20110131-r1.ebuild, +tvtime-1.0.2_p20110131-r2.ebuild:
+  Revbump, hide unstable alsa patch behind masked use flag until it has matured
+  (and things like bug 384215 don't happen anymore). Removing old versions.
 
   10 Oct 2011; Samuli Suominen <ssuominen@gentoo.org> tvtime-1.0.2-r2.ebuild:
   Missing #include <zlib.h> for Z_BEST_COMPRESSION. Required by libpng >= 1.5
diff --git a/media-tv/tvtime/tvtime-1.0.2_p20110131-r1.ebuild b/media-tv/tvtime/tvtime-1.0.2_p20110131-r2.ebuild
index abf3e3d62d34..41f639b24354 100644
--- a/media-tv/tvtime/tvtime-1.0.2_p20110131-r1.ebuild
+++ b/media-tv/tvtime/tvtime-1.0.2_p20110131-r2.ebuild
@@ -1,6 +1,6 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/tvtime/tvtime-1.0.2_p20110131-r2.ebuild,v 1.1 2011/10/13 08:13:56 a3li Exp $
 
 EAPI=4
 inherit eutils autotools
@@ -16,7 +16,7 @@ http://dev.gentoo.org/~a3li/distfiles/${PN}-1.0.2-alsamixer.patch"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="nls xinerama"
+IUSE="alsa nls xinerama"
 
 RDEPEND="x11-libs/libSM
 	x11-libs/libICE
@@ -32,7 +32,7 @@ RDEPEND="x11-libs/libSM
 	>=sys-libs/zlib-1.1.4
 	>=media-libs/libpng-1.2
 	>=dev-libs/libxml2-2.5.11
-	media-libs/alsa-lib
+	alsa? ( media-libs/alsa-lib )
 	nls? ( virtual/libintl )"
 
 DEPEND="${RDEPEND}
@@ -63,8 +63,10 @@ src_prepare() {
 	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"
+	if use alsa; then
+		epatch "${DISTDIR}/${PN}-1.0.2-alsa.patch"
+		epatch "${DISTDIR}/${PN}-1.0.2-alsamixer.patch"
+	fi
 
 	AT_M4DIR="m4" eautoreconf
 }
diff --git a/media-tv/tvtime/tvtime-1.0.2_p20110131.ebuild b/media-tv/tvtime/tvtime-1.0.2_p20110131.ebuild
deleted file mode 100644
index 5f52eb33d719..000000000000
--- a/media-tv/tvtime/tvtime-1.0.2_p20110131.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# 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.2 2011/06/02 11:41:44 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"
-	epatch "${FILESDIR}/${PN}-libpng-1.5.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
-}