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

Package-Manager: portage-2.1.3.4

7 files changed, 28 insertions, 145 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/Manifest b/media-sound/exaile/Manifest
index b1b6127d7aca..0cf7602c8723 100644
--- a/media-sound/exaile/Manifest
+++ b/media-sound/exaile/Manifest
@@ -6,28 +6,15 @@ AUX exaile-0.2.10-visual.patch 731 RMD160 0b073739a957b36d0b47f210f1f51ec728f256
 MD5 54022a1f98a785de19d4128330e35d11 files/exaile-0.2.10-visual.patch 731
 RMD160 0b073739a957b36d0b47f210f1f51ec728f25689 files/exaile-0.2.10-visual.patch 731
 SHA256 152a676acb56a1b4473e8a5bad572a080ef2dc61cd40b39d4deb025cb95f9cb7 files/exaile-0.2.10-visual.patch 731
-AUX exaile-0.2.9-amazon.patch 563 RMD160 8d1a46478d1e596bdbfa35114875479a999bb214 SHA1 d4cb20c3edf0761be336de60b33db0e521ce264a SHA256 128453b2231e1350020480d409386e53365396af9ce75dfefea7c3713852fbc7
-MD5 7215eab75c53703b3c291e6e4ebfdf1c files/exaile-0.2.9-amazon.patch 563
-RMD160 8d1a46478d1e596bdbfa35114875479a999bb214 files/exaile-0.2.9-amazon.patch 563
-SHA256 128453b2231e1350020480d409386e53365396af9ce75dfefea7c3713852fbc7 files/exaile-0.2.9-amazon.patch 563
-AUX exaile-0.2.x-strip.patch 386 RMD160 5e8190e703de0d59386a932394fcce6d4a479886 SHA1 5dabaa355cbde74f3f348b8ec5cb273d6895c979 SHA256 842b3d627b9fe528f540a0b6a46b52a8db32cd578b1f2e1430a4b6b364bbf097
-MD5 db41796431d7aca5b429db3ef3465a72 files/exaile-0.2.x-strip.patch 386
-RMD160 5e8190e703de0d59386a932394fcce6d4a479886 files/exaile-0.2.x-strip.patch 386
-SHA256 842b3d627b9fe528f540a0b6a46b52a8db32cd578b1f2e1430a4b6b364bbf097 files/exaile-0.2.x-strip.patch 386
 DIST exaile_0.2.10.tar.gz 516304 RMD160 80a688361964659785932ff1de3be71c798f5082 SHA1 201052c99762405fa99132f6ded308543fd1998b SHA256 11cbef758b770fcab44a73b0b3d7f7daa37c1eb3c9e96cb6754e664f76609184
