--- /usr/portage/media-tv/tvtime/tvtime-1.0.2_p20110131-r3.ebuild	2012-05-02 19:01:19.000000000 -0300
+++ tvtime-1.0.2-r4.ebuild	2013-04-23 20:31:45.000000000 -0300
@@ -1,23 +1,18 @@
 # Copyright 1999-2012 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-r3.ebuild,v 1.5 2012/05/02 21:32:37 jdhore Exp $
+# $Header: $
 
 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-alsamixer-r1.patch
-http://dev.gentoo.org/~a3li/distfiles/${PN}-1.0.2-alsa-r1.patch
-http://dev.gentoo.org/~a3li/distfiles/${PN}-1.0.2-alsa-fixes.patch"
+SRC_URI="http://www.renesp.com.br/files/gentoo/${P}-r4.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="alsa nls xinerama"
+KEYWORDS="amd64 ppc x86 ~x86"
+IUSE="nls xinerama"
 
 RDEPEND="x11-libs/libSM
 	x11-libs/libICE
@@ -33,17 +28,18 @@
 	>=sys-libs/zlib-1.1.4
 	>=media-libs/libpng-1.2
 	>=dev-libs/libxml2-2.5.11
-	alsa? ( media-libs/alsa-lib )
 	nls? ( virtual/libintl )"
 
 DEPEND="${RDEPEND}
 	nls? ( sys-devel/gettext )
 	virtual/pkgconfig"
 
-S="${WORKDIR}/${PN}-${TVTIME_HGREV}"
 DOCS=( ChangeLog AUTHORS NEWS README )
 
 src_prepare() {
+	# patch the desktop file to remove deprecated values
+	epatch "${FILESDIR}/${PN}-desktopfile.patch"
+
 	# 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
@@ -56,21 +52,8 @@
 
 	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}/${P}_p20110131-gettext.patch"
 	epatch "${FILESDIR}/${PN}-libpng-1.5.patch"
-	epatch "${FILESDIR}/${P}-underlinking.patch" #370025
-
-	if use alsa; then
-		epatch "${DISTDIR}/${PN}-1.0.2-alsa-r1.patch"
-		epatch "${DISTDIR}/${PN}-1.0.2-alsamixer-r1.patch"
-		epatch "${DISTDIR}/${PN}-1.0.2-alsa-fixes.patch"
-	fi
 
 	AT_M4DIR="m4" eautoreconf
 }