fix build with Xaw3d wrt #484078

Package-Manager: portage-2.2.1/cvs/Linux x86_64
Manifest-Sign-Key: 0xE73C35B3

4 files changed, 45 insertions, 17 deletions

diff --git a/games-board/xboard/ChangeLog b/games-board/xboard/ChangeLog
index 107d8fa28136..91c8f04e96b5 100644
--- a/games-board/xboard/ChangeLog
+++ b/games-board/xboard/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-board/xboard
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/xboard/ChangeLog,v 1.56 2013/09/06 20:57:38 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/xboard/ChangeLog,v 1.57 2013/09/07 11:19:26 hasufell Exp $
+
+  07 Sep 2013; Julian Ospald <hasufell@gentoo.org> xboard-4.7.2.ebuild,
+  +files/xboard-4.7.2-Xaw3d.patch:
+  fix build with Xaw3d wrt #484078
 
   06 Sep 2013; Julian Ospald <hasufell@gentoo.org>
   files/xboard-4.7.2-paths.patch:
diff --git a/games-board/xboard/Manifest b/games-board/xboard/Manifest
index 31da73cefa00..8dd1ba8c845e 100644
--- a/games-board/xboard/Manifest
+++ b/games-board/xboard/Manifest
@@ -3,6 +3,7 @@ Hash: SHA256
 
 AUX xboard-4.6.2-gentoo.patch 2729 SHA256 c0525e3dfd2ec8969b35a37a9ba95b889331f840b2e16f73b9999edab26217b7 SHA512 800bab6852098237a5a2a3a8fb275e7c3e386d745ef07e7ba1505497ae6f509d707bd4dbb5d987d31b696418f4dd58c3fa02ff89d36c2ff78fe3d89f4539b33e WHIRLPOOL 5247afd76fd3daa105ef5d648d79d84917dbfaeaccc5b36ec28c1e892b57198740d5eb03ed9c7668975a3f09a045839387dab5f30751e18e13c88450d00cefdc
 AUX xboard-4.6.2-gettext.patch 386 SHA256 749d7be2b6b4c37b058d5a7aa25ff2894e7346a46397fac146897cd2c881d21d SHA512 d49d8696d245125877b016766541f65c84cc6b5f405a96d11d7f83149ea4bd0ff7d15b288e7adfe3f1ecfe74c89bb40be9ead84ee3bdad441f9968251aa93325 WHIRLPOOL bdfb09c44353eefde6c91efcc55b098262935dcdacb766578952f37f891b7212a36f772377d39389eb08062f983ce0f9aa846849760cfd8af3ef37e1ddfb0c40
+AUX xboard-4.7.2-Xaw3d.patch 757 SHA256 a1a13d4a742b548473fe9641b99dd0803f45fa5dd5416738cba337cf405d1172 SHA512 c4371d149e778eaae916f09e0a3a0c1830abaf3475e88269e2f64f08c76b41fbacdcc962cd3ecfa9abed226dbdda536ab223bfa6374af841179df541bf585147 WHIRLPOOL 48cc58b785affc1e55beefe37cf6f62265d05a15fe9523138221752a5c55043422e15efef11534c00d349b1d1aee54ca06425115b7dff43746e1629d0ab27fef
 AUX xboard-4.7.2-configure-switches.patch 1115 SHA256 57d28b97ecdaad88d83840dd0d0ea26a7a68871ec16e993ca84d9d10995c7801 SHA512 37a389b811a651161f27605a9f3b139baaf01455868705b7425b30b8e3a8ce840cfcb628f367b59dd91a53c3f42d08277d1587040e6cd155e70cc6d84d7a5ea0 WHIRLPOOL ead1e9eeefb7a2dc7df78598f0b68be370c54a89eb60f9f96668804ea5f6f9f2a8ef4241d3742de8b1609c6c2feb2ec65d87d39e1ea1139784c73b4fb9488b8b
 AUX xboard-4.7.2-gettext.patch 573 SHA256 d5af04d6b145e3ccdeced3c346c0a0662db306d181d28beaf82d3593b3bac327 SHA512 1aa6268ca3ab41f15818782b24f80656815d88df6e91d49ec64771bad14b21ab218802cbcf679aa70c70cc8afe19b9cf08fb21a0181cbf2ec8e0dfeee81986c3 WHIRLPOOL 57ed0eace7a3293ccfb6c979e12f59bcdf2893531f12236c831167a87fa92c056972f412ef723dfcdf4de2f8f0ea9e8d9bd322a5c61aaa926ae0ddbbcb097899
 AUX xboard-4.7.2-gnuchess-default.patch 1507 SHA256 5da35616933c0ca7bb593f7e90d39b3832b2eb31f1eeb27a86a675289ae3a487 SHA512 12ab109c5f12be35a3aeefd0e499f8c367a812c9747a5bec7d103d3651d1774d6cacfd57de4a26fff235407a69bba116aec3433e1460086e67033a0c2bdf5235 WHIRLPOOL 787ac52a533acf21b87aed6a266b762c6cbb916b6e75b0d0c13bdb265265d053e466fbe35993cb4ffbdf003743bdc394a57d0ab893fee9cd6638fe6f624ed44a
