Remove old and use slot dep for gtk+.

(Portage version: 2.2.0_alpha28/cvs/Linux x86_64)

4 files changed, 12 insertions, 118 deletions

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}