reworked dependencies, dropped all useflags wrt #419631

(Portage version: 2.2.0_alpha109/cvs/Linux x86_64)

6 files changed, 146 insertions, 95 deletions

diff --git a/media-sound/gmusicbrowser/ChangeLog b/media-sound/gmusicbrowser/ChangeLog
index b2212a2b3829..fafd9c54f603 100644
--- a/media-sound/gmusicbrowser/ChangeLog
+++ b/media-sound/gmusicbrowser/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/gmusicbrowser
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/gmusicbrowser/ChangeLog,v 1.14 2012/05/29 01:22:31 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/gmusicbrowser/ChangeLog,v 1.15 2012/06/05 12:55:04 hasufell Exp $
+
+  05 Jun 2012; Julian Ospald <hasufell@gentoo.org> gmusicbrowser-1.1.8.ebuild,
+  gmusicbrowser-1.1.9.ebuild, gmusicbrowser-1.1.9.1_pre20120526.ebuild,
+  gmusicbrowser-9999.ebuild:
+  reworked dependencies, dropped all useflags wrt #419631
 
 *gmusicbrowser-1.1.9.1_pre20120526 (29 May 2012)
 
diff --git a/media-sound/gmusicbrowser/gmusicbrowser-1.1.8.ebuild b/media-sound/gmusicbrowser/gmusicbrowser-1.1.8.ebuild
index 871197a841a7..52e6eca0f742 100644
--- a/media-sound/gmusicbrowser/gmusicbrowser-1.1.8.ebuild
+++ b/media-sound/gmusicbrowser/gmusicbrowser-1.1.8.ebuild
@@ -1,10 +1,11 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/gmusicbrowser/gmusicbrowser-1.1.8.ebuild,v 1.4 2012/05/09 00:01:12 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/gmusicbrowser/gmusicbrowser-1.1.8.ebuild,v 1.5 2012/06/05 12:55:04 hasufell Exp $
 
 # note: dev-perl/Gtk2-MozEmbed left out in purpose because gtkmozembed and xulrunner are obsolete
 
 EAPI=4
+
 inherit fdo-mime
 
 DESCRIPTION="An open-source jukebox for large collections of mp3/ogg/flac files"
@@ -14,30 +15,29 @@ SRC_URI="http://${PN}.org/download/${P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="dbus gstreamer libnotify mplayer webkit"
+IUSE=""
+
+GSTREAMER_DEPEND="
+	dev-perl/GStreamer
+	dev-perl/GStreamer-Interfaces
+	media-plugins/gst-plugins-meta"
+MPLAYER_DEPEND="
+	|| ( media-video/mplayer media-video/mplayer2 )"
+OTHER_DEPEND="
+	media-sound/alsa-utils
+	media-sound/flac123
+	|| ( media-sound/mpg123 media-sound/mpg321 )
+	media-sound/vorbis-tools"
 
 RDEPEND="dev-lang/perl
-	dev-perl/AnyEvent-HTTP
-	dev-perl/gnome2-wnck
 	dev-perl/gtk2-perl
-	dev-perl/gtk2-trayicon
-	dev-perl/MP3-Tag
 	virtual/perl-MIME-Base64
-	dbus? ( dev-perl/Net-DBus )
-	gstreamer? (
-		dev-perl/GStreamer
-		dev-perl/GStreamer-Interfaces
-		media-plugins/gst-plugins-meta
-	)
-	!gstreamer? ( !mplayer? (
-		media-sound/alsa-utils
-		media-sound/flac123
-		|| ( media-sound/mpg123 media-sound/mpg321 )
-		media-sound/vorbis-tools
-	) )
-	libnotify? ( dev-perl/Gtk2-Notify )
-	mplayer? ( || ( media-video/mplayer media-video/mplayer2 ) )
-	webkit? ( dev-perl/Gtk2-WebKit )"
+	|| ( net-misc/wget dev-perl/AnyEvent-HTTP )
+	|| (
+		( ${GSTREAMER_DEPEND} )
+		( ${MPLAYER_DEPEND} )
+		( ${OTHER_DEPEND} )
+	)"
 DEPEND="sys-devel/gettext"
 
 LANGS="cs de es fr hu it ko pl pt pt_BR ru sv zh_CN"
