7 files changed, 12 insertions, 210 deletions
diff --git a/media-video/ttcut/ChangeLog b/media-video/ttcut/ChangeLog
index 02ba0a78738a..6f388887ceae 100644
--- a/media-video/ttcut/ChangeLog
+++ b/media-video/ttcut/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/ttcut
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ttcut/ChangeLog,v 1.10 2008/02/01 15:38:22 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ttcut/ChangeLog,v 1.11 2008/04/12 16:11:41 yngwin Exp $
+
+  12 Apr 2008; Ben de Groot <yngwin@gentoo.org> -ttcut-0.19.4.ebuild,
+  -ttcut-0.19.5.ebuild, -ttcut-0.19.5-r1.ebuild, -ttcut-0.19.6.ebuild,
+  ttcut-0.19.6-r1.ebuild:
+  Removing older versions. Fixing src_url and qt4 deps. Fixes bug 217193.
 
 *ttcut-0.19.6-r1 (01 Feb 2008)
 
diff --git a/media-video/ttcut/Manifest b/media-video/ttcut/Manifest
index 65a4914a0ce8..27dbe477f740 100644
--- a/media-video/ttcut/Manifest
+++ b/media-video/ttcut/Manifest
@@ -1,20 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-DIST ttcut-0.19.4.tar.gz 378282 RMD160 0858e99f30eee7c0e710f4ea367c56b2489d1887 SHA1 b85d1eaaa59676d9c8e55004c71cf148765d0572 SHA256 62036ad05e91216d357e82562add365c5771ecdca638a541c94079075e949034
-DIST ttcut-0.19.5.tar.gz 378372 RMD160 bb91b202608d3198619c9fa5c52176c1450f5971 SHA1 0f63d32ebe88147bef3c0ca110cf4be162b14241 SHA256 9566895816cd4185b9fc9d0887de991b46aa5ea5306da8cafc4db2a48097140a
 DIST ttcut-0.19.6.tar.gz 283977 RMD160 80e0e29cf0a807a5603b1d2b28e0467c04c8577e SHA1 ebb7b8cb9e516d9a3d394dc08abf3f8cd28f66c0 SHA256 e0f3f55fdcd67096de5588ddfb4a455cff731a9723923b34c283546c42c2ae11
