Add patch to fix mono from SF.net bug #1639901 and gentoo bug #162930

Package-Manager: portage-2.1.1-r2

diff --git a/net-im/gaim/ChangeLog b/net-im/gaim/ChangeLog
index 00e2f1f7f77f3c1fd9e9d571acc07bf54c2e4aed..c0dd7a92a2e455957d229101792ff686c599b988 100644 (file)
--- a/net-im/gaim/ChangeLog
+++ b/net-im/gaim/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-im/gaim
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/ChangeLog,v 1.431 2007/01/21 23:32:32 tester Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/ChangeLog,v 1.432 2007/01/27 00:47:05 tester Exp $
+
+  27 Jan 2007; Olivier Crête <tester@gentoo.org>
+  +files/gaim-2.0.0_beta6-mono-api-change-update.patch,
+  gaim-2.0.0_beta6.ebuild:
+  Add patch to fix mono from SF.net bug #1639901 and gentoo bug #162930
 
 *gaim-2.0.0_beta6 (21 Jan 2007)
 

diff --git a/net-im/gaim/Manifest b/net-im/gaim/Manifest
index 07e82a550cd80ef8f128870920f05953eb3412e9..b06e73142744d2a40c163ca8f640497268d7bd58 100644 (file)
--- a/net-im/gaim/Manifest
+++ b/net-im/gaim/Manifest
@@ -13,6 +13,10 @@ AUX gaim-2.0.0_beta5-dbus.patch 2347 RMD160 df8f4261289b1f1dd5dfb25d10c2750bb61c
 MD5 3368d8d7c673a679625f0fd12b535602 files/gaim-2.0.0_beta5-dbus.patch 2347
 RMD160 df8f4261289b1f1dd5dfb25d10c2750bb61cae3f files/gaim-2.0.0_beta5-dbus.patch 2347
 SHA256 ccdb151171d8df331f7192aeb3b04767627f608e5b0d9b06a9173be484f2b6bd files/gaim-2.0.0_beta5-dbus.patch 2347
+AUX gaim-2.0.0_beta6-mono-api-change-update.patch 1569 RMD160 181de7b43a245c44785be6db3974551a73e19c4a SHA1 d42e5fbdf02c9ada25c24c1c0801b93716983c95 SHA256 3afca0431fd73ae91b1a06b5aea2d278107c2374f102008fcb54f0ee5321e942
+MD5 0a052a627c2e577afe31a1acca7cd819 files/gaim-2.0.0_beta6-mono-api-change-update.patch 1569
+RMD160 181de7b43a245c44785be6db3974551a73e19c4a files/gaim-2.0.0_beta6-mono-api-change-update.patch 1569
+SHA256 3afca0431fd73ae91b1a06b5aea2d278107c2374f102008fcb54f0ee5321e942 files/gaim-2.0.0_beta6-mono-api-change-update.patch 1569
 DIST gaim-1.5.0.tar.bz2 6123237 RMD160 13f74e2d2ed69a775a5884b807c365177455ae0e SHA1 a280d005f01be7fa89c9fa210efb86cc6a9eb9c7 SHA256 58e3b0340cfc9e54e46f8d8835e5a02e31201c9ed8820bbb4cea36c59b9682aa
 DIST gaim-2.0.0beta5.tar.bz2 6489271 RMD160 5fdb0f16411745033a691c4991e0f36cd31655c5 SHA1 cc897b656b933c60d9557df7f6dfdffc913fb6b6 SHA256 d6fab2ff940eddbf8256b2d845332cbc25b10e1c44f1761a0a754c55849b01db
 DIST gaim-2.0.0beta6.tar.bz2 6667700 RMD160 b741288aeba621fbfeea3fd3ed16a2b4deff3dc9 SHA1 39345fe6e0519f2e126f7f60f7d9905e3460517b SHA256 fea8d9adbb2886ea7accde1d11b6da5fb77e1847fb4054ac55bca30b5b10ce82
@@ -32,14 +36,14 @@ EBUILD gaim-2.0.0_beta5-r3.ebuild 6939 RMD160 1a87d609d4f6aa231101d8fb5ee15fe140
 MD5 8cfdd53188851b6870bdd4f060bc6df1 gaim-2.0.0_beta5-r3.ebuild 6939
 RMD160 1a87d609d4f6aa231101d8fb5ee15fe1407a49f5 gaim-2.0.0_beta5-r3.ebuild 6939
 SHA256 a1e16e6e9bb444c0780857ff5ca235935481fa85443b54be3a8b73551a3465b8 gaim-2.0.0_beta5-r3.ebuild 6939
