From: Pacho Ramos <pacho@gentoo.org>
Date: Mon, 5 Jan 2015 11:03:12 +0000 (+0000)
Subject: Reorder the patch applying and add a comment for it
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=7d06ed2234cd7215bd3e95e0c86482bf5faddfa1;p=gentoo.git

Reorder the patch applying and add a comment for it

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4
---

diff --git a/net-misc/vinagre/ChangeLog b/net-misc/vinagre/ChangeLog
index c15bff9d32f8..d1ba3ef5ba79 100644
--- a/net-misc/vinagre/ChangeLog
+++ b/net-misc/vinagre/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-misc/vinagre
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vinagre/ChangeLog,v 1.111 2015/01/04 13:16:53 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vinagre/ChangeLog,v 1.112 2015/01/05 11:03:11 pacho Exp $
+
+  05 Jan 2015; Pacho Ramos <pacho@gentoo.org> vinagre-3.14.3.ebuild:
+  Reorder the patch applying and add a comment for it
 
   04 Jan 2015; Justin Lecher <jlec@gentoo.org> vinagre-3.14.3.ebuild,
   +files/vinagre-3.14.3-freerdp.patch, metadata.xml:
diff --git a/net-misc/vinagre/Manifest b/net-misc/vinagre/Manifest
index c41251a59448..4e14e6847346 100644
--- a/net-misc/vinagre/Manifest
+++ b/net-misc/vinagre/Manifest
@@ -1,29 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX vinagre-3.14.3-freerdp.patch 1340 SHA256 13b0eb25610417ba1bc8538556eff7a7125730d82fa3e9758dd0c3db6e97b47f SHA512 675f9cd4d65131de054c28b7d65aa14fcaaba79e422456e3bd3a3cd2756d536219d5ec3ef7f03993fce155c17c4fee99d43d3ede5e3e8e013e4b24cc2c4bf576 WHIRLPOOL c65b145133f308489a9bc0650fa9eb3c37f297c19dbbf102be50942d334b275105a009c63f414391db4d25e542f27d649efeb8a7362ae960a23997411d5b75c0
 DIST vinagre-3.12.2.tar.xz 1088128 SHA256 d1959bfa7b82aad79b96ed92d11f37209a0f5cccdb025c91574a9a85381d82fc SHA512 8403d31b088b602ef58e8f828ec6ef5abec2c65fb6cf98cd1b42d74e085909257a4d86652771419f1dcd72bc99b2877a07840b5211694c690b6cb81b8e6f9704 WHIRLPOOL 966f67a54ca98e3cffa1167de903c810fe19e5d63a3b13e47128b0e3fe69d16f46bb6bdbd99910522d9accb04c3498aea7d477fca173257280226bcdcd1eaedb
 DIST vinagre-3.14.3.tar.xz 1101544 SHA256 f82d8c66684a00a79422724b0e1efad28ba35ba21a92dc7dcb867ed7b64659f0 SHA512 80d87d3aab0e11c2990e6f8f369095e7587a3d2def0afe1e0be2cae31e376bc40c902180b92d84c196ded8c1973dca8421dd5d66ecda5d6d1e41e3fe0aa02ccd WHIRLPOOL 9a38f134b27e1064b186df2c53daacc268e719458fc13fab81a7013972966c107d30c9041082578c4fd0ca037b4285bf9df69ed0f2b900f77ec54fe633539c04
 EBUILD vinagre-3.12.2.ebuild 1497 SHA256 bf1493e56495a40020a9f988cda63ea926221272d711a99dddd6f45c0798d6ef SHA512 2b3ab98108c78574a42b14dc31d3aa05121589afa764cf9d500a9a4d12f8c22e3f6d6226d69e6b7b4aaa10fba733cee7377d06fb8064d6096ed7eb3c7f9e9f94 WHIRLPOOL b92ebb744c8ff346b6e55b9d897bdfb02833f0eee1959c921d8a29efabd02337517be28b2f733db0c4d153bb7451c08f7211c6536477e88a23d4baa554513b1c
