Adapt to libsoup-2.42 dropping gnome USE and splitting (#463702), drop old.

Package-Manager: portage-2.1.11.58/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

9 files changed, 16 insertions, 472 deletions

diff --git a/media-sound/banshee/ChangeLog b/media-sound/banshee/ChangeLog
index 2ae3cab853b8..698d4c05109c 100644
--- a/media-sound/banshee/ChangeLog
+++ b/media-sound/banshee/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-sound/banshee
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/banshee/ChangeLog,v 1.162 2013/02/24 11:28:40 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/banshee/ChangeLog,v 1.163 2013/03/31 18:59:18 pacho Exp $
+
+  31 Mar 2013; Pacho Ramos <pacho@gentoo.org> -banshee-2.2.1.ebuild,
+  -banshee-2.4.1.ebuild, -files/banshee-1.7.4-make-webkit-optional.patch,
+  -files/banshee-2.2.0-fix-equalizer-values.patch,
+  -files/banshee-2.4.0-libgpod-082.patch, -files/banshee-2.4.0-upnp-crash.patch,
+  banshee-2.6.0.ebuild:
+  Adapt to libsoup-2.42 dropping gnome USE and splitting (#463702), drop old.
 
   24 Feb 2013; Agostino Sarubbo <ago@gentoo.org> banshee-2.6.0.ebuild:
   Stable for amd64, wrt bug #458494
diff --git a/media-sound/banshee/Manifest b/media-sound/banshee/Manifest
index ad7664f03da3..d0d490cc6904 100644
--- a/media-sound/banshee/Manifest
+++ b/media-sound/banshee/Manifest
@@ -1,32 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
-AUX banshee-1.7.4-make-webkit-optional.patch 2151 SHA256 5f5ceea4e09dd9f9dca776b9775d6998faa641c7daa8968241b9bbddd6f72ecf SHA512 1d9dcd4b137c8600f5d1c16cc357da90bace85d9992c015fec5a149e89c6875c9bb4e812ea5f9fe46470693eea2c7c31c76fc32eb7ed97a4be514b98adf12170 WHIRLPOOL ac4df921014cd453d7f1496849e10569c18498033fd42c293943f8c0223849159dca106c1a458ebe2ad8bca5ca98b7d9b0084e9602f77bf83bcf3c064b78a0d3
-AUX banshee-2.2.0-fix-equalizer-values.patch 1385 SHA256 23752f3da13c3b87d378a8fb7b42a6c1b3062f12432f74da8f80427b71434f08 SHA512 56bec40eed290442227b0805a2932281c2fc6509f08c992a96ec05127f55dd539891e9956fb21335c13c9bd92e6d850533441a563eca6aa4a1b8d0aff3613186 WHIRLPOOL b8e443e89628d65abc36531da61ff58be2b09de25191be8fbeadc0d936ea768ac8f54a303829eb94cb15aaf93e672287c7689e1cb4acd248c824deecd4921774
-AUX banshee-2.4.0-libgpod-082.patch 1523 SHA256 4132df08780b035ca8952939362c4f66f1211dd4fc41f8692e427f28fd1c323e SHA512 da983f8d9505a88544b852e5cd4ce8282060f86e3c1869e4506a16f1ab66ebfe4374a4675647c03e8cdf001fc7e71e265f354053ba09aa41f79234c8e8ffa89b WHIRLPOOL ef38a29bc5558704627792e79cfa655a4f3723942c98f4f8018f882958dae9ed849e932f097374c7478710667eff2f84ceca5c7c17703f9cc2574c9d0b286e08
-AUX banshee-2.4.0-upnp-crash.patch 1295 SHA256 54cc9cc0131fd01b7a5a1217f316735df8eb651ff6bf9964f4828273c291b5e2 SHA512 f781e215558a60ee32125e6ca70cf2c74cd996b0965a3421508d855f8ed1514f6ee9cc30f3b90abd0eb50f57d43956540f82f1b376482bc6be35a6ac1c05601b WHIRLPOOL a1ac03270c31266042f17d35c02c05f846be33fdeb8a5b299913a72abce49830497ca671fe5e66e219d9e35ef914180874bd1ef5faeee96862a6141918614255
-DIST banshee-2.2.1.tar.xz 3084484 SHA256 55c03ddf9732199b9f83d4ff375af99ae5a4eea46b8a198695427e5c48f1b9a5 SHA512 7725ce4eeb94bb958fe33d84b51095a57683ba8405bb94fd9a3ba8500fcc4784037afe1b3beb2df79d421dddc8a178981eb65f49eea379b280b194af7faec075 WHIRLPOOL 03b0c9a475dbd6e7ae3d267aec43093babbb93f573086fdcbcb07c6ceae28b9b3d02e5fbd3b7bc86d92d2df73bc92dcb643ac9c4b3d81ddc1f50cc081b202a72
-DIST banshee-2.4.1.tar.xz 3191312 SHA256 7099b2139050ac0c271014478790fa85484fbfea264ea18b707fa50324ecc2cb SHA512 ef8a08405faffda4b4033e54e944b0608967e9959f9cae8692516ba9c95ef1a94ab81d9036a548fe4d908a1b646a804392b8855a5e975cd30203871d45cf5108 WHIRLPOOL 252be477101b7b6d0e663f515b3a1027f739a2bc7dc2ef0d03c3ecdcb624e67bbaeb9b87c49f4f356bcb96ab1873512fdee96c93a55e2e755c68159627e0269b
 DIST banshee-2.6.0.tar.xz 3280112 SHA256 a47cc741f8ef2f81726ec4872e8179b17efa271c0c991e912e384fabf777394a SHA512 8b6d16429902854eb1a773075ebdd409d71fe08d65017f4eb13f5080bce076ee8d7b860aa65b69b0441de7d8f54ea8f7c2bc926c18f97e803b88834115bb2c85 WHIRLPOOL 357c7238aa094337136883e55ecec71124d4d8a1f87a24a044d5db57bcc1961811bac1b013eb0792bdcd87e4a6478f64b04b75ed24855e10a9c70a2eef4306d3
-EBUILD banshee-2.2.1.ebuild 4012 SHA256 ee8e2e8b87e0baf659a5422eda07f81b95cb7323663c4202ac56560aa2142a22 SHA512 59d082c4c99eee19ec0e535fbd7377d3884488808fe22bf4bf295de56dfa647306bb9fd76a12f61df912605b64b080f932b57a9baf78cee0a7eca8fa23442a97 WHIRLPOOL 9453eb2282bb4c0fd987ae5bf95082983a971f0d09949b823c40d0b2f8eb21d3520a4f8fa7aeb5d19c140ce37ed3c511e04356b28a62f0cbd1ca155a95dec896
-EBUILD banshee-2.4.1.ebuild 3730 SHA256 bf52974747f8537aab764e7994195477acb5c57a83a5bf2aed067c8555cda152 SHA512 2bad73600fe3a3d78e6f61851762ad65ec1c29a8e328b50dc8e8a9eead870ff7eada5f05a796adb68cafef5050bf2b505361f34f5dad07d834f15908a3f9dd5c WHIRLPOOL 9bd268e6258c0e67baeee0d675cd5f453924c9ec74699849bc956f09f3fb7a035e2db779e497de2dd13dbaf63cc30827957fe64854fa41a6a3aa5bf5c33e964f
-EBUILD banshee-2.6.0.ebuild 3600 SHA256 3fa66201bbfe1ffb5d30e37b9632fb81748781b45af4e0dd015a6681546f381f SHA512 07951f7ece383db6657f453d5c466c0019755dbdc3a12b353689c12efe50394329126b537a6846f41db372adde7f15fa928665777f983a722617a6a523c4898a WHIRLPOOL 3e283129671a5d827b7eda61c5d8360eb785e35a5d50566d106ab1de27707894c5f19c21ac0369709de12bcca28143406351755a5f6c484e0cbdc607e034bbde
-MISC ChangeLog 30111 SHA256 ed08f74b46f1eac2a9f47c36439de284d7aacc857d46ba599b09fb843dab4525 SHA512 12f071d5c9d9ad28d0287369e5cece722e1f9e07e28a8cf944fc1743bfdb0afcb7a752c403fb058a9c3973fbcf92a22897538aac0d77e06cd56392331d47324f WHIRLPOOL 1121b5132e0582565def6f90e1d4123b87181c49800b36bce1f14099034d786e70d1f12a36fb82f2078c6f19d5f6c6a660a635ab9e008cbcfcb537c1de5fac80
+EBUILD banshee-2.6.0.ebuild 3607 SHA256 978d0071635e8b24401a8e950bba21ae3383fc6a5f33a4d8b740313382efb4cc SHA512 b18f6fb671ba062ffb13e5f93b5c26140152b87802a98aa840768e2fa0e3be04c7efb872d5e82f7fd83982ff2377b2e7a4b5cd82023d58265241b854ae0c672c WHIRLPOOL a22f58b75465398c3421195e275b2e24f29b891f5f7143d0f30f36cc9d2d3f61ac6cb1fc3ff12cd2d666c9bc5843e980de18ec9283c814df0b3a796949fb5ff7
+MISC ChangeLog 30491 SHA256 7292f00cc301c73f553bf9ae3318f51508fc5cea2e9b420d587ce75cc36ddb33 SHA512 fbcbcbef73b41b629e3158b6252225be537c3d87c66cb513610b02a92a7feff17f55a6e369b297e5049a86e11f3a262fcc9487e1dbf109bc23936ad91360c0dd WHIRLPOOL af09410226762c39e1671d8d0c92e8aa20f467944f121a50f41576d04912ce37aa9c0850abefc8112de778a797df976e5e81bc86386484a50a09f3207c3f6af6
 MISC metadata.xml 698 SHA256 fdccdd9d76ee8b2de867fad022cc51569cf5932e8ddf4b1eba263f0add1f4973 SHA512 b79c280f8d5833dbb2f5c73d59df903711d0878f853b9f8c287162ebbbb177aac4a7437cdf765fc74774ccf441b2f1822cae07be80a0633590d412b0019495af WHIRLPOOL d2d16597076c85fe8d835bc4f93960ac71d7a53c4ef8455ede68bd8f10387dc122080f8d1b4dd5ebc51b60eb59a29fffe728c550414fe80237d2a974faffa523
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCgAGBQJRKfloAAoJELp701BxlEWfumoQALaBlFGptmiNslHf1/BQ9bYG
-5tRRjPooMwsnGuEDmj0ypO91GFCuy+qfKwW8womCBSyy/o1QisdG5smzTDgIwjtN
-CdK1Eo+8Tfoy3RT5eQEal39aFifJeIPqnwhL/5qSznX4VVX7evkDu1xR4G5/bZaz
-t0F7A/f2PlGbZOp6FqMWJitG1ppz0aulKgATZyQOa+B3UTJ1MuVAx0oQs/dqXLMA
-BgfjQNIGCIBY6WLZz/Uj+rDSLH43xzP29he8wFztbskV+Ub0+E3Xf5q1EZ4OeKNC
-66E62KH5fjOGTCY2hu7ZZXluj/+uCVY91GTl3V+Uygkmi1JYqBnmPKB6I06i2wgk
-uhPWu1RiBvPhRdy9uiKVSzGNoWL59d3YQ3pewlqStY6Q1FaLSsm/xZ6XAXinj/Xw
-jtVpBzfS7tMXdoU/g0QOnyhxob2sS3lRlviFCvypwsvmqEUpi3lvzePzSvgOzHVK
-7ONXx1Muk71nlBWK+WpIv8CcYUUddHXf0yZaw3dmOnO7w8EFCkNIdk0nyPYt6QaN
-6ATmU5ZqINV4/D1n1LvuOm81HrZV2mWa4aYt6zak3WHBhDqSUYPhw0MfqAnpPnDp
-aFMW3hiMWmZ/SeGamvTS5eBoyMoxxHV+GhwsYyoFyYNI4G6BszzSicmx664zjtzA
-FTQzzwVYH2kEDGwrKTaP
-=eMmA
+iEYEAREIAAYFAlFYh4gACgkQCaWpQKGI+9QrpgCfWvDIv8hR5FSgXdnc96udaeVT
+9igAnjGu7zOEbMPuuRryMRAvPYMrGQa7
+=cX2Q
 -----END PGP SIGNATURE-----
diff --git a/media-sound/banshee/banshee-2.2.1.ebuild b/media-sound/banshee/banshee-2.2.1.ebuild
deleted file mode 100644
index 3e8922362822..000000000000
--- a/media-sound/banshee/banshee-2.2.1.ebuild
+++ /dev/null
@@ -1,158 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/banshee/banshee-2.2.1.ebuild,v 1.6 2012/12/02 17:07:48 eva Exp $
-
-EAPI="4"
-
-inherit eutils autotools mono gnome2-utils fdo-mime versionator gnome.org
-
-DESCRIPTION="Import, organize, play, and share your music using a simple and powerful interface."
-HOMEPAGE="http://banshee.fm/"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+aac +cdda +bpm boo daap doc +encode ios karma mtp test udev +web youtube"
-
-RDEPEND=">=dev-lang/mono-2.4.3
-	gnome-base/gnome-settings-daemon
-	x11-themes/gnome-icon-theme
-	sys-apps/dbus
-	>=dev-dotnet/gtk-sharp-2.12:2
-	>=dev-dotnet/gconf-sharp-2.24.0:2
-	>=dev-dotnet/notify-sharp-0.4.0_pre20080912-r1
-	>=media-libs/gstreamer-0.10.21-r3:0.10
-	>=media-libs/gst-plugins-base-0.10.25.2:0.10
-	media-libs/gst-plugins-bad:0.10
-	media-libs/gst-plugins-good:0.10
-	media-libs/gst-plugins-ugly:0.10
-	>=media-plugins/gst-plugins-meta-0.10-r2:0.10
-	media-plugins/gst-plugins-gio:0.10
-	media-plugins/gst-plugins-gconf:0.10
-	cdda? (
-		|| (
-			media-plugins/gst-plugins-cdparanoia:0.10
-			media-plugins/gst-plugins-cdio:0.10
-		)
-	)
-	media-libs/musicbrainz:1
-	dev-dotnet/dbus-sharp
-	dev-dotnet/dbus-sharp-glib
-	>=dev-dotnet/mono-addins-0.4[gtk]
-	>=dev-dotnet/taglib-sharp-2.0.3.7
-	>=dev-db/sqlite-3.4:3
-	karma? ( >=media-libs/libkarma-0.1.0-r1 )
-	aac? ( media-plugins/gst-plugins-faad:0.10 )
-	boo? ( >=dev-lang/boo-0.8.1 )
-	bpm? ( media-plugins/gst-plugins-soundtouch:0.10 )
-	daap? (	>=dev-dotnet/mono-zeroconf-0.8.0-r1 )
-	doc? (
-		virtual/monodoc
-		>=app-text/gnome-doc-utils-0.17.3
-	)
-	encode? (
-		media-plugins/gst-plugins-lame:0.10
-		media-plugins/gst-plugins-taglib:0.10
-	)
-	ios? (
-		>=media-libs/libgpod-0.7.95[mono]
-		gnome-base/gvfs[ios]
-	)
-	mtp? (
-		>=media-libs/libmtp-0.3.0
-	)
-	web? (
-		>=net-libs/webkit-gtk-1.2.2:2
-		>=net-libs/libsoup-2.26:2.4
-		>=net-libs/libsoup-gnome-2.26:2.4
-	)
-	youtube? (
-		>=dev-dotnet/google-gdata-sharp-1.4
-	)
-	udev? (
-		dev-dotnet/gudev-sharp
-		dev-dotnet/gkeyfile-sharp
-		dev-dotnet/gtk-sharp-beans
-		dev-dotnet/gio-sharp
-	)"
-
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	virtual/pkgconfig"
-
-DOCS="AUTHORS ChangeLog HACKING NEWS README"
-
-src_prepare () {
-	# Don't build BPM extension when not wanted
-	if ! use bpm; then
-		sed -i -e 's:Banshee.Bpm:$(NULL):g' src/Extensions/Makefile.am || die
-	fi
-
-	# EqualizerManager: Update values for the Smiley Face preset (bgo#661224)
-	epatch "${FILESDIR}/${PN}-2.2.0-fix-equalizer-values.patch"
-
-	epatch "${FILESDIR}/${PN}-1.7.4-make-webkit-optional.patch" # upstream bug 628518
-	AT_M4DIR="-I build/m4/banshee -I build/m4/shamrock -I build/m4/shave" \
-		eautoreconf
-}
-
-src_configure() {
-	# soundmenu needs a properly maintained and updated indicate-sharp
-	local myconf="--disable-dependency-tracking
-		--disable-static
-		--disable-maintainer-mode
-		--enable-gnome
-		--enable-schemas-install
-		--with-gconf-schema-file-dir=/etc/gconf/schemas
-		--with-vendor-build-id=Gentoo/${PN}/${PVR}
-		--enable-gapless-playback
-		--disable-gst-sharp
-		--disable-torrent
-		--disable-shave
-		--disable-ubuntuone
-		--disable-soundmenu"
-
-	econf \
-		$(use_enable doc docs) \
-		$(use_enable doc user-help) \
-		$(use_enable boo) \
-		$(use_enable mtp) \
-		$(use_enable daap) \
-		$(use_enable ios appledevice) \
-		$(use_enable karma) \
-		$(use_enable web webkit) \
-		$(use_enable youtube) \
-		$(use_enable udev gio) \
-		$(use_enable udev gio_hardware) \
-		${myconf}
-}
-
-src_compile() {
-	emake MCS=/usr/bin/gmcs
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	find "${ED}" -name '*.la' -exec rm -f {} +
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	ewarn
-	ewarn "If ${PN} doesn't play some format, please check your"
-	ewarn "USE flags on media-plugins/gst-plugins-meta"
-	ewarn
-
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-	gnome2_icon_cache_update
-}
diff --git a/media-sound/banshee/banshee-2.4.1.ebuild b/media-sound/banshee/banshee-2.4.1.ebuild
deleted file mode 100644
index 6c7be03a54ed..000000000000
--- a/media-sound/banshee/banshee-2.4.1.ebuild
+++ /dev/null
@@ -1,149 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/banshee/banshee-2.4.1.ebuild,v 1.4 2012/12/07 05:02:38 phajdan.jr Exp $
-
-EAPI="4"
-
-inherit eutils autotools mono gnome2-utils fdo-mime versionator gnome.org
-
-DESCRIPTION="Import, organize, play, and share your music using a simple and powerful interface."
-HOMEPAGE="http://banshee.fm/"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+aac +cdda +bpm boo daap doc +encode ipod karma mtp test udev +web youtube"
-
-RDEPEND=">=dev-lang/mono-2.4.3
-	gnome-base/gnome-settings-daemon
-	x11-themes/gnome-icon-theme
-	sys-apps/dbus
-	>=dev-dotnet/gtk-sharp-2.12:2
-	>=dev-dotnet/notify-sharp-0.4.0_pre20080912-r1
-	>=media-libs/gstreamer-0.10.21-r3:0.10
-	>=media-libs/gst-plugins-base-0.10.25.2:0.10
-	media-libs/gst-plugins-bad:0.10
-	media-libs/gst-plugins-good:0.10
-	media-libs/gst-plugins-ugly:0.10
-	>=media-plugins/gst-plugins-meta-0.10-r2:0.10
-	media-plugins/gst-plugins-gio:0.10
-	>=dev-dotnet/gconf-sharp-2.24.0:2
-	media-plugins/gst-plugins-gconf:0.10
-	cdda? (
-		|| (
-			media-plugins/gst-plugins-cdparanoia:0.10
-			media-plugins/gst-plugins-cdio:0.10
-		)
-	)
-	media-libs/musicbrainz:3
-	dev-dotnet/dbus-sharp
-	dev-dotnet/dbus-sharp-glib
-	>=dev-dotnet/mono-addins-0.6.2[gtk]
-	>=dev-dotnet/taglib-sharp-2.0.3.7
-	>=dev-db/sqlite-3.4:3
-	karma? ( >=media-libs/libkarma-0.1.0-r1 )
-	aac? ( media-plugins/gst-plugins-faad:0.10 )
-	boo? ( >=dev-lang/boo-0.8.1 )
-	bpm? ( media-plugins/gst-plugins-soundtouch:0.10 )
-	daap? (	>=dev-dotnet/mono-zeroconf-0.8.0-r1 )
-	doc? (
-		virtual/monodoc
-		>=app-text/gnome-doc-utils-0.17.3
-	)
-	encode? (
-		media-plugins/gst-plugins-lame:0.10
-		media-plugins/gst-plugins-taglib:0.10
-	)
-	ipod? ( >=media-libs/libgpod-0.8.2[mono] )
-	mtp? (
-		>=media-libs/libmtp-0.3.0
-	)
-	web? (
-		>=net-libs/webkit-gtk-1.2.2:2
-		>=net-libs/libsoup-2.26:2.4
-		>=net-libs/libsoup-gnome-2.26:2.4
-	)
-	youtube? (
-		>=dev-dotnet/google-gdata-sharp-1.4
-	)
-	udev? (
-		app-misc/media-player-info
-		dev-dotnet/gudev-sharp
-		dev-dotnet/gkeyfile-sharp
-		dev-dotnet/gtk-sharp-beans
-		dev-dotnet/gio-sharp
-	)"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-DOCS="AUTHORS ChangeLog HACKING NEWS README"
-
-src_prepare () {
-	# Fix build against libgpod-sharp 0.8.2
-	epatch "${FILESDIR}/${PN}-2.4.0-libgpod-082.patch"
-
-	# Don't build BPM extension when not wanted
-	if ! use bpm; then
-		sed -i -e 's:Banshee.Bpm:$(NULL):g' src/Extensions/Makefile.am || die
-		AT_M4DIR="-I build/m4/banshee -I build/m4/shamrock -I build/m4/shave" \
-		eautoreconf
-	fi
-}
-
-src_configure() {
-	# soundmenu needs a properly maintained and updated indicate-sharp
-	local myconf="--disable-dependency-tracking
-		--disable-static
-		--disable-maintainer-mode
-		--enable-gnome
-		--enable-schemas-install
-		--with-gconf-schema-file-dir=/etc/gconf/schemas
-		--with-vendor-build-id=Gentoo/${PN}/${PVR}
-		--enable-gapless-playback
-		--disable-gst-sharp
-		--disable-torrent
-		--disable-shave
-		--disable-ubuntuone
-		--disable-soundmenu
-		--disable-upnp"
-
-	econf \
-		$(use_enable doc docs) \
-		$(use_enable doc user-help) \
-		$(use_enable boo) \
-		$(use_enable mtp) \
-		$(use_enable daap) \
-		$(use_enable ipod appledevice) \
-		$(use_enable karma) \
-		$(use_enable web webkit) \
-		$(use_enable youtube) \
-		$(use_enable udev gio) \
-		$(use_enable udev gio_hardware) \
-		${myconf}
-}
-
-src_compile() {
-	emake MCS=/usr/bin/gmcs
-}
-
-src_install() {
-	default
-	prune_libtool_files --all
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-	gnome2_icon_cache_update
-}
diff --git a/media-sound/banshee/banshee-2.6.0.ebuild b/media-sound/banshee/banshee-2.6.0.ebuild
index 336662f324a5..d9033ff3e7bc 100644
--- a/media-sound/banshee/banshee-2.6.0.ebuild
+++ b/media-sound/banshee/banshee-2.6.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/banshee/banshee-2.6.0.ebuild,v 1.5 2013/02/24 11:28:40 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/banshee/banshee-2.6.0.ebuild,v 1.6 2013/03/31 18:59:18 pacho Exp $
 
 EAPI="4"
 
@@ -59,8 +59,7 @@ RDEPEND=">=dev-lang/mono-2.4.3
 	)
 	web? (
 		>=net-libs/webkit-gtk-1.2.2:2
-		>=net-libs/libsoup-2.26:2.4
-		>=net-libs/libsoup-gnome-2.26:2.4
+		|| ( >=net-libs/libsoup-2.42:2.4 >=net-libs/libsoup-gnome-2.26:2.4 )
 	)
 	youtube? (
 		>=dev-dotnet/google-gdata-sharp-1.4
diff --git a/media-sound/banshee/files/banshee-1.7.4-make-webkit-optional.patch b/media-sound/banshee/files/banshee-1.7.4-make-webkit-optional.patch
deleted file mode 100644
index 562b61de5693..000000000000
--- a/media-sound/banshee/files/banshee-1.7.4-make-webkit-optional.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-diff -urNp banshee-1-1.7.4.orig/build/m4/banshee/libwebkit.m4 banshee-1-1.7.4/build/m4/banshee/libwebkit.m4
---- banshee-1-1.7.4.orig/build/m4/banshee/libwebkit.m4	2010-08-29 02:24:28.598617103 +0530
-+++ banshee-1-1.7.4/build/m4/banshee/libwebkit.m4	2010-08-29 12:06:20.117617111 +0530
-@@ -4,24 +4,33 @@ AC_DEFUN([BANSHEE_CHECK_LIBWEBKIT],
- 	SOUP_MIN_VERSION=2.26
- 	SOUP_GNOME_MIN_VERSION=2.26
- 
--	have_libwebkit=no
--	PKG_CHECK_MODULES(LIBWEBKIT,
--		webkit-1.0 >= $WEBKIT_MIN_VERSION
--		libsoup-2.4 >= $SOUP_MIN_VERSION,
--		have_libwebkit=yes, have_libwebkit=no)
--	AC_SUBST(LIBWEBKIT_LIBS)
--	AC_SUBST(LIBWEBKIT_CFLAGS)
--	AM_CONDITIONAL(HAVE_LIBWEBKIT, [test x$have_libwebkit = xyes])
-+	AC_ARG_ENABLE(webkit, AC_HELP_STRING([--disable-webkit], [Disable extensions which require WebKit]), , enable_webkit="yes")
- 
--	have_libsoup_gnome=no
--	PKG_CHECK_MODULES(LIBSOUP_GNOME,
--		libsoup-gnome-2.4 >= $SOUP_GNOME_MIN_VERSION,
--		have_libsoup_gnome=$have_libwebkit, have_libsoup_gnome=no)
--	AC_SUBST(LIBSOUP_GNOME_LIBS)
--	AC_SUBST(LIBSOUP_GNOME_CFLAGS)
--	AM_CONDITIONAL(HAVE_LIBSOUP_GNOME, [test x$have_libsoup_gnome = xyes])
--	if test x$have_libsoup_gnome = xyes; then
--		AC_DEFINE(HAVE_LIBSOUP_GNOME, 1, [libsoup-gnome-2.4 detected])
-+	if test "x$enable_webkit" = "xyes"; then
-+		have_libwebkit=no
-+		PKG_CHECK_MODULES(LIBWEBKIT,
-+			webkit-1.0 >= $WEBKIT_MIN_VERSION
-+			libsoup-2.4 >= $SOUP_MIN_VERSION,
-+			have_libwebkit=yes, have_libwebkit=no)
-+		AC_SUBST(LIBWEBKIT_LIBS)
-+		AC_SUBST(LIBWEBKIT_CFLAGS)
-+		AM_CONDITIONAL(HAVE_LIBWEBKIT, [test x$have_libwebkit = xyes])
-+
-+		have_libsoup_gnome=no
-+		PKG_CHECK_MODULES(LIBSOUP_GNOME,
-+			libsoup-gnome-2.4 >= $SOUP_GNOME_MIN_VERSION,
-+			have_libsoup_gnome=$have_libwebkit, have_libsoup_gnome=no)
-+		AC_SUBST(LIBSOUP_GNOME_LIBS)
-+		AC_SUBST(LIBSOUP_GNOME_CFLAGS)
-+		AM_CONDITIONAL(HAVE_LIBSOUP_GNOME, [test x$have_libsoup_gnome = xyes])
-+		if test x$have_libsoup_gnome = xyes; then
-+			AC_DEFINE(HAVE_LIBSOUP_GNOME, 1, [libsoup-gnome-2.4 detected])
-+		fi
-+	else
-+		have_libwebkit=no
-+		have_libsoup_gnome=no
-+		AM_CONDITIONAL(HAVE_LIBWEBKIT, false)
-+		AM_CONDITIONAL(HAVE_LIBSOUP_GNOME, false)
- 	fi
- ])
- 
diff --git a/media-sound/banshee/files/banshee-2.2.0-fix-equalizer-values.patch b/media-sound/banshee/files/banshee-2.2.0-fix-equalizer-values.patch
deleted file mode 100644
index 074163768a41..000000000000
--- a/media-sound/banshee/files/banshee-2.2.0-fix-equalizer-values.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 705b1767b5767c7c734cb69cfdea468553978935 Mon Sep 17 00:00:00 2001
-From: Pacho Ramos <pacho@condmat1.ciencias.uniovi.es>
-Date: Sun, 09 Oct 2011 09:12:27 +0000
-Subject: EqualizerManager: Update values for the Smiley Face preset (bgo#661224)
-
-Signed-off-by: Bertrand Lorentz <bertrand.lorentz@gmail.com>
----
-diff --git a/src/Core/Banshee.Services/Banshee.Equalizer/EqualizerManager.cs b/src/Core/Banshee.Services/Banshee.Equalizer/EqualizerManager.cs
-index b379f5b..9effe5a 100644
---- a/src/Core/Banshee.Services/Banshee.Equalizer/EqualizerManager.cs
-+++ b/src/Core/Banshee.Services/Banshee.Equalizer/EqualizerManager.cs
-@@ -291,8 +291,8 @@ namespace Banshee.Equalizer
-             yield return new EqualizerSetting (this, Catalog.GetString ("Ska"), -1.1, new [] {
-                 -2.4, -4.8, -4, -1.1, 4, 5.6, 8.8, 9.6, 11.2, 9.6
-             });
--            yield return new EqualizerSetting (this, Catalog.GetString ("Smiley Face Curve"), -7.1, new [] {
--                11.9, 8.1, 6.2, 3.1, 0.7, -0.1, 3, 5.7, 8.4, 11.9
-+            yield return new EqualizerSetting (this, Catalog.GetString ("Smiley Face Curve"), -7, new [] {
-+                12, 8, 6, 3, 0.0, 0.0, 3, 6, 8, 12
-             });
-             yield return new EqualizerSetting (this, Catalog.GetString ("Soft"), -1.1, new [] {
-                 4.8, 1.6, -1.1, -2.4, -1.1, 4, 8, 9.6, 11.2, 12,
---
-cgit v0.9.0.2
diff --git a/media-sound/banshee/files/banshee-2.4.0-libgpod-082.patch b/media-sound/banshee/files/banshee-2.4.0-libgpod-082.patch
deleted file mode 100644
index 1eed55ba13e4..000000000000
--- a/media-sound/banshee/files/banshee-2.4.0-libgpod-082.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 623695e51ffd7faf3ff5b12754f4e3547d066f34 Mon Sep 17 00:00:00 2001
-From: Bertrand Lorentz <bertrand.lorentz@gmail.com>
-Date: Sat, 24 Mar 2012 15:38:18 +0000
-Subject: AppleDeviceTrackInfo: Fix build against libgpod-sharp 0.8.2
-
-In libgpod 0.8.2, released in July 2011, the type of the Track.Size
-field was changed, so it is reflected in the C# bindings and breaks the
-API.
-
-We have currently no way of checking which version of the libgpod-sharp
-bindings are available, so this breaks compilation against older version
-of libgpod-sharp. But people shipping Banshee 2.5.x and later should
-really ship libgpod-sharp 0.8.2.
-
-See this bug for details and attempts to fix this correctly:
-https://bugzilla.gnome.org/show_bug.cgi?id=655660
----
-diff --git a/src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceTrackInfo.cs b/src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceTrackInfo.cs
-index 178266d..b8549f7 100644
---- a/src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceTrackInfo.cs
-+++ b/src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceTrackInfo.cs
-@@ -215,7 +215,7 @@ namespace Banshee.Dap.AppleDevice
-             track.CDs = DiscCount;
-             track.CDNumber = DiscNumber;
-             track.TrackLength = (int) Duration.TotalMilliseconds;
--            track.Size = (int)FileSize;
-+            track.Size = (uint)FileSize;
-             track.Grouping = Grouping;
-             try {
-                 track.TimePlayed = LastPlayed;
---
-cgit v0.9.0.2
diff --git a/media-sound/banshee/files/banshee-2.4.0-upnp-crash.patch b/media-sound/banshee/files/banshee-2.4.0-upnp-crash.patch
deleted file mode 100644
index fa48a878ce97..000000000000
--- a/media-sound/banshee/files/banshee-2.4.0-upnp-crash.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From b627217e3841ca7d0b8af1ed8f916436e5088cee Mon Sep 17 00:00:00 2001
-From: Bertrand Lorentz <bertrand.lorentz@gmail.com>
-Date: Sat, 24 Mar 2012 11:27:06 +0000
-Subject: UPnPServerSource: Fix crash when getting the root object (bgo#672744)
-
-Move the GetRootObject () call inside the try/catch block, so that
-exceptions from Mono.Upnp don't cause a crash.
----
-diff --git a/src/Extensions/Banshee.UPnPClient/Banshee.UPnPClient/UPnPServerSource.cs b/src/Extensions/Banshee.UPnPClient/Banshee.UPnPClient/UPnPServerSource.cs
-index 04a743a..5412663 100644
---- a/src/Extensions/Banshee.UPnPClient/Banshee.UPnPClient/UPnPServerSource.cs
-+++ b/src/Extensions/Banshee.UPnPClient/Banshee.UPnPClient/UPnPServerSource.cs
-@@ -124,10 +124,11 @@ namespace Banshee.UPnPClient
-         {
-             RemoteContentDirectory remote_dir = new RemoteContentDirectory (content_directory);
-             DateTime begin = DateTime.Now;
--            Container root = remote_dir.GetRootObject ();
-             bool recursive_browse = !content_directory.CanSearch;
- 
-             try {
-+                Container root = remote_dir.GetRootObject ();
-+
-                 if (!recursive_browse) {
-                     try {
-                         Log.Debug ("Content directory is searchable, let's search");
---
-cgit v0.9.0.2