remove old

(Portage version: 2.2_rc20/cvs/Linux 2.6.28 x86_64)

5 files changed, 7 insertions, 433 deletions

diff --git a/media-video/tovid/ChangeLog b/media-video/tovid/ChangeLog
index 47c7919c1552..09b234151fde 100644
--- a/media-video/tovid/ChangeLog
+++ b/media-video/tovid/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/tovid
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/tovid/ChangeLog,v 1.17 2008/12/20 08:57:19 ssuominen Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/tovid/ChangeLog,v 1.18 2009/01/03 13:37:29 aballier Exp $
+
+  03 Jan 2009; Alexis Ballier <aballier@gentoo.org>
+  -files/tovid-0.30-ffmpeg.patch, -files/tovid-0.30-tovid-init.patch,
+  -tovid-0.30-r2.ebuild, -tovid-0.31.ebuild:
+  remove old
 
 *tovid-0.31-r1 (20 Dec 2008)
 
diff --git a/media-video/tovid/files/tovid-0.30-ffmpeg.patch b/media-video/tovid/files/tovid-0.30-ffmpeg.patch
deleted file mode 100644
index 93f953f3d083..000000000000
--- a/media-video/tovid/files/tovid-0.30-ffmpeg.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-diff -Naur tovid-0.30/libtovid/gui/options.py tovid-0.30.2/libtovid/gui/options.py
---- tovid-0.30/libtovid/gui/options.py	2007-02-12 22:51:57.000000000 +0000
-+++ tovid-0.30/libtovid/gui/options.py	2007-04-17 17:00:03.000000000 +0000
-@@ -42,7 +42,7 @@
-         # Get global configuration (for output directory)
-         curConfig = TovidConfig()
- 
--        strCommand = "makexml -noask -quiet -overwrite -%s " % self.format
-+        strCommand = "makexml -quiet -overwrite -%s " % self.format
- 
-         for curItem in self.optionList:
-             # Prefix -topmenu or -menu if necessary
-diff -Naur tovid-0.30/src/makemenu tovid-0.30.2/src/makemenu
---- tovid-0.30/src/makemenu	2007-02-12 22:51:57.000000000 +0000
-+++ tovid-0.30/src/makemenu	2007-04-17 16:58:49.000000000 +0000
-@@ -755,14 +755,14 @@
-         MENU_LENGTH="-t 4"
-     fi
-     echo "Creating $(echo "$MENU_LENGTH" | cut -c 4-)-second silent $ASUF audio...   "
--    AUDIO_CMD="ffmpeg -f s16le -i /dev/zero -ac 2 -ar $SAMPRATE -ab 224 \
-+    AUDIO_CMD="ffmpeg -f s16le -i /dev/zero -ac 2 -ar $SAMPRATE -ab 224k \
-         $MENU_LENGTH -acodec $ASUF -y \"$AUDIO_STREAM\""
-     $DEBUG && echo -e "\n\nBG audio:\n$AUDIO_CMD" >> $REDIR
-     eval $AUDIO_CMD >> $REDIR 2>&1
- # Otherwise, convert provided audio to the target format
- else
-     echo "Converting \"$BG_AUDIO\" to $ASUF...   "
--    AUDIO_CMD="ffmpeg -i \"$BG_AUDIO\" -ac 2 -ar $SAMPRATE -ab 224 \
-+    AUDIO_CMD="ffmpeg -i \"$BG_AUDIO\" -ac 2 -ar $SAMPRATE -ab 224k \
-         $MENU_LENGTH -acodec $ASUF -y \"$AUDIO_STREAM\""
-     $DEBUG && echo -e "\n\nBG audio:\n$AUDIO_CMD" >> $REDIR
-     eval $AUDIO_CMD >> $REDIR 2>&1
-diff -Naur tovid-0.30/src/postproc tovid-0.30.2/src/postproc
---- tovid-0.30/src/postproc	2006-12-05 05:19:32.000000000 +0000
-+++ tovid-0.30/src/postproc	2007-04-17 16:59:03.000000000 +0000
-@@ -210,7 +210,7 @@
-    # Re-encode audio
-    mv -v audio_dump normed_audio
-    AUDIO_BITRATE=$(expr $ID_AUDIO_BITRATE / 1000)
--   AUDIO_ENC="ffmpeg -i normed_audio -vn -ab $AUDIO_BITRATE -ar $ID_AUDIO_RATE"
-+   AUDIO_ENC="ffmpeg -i normed_audio -vn -ab ${AUDIO_BITRATE}k -ar $ID_AUDIO_RATE"
-    AUDIO_ENC="$AUDIO_ENC -ac $ID_AUDIO_NCH -acodec $ID_AUDIO_CODEC"
-    AUDIO_ENC="$AUDIO_ENC -y audio_dump.$ID_AUDIO_CODEC"
- 
-diff -Naur tovid-0.30/src/todisc tovid-0.30.2/src/todisc
---- tovid-0.30/src/todisc	2007-04-17 17:53:57.000000000 +0000
-+++ tovid-0.30/src/todisc	2007-04-17 16:58:26.000000000 +0000
-@@ -1856,7 +1856,7 @@
- 
- # easier to have non transparent showcase use the transparent block
- if $SHOWCASE && ! $TRANSPARENT; then TRANSPARENT=:; fi
--AUDIO_OPTS="-ab 224 -ar $SAMPLERATE -ac 2 -acodec $AUDIO_EXT"
-+AUDIO_OPTS="-ab 224k -ar $SAMPLERATE -ac 2 -acodec $AUDIO_EXT"
- # spumux and dvdauthor vars
- if $WIDE_SCREEN; then
-         TITLES_VIDEO_TAG="<video widescreen=\"$WIDESCREEN\" $V_ASPECT/>"
-diff -Naur tovid-0.30/src/tovid tovid-0.30.2/src/tovid
---- tovid-0.30/src/tovid	2007-02-11 20:11:11.000000000 +0000
-+++ tovid-0.30/src/tovid	2007-04-17 16:59:50.000000000 +0000
-@@ -1810,7 +1810,7 @@
-         AUDIO_ENC=( "${AUDIO_ENC[@]}" -i "${AUDIO_IN_FILE[@]}" )
-         yecho "Encoding audio stream to $AUD_SUF with the following command:"
-     fi
--    AUDIO_ENC=( "${AUDIO_ENC[@]}" -vn -ab $AUD_BITRATE -ar $SAMPRATE -ac 2 )
-+    AUDIO_ENC=( "${AUDIO_ENC[@]}" -vn -ab ${AUD_BITRATE}k -ar $SAMPRATE -ac 2 )
-     ! $DO_NORM && AUDIO_ENC=( "${AUDIO_ENC[@]}" $CLIP_SEEK $FF_LENGTH $AUDIO_MAP )
-     AUDIO_ENC=( "${AUDIO_ENC[@]}" -acodec $AUD_SUF)
-     $DO_NORM && AUDIO_ENC=( "${AUDIO_ENC[@]}" "${AUDIO_WAV_MAP[@]}" )
diff --git a/media-video/tovid/files/tovid-0.30-tovid-init.patch b/media-video/tovid/files/tovid-0.30-tovid-init.patch
deleted file mode 100644
index 1a650d71c728..000000000000
--- a/media-video/tovid/files/tovid-0.30-tovid-init.patch
+++ /dev/null
@@ -1,189 +0,0 @@
---- src/tovid-init.in	2007-02-02 18:42:19.000000000 +0100
-+++ src/tovid-init.in.new	2007-05-04 17:12:27.000000000 +0200
-@@ -4,24 +4,24 @@
- # Part of the tovid suite
- # =======================
- # Define global (suite-wide) functions and variables
--# for the tovid suite. 
-+# for the tovid suite.
- #
- # Project homepage: http://www.tovid.org
- #
- #
- # Copyright (C) 2005 tovid.org <http://www.tovid.org>
--# 
--# This program is free software; you can redistribute it and/or 
--# modify it under the terms of the GNU General Public License 
--# as published by the Free Software Foundation; either 
--# version 2 of the License, or (at your option) any later 
-+#
-+# This program is free software; you can redistribute it and/or
-+# modify it under the terms of the GNU General Public License
-+# as published by the Free Software Foundation; either
-+# version 2 of the License, or (at your option) any later
- # version.
--# 
-+#
- # This program is distributed in the hope that it will be useful,
- # but WITHOUT ANY WARRANTY; without even the implied warranty of
- # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- # GNU General Public License for more details.
--# 
-+#
- # You should have received a copy of the GNU General Public License
- # along with this program; if not, write to the Free Software
- # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. Or see:
-@@ -128,7 +128,7 @@
-             echo ":"
-         else
-             echo "false"
--        fi 
-+        fi
-         ;;
- 
-     "set" )
-@@ -145,7 +145,7 @@
- 
- # ******************************************************************************
- # Print a pretty (wrapped) notice message.
--# Args: $@ == text string containing the message 
-+# Args: $@ == text string containing the message
- # ******************************************************************************
- function precho()
- {
-@@ -154,7 +154,7 @@
- 
- # ******************************************************************************
- # Print error message, then exit.
--# Args: $@ == text string containing error message 
-+# Args: $@ == text string containing error message
- # ******************************************************************************
- function exit_with_error()
- {
-@@ -261,11 +261,11 @@
-     if test ! -e "$FOP_OUTFILE"; then
-         runtime_error "Couldn't create file: \"$FOP_OUTFILE\""
-     fi
--    
-+
-     # File size in bytes
-     FOP_LAST_SIZE=0
-     FOP_CUR_SIZE=$(du -b "$FOP_OUTFILE" | awk '{print $1}')
--    
-+
-     # Keep looping until outfile stops getting bigger
-     while test "$FOP_CUR_SIZE" -gt "$FOP_LAST_SIZE"; do
-         # Display a changing line
-@@ -286,7 +286,7 @@
-         # (SLEEP_TIME defaults to 1s if unset)
-         sleep ${SLEEP_TIME-"1s"}
- 
--        FOP_LAST_SIZE=$FOP_CUR_SIZE 
-+        FOP_LAST_SIZE=$FOP_CUR_SIZE
-         FOP_CUR_SIZE=$(du -b "$FOP_OUTFILE" | awk '{print $1}')
-     done
-     printf "\n\n"
-@@ -294,7 +294,7 @@
- 
- # ******************************************************************************
- # Check to see if a dependency group exists, quit if missing
--# Input args: 
-+# Input args:
- #    $1 = dependency group to check for; note that this can be a globally
- #         defined group (below), or a space-separated list of executables
- #    $2 = Descriptive message about why the user needs the dependencies
-@@ -330,7 +330,7 @@
- # See what filesystem a directory is in
- # Input args:
- #   $1 = directory to find filesystem type
--# 
-+#
- # Usage:
- #   FS_TYPE=$(get_filesystem "$WORK_DIR")
- # ******************************************************************************
-@@ -342,6 +342,19 @@
-     echo "$FILESYSTEM"
- }
- 
-+# ******************************************************************************
-+# Do floating point math with bc
-+# Input args:
-+#   $1 = The math operation to perfrom, in a quoted string
-+#
-+# Usage:
-+#   ANSWER=$(bc_math "$NUM1 + $NUM2")
-+# ******************************************************************************
-+function bc_math()
-+{
-+    echo "scale=2; $1" | bc -l
-+}
-+
- 
- # ******************************************************************************
- # Countdown 5 seconds, then return
-@@ -390,21 +403,30 @@
- # ******************************************************************************
- INSTALLED_TOVIDS=$(type -a tovid 2>>/dev/null | awk '{print $NF}' | tr '\n' ' ')
- NUM_INSTALLED=0
-+INSTALLED_VERS=""
-+INSTALLED_PREFS=""
- 
--# Only count non-links
-+# Only count tovids that are different versions
- for tovid in $INSTALLED_TOVIDS; do
--    if ! test -L $tovid; then
--        let "NUM_INSTALLED=NUM_INSTALLED+1"
--    fi
-+    tovid_PREFIX=$(dirname $tovid)
-+    tovid_VERSION=$(grep TOVID_VERSION $tovid_PREFIX/tovid-init | \
-+        awk -F '"' '{print $2}')
-+    INSTALLED_VERS="$INSTALLED_VERS $tovid_VERSION"
- done
-+UNIQ_TOVIDS="$(echo $INSTALLED_VERS | tr ' ' '\n' | uniq)"
-+NUM_INSTALLED="$(echo $INSTALLED_VERS | tr ' ' '\n' | uniq | wc -l)"
- 
- # Exit when there is more than one tovid installed
- if test $NUM_INSTALLED -ne 1; then
--    echo "Found $NUM_INSTALLED installations of tovid on your system!"
-+    echo "Found $NUM_INSTALLED versions of tovid on your system!"
-     echo "I won't run until there is only one of me :)"
-     echo "Installed versions:"
--    for version in $INSTALLED_TOVIDS; do
--        echo "   $version"
-+    i=1
-+    while test $i -le $(echo "$INSTALLED_TOVIDS" | awk '{print NF}'); do
-+        tovid_ver=$(echo $INSTALLED_VERS | awk '{print $'$i'}')
-+        tovid_path=$(echo $INSTALLED_TOVIDS | awk '{print $'$i'}')
-+        printf "   %s (%s)\n" $tovid_ver $tovid_path
-+        let "i=i+1"
-     done
-     echo "Exiting..."
-     exit 1
-@@ -442,7 +464,7 @@
- #-kvcd
- #-ksvcd
- #-kdvd
--    
-+
- # TV system standard
- #-pal
- #-ntsc
-@@ -493,15 +515,15 @@
-     #   No:  add another group and fill it with members.
- 
-     # *************************************************************************
--    # Required Dependencies 
-+    # Required Dependencies
-     # *************************************************************************
-     core="grep sed md5sum mplayer mencoder mplex mpeg2enc yuvfps yuvdenoise ppmtoy4m mp2enc jpeg2yuv ffmpeg"
- 
-     # *************************************************************************
-     # Optional Dependencies
-     # *************************************************************************
--    # Optional dependencies are grouped according to the functionality they 
--    # bring to tovid: menu creation, DVD creation, (S)VCD creation, and 
-+    # Optional dependencies are grouped according to the functionality they
-+    # bring to tovid: menu creation, DVD creation, (S)VCD creation, and
-     # post-processing.
- 
-     # -------------------------------------------------------------------------
diff --git a/media-video/tovid/tovid-0.30-r2.ebuild b/media-video/tovid/tovid-0.30-r2.ebuild
deleted file mode 100644
index f081df3bffd8..000000000000
--- a/media-video/tovid/tovid-0.30-r2.ebuild
+++ /dev/null
@@ -1,77 +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.30-r2.ebuild,v 1.4 2007/10/02 03:41:41 dirtyepic Exp $
-
-inherit eutils
-
-DESCRIPTION="Video conversion and DVD authoring tools"
-HOMEPAGE="http://tovid.wikia.com/"
-SRC_URI="mirror://sourceforge/tovid/${P}.tar.gz"
-IUSE="tk"
-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
-	=dev-python/wxpython-2.6*
-	app-cdr/dvd+rw-tools
-	app-cdr/cdrdao
-	dev-python/imaging"
-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
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-configure.patch"
-	epatch "${FILESDIR}/${P}-ffmpeg.patch"
-	epatch "${FILESDIR}/${P}-tovid-init.patch"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install died"
-	dodoc AUTHORS ChangeLog NEWS README
-}
-
-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"
-	elog "   tovidgui:    The tovid GUI"
-	elog "   pytovid:     The new (experimental) python based tovid script"
-	elog "   todisc:      Create a DVD with animated menus"
-	elog "   todiscgui:   Experimental gui for todisc"
-	elog ""
-	elog "Please check out the tovid documentation on the web:"
-	elog "   http://tovid.wikia.com/"
-	elog ""
-}
diff --git a/media-video/tovid/tovid-0.31.ebuild b/media-video/tovid/tovid-0.31.ebuild
deleted file mode 100644
index 8be9de4fb104..000000000000
--- a/media-video/tovid/tovid-0.31.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# 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.4 2008/12/17 22:32:00 maekke 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 ""
-}