@@ -11,17 +12,17 @@ DIST xboard-4.6.2.tar.gz 2956198 SHA256 2e57f2d2c6e90f704a2c5bc0c6e14840d88dc4f9
 DIST xboard-4.7.2.tar.gz 3415953 SHA256 9b6736994b051499dcbe564051f6d964114a38fe47bbaab6dc7bde71a52ba9ee SHA512 00fada24279165e715426282e38f3f7a8dfd2aa15900ed7edd3c3e8de57ac425c1eb721df7bcf4ec4a980955cb42d69762ddd5e07af899e556820fff20607ad0 WHIRLPOOL 4dc5d9cc18725953509e25a8ba2cb04dd803228f092feb0507a878c66bed86b4072d672470462208532b60f9b9c3736a9f2207427a0bc173642bf0450e1795c2
 DIST xboard.png 479 SHA256 1c36fd6ca934eef29d7cdc72159019585d8c449f489f6a6ccc2d787bba03f41d SHA512 c7f8274d70989fa85ef3bef6c819219ae7d4e6355f3c4ca22faec8b703817152256914a95b30de66803db04e0e16eaa117c2f9132a1f0acb6d29de6df5e54898 WHIRLPOOL 5ba135d34808d4814d545bef8eb89aa2a5dfa0f6515ab33d1baa1dfe15bb740e3b77626e45c3b6579b7af0f6b5bc0f060b93f0d4d37f55506778124dbbd1f3de
 EBUILD xboard-4.6.2.ebuild 1725 SHA256 f42d64562f8029ed00144ff3d098a3e8f349d20400e965410f7d4cc664ef146d SHA512 58dc8661fbc4fbb17e679782e925c96b6345819e47a8714a4fe280a754b8d05777759b9f840b9e5f38cd9e4df25300631f94e23887ca3151dd97b10d0231a23d WHIRLPOOL 03fc0b7f7d5a3242c0c2bf4a2de95121758b8a485f8b6d135befd30406dabbceca7d1769ea7ba78bd9ee440d99b049cb35529943fa62b84e3e781e46271506dd