-DIST exaile_0.2.9.tar.gz 421296 RMD160 333362939e80f2feb5bd81d51e134cb4d29f74f2 SHA1 100e048b35b59f89c7874c60cb235df69005a8f4 SHA256 b8377fd0559a1ca7b98b47348a436b9dc90658b1dde17115b429e907f045ca98
-EBUILD exaile-0.2.10-r1.ebuild 2804 RMD160 2954e78aeb1ba61bd134121b67e8c82a12a0a89a SHA1 8f2934cac0762a54c9a0237a40bf297a61350d6e SHA256 178f4dfa22e06a8983a250de3c1dd17d714e562210655dae4e6641ce081c1b65
-MD5 b0b61c22adcf80d9dbc49293142cda6e exaile-0.2.10-r1.ebuild 2804
-RMD160 2954e78aeb1ba61bd134121b67e8c82a12a0a89a exaile-0.2.10-r1.ebuild 2804
-SHA256 178f4dfa22e06a8983a250de3c1dd17d714e562210655dae4e6641ce081c1b65 exaile-0.2.10-r1.ebuild 2804
-EBUILD exaile-0.2.9-r3.ebuild 2691 RMD160 da9a11586058f0d8c541412040edc95fdad9b431 SHA1 5609a31a77b2146e591f2fb5ff7f03c2973d08fd SHA256 5d1543be85a2a65300857f19b2d1938f1fe823a1a1a1035fbd247e92aff8474f
-MD5 ce4cdeee216aee8838e5f881303a1a13 exaile-0.2.9-r3.ebuild 2691
-RMD160 da9a11586058f0d8c541412040edc95fdad9b431 exaile-0.2.9-r3.ebuild 2691
-SHA256 5d1543be85a2a65300857f19b2d1938f1fe823a1a1a1035fbd247e92aff8474f exaile-0.2.9-r3.ebuild 2691
-MISC ChangeLog 4117 RMD160 c6e25004672d6fc37a2c15f1738b5da57eb24b4e SHA1 5c18d7c57db1e45c33585a2d9e4e2bdc5f57ebff SHA256 7a7b0f50e6da819a386c7e80daf1e6ed2927f37f4a96a42910bd48c4c41cdd69
-MD5 6360de56728839b299aeb918503cc1cc ChangeLog 4117
-RMD160 c6e25004672d6fc37a2c15f1738b5da57eb24b4e ChangeLog 4117
-SHA256 7a7b0f50e6da819a386c7e80daf1e6ed2927f37f4a96a42910bd48c4c41cdd69 ChangeLog 4117
+EBUILD exaile-0.2.10-r1.ebuild 3260 RMD160 be5fddbf8aa593d81daec90cac5eaf015508982b SHA1 640beabbc38ad80016db89e8081ba51d59f0fc26 SHA256 cf55ed6836c45e3ce4f04f505bcef853ee5734f85b8137470a136648e8ed6062
+MD5 dd43b691a94c03ed6f36f99f2ace5d48 exaile-0.2.10-r1.ebuild 3260
+RMD160 be5fddbf8aa593d81daec90cac5eaf015508982b exaile-0.2.10-r1.ebuild 3260
+SHA256 cf55ed6836c45e3ce4f04f505bcef853ee5734f85b8137470a136648e8ed6062 exaile-0.2.10-r1.ebuild 3260
+MISC ChangeLog 4308 RMD160 eb1a443d10c15d0489021c4d51e98c9b34ace0a6 SHA1 1d7bd424e18b2e8717ad0b1bb69ec97d627df302 SHA256 d860382697dbd48e28cfe966549c6b5fc557da57dc612e637210c9ef3398b07f
+MD5 0b6336b4c44b9b41dd635e065dcb3cb3 ChangeLog 4308
+RMD160 eb1a443d10c15d0489021c4d51e98c9b34ace0a6 ChangeLog 4308
+SHA256 d860382697dbd48e28cfe966549c6b5fc557da57dc612e637210c9ef3398b07f ChangeLog 4308
 MISC metadata.xml 214 RMD160 3ef8a9b331ffe9433ac2b885f83a985e0f89236f SHA1 ec7c7723b21b430e43c31acc7176045413af0225 SHA256 690c22b23be5f116a9ab2986b9fdae7b4f53788c4a8fafb369f3f636a3b619ba
 MD5 97f43390489104c86df538d5759098f0 metadata.xml 214
 RMD160 3ef8a9b331ffe9433ac2b885f83a985e0f89236f metadata.xml 214
@@ -35,6 +22,3 @@ SHA256 690c22b23be5f116a9ab2986b9fdae7b4f53788c4a8fafb369f3f636a3b619ba metadata
 MD5 e839569c48d446b3783875d3b25acf00 files/digest-exaile-0.2.10-r1 241
 RMD160 8b868fb5d2a45775b84c9a472cd74b0c4dbf0948 files/digest-exaile-0.2.10-r1 241
 SHA256 2e2fac088323bb9fcb4711b6d505f5a42cc5a2002a8135bb30a877dddbbf3388 files/digest-exaile-0.2.10-r1 241
-MD5 6def8cf36e2cf60c2c7dbcbe412928c2 files/digest-exaile-0.2.9-r3 238
-RMD160 68539fabf8deca5e634fcd26e9b526cb70601238 files/digest-exaile-0.2.9-r3 238
-SHA256 214a703e6bee2bb1587d77931baf69c4c4ed5bdff45eb4485c5177811a854b03 files/digest-exaile-0.2.9-r3 238
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`
-