Fix finding csync when we are not using the internal one. Resolves bug#438290.

Package-Manager: portage-2.2.0_alpha138/cvs/Linux x86_64
Manifest-Sign-Key: 0x8EEE3BE8

3 files changed, 25 insertions, 17 deletions

diff --git a/net-misc/mirall/ChangeLog b/net-misc/mirall/ChangeLog
index 8a3654bee0e7..b1b44105fb78 100644
--- a/net-misc/mirall/ChangeLog
+++ b/net-misc/mirall/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-misc/mirall
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/mirall/ChangeLog,v 1.6 2012/10/13 12:58:33 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/mirall/ChangeLog,v 1.7 2012/10/15 08:19:54 scarabeus Exp $
+
+  15 Oct 2012; Tomáš Chvátal <scarabeus@gentoo.org> mirall-1.1.0.ebuild:
+  Fix finding csync when we are not using the internal one. Resolves bug#438290.
 
 *mirall-1.1.0 (13 Oct 2012)
 
diff --git a/net-misc/mirall/Manifest b/net-misc/mirall/Manifest
index d85644ed3981..a2c59c9ffcf8 100644
--- a/net-misc/mirall/Manifest
+++ b/net-misc/mirall/Manifest
@@ -4,23 +4,23 @@ Hash: SHA256
 DIST mirall-1.0.5.tar.bz2 789362 SHA256 07880de327f7f377c19521064bda466bbc26cad6c73848f7ce369a22c059ba41 SHA512 926b77a3c51b5f72c874853ee742aaea6f7debb0df48a614d04ba1e7eb016261a80abc8d4e59f67da6a96533bbfe5a0352bfd5f5f0fe67ff60c6202438a70936 WHIRLPOOL d9f53e45c04bc0b721a4a20a063a43efc9cc943f67b94d0cd29621c523296fb40850d3f620fdc43a50e4521b4cce7e770ffdd9982b4f2384c8123ada4b8051d6
 DIST mirall-1.1.0.tar.bz2 833165 SHA256 69d2f3ff300303b5055b08713a8104cbd6afaf80fc82ccdcf2260097cf5166a3 SHA512 7fedd190244c90f5572aa48d4e4c0161e659b8d35d60ab9bd10c6f56c0b1908d2217ca0ac1e742c2e48209b070746887052a976a580066358d0574cc4cbc4a08 WHIRLPOOL a213e82008c893704eb9ca6f920f3d36ad4fae48265758749f092d83d8a3fb627c0e4af7040f47f17eb944a8c3c85c5e76bb6d77ef842d53d33c85b7ac8bc32e
 EBUILD mirall-1.0.5.ebuild 596 SHA256 412e03e40b26a8c3d6666d969247f2e3bc086fb277fe528dfeddea522cc35c9a SHA512 9f6fd033431de9ecccd86dfff99d6c05ae262ade4a57e70302bcd349632adfbd9a88a401d2b23519f5ba339a32e3f0844b92c980453fa77a76085c10ca1a8d80 WHIRLPOOL 9e9c5e8de7afa806d6418dca28d244bfcdce0b21493d85b8c96be36ce5faa47f2b35cd6c443bc9cfb30b7a026602b528968e4442ff201167944892c5153b1008
-EBUILD mirall-1.1.0.ebuild 605 SHA256 a15b3b287cdc3e00f43df0046564c2e9fc564718de5ac9d8b972cc34de4155da SHA512 e863c032201facfb69300107b20134277f1704949067f7ccfd224d9644e892640a28a394a354a9d3fb6180edacdb755b3c695336534f772aa145c2b682abcec9 WHIRLPOOL 327565c766dd845069e7cf2c64e2e15cd228adcec2c00177e469f724380a7982124ce16837c446b613207129696e8b562fde4c6006dbcd9d9a66098408234c2e
-MISC ChangeLog 919 SHA256 6d0b6dbf647e967ee1684f28589ecc25390d96154d7ce44abf19e449ec04d86c SHA512 3acc7267c6925c10839aa8190b40b142012ac9241f34c20bc0bddd7a49d9f3ea85b4f6adbdb7ed05b1962085bb55f74750f868af01d306771c4cb658f4b59d9f WHIRLPOOL c83cd301e647061b5fb0d5bbbdfa7d9da08b64404633793c0f2a4c2ee1aef6a24445a78e87ee246a7215feb25fc963ea03ecb99ac58bc302227c27efb264a585
+EBUILD mirall-1.1.0.ebuild 703 SHA256 013d88d5765aa5b9d7eccdb5cea7e01543dfa0122c9084b09d79b2565441fcc1 SHA512 38d54e5d8072aac7acebaf5048ec8029baeaf5933eef9ffa40ab4a70c99f195d59af3c2a17191cc08c316b97d630ff43cb2d0ed1ded3b65c1e1456e8fff24a0b WHIRLPOOL 4f5ad41f38c734cef385b012b7776bb2886339d6d80c9745ef86c5ac27b9d9e2d6972d4d014b387b29fd6842107895b3ca1cd590e052b4bb7f1eb9cc51c55989
+MISC ChangeLog 1077 SHA256 778b59c84dc25dd5dfee437780e2f0a24d3a82156bd6ff5cdff16b56616ea5c7 SHA512 a8711d969304e78005d75e1aea9f2bde50c2a7e549197ec25d93d6ecf82525550456c8deba294bbf1f9aabe656a239b353625bd54a2da943fd4da09c1cc138a9 WHIRLPOOL 1e3894e254de0f6814c9bd4fed1b07d5f321e032084d43b8dde49ceacf5e8387489453ead62a5bbb9990f4004289399199d9eb6c0ca8e3e4eca5bc8c06b07609
 MISC metadata.xml 157 SHA256 01f6fa4357ce08e8b0f7900a51fa78c7f060fefc7c7da98acaec1e283dd59892 SHA512 657d6b0a31ceb7ac10bedfd5cbd634d4ff47938bd2f321203f0233e53686f7e0fd460e81f82793804895c7e97cfa472c1ca44b93314574262ee8cc5745a3efd0 WHIRLPOOL 785331909f1834cdd5d797ad484ea0e35c3e44c79a8a7517a6fb5de926acd181abd57910c8d960fb2e11ea38ddea336bca309af16fcc2df68fe4b602bca120b3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQeWWJAAoJEOSiRoyO7jvovRcQAJkysHiGD9IZPrhG7B0x2Sx6
