[gentoo-commits] proj/gnome:master commit in: media-sound/sound-juicer/

[Gilles Dartiguelongue]

commit:     38b054c63067b315106cf29f04f2ef05263fd38b
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 31 14:06:39 2012 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Mon Dec 31 14:06:53 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=38b054c6

media-sound/sound-juicer: moved to gx86, sync live ebuild

---
 media-sound/sound-juicer/sound-juicer-3.5.0.ebuild |   70 --------------------
 media-sound/sound-juicer/sound-juicer-9999.ebuild  |   26 ++++---
 2 files changed, 15 insertions(+), 81 deletions(-)

diff --git a/media-sound/sound-juicer/sound-juicer-3.5.0.ebuild b/media-sound/sound-juicer/sound-juicer-3.5.0.ebuild
deleted file mode 100644
index 4530e5b..0000000
--- a/media-sound/sound-juicer/sound-juicer-3.5.0.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="4"
-GCONF_DEBUG="yes"
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2
-if [[ ${PV} = 9999 ]]; then
-	inherit gnome2-live
-fi
-
-DESCRIPTION="CD ripper for GNOME"
-HOMEPAGE="http://www.burtonini.com/blog/computers/sound-juicer/"
-
-LICENSE="GPL-2"
-SLOT="0"
-if [[ ${PV} = 9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-fi
-IUSE="flac test vorbis"
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.32:2
-	>=x11-libs/gtk+-2.90:3
-	media-libs/libcanberra[gtk3]
-	>=app-cdr/brasero-2.90
-	>=gnome-base/gconf-2:2
-	sys-apps/dbus
-
-	media-libs/libdiscid
-	>=media-libs/musicbrainz-5.0.1:5
-
-	media-libs/gstreamer:1.0
-	media-libs/gst-plugins-base:1.0[vorbis?]
-	flac? ( media-plugins/gst-plugins-flac:1.0 )
-"
-RDEPEND="${COMMON_DEPEND}
-	gnome-base/gvfs[cdda,udev]
-	|| (
-		media-plugins/gst-plugins-cdparanoia:1.0
-		media-plugins/gst-plugins-cdio:1.0 )"
-
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.40
-	>=app-text/scrollkeeper-0.3.5
-	app-text/gnome-doc-utils
-	virtual/pkgconfig
-	test? ( ~app-text/docbook-xml-dtd-4.3 )"
-
-src_configure() {
-	DOCS="AUTHORS ChangeLog NEWS README TODO"
-	# GST_INSPECT needed to get around some sandboxing checks
-	G2CONF="${G2CONF}
-		GST_INSPECT=$(type -P true)"
-	gnome2_src_configure
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	ewarn "If ${PN} does not rip to some music format, please check your USE flags"
-	ewarn "on media-libs/libgnome-media-profiles and media-plugins/gst-plugins-meta"
-	ewarn
-	ewarn "The list of audio encoding profiles in ${P} is non-customizable."
-	ewarn "A possible workaround is to rip to flac using ${PN}, and convert to"
-	ewarn "your desired format using a separate tool."
-}

diff --git a/media-sound/sound-juicer/sound-juicer-9999.ebuild b/media-sound/sound-juicer/sound-juicer-9999.ebuild
index 832e85b..9a875f9 100644
--- a/media-sound/sound-juicer/sound-juicer-9999.ebuild
+++ b/media-sound/sound-juicer/sound-juicer-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="4"
+EAPI="5"
 GCONF_DEBUG="yes"
 GNOME2_LA_PUNT="yes"
 
@@ -14,7 +14,7 @@ fi
 DESCRIPTION="CD ripper for GNOME"
 HOMEPAGE="http://www.burtonini.com/blog/computers/sound-juicer/"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 if [[ ${PV} = 9999 ]]; then
 	KEYWORDS=""
@@ -35,15 +35,16 @@ COMMON_DEPEND="
 	>=media-libs/musicbrainz-5.0.1:5
 
 	media-libs/gstreamer:1.0
-	media-libs/gst-plugins-base:1.0[flac?,vorbis?]
+	media-libs/gst-plugins-base:1.0[vorbis?]
+	flac? ( media-plugins/gst-plugins-flac:1.0 )
 "
 RDEPEND="${COMMON_DEPEND}
 	gnome-base/gvfs[cdda,udev]
 	|| (
 		media-plugins/gst-plugins-cdparanoia:1.0
 		media-plugins/gst-plugins-cdio:1.0 )
-	>=media-plugins/gst-plugins-meta-0.10-r2:0.10"
-
+	media-plugins/gst-plugins-meta:1.0
+"
 DEPEND="${COMMON_DEPEND}
 	>=dev-util/intltool-0.40
 	>=app-text/scrollkeeper-0.3.5
@@ -51,12 +52,15 @@ DEPEND="${COMMON_DEPEND}
 	virtual/pkgconfig
 	test? ( ~app-text/docbook-xml-dtd-4.3 )"
 
-src_configure() {
-	DOCS="AUTHORS ChangeLog NEWS README TODO"
-	# GST_INSPECT needed to get around some sandboxing checks
-	G2CONF="${G2CONF}
-		GST_INSPECT=$(type -P true)"
-	gnome2_src_configure
+src_prepare() {
+	gnome2_src_prepare
+
+	# FIXME: gst macros does not take GST_INSPECT override anymore but we need a
+	# way to disable inspection due to gst-clutter always creating a GL context
+	# which is forbidden in sandbox since it needs write access to
+	# /dev/card*/dri
+	sed -e "s|\(gstinspect=\).*|\1$(type -P true)|" \
+		-i configure || die
 }
 
 pkg_postinst() {