media-video/ttcut: Remove old ebuilds, fix up existing ones and use mirror://berlios

svn path=/sunrise/; revision=1977

6 files changed, 24 insertions, 124 deletions

diff --git a/media-video/ttcut/Manifest b/media-video/ttcut/Manifest
index 629fd6fd8..9f3a2b333 100644
--- a/media-video/ttcut/Manifest
+++ b/media-video/ttcut/Manifest
@@ -1,17 +1,8 @@
-DIST ttcut-0.11.2-alpha.tar.gz 233745 RMD160 91f77c6e26eb9ddd79ea7814b2f39569528a7c99 SHA1 ed8213f68082a15dbedd0a5b1e89e27277e7d02d SHA256 1eb9dd3cea36b053af46be1e495d661f734a4bb70642a3ef8f897befd7bf19b0
 DIST ttcut-0.11.4-alpha.tar.gz 234825 RMD160 1837c6fe95e7a74c379a07cd0c9baa5ef98588fe SHA1 ba7ab0fc570dc7d275dcaa622faf2d26f4179e07 SHA256 46f5ca81e20faec9d87b322bfe541f8c3cdeb40a727beb2c5b5c289ef8b46f3e
-EBUILD ttcut-0.11.2_alpha-r1.ebuild 909 RMD160 795a3e64c982389d4c6c7731dcc19192357751e4 SHA1 95fdf1a1c08e67358d82d2a7a1c58438940df17e SHA256 a9980e3e728b9c0bbdf3b186233cc9529556ffa8bedd4238e076613101c106de
-MD5 3d122accda91995116fac9b19eb6651e ttcut-0.11.2_alpha-r1.ebuild 909
-RMD160 795a3e64c982389d4c6c7731dcc19192357751e4 ttcut-0.11.2_alpha-r1.ebuild 909
-SHA256 a9980e3e728b9c0bbdf3b186233cc9529556ffa8bedd4238e076613101c106de ttcut-0.11.2_alpha-r1.ebuild 909
-EBUILD ttcut-0.11.2_alpha.ebuild 835 RMD160 45b61aca775ebb1f3658a8e3bf11f6373ccb64a4 SHA1 c388c5f9c6a64ec6e5b5482ede75680389f962f5 SHA256 2691517af1a266cb29c7940e0742bf301b9cc9d0bde398459b82a73a04f611a3
-MD5 a7fd76f2f64eb450811a5c1e60e76c13 ttcut-0.11.2_alpha.ebuild 835
-RMD160 45b61aca775ebb1f3658a8e3bf11f6373ccb64a4 ttcut-0.11.2_alpha.ebuild 835
-SHA256 2691517af1a266cb29c7940e0742bf301b9cc9d0bde398459b82a73a04f611a3 ttcut-0.11.2_alpha.ebuild 835
-EBUILD ttcut-0.11.4_alpha.ebuild 909 RMD160 795a3e64c982389d4c6c7731dcc19192357751e4 SHA1 95fdf1a1c08e67358d82d2a7a1c58438940df17e SHA256 a9980e3e728b9c0bbdf3b186233cc9529556ffa8bedd4238e076613101c106de
-MD5 3d122accda91995116fac9b19eb6651e ttcut-0.11.4_alpha.ebuild 909
-RMD160 795a3e64c982389d4c6c7731dcc19192357751e4 ttcut-0.11.4_alpha.ebuild 909
-SHA256 a9980e3e728b9c0bbdf3b186233cc9529556ffa8bedd4238e076613101c106de ttcut-0.11.4_alpha.ebuild 909
+EBUILD ttcut-0.11.4_alpha.ebuild 1199 RMD160 959463c74842884e409418124461f29882ff80e8 SHA1 8c8ac99fda78475a3aa7658560e6d49d502216ff SHA256 3ea37a5004c7e56aceab64d8ea332c90284237cc6be9fa012dc7fcf67c79a622
+MD5 01de6ec9b9d791a4603efbfa8d11ab71 ttcut-0.11.4_alpha.ebuild 1199
+RMD160 959463c74842884e409418124461f29882ff80e8 ttcut-0.11.4_alpha.ebuild 1199
+SHA256 3ea37a5004c7e56aceab64d8ea332c90284237cc6be9fa012dc7fcf67c79a622 ttcut-0.11.4_alpha.ebuild 1199
 EBUILD ttcut-9999.ebuild 905 RMD160 9ba4018678019c0220b5ea6f9458a6be85c9d8f2 SHA1 75866d5816a68904031efe9f93015661e4f49c80 SHA256 5fa6d11643bc8b3ccbdb64af485985cda8b15e1a5a2f8c50b35bca624dca8002
 MD5 1348792720ca94739a70fa351f5b764d ttcut-9999.ebuild 905
 RMD160 9ba4018678019c0220b5ea6f9458a6be85c9d8f2 ttcut-9999.ebuild 905
