Fix build with newer sharp stack.

(Portage version: 2.2_rc20/cvs/Linux 2.6.28 x86_64)

3 files changed, 68 insertions, 10 deletions

diff --git a/media-sound/monopod/ChangeLog b/media-sound/monopod/ChangeLog
index bee3fd53bfe2..483c2c53e816 100644
--- a/media-sound/monopod/ChangeLog
+++ b/media-sound/monopod/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/monopod
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/monopod/ChangeLog,v 1.9 2008/05/02 15:56:54 drac Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/monopod/ChangeLog,v 1.10 2009/01/08 20:28:05 loki_val Exp $
+
+  08 Jan 2009; Peter Alfredsen <loki_val@gentoo.org>
+  +files/monopod-0.6-build-fix.patch, monopod-0.6.ebuild:
+  Fix build with newer sharp stack.
 
   02 May 2008; Samuli Suominen <drac@gentoo.org> monopod-0.6.ebuild:
   Use berlios mirrors://
diff --git a/media-sound/monopod/files/monopod-0.6-build-fix.patch b/media-sound/monopod/files/monopod-0.6-build-fix.patch
new file mode 100644
index 000000000000..ff596ea89e02
--- /dev/null
+++ b/media-sound/monopod/files/monopod-0.6-build-fix.patch
@@ -0,0 +1,46 @@
+diff -NrU5 monopod-0.6.orig/configure.ac monopod-0.6/configure.ac
+--- monopod-0.6.orig/configure.ac	2009-01-08 20:49:25.000000000 +0100
++++ monopod-0.6/configure.ac	2009-01-08 20:58:49.000000000 +0100
+@@ -28,11 +28,11 @@
+ 
+ MONODIR=`$PKG_CONFIG --variable=exec_prefix mono`
+ MONOBIN="$MONODIR/bin"
+ MONO="$MONOBIN/mono"
+ MINT="$MONOBIN/mint"
+-MCS="$MONOBIN/mcs"
++MCS="$MONOBIN/gmcs"
+ GACUTIL="$MONOBIN/gacutil"
+ 
+ if test ! -x "$MONO" -a ! -x "$MINT"; then
+ 	AC_MSG_ERROR([No Mono runtime found])
+ fi
+@@ -76,10 +76,14 @@
+ dnl gconf-sharp
+ GCONFSHARP_REQUIRED_VERSION=2.8.0
+ PKG_CHECK_MODULES(GCONFSHARP, gconf-sharp-2.0 >= $GCONFSHARP_REQUIRED_VERSION)
+ AC_SUBST(GCONFSHARP_LIBS)
+ 
++GNOMESHARP_REQUIRED_VERSION=2.8.0
++PKG_CHECK_MODULES(GNOMESHARP, gnome-sharp-2.0 >= $GNOMESHARP_REQUIRED_VERSION)
++AC_SUBST(GNOMESHARP_LIBS)
++
+ dnl ipod-sharp
+ 
+ dnl configure options
+ AC_ARG_ENABLE(ipod, AC_HELP_STRING([--enable-ipod], [Enable iPod support]), , enable_ipod="yes")
+ enable_ipodsharp="${enable_ipod}"
+diff -NrU5 monopod-0.6.orig/Monopod/Makefile.am monopod-0.6/Monopod/Makefile.am
+--- monopod-0.6.orig/Monopod/Makefile.am	2009-01-08 20:49:25.000000000 +0100
++++ monopod-0.6/Monopod/Makefile.am	2009-01-08 20:59:39.000000000 +0100
+@@ -48,10 +48,11 @@
+ Monopod.exe: $(monopod_build_sources) $(monopod_resources) $(entagged_dll)
+ 	$(MCS) \
+ 	$(GTKSHARP_LIBS) \
+ 	$(GLADESHARP_LIBS) \
+ 	$(GCONFSHARP_LIBS) \
++	$(GNOMESHARP_LIBS) \
+ 	$(IPODSHARP_LIBS) \
+ 	-r:$(entagged_dll) \
+ 	$(OTHERLIBS) \
+ 	$(monopod_embedded) \
+ 	$(MCS_FLAGS) \
diff --git a/media-sound/monopod/monopod-0.6.ebuild b/media-sound/monopod/monopod-0.6.ebuild
index ec81f6040efe..63855c76b9b4 100644
--- a/media-sound/monopod/monopod-0.6.ebuild
+++ b/media-sound/monopod/monopod-0.6.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/monopod/monopod-0.6.ebuild,v 1.7 2008/05/02 15:56:54 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/monopod/monopod-0.6.ebuild,v 1.8 2009/01/08 20:28:05 loki_val Exp $
+EAPI=2
 
-inherit gnome2 mono
+inherit mono eutils autotools
 
 DESCRIPTION="A very lightweight podcast client with ipod support written in GTK#"
 HOMEPAGE="http://monopod.berlios.de"
@@ -11,16 +12,15 @@ SRC_URI="mirror://berlios/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~ppc ~x86"
-#IUSE="ipod"
 IUSE=""
 
 RDEPEND=">=dev-lang/mono-1.1.6
 	>=dev-dotnet/glade-sharp-2.8
+	>=dev-dotnet/gnome-sharp-2.8
 	>=dev-dotnet/gconf-sharp-2.8
 	>=dev-dotnet/gtk-sharp-2.8
 	dev-db/sqlite
 	sys-apps/dbus"
-#	ipod? ( >=dev-dotnet/ipod-sharp-0.5.15 )"
 DEPEND="${RDEPEND}
 	dev-util/intltool
 	dev-util/pkgconfig
@@ -28,7 +28,15 @@ DEPEND="${RDEPEND}
 
 DOCS="AUTHORS ChangeLog NEWS README TODO"
 
-pkg_setup() {
-#	G2CONF="${G2CONF} $(use_enable ipod)"
-	G2CONF="${G2CONF} --disable-ipod"
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-build-fix.patch
+	eautoreconf
+}
+
+src_configure() {
+	econf --disable-ipod
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
 }