Version bump for Gnome 3.6.

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

4 files changed, 80 insertions, 76 deletions

diff --git a/media-sound/sound-juicer/ChangeLog b/media-sound/sound-juicer/ChangeLog
index e3ae08a11520..c9678f6a1d20 100644
--- a/media-sound/sound-juicer/ChangeLog
+++ b/media-sound/sound-juicer/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-sound/sound-juicer
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/sound-juicer/ChangeLog,v 1.219 2012/06/07 05:37:35 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/sound-juicer/ChangeLog,v 1.220 2012/12/31 14:04:55 eva Exp $
+
+*sound-juicer-3.5.1_pre20121231 (31 Dec 2012)
+
+  31 Dec 2012; Gilles Dartiguelongue <eva@gentoo.org>
+  -sound-juicer-2.99.0_pre20111001.ebuild,
+  +sound-juicer-3.5.1_pre20121231.ebuild, metadata.xml:
+  Version bump for Gnome 3.6.
 
   07 Jun 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
   sound-juicer-2.99.0_pre20111001.ebuild:
diff --git a/media-sound/sound-juicer/metadata.xml b/media-sound/sound-juicer/metadata.xml
index 8d050837c31b..da6fd63d0085 100644
--- a/media-sound/sound-juicer/metadata.xml
+++ b/media-sound/sound-juicer/metadata.xml
@@ -1,10 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>gnome</herd>
-	<herd>sound</herd>
-	<maintainer>
-		<email>sping@gentoo.org</email>
-		<name>Sebastian Pipping</name>
-	</maintainer>
+<herd>gnome</herd>
 </pkgmetadata>
diff --git a/media-sound/sound-juicer/sound-juicer-2.99.0_pre20111001.ebuild b/media-sound/sound-juicer/sound-juicer-2.99.0_pre20111001.ebuild
deleted file mode 100644
index 5c6eb7ad6f54..000000000000
--- a/media-sound/sound-juicer/sound-juicer-2.99.0_pre20111001.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/sound-juicer/sound-juicer-2.99.0_pre20111001.ebuild,v 1.6 2012/06/07 05:37:35 tetromino Exp $
-
-EAPI="4"
-GCONF_DEBUG="yes"
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2
-
-DESCRIPTION="CD ripper for GNOME"
-HOMEPAGE="http://www.burtonini.com/blog/computers/sound-juicer/"
-SRC_URI="mirror://gentoo/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-COMMON_DEPEND=">=dev-libs/glib-2.18:2
-	>=x11-libs/gtk+-2.90:3
-	media-libs/libcanberra[gtk3]
-	>=app-cdr/brasero-2.90
-	>=gnome-base/gconf-2:2
-	sys-apps/dbus
-	dev-libs/dbus-glib
-
-	>=media-libs/musicbrainz-3.0.2:3
-	media-libs/libgnome-media-profiles:3
-
-	>=media-libs/gstreamer-0.10.15:0.10
-	>=media-libs/gst-plugins-base-0.10:0.10"
-
-RDEPEND="${COMMON_DEPEND}
-	gnome-base/gvfs[cdda,udev]
-	>=media-plugins/gst-plugins-gconf-0.10:0.10
-	>=media-plugins/gst-plugins-gio-0.10:0.10
-	|| (
-		>=media-plugins/gst-plugins-cdparanoia-0.10:0.10
-		>=media-plugins/gst-plugins-cdio-0.10:0.10 )
-	>=media-plugins/gst-plugins-meta-0.10-r2:0.10"
-
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-	>=dev-util/intltool-0.40
-	>=app-text/scrollkeeper-0.3.5
-	app-text/gnome-doc-utils
-	test? ( ~app-text/docbook-xml-dtd-4.3 )"
-
-pkg_setup() {
-	# GST_INSPECT needed to get around some sandboxing checks
-	G2CONF="${G2CONF}
-		--disable-scrollkeeper
-		GST_INSPECT=$(type -p true)"
-	DOCS="AUTHORS ChangeLog NEWS README TODO"
-}
-
-src_configure() {
-	# Work around sandbox violations when FEATURES=-userpriv caused by
-	# gst-inspect-0.10 (bug #419183)
-	unset DISPLAY
-	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"
-}
diff --git a/media-sound/sound-juicer/sound-juicer-3.5.1_pre20121231.ebuild b/media-sound/sound-juicer/sound-juicer-3.5.1_pre20121231.ebuild
new file mode 100644
index 000000000000..8c8611128dd0
--- /dev/null
+++ b/media-sound/sound-juicer/sound-juicer-3.5.1_pre20121231.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/sound-juicer/sound-juicer-3.5.1_pre20121231.ebuild,v 1.1 2012/12/31 14:04:55 eva Exp $
+
+EAPI="5"
+GCONF_DEBUG="yes"
+GNOME2_LA_PUNT="yes"
+
+inherit gnome2
+
+DESCRIPTION="CD ripper for GNOME"
+HOMEPAGE="http://www.burtonini.com/blog/computers/sound-juicer/"
+SRC_URI="http://dev.gentoo.org/~eva/distfiles/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+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 )
+	media-plugins/gst-plugins-meta: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 )"
+
+# Upstream did not do a post-release version bump.
+S="${WORKDIR}/${PN}-3.5.0"
+
+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() {
+	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."
+}