Make gstreamer SLOT explicit. Remove old.

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

4 files changed, 11 insertions, 176 deletions

diff --git a/x11-libs/wxGTK/ChangeLog b/x11-libs/wxGTK/ChangeLog
index ab742fd15c4b..a4dfbe40d60f 100644
--- a/x11-libs/wxGTK/ChangeLog
+++ b/x11-libs/wxGTK/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/wxGTK
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/ChangeLog,v 1.292 2012/07/28 22:45:58 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/ChangeLog,v 1.293 2012/09/16 02:54:05 dirtyepic Exp $
+
+  16 Sep 2012; Ryan Hill <dirtyepic@gentoo.org> wxGTK-2.8.12.1.ebuild,
+  -wxGTK-2.9.3.1.ebuild, wxGTK-2.9.4.1.ebuild:
+  Make gstreamer SLOT explicit. Remove old.
 
 *wxGTK-2.9.4.1 (28 Jul 2012)
 
diff --git a/x11-libs/wxGTK/wxGTK-2.8.12.1.ebuild b/x11-libs/wxGTK/wxGTK-2.8.12.1.ebuild
index 711dd7e7c6cf..c20aeeb98d6f 100644
--- a/x11-libs/wxGTK/wxGTK-2.8.12.1.ebuild
+++ b/x11-libs/wxGTK/wxGTK-2.8.12.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.8.12.1.ebuild,v 1.11 2012/05/31 13:25:49 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.8.12.1.ebuild,v 1.12 2012/09/16 02:54:04 dirtyepic Exp $
 
 EAPI="4"
 
@@ -36,8 +36,8 @@ RDEPEND="
 		gnome?  ( gnome-base/libgnomeprintui:2.2 )
 		gstreamer? (
 			gnome-base/gconf:2
-			>=media-libs/gstreamer-0.10
-			>=media-libs/gst-plugins-base-0.10 )
+			media-libs/gstreamer:0.10
+			media-libs/gst-plugins-base:0.10 )
 		opengl? ( virtual/opengl )
 		tiff?   ( media-libs/tiff:0 )
 		)
