Version bump, remove old.

(Portage version: 2.1.9.41/cvs/Linux x86_64)

3 files changed, 40 insertions, 22 deletions

diff --git a/media-sound/banshee/ChangeLog b/media-sound/banshee/ChangeLog
index 42ce972220ac..67647bc87992 100644
--- a/media-sound/banshee/ChangeLog
+++ b/media-sound/banshee/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/banshee
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/banshee/ChangeLog,v 1.127 2010/11/17 20:56:08 hwoarang Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/banshee/ChangeLog,v 1.128 2011/02/27 14:54:42 pacho Exp $
+
+*banshee-1.8.1 (27 Feb 2011)
+
+  27 Feb 2011; Pacho Ramos <pacho@gentoo.org> -banshee-1.6.1.ebuild,
+  +banshee-1.8.1.ebuild:
+  Version bump, remove old.
 
   17 Nov 2010; Markos Chandras <hwoarang@gentoo.org>
   banshee-1.8.0-r1.ebuild:
diff --git a/media-sound/banshee/banshee-1.6.1.ebuild b/media-sound/banshee/banshee-1.8.1.ebuild
index ab78bfaf6233..9abaffd7bfaf 100644
--- a/media-sound/banshee/banshee-1.6.1.ebuild
+++ b/media-sound/banshee/banshee-1.8.1.ebuild
@@ -1,15 +1,15 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/banshee/banshee-1.6.1.ebuild,v 1.4 2010/07/12 18:03:07 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/banshee/banshee-1.8.1.ebuild,v 1.1 2011/02/27 14:54:42 pacho Exp $
 
 EAPI=2
 
-inherit eutils mono gnome2-utils fdo-mime versionator
+inherit eutils autotools mono gnome2-utils fdo-mime versionator
 
 GVER=0.10.7
 
 DESCRIPTION="Import, organize, play, and share your music using a simple and powerful interface."
-HOMEPAGE="http://banshee-project.org"
+HOMEPAGE="http://banshee.fm/"
 
 #BANSHEE_V2=$(get_version_component_range 2)
 #[[ $((${BANSHEE_V2} % 2)) -eq 0 ]] && RELTYPE=stable || RELTYPE=unstable
@@ -18,8 +18,8 @@ SRC_URI="http://download.banshee-project.org/${PN}/stable/${PV}/${PN}-1-${PV}.ta
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+aac +cdda boo daap doc +encode ipod karma mtp podcast test wikipedia youtube"
+KEYWORDS="~amd64 ~x86"
+IUSE="+aac +cdda boo daap doc +encode ipod karma mtp podcast test +web youtube"
 
 # Hal is required until upstream bug 612616 is solved
 RDEPEND=">=dev-lang/mono-2.4.3
@@ -27,8 +27,8 @@ RDEPEND=">=dev-lang/mono-2.4.3
 	x11-themes/gnome-icon-theme
 	sys-apps/dbus
 	sys-apps/hal
-	>=dev-dotnet/gtk-sharp-2.12
-	>=dev-dotnet/gconf-sharp-2.24.0
+	>=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
 	>=media-libs/gst-plugins-base-0.10.25.2
@@ -60,19 +60,22 @@ RDEPEND=">=dev-lang/mono-2.4.3
 	)
 	doc? (
 		virtual/monodoc
+		>=app-text/gnome-doc-utils-0.17.3
 	)
 	encode? (
 		>=media-plugins/gst-plugins-lame-${GVER}
 		>=media-plugins/gst-plugins-taglib-${GVER}
 	)
 	ipod? (
-		>=dev-dotnet/ipod-sharp-0.8.5
+		>=media-libs/libgpod-0.7.95[mono]
 	)
 	mtp? (
-		media-libs/libmtp
+		>=media-libs/libmtp-0.3.0
 	)
-	wikipedia? (
-		>=dev-dotnet/webkit-sharp-0.2
+	web? (
+		>=net-libs/webkit-gtk-1.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
@@ -88,28 +91,39 @@ S=${WORKDIR}/${PN}-1-${PV}
 src_prepare () {
 	# Fix intltool b0rkage similar to
 	# https://bugzilla.gnome.org/show_bug.cgi?id=577133
-	sed "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" -i po/Makefile.in.in \
-		|| die "sed failed"
+#	sed "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" -i po/Makefile.in.in \
+#		|| die "sed failed"
+
+	epatch "${FILESDIR}/${PN}-1.7.4-make-webkit-optional.patch"
+	AT_M4DIR="-I build/m4/banshee -I build/m4/shamrock -I build/m4/shave" \
+		eautoreconf
 }
 
 src_configure() {
+	# Disable gio till gtk-sharp-beans and gio-sharp are in-tree
+	# Disable gio-hardware till gudev-sharp and gkeyfile-sharp are around
+	# for a bit longer (when these are in, we can drop HAL)
+	# Ditto gst-sharp
 	local myconf="--disable-dependency-tracking --disable-static
 		--enable-gnome --enable-schemas-install
 		--with-gconf-schema-file-dir=/etc/gconf/schemas
 		--with-vendor-build-id=Gentoo/${PN}/${PVR}
 		--enable-gapless-playback
+		--disable-gio --disable-gst-sharp
+		--disable-gio_hardware --enable-hal
 		--disable-torrent
 		--disable-shave"
 
 	econf \
 		$(use_enable doc docs) \
+		$(use_enable doc user-help) \
 		$(use_enable boo) \
 		$(use_enable mtp) \
 		$(use_enable daap) \
-		$(use_enable ipod) \
+		$(use_enable ipod appledevice) --disable-ipod \
 		$(use_enable podcast) \
 		$(use_enable karma) \
-		$(use_enable wikipedia webkit) \
+		$(use_enable web webkit) \
 		$(use_enable youtube) \
 		${myconf}
 }
diff --git a/media-sound/banshee/metadata.xml b/media-sound/banshee/metadata.xml
index 350ce2a36421..14711119f52f 100644
--- a/media-sound/banshee/metadata.xml
+++ b/media-sound/banshee/metadata.xml
@@ -9,11 +9,9 @@
     <flag name="daap">Build with Daap support</flag>
     <flag name="karma">Build with karma support</flag>
     <flag name="podcast">Build with podcasting support</flag>
-	<flag name="wikipedia">Enable the Wikipedia context pane (require
-		<pkg>net-libs/webkit-gtk</pkg>)</flag>
-	<flag name="web">Enable support for plugins that access web-based services
+   <flag name="web">Enable support for plugins that access web-based services
 		such as Amazon and wikipedia (requires
 		<pkg>net-libs/webkit-gtk</pkg>)</flag>
-	<flag name="youtube">Enable the Youtube plugin</flag>
+   <flag name="youtube">Enable the Youtube plugin</flag>
   </use>
 </pkgmetadata>