Fix underlinking failure (bug #497116, thanks to d_dart).

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xCF0ADD61

4 files changed, 43 insertions, 13 deletions

diff --git a/net-misc/vinagre/ChangeLog b/net-misc/vinagre/ChangeLog
index 9004e13e92dd..54ce7d872242 100644
--- a/net-misc/vinagre/ChangeLog
+++ b/net-misc/vinagre/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/vinagre
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vinagre/ChangeLog,v 1.96 2013/12/24 17:35:43 pacho Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vinagre/ChangeLog,v 1.97 2014/01/05 17:27:53 tetromino Exp $
+
+  05 Jan 2014; Alexandre Rostovtsev <tetromino@gentoo.org>
+  vinagre-2.30.3.ebuild, +files/vinagre-2.30.3-gmodule.patch:
+  Fix underlinking failure (bug #497116, thanks to d_dart).
 
 *vinagre-3.10.2 (24 Dec 2013)
 
diff --git a/net-misc/vinagre/Manifest b/net-misc/vinagre/Manifest
index daea58aef8a0..d2409db481b1 100644
--- a/net-misc/vinagre/Manifest
+++ b/net-misc/vinagre/Manifest
@@ -1,18 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX vinagre-2.30.3-gmodule.patch 396 SHA256 3c52b535e4d143b6c7b44b457b10175ffdff62555a259c1e4f132c5cc5b014ba SHA512 d57a0e0237d0cc632e688d2609a405ab084a36fa78ba9c5dfd088c215e79ac0a146b92763e617e3effda27c67e3dfd42aa7a47cbc4b18f7843270d97b690fc4d WHIRLPOOL 7de0085159a6878c684e30a6c43db009b194ad0b1986ff86dc0956198946c3810965f0632ce2ca81ec6edaea0b978a32123a9e12821234067334d3cb39642893
 DIST vinagre-2.30.3.tar.bz2 2447388 SHA256 28bfc70a816bc3f1e71ada82e260c39ee2dac693cb7859323b06c8b1452a39f4 SHA512 3363d55f013d1477fd3270f701f717df5ffdf187d2718ab577b3acead5950bdc566bc714fd689a63c44c13160e4d0fdfc7be89b495859d721b8b3c6121443c5d WHIRLPOOL e79aa98f9252b2b50fd77f0debd622d716a4b81addc75d662ea224f876e4e718c20bbbff2c9569a16d8efb563dbe8720430907067eb0cf006261def0397f215b
 DIST vinagre-3.10.2.tar.xz 1075560 SHA256 72907079da70dcda63870a790db956bebee241a920daa99c4a80766c177ead87 SHA512 386d64d4711efbf03add09062a865da6b33a8a805e115f7085c35e75ebd0e92d37a12335a27dea1eed053acff0fa5fcfd9b2af4b36a93432fa7bd8ffd2bfb364 WHIRLPOOL 75ac5529138f860bb4af0e078aeea61d22c5c9192ba5cf698b3fc0bf61722b21a4e5d8a23dc1c1dda39aeefdaf59bd30014ed0148ee41ad2febb8748b6e454f9
 DIST vinagre-3.8.3.tar.xz 1062796 SHA256 0d862429307d28333f17afa40cf81f6006903e1aa134a8bc430079a9db40b1c6 SHA512 1674a3e5a1a7bb2f08c27c32051c6e651802e217b475218cf001f0dba547b736b81c906f17e36be9313cdeaae6177501f0aa2835f766f11d07bd61d8ab81523a WHIRLPOOL 291e14611490cd1fa699f2b1d29dc790bb7f31d7d8c4fae5e79cc128f098dad49a54c804c07f386f27b147c5b9af90a7d436bcc3adff00d23010c0896ce454b5
-EBUILD vinagre-2.30.3.ebuild 1672 SHA256 85d2f2c50609bc591cc56b62264428e3f284c0d1dccf5037bfa92f423f747b1c SHA512 b37c17cade8ffcc8358c1b755203701054d00f3bc197cc4c10b2f8ef185ad2bd2c8172e144af4d3604e34422255a2e85c857cc241627db8f23f90dea99dd7508 WHIRLPOOL 860ffcd26faf0e33ae2e790b25b137c2f45c948fb149c2f942666f3b12124b16efedfb830505a5874c0a8ee161b6ed1181324acb6b9e6371876f4a459f2f2fe5
+EBUILD vinagre-2.30.3.ebuild 1858 SHA256 80e617428723c8b545630367d86e65760578a5f2ad9317beaceec6e1209702fb SHA512 38147f893ecb869f00576e51789c29422441e557ba5a2ca738f1cd011d559a07c99e5ae83b69e5d085766f1b6296d61d29e7caea6c2fcb1f8d5ba3cde94091b2 WHIRLPOOL 58deb1c11d9fc474f49bd9d61e69d46ee0c8379939bed7d1808fa99554da0e88c04e36f57f789e82d548c6deff1f5b9bfc3fdf63bcc87fd406856fc448458897
 EBUILD vinagre-3.10.2.ebuild 1469 SHA256 4f40b85df806cf882f404dec93537ba54d8a0822aa33576ad895f130fa794ec6 SHA512 82e5c0f2d1b85f6e4ae27374575047e290591ffcb9733e59f5af67159ba09650106fe4b49a0502a31744e3848084fde654588c3fb75a81fc77d9e6ac306d1ed4 WHIRLPOOL 2735a9d4071a9791e328899f42ed01374da483d5ecbe33e04c7383db14242b53f358060a4d16731004c089374405cd27b015c6ca7716470b67695fff64345b3b
 EBUILD vinagre-3.8.3.ebuild 1615 SHA256 46206a070bd5f29be99164e7d93f9f75b455b5e1437b16a9e7379e9daa64a6be SHA512 7ac58af8e83a29becb0d28e2e5f6be01d58ae59a0a179d996c7c00097c29eeef01e1a85004454ccc8d263a2bbd0fd230a20d3070b33d8197fc4b1ca192968d1f WHIRLPOOL 6bfa084200d2f37ede1d31dfae17ffbf27e55412b0cff72f4f314d60f16c2d59e74867fc9de02b6246e9e4d4fc3a681ae79cd094e6f387be849181431514912f
-MISC ChangeLog 13299 SHA256 1d963788feb4fc7c519bd486348f01ca8941857315b6b6cd7b53dc7bec805aa5 SHA512 b9e7246cd00f2c1a2173b8d0693b6c64e8892c8b20be8d1573aa837770613496d5784c0b2469b661a3a86350b0e0a4894d55818310a821a118d080b183e23884 WHIRLPOOL 453ee41890c204dea7bd282cf555ceb3cf86ad9269bdb466d0e975152e4a69b839cf4ac6e240a87c1617f58f58932a0ee86389b46d557e85a235d8dad8023605
+MISC ChangeLog 13485 SHA256 7ce1357a6f65f5dad94c348bc7697f3e51ae027b0c83b5362a829d69d87ebfb9 SHA512 7c4ab819478cf4866608f6d666cdd841c1c3a97e95888c420bd59984b8fe307ad274f7bb6c096c24ed52d5b8d397214a15f3c1548def2c273791063154bf87fd WHIRLPOOL 3cd11357f07cb2f62726e7f4eaa067f75be8d5fdb77954f58b0535d8f28812047168cd8a9cd3c7c95783faf352ed90bbb3b61d5057cc2c6efd1b31f0c07c2a22
 MISC metadata.xml 633 SHA256 a6ad796117ba8acfa7a4751bfab866713d1b5861eba7eef0a5ed239ebc236363 SHA512 1e5eb8f97a57f6d19aaacc15e468bb0388d7bd0c331efa65cff2b843ef61f4a5971c89b0c2745f86d59d27a454211a2e38744f976d0bb2699298506627922ce3 WHIRLPOOL c6deceea983d4d2b215846ff97fd7aaac03e1d2fd8f51c7ce006236baea39fe5aa2b4834ea7be81cb05262a93eca33dd79ed8d98cac1048994b47130060b46d3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlK5xfEACgkQCaWpQKGI+9To4wCbBFIiNWn9p/CpDGyc3gURrYIf
-FFMAniDcrjBpk7A/L/gme3COEIczBNjZ
-=WXyK
+iQEcBAEBCAAGBQJSyZYbAAoJEJ0WA1zPCt1hHgUH/0whWuRR++aSxum1KdmYtxTl
+UMv4RLGDzmfn+oO2ok6meGOKRL+3VAshOoLOpV86lW4oGT8cGOXhHHY7WPYImVy1
+YA/CpIxAGipiasecRNvquDc8Y/iIjpiqEanlcQNsDAKTa7D9rmuaoXiSDPcpCqVU
+B0eJeVagTKFBVuPAbQGhuZSSOYooitURRI9LRFFhtWEN65xAhQRskO882qdK1bZr
+BeY5KAIBXpykEQ34EBBVjJkSezoltOSMBX/bGNaqvyBQwQgunK8/hZGqy4fhIKl2
+AVY71zSBEjvFzk4eiTAAEoAUK3JQXNSdl6Oig+Y59N9bC5ls1Cw1/erZZRRq6UU=
+=FVi9
 -----END PGP SIGNATURE-----
diff --git a/net-misc/vinagre/files/vinagre-2.30.3-gmodule.patch b/net-misc/vinagre/files/vinagre-2.30.3-gmodule.patch
new file mode 100644
index 000000000000..8b8837ac0de8
--- /dev/null
+++ b/net-misc/vinagre/files/vinagre-2.30.3-gmodule.patch
@@ -0,0 +1,12 @@
+diff --git a/configure.ac b/configure.ac
+index cb10398..7af7895 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -104,6 +104,7 @@ PKG_CHECK_MODULES(VINAGRE, \
+   glib-2.0 >= $GLIB_REQUIRED \
+   gio-2.0 >= $GLIB_REQUIRED \
+   gio-unix-2.0 >= $GLIB_REQUIRED \
++  gmodule-2.0 >= $GLIB_REQUIRED \
+   gtk+-2.0 >= $GTK_REQUIRED \ 
+   gconf-2.0 >= $GCONF_REQUIRED \
+   gthread-2.0 >= $GTHREAD_REQUIRED \
diff --git a/net-misc/vinagre/vinagre-2.30.3.ebuild b/net-misc/vinagre/vinagre-2.30.3.ebuild
index f250fbec1dca..fcc7a4a5ec27 100644
--- a/net-misc/vinagre/vinagre-2.30.3.ebuild
+++ b/net-misc/vinagre/vinagre-2.30.3.ebuild
@@ -1,11 +1,13 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vinagre/vinagre-2.30.3.ebuild,v 1.11 2013/01/07 13:44:54 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vinagre/vinagre-2.30.3.ebuild,v 1.12 2014/01/05 17:27:53 tetromino Exp $
 
-EAPI="2"
+EAPI="4"
 GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+GNOME_TARBALL_SUFFIX="bz2"
 
-inherit gnome2
+inherit autotools gnome2
 
 DESCRIPTION="VNC client for the GNOME desktop"
 HOMEPAGE="http://www.gnome.org/projects/vinagre/"
@@ -52,11 +54,18 @@ pkg_setup() {
 		$(use_enable telepathy)"
 }
 
+src_prepare() {
+	# underlinking failure, bug #497116
+	epatch "${FILESDIR}/${P}-gmodule.patch"
+
+	rm missing || die # old missing script causes autoreconf warnings
+	eautoreconf
+	gnome2_src_prepare
+}
+
 src_install() {
 	gnome2_src_install
 
-	find "${D}" -name "*.la" -delete || die "remove of la files failed"
-
 	# Remove it's own installation of DOCS that go to $PN instead of $P and aren't ecompressed
 	rm -rf "${D}"/usr/share/doc/vinagre
 }