QA fixes.

(Portage version: 2.2.0_alpha170/cvs/Linux x86_64, signed Manifest commit with key C6085806)

2 files changed, 33 insertions, 23 deletions

diff --git a/net-misc/rygel/ChangeLog b/net-misc/rygel/ChangeLog
index 4796b466d0e2..0792ed62e68b 100644
--- a/net-misc/rygel/ChangeLog
+++ b/net-misc/rygel/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-misc/rygel
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/rygel/ChangeLog,v 1.34 2013/03/30 22:48:38 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/rygel/ChangeLog,v 1.35 2013/03/31 18:13:55 eva Exp $
+
+  31 Mar 2013; Gilles Dartiguelongue <eva@gentoo.org> rygel-0.18.0.ebuild:
+  QA fixes.
 
   30 Mar 2013; Gilles Dartiguelongue <eva@gentoo.org> rygel-0.14.3.ebuild,
   rygel-0.16.4.ebuild, rygel-0.18.0.ebuild:
diff --git a/net-misc/rygel/rygel-0.18.0.ebuild b/net-misc/rygel/rygel-0.18.0.ebuild
index 081f206a196a..11a86d33604a 100644
--- a/net-misc/rygel/rygel-0.18.0.ebuild
+++ b/net-misc/rygel/rygel-0.18.0.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/rygel/rygel-0.18.0.ebuild,v 1.2 2013/03/30 22:48:38 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/rygel/rygel-0.18.0.ebuild,v 1.3 2013/03/31 18:13:55 eva Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 
-inherit gnome2
+inherit gnome2 virtualx
 
 DESCRIPTION="Rygel is an open source UPnP/DLNA MediaServer"
 HOMEPAGE="http://live.gnome.org/Rygel"
@@ -16,27 +16,26 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="X nls +sqlite tracker test transcode"
 
-RESTRICT=test # Tries to access /dev/dri/*
-
 # The deps for tracker? and transcode? are just the earliest available
 # version at the time of writing this ebuild
 RDEPEND="
 	>=dev-libs/glib-2.32:2
-	>=dev-libs/libgee-0.8.0:0.8
+	>=dev-libs/libgee-0.8:0.8
+	>=dev-libs/libxml2-2.7:2
 	>=media-libs/gupnp-dlna-0.9.4:2.0
 	media-libs/gstreamer:1.0
 	media-libs/gst-plugins-base:1.0
-	>=net-libs/gssdp-0.13.0
-	>=net-libs/gupnp-0.19.0
+	>=net-libs/gssdp-0.13
+	>=net-libs/gupnp-0.19
 	>=net-libs/gupnp-av-0.11.4
 	>=net-libs/libsoup-2.34:2.4
-	>=sys-libs/e2fsprogs-libs-1.41.3
+	>=sys-apps/util-linux-2.20
 	x11-misc/shared-mime-info
 	sqlite? (
 		>=dev-db/sqlite-3.5:3
 		dev-libs/libunistring
 	)
-	tracker? ( >=app-misc/tracker-0.14 )
+	tracker? ( >=app-misc/tracker-0.14:= )
 	transcode? (
 		>=media-libs/gst-plugins-bad-0.10.14:0.10
 		>=media-plugins/gst-plugins-twolame-0.10.12:0.10
@@ -51,26 +50,34 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 "
 # Maintainer only
-#	>=dev-lang/vala-0.16.1
-#	>=net-libs/gupnp-vala-0.10.2
+#	>=dev-lang/vala-0.18
 #   dev-libs/libxslt
 
+src_prepare() {
+	# runs gst-plugins-scanner on run with triggers sandbox violation
+	# trying to open dri
+	sed -e 's/rygel-media-engine-test$(EXEEXT)//' \
+		-e 's/rygel-playbin-renderer-test$(EXEEXT)//' \
+		-i tests/Makefile.in || die
+
+	gnome2_src_prepare
+}
+
 src_configure() {
 	DOCS="AUTHORS ChangeLog NEWS README TODO"
 	# We defined xsltproc because man pages are provided by upstream
 	# and we do not want to regenerate them automagically.
-	G2CONF="${G2CONF}
-		XSLTPROC=$(type -P false)
-		--disable-valadoc
-		--enable-gst-launch-plugin
-		--enable-mediathek-plugin
-		$(use_enable nls)
-		$(use_enable sqlite media-export-plugin)
-		$(use_enable test tests)
-		$(use_enable tracker tracker-plugin)
+	gnome2_src_configure \
+		XSLTPROC=$(type -P false) \
+		--disable-valadoc \
+		--enable-gst-launch-plugin \
+		--enable-mediathek-plugin \
+		--with-media-engine=gstreamer \
+		$(use_enable nls) \
+		$(use_enable sqlite media-export-plugin) \
+		$(use_enable test tests) \
+		$(use_enable tracker tracker-plugin) \
 		$(use_with X ui)
-	"
-	gnome2_src_configure
 }
 
 src_install() {