fix buildtime bug #408025

Package-Manager: portage-2.2.0_alpha103/cvs/Linux x86_64

4 files changed, 44 insertions, 4 deletions

diff --git a/x11-wm/awesome/ChangeLog b/x11-wm/awesome/ChangeLog
index c104cb21b877..b64c40a32f8c 100644
--- a/x11-wm/awesome/ChangeLog
+++ b/x11-wm/awesome/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-wm/awesome
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/awesome/ChangeLog,v 1.134 2012/05/04 08:58:56 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/awesome/ChangeLog,v 1.135 2012/05/10 22:53:35 hasufell Exp $
+
+  10 May 2012; Julian Ospald <hasufell@gentoo.org> awesome-3.4.11.ebuild,
+  +files/awesome-3.4.11-convert-path.patch:
+  fix buildtime bug #408025
 
   04 May 2012; Jeff Horelick <jdhore@gentoo.org> awesome-3.4.8.ebuild,
   awesome-3.4.9.ebuild, awesome-3.4.9-r1.ebuild, awesome-3.4.10.ebuild,
diff --git a/x11-wm/awesome/Manifest b/x11-wm/awesome/Manifest
index 12c90e45e6f0..50ebe90dabb2 100644
--- a/x11-wm/awesome/Manifest
+++ b/x11-wm/awesome/Manifest
@@ -1,4 +1,8 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 3.4-0001-Update-the-code-following-release-of-xcb-util-0.3.8.patch 23023 RMD160 961a5046e4abc1135d70308c2571468b98a78be4 SHA1 b50ad1167c1cfeade882eba44afb6727540a5170 SHA256 58da405ee5fc1bfa0f57b6c228bc1a3ae7420c9d37acb956419661a4b0f3c7ef
+AUX awesome-3.4.11-convert-path.patch 520 RMD160 1a3fb0743e2fad9fed9a5a88afcb4ce3855ead7b SHA1 fca6b7a9308d8bcf61fcd136d905538bab08681f SHA256 195edd642759579a7b14b99cc9146b7a1724ee45ac5e65aeb499cb41234f7e86
 AUX awesome-3.4.2-backtrace.patch 713 RMD160 b60e09f17c1452588020738df6657768080f4dcc SHA1 2845c4529f9189bf41ecd1c2df7eae36fbec329a SHA256 5738944681ce666fab1621c0abbb444356456fcea3ea2119f732c54ef4bf3f26
 AUX awesome-3.4.4-cmake-2.8.4.patch 1581 RMD160 cefa281d597501ab162b14d526f8041f69969d66 SHA1 60789f332cdd9bf21de3caf91053170b85fc3214 SHA256 a7e9fe9dfd3b3cdcc67bdf563ff69c6d432fb038fd1b9c62164fa473751f97f1
 AUX awesome-3.4.8-cmake-2.8.4.patch 878 RMD160 1793b87bc558377e8d117f104cd830c7b38b95e2 SHA1 95a5b453d5c11dee3dff058b81f9500c7362eb92 SHA256 6f4f3fc953739d5437cd4258f664677aef882acf873894c5300f6b35feff708d
@@ -10,9 +14,20 @@ DIST awesome-3.4.11.tar.bz2 758495 RMD160 1ceafb96ebe4e5b04c09dee5d6a69266516203
 DIST awesome-3.4.8.tar.bz2 741506 RMD160 f97c31631e81c003b7fc90e582d7d8bcae40981f SHA1 23748bccd8bd4999107354a24173811cbdc85740 SHA256 457b639779053a28d39a0039cdc2d76e6b1ae358b2b0d34467a05a75e959ff66
 DIST awesome-3.4.9.tar.bz2 742902 RMD160 ab6cb81f9c44ca2d3ef863d37683930a21fb9c58 SHA1 8fba4bf2e272c21cf9d7f5f2269932a967fa733c SHA256 144cf9643ca47c2238981f9fe0a1c8ae379ef54a5fb853fd9ac3541a60fc738d
 EBUILD awesome-3.4.10.ebuild 2784 RMD160 b6bf8af8ab3ae255ed2b0e250de56ec19952255a SHA1 0d6d06959d4fbd0aa51650152efaf8bf7eb6061a SHA256 2a8b106a70bec225a39966eb5b624804f5c25913ea17e0928d34c5a9453cd8ed
