Removing older versions. Fixing src_url and qt4 deps. Fixes bug 217193.

(Portage version: 2.1.5_rc2)

6 files changed, 10 insertions, 192 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/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"
-}