-EBUILD xboard-4.7.2.ebuild 2340 SHA256 3fe7f15205448866fcfa19330e582bfd6a7c862ffdc335296a132552868ab412 SHA512 906e62de17b6b857f24a58a614fcbf80cd974de7748dc12524bda29e64ddc9d4686966669a8a4df658e7005ec21f6b0bb3552f26abb3b5d1667501005022b471 WHIRLPOOL 556ba72372d7c86da26b77eefcd0ced3e48d3581ad7add37605a89a0306915687e6f5a396c67b294c2641a06cf92194f7a18accee7dc42f19c8cbc1a6ca369ad
-MISC ChangeLog 8116 SHA256 e84b4afeb4e98c3e9872975056e30978cd3ce653650a164f9fc7625674e7083c SHA512 6f73d3225cc215d515a97bdc80d2ff62ab5279d6d8d9a4bb66dff47a6e921c72e2287c03e652175e63ed81386c26fdd717904f9aa5f5ad63671d3c848f0941fd WHIRLPOOL 341b8262bca36407423a91cfb2acd00ee5484eae56495d43d71cee4c517cb5e31a609078ea757ab793bb63d6d5852d4973346d388ed97fcfb1c0b4ab83f40c47
+EBUILD xboard-4.7.2.ebuild 2326 SHA256 5e11d90bae9ece585f97d67b5e1eb1f42c468c6e794d899c0c37fc05cd03c489 SHA512 f3c0c4b70fd1b21727d96f630af49cb800838a036ac456d25f3fe0ee388a74a3c303598608bf33c46117fac82d3ba9fc548d18ded4d0c7480e8268fdeaa7c2cd WHIRLPOOL 387091bdca6fc2349560c9829bebe54bf40b12c36b59ad23d48bb11c29502f6c698d7a8f7ec406fd7ad69a115edfaa93385c464183ad4c4c750da448eef1f352
+MISC ChangeLog 8259 SHA256 6faca7d050385657c04cc45cf4fa7904cfdeb811c5713b0576bb320d8ea3d3a6 SHA512 19b04ed80df58ef637befcbc1dd85d72980984a9d8230037d9a857b9fa7dfc14c7314af128c1fdeb9c4a812ee039833be169467f05f821cd82827ae01261075c WHIRLPOOL f3db3ed9b388ce769480e13a82a21f995afe17c1cb531a0142ab843a509d87a594fa4382d64af832a36efa1aad51035167a47e65d8cb85a62af9b4b4e979993d
 MISC metadata.xml 319 SHA256 1b7947629144f869664be4bd08e38dddbd61fc134d37c26d393837c9bb41851c SHA512 7ad0f40154f6d1ac4026dea028a9bf45bd1178e9fcce63809f6180607f687dd77e52e3fea92fa9c032d2b143af1915d2cafb2923d5f63be9d06495ce664d9b8a WHIRLPOOL 16bcb699ead87c5c824765d8f0344d9ef29f223ab10813d8b421d2f4e16b78166fadd4c9c5262c1a73fbd26df7c4e912470b8b9e8d8bbe9cbd7813816e612d4d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQEcBAEBCAAGBQJSKkHHAAoJEFpvPKfnPDWzi9gH/RY/1cyRNlRXuYNwxKUdeuwH
-0jLnXUTqf5zmYRoL8kg/LSqOV4igKQ8ENX874j3koW8GKj6sKusyBSiPOnA9TG7n
-YfSilJgHUtytSDAHQIw1+eRyF65SHXAGMkBMcCN8Zg8pF8q2t9s/85wxYMnGHCT+
-8MuUdSRfsvE3kIIJlTq21X/FmnpzcFW3zHclQh+UP8OiTCTmUHtxmBg/t2pFUKRD
-PTAiBdddQ9aETPpouJYejm6YyBWFPxCqa7TymXjdFml6IGX0d7M75o14fwtnUxKD
-im5JCnqI05yIB/rNVAk6CRTta3yoVrECkNR1OGybOkyRHIx9BXd2f+hXXxU7a2o=
-=Syuo
+iQEcBAEBCAAGBQJSKwvEAAoJEFpvPKfnPDWz/OQH/2caQd1LCOkAb72T0qMm+s/Y
+vasQBUg6qi3y9VQ0VRtrqJ4Ujw/31rx75Wd1EsXaTpgYRoq/BSWO1I8tYpmq88Ar
+PaTmHP0VX/1JshPLTJ2n37M7JYRcCcKiv20x5w8HWARoIu+a29dVoX/6auS58+R7
+zZwb50fpOaEPHSSsXadERDlrQohCjpTJZuurcS+3tCgVPLQEOMu84kzci/AsMQkx
+osRsSfmBvZIfLe4KoMp9jHX/rJ9abo5Zj23KvUxUNv+SCWyg0ctM+7HnEirDqH5y
+St6yitW5vSmeKpFYRrdimqFvQhbWRLIzK6fUFQuhhANi+3lQODdqJJ+u6zze4cI=
+=HFPR
 -----END PGP SIGNATURE-----
