[gentoo-commits] proj/kde:master commit in: media-sound/amarok/

["Michael Palimaka" <kensington@gentoo.org>]

commit:     406f4676a61e3d7bec807eba0862583052023cbe
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Thu Aug  1 12:29:19 2013 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Aug  1 12:29:19 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=406f4676

[media-sound/amarok] Remove daap USE flag wrt bug #477208.

Package-Manager: portage-2.1.13.2

---
 media-sound/amarok/amarok-2.7.90.ebuild | 9 +--------
 media-sound/amarok/amarok-9999.ebuild   | 9 +--------
 media-sound/amarok/metadata.xml         | 5 -----
 3 files changed, 2 insertions(+), 21 deletions(-)

diff --git a/media-sound/amarok/amarok-2.7.90.ebuild b/media-sound/amarok/amarok-2.7.90.ebuild
index a4bc4b1..0642359 100644
--- a/media-sound/amarok/amarok-2.7.90.ebuild
+++ b/media-sound/amarok/amarok-2.7.90.ebuild
@@ -26,7 +26,7 @@ fi
 
 LICENSE="GPL-2"
 SLOT="4"
-IUSE="cdda daap debug +embedded ipod lastfm mp3tunes mtp ofa opengl test +utils"
+IUSE="cdda debug +embedded ipod lastfm mp3tunes mtp ofa opengl test +utils"
 
 if [[ ${PV} == *9999* ]]; then
 	RESTRICT="test"
@@ -104,13 +104,6 @@ src_configure() {
 pkg_postinst() {
 	kde4-base_pkg_postinst
 
-	if use daap; then
-		echo
-		elog "You have installed amarok with daap support."
-		elog "You may be interested in installing www-servers/mongrel as well."
-		echo
-	fi
-
 	if ! use embedded; then
 		echo
 		elog "You've disabled the amarok support for embedded mysql DBs."

diff --git a/media-sound/amarok/amarok-9999.ebuild b/media-sound/amarok/amarok-9999.ebuild
index 5bd74e2..01dd23e 100644
--- a/media-sound/amarok/amarok-9999.ebuild
+++ b/media-sound/amarok/amarok-9999.ebuild
@@ -26,7 +26,7 @@ fi
 
 LICENSE="GPL-2"
 SLOT="4"
-IUSE="cdda daap debug +embedded ipod lastfm mp3tunes mtp ofa opengl test +utils"
+IUSE="cdda debug +embedded ipod lastfm mp3tunes mtp ofa opengl test +utils"
 
 if [[ ${KDE_BUILD_TYPE} == live ]]; then
 	RESTRICT="test"
@@ -109,13 +109,6 @@ src_configure() {
 pkg_postinst() {
 	kde4-base_pkg_postinst
 
-	if use daap && ! has_version www-servers/mongrel ; then
-		echo
-		elog "You have installed amarok with daap support."
-		elog "You may be interested in installing www-servers/mongrel as well."
-		echo
-	fi
-
 	if ! use embedded; then
 		echo
 		elog "You've disabled the amarok support for embedded mysql DBs."

diff --git a/media-sound/amarok/metadata.xml b/media-sound/amarok/metadata.xml
index 6a78f0d..c964fd8 100644
--- a/media-sound/amarok/metadata.xml
+++ b/media-sound/amarok/metadata.xml
@@ -8,11 +8,6 @@
 	<name>Jorge Manuel B. S. Vicetto</name>
 </maintainer>
 <use>
-	<flag name="daap">Enable the scripts for music sharing through DAAP. This flag adds
-		dependencies on <pkg>www-servers/mongrel</pkg> to allow sharing of
-		the Amarok music collection through DAAP protocol. Please note
-		that turning this flag off has no effect on DAAP browsing.
-	</flag>
 	<flag name="embedded">Use libmysqld, MySQL embedded server library.
 		Try disabling this if you encounter -PIC related in amarok,
 		it will make amarok rely only on standalone MySQL server.