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

Package-Manager: portage-2.2.0_alpha29/cvs/Linux x86_64

5 files changed, 60 insertions, 26 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/Manifest b/net-irc/smuxi/Manifest
index ea7bf5485bd1..c87ed4d8be72 100644
--- a/net-irc/smuxi/Manifest
+++ b/net-irc/smuxi/Manifest
@@ -1,26 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
+AUX smuxi-0.8-release-build.patch 1507 RMD160 e965e971fe698cb714f28a96054080107aa971f9 SHA1 4b2a9327aca1f563048636dbbb2b0ea5ee3aaa97 SHA256 6f16db4882009a46da52c8f2c963471cd0894d480ca2ee59d8ae7a0d1a04cb15
+AUX smuxi-0.8-visibility.patch 717 RMD160 d1370b5ad00966eb4d6fa251bb2508661c976c36 SHA1 573ad7b87d8f7647ec2664ee04b3e062f1cee4b9 SHA256 bcc0b8d82922712c967b0558580ecf023cf7447b55bb784697f0e72c0df39d45
 DIST smuxi-0.7.2.1.tar.gz 905833 RMD160 1fad869aae843e0f3cbe30366986c3f51cd5536a SHA1 94cbc0f5bee6cd2e1ff8c8f72d714270c80e5875 SHA256 9a313a04b41fd3f56874ebfdee5fe5c618b7208532edaaf13dbb62743d73e1ad
 DIST smuxi-0.8.tar.gz 1135506 RMD160 83116c213d7c5454d290f61f0b89aab04c4a35f2 SHA1 50ad828a771cf8387ad6c8f9ab0123daf97488ea SHA256 76ac79b24e0ac3aa7994fd56c70bef34c0bcd435b0acf4be5135aea5e0e8a41a
 EBUILD smuxi-0.7.2.1.ebuild 1131 RMD160 8755a4a61209c3b68835962af9174f704dc6dbdc SHA1 8e848b4cbf3b1c8cff143315651703313c2918e2 SHA256 a709130ab2c1091ecf7629a1fa7846831ceee1706cf4a1f66e4af0c4748e205b
-EBUILD smuxi-0.8.ebuild 1364 RMD160 97bcf744d569f67b1f1babde253cd296b1d25793 SHA1 c01c2c656192ae71dd8936f1b5b239acde9afeec SHA256 c4a9a0e08d524f45e1968a2c613444d8ffab1ec298f313390ce8305d9d8125cf
-MISC ChangeLog 2444 RMD160 23fb3d104a26984118873b153c65378489fb59d8 SHA1 6478775332f72add77a8fde5465af215d8f7fe6a SHA256 424dd4f209d09cb327ff398befe295e8e59c69547d918dd11ced411a646a5aaf
+EBUILD smuxi-0.8.ebuild 1352 RMD160 d969f6ae4c77ec137366e955a6479c74e8ef1e88 SHA1 6372da0d5a598ff546126b1782a69abbefedd993 SHA256 acf3f6ec6de8b3308a7f11298c433d50b3c5c90351e99cdc781c1b006f9c2228
+MISC ChangeLog 2661 RMD160 29cc137014baa09dffb2263cad4180050b7bb9fd SHA1 b353ca7eeaaf5c400ae9f8c1351876050f455ebe SHA256 cecc2916914fcd5c705a17253383cd9054276dc8024f107dd2652aae35abd7cf
 MISC metadata.xml 160 RMD160 cc10b170ad63a746d8bdfbe5bf1bd9f7065922b8 SHA1 49eaf4246f7502850064d3806cce65d3a404ce1b SHA256 1bc3e313a948415fff0dfa63a5610943327146bfe16bfeca603379bf9706a687
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJNREkvAAoJEPqDWhW0r/LCnKwP/RHWX99IJ/EkZAF99JC2OjTO
-0tRpjHSrMBfEJlqiz+SgtmTgl9DWraRudc9E3A3SZ/V+ioadZMKJ1MJW/uBLx9FG
-+7LGzJFLN2uIYj9AA/lFUqCowARIrw3jPFd3pGTM4zEFzMJRh/c/InFAJyvx0//9
-rMJuIkT6Q0g1zNrk2hegI63udPC9ST4LrF/lJuqbK11ipDldEzjKD6gfNc1azprO
-mkA9GTB9Q4Scg4t4P3PAqjfclxnIBTzTx1r5VejPGn+RYKnff028n9KmCLaPXboL
-gnSLszGh8zE/HZYFJf9u9IzWcA0dz4BJ6zfcV9RP56zYGGkN627OeM1Rm+6j0EJR
-P8tdOiN7lfIuwJZXPd18rgRWoaBFdd6B3lKavGKirGqmtY+XYCQ7ewhCq0RsWkLs
-bYOehj7BR9jp1DDOZGfQHawoKHWL/3qQPPXuk2f1EbedBwA5H5edW8dbVpn3etd7
-InGl4fQKuF/wlxA+z1Qq3zO//Esqn09QoiqFTNTjFkMx8Lm1fr0MFZTIE/zHzeyK
-ZCijtYDnKlER/YdFZNz7eYcB4xdat/A4FHkyNepFtrqpDy8EDAT9zzbJNC1ZdGpf
-YxD/nWj9YTWQDiJoGYWEz1EH8BlDnDQmqvZxV39bdvdc2GSwOUJ8PXMH4okacKQO
-CbV5QpKiZt+stsThpCyW
-=8o0l
+iF4EAREIAAYFAk2jJdoACgkQmWq1bYTyC0MExwEAlnTclFmD1fCpsgW5r1qnuVst
+spZNhxjq5l340hCWCkgA/13E+SvjzzYEVd5yERAyhg1lx3PYhVzY+6noR13EVxHd
+=agbR
 -----END PGP SIGNATURE-----
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
 }