diff --git a/x11-libs/wxGTK/wxGTK-2.9.3.1.ebuild b/x11-libs/wxGTK/wxGTK-2.9.3.1.ebuild
deleted file mode 100644
index ddf8f1e0f9c2..000000000000
--- a/x11-libs/wxGTK/wxGTK-2.9.3.1.ebuild
+++ /dev/null
@@ -1,169 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.9.3.1.ebuild,v 1.2 2012/05/05 03:52:23 jdhore Exp $
-
-EAPI="3"
-
-inherit eutils flag-o-matic
-
-DESCRIPTION="GTK+ version of wxWidgets, a cross-platform C++ GUI toolkit"
-HOMEPAGE="http://wxwidgets.org/"
-
-# we use the wxPython tarballs because they include the full wxGTK sources and
-# docs, and are released more frequently than wxGTK.
-SRC_URI="mirror://sourceforge/wxpython/wxPython-src-${PV}.tar.bz2
-	doc? ( mirror://sourceforge/wxpython/wxPython-docs-${PV}.tar.bz2 )"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="X aqua doc debug gnome gstreamer opengl pch sdl tiff"
-
-RDEPEND="
-	dev-libs/expat
-	sdl?    ( media-libs/libsdl )
-	X?  (
-		>=dev-libs/glib-2.22:2
-		media-libs/libpng:0
-		sys-libs/zlib
-		virtual/jpeg
-		>=x11-libs/gtk+-2.18:2
-		x11-libs/libSM
-		x11-libs/libXinerama
-		x11-libs/libXxf86vm
-		x11-libs/pango[X]
-		gnome? ( gnome-base/libgnomeprintui:2.2 )
-		gstreamer? (
-			gnome-base/gconf:2
-			>=media-libs/gstreamer-0.10
-			>=media-libs/gst-plugins-base-0.10 )
-		opengl? ( virtual/opengl )
-		tiff?   ( media-libs/tiff:0 )
-		)
-	aqua? (
-		>=x11-libs/gtk+-2.4[aqua=]
-		virtual/jpeg
-		tiff?   ( media-libs/tiff:0 )
-		)"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	X?  (
-		x11-proto/xproto
-		x11-proto/xineramaproto
-		x11-proto/xf86vidmodeproto
-		)"
-#		test? ( dev-util/cppunit )
-
-PDEPEND=">=app-admin/eselect-wxwidgets-1.4"
-
-SLOT="2.9"
-LICENSE="wxWinLL-3
-		GPL-2
-		doc?	( wxWinFDL-3 )"
-
-S="${WORKDIR}/wxPython-src-${PV}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-collision.patch
-}
-
-src_configure() {
-	local myconf
-
-	append-flags -fno-strict-aliasing
-
-	# X independent options
-	myconf="--enable-compat26
-			--with-zlib=sys
-			--with-expat=sys
-			$(use_enable pch precomp-headers)
-			$(use_with sdl)"
-
-	# debug in >=2.9
-	#   if USE="debug" set max debug level (wxDEBUG_LEVEL=2)
-	#   if USE="-debug" use the default (wxDEBUG_LEVEL=1)
-	#   do not use --disable-debug
-	# this means we always build debugging features into the library, and
-	# apps can disable these features by building w/ -NDEBUG or wxDEBUG_LEVEL_0.
-	# wxDEBUG_LEVEL=2 enables assertions that have expensive runtime costs.
-	# http://docs.wxwidgets.org/2.9/overview_debugging.html
-	# http://groups.google.com/group/wx-dev/browse_thread/thread/c3c7e78d63d7777f/05dee25410052d9c
-	use debug \
-		&& myconf="${myconf} --enable-debug=max"
-
-	# wxGTK options
-	#   --enable-graphics_ctx - needed for webkit, editra
-	#   --without-gnomevfs - bug #203389
-
-	use X && \
-		myconf="${myconf}
-			--enable-graphics_ctx
-			--enable-gui
-			--with-libpng=sys
-			--with-libxpm=sys
-			--with-libjpeg=sys
-			--without-gnomevfs
-			$(use_enable gstreamer mediactrl)
-			$(use_with opengl)
-			$(use_with gnome gnomeprint)
-			$(use_with !gnome gtkprint)
-			$(use_with tiff libtiff sys)"
-
-	use aqua && \
-		myconf="${myconf}
-			--enable-graphics_ctx
-			--enable-gui
-			--with-libpng=sys
-			--with-libxpm=sys
-			--with-libjpeg=sys
-			--with-mac
-			--with-opengl"
-			# cocoa toolkit seems to be broken
-
-	# wxBase options
-	if use !X && use !aqua ; then
-		myconf="${myconf}
-			--disable-gui"
-	fi
-
-	mkdir "${S}"/wxgtk_build
-	cd "${S}"/wxgtk_build
-
-	ECONF_SOURCE="${S}" econf ${myconf}
-}
-
-src_compile() {
-	cd "${S}"/wxgtk_build
-	emake || die "make failed."
-}
-
-# Currently fails - need to investigate
-#src_test() {
-#	cd "${S}"/wxgtk_build/tests
-#	emake || die "failed building testsuite"
-#	./test -d || ewarn "failed running testsuite"
-#}
-
-src_install() {
-	cd "${S}"/wxgtk_build
-
-	emake DESTDIR="${D}" install || die "install failed."
-
-	cd "${S}"/docs
-	dodoc changes.txt readme.txt
-	newdoc base/readme.txt base_readme.txt
-	newdoc gtk/readme.txt gtk_readme.txt
-
-	if use doc; then
-		dohtml -r "${S}"/docs/doxygen/out/html/*
-	fi
-}
-
-pkg_postinst() {
-	has_version app-admin/eselect-wxwidgets \
-		&& eselect wxwidgets update
-}
-
-pkg_postrm() {
-	has_version app-admin/eselect-wxwidgets \
-		&& eselect wxwidgets update
-}
diff --git a/x11-libs/wxGTK/wxGTK-2.9.4.1.ebuild b/x11-libs/wxGTK/wxGTK-2.9.4.1.ebuild
index 95df279452f5..64dcc7e103d7 100644
--- a/x11-libs/wxGTK/wxGTK-2.9.4.1.ebuild
+++ b/x11-libs/wxGTK/wxGTK-2.9.4.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.9.4.1.ebuild,v 1.1 2012/07/28 22:45:58 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.9.4.1.ebuild,v 1.2 2012/09/16 02:54:05 dirtyepic Exp $
 
 EAPI="4"
 
@@ -34,8 +34,8 @@ RDEPEND="
 		gnome? ( gnome-base/libgnomeprintui:2.2 )
 		gstreamer? (
 			gnome-base/gconf:2
-			>=media-libs/gstreamer-0.10
-			>=media-libs/gst-plugins-base-0.10 )
+			media-libs/gstreamer:0.10
+			media-libs/gst-plugins-base:0.10 )
 		opengl? ( virtual/opengl )
 		tiff?   ( media-libs/tiff:0 )
 		)