Fix tk dep, bug 169536

(Portage version: 2.1.2.3)

4 files changed, 14 insertions, 67 deletions

diff --git a/media-video/tovid/ChangeLog b/media-video/tovid/ChangeLog
index 045db4f56eb6..a265d58b7e6e 100644
--- a/media-video/tovid/ChangeLog
+++ b/media-video/tovid/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/tovid
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/tovid/ChangeLog,v 1.6 2007/02/25 16:07:20 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/tovid/ChangeLog,v 1.7 2007/03/30 03:46:11 beandog Exp $
+
+  30 Mar 2007; Steve Dibb <beandog@gentoo.org> -tovid-0.29-r1.ebuild,
+  tovid-0.30.ebuild:
+  Fix tk dep, bug 169536
 
 *tovid-0.30 (25 Feb 2007)
 *tovid-0.29-r1 (25 Feb 2007)
diff --git a/media-video/tovid/files/digest-tovid-0.29-r1 b/media-video/tovid/files/digest-tovid-0.29-r1
deleted file mode 100644
index 378a8d81650d..000000000000
--- a/media-video/tovid/files/digest-tovid-0.29-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 46b5d0d227ac651b086b8ae8d2e3969b tovid-0.29.tar.gz 345846
-RMD160 612d24af62e97031cff4c767865ec64452ae750f tovid-0.29.tar.gz 345846
-SHA256 891ab7f3acccde7f3c440630de6d5c6deab2e002311351101d7da8e6dd542606 tovid-0.29.tar.gz 345846
diff --git a/media-video/tovid/tovid-0.29-r1.ebuild b/media-video/tovid/tovid-0.29-r1.ebuild
deleted file mode 100644
index 06f2f321a5d3..000000000000
--- a/media-video/tovid/tovid-0.29-r1.ebuild
+++ /dev/null
@@ -1,61 +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/tovid/tovid-0.29-r1.ebuild,v 1.1 2007/02/25 16:07:20 beandog Exp $
-
-inherit eutils
-
-DESCRIPTION="Video conversion and DVD authoring tools"
-HOMEPAGE="http://tovid.wikia.com/"
-SRC_URI="mirror://sourceforge/tovid/${P}.tar.gz"
-IUSE=""
-DEPEND="media-video/mplayer"
-RDEPEND="media-video/mjpegtools
-	media-video/ffmpeg
-	media-video/transcode
-	media-sound/normalize
-	media-gfx/imagemagick
-	media-sound/sox
-	media-video/dvdauthor
-	media-video/vcdimager
-	media-video/lsdvd
-	virtual/cdrtools
-	dev-python/pycairo
-	>=dev-python/wxpython-2.6
-	app-cdr/dvd+rw-tools
-	app-cdr/cdrdao
-	dev-python/imaging"
-KEYWORDS="~x86 ~amd64"
-LICENSE="GPL-2"
-SLOT="0"
-
-pkg_setup() {
-	if ! built_with_use media-video/mplayer encode; then
-		eerror "Please emerge media-video/mplayer with useflag 'encode'."
-		die "Fix USE flags and re-emerge"
-	fi
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install died"
-	dodoc AUTHORS ChangeLog NEWS README
-}
-
-pkg_postinst() {
-	einfo ""
-	einfo "List of suite components:"
-	einfo "   idvid:       Identifies video format, resolution, and length"
-	einfo "   makemenu:    Creates (S)VCD/DVD menus"
-	einfo "   makeslides:  Creates mpeg still slides for (S)VCD"
-	einfo "   makexml:     Creates XML specification for an (S)VCD or DVD navigation hierarchy"
-	einfo "   makedvd:     Creates the DVD structure and/or iso image"
-	einfo "   postproc:    Adjusts A/V sync and does shrinking of encoded video"
-	einfo "   tovid:       Converts video to (S)VCD or DVD mpeg format"
-	einfo "   tovidgui:    The tovid GUI"
-	einfo "   pytovid:     The new (experimental) python based tovid script"
-	einfo "   todisc:      Create a DVD with animated menus"
-	einfo "   todiscgui:   Experimental gui for todisc"
-	einfo ""
-	einfo "Please check out the tovid documentation on the web:"
-	einfo "   http://tovid.wikia.com/"
-	einfo ""
-}
diff --git a/media-video/tovid/tovid-0.30.ebuild b/media-video/tovid/tovid-0.30.ebuild
index 76f56db2b06a..6ba118c80b22 100644
--- a/media-video/tovid/tovid-0.30.ebuild
+++ b/media-video/tovid/tovid-0.30.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/tovid/tovid-0.30.ebuild,v 1.1 2007/02/25 16:07:20 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/tovid/tovid-0.30.ebuild,v 1.2 2007/03/30 03:46:11 beandog Exp $
 
 inherit eutils
 
 DESCRIPTION="Video conversion and DVD authoring tools"
 HOMEPAGE="http://tovid.wikia.com/"
 SRC_URI="mirror://sourceforge/tovid/${P}.tar.gz"
-IUSE=""
+IUSE="tk"
 DEPEND="media-video/mplayer
 	app-text/txt2tags"
 RDEPEND="media-video/mjpegtools
@@ -30,6 +30,13 @@ LICENSE="GPL-2"
 SLOT="0"
 
 pkg_setup() {
+	if use tk && ( ! built_with_use dev-lang/python tk ); then
+		eerror "Please emerge python with useflag 'tk' enabled."
+		die "Fix USE flags and re-emerge"
+	elif ! use tk; then
+		ewarn "If you want to use 'todiscgui', then emerge"
+		ewarn "dev-lang/python and this package with the 'tk' use flag"
+	fi
 	if ! built_with_use media-video/mplayer encode; then
 		eerror "Please emerge media-video/mplayer with useflag 'encode'."
 		die "Fix USE flags and re-emerge"