Bump to eapi-2 and use-dep on mono-addins[gtk]. Fixes bug 250332.

Package-Manager: portage-2.2_rc17/cvs/Linux 2.6.28-rc6 x86_64

4 files changed, 32 insertions, 117 deletions

diff --git a/media-sound/banshee/ChangeLog b/media-sound/banshee/ChangeLog
index 27b0b7425181..e58b05a0bb6f 100644
--- a/media-sound/banshee/ChangeLog
+++ b/media-sound/banshee/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/banshee
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/banshee/ChangeLog,v 1.74 2008/12/05 23:26:40 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/banshee/ChangeLog,v 1.75 2008/12/09 21:24:34 loki_val Exp $
+
+*banshee-1.4.1-r2 (09 Dec 2008)
+
+  09 Dec 2008; Peter Alfredsen <loki_val@gentoo.org> -banshee-1.4.1.ebuild,
+  -banshee-1.4.1-r1.ebuild, +banshee-1.4.1-r2.ebuild:
+  Bump to eapi-2 and use-dep on mono-addins[gtk]. Fixes bug 250332.
 
 *banshee-1.4.1-r1 (05 Dec 2008)
 
diff --git a/media-sound/banshee/Manifest b/media-sound/banshee/Manifest
index 5a17729861e1..f1cf34e9b9aa 100644
--- a/media-sound/banshee/Manifest
+++ b/media-sound/banshee/Manifest
@@ -12,7 +12,6 @@ EBUILD banshee-0.13.1.ebuild 2995 RMD160 ea90307f7745259bdb12b22dae8d428de7cba7b
 EBUILD banshee-1.0.0-r1.ebuild 2202 RMD160 fcaaa6d71fd03c43569c1cb2953836d9b444da5f SHA1 05b90c39aabc619e7b9833fc018d9b724a951db0 SHA256 69ccfb5570b7200dd7bd08a24efee1b91920ba4a71910356b1a6d257e77ffc86
 EBUILD banshee-1.2.1-r2.ebuild 2335 RMD160 8667fba2eecedcc96ab6c266ad74f9e2751ccda5 SHA1 39451794dc0bb1de88b28d8767bbe1dba26c9df5 SHA256 f00da028931c3156b395efc087a490f2abdea1a32f753d5ff477356a0705fb0a
 EBUILD banshee-1.2.1.ebuild 2210 RMD160 34b20e9e66f736db60934a712545ee9bba3203da SHA1 100317bfad927a9279a5da868923f0c196669889 SHA256 8a13cc436483124f120fe137b2fd2107521e466189340f3ea3cfa66cc106b591
-EBUILD banshee-1.4.1-r1.ebuild 2521 RMD160 73647c4057e55b4241df5042a1db502a21ca92d4 SHA1 5774a46de7857dc611a4b10800c85cf5187633a7 SHA256 4496fa1402643edae06c2c4af833655c447c0a791c864949cac06bed044a99b7
-EBUILD banshee-1.4.1.ebuild 2410 RMD160 216f150f3cb87c8171e01d4122a85ca490038f47 SHA1 19b024a1aede02fc7b15f5419290e3086764afe8 SHA256 08ae650be4b5a029a8e0e0cf22b1a0af763f65d05292d088187c145f60f42a45
-MISC ChangeLog 13671 RMD160 d5d8e55235fb9735288ad86dbbc5e876dd234291 SHA1 2f4bfeeb91b3921e2dd2ad361a32bb4361ccc1f6 SHA256 dffd3299d1bc1b2f48e2a279b094391c8f2f02ea914276b8b42c5114a7e38587
+EBUILD banshee-1.4.1-r2.ebuild 2638 RMD160 27d8a62b58643cf518b7eb732057c139a103d131 SHA1 cc836ab2eb7463a10699f9c8f697e545bac5c428 SHA256 6803cf6047e45a23919e31e272f5988c06590848c2f99fd43f83ec67dac20248
+MISC ChangeLog 13903 RMD160 a416a7c982c83e801da10acb86b7eba91cc3f0ea SHA1 3ebff514f633319979806cc97cea2c0b8914402a SHA256 2d17c5c9fe6816bc9166316c48889a0e7bbcc35878cae403f3ae2b0cd67f19b0
 MISC metadata.xml 499 RMD160 58c90a5fa64f948def14ea188bd7815294e36f35 SHA1 5d463e6bbad5600e2fb46e20dd35be871bcb48a8 SHA256 77f493966e62f6e00073371783c5234cee51f5a4462571c8214c6e301860cd5a
diff --git a/media-sound/banshee/banshee-1.4.1-r1.ebuild b/media-sound/banshee/banshee-1.4.1-r2.ebuild
index 4120e63f6d8e..9fc9bc2489f8 100644
--- a/media-sound/banshee/banshee-1.4.1-r1.ebuild
+++ b/media-sound/banshee/banshee-1.4.1-r2.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/banshee/banshee-1.4.1-r1.ebuild,v 1.1 2008/12/05 23:26:40 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/banshee/banshee-1.4.1-r2.ebuild,v 1.1 2008/12/09 21:24:34 loki_val Exp $
 
-EAPI=1
+EAPI=2
 
 inherit base gnome2 mono autotools
 