-EBUILD ttcut-0.19.4.ebuild 1301 RMD160 813ae4e33f71d857a928f70bef78c63170943c80 SHA1 d89d9ed6756c008f03617ea6c26df80ab2a7d691 SHA256 4ecd993edfe3fe7ead82d7a41218f6b5f460abc65bec6ea836dd21ea253e1db5
-EBUILD ttcut-0.19.5-r1.ebuild 1264 RMD160 bd43775fe420741cb774710a56617cf9c1bbb38c SHA1 f18445826ff0e684e29ddff25f09193b27ac572c SHA256 3631032738b3d4725369f85a427ee99cc4057f1c91e4da55f9847d80d08dc974
-EBUILD ttcut-0.19.5.ebuild 1301 RMD160 0a5a70b51e657e32861f09f4c92d876bfa031aa0 SHA1 1b33962915bf525c352177dd3025c7ed5f70690e SHA256 f4abeeae23942b86c57f39eae437ba977b21fd3a5b28e721347f5762bf6676c8
-EBUILD ttcut-0.19.6-r1.ebuild 1270 RMD160 fac81d97832f4b3a1addb3867e94261c039b96b1 SHA1 0440eacf1698046ad72d4ce4a89df4fb5577dc3f SHA256 7bdb5e437d36bec94e2208c26af4e91deac27d50a3d308a642bc8b156c1e024b
-EBUILD ttcut-0.19.6.ebuild 1261 RMD160 09cb44ebdfc14d8f6a773f01fa5cc6ebc5811330 SHA1 12f308b8fb5a31d7e4b9c372a01d22e4623f0827 SHA256 2de2f433f2e531c9444bf193df0db345691faf1505444907a2c4cd811b415a33
-MISC ChangeLog 1883 RMD160 8559bf71c8b947de4deb96cf3615c0839f723d5e SHA1 5e87e6dd073e47138e69cf8645f74b98768d89b6 SHA256 ffc22d720364e9783ea28c691db60b1630b6b3b79c815253ef842dfb652da7ad
+EBUILD ttcut-0.19.6-r1.ebuild 1322 RMD160 42849465a250d05598f720a6f0a599d656a4fa3e SHA1 258449126c8b49597001c1afb4f295b215a1aa7a SHA256 d9381c119dc524997d97a3801dd6d92ae27ec376b706f0a15a5c097e00997e67
+MISC ChangeLog 2127 RMD160 45cc1b6e5b06bc912178875032ce16af710c1550 SHA1 7bd38a7a16c62086441e3fb859df156933fa81ed SHA256 35322b956e82ed9cf1d0552adb0fd74f0e3bc1cf9f526e6d9d9f4c4255e6be84
 MISC metadata.xml 464 RMD160 01f9f34635f456c170ab3f3baf8d2f6a528900b9 SHA1 7dddf999949e75542b0d5f033d55aa07deaefb9c SHA256 edc3c8a79b253d45fea4029a2d722879dd8de075f2164997fdfa5d0117fd905b
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
-
-iD8DBQFHozz0t2vP6XvVdOcRAs0vAJ9mDu+L+O6GhDNsVtLt4wWlvK0G+QCfe6ed
-mmFClwMQcdqxEfTBmNp9b8c=
-=hGOB
------END PGP SIGNATURE-----
diff --git a/media-video/ttcut/ttcut-0.19.4.ebuild b/media-video/ttcut/ttcut-0.19.4.ebuild
deleted file mode 100644
index b191e5e9298a..000000000000
--- a/media-video/ttcut/ttcut-0.19.4.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ttcut/ttcut-0.19.4.ebuild,v 1.3 2007/06/13 15:26:16 zzam Exp $
-
-inherit eutils qt4
-
-DESCRIPTION="Tool for removing advertisements from recorded MPEG files"
-HOMEPAGE="http://ttcut.tritime.org/"
-SRC_URI="mirror://berlios/${PN}/${P/_/-}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-
-DEPEND="$(qt4_min_version 4.1)
-		>=media-libs/libmpeg2-0.4.0
-		virtual/opengl"
-
-RDEPEND="${DEPEND}
-		media-video/mplayer
-		media-video/transcode"
-
-S=${WORKDIR}/${PN}
-
-pkg_setup() {
-	if ! built_with_use media-video/transcode mjpeg ; then
-		eerror "In order to have encoding mode working with ttcut"
-		eerror "you need to recompile transcode with mjpeg USE flag enabled."
-		die "Recompile transcode with mjpeg USE flag enabled"
-	fi
-}
-
-src_compile() {
-	qmake ttcut.pro -o Makefile.ttcut || \
-		die "configuring ttcut failed"
-	emake -f Makefile.ttcut || die "emake failed"
-}
-
-src_install() {
-	dobin ttcut || die "Couldn't install ttcut"
-	make_desktop_entry ttcut TTCut "" "AudioVideo;Video;AudioVideoEditing" || \
-		die "Couldn't make ttcut desktop entry"
-
-	dodoc AUTHORS BUGS CHANGELOG \
-		README.DE README.EN TODO || die "Couldn't install documentation"
-}
diff --git a/media-video/ttcut/ttcut-0.19.5-r1.ebuild b/media-video/ttcut/ttcut-0.19.5-r1.ebuild
deleted file mode 100644
index 38a4383d6715..000000000000
--- a/media-video/ttcut/ttcut-0.19.5-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ttcut/ttcut-0.19.5-r1.ebuild,v 1.1 2007/08/18 21:49:35 zzam Exp $
-
-inherit eutils qt4
-
-DESCRIPTION="Tool for removing advertisements from recorded MPEG files"
-HOMEPAGE="http://ttcut.tritime.org/"
-SRC_URI="mirror://berlios/${PN}/${P/_/-}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-
-DEPEND="$(qt4_min_version 4.1)
-	>=media-libs/libmpeg2-0.4.0
-	virtual/opengl"
-
-RDEPEND="${DEPEND}
-	media-video/mplayer
-	media-video/transcode"
-
-S=${WORKDIR}/${PN}
-
-pkg_setup() {
-	if ! built_with_use media-video/transcode mjpeg ; then
-		eerror "In order to have encoding mode working with ttcut"
-		eerror "you need to recompile transcode with mjpeg USE flag enabled."
-		die "Recompile transcode with mjpeg USE flag enabled"
-	fi
-}
-
-src_compile() {
-	eqmake4 ttcut.pro -o Makefile.ttcut
-	emake -f Makefile.ttcut || die "emake failed"
-}
-
-src_install() {
-	dobin ttcut || die "Couldn't install ttcut"
-	make_desktop_entry ttcut TTCut "" "AudioVideo;Video;AudioVideoEditing" || \
-		die "Couldn't make ttcut desktop entry"
-
-	dodoc AUTHORS BUGS CHANGELOG \
-		README.DE README.EN TODO || die "Couldn't install documentation"
-}
diff --git a/media-video/ttcut/ttcut-0.19.5.ebuild b/media-video/ttcut/ttcut-0.19.5.ebuild
deleted file mode 100644
index 1292697c5b0d..000000000000
--- a/media-video/ttcut/ttcut-0.19.5.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ttcut/ttcut-0.19.5.ebuild,v 1.1 2007/06/21 19:55:00 zzam Exp $
-
-inherit eutils qt4
-
-DESCRIPTION="Tool for removing advertisements from recorded MPEG files"
-HOMEPAGE="http://ttcut.tritime.org/"
-SRC_URI="mirror://berlios/${PN}/${P/_/-}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-
-DEPEND="$(qt4_min_version 4.1)
-		>=media-libs/libmpeg2-0.4.0
-		virtual/opengl"
-
-RDEPEND="${DEPEND}
-		media-video/mplayer
-		media-video/transcode"
-
-S=${WORKDIR}/${PN}
-
-pkg_setup() {
-	if ! built_with_use media-video/transcode mjpeg ; then
-		eerror "In order to have encoding mode working with ttcut"
-		eerror "you need to recompile transcode with mjpeg USE flag enabled."
-		die "Recompile transcode with mjpeg USE flag enabled"
-	fi
-}
-
-src_compile() {
-	qmake ttcut.pro -o Makefile.ttcut || \
-		die "configuring ttcut failed"
-	emake -f Makefile.ttcut || die "emake failed"
-}
-
-src_install() {
-	dobin ttcut || die "Couldn't install ttcut"
-	make_desktop_entry ttcut TTCut "" "AudioVideo;Video;AudioVideoEditing" || \
-		die "Couldn't make ttcut desktop entry"
-
-	dodoc AUTHORS BUGS CHANGELOG \
-		README.DE README.EN TODO || die "Couldn't install documentation"
-}
diff --git a/media-video/ttcut/ttcut-0.19.6-r1.ebuild b/media-video/ttcut/ttcut-0.19.6-r1.ebuild
index 5fb95abc7a93..151158e7a3ee 100644
--- a/media-video/ttcut/ttcut-0.19.6-r1.ebuild
+++ b/media-video/ttcut/ttcut-0.19.6-r1.ebuild
@@ -1,20 +1,19 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ttcut/ttcut-0.19.6-r1.ebuild,v 1.1 2008/02/01 15:38:22 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ttcut/ttcut-0.19.6-r1.ebuild,v 1.2 2008/04/12 16:11:41 yngwin Exp $
 
 EAPI="1"
 inherit eutils qt4
 
 DESCRIPTION="Tool for removing advertisements from recorded MPEG files"
 HOMEPAGE="http://ttcut.tritime.org/"