-EBUILD awesome-3.4.11.ebuild 2677 RMD160 d17caf54920f9bb3f32887b00ad88ad1acb9d65e SHA1 f9461b8d37dcbc22af418429812d3c094466c990 SHA256 6fedf212bbc3760110bc302e7e9ce12842e460fc71b913557ce8460f3ba6c02a
+EBUILD awesome-3.4.11.ebuild 2742 RMD160 aa8505a7b2e00d760f31c957f08c1998baf41b68 SHA1 5660c8706f112ba49728eeb47168f486e8f1d5b7 SHA256 d86ed4a93eac8b9e26ff911e5a9ca00fed8f0108d5f84900b7394791bcc65c2b
 EBUILD awesome-3.4.8.ebuild 2778 RMD160 6f8ca8f02beae10a44fda1f27ae3086f6f3155bd SHA1 72f6c8877bc5cc15c201e83ab89ec711ad90ed70 SHA256 387cdba878d6e67c0155441ad37842e6e87648f378a093d2088ac1d943b5e8f9
 EBUILD awesome-3.4.9-r1.ebuild 2825 RMD160 8afb77918c2eebf08263e97861448b4fd682946a SHA1 565c2278e288d6b12e93d4d8a08fa75420d49870 SHA256 bc1d23c3263cbde6c8f3f35cb5059cd788ac159f6cf7e9468a65362d8e37bf3e
 EBUILD awesome-3.4.9.ebuild 2711 RMD160 3085c74a0bea785711cd7563a239414a5ddcd860 SHA1 61b670ab927e806bc2f3f20c07f81a6d9231d7ea SHA256 9d63bf6408e2158f08afe0e14656d3c9b6801d98f6bb830e80884eca41d52c56
-MISC ChangeLog 19977 RMD160 906d402384749e27fa6185520686533dcad25441 SHA1 4f62209197530a4e30b8345787eb39df045e6b68 SHA256 8b4a227a0462a536e4f4709dc6066b63bf6e36a2532be8bdd9dfa9118db8526b
+MISC ChangeLog 20126 RMD160 53076b30d6124e8dcd873e09e94ce253d86d6c20 SHA1 94e1f8fb93a2a0d667f9acc67599c3eab8eb91b4 SHA256 3e4c185b562c4c144e3488e6647d779f33cd021d575aa0dac64a3aa43227a577
 MISC metadata.xml 326 RMD160 ced8f7923f363eef060cff4c80b7b3ede10fe120 SHA1 2c709bad680d6ab8dcd19466039cedd5ca8bc952 SHA256 4d23256553ae5f4f0e2b2ec2dc603fa7199160052eee9dbe58c61108afe4cd03
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBAgAGBQJPrEZ8AAoJEFpvPKfnPDWzAmoH/ibNwNP31G8CDwA1EQ3uMak/
+Y+PvhPP8x2Bhv/YtWyy4a7rMnKogY69iZWlPwv69Yk8I7V2dmEq6oawA/OX96EXd
+pOXJiL3e29rKb2/tfP9VY+HAJUKfdffI9oNz6ebb27iNVCtiNQSeMJzDeXfxrRtJ
+ZDx5OpIScZ+vuDx1o5swIR08upiuBrGbZJLmhYKXEFIACusd9t2LxBAbdoQIQkCc
+Dx1cN3qng0cqD/tUeEl2s07NWs/J3izF5jmyzIm69Qbb5CSt/p6LVXglauHak+vp
+0fvA7zeiZ6nuFYMQAMEYlQLf8hMwx2NsnGi1JXg+cDMYGrx1Y5xdhfwHZtnV93o=
+=9OcG
+-----END PGP SIGNATURE-----
diff --git a/x11-wm/awesome/awesome-3.4.11.ebuild b/x11-wm/awesome/awesome-3.4.11.ebuild
index 0527b223594d..b4cff4a2ff95 100644
--- a/x11-wm/awesome/awesome-3.4.11.ebuild
+++ b/x11-wm/awesome/awesome-3.4.11.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/x11-wm/awesome/awesome-3.4.11.ebuild,v 1.8 2012/05/04 08:58:56 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/awesome/awesome-3.4.11.ebuild,v 1.9 2012/05/10 22:53:35 hasufell Exp $
 
 EAPI="3"
 CMAKE_MIN_VERSION="2.8"
@@ -76,6 +76,9 @@ src_prepare() {
 
 	# bug #396417
 	epatch "${FILESDIR}/${PN}-glib-fix.patch"
+
+	# bug  #408025
+	epatch "${FILESDIR}/${P}-convert-path.patch"
 }
 
 src_configure() {
diff --git a/x11-wm/awesome/files/awesome-3.4.11-convert-path.patch b/x11-wm/awesome/files/awesome-3.4.11-convert-path.patch
new file mode 100644
index 000000000000..f06739ce87b6
--- /dev/null
+++ b/x11-wm/awesome/files/awesome-3.4.11-convert-path.patch
@@ -0,0 +1,18 @@
+From: Julian Ospald <hasufell@gentoo.org>
+Date: Tue Mar 13 12:55:00 UTC 2012
+Subject: build system
+
+https://bugs.gentoo.org/show_bug.cgi?id=408025
+fix compilation when dev-libs/libee is installed
+
+--- awesomeConfig.cmake
++++ awesomeConfig.cmake
+@@ -57,7 +57,7 @@
+ a_find_program(LUA_EXECUTABLE lua FALSE)
+ a_find_program(LUADOC_EXECUTABLE luadoc FALSE)
+ # theme graphics
+-a_find_program(CONVERT_EXECUTABLE convert TRUE)
++a_find_program(CONVERT_EXECUTABLE bin/convert TRUE)
+ # doxygen
+ include(FindDoxygen)
+ # pkg-config