Remove old and use slot dep for gtk+.

Package-Manager: portage-2.2.0_alpha28/cvs/Linux x86_64

10 files changed, 35 insertions, 261 deletions

diff --git a/media-video/frameworks/ChangeLog b/media-video/frameworks/ChangeLog
index 64ed1054fe10..24f4fa3b511a 100644
--- a/media-video/frameworks/ChangeLog
+++ b/media-video/frameworks/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/frameworks
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/frameworks/ChangeLog,v 1.7 2008/01/13 11:55:15 aballier Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/frameworks/ChangeLog,v 1.8 2011/03/23 08:32:23 radhermit Exp $
+
+  23 Mar 2011; Tim Harder <radhermit@gentoo.org> -frameworks-0.3.6.ebuild,
+  frameworks-0.3.7.ebuild:
+  Remove old and use slot dep for gtk+.
 
 *frameworks-0.3.7 (13 Jan 2008)
 
diff --git a/media-video/frameworks/frameworks-0.3.6.ebuild b/media-video/frameworks/frameworks-0.3.6.ebuild
deleted file mode 100644
index 548dd018710b..000000000000
--- a/media-video/frameworks/frameworks-0.3.6.ebuild
+++ /dev/null
@@ -1,22 +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/frameworks/frameworks-0.3.6.ebuild,v 1.3 2008/01/13 11:51:50 aballier Exp $
-
-DESCRIPTION="A small v4l frame capture utility especially suited for stop motion animation."
-SRC_URI="http://frameworks.polycrystal.org/release/${P}.tar.gz"
-HOMEPAGE="http://frameworks.polycrystal.org"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~ppc ~x86 ~amd64"
-
-IUSE=""
-RDEPEND=">=gnome-base/libglade-2
-	>=x11-libs/gtk+-2"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-src_install () {
-	make DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog NEWS README TODO
-}
diff --git a/media-video/frameworks/frameworks-0.3.7.ebuild b/media-video/frameworks/frameworks-0.3.7.ebuild
index 06993b6f6794..2c4c8de435c6 100644
--- a/media-video/frameworks/frameworks-0.3.7.ebuild
+++ b/media-video/frameworks/frameworks-0.3.7.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/frameworks/frameworks-0.3.7.ebuild,v 1.1 2008/01/13 11:55:15 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/frameworks/frameworks-0.3.7.ebuild,v 1.2 2011/03/23 08:32:23 radhermit Exp $
+
+EAPI=2
 
 DESCRIPTION="A small v4l frame capture utility especially suited for stop motion animation."
 SRC_URI="http://frameworks.polycrystal.org/release/${P}.tar.gz"
@@ -9,10 +11,10 @@ HOMEPAGE="http://frameworks.polycrystal.org"
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="~ppc ~x86 ~amd64"
-
 IUSE=""
+
 RDEPEND=">=gnome-base/libglade-2
-	>=x11-libs/gtk+-2"
+	x11-libs/gtk+:2"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
diff --git a/media-video/kino/ChangeLog b/media-video/kino/ChangeLog
index 1dc475608c42..b8015099db1c 100644
--- a/media-video/kino/ChangeLog
+++ b/media-video/kino/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/kino
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/kino/ChangeLog,v 1.120 2010/01/20 21:15:41 ranger Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/kino/ChangeLog,v 1.121 2011/03/23 08:36:47 radhermit Exp $
+
+  23 Mar 2011; Tim Harder <radhermit@gentoo.org> -kino-1.3.1.ebuild,
+  kino-1.3.3.ebuild:
+  Remove old and use slot dep for gtk+.
 
   20 Jan 2010; Brent Baude <ranger@gentoo.org> kino-1.3.3.ebuild:
   Marking kino-1.3.3 ppc64 for bug 285414