@@ -24,12 +15,6 @@ MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f4
 MD5 1e678929a9fec6632e227bdf2262e9a1 metadata.xml 170
 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 metadata.xml 170
 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42 metadata.xml 170
-MD5 0947e1f9ad2cc0a7144343bb38f25939 files/digest-ttcut-0.11.2_alpha 256
-RMD160 fee356aecc241a8eba23c2e3ea143d9f7212a06b files/digest-ttcut-0.11.2_alpha 256
-SHA256 8777449b58a38e79f9ac1e95fbde6fa182d3d070ccb36e837721c448c84d0f13 files/digest-ttcut-0.11.2_alpha 256
-MD5 0947e1f9ad2cc0a7144343bb38f25939 files/digest-ttcut-0.11.2_alpha-r1 256
-RMD160 fee356aecc241a8eba23c2e3ea143d9f7212a06b files/digest-ttcut-0.11.2_alpha-r1 256
-SHA256 8777449b58a38e79f9ac1e95fbde6fa182d3d070ccb36e837721c448c84d0f13 files/digest-ttcut-0.11.2_alpha-r1 256
 MD5 4c1bdfe10220286400c8744234f2bf02 files/digest-ttcut-0.11.4_alpha 256
 RMD160 78da54fe22c9fb3eef32e073954eed68b675e60a files/digest-ttcut-0.11.4_alpha 256
 SHA256 04700c4d99e885f7539f560f47f7e8c6ec6e99b608e5b5031013273cec4c4423 files/digest-ttcut-0.11.4_alpha 256
diff --git a/media-video/ttcut/files/digest-ttcut-0.11.2_alpha b/media-video/ttcut/files/digest-ttcut-0.11.2_alpha
deleted file mode 100644
index 0b03ba52e..000000000
--- a/media-video/ttcut/files/digest-ttcut-0.11.2_alpha
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 a14399b3b2549a40739788bd214e2612 ttcut-0.11.2-alpha.tar.gz 233745
-RMD160 91f77c6e26eb9ddd79ea7814b2f39569528a7c99 ttcut-0.11.2-alpha.tar.gz 233745
-SHA256 1eb9dd3cea36b053af46be1e495d661f734a4bb70642a3ef8f897befd7bf19b0 ttcut-0.11.2-alpha.tar.gz 233745
diff --git a/media-video/ttcut/files/digest-ttcut-0.11.2_alpha-r1 b/media-video/ttcut/files/digest-ttcut-0.11.2_alpha-r1
deleted file mode 100644
index 0b03ba52e..000000000
--- a/media-video/ttcut/files/digest-ttcut-0.11.2_alpha-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 a14399b3b2549a40739788bd214e2612 ttcut-0.11.2-alpha.tar.gz 233745
-RMD160 91f77c6e26eb9ddd79ea7814b2f39569528a7c99 ttcut-0.11.2-alpha.tar.gz 233745
-SHA256 1eb9dd3cea36b053af46be1e495d661f734a4bb70642a3ef8f897befd7bf19b0 ttcut-0.11.2-alpha.tar.gz 233745
diff --git a/media-video/ttcut/ttcut-0.11.2_alpha-r1.ebuild b/media-video/ttcut/ttcut-0.11.2_alpha-r1.ebuild
deleted file mode 100644
index ede8e262f..000000000
--- a/media-video/ttcut/ttcut-0.11.2_alpha-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit eutils
-
-DESCRIPTION="Tool for removing advertisements from recorded MPEG files"
-HOMEPAGE="http://ttcut.tritime.org/"
-SRC_URI="http://download.berlios.de/${PN}/${P/_/-}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE="ttmpeg2"
-
-DEPEND=">=media-libs/libmpeg2-0.4.0
-	>=x11-libs/qt-4.1.0"
-
-RDEPEND="${DEPEND}
-	media-video/mplayer
-	media-video/dvdauthor
-	media-video/transcode
-	media-video/ffmpeg"
-
-S=${WORKDIR}/${PN}
-
-src_compile() {
-	if use ttmpeg2 ; then
-		qmake ttmpeg2.pro -o Makefile.ttmpeg2
-		make -f Makefile.ttmpeg2
-	fi
-
-	qmake ttcut.pro -o Makefile.ttcut
-	make -f Makefile.ttcut
-}
-
-src_install() {
-	if use ttmpeg2 ; then
-		dobin ttmpeg2
-		make_desktop_entry ttmpeg2 Ttmpeg2 "" AudioVideoEditing
-	fi
-
-	dobin ttcut
-	make_desktop_entry ttcut Ttcut "" AudioVideoEditing
-}
diff --git a/media-video/ttcut/ttcut-0.11.2_alpha.ebuild b/media-video/ttcut/ttcut-0.11.2_alpha.ebuild
deleted file mode 100644
index 38c21fe4d..000000000
--- a/media-video/ttcut/ttcut-0.11.2_alpha.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit eutils
-
-DESCRIPTION="Tool for removing advertisements from recorded MPEG files"
-HOMEPAGE="http://ttcut.tritime.org/"
-SRC_URI="http://download.berlios.de/${PN}/${P/_/-}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-
-DEPEND=">=media-libs/libmpeg2-0.4.0
-	>=x11-libs/qt-4.1.0"
-
-RDEPEND="${DEPEND}
-	media-video/mplayer
-	media-video/dvdauthor
-	media-video/transcode
-	media-video/ffmpeg"
-
-S=${WORKDIR}/${PN}
-
-src_compile() {
-	qmake ttcut.pro -o Makefile.ttcut
-	make -f Makefile.ttcut
-	qmake ttmpeg2.pro -o Makefile.ttmpeg2
-	make -f Makefile.ttmpeg2
-}
-
-src_install() {
-	dobin ttcut ttmpeg2
-	make_desktop_entry ttcut Ttcut "" AudioVideoEditing
-	make_desktop_entry ttmpeg2 Ttmpeg2 "" AudioVideoEditing
-}
diff --git a/media-video/ttcut/ttcut-0.11.4_alpha.ebuild b/media-video/ttcut/ttcut-0.11.4_alpha.ebuild
index ede8e262f..6d03f25c4 100644
--- a/media-video/ttcut/ttcut-0.11.4_alpha.ebuild
+++ b/media-video/ttcut/ttcut-0.11.4_alpha.ebuild
@@ -2,44 +2,48 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-inherit eutils
+inherit eutils qt4
 
 DESCRIPTION="Tool for removing advertisements from recorded MPEG files"
 HOMEPAGE="http://ttcut.tritime.org/"