-EBUILD gaim-2.0.0_beta6.ebuild 6995 RMD160 c19d547da17f1bbb353128c05f05c081164127d0 SHA1 87d777308765c7e727a631093d233856094f3cea SHA256 934202a2303b03ee6d384dab4e2bdcc7ee99f250ab8d55667d35a452dcaddda3
-MD5 19d2db87664d731380d86bbfd80a5bc9 gaim-2.0.0_beta6.ebuild 6995
-RMD160 c19d547da17f1bbb353128c05f05c081164127d0 gaim-2.0.0_beta6.ebuild 6995
-SHA256 934202a2303b03ee6d384dab4e2bdcc7ee99f250ab8d55667d35a452dcaddda3 gaim-2.0.0_beta6.ebuild 6995
-MISC ChangeLog 63056 RMD160 c710626c2603f714d367bc454cf4a8ec74fe5477 SHA1 f5b316dc120d0dbf04741cd96f3dbb920b54df5a SHA256 8a22b8263abed700736dd55c354eddb9b2e2515e89c7cacfc1b4ef0b8463cad2
-MD5 b2c414d434183de0a51a8dee35323094 ChangeLog 63056
-RMD160 c710626c2603f714d367bc454cf4a8ec74fe5477 ChangeLog 63056
-SHA256 8a22b8263abed700736dd55c354eddb9b2e2515e89c7cacfc1b4ef0b8463cad2 ChangeLog 63056
+EBUILD gaim-2.0.0_beta6.ebuild 6998 RMD160 19920b5a854331a20de6d3e6bf9d9ca79512b920 SHA1 6580dbee47eaa43048ff24e03a9e9adb3ae6a93b SHA256 8a81b72083c6e7ee2fc79a20aa9af61c3a98faa4b890429e28d419717f734f81
+MD5 05bbeffec2b1df6f8cc672a1e47da34a gaim-2.0.0_beta6.ebuild 6998
+RMD160 19920b5a854331a20de6d3e6bf9d9ca79512b920 gaim-2.0.0_beta6.ebuild 6998
+SHA256 8a81b72083c6e7ee2fc79a20aa9af61c3a98faa4b890429e28d419717f734f81 gaim-2.0.0_beta6.ebuild 6998
+MISC ChangeLog 63262 RMD160 f13f7bdabac21b4120a67dc9f8f50dcf4f7617af SHA1 bdd1f6fd2e449f032f2ccc31ad98e7c8fd4dcb0a SHA256 439b415018b478dec5ac928296d98fe18d916032e67084df71b5698734a763f8
+MD5 1fdb9c5e7d1fc39138fe53b1db3fcb5f ChangeLog 63262
+RMD160 f13f7bdabac21b4120a67dc9f8f50dcf4f7617af ChangeLog 63262
+SHA256 439b415018b478dec5ac928296d98fe18d916032e67084df71b5698734a763f8 ChangeLog 63262
 MISC metadata.xml 414 RMD160 fed9c6330ca8dd83726b90f10b2b627c539f8a71 SHA1 9cd1e1d6345fc95f73379f5ee554a8e70860e067 SHA256 f789243482d75a4fda274cc53b0c821f1cce89f08d856d8b8d641d4ae05c813f
 MD5 6727d140d07549b6be4b0ca9886e2514 metadata.xml 414
 RMD160 fed9c6330ca8dd83726b90f10b2b627c539f8a71 metadata.xml 414
@@ -62,7 +66,7 @@ SHA256 6648647e61579dfac661f3decdc8c8924ce23f284dcfa336afed9d3379cabff5 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFFs/gw+IXOQtHLm/gRAl3qAJ0QUE57ui33rVZsM/ND0YyA5AAsJACdGCdr
-nDDJQ2l9hIAvCCYULLkO/E8=
-=iR5m
+iD8DBQFFuqFG+IXOQtHLm/gRAngkAJ9WK9k91sRDcizgoJQAimKO0aDMUgCeOOPw
+kWAqjt/oGldLgBHA65ldMWg=
+=U8PB
 -----END PGP SIGNATURE-----