diff --git a/games-board/xboard/files/xboard-4.7.2-Xaw3d.patch b/games-board/xboard/files/xboard-4.7.2-Xaw3d.patch
new file mode 100644
index 000000000000..a180d9288e22
--- /dev/null
+++ b/games-board/xboard/files/xboard-4.7.2-Xaw3d.patch
@@ -0,0 +1,23 @@
+commit 7bc79645d4e404d00fee43b5a6cee4e3b6bf7a35
+Author: hasufell <hasufell@gentoo.org>
+Date:   Sat Sep 7 12:48:58 2013 +0200
+
+    BUILD: fix withXaw conditional
+    
+    Listing both one after another leads to withXaw being false
+    if you pass "--with-Xaw3d --without-Xaw".
+
+diff --git a/configure.ac b/configure.ac
+index 1664491..6548295 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -248,8 +248,7 @@ fi
+ 
+ dnl | make results available in Makefile.am
+ AM_CONDITIONAL([withGTK],   [test x"$with_GTK" = x"yes"])
+-AM_CONDITIONAL([withXaw],   [test x"$with_Xaw3d" = x"yes"])
+-AM_CONDITIONAL([withXaw],   [test x"$with_Xaw" = x"yes"])
++AM_CONDITIONAL([withXaw],   [test x"$with_Xaw3d" = x"yes" || test x"$with_Xaw" = x"yes"])
+ 
+ 
+ AC_SUBST(FRONTEND_CFLAGS)
diff --git a/games-board/xboard/xboard-4.7.2.ebuild b/games-board/xboard/xboard-4.7.2.ebuild
index 2fc7e927fccc..8fe4f9a322c6 100644
--- a/games-board/xboard/xboard-4.7.2.ebuild
+++ b/games-board/xboard/xboard-4.7.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/xboard/xboard-4.7.2.ebuild,v 1.3 2013/09/06 19:03:16 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/xboard/xboard-4.7.2.ebuild,v 1.4 2013/09/07 11:19:26 hasufell Exp $
 
 EAPI=5
 inherit autotools eutils fdo-mime gnome2-utils games
@@ -12,8 +12,8 @@ SRC_URI="mirror://gnu/xboard/${P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="Xaw3d +default-font gtk nls xpm zippy"
-REQUIRED_USE="?? ( Xaw3d gtk ) xpm? ( !gtk )"
+IUSE="Xaw3d +default-font gtk nls zippy"
+REQUIRED_USE="?? ( Xaw3d gtk )"
 RESTRICT="test" #124112
 
 RDEPEND="
@@ -21,6 +21,7 @@ RDEPEND="
 	gnome-base/librsvg:2
 	virtual/libintl
 	x11-libs/cairo[X]
+	x11-libs/libXpm
 	Xaw3d? ( x11-libs/libXaw3d )
 	!Xaw3d? ( !gtk? ( x11-libs/libXaw ) )
 	default-font? (
@@ -32,8 +33,7 @@ RDEPEND="
 		x11-libs/libXt
 		x11-libs/libXmu
 	)
-	gtk? ( x11-libs/gtk+:2 )
-	xpm? ( x11-libs/libXpm )"
+	gtk? ( x11-libs/gtk+:2 )"
 DEPEND="${RDEPEND}
 	x11-proto/xproto
 	virtual/pkgconfig
@@ -44,7 +44,8 @@ src_prepare() {
 		"${FILESDIR}"/${P}-paths.patch \
 		"${FILESDIR}"/${P}-gettext.patch \
 		"${FILESDIR}"/${P}-configure-switches.patch \
-		"${FILESDIR}"/${P}-gnuchess-default.patch
+		"${FILESDIR}"/${P}-gnuchess-default.patch \
+		"${FILESDIR}"/${P}-Xaw3d.patch
 	eautoreconf
 }
 
@@ -52,7 +53,6 @@ src_configure() {
 	egamesconf \
 		--datadir=/usr/share \
 		$(use_enable nls) \
-		$(use_enable xpm) \
 		$(use_enable zippy) \
 		--disable-update-mimedb \
 		$(use_with gtk) \