-SRC_URI="http://download.berlios.de/${PN}/${P/_/-}.tar.gz"
+SRC_URI="mirror://berlios/${PN}/${P/_/-}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86"
 IUSE="ttmpeg2"
 
-DEPEND=">=media-libs/libmpeg2-0.4.0
-	>=x11-libs/qt-4.1.0"
+DEPEND="$(qt_min_version 4.1)
+		>=media-libs/libmpeg2-0.4.0"
 
 RDEPEND="${DEPEND}
-	media-video/mplayer
-	media-video/dvdauthor
-	media-video/transcode
-	media-video/ffmpeg"
+		media-video/mplayer
+		media-video/dvdauthor
+		media-video/transcode
+		media-video/ffmpeg"
 
 S=${WORKDIR}/${PN}
 
 src_compile() {
 	if use ttmpeg2 ; then
-		qmake ttmpeg2.pro -o Makefile.ttmpeg2
-		make -f Makefile.ttmpeg2
+		qmake ttmpeg2.pro -o Makefile.ttmpeg2 || \
+			die "configuring ttpmeg2 failed"
+		make -f Makefile.ttmpeg2 || die "emake ttmpeg2 failed"
 	fi
 
-	qmake ttcut.pro -o Makefile.ttcut
-	make -f Makefile.ttcut
+	qmake ttcut.pro -o Makefile.ttcut || \
+		die "configuring ttcut failed"
+	emake -f Makefile.ttcut || die "emake failed"
 }
 
 src_install() {
 	if use ttmpeg2 ; then
-		dobin ttmpeg2
-		make_desktop_entry ttmpeg2 Ttmpeg2 "" AudioVideoEditing
+		dobin ttmpeg2 || die "Couldn't install ttmpeg2"
+		make_desktop_entry ttmpeg2 Ttmpeg2 "" AudioVideoEditing || \
+			die "Could make ttmpeg2 desktop entry"
 	fi
 
-	dobin ttcut
-	make_desktop_entry ttcut Ttcut "" AudioVideoEditing
+	dobin ttcut || die "Couldn't install ttcut"
+	make_desktop_entry ttcut Ttcut "" AudioVideoEditing || \
+		die "Could make ttcut desktop entry"
 }