commit:     422c45c34204d9d613d3572f5dd6c35725824ed7
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sun Apr  6 17:30:49 2014 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sun Apr  6 17:51:53 2014 +0000
URL:        
http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=422c45c3

media-sound/sound-juicer: 3.5.1_pre20130826 → 3.11.90

---
 ...cer-9999.ebuild => sound-juicer-3.11.90.ebuild} | 32 +++++++++-------------
 media-sound/sound-juicer/sound-juicer-9999.ebuild  | 24 ++++++++--------
 2 files changed, 26 insertions(+), 30 deletions(-)

diff --git a/media-sound/sound-juicer/sound-juicer-9999.ebuild 
b/media-sound/sound-juicer/sound-juicer-3.11.90.ebuild
similarity index 65%
copy from media-sound/sound-juicer/sound-juicer-9999.ebuild
copy to media-sound/sound-juicer/sound-juicer-3.11.90.ebuild
index b35707c..6face1f 100644
--- a/media-sound/sound-juicer/sound-juicer-9999.ebuild
+++ b/media-sound/sound-juicer/sound-juicer-3.11.90.ebuild
@@ -4,23 +4,15 @@
 
 EAPI="5"
 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 ~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="
@@ -29,7 +21,6 @@ COMMON_DEPEND="
        >=x11-libs/gtk+-3.2:3
        media-libs/libcanberra[gtk3]
        >=app-cdr/brasero-2.90
-       >=gnome-base/gconf-2:2
        sys-apps/dbus
 
        media-libs/libdiscid
@@ -47,11 +38,11 @@ RDEPEND="${COMMON_DEPEND}
        media-plugins/gst-plugins-meta:1.0
 "
 DEPEND="${COMMON_DEPEND}
-       >=dev-util/intltool-0.40
+       >=dev-util/intltool-0.50
        >=app-text/scrollkeeper-0.3.5
-       app-text/gnome-doc-utils
        virtual/pkgconfig
-       test? ( ~app-text/docbook-xml-dtd-4.3 )"
+       test? ( ~app-text/docbook-xml-dtd-4.3 )
+"
 
 src_prepare() {
        gnome2_src_prepare
@@ -64,12 +55,15 @@ src_prepare() {
                -i configure || die
 }
 
+src_configure() {
+       gnome2_src_configure ITSTOOLS="$(type -P true)"
+}
+
 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."
+       if [ -z ${REPLACING_VERSIONS} ]; then
+               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."
+       fi
 }

diff --git a/media-sound/sound-juicer/sound-juicer-9999.ebuild 
b/media-sound/sound-juicer/sound-juicer-9999.ebuild
index b35707c..1f94e41 100644
--- a/media-sound/sound-juicer/sound-juicer-9999.ebuild
+++ b/media-sound/sound-juicer/sound-juicer-9999.ebuild
@@ -4,7 +4,6 @@
 
 EAPI="5"
 GCONF_DEBUG="yes"
-GNOME2_LA_PUNT="yes"
 
 inherit gnome2
 if [[ ${PV} = 9999 ]]; then
@@ -29,7 +28,6 @@ COMMON_DEPEND="
        >=x11-libs/gtk+-3.2:3
        media-libs/libcanberra[gtk3]
        >=app-cdr/brasero-2.90
-       >=gnome-base/gconf-2:2
        sys-apps/dbus
 
        media-libs/libdiscid
@@ -47,11 +45,16 @@ RDEPEND="${COMMON_DEPEND}
        media-plugins/gst-plugins-meta:1.0
 "
 DEPEND="${COMMON_DEPEND}
-       >=dev-util/intltool-0.40
+       >=dev-util/intltool-0.50
        >=app-text/scrollkeeper-0.3.5
-       app-text/gnome-doc-utils
        virtual/pkgconfig
-       test? ( ~app-text/docbook-xml-dtd-4.3 )"
+       test? ( ~app-text/docbook-xml-dtd-4.3 )
+"
+
+if [[ ${PV} = 9999 ]]; then
+       DEPEND="${DEPEND}
+               app-text/yelp-tools"
+fi
 
 src_prepare() {
        gnome2_src_prepare
@@ -66,10 +69,9 @@ src_prepare() {
 
 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."
+       if [ -z ${REPLACING_VERSIONS} ]; then
+               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."
+       fi
 }

Reply via email to