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.

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

4 files changed, 21 insertions, 104 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/Manifest b/media-tv/tvtime/Manifest
index 84383df580ba..3a6cc1c7b2d5 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
@@ -17,18 +17,13 @@ DIST tvtime-1.0.2-alsamixer.patch 36484 RMD160 22237eb387403804ef86dc01ffdae7f06
 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 2200 RMD160 55d6ad28970da609693321525b7e683675df1e17 SHA1 06e9ec116bdcca0b025ca12d82fa5526e41ba252 SHA256 b1c4c8e814b0e799da1cd50e82613dfe785f2adab420b82948c618a6a9ba8f08
-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 9730 RMD160 d7a371d6878a034ce882ddabde4ab0eb34de18b1 SHA1 87d9cd0ebb6d6403ad570697a09e7be4ee371aa8 SHA256 191effe73e72e5c297a557eba6d70edb17c1b7f78b663efa20079d1a5bb1d61d
+EBUILD tvtime-1.0.2_p20110131-r2.ebuild 2687 RMD160 6c50b50d70fd64a2220f39c21931c501c9b3c709 SHA1 be44337d19cdb1ecbd64b26f096232e981d2b0bc SHA256 f3c2534f0e767a069699ed42c57cfceb6a6c76069ace48a89b1f57eab970714f
+MISC ChangeLog 10073 RMD160 448fcc3a71ac03ad2a9ef8170c6b05b51ad7b6b5 SHA1 8e63d0f288363e8ddd52a47e618c7e70c918ddde SHA256 ac584b2698da0078815b61c6f8281ea56ba1cd246da7519edf1d3200542b6c9d
 MISC metadata.xml 298 RMD160 b3c50e3158896716b3eed3bf8a2592979388b8c0 SHA1 63ef4f15859c74802318b2caa220040a02e6863f SHA256 d3ccf40b1c0e6e264c8771fe382756028d2eaefa0bfa5c69900c6fe152db158c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBAgAGBQJOkz7AAAoJEEdUh39IaPFNLwUH/At7GOBLuGVGMqxpcwZZ9DUn
-lrdpBSQTiWiJL0mVfmeIGS6J9fAc9s0qhjuU2iaH09hpykMY3VeLzAn7F/I95xfF
-MMjNnviV2FdDI5wklYbaLpxvczCpRZcYdoFrfd++GJ3A3a+DzGk7+Q4h+Xm4FYzH
-PJV2soKYgPFZtXIcxYhi7zv2Oj4nJMiMHwtD/xjMQYdU/vzwSciWd55R8RkN+wfg
-ltXEVZ4xfwp8gMuAxjTVbj9tM8f1/ect9HbAfOXiQvhzfQU+BhGkXFqj3amF0vEQ
-bV1RKuERGhEm07spXmDcvJH/NpwI9+JHhpUkxSltrL1HyQN3yKQw2hudcVX+32c=
-=eBtt
+iF4EAREIAAYFAk6Wnc0ACgkQ3Ca6Xy8+rvQMkQEAhT3oSM5+zfucxvFsNNUZRe5W
+B6tVu+cISN8eLotaz6YA/j+07ChX7EBMUtGFRsBIDuhitPM5dE4RNCFfdbAL/yOh
+=PtEq
 -----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-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
-}