Fix bug #312163

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

diff --git a/dev-dotnet/gnome-desktop-sharp/ChangeLog b/dev-dotnet/gnome-desktop-sharp/ChangeLog
index 6f480aef33738ac51fbbfda8d3bc66be49476ff4..12caf97b724b9fce5a24f6e264fd93385b4575b5 100644 (file)
--- a/dev-dotnet/gnome-desktop-sharp/ChangeLog
+++ b/dev-dotnet/gnome-desktop-sharp/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-dotnet/gnome-desktop-sharp
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/gnome-desktop-sharp/ChangeLog,v 1.10 2010/05/22 16:23:14 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/gnome-desktop-sharp/ChangeLog,v 1.11 2010/06/17 18:14:08 pacho Exp $
+
+*gnome-desktop-sharp-2.26.0-r1 (17 Jun 2010)
+
+  17 Jun 2010; Pacho Ramos <pacho@gentoo.org>
+  +gnome-desktop-sharp-2.26.0-r1.ebuild,
+  +files/gnome-desktop-sharp-2.26.0-soname.patch:
+  Fix libgnome-desktop soname (bug #312163 by Diego E. 'Flameeyes' Pettenò)
 
   22 May 2010; Pacho Ramos <pacho@gentoo.org>
   gnome-desktop-sharp-2.26.0.ebuild:

diff --git a/dev-dotnet/gnome-desktop-sharp/Manifest b/dev-dotnet/gnome-desktop-sharp/Manifest
index 827db2c69fc880cc580dea71e7428f99db4cfc27..b5305e24c15ff4b179ece7a4eb343dd66eeeeb78 100644 (file)
--- a/dev-dotnet/gnome-desktop-sharp/Manifest
+++ b/dev-dotnet/gnome-desktop-sharp/Manifest
@@ -1,16 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX gnome-desktop-sharp-2.26.0-soname.patch 718 RMD160 b2033412190c1401e5ce8e1fd0d23356f784f76b SHA1 969a6ce5fbb87cdaefd7fdb37a8637adb7b5f5c3 SHA256 db638f19cb33ad9ac8a4f8ddd0bfb68c26df2c4b4350a1e0e80ba492a237cefe
 DIST gnome-desktop-sharp-2.24.0.tar.bz2 309256 RMD160 f1e3a384f8be677cc0480c985298853b2b0fd92f SHA1 bfc56b97d9fb19dd2b69c3b509d0b7bf95365c10 SHA256 fc66b3663b61b38c4d53cdee7ea6ace713feba333e022532e9a6933a7a1fef1c
 DIST gnome-desktop-sharp-2.26.0.tar.bz2 313134 RMD160 3537835ae11ee5cf9cf4d9dde17eed1537496e81 SHA1 3c98aca331def4bf0701df80e809c36e183eb135 SHA256 577148d0937d91997341e8b2d2e8aadb0a5f1d898ca9bf579b114097c509aa67
 EBUILD gnome-desktop-sharp-2.24.0-r10.ebuild 415 RMD160 7a00cbe88c89016a64da95e08f18787a56d37e64 SHA1 44f512520a687a68b437e8e5f54a14c625bef443 SHA256 ff6db8a3187688f2ac1332a0460f2756c41afd5cb3d507571cd0048874d3593d
+EBUILD gnome-desktop-sharp-2.26.0-r1.ebuild 555 RMD160 47be8f8ec8376be5eb9241108a9dbdf34107ddb1 SHA1 8f266598e24550f82fe6580d2366dcf508796d4c SHA256 df000240e9cd73f9a6db8ba7e3c01fccac661135da64661e86b8b517d0250469
 EBUILD gnome-desktop-sharp-2.26.0.ebuild 406 RMD160 fd4cd42fab840b57c9f5d0d9ec599c54a5c853ea SHA1 01a01a4fa25162ddaf92bd15baf701990cbd2b13 SHA256 b2d14d5c455b6af0cb0db73645bbc253ba26e19c7757164f928672d319345985
-MISC ChangeLog 1911 RMD160 8fadc833dd5d72a077b630ade5ec6fc180beb11f SHA1 c2875bc4dc0cfc37b328266318e0a1fe1a017536 SHA256 5e1d2eee3d76fca6615cd7418cfaa9dca2da5878c0c9945baf76dc9883fa2c7f
+MISC ChangeLog 2172 RMD160 acde1e9e7d04b4a4203b3b1c5bdf03d9c87a0dea SHA1 f687158bc3fdece3710bea619e9139c06a6dd1d7 SHA256 cd8d28a233779f226dbf560cad487908a5bfcb0e82e4ef26fae128fffcfb3017
 MISC metadata.xml 160 RMD160 cc10b170ad63a746d8bdfbe5bf1bd9f7065922b8 SHA1 49eaf4246f7502850064d3806cce65d3a404ce1b SHA256 1bc3e313a948415fff0dfa63a5610943327146bfe16bfeca603379bf9706a687
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
+Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkv4BPgACgkQCaWpQKGI+9T1OwCggWZfV2Im7lMW93gKGd4d3PWF
-6CoAn2HFp+6hYKb4NY3zpyb/4Iwwjt+e
-=L5wZ
+iEYEARECAAYFAkwaZfYACgkQCaWpQKGI+9RoMQCghENwg7bCtyRnk0lBQSJRZl0U
+uywAnj8T0zCK1pCPS42ApkqFwDqtY+oB
+=CeO7
 -----END PGP SIGNATURE-----

diff --git a/dev-dotnet/gnome-desktop-sharp/files/gnome-desktop-sharp-2.26.0-soname.patch b/dev-dotnet/gnome-desktop-sharp/files/gnome-desktop-sharp-2.26.0-soname.patch
new file mode 100644 (file)
index 0000000..3f0ea49
--- /dev/null
+++ b/dev-dotnet/gnome-desktop-sharp/files/gnome-desktop-sharp-2.26.0-soname.patch
@@ -0,0 +1,9 @@
+--- gnome-desktop-sharp-2.26.0/gnomedesktop/gnomedesktop-sharp.dll.config.in.false     2009-02-23 19:01:27.000000000 +0100
++++ gnome-desktop-sharp-2.26.0/gnomedesktop/gnomedesktop-sharp.dll.config.in   2010-02-11 15:59:36.000000000 +0100
+@@ -3,5 +3,5 @@
+   <dllmap dll="libgobject-2.0-0.dll" target="libgobject-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
+   <dllmap dll="libgthread-2.0-0.dll" target="libgthread-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
+   <dllmap dll="libgtk-win32-2.0-0.dll" target="libgtk-x11-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
+-  <dllmap dll="gnome-desktop-2" target="libgnome-desktop-2@LIB_PREFIX@.11@LIB_SUFFIX@"/>
++  <dllmap dll="gnome-desktop-2" target="libgnome-desktop-2@LIB_PREFIX@.17@LIB_SUFFIX@"/>
+ </configuration>

diff --git a/dev-dotnet/gnome-desktop-sharp/gnome-desktop-sharp-2.26.0-r1.ebuild b/dev-dotnet/gnome-desktop-sharp/gnome-desktop-sharp-2.26.0-r1.ebuild
new file mode 100644 (file)
index 0000000..f8da5ea
--- /dev/null
+++ b/dev-dotnet/gnome-desktop-sharp/gnome-desktop-sharp-2.26.0-r1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/gnome-desktop-sharp/gnome-desktop-sharp-2.26.0-r1.ebuild,v 1.1 2010/06/17 18:14:08 pacho Exp $
+
+EAPI=2
+
+GTK_SHARP_REQUIRED_VERSION="2.12"
+GTK_SHARP_MODULE_DIR="gnomedesktop"
+
+inherit gtk-sharp-module eutils
+
+SLOT="2"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RESTRICT="test"
+
+src_prepare() {
+       # Update soname to fit with gnome-desktop-2.30
+       epatch "${FILESDIR}/${P}-soname.patch"
+       gtk-sharp-module_src_prepare
+}