4 files changed, 132 insertions, 3 deletions
diff --git a/media-video/tovid/ChangeLog b/media-video/tovid/ChangeLog
index 92b2e40b8e95..d691d820bca9 100644
--- a/media-video/tovid/ChangeLog
+++ b/media-video/tovid/ChangeLog
@@ -1,6 +1,12 @@
 # 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.13 2007/10/02 03:41:41 dirtyepic Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/tovid/ChangeLog,v 1.14 2008/05/12 08:43:21 aballier Exp $
+
+*tovid-0.31 (12 May 2008)
+
+  12 May 2008; Alexis Ballier <aballier@gentoo.org>
+  +files/tovid-0.31-todisc.patch, +tovid-0.31.ebuild:
+  version bump, thanks to everyone involved in bug #190442
 
   02 Oct 2007; Ryan Hill <dirtyepic@gentoo.org> tovid-0.30-r2.ebuild:
   Lock wxpython to 2.6.
diff --git a/media-video/tovid/Manifest b/media-video/tovid/Manifest
index 08db2543c8f9..c22cb602ca10 100644
--- a/media-video/tovid/Manifest
+++ b/media-video/tovid/Manifest
@@ -1,7 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX tovid-0.30-configure.patch 263 RMD160 fb74007a796ace83357ae304fe70afd6cb104f99 SHA1 884a64a84a0bc13f375926897dec5752d5cf7ab2 SHA256 bad68a1a8afca29440156f3d1cc38fb2718151170d46407a503ad5b0b13b57ae
 AUX tovid-0.30-ffmpeg.patch 3552 RMD160 eb6ff38afb781791dab2a207b77d02af8393080e SHA1 16127bc0a996752f12bae347c34cdff0e16032b8 SHA256 8934dd9d0e90fca46a2176b02031632fb9dd68cbfc24610fbb957f5448f23b6a
 AUX tovid-0.30-tovid-init.patch 6723 RMD160 59016249843efc416b79ca6da3fce133f06358f7 SHA1 a263a146e00de688f7c1c927212d655f89928589 SHA256 a185ea4ca31ddfc1dc4daacf2a3abc6fc4e631b1416ad0faac121d1f08422625
+AUX tovid-0.31-todisc.patch 510 RMD160 18a88e357370d633037154f3e01a6ce397010635 SHA1 905417a98c5d4ba51bcef26ca54a96188ea9cd24 SHA256 0ee1b00f1c42926fb2dc7da840992a1f300c762274d835c7f96ac7a9e25dda18
 DIST tovid-0.30.tar.gz 393084 RMD160 ef7e35e6553fddc4f601fd44b681b5afd643705a SHA1 70259c55a7da3b9a98fe8136470f5770d0923732 SHA256 fe30a4ef08d1aa15fcb811d123d14a7934a9f5180abbcaddafef1e543c42720f
+DIST tovid-0.31.tar.gz 415625 RMD160 c79e7fe566256699e65cc4bd94cf5a1f98503502 SHA1 1c3ec16a7654e7f1248da2fc666b797efa29d0ae SHA256 e51e38c3f2da9898a8c2466b0ef3298519300e274568097388b7a0d066400d23
 EBUILD tovid-0.30-r2.ebuild 2454 RMD160 f3583ca429282023c69dc000f038d359e05d0196 SHA1 33aaf4d08dd7fe7df8e7cc12bb777cf6a604fc39 SHA256 b83f6d5b2a1f02bf7c9abf041dc1b4a6dea4202b7d0a43c7f620249759699b87
