Fix build against mono-2.6 and allow to only build server

(Portage version: 2.1.8.3/cvs/Linux x86_64)

4 files changed, 42 insertions, 49 deletions

diff --git a/net-irc/smuxi/ChangeLog b/net-irc/smuxi/ChangeLog
index 25f52e1f8ab1..4791e32a563e 100644
--- a/net-irc/smuxi/ChangeLog
+++ b/net-irc/smuxi/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-irc/smuxi
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/smuxi/ChangeLog,v 1.5 2010/02/21 11:23:28 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/smuxi/ChangeLog,v 1.6 2010/07/03 18:52:38 pacho Exp $
+
+*smuxi-0.7.1-r1 (03 Jul 2010)
+
+  03 Jul 2010; Pacho Ramos <pacho@gentoo.org> -smuxi-0.6.4.ebuild,
+  -smuxi-0.7.1.ebuild, +smuxi-0.7.1-r1.ebuild,
+  +files/smuxi-0.7.1-mono26.patch:
+  Revision bump fixing building against mono-2.6 (bug #310735 by Diego and
+  Steev) and allowing to build only server (bug #293952 by Ayron Jungren).
+  Remove old testing.
 
 *smuxi-0.7.1 (21 Feb 2010)
 
diff --git a/net-irc/smuxi/files/smuxi-0.7.1-mono26.patch b/net-irc/smuxi/files/smuxi-0.7.1-mono26.patch
new file mode 100644
index 000000000000..6a76ec3eda5a
--- /dev/null
+++ b/net-irc/smuxi/files/smuxi-0.7.1-mono26.patch
@@ -0,0 +1,19 @@
+commit 1b7ebd1dfcca090b3e8510947d9ea8a54d919b09
+Author: Mirco Bauer <meebey@meebey.net>
+Date:   Sun Jun 6 19:28:02 2010 +0200
+
+    Fixed build issue with xbuild on Mono 2.6 (closes: #380)
+
+diff --git a/lib/Twitterizer.Framework/Makefile.am b/lib/Twitterizer.Framework/Makefile.am
+index 8de6969..1116489 100644
+--- a/lib/Twitterizer.Framework/Makefile.am
++++ b/lib/Twitterizer.Framework/Makefile.am
+@@ -6,7 +6,7 @@ ASSEMBLY_NAME = Twitterizer.Framework.dll
+ ASSEMBLY_TARGET = $(OUTPUT_DIR)/$(ASSEMBLY_NAME)
+ KEY_FILE = $(srcdir)/Twitterizer.Framework.snk
+ BUILD_FILE = $(srcdir)/Twitterizer.Framework.vs2008.csproj
+-XBUILD_FLAGS = /p:Configuration=Debug /p:NoWarn=CS0168 /p:OutputPath=$(abspath $(OUTPUT_DIR)) /p:BaseIntermediateOutputPath=$(abspath $(OBJECT_DIR))/
++XBUILD_FLAGS = /p:Configuration=Debug /p:NoWarn=0168 /p:OutputPath=$(abspath $(OUTPUT_DIR)) /p:BaseIntermediateOutputPath=$(abspath $(OBJECT_DIR))/
+ 
+ # magic automake variables
+ if ENABLE_ENGINE_TWITTER
diff --git a/net-irc/smuxi/smuxi-0.6.4.ebuild b/net-irc/smuxi/smuxi-0.6.4.ebuild
deleted file mode 100644
index 54aeac4c9e7f..000000000000
--- a/net-irc/smuxi/smuxi-0.6.4.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/smuxi/smuxi-0.6.4.ebuild,v 1.1 2009/08/29 20:57:06 loki_val Exp $
-
-EAPI=2
-
-inherit base  mono
-
-DESCRIPTION="A flexible, irssi-like and user-friendly IRC client for the Gnome Desktop."
-HOMEPAGE="http://www.smuxi.org/page/Download"
-SRC_URI="http://smuxi.meebey.net/jaws/data/files/${P}.tar.gz"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-LICENSE="|| ( GPL-2 GPL-3 )"
-
-RDEPEND=">=dev-lang/mono-2.0
-	>=dev-dotnet/smartirc4net-0.4.5.1
-	>=dev-dotnet/nini-1.1.0-r2
-	>=dev-dotnet/log4net-1.2.10-r2
-	>=dev-dotnet/gtk-sharp-2.12
-	>=dev-dotnet/gconf-sharp-2.12
-	>=dev-dotnet/glade-sharp-2.12
-	>=dev-dotnet/glib-sharp-2.12"
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.25
-	>=sys-devel/gettext-0.17
-	>=dev-util/pkgconfig-0.23"
-
-src_configure() {
-	econf	--disable-dependency-tracking	\
-		--enable-engine-irc		\
-		--enable-frontend-gnome
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "install failed"
-	dodoc FEATURES TODO README || die "dodoc failed"
-}
diff --git a/net-irc/smuxi/smuxi-0.7.1.ebuild b/net-irc/smuxi/smuxi-0.7.1-r1.ebuild
index b397bd45e046..c19fa9f766ff 100644
--- a/net-irc/smuxi/smuxi-0.7.1.ebuild
+++ b/net-irc/smuxi/smuxi-0.7.1-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/smuxi/smuxi-0.7.1.ebuild,v 1.1 2010/02/21 11:23:28 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/smuxi/smuxi-0.7.1-r1.ebuild,v 1.1 2010/07/03 18:52:38 pacho Exp $
 
 EAPI=2
 
-inherit base  mono
+inherit base mono eutils autotools
 
 DESCRIPTION="A flexible, irssi-like and user-friendly IRC client for the Gnome Desktop."
 HOMEPAGE="http://www.smuxi.org/page/Download"
@@ -12,26 +12,31 @@ SRC_URI="http://smuxi.meebey.net/jaws/data/files/${P}.tar.gz"
 
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
+IUSE="gnome"
 LICENSE="|| ( GPL-2 GPL-3 )"
 
 RDEPEND=">=dev-lang/mono-2.0
 	>=dev-dotnet/smartirc4net-0.4.5.1
 	>=dev-dotnet/nini-1.1.0-r2
 	>=dev-dotnet/log4net-1.2.10-r2
-	>=dev-dotnet/gtk-sharp-2.12
-	>=dev-dotnet/gconf-sharp-2.12
-	>=dev-dotnet/glade-sharp-2.12
-	>=dev-dotnet/glib-sharp-2.12"
+	gnome? ( >=dev-dotnet/gtk-sharp-2.12
+		 >=dev-dotnet/gconf-sharp-2.12
+		 >=dev-dotnet/glade-sharp-2.12
+		 >=dev-dotnet/glib-sharp-2.12 )"
 DEPEND="${RDEPEND}
 	>=dev-util/intltool-0.25
 	>=sys-devel/gettext-0.17
 	>=dev-util/pkgconfig-0.23"
 
+src_prepare() {
+	epatch "${FILESDIR}/${P}-mono26.patch"
+	eautoreconf
+}
+
 src_configure() {
 	econf	--disable-dependency-tracking	\
 		--enable-engine-irc		\
-		--enable-frontend-gnome
+		$(use_enable gnome frontend-gnome)
 }
 
 src_install() {