-DQEYsGMa0KCV8bbEVwSskFB3bhI/0zag/UKiClfnD6zEhQVAvzQTIudX+Coe0KY6
-cpMLgCbxSGtK99Hqcg04iv9tJ8coNtYMSBwCuk/bVxS13D/3nv0x4zZJo4gXFzET
-kuEvtJGDEzmDbZ+lhemNvC7e57Zf1IRDM1F5c5q66iT2+SsSlc7sR5zmmTdUwaNw
-WMifldnTjzlTQ6/pETozIBqU0v5hnl+rwwcD+sFOtrY3LQ5+kxebhtYS52ZM2ZZT
-nyomyW10rZvelXX30KDjNQslyITtOdgNcXir32ANkXx4SoTzR2lUkaVf7t1eoM+8
-hJwOFRAGdh4QcT8bkMa7pzrVMOBog0vnBdr1r3gS0OlUQeNtiYdUdIG6Xrgy5esu
-GnXAEVH+vzCOQzOFaXo5m1wwP/5XTfy2mociD3HCswrwaPtwQ2ufrsw5xCYbyup6
-+5aQ8NyDcHmV+u1/gWeC3k+NPW54vwxwltBCF6NG2A4E4KQpEQiKB6pwTSjGLC+5
-uQkLKXdbiJQA6FDGEGPFvae16c1irGXwZMStIeM1ZDE3Zfd/hK2JIboNxQoYQn1s
-2lvpL0iBqvVGjir4J167NMAU9nJmHfuyODR8HtzGpTJytrsNzLdvRZ+CE8A8Am/P
-OWTv8mXACM4PvSGMuy/s
-=X2wl
+iQIcBAEBCAAGBQJQe8crAAoJEOSiRoyO7jvojnoP/A+Pe8tJn53NHjZCXWooFsPx
+z4K2BAKMPsMs0qVXBzIisYsz9GvG1VqSDu6L3gS53xP5FJEARqCB0wF2zSyEGm4Z
+Z4D304GBfMCp2IRoavJtMKfIOPMkAonqxH+Qwd0c1Un927ZsxhR+u/qbJfb0gE3z
+05dFpluoS13MwXsdafcHnUbrCKVwpavg6kIzvxIaiG4dIicJfVjPWbKMti4aCBNj
+F1QB5vOpH8LFhMl7+HPT6hNq2dzoF4UTaXOp008oPdxDvZOxVHTeDFDw1mDSDAb0
+U8FiXxueO58AQ5/lX3PXdAuDFvIwHGnyEIlw8aSzflsGzu382vUzUvRkbnyNNkiD
+4idR/Kjn6c4enizkuRGPvcV4Mkv2at6kT7terWP+JY+PNYh4tz/xz4P9vza4KI27
+vvJG5iiXljuAzD9dIXmewTwayEsrVKJIgYXgCS19+H4vAXAwj3zMn8beuHMbtUdY
+0hh0MCoCJ7C+HH1UDIgmSSWYwHos7++SRAFD35w9kOHZvSyb3Oorah7pHaNu3qK9
+jbhWRu41Yk4qzDRWM799/xiXBxURSbJfWP5rTudE1ZinxWVydYOuYXlzHxshpDBg
+VvVV3Eb1a7X4NvY4u+k+gkm2+GkAOHzfb8Z4+ksMlAcSvLZvUjS36eQOJQeIE7P1
+33HMDXNKkxjB6+XTcI82
+=Rd3h
 -----END PGP SIGNATURE-----
diff --git a/net-misc/mirall/mirall-1.1.0.ebuild b/net-misc/mirall/mirall-1.1.0.ebuild
index c7acc4de8bd9..aea3ff0ced39 100644
--- a/net-misc/mirall/mirall-1.1.0.ebuild
+++ b/net-misc/mirall/mirall-1.1.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/mirall/mirall-1.1.0.ebuild,v 1.1 2012/10/13 12:58:33 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/mirall/mirall-1.1.0.ebuild,v 1.2 2012/10/15 08:19:54 scarabeus Exp $
 
 EAPI=4
 
@@ -22,3 +22,8 @@ RDEPEND="
 	x11-libs/qt-test:4
 "
 DEPEND="${RDEPEND}"
+
+src_prepare() {
+	# Yay for fcked detection.
+	export CSYNC_DIR="${EPREFIX}/usr/include/ocsync/"
+}