-EBUILD vinagre-3.14.3.ebuild 1555 SHA256 bd9850ef4d34ce74fa2d18a06f870640ca3e2f774daf16df6ce8efc922f4f3fa SHA512 b9178cd7cdb77be3c10c99dfa9a806789cfdec603e93b40f61abe7f95b492313e6893550ea47963f4fdb416b2216d31d6d83412246d79b0d10cb94360d932579 WHIRLPOOL d308cb074e0f2648fafadc7aadce7cb99f355cc26bf4ee536bd3d59db7511a66eb32347518f1e32946102a6f129dca4b1e7f85a9ffd6beb51e707f42ead2971e
-MISC ChangeLog 15486 SHA256 b727baec6de26065418ffc0e8895eb351dbeb3ace91c2e572d423ddacd59f227 SHA512 d3c9edcc22792a615d419cab093538eba99632838ef445a9e458a796657b08138f0cbdf0d5ddac4a55f57e4124cdf4fb9fbe944c7abebb1bfe21a242a0de317d WHIRLPOOL 1b90ac07d4082a43c5154ab5b47bbbaa8d07cbcf7496b480e228450a1a792257b565ce357b97391c0c54433c0c034bfbf339f7da679bca6daad8fd253822f1d6
+EBUILD vinagre-3.14.3.ebuild 1598 SHA256 cb072b744861563542723a15ce5005218cd7d17be66a0977f556519d09f634a3 SHA512 05a340c192c68d88df673d6e421dab7ba51b5ba556dc84ee2fda81cdfce0b05abfe18b4fea0df539696097a3078bac221522a502a339dd423a8ba56e4a019eac WHIRLPOOL 99e809d94aa7719f5a12ecde8a9551f5e263a71e9bbdca4f34be3f3dfb3c9738b98178d9a17abdebd4cf93e16b2f737a01c514812990e128727dd8e34c8f6a71
+MISC ChangeLog 15611 SHA256 f62ac6dad0570bdd2b8aadf1e321f34a90b8f60d86d0d481a9428767925ec598 SHA512 c612497df0ca2d993527c36edf52f609603c8d3bf2995d966ee7fc609eda254b71f44b8d4fff5c35ba841c7a97cb0a327d90bf8c370a473c83a59ce5e63bcb6d WHIRLPOOL 6421e322dfbcb3c984d2f3ec44ec9dd37f2000670fec84a844b9af79431bca5fa6714a32ffe0e27e918a1e8014f9be2cc1a9a82ec1413ec8ce38a78b887cd20f
 MISC metadata.xml 552 SHA256 1f37c243a68e72fd200b1bdd3c6e3068c805923ed142ca4ba7b2b3bf79afc1cf SHA512 823a63d72cba6eec8652ecf3dba2041654a9404160f8f83c9fa937ecb090cb4728b66fbf976df06e3a026fb07bfb1d744374b5ad84cb043aa87eb9b8d2858726 WHIRLPOOL d2584cb01c5a2d4412283f28093c07c4a72b5112d75c9c48611c1ed69239d702ac2244530afc68a1761e390c49aa21bcf9fb2a5af6a4ebab0d4d738e24d060b4
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2
 
-iQJ8BAEBCgBmBQJUqT38XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
-OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirqcgP/3zRhkzy7AbXrW7VZoKIZlWH
-hQf53O9kQA5Lp+kJPflHq4yTMR7DeqT/+GfdXbcBqO9iDiJ5Vegqsfsd2Z5oR64b
-dKTOemhdgXptvmTfu33QImYHN/zhPc6Z6mKrJNt0jWhsk3p+HC5i9elD6TzHHzDg
-fbP9Z5bSAtW9IeDw75wTA4SFaM1wAgBRhHblz9hY/wNFRzEWRylDD2keVGl9eCOd
-FNe9G/c/l/W8adnWJY1ODJajCS7uFmbJmjJjY5J5wZmE7lHtpe+aysBDMFzO5foX
-nqmslm2TVVfyPkw861HyQyg6nE711a2dKYRyYB+1blsRPhit78ZZKF5VWGZoK92k
-Q9J5V1Be74kbakzRPP7Qaq5eOTb3LHIK2jYtlV4YPz/KAgHTZC3YKofSCGd5x3CL
-YTDNa+RkURGWuM0jmd1TwkHMcAynxvTaVG9XrFLIYD+y/jF9xBfV8rPBUfn2GiTS
-NjxbaBX+2N6+LqrI50l2WCFC0ZqLACl7LV0d73hYGzjegm7ud4t4yatyUyuJzaBR
-7aRIY1V3VlQw9UpACkaHI7tNiLXIyhggvfm70NMl1K787UjcvFyFrpZI1UJ8XTj/
-RPxLXoVTGLhtS75YQuXWinhZnJyP29j0zmqmtfci/QpptRF5C836QLOqz3RLn6mt
-kA3o5xLzwtZZUS5V4tCV
-=0+1D
+iEYEAREIAAYFAlSqb3AACgkQCaWpQKGI+9TOOQCfRr2e/gboMORkjEIQuyU0+gwK
+G/IAn1Z1kOyTTVcNrIVAPsGtKgRTeYLO
+=gd4o
 -----END PGP SIGNATURE-----
diff --git a/net-misc/vinagre/vinagre-3.14.3.ebuild b/net-misc/vinagre/vinagre-3.14.3.ebuild
index a880c93a95e8..77524f5ccbf0 100644
--- a/net-misc/vinagre/vinagre-3.14.3.ebuild
+++ b/net-misc/vinagre/vinagre-3.14.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vinagre/vinagre-3.14.3.ebuild,v 1.2 2015/01/04 13:16:53 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vinagre/vinagre-3.14.3.ebuild,v 1.3 2015/01/05 11:03:11 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -47,10 +47,10 @@ DEPEND="${RDEPEND}
 	$(vala_depend)
 "
 
-PATCHES=( "${FILESDIR}"/${P}-freerdp.patch )
-
 src_prepare() {
-	epatch "${PATCHES[@]}"
+	# Fix RDP initialization with recent FreeRDP (from 'master')
+	epatch "${FILESDIR}"/${PN}-3.14.3-freerdp.patch
+
 	vala_src_prepare
 	gnome2_src_prepare
 }