Check for xulrunner, firefox or seamonkey USE flag in gnome-python-extras for extra features as per bug 184038.

(Portage version: 2.1.3.4)

6 files changed, 20 insertions, 121 deletions

diff --git a/media-sound/exaile/ChangeLog b/media-sound/exaile/ChangeLog
index 51f2a3c13eaa..ebf3c6597aea 100644
--- a/media-sound/exaile/ChangeLog
+++ b/media-sound/exaile/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/exaile
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/exaile/ChangeLog,v 1.24 2007/07/16 13:12:53 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/exaile/ChangeLog,v 1.25 2007/08/11 12:34:57 drac Exp $
+
+  11 Aug 2007; Samuli Suominen <drac@gentoo.org> exaile-0.2.10-r1.ebuild:
+  Check for xulrunner, firefox or seamonkey USE flag in gnome-python-extras
+  for extra features as per bug 184038.
 
   16 Jul 2007; Samuli Suominen <drac@gentoo.org> exaile-0.2.9-r3.ebuild,
   exaile-0.2.10-r1.ebuild:
diff --git a/media-sound/exaile/exaile-0.2.10-r1.ebuild b/media-sound/exaile/exaile-0.2.10-r1.ebuild
index 85f69e062048..d1ce2e087ae5 100644
--- a/media-sound/exaile/exaile-0.2.10-r1.ebuild
+++ b/media-sound/exaile/exaile-0.2.10-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/exaile/exaile-0.2.10-r1.ebuild,v 1.6 2007/07/16 13:12:53 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/exaile/exaile-0.2.10-r1.ebuild,v 1.7 2007/08/11 12:34:57 drac Exp $
 
 inherit eutils fdo-mime multilib python
 
@@ -25,7 +25,7 @@ RDEPEND=">=dev-python/pygtk-2.8.6
 	dev-python/dbus-python
 	libnotify? ( dev-python/notify-python )
 	libsexy? ( dev-python/sexy-python )