-SRC_URI="mirror://berlios/${PN}/${P/_/-}.tar.gz"
-
+SRC_URI="mirror://berlios/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-DEPEND=">=x11-libs/qt-4.3:4
+DEPEND="|| ( =x11-libs/qt-4.3* ( x11-libs/qt-gui:4 x11-libs/qt-opengl:4 ) )
 	>=media-libs/libmpeg2-0.4.0
 	virtual/opengl"
 
diff --git a/media-video/ttcut/ttcut-0.19.6.ebuild b/media-video/ttcut/ttcut-0.19.6.ebuild
deleted file mode 100644
index 6978f9a41555..000000000000
--- a/media-video/ttcut/ttcut-0.19.6.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ttcut/ttcut-0.19.6.ebuild,v 1.1 2007/09/02 14:26:11 zzam Exp $
-
-inherit eutils qt4
-
-DESCRIPTION="Tool for removing advertisements from recorded MPEG files"
-HOMEPAGE="http://ttcut.tritime.org/"
-SRC_URI="mirror://berlios/${PN}/${P/_/-}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-
-DEPEND="$(qt4_min_version 4.1)
-	>=media-libs/libmpeg2-0.4.0
-	virtual/opengl"
-
-RDEPEND="${DEPEND}
-	media-video/mplayer
-	media-video/transcode"
-
-S=${WORKDIR}/${PN}
-
-pkg_setup() {
-	if ! built_with_use media-video/transcode mjpeg ; then
-		eerror "In order to have encoding mode working with ttcut"
-		eerror "you need to recompile transcode with mjpeg USE flag enabled."
-		die "Recompile transcode with mjpeg USE flag enabled"
-	fi
-}
-
-src_compile() {
-	eqmake4 ttcut.pro -o Makefile.ttcut
-	emake -f Makefile.ttcut || die "emake failed"
-}
-
-src_install() {
-	dobin ttcut || die "Couldn't install ttcut"
-	make_desktop_entry ttcut TTCut "" "AudioVideo;Video;AudioVideoEditing" || \
-		die "Couldn't make ttcut desktop entry"
-
-	dodoc AUTHORS BUGS CHANGELOG \
-		README.DE README.EN TODO || die "Couldn't install documentation"
-}