diff --git a/media-video/kino/kino-1.3.1.ebuild b/media-video/kino/kino-1.3.1.ebuild
deleted file mode 100644
index 5c4d41aea847..000000000000
--- a/media-video/kino/kino-1.3.1.ebuild
+++ /dev/null
@@ -1,110 +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/kino/kino-1.3.1.ebuild,v 1.7 2008/12/21 14:44:31 nixnut Exp $
-
-DESCRIPTION="Kino is a non-linear DV editor for GNU/Linux"
-HOMEPAGE="http://www.kinodv.org/"
-SRC_URI="mirror://sourceforge/kino/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 sparc x86"
-IUSE="alsa dvdr gpac lame gstreamer quicktime sox vorbis"
-
-# This ebuild would benefit a lot of USE dependencies but that has to wait for
-# EAPI 2. The usual fix is to issue built_with_use checks but in that particu-
-# lar case it would make the ebuild rather complicated to write and maintain
-# (certain features can be enabled in various different ways). Also it would
-# also force the emerge process to stop a bit too often for users not to comp-
-# lain. Thus, if you need features like theora, x264, xvid and maybe others,
-# make sure you activate the required support where it should be (ffmpeg, mostly).
-
-# Optional dependency on cinelerra-cvs (as a replacement for libquicktime)
-# dropped because kino may run with it but won't build anymore.
-
-DEPEND=">=x11-libs/gtk+-2.6.0
-	>=gnome-base/libglade-2.5.0
-	>=dev-libs/glib-2
-	x11-libs/libXv
-	dev-libs/libxml2
-	media-libs/audiofile
-	>=sys-libs/libraw1394-1.0.0
-	>=sys-libs/libavc1394-0.4.1
-	>=media-libs/libdv-0.103
-	media-libs/libsamplerate
-	media-libs/libiec61883
-	alsa? ( >=media-libs/alsa-lib-1.0.9 )
-	>=media-video/ffmpeg-0.4.9_p20080326
-	quicktime? ( >=media-libs/libquicktime-0.9.5 )"
-RDEPEND="${DEPEND}
-	media-video/mjpegtools
-	media-sound/rawrec
-	dvdr? ( media-video/dvdauthor
-		app-cdr/dvd+rw-tools )
-	gpac? ( media-video/gpac )
-	lame? ( media-sound/lame )
-	gstreamer? ( media-libs/gst-plugins-base )
-	sox? ( media-sound/sox )
-	vorbis? ( media-sound/vorbis-tools )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Fix to link with --as-needed
-	sed -i -e 's:LIBS="-lXext:LIBS="-lXext -lX11:' configure || die "sed failed"
-
-	# Deactivating automagic alsa configuration, bug #134725
-	if ! use alsa ; then
-		sed -i -e "s:HAVE_ALSA 1:HAVE_ALSA 0:" configure || die "sed failed"
-	fi
-
-	# Fix bug #169590
-	sed -i \
-		-e '/\$(LIBQUICKTIME_LIBS) \\/d' \
-		-e '/^[[:space:]]*\$(SRC_LIBS)/ a\
-	\$(LIBQUICKTIME_LIBS) \\' \
-		src/Makefile.in || die "sed failed"
-
-	# Fix bug #172687
-	sed -i \
-		-e 's/^install-exec-local:/install-exec-local: install-binPROGRAMS/' \
-		src/Makefile.in || die "sed failed"
-
-	# Fix test failure discovered in bug #193947
-	sed -i -e '$a\
-\
-ffmpeg/libavcodec/ps2/idct_mmi.c\
-ffmpeg/libavcodec/sparc/dsputil_vis.c\
-ffmpeg/libavcodec/sparc/vis.h\
-ffmpeg/libavutil/bswap.h\
-ffmpeg/libswscale/yuv2rgb_template.c\
-src/export.h\
-src/message.cc\
-src/page_bttv.cc' po/POTFILES.in || die "sed failed"
-
-	sed -i -e 's:^#include <quicktime.h>:#include <lqt/quicktime.h>:' \
-		src/filehandler.h || die "sed failed"
-
-	# Fix compilation with gcc-4.3, see bug #215160
-	sed -i -e '/C++ includes/ a\
-#include <algorithm>' src/playlist.cc || die "sed failed"
-}
-
-src_compile() {
-	econf \
-		--disable-dependency-tracking \
-		--disable-local-ffmpeg \
-		$(use_enable quicktime) \
-		$(use_with sparc dv1394) \
-		CPPFLAGS="-I${ROOT}usr/include/libavcodec -I${ROOT}usr/include/libavformat -I${ROOT}usr/include/libswscale" \
-		|| die "Configuration failed"
-	emake || die "Compilation failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "Installation failed"
-	dodoc AUTHORS BUGS ChangeLog NEWS README* TODO
-	# Fix bug #177378
-	fowners root:root -R /usr/share/kino/help
-}
diff --git a/media-video/kino/kino-1.3.3.ebuild b/media-video/kino/kino-1.3.3.ebuild
index 9c941522d898..4622eac3c1c7 100644
--- a/media-video/kino/kino-1.3.3.ebuild
+++ b/media-video/kino/kino-1.3.3.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/kino/kino-1.3.3.ebuild,v 1.6 2010/01/20 21:15:41 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/kino/kino-1.3.3.ebuild,v 1.7 2011/03/23 08:36:47 radhermit Exp $
+
+EAPI=1
 
 inherit eutils
 