@@ -34,7 +34,10 @@ RDEPEND=">=dev-lang/mono-2
 	media-libs/musicbrainz:1
 	>=dev-dotnet/dbus-glib-sharp-0.3
 	>=dev-dotnet/dbus-sharp-0.5
-	>=dev-dotnet/mono-addins-0.3.1
+	|| (
+		~dev-dotnet/mono-addins-0.3.1
+		>=dev-dotnet/mono-addins-0.4[gtk]
+	)
 	>=dev-dotnet/taglib-sharp-2.0.3
 	>=dev-db/sqlite-3.4
 	aac? (
@@ -77,14 +80,6 @@ DOCS="AUTHORS ChangeLog HACKING NEWS README"
 
 S=${WORKDIR}/${PN}-1-${PV}
 
-src_unpack() {
-	gnome2_src_unpack
-
-	#Upstream bug 563283
-	#Author is thansen on freenode.
-	epatch "${FILESDIR}/${P}-metadata-writefail.patch"
-}
-
 pkg_setup() {
 	G2CONF="${G2CONF}
 		$(use_enable doc docs)
@@ -100,6 +95,23 @@ pkg_setup() {
 
 }
 
+
+src_unpack() {
+	gnome2_src_unpack
+
+	#Upstream bug 563283
+	#Author is thansen on freenode.
+	epatch "${FILESDIR}/${P}-metadata-writefail.patch"
+}
+
+src_configure() {
+	gnome2_src_configure
+}
+
+src_compile() {
+	default
+}
+
 pkg_postinst() {
 	gnome2_pkg_postinst
 	elog "If banshee segfaults not long after being started, try running gnome-appearance-properties and select a theme."
diff --git a/media-sound/banshee/banshee-1.4.1.ebuild b/media-sound/banshee/banshee-1.4.1.ebuild
deleted file mode 100644
index 2ed102ea274a..000000000000
--- a/media-sound/banshee/banshee-1.4.1.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/banshee/banshee-1.4.1.ebuild,v 1.2 2008/11/23 16:03:12 loki_val Exp $
-
-EAPI=1
-
-inherit base gnome2 mono autotools
-
-GVER=0.10.3
-
-DESCRIPTION="Import, organize, play, and share your music using a simple and powerful interface."
-HOMEPAGE="http://banshee-project.org"
-SRC_URI="http://download.banshee-project.org/${PN}/${PN}-1-${PV}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+aac +boo daap doc +encode +flac ipod +mad mtp +podcast test +vorbis"
-
-RDEPEND=">=dev-lang/mono-2
-	>=dev-dotnet/gtk-sharp-2.12
-	>=dev-dotnet/gconf-sharp-2.8
-	>=dev-dotnet/gnome-sharp-2.8
-	>=media-libs/gst-plugins-bad-${GVER}
-	>=media-libs/gst-plugins-good-${GVER}
-	>=media-libs/gst-plugins-ugly-${GVER}
-	>=media-plugins/gst-plugins-alsa-${GVER}
-	>=media-plugins/gst-plugins-gnomevfs-${GVER}
-	>=media-plugins/gst-plugins-gconf-${GVER}
-	|| (
-		>=media-plugins/gst-plugins-cdparanoia-${GVER}
-		>=media-plugins/gst-plugins-cdio-${GVER}
-	)
-	media-libs/musicbrainz:1
-	>=dev-dotnet/dbus-glib-sharp-0.3
-	>=dev-dotnet/dbus-sharp-0.5
-	>=dev-dotnet/mono-addins-0.3.1
-	>=dev-dotnet/taglib-sharp-2.0.3
-	>=dev-db/sqlite-3.4
-	aac? (
-		>=media-plugins/gst-plugins-faad-${GVER}
-	)
-	boo? (
-		>=dev-lang/boo-0.8.1
-	)
-	daap? (
-	 	>=dev-dotnet/mono-zeroconf-0.7.3
-	)
-	doc? (
-		dev-util/monodoc
-	)
-	encode? (
-		>=media-plugins/gst-plugins-lame-${GVER}
-		>=media-plugins/gst-plugins-taglib-${GVER}
-	)
-	flac? (
-		>=media-plugins/gst-plugins-flac-${GVER}
-	)
-	ipod? (
-		>=dev-dotnet/ipod-sharp-0.8.0
-	)
-	mad? (
-		>=media-plugins/gst-plugins-mad-${GVER}
-	)
-	mtp? (
-		media-libs/libmtp
-	)
-	vorbis? (
-		>=media-plugins/gst-plugins-ogg-${GVER}
-		>=media-plugins/gst-plugins-vorbis-${GVER}
-	)"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-DOCS="AUTHORS ChangeLog HACKING NEWS README"
-
-S=${WORKDIR}/${PN}-1-${PV}
-
-src_unpack() {
-	gnome2_src_unpack
-}
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		$(use_enable doc docs)
-		$(use_enable boo)
-		$(use_enable mtp)
-		$(use_enable daap)
-		$(use_enable ipod)
-		$(use_enable podcast)
-		$(use_enable test tests)
-		--enable-gnome
-		--enable-schemas-install
-		--with-gconf-schema-file-dir=/etc/gconf/schemas"
-
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	elog "If banshee segfaults not long after being started, try running gnome-appearance-properties and select a theme."
-}