-	gnome? ( >=dev-python/gnome-python-extras-2.14
+	gnome? ( >=dev-python/gnome-python-extras-2.14.2-r1
 		>=media-plugins/gst-plugins-gconf-${GVER}
 		>=media-plugins/gst-plugins-gnomevfs-${GVER} )
 	serpentine? ( app-cdr/serpentine )
@@ -54,6 +54,19 @@ pkg_setup() {
 		eerror "libgpod has to be built with python support"
 		die "libgpod python use-flag not set"
 	fi
+	
+	if use gnome; then
+		if ! built_with_use dev-python/gnome-python-extras xulrunner; then
+			if ! built_with_use dev-python/gnome-python-extras firefox; then
+				if ! built_with_use dev-python/gnome-python-extras seamonkey; then
+					ewarn "In order to enable extra features provided by gtkmozembed,"
+					ewarn "you have to re-emerge gnome-python-extras with"
+					ewarn "xulrunner, firefox or seamonkey USE flag."
+					epause
+				fi
+			fi
+		fi
+	fi
 }
 
 src_unpack() {
diff --git a/media-sound/exaile/exaile-0.2.9-r3.ebuild b/media-sound/exaile/exaile-0.2.9-r3.ebuild
deleted file mode 100644
index 8440341fcedd..000000000000
--- a/media-sound/exaile/exaile-0.2.9-r3.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/exaile/exaile-0.2.9-r3.ebuild,v 1.3 2007/07/16 13:12:53 drac Exp $
-
-inherit eutils fdo-mime python toolchain-funcs
-
-GVER="0.10"
-
-MY_P=${PN}_${PV}
-
-DESCRIPTION="a media player aiming to be similar to AmaroK, but for GTK+"
-HOMEPAGE="http://www.exaile.org/"
-SRC_URI="http://www.exaile.org/files/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="aac alsa cdparanoia flac gnome ipod libnotify libsexy mad musepack ogg
-	oss serpentine streamripper vorbis"
-
-RDEPEND=">=dev-python/pygtk-2.8.6
-	>=dev-python/pysqlite-2
-	>=media-libs/mutagen-1.6
-	|| ( >=dev-lang/python-2.5 dev-python/elementtree )
-	>=gnome-base/librsvg-2
-	dev-python/dbus-python
-	libnotify? ( dev-python/notify-python )
-	libsexy? ( dev-python/sexy-python )
-	gnome? ( >=dev-python/gnome-python-extras-2.14
-		>=media-plugins/gst-plugins-gconf-${GVER}
-		>=media-plugins/gst-plugins-gnomevfs-${GVER} )
-	serpentine? ( app-cdr/serpentine )
-	streamripper? ( media-sound/streamripper )
-	>=media-libs/gstreamer-${GVER}
-	>=media-libs/gst-plugins-good-${GVER}
-	>=dev-python/gst-python-${GVER}
-	musepack? ( >=media-plugins/gst-plugins-musepack-${GVER} )
-	vorbis? ( >=media-plugins/gst-plugins-vorbis-${GVER} )
-	flac? ( >=media-plugins/gst-plugins-flac-${GVER} )
-	aac? ( >=media-plugins/gst-plugins-faad-${GVER} )
-	alsa? ( >=media-plugins/gst-plugins-alsa-${GVER} )
-	oss? ( >=media-plugins/gst-plugins-oss-${GVER} )
-	mad? ( >=media-plugins/gst-plugins-mad-${GVER} )
-	ogg? ( >=media-plugins/gst-plugins-ogg-${GVER} )
-	cdparanoia? ( >=media-plugins/gst-plugins-cdparanoia-${GVER}
-		dev-python/cddb-py )
-	ipod? ( >=media-libs/libgpod-0.4
-		>=media-plugins/gst-plugins-faad-${GVER} )"
-DEPEND=""
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	if use ipod && ! built_with_use media-libs/libgpod python ; then
-		eerror "libgpod has to be built with python support"
-		die "libgpod python use-flag not set"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${PN}-0.2.x-strip.patch
-	epatch "${FILESDIR}"/${P}-amazon.patch
-	python_version
-	sed -i -e "s:hon2.4:hon${PYVER}:" mmkeys/Makefile
-}
-
-src_compile() {
-	emake -j1 CC="$(tc-getCC)" || die "emake failed."
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed."
-	dodoc testing TODO
-	exeinto /usr/share/${PN}
-	doexe scripts/*
-}
-
-pkg_postinst() {
-	python_mod_optimize "${ROOT}"/usr/share/${PN}
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-}
-
-pkg_postrm() {
-	python_mod_cleanup "${ROOT}"/usr/share/${PN}
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-}
diff --git a/media-sound/exaile/files/digest-exaile-0.2.9-r3 b/media-sound/exaile/files/digest-exaile-0.2.9-r3
deleted file mode 100644
index 7fa98eb6bbe1..000000000000
--- a/media-sound/exaile/files/digest-exaile-0.2.9-r3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 d52241d30a66286d9483e30e1259d8d4 exaile_0.2.9.tar.gz 421296
-RMD160 333362939e80f2feb5bd81d51e134cb4d29f74f2 exaile_0.2.9.tar.gz 421296
-SHA256 b8377fd0559a1ca7b98b47348a436b9dc90658b1dde17115b429e907f045ca98 exaile_0.2.9.tar.gz 421296
diff --git a/media-sound/exaile/files/exaile-0.2.9-amazon.patch b/media-sound/exaile/files/exaile-0.2.9-amazon.patch
deleted file mode 100644
index 1d6e13eb028f..000000000000
--- a/media-sound/exaile/files/exaile-0.2.9-amazon.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Index: xl/covers.py
-===================================================================
---- xl/covers.py	(revision 2372)
-+++ xl/covers.py	(working copy)
-@@ -42,7 +42,8 @@
- QUERY = "/onca/xml3?t=webservices-20&dev-t=%s&mode=music&type=lite&" % (KEY) + \
-     "locale={locale}&page=1&f=xml&KeywordSearch="
- IMAGE_PATTERN = re.compile(
--    r"http://(images(?:-\w\w)?\.amazon\.com)(/images/.*?LZ+\.jpg)")
-+    r"<ImageUrlMedium>http://(\w+\.images-amazon\.com)"
-+    "(/images/.*?\.jpg)</ImageUrlMedium>", re.DOTALL)
- 
- """
-     Fetches album covers from Amazon.com
diff --git a/media-sound/exaile/files/exaile-0.2.x-strip.patch b/media-sound/exaile/files/exaile-0.2.x-strip.patch
deleted file mode 100644
index 677da34cf2ad..000000000000
--- a/media-sound/exaile/files/exaile-0.2.x-strip.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -ur exaile_0.2.8.orig/mmkeys/Makefile exaile_0.2.8/mmkeys/Makefile
---- exaile_0.2.8.orig/mmkeys/Makefile	2006-11-01 02:11:34.000000000 +0200
-+++ exaile_0.2.8/mmkeys/Makefile	2007-02-04 13:40:43.000000000 +0200
-@@ -7,7 +7,6 @@
- 
- mmkeys.so: mmkeyspy.o mmkeys.o mmkeysmodule.o
- 	$(CC) $(LDFLAGS) -shared $^ -o $@
--	strip mmkeys.so
- 
- DEFS=`pkg-config --variable=defsdir pygtk-2.0`
-