Fix dependencies for test suite, bug #320109. Drop old revisions.

(Portage version: 2.2_rc86/cvs/Linux x86_64)

4 files changed, 16 insertions, 93 deletions

diff --git a/dev-cpp/gstreamermm/ChangeLog b/dev-cpp/gstreamermm/ChangeLog
index 6cdbe4f5aef0..4a02645498f0 100644
--- a/dev-cpp/gstreamermm/ChangeLog
+++ b/dev-cpp/gstreamermm/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-cpp/gstreamermm
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gstreamermm/ChangeLog,v 1.11 2010/09/11 18:20:27 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gstreamermm/ChangeLog,v 1.12 2010/09/26 14:33:54 eva Exp $
+
+  26 Sep 2010; Gilles Dartiguelongue <eva@gentoo.org>
+  -gstreamermm-0.10.6.ebuild, -gstreamermm-0.10.7.ebuild,
+  gstreamermm-0.10.7.3.ebuild:
+  Fix dependencies for test suite, bug #320109. Drop old revisions.
 
   11 Sep 2010; Joseph Jezak <josejx@gentoo.org> gstreamermm-0.10.7.3.ebuild:
   Fixed keyword (ppc->~ppc).
diff --git a/dev-cpp/gstreamermm/gstreamermm-0.10.6.ebuild b/dev-cpp/gstreamermm/gstreamermm-0.10.6.ebuild
deleted file mode 100644
index fb3614d94d7f..000000000000
--- a/dev-cpp/gstreamermm/gstreamermm-0.10.6.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gstreamermm/gstreamermm-0.10.6.ebuild,v 1.3 2010/03/13 11:24:40 phajdan.jr Exp $
-
-EAPI=2
-
-inherit gnome2
-
-DESCRIPTION="C++ interface for GStreamer"
-HOMEPAGE="http://gstreamer.freedesktop.org/bindings/cplusplus.html"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-# gstreamer 0.10.25 is needed for per-stream volume
-# see bug #308935
-RDEPEND="
-	>=media-libs/gstreamer-0.10.25
-	>=media-libs/gst-plugins-base-0.10.25
-	>=dev-cpp/glibmm-2.21.1
-	>=dev-cpp/libxmlpp-2.14
-	>=dev-libs/libsigc++-2.0"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-src_test() {
-	# explicitly allow parallel make of tests: they are not built in
-	# src_compile() and indeed we'd slow down tremendously to run this
-	# serially.
-	emake check || die "tests failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "install failed"
-	dodoc AUTHORS ChangeLog NEWS README || die
-
-	find . -name '*.la' -delete
-}
diff --git a/dev-cpp/gstreamermm/gstreamermm-0.10.7.3.ebuild b/dev-cpp/gstreamermm/gstreamermm-0.10.7.3.ebuild
index 2942b2f66c7c..8f07e98f0cde 100644
--- a/dev-cpp/gstreamermm/gstreamermm-0.10.7.3.ebuild
+++ b/dev-cpp/gstreamermm/gstreamermm-0.10.7.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gstreamermm/gstreamermm-0.10.7.3.ebuild,v 1.6 2010/09/11 18:20:27 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gstreamermm/gstreamermm-0.10.7.3.ebuild,v 1.7 2010/09/26 14:33:54 eva Exp $
 
 EAPI="2"
 
@@ -12,7 +12,7 @@ HOMEPAGE="http://gstreamer.freedesktop.org/bindings/cplusplus.html"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="amd64 ~ppc x86"
-IUSE=""
+IUSE="test"
 
 # gstreamer 0.10.25 is needed for per-stream volume
 # see bug #308935
@@ -21,10 +21,15 @@ RDEPEND="
 	>=media-libs/gst-plugins-base-0.10.28
 	>=dev-cpp/glibmm-2.21.1
 	>=dev-cpp/libxmlpp-2.14
-	>=dev-libs/libsigc++-2:2"
-
+	>=dev-libs/libsigc++-2:2
+"
 DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
+	dev-util/pkgconfig
+	test? (
+		media-libs/gst-plugins-good:0.10
+		media-plugins/gst-plugins-vorbis:0.10
+		media-plugins/gst-plugins-x:0.10 )
+"
 
 src_prepare() {
 	epatch "${FILESDIR}/${P}+gcc-4.5.patch"
diff --git a/dev-cpp/gstreamermm/gstreamermm-0.10.7.ebuild b/dev-cpp/gstreamermm/gstreamermm-0.10.7.ebuild
deleted file mode 100644
index 95c1a4a92feb..000000000000
--- a/dev-cpp/gstreamermm/gstreamermm-0.10.7.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gstreamermm/gstreamermm-0.10.7.ebuild,v 1.2 2010/05/14 17:54:28 ssuominen Exp $
-
-EAPI=2
-
-inherit eutils gnome2
-
-DESCRIPTION="C++ interface for GStreamer"
-HOMEPAGE="http://gstreamer.freedesktop.org/bindings/cplusplus.html"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-# gstreamer 0.10.25 is needed for per-stream volume
-# see bug #308935
-RDEPEND="
-	>=media-libs/gstreamer-0.10.28
-	>=media-libs/gst-plugins-base-0.10.28
-	>=dev-cpp/glibmm-2.21.1
-	>=dev-cpp/libxmlpp-2.14
-	>=dev-libs/libsigc++-2:2"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-gcc45.patch
-	gnome2_src_prepare
-}
-
-src_test() {
-	# explicitly allow parallel make of tests: they are not built in
-	# src_compile() and indeed we'd slow down tremendously to run this
-	# serially.
-	emake check || die "tests failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "install failed"
-	dodoc AUTHORS ChangeLog NEWS README || die
-
-	find . -name '*.la' -delete || die "removal of *.la files failed"
-}