@@ -71,6 +71,20 @@ src_install() {
 
 pkg_postinst() {
 	fdo-mime_desktop_database_update
+
+	elog "Gmusicbrowser supports gstreamer, mplayer and mpg123/ogg123..."
+	elog "for audio playback. Needed dependencies:"
+	elog "Gstreamer: ${GSTREAMER_DEPEND}"
+	elog "mplayer: ${MPLAYER_DEPEND}"
+	elog "mpg123/ogg123...: ${OTHER_DEPEND}"
+	elog
+	elog "This ebuild just ensures at least one implementation is installed!"
+	elog
+	elog "other optional dependencies:"
+	elog "	dev-perl/Net-DBus (for dbus support and mpris1/2 plugins)"
+	elog "	dev-perl/Gtk2-WebKit (for Web context plugin)"
+	elog "	dev-perl/Gtk2-Notify (for Notify plugin)"
+	elog "	dev-perl/gnome2-wnck (for Titlebar plugin)"
 }
 
 pkg_postrm() {
diff --git a/media-sound/gmusicbrowser/gmusicbrowser-1.1.9.1_pre20120526.ebuild b/media-sound/gmusicbrowser/gmusicbrowser-1.1.9.1_pre20120526.ebuild
index a6116df82d3e..c86421addc18 100644
--- a/media-sound/gmusicbrowser/gmusicbrowser-1.1.9.1_pre20120526.ebuild
+++ b/media-sound/gmusicbrowser/gmusicbrowser-1.1.9.1_pre20120526.ebuild
@@ -1,10 +1,9 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/gmusicbrowser/gmusicbrowser-1.1.9.1_pre20120526.ebuild,v 1.1 2012/05/29 01:22:31 hasufell Exp $
-
-# note: dev-perl/Gtk2-MozEmbed left out in purpose because gtkmozembed and xulrunner are obsolete
+# $Header: /var/cvsroot/gentoo-x86/media-sound/gmusicbrowser/gmusicbrowser-1.1.9.1_pre20120526.ebuild,v 1.2 2012/06/05 12:55:04 hasufell Exp $
 
 EAPI=4
+
 inherit fdo-mime vcs-snapshot
 
 DESCRIPTION="An open-source jukebox for large collections of mp3/ogg/flac files"
@@ -15,30 +14,29 @@ SRC_URI="https://github.com/squentin/${PN}/tarball/3293bcbf09dce933b991a98cd5bfc
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="dbus gstreamer libnotify mplayer webkit"
+IUSE=""
+
+GSTREAMER_DEPEND="
+	dev-perl/GStreamer
+	dev-perl/GStreamer-Interfaces
+	media-plugins/gst-plugins-meta"
+MPLAYER_DEPEND="
+	|| ( media-video/mplayer media-video/mplayer2 )"
+OTHER_DEPEND="
+	media-sound/alsa-utils
+	media-sound/flac123
+	|| ( media-sound/mpg123 media-sound/mpg321 )
+	media-sound/vorbis-tools"
 
 RDEPEND="dev-lang/perl
-	dev-perl/AnyEvent-HTTP
-	dev-perl/gnome2-wnck
 	dev-perl/gtk2-perl
-	dev-perl/gtk2-trayicon
-	dev-perl/MP3-Tag
 	virtual/perl-MIME-Base64
-	dbus? ( dev-perl/Net-DBus )
-	gstreamer? (
-		dev-perl/GStreamer
-		dev-perl/GStreamer-Interfaces
-		media-plugins/gst-plugins-meta
-	)
-	!gstreamer? ( !mplayer? (
-		media-sound/alsa-utils
-		media-sound/flac123
-		|| ( media-sound/mpg123 media-sound/mpg321 )
-		media-sound/vorbis-tools
-	) )
-	libnotify? ( dev-perl/Gtk2-Notify )
-	mplayer? ( || ( media-video/mplayer media-video/mplayer2 ) )
-	webkit? ( dev-perl/Gtk2-WebKit )"
+	|| ( net-misc/wget dev-perl/AnyEvent-HTTP )
+	|| (
+		( ${GSTREAMER_DEPEND} )
+		( ${MPLAYER_DEPEND} )
+		( ${OTHER_DEPEND} )
+	)"
 DEPEND="sys-devel/gettext"
 
 LANGS="cs de es fr hu it ko nl pl pt pt_BR ru sv zh_CN"
@@ -73,6 +71,20 @@ src_install() {
 
 pkg_postinst() {
 	fdo-mime_desktop_database_update
+
+	elog "Gmusicbrowser supports gstreamer, mplayer and mpg123/ogg123..."
+	elog "for audio playback. Needed dependencies:"
+	elog "Gstreamer: ${GSTREAMER_DEPEND}"
+	elog "mplayer: ${MPLAYER_DEPEND}"
+	elog "mpg123/ogg123...: ${OTHER_DEPEND}"
+	elog
+	elog "This ebuild just ensures at least one implementation is installed!"
+	elog
+	elog "other optional dependencies:"
+	elog "	dev-perl/Net-DBus (for dbus support and mpris1/2 plugins)"
+	elog "	dev-perl/Gtk2-WebKit (for Web context plugin)"
+	elog "	dev-perl/Gtk2-Notify (for Notify plugin)"
+	elog "	dev-perl/gnome2-wnck (for Titlebar plugin)"
 }
 
 pkg_postrm() {
diff --git a/media-sound/gmusicbrowser/gmusicbrowser-1.1.9.ebuild b/media-sound/gmusicbrowser/gmusicbrowser-1.1.9.ebuild
index 1fac3c5b691c..633317b5c591 100644
--- a/media-sound/gmusicbrowser/gmusicbrowser-1.1.9.ebuild
+++ b/media-sound/gmusicbrowser/gmusicbrowser-1.1.9.ebuild
@@ -1,10 +1,9 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/gmusicbrowser/gmusicbrowser-1.1.9.ebuild,v 1.3 2012/05/20 18:38:36 ago Exp $
-
-# note: dev-perl/Gtk2-MozEmbed left out in purpose because gtkmozembed and xulrunner are obsolete
+# $Header: /var/cvsroot/gentoo-x86/media-sound/gmusicbrowser/gmusicbrowser-1.1.9.ebuild,v 1.4 2012/06/05 12:55:04 hasufell Exp $
 
 EAPI=4
+
 inherit fdo-mime
 
 DESCRIPTION="An open-source jukebox for large collections of mp3/ogg/flac files"
@@ -14,30 +13,29 @@ SRC_URI="http://${PN}.org/download/${P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="amd64 ~x86"
-IUSE="dbus gstreamer libnotify mplayer webkit"
+IUSE=""
+
+GSTREAMER_DEPEND="
+	dev-perl/GStreamer
+	dev-perl/GStreamer-Interfaces
+	media-plugins/gst-plugins-meta"
+MPLAYER_DEPEND="
+	|| ( media-video/mplayer media-video/mplayer2 )"
+OTHER_DEPEND="
+	media-sound/alsa-utils
+	media-sound/flac123
+	|| ( media-sound/mpg123 media-sound/mpg321 )
+	media-sound/vorbis-tools"
 
 RDEPEND="dev-lang/perl
-	dev-perl/AnyEvent-HTTP
-	dev-perl/gnome2-wnck
 	dev-perl/gtk2-perl
-	dev-perl/gtk2-trayicon
-	dev-perl/MP3-Tag
 	virtual/perl-MIME-Base64
-	dbus? ( dev-perl/Net-DBus )
-	gstreamer? (
-		dev-perl/GStreamer
-		dev-perl/GStreamer-Interfaces
-		media-plugins/gst-plugins-meta
-	)
-	!gstreamer? ( !mplayer? (
-		media-sound/alsa-utils
-		media-sound/flac123
-		|| ( media-sound/mpg123 media-sound/mpg321 )
-		media-sound/vorbis-tools
-	) )
-	libnotify? ( dev-perl/Gtk2-Notify )
-	mplayer? ( || ( media-video/mplayer media-video/mplayer2 ) )
-	webkit? ( dev-perl/Gtk2-WebKit )"
+	|| ( net-misc/wget dev-perl/AnyEvent-HTTP )
+	|| (
+		( ${GSTREAMER_DEPEND} )
+		( ${MPLAYER_DEPEND} )
+		( ${OTHER_DEPEND} )
+	)"
 DEPEND="sys-devel/gettext"
 
 LANGS="cs de es fr hu it ko nl pl pt pt_BR ru sv zh_CN"
@@ -71,6 +69,20 @@ src_install() {
 
 pkg_postinst() {
 	fdo-mime_desktop_database_update
+
+	elog "Gmusicbrowser supports gstreamer, mplayer and mpg123/ogg123..."
+	elog "for audio playback. Needed dependencies:"
+	elog "Gstreamer: ${GSTREAMER_DEPEND}"
+	elog "mplayer: ${MPLAYER_DEPEND}"
+	elog "mpg123/ogg123...: ${OTHER_DEPEND}"
+	elog
+	elog "This ebuild just ensures at least one implementation is installed!"
+	elog
+	elog "other optional dependencies:"
+	elog "	dev-perl/Net-DBus (for dbus support and mpris1/2 plugins)"
+	elog "	dev-perl/Gtk2-WebKit (for Web context plugin)"
+	elog "	dev-perl/Gtk2-Notify (for Notify plugin)"
+	elog "	dev-perl/gnome2-wnck (for Titlebar plugin)"
 }
 
 pkg_postrm() {
diff --git a/media-sound/gmusicbrowser/gmusicbrowser-9999.ebuild b/media-sound/gmusicbrowser/gmusicbrowser-9999.ebuild
index a606be7296c5..9e8e86c9accc 100644
--- a/media-sound/gmusicbrowser/gmusicbrowser-9999.ebuild
+++ b/media-sound/gmusicbrowser/gmusicbrowser-9999.ebuild
@@ -1,45 +1,42 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/gmusicbrowser/gmusicbrowser-9999.ebuild,v 1.2 2012/05/09 00:01:12 hasufell Exp $
-
-# note: dev-perl/Gtk2-MozEmbed left out in purpose because gtkmozembed and xulrunner are obsolete
+# $Header: /var/cvsroot/gentoo-x86/media-sound/gmusicbrowser/gmusicbrowser-9999.ebuild,v 1.3 2012/06/05 12:55:04 hasufell Exp $
 
 EAPI=4
+
 inherit fdo-mime git-2
 
 DESCRIPTION="An open-source jukebox for large collections of mp3/ogg/flac files"
 HOMEPAGE="http://gmusicbrowser.org/"
 SRC_URI=""
-
 EGIT_REPO_URI="git://github.com/squentin/${PN}.git"
 
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS=""
-IUSE="dbus gstreamer libnotify mplayer webkit"
+IUSE=""
+
+GSTREAMER_DEPEND="
+	dev-perl/GStreamer
+	dev-perl/GStreamer-Interfaces
+	media-plugins/gst-plugins-meta"
+MPLAYER_DEPEND="
+	|| ( media-video/mplayer media-video/mplayer2 )"
+OTHER_DEPEND="
+	media-sound/alsa-utils
+	media-sound/flac123
+	|| ( media-sound/mpg123 media-sound/mpg321 )
+	media-sound/vorbis-tools"
 
 RDEPEND="dev-lang/perl
-	dev-perl/AnyEvent-HTTP
-	dev-perl/gnome2-wnck
 	dev-perl/gtk2-perl
-	dev-perl/gtk2-trayicon
-	dev-perl/MP3-Tag
 	virtual/perl-MIME-Base64
-	dbus? ( dev-perl/Net-DBus )
-	gstreamer? (
-		dev-perl/GStreamer
-		dev-perl/GStreamer-Interfaces
-		media-plugins/gst-plugins-meta
-	)
-	!gstreamer? ( !mplayer? (
-		media-sound/alsa-utils
-		media-sound/flac123
-		|| ( media-sound/mpg123 media-sound/mpg321 )
-		media-sound/vorbis-tools
-	) )
-	libnotify? ( dev-perl/Gtk2-Notify )
-	mplayer? ( || ( media-video/mplayer media-video/mplayer2 ) )
-	webkit? ( dev-perl/Gtk2-WebKit )"
+	|| ( net-misc/wget dev-perl/AnyEvent-HTTP )
+	|| (
+		( ${GSTREAMER_DEPEND} )
+		( ${MPLAYER_DEPEND} )
+		( ${OTHER_DEPEND} )
+	)"
 DEPEND="sys-devel/gettext"
 
 LANGS="cs de es fr hu it ko nl pl pt pt_BR ru sv zh_CN"
@@ -73,6 +70,20 @@ src_install() {
 
 pkg_postinst() {
 	fdo-mime_desktop_database_update
+
+	elog "Gmusicbrowser supports gstreamer, mplayer and mpg123/ogg123..."
+	elog "for audio playback. Needed dependencies:"
+	elog "Gstreamer: ${GSTREAMER_DEPEND}"
+	elog "mplayer: ${MPLAYER_DEPEND}"
+	elog "mpg123/ogg123...: ${OTHER_DEPEND}"
+	elog
+	elog "This ebuild just ensures at least one implementation is installed!"
+	elog
+	elog "other optional dependencies:"
+	elog "	dev-perl/Net-DBus (for dbus support and mpris1/2 plugins)"
+	elog "	dev-perl/Gtk2-WebKit (for Web context plugin)"
+	elog "	dev-perl/Gtk2-Notify (for Notify plugin)"
+	elog "	dev-perl/gnome2-wnck (for Titlebar plugin)"
 }
 
 pkg_postrm() {
diff --git a/media-sound/gmusicbrowser/metadata.xml b/media-sound/gmusicbrowser/metadata.xml
index 0b00b50ce5b0..1d70d294dc1a 100644
--- a/media-sound/gmusicbrowser/metadata.xml
+++ b/media-sound/gmusicbrowser/metadata.xml
@@ -7,7 +7,4 @@
     <name>Julian Ospald</name>
     <description>hasufell at Freenode</description>
   </maintainer>
-  <use>
-    <flag name='webkit'>Enable GTK+ based WebKit support</flag>
-  </use>
 </pkgmetadata>