-MISC ChangeLog 1965 RMD160 61d8cb62a5babe888fc073df78425b621890f560 SHA1 7767fa4e7c42f524ee435156b224f48e8df72208 SHA256 d8b6e47bf7ea4d9534abbc8472eb0efe209fc3df0886eafeea679b67d5e95abb
+EBUILD tovid-0.31.ebuild 2961 RMD160 f28b99b569ab9c1fec9bcb8c6b5a22b62402e891 SHA1 33ba5c7b9fa7a11e3d083f3a3ce6476f277ce846 SHA256 d9d22b65c089ba17bba93439542fe524bb5df9d036b47a963640d7d88902d189
+MISC ChangeLog 2157 RMD160 d20735f891d5f37b5992bcf4d3e3b00c4149afb5 SHA1 5f1786cfc8a0bc861957f530d8ccf5525751967a SHA256 16fe4cc77a80bd5a8fd70bca2bdeae9a0e8e9df74e6bfc6c6aa72a736a5bb462
 MISC metadata.xml 158 RMD160 d91ff64b3e5f86657b8b6ba02c41a26247a2fac7 SHA1 9ac37da489ebe6e58e32fe8e037b1ef2d99c6638 SHA256 f9dd4fb4a7f368e776ea0d7d394dad8f3a674e67f6103d6fb58a8a98971eeee4
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkgoAzMACgkQvFcC4BYPU0ojzQCfarRHSEvxdw1hLA4go/4uRsKh
+aMQAoMTsFNnZzT1LfwpmKt7mfDS1in9t
+=WfVi
+-----END PGP SIGNATURE-----
diff --git a/media-video/tovid/files/tovid-0.31-todisc.patch b/media-video/tovid/files/tovid-0.31-todisc.patch
new file mode 100644
index 000000000000..c248c72df372
--- /dev/null
+++ b/media-video/tovid/files/tovid-0.31-todisc.patch
@@ -0,0 +1,12 @@
+--- src/todisc	2007-08-19 21:27:36.000000000 -0400
++++ src/todisc.new	2007-10-19 22:43:33.000000000 -0400
+@@ -3736,8 +3736,7 @@
+ # if static menu and no background audio, ignore MENU_AUDIOLENGTH
+ $STATIC && [[ -z "$BG_AUDIO" ]] && ! $SWITCHED && unset MENU_AUDIOLENGTH
+ # Check input files for compliance; offer to tovid-encode non-compliant files
+-$SWITCHED && MN=2 || MN=1
+-if [[ $MENU_NUM -eq $MN ]]; then
++if [[ $MENU_NUM = [1-2] ]]; then
+     check_compliance
+     $GROUPING && check_compliance group
+ fi
diff --git a/media-video/tovid/tovid-0.31.ebuild b/media-video/tovid/tovid-0.31.ebuild
new file mode 100644
index 000000000000..d20a9a06f9f8
--- /dev/null
+++ b/media-video/tovid/tovid-0.31.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/tovid/tovid-0.31.ebuild,v 1.1 2008/05/12 08:43:21 aballier Exp $
+
+inherit eutils python
+
+DESCRIPTION="Video conversion and DVD authoring tools"
+HOMEPAGE="http://tovid.wikia.com/"
+SRC_URI="http://${PN}.googlecode.com/files/${P}.tar.gz"
+IUSE="tk wxwindows"
+DEPEND="media-video/mplayer
+	app-text/txt2tags"
+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
+	wxwindows? ( =dev-python/wxpython-2.6* )
+	app-cdr/dvd+rw-tools
+	app-cdr/cdrdao
+	dev-python/imaging
+	sys-devel/bc"
+KEYWORDS="~amd64 ~x86"
+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"
+	fi
+	if ! use wxwindows; then
+		ewarn "You have choosen to disable all tovidgui interface."
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${PN}-0.30-configure.patch"
+	epatch "${FILESDIR}/${PN}-0.31-todisc.patch"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "make install died"
+	dodoc AUTHORS ChangeLog NEWS README
+
+
+	python_version
+	# remove wxgtk components 
+	if ! use wxwindows; then
+		rm -f "${D}/usr/bin/tovidgui"
+		rm -rf "${D}/usr/$(get_libdir)/python${PYVER}/site-packages/libtovid/gui"
+	fi
+
+	# remove tk components
+	if ! use tk; then
+		rm -f "${D}/usr/bin/todiscgui"
+		rm -rf "${D}/usr/$(get_libdir)/python${PYVER}/site-packages/libtovid/metagui"
+	fi
+}
+
+pkg_postinst() {
+	elog ""
+	elog "List of suite components:"
+	elog "   idvid:       Identifies video format, resolution, and length"
+	elog "   makemenu:    Creates (S)VCD/DVD menus"
+	elog "   makeslides:  Creates mpeg still slides for (S)VCD"
+	elog "   makexml:     Creates XML specification for an (S)VCD or DVD navigation hierarchy"
+	elog "   makedvd:     Creates the DVD structure and/or iso image"
+	elog "   postproc:    Adjusts A/V sync and does shrinking of encoded video"
+	elog "   tovid:       Converts video to (S)VCD or DVD mpeg format"
+	if use wxwindows; then
+		elog "   tovidgui:    The tovid GUI"
+	fi
+	elog "   pytovid:     The new (experimental) python based tovid script"
+	elog "   todisc:      Create a DVD with animated menus"
+	if use tk; then
+		elog "   todiscgui:   Experimental gui for todisc"
+	fi
+	elog ""
+	elog "Please check out the tovid documentation on the web:"
+	elog "   http://tovid.wikia.com/"
+	elog ""
+}