@@ -24,7 +26,7 @@ IUSE="alsa dvdr gpac lame gstreamer quicktime sox vorbis"
 # Optional dependency on cinelerra-cvs (as a replacement for libquicktime)
 # dropped because kino may run with it but won't build anymore.
 
-DEPEND=">=x11-libs/gtk+-2.6.0
+DEPEND=">=x11-libs/gtk+-2.6.0:2
 	>=gnome-base/libglade-2.5.0
 	>=dev-libs/glib-2
 	x11-libs/libXv
diff --git a/media-video/lives/ChangeLog b/media-video/lives/ChangeLog
index 0f4483515d02..e0732ded6dc0 100644
--- a/media-video/lives/ChangeLog
+++ b/media-video/lives/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/lives
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/lives/ChangeLog,v 1.29 2011/02/26 19:28:25 signals Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/lives/ChangeLog,v 1.30 2011/03/23 08:41:07 radhermit Exp $
+
+  23 Mar 2011; Tim Harder <radhermit@gentoo.org> -lives-0.9.8.6.ebuild,
+  -lives-0.9.8.12.ebuild, lives-1.0.0.ebuild:
+  Remove old and use slot dep for gtk+.
 
   26 Feb 2011; Kevin McCarthy <signals@gentoo.org> lives-0.9.8.6.ebuild,
   lives-0.9.8.12.ebuild, lives-1.0.0.ebuild:
diff --git a/media-video/lives/lives-0.9.8.12.ebuild b/media-video/lives/lives-0.9.8.12.ebuild
deleted file mode 100644
index 4f9927834661..000000000000
--- a/media-video/lives/lives-0.9.8.12.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/lives/lives-0.9.8.12.ebuild,v 1.2 2011/02/26 19:28:25 signals Exp $
-
-inherit flag-o-matic
-
-MY_P="LiVES-${PV}"
-DESCRIPTION="LiVES is a Video Editing System"
-HOMEPAGE="http://lives.sf.net"
-SRC_URI="http://www.xs4all.nl/~salsaman/lives/current/${MY_P}.tar.bz2"
-	# sf.net only has rpms for this version
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~amd64"
-IUSE="matroska ogg theora libvisual nls" #sdl jack dv"
-DEPEND=">=media-video/mplayer-0.90-r2
-		>=media-gfx/imagemagick-5.5.6
-		>=dev-lang/perl-5.8.0-r12
-		>=x11-libs/gtk+-2.2.1
-		media-libs/libsdl
-		>=media-video/ffmpeg-0.4.8
-		virtual/jpeg
-		>=media-sound/sox-12.17.3-r3
-		virtual/cdrtools
-		theora? ( media-libs/libtheora )
-		>=dev-lang/python-2.3.4
-		matroska? ( media-video/mkvtoolnix
-					media-libs/libmatroska )
-		ogg? ( media-sound/ogmtools )
-		>=media-video/mjpegtools-1.6.2
-		libvisual? ( media-libs/libvisual )
-		media-sound/jack-audio-connection-kit
-		sys-libs/libavc1394"
-
-src_unpack() {
-	unpack ${A}
-	# hardcoding -03 is wrong!
-	sed -i -e "s:-O3::g" \
-	"${S}"/{,src,lives-plugins,lives-plugins/plugins/playback/video,lives-plugins/weed-plugins}/Makefile*
-}
-
-src_compile() {
-	econf \
-		$(use_enable libvisual) \
-		$(use_enable nls) \
-		|| die "configure failed"
-	emake || die "make failed"
-}
-
-src_install() {
-	dodir /usr/share/pixmaps
-	dodir /usr/share/applications
-	make DESTDIR="${D}" install || die
-	dodoc AUTHORS FEATURES GETTING.STARTED
-}
diff --git a/media-video/lives/lives-0.9.8.6.ebuild b/media-video/lives/lives-0.9.8.6.ebuild
deleted file mode 100644
index 6a5e58362b0b..000000000000
--- a/media-video/lives/lives-0.9.8.6.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/lives/lives-0.9.8.6.ebuild,v 1.5 2011/02/26 19:28:25 signals Exp $
-
-inherit flag-o-matic
-
-DESCRIPTION="Linux Video Editing System"
-
-HOMEPAGE="http://lives.sf.net"
-
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-
-SLOT="0"
-
-KEYWORDS="~x86 ~ppc ~amd64"
-
-IUSE="matroska ogg theora libvisual nls" #sdl jack dv"
-
-DEPEND=">=media-video/mplayer-0.90-r2
-		>=media-gfx/imagemagick-5.5.6
-		>=dev-lang/perl-5.8.0-r12
-		>=x11-libs/gtk+-2.2.1
-		media-libs/libsdl
-		>=media-video/ffmpeg-0.4.8
-		virtual/jpeg
-		>=media-sound/sox-12.17.3-r3
-		virtual/cdrtools
-		theora? ( media-libs/libtheora )
-		>=dev-lang/python-2.3.4
-		matroska? ( media-video/mkvtoolnix
-					media-libs/libmatroska )
-		ogg? ( media-sound/ogmtools )
-		>=media-video/mjpegtools-1.6.2
-		libvisual? ( media-libs/libvisual )
-		media-sound/jack-audio-connection-kit
-		sys-libs/libavc1394"
-
-src_unpack() {
-	unpack ${A}
-	# hardcoding -03 is wrong!
-	sed -i -e "s:-O3::g" \
-	"${S}"/{,src,lives-plugins,lives-plugins/plugins/playback/video,lives-plugins/weed-plugins}/Makefile*
-}
-
-src_compile() {
-	econf \
-		$(use_enable libvisual) \
-		$(use_enable nls) \
-		|| die "configure failed"
-	emake || die "make failed"
-}
-
-src_install() {
-	dodir /usr/share/pixmaps
-	dodir /usr/share/applications
-	make DESTDIR="${D}" install || die
-	dodoc AUTHORS FEATURES GETTING.STARTED
-}
diff --git a/media-video/lives/lives-1.0.0.ebuild b/media-video/lives/lives-1.0.0.ebuild
index cf2575ecf106..559f48c9c08d 100644
--- a/media-video/lives/lives-1.0.0.ebuild
+++ b/media-video/lives/lives-1.0.0.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/lives/lives-1.0.0.ebuild,v 1.2 2011/02/26 19:28:25 signals Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/lives/lives-1.0.0.ebuild,v 1.3 2011/03/23 08:41:07 radhermit Exp $
+
+EAPI=1
 
 inherit flag-o-matic
 
@@ -9,14 +11,16 @@ DESCRIPTION="LiVES is a Video Editing System"
 HOMEPAGE="http://lives.sf.net"
 SRC_URI="http://www.xs4all.nl/~salsaman/lives/current/${MY_P}.tar.bz2"
 	# sf.net only has rpms for this version
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86 ~ppc ~amd64"
 IUSE="matroska ogg theora libvisual nls" #sdl jack dv"
+
 DEPEND=">=media-video/mplayer-0.90-r2
 		>=media-gfx/imagemagick-5.5.6
 		>=dev-lang/perl-5.8.0-r12
-		>=x11-libs/gtk+-2.2.1
+		>=x11-libs/gtk+-2.2.1:2
 		media-libs/libsdl
 		>=media-video/ffmpeg-0.4.8
 		virtual/jpeg
@@ -31,6 +35,7 @@ DEPEND=">=media-video/mplayer-0.90-r2
 		libvisual? ( media-libs/libvisual )
 		media-sound/jack-audio-connection-kit
 		sys-libs/libavc1394"
+RDEPEND="${DEPEND}"
 
 src_unpack() {
 	unpack ${A}