Fixed building against mono-2.10 with patches from Arch (bug #362623)

(Portage version: 2.2.0_alpha29/cvs/Linux x86_64)

4 files changed, 52 insertions, 10 deletions

diff --git a/net-irc/smuxi/ChangeLog b/net-irc/smuxi/ChangeLog
index 7212772a0dc7..1024f7624136 100644
--- a/net-irc/smuxi/ChangeLog
+++ b/net-irc/smuxi/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-irc/smuxi
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/smuxi/ChangeLog,v 1.14 2011/01/29 17:07:58 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/smuxi/ChangeLog,v 1.15 2011/04/11 16:01:42 angelos Exp $
+
+  11 Apr 2011; Christoph Mende <angelos@gentoo.org> smuxi-0.8.ebuild,
+  +files/smuxi-0.8-release-build.patch, +files/smuxi-0.8-visibility.patch:
+  Fixed building against mono-2.10 with patches from Arch (bug #362623)
 
   29 Jan 2011; Markos Chandras <hwoarang@gentoo.org> smuxi-0.8.ebuild:
   Stable on amd64 wrt bug #352808
diff --git a/net-irc/smuxi/files/smuxi-0.8-release-build.patch b/net-irc/smuxi/files/smuxi-0.8-release-build.patch
new file mode 100644
index 000000000000..ff95bcb8d257
--- /dev/null
+++ b/net-irc/smuxi/files/smuxi-0.8-release-build.patch
@@ -0,0 +1,24 @@
+diff --git a/lib/Makefile.am b/lib/Makefile.am
+index 2dac439..ba929fc 100644
+--- a/lib/Makefile.am
++++ b/lib/Makefile.am
+@@ -3,7 +3,7 @@ SUBDIRS =	SmartIrc4net
+ OUTPUT_DIR = $(top_builddir)/bin/$(PROFILE)
+ OBJECT_DIR = $(OUTPUT_DIR)/obj
+ SOURCE_PATTERNS = *.cs */*.cs */*/*.cs */*/*/*.cs
+-XBUILD_FLAGS = /p:Configuration=Debug /p:WarningLevel=0 /p:OutputPath=$(abspath $(OUTPUT_DIR)) /p:BaseIntermediateOutputPath=$(abspath $(OBJECT_DIR))/ /p:DocumentationFile=
++XBUILD_FLAGS = /p:Configuration=Release /p:SignAssembly=false /p:WarningLevel=0 /p:OutputPath=$(abspath $(OUTPUT_DIR)) /p:BaseIntermediateOutputPath=$(abspath $(OBJECT_DIR))/ /p:DocumentationFile=
+ 
+ JSON_SUBDIR = Newtonsoft.Json
+ JSON_SRCDIR = $(srcdir)/$(JSON_SUBDIR)/Src/Newtonsoft.Json
+--- a/lib/Makefile.in
++++ b/lib/Makefile.in
+@@ -285,7 +285,7 @@
+ OUTPUT_DIR = $(top_builddir)/bin/$(PROFILE)
+ OBJECT_DIR = $(OUTPUT_DIR)/obj
+ SOURCE_PATTERNS = *.cs */*.cs */*/*.cs */*/*/*.cs
+-XBUILD_FLAGS = /p:Configuration=Debug /p:WarningLevel=0 /p:OutputPath=$(abspath $(OUTPUT_DIR)) /p:BaseIntermediateOutputPath=$(abspath $(OBJECT_DIR))/ /p:DocumentationFile=
++XBUILD_FLAGS = /p:Configuration=Release /p:SignAssembly=false /p:WarningLevel=0 /p:OutputPath=$(abspath $(OUTPUT_DIR)) /p:BaseIntermediateOutputPath=$(abspath $(OBJECT_DIR))/ /p:DocumentationFile=
+ JSON_SUBDIR = Newtonsoft.Json
+ JSON_SRCDIR = $(srcdir)/$(JSON_SUBDIR)/Src/Newtonsoft.Json
+ JSON_SOURCE_FILES = $(foreach pattern, $(SOURCE_PATTERNS), $(wildcard $(JSON_SRCDIR)/$(pattern)))
diff --git a/net-irc/smuxi/files/smuxi-0.8-visibility.patch b/net-irc/smuxi/files/smuxi-0.8-visibility.patch
new file mode 100644
index 000000000000..33e16a2a4c83
--- /dev/null
+++ b/net-irc/smuxi/files/smuxi-0.8-visibility.patch
@@ -0,0 +1,13 @@
+diff --git a/lib/Twitterizer/Twitterizer2/Methods/User/TwitterUserCollection.cs b/lib/Twitterizer/Twitterizer2/Methods/User/TwitterUserCollection.cs
+index 522bccf..d73cfef 100644
+--- a/lib/Twitterizer/Twitterizer2/Methods/User/TwitterUserCollection.cs
++++ b/lib/Twitterizer/Twitterizer2/Methods/User/TwitterUserCollection.cs
+@@ -59,7 +59,7 @@ namespace Twitterizer
+         /// Gets or sets information about the user's rate usage.

+         /// </summary>

+         /// <value>The rate limiting object.</value>

+-        public new RateLimiting RateLimiting { get; internal set; }

++        public new RateLimiting RateLimiting { get; set; }

+ 

+         /// <summary>

+         /// Gets or sets the paged command.

diff --git a/net-irc/smuxi/smuxi-0.8.ebuild b/net-irc/smuxi/smuxi-0.8.ebuild
index 4b734ab4741c..8c279ebb0737 100644
--- a/net-irc/smuxi/smuxi-0.8.ebuild
+++ b/net-irc/smuxi/smuxi-0.8.ebuild
@@ -1,9 +1,8 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/smuxi/smuxi-0.8.ebuild,v 1.3 2011/01/29 17:07:58 hwoarang Exp $
-
-EAPI=2
+# $Header: /var/cvsroot/gentoo-x86/net-irc/smuxi/smuxi-0.8.ebuild,v 1.4 2011/04/11 16:01:42 angelos Exp $
 
+EAPI=4
 inherit base mono eutils
 
 DESCRIPTION="A flexible, irssi-like and user-friendly IRC client for the Gnome Desktop."
@@ -29,6 +28,13 @@ DEPEND="${RDEPEND}
 	>=sys-devel/gettext-0.17
 	>=dev-util/pkgconfig-0.23"
 
+DOCS="FEATURES TODO README"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-visibility.patch \
+		"${FILESDIR}"/${P}-release-build.patch
+}
+
 src_configure() {
 	econf	--disable-dependency-tracking	\
 		--enable-engine-irc		\
@@ -40,10 +46,5 @@ src_configure() {
 
 src_compile() {
 	# This is not parallel build safe, see upstream bug #515
-	emake -j1 || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "install failed"
-	dodoc FEATURES TODO README || die "dodoc failed"
+	emake -j1
 }