diff --git a/net-im/gaim/files/gaim-2.0.0_beta6-mono-api-change-update.patch b/net-im/gaim/files/gaim-2.0.0_beta6-mono-api-change-update.patch
new file mode 100644 (file)
index 0000000..22866ba
--- /dev/null
+++ b/net-im/gaim/files/gaim-2.0.0_beta6-mono-api-change-update.patch
@@ -0,0 +1,58 @@
+--- libgaim/plugins/mono/MPlugin.cs.orig       2007-01-19 15:23:33.000000000 -0600
++++ libgaim/plugins/mono/MPlugin.cs    2007-01-19 15:36:15.000000000 -0600
+@@ -1,7 +1,14 @@
+ using Gaim;
+ 
+-public class MPlugin : GaimPlugin
++public class MPlugin : Plugin
+ {
++      private static PluginInfo info = new PluginInfo("C# Plugin", "0.1", "Test C# Plugin", "Longer Description", "Eoin Coffey", "urled");
++
++      public MPlugin()
++              : base(info)
++      {
++      }
++
+       public void HandleSig(object[] args)
+       {
+               Buddy buddy = (Buddy)args[0];
+@@ -28,9 +35,4 @@
+       {
+               Debug.debug(Debug.INFO, "mplug", "destroying...\n");
+       }
+-      
+-      public override GaimPluginInfo Info()
+-      {
+-              return new GaimPluginInfo("C# Plugin", "0.1", "Test C# Plugin", "Longer Description", "Eoin Coffey", "urled");
+-      }
+ }
+--- libgaim/plugins/mono/GetBuddyBack.cs.orig  2007-01-19 15:36:33.000000000 -0600
++++ libgaim/plugins/mono/GetBuddyBack.cs       2007-01-19 15:37:58.000000000 -0600
+@@ -1,7 +1,14 @@
+ using Gaim;
+ 
+-public class GetBuddyBack : GaimPlugin
++public class GetBuddyBack : Plugin
+ {
++      private static PluginInfo info = new PluginInfo("C# Get Buddy Back", "0.1", "Prints when a Buddy returns", "Longer Description", "Eoin Coffey", "urled");
++
++      public GetBuddyBack()
++              : base (info)
++      {
++      }
++
+       public void HandleSig(object[] args)
+       {
+               Buddy buddy = (Buddy)args[0];
+@@ -24,9 +31,4 @@
+       public override void Destroy()
+       {
+       }
+-      
+-      public override GaimPluginInfo Info()
+-      {
+-              return new GaimPluginInfo("C# Get Buddy Back", "0.1", "Prints when a Buddy returns", "Longer Description", "Eoin Coffey", "urled");
+-      }
+ }
+
+                

diff --git a/net-im/gaim/gaim-2.0.0_beta6.ebuild b/net-im/gaim/gaim-2.0.0_beta6.ebuild
index eb02839bf4e659c3aa5542152ea5d02d97c02432..3153ddd1e2bf16a3979f2c52600bea05f3bd2671 100644 (file)
--- a/net-im/gaim/gaim-2.0.0_beta6.ebuild
+++ b/net-im/gaim/gaim-2.0.0_beta6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/gaim-2.0.0_beta6.ebuild,v 1.1 2007/01/21 23:32:32 tester Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/gaim-2.0.0_beta6.ebuild,v 1.2 2007/01/27 00:47:05 tester Exp $
 
 inherit flag-o-matic eutils toolchain-funcs multilib mono autotools perl-app gnome2
 
@@ -14,8 +14,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="avahi bonjour cjk crypt dbus debug doc eds gadu gnutls gstreamer meanwhile nls perl silc startup-notification tcl tk xscreensaver custom-cflags spell ssl qq msn gadu"
-IUSE="${IUSE} gtk sasl console groupwise"
-# removed  IUSE mono because it doesnt build
+IUSE="${IUSE} gtk sasl console groupwise mono"
 
 RDEPEND="
        bonjour? ( !avahi? ( net-misc/howl )
@@ -50,8 +49,8 @@ RDEPEND="
        gstreamer? ( >=media-libs/gstreamer-0.10 )
        sasl? ( >=dev-libs/cyrus-sasl-2 )
        doc? ( app-doc/doxygen )
-       dev-libs/libxml2"
-#      mono? ( dev-lang/mono )
+       dev-libs/libxml2
+       mono? ( dev-lang/mono )"
 
 DEPEND="$RDEPEND
        dev-util/pkgconfig
@@ -150,6 +149,9 @@ pkg_setup() {
 
 src_unpack() {
        gnome2_src_unpack
+
+       cd ${S}
+       epatch ${FILESDIR}/${P}-mono-api-change-update.patch
 }
 
 src_compile() {
@@ -235,10 +237,9 @@ src_compile() {
                $(use_enable gstreamer) \
                $(use_enable sasl cyrus-sasl ) \
                $(use_enable doc doxygen) \
-               --disable-mono \
+               $(use_enable mono) \
                "--with-dynamic-prpls=${DYNAMIC_PRPLS}" \
                ${myconf} || die "Configuration failed"
-#              $(use_enable mono) \
 
        # This is a tempory fix until Makefile is fixed!!
        if use mono; then