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

[Gilles Dartiguelongue]

commit:     ba983aacea8949d0757f9e1530d10a2884ae3e49
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sun May  3 21:25:47 2015 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sun May  3 21:54:48 2015 +0000
URL:        https://gitweb.gentoo.org/proj/gnome.git/commit/?id=ba983aac

media-sound/sound-juicer: 3.14.0 → 3.16.1

 ...-juicer-9999.ebuild => sound-juicer-3.16.1.ebuild} | 19 ++++---------------
 media-sound/sound-juicer/sound-juicer-9999.ebuild     |  8 +++++---
 2 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/media-sound/sound-juicer/sound-juicer-9999.ebuild 
b/media-sound/sound-juicer/sound-juicer-3.16.1.ebuild
similarity index 83%
copy from media-sound/sound-juicer/sound-juicer-9999.ebuild
copy to media-sound/sound-juicer/sound-juicer-3.16.1.ebuild
index f6294f1..eabd252 100644
--- a/media-sound/sound-juicer/sound-juicer-9999.ebuild
+++ b/media-sound/sound-juicer/sound-juicer-3.16.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -6,20 +6,13 @@ EAPI="5"
 GCONF_DEBUG="yes"
 
 inherit gnome2
-if [[ ${PV} = 9999 ]]; then
-       inherit gnome2-live
-fi
 
 DESCRIPTION="CD ripper for GNOME"
 HOMEPAGE="https://wiki.gnome.org/Apps/SoundJuicer";
 
 LICENSE="GPL-2+"
 SLOT="0"
-if [[ ${PV} = 9999 ]]; then
-       KEYWORDS=""
-else
-       KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-fi
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="flac test vorbis"
 
 COMMON_DEPEND="
@@ -46,16 +39,12 @@ RDEPEND="${COMMON_DEPEND}
        media-plugins/gst-plugins-meta:1.0
 "
 DEPEND="${COMMON_DEPEND}
+       dev-libs/appstream-glib
        >=dev-util/intltool-0.50
-       >=app-text/scrollkeeper-0.3.5
        virtual/pkgconfig
        test? ( ~app-text/docbook-xml-dtd-4.3 )
 "
-
-if [[ ${PV} = 9999 ]]; then
-       DEPEND="${DEPEND}
-               app-text/yelp-tools"
-fi
+# eautoreconf needs gnome-common
 
 src_prepare() {
        gnome2_src_prepare

diff --git a/media-sound/sound-juicer/sound-juicer-9999.ebuild 
b/media-sound/sound-juicer/sound-juicer-9999.ebuild
index f6294f1..f12f149 100644
--- a/media-sound/sound-juicer/sound-juicer-9999.ebuild
+++ b/media-sound/sound-juicer/sound-juicer-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -46,15 +46,17 @@ RDEPEND="${COMMON_DEPEND}
        media-plugins/gst-plugins-meta:1.0
 "
 DEPEND="${COMMON_DEPEND}
+       dev-libs/appstream-glib
        >=dev-util/intltool-0.50
-       >=app-text/scrollkeeper-0.3.5
        virtual/pkgconfig
        test? ( ~app-text/docbook-xml-dtd-4.3 )
 "
 
 if [[ ${PV} = 9999 ]]; then
        DEPEND="${DEPEND}
-               app-text/yelp-tools"
+               app-text/yelp-tools
+               gnome-base/gnome-common
+       "
 fi
 
 src_prepare() {