pthreads build fix, bug #423305

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

4 files changed, 68 insertions, 9 deletions

diff --git a/games-util/gtkevemon/ChangeLog b/games-util/gtkevemon/ChangeLog
index dcc235f84c9e..56a85a527fb0 100644
--- a/games-util/gtkevemon/ChangeLog
+++ b/games-util/gtkevemon/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-util/gtkevemon
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-util/gtkevemon/ChangeLog,v 1.3 2012/05/03 03:41:15 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-util/gtkevemon/ChangeLog,v 1.4 2012/09/24 14:58:07 wired Exp $
+
+  24 Sep 2012; Alex Alexander <wired@gentoo.org> gtkevemon-1.8-r1.ebuild,
+  +files/gtkevemon-1.8-pthreads-build-fix.patch:
+  pthreads build fix, bug #423305
 
   03 May 2012; Jeff Horelick <jdhore@gentoo.org> gtkevemon-1.8-r1.ebuild,
   gtkevemon-9999.ebuild:
diff --git a/games-util/gtkevemon/Manifest b/games-util/gtkevemon/Manifest
index 07845cdb1669..0bb3393800fd 100644
--- a/games-util/gtkevemon/Manifest
+++ b/games-util/gtkevemon/Manifest
@@ -1,7 +1,28 @@
-AUX gtkevemon-1.8-portrait.patch 714 RMD160 04b104e18df772f51e141e87b9bc30a7fe8be69b SHA1 28e4ece4b5daa5fa28a887b82eed030b654a1626 SHA256 4e3b591433171449f90e89f1fb33ba63e7365ae2eb95e258c4350fdfe0c76899
-DIST gtkevemon-1.8-learning.patch.gz 5879 RMD160 aa4098c5664e46de97cab7a9dccc544c0247ebfc SHA1 c4d76012466fd751ef68e841b0e03d84c5ffd935 SHA256 ec9951ae91447e4e5f1d1720a35c27a92546760cc2ae76cd269f85cb59766437
-DIST gtkevemon-1.8-source.tar.gz 321226 RMD160 7420a9fd78377e93b97561b066b1561ec909f30b SHA1 d976d1f022c25f1d47399bfcbec9876bc3d319d8 SHA256 32faf51b5b84f7e055dd47b7c43f722613b5c6cfbd8ec6a47cada75e686300c7
-EBUILD gtkevemon-1.8-r1.ebuild 1246 RMD160 c6c2e21eff439547be7bbc3caa1cc9b8d5de3819 SHA1 95682354ce7784629ff2313328f1a85429c6cfcf SHA256 71c73ba11401db45ca42d19caa3888aa1dc794c440fe42fcfed6534d1d2a8888
-EBUILD gtkevemon-9999.ebuild 978 RMD160 31afb3ca5d1cf333074589a7f2e5e67b99ab9a69 SHA1 9cf8769f6ba78ef36ffce00d28c9d71b8d8ed865 SHA256 c5162b7f972286891c25f5009fb27fd9bab39885d89cdfc172641886e21423c0
-MISC ChangeLog 827 RMD160 7e5780d04c62cf7deb1253e9f788bdbca9d41768 SHA1 b95a6b867b03d49a60585cf2944bd709791ca6cc SHA256 8b28f9389e4c3e009165bd7ad8e40766ab241ed54899ea3ab23171c76e88e742
-MISC metadata.xml 575 RMD160 62c052130025cb32a6097e2f56c39f9793144108 SHA1 2b7135ebe372023f331f91f3bb4be7fbe3d74124 SHA256 ef529497d925ff63694dda82e323667aebca12767230905351c278b607e8525a
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
+AUX gtkevemon-1.8-portrait.patch 714 SHA256 4e3b591433171449f90e89f1fb33ba63e7365ae2eb95e258c4350fdfe0c76899 SHA512 2843865ed639eb6a8e77ccc91f8b6d571647faef556e2fee3142e4fa7a3f2313d964adb0ae47c11dea77d95438191b836be9982169cdf65f93386be32a8473ff WHIRLPOOL 101661f1264bb54038975338283a6746c13d36a20377d44ecf4adaa42a10d21e7243edc0f8f1cb1b82294762237f690fddaecfa310d13e1a0104148f5ebe50ee
+AUX gtkevemon-1.8-pthreads-build-fix.patch 939 SHA256 8e55d667da0f95d868e7ee440ca7dd675121f9d2af502f24fb1bc89363ec68ab SHA512 8d54160f2dfc3dd4d275b7259164dd2900ef1dcff05cdaf627e68208d4c617fbb0fa14c4886cb92422f8b174d9aea6d28ec6e2462e18b0e47612148ac06c8460 WHIRLPOOL 088930a52432fe96837a03399159c8e45af8e3c7ae72dd24087a92d19c0d9b991c548d49d43005c5d3c4e93b6ec680727cde0975a682b5932fd47fec38455c9d
+DIST gtkevemon-1.8-learning.patch.gz 5879 SHA256 ec9951ae91447e4e5f1d1720a35c27a92546760cc2ae76cd269f85cb59766437 SHA512 44d58ce947b27fb623a94e79e2eff6a20aec1bd0a63c3029347099e64bde5fc31080bcfed0da8fd00f70c2f5c88182760ee169729729c39805bee099099d3022 WHIRLPOOL 68342fc1e8aa729f4e6cd3002fbde58ad7c3818dc5d76cddfb4b4d4d05a5f9e55d8244f07a7803c3fc5ddc354546cc20f73c0c6dea58fd1a2303004cd3ce120e
+DIST gtkevemon-1.8-source.tar.gz 321226 SHA256 32faf51b5b84f7e055dd47b7c43f722613b5c6cfbd8ec6a47cada75e686300c7 SHA512 483a66bda9f34ae423ce4205eaf5dc3775dab9d8d0074a19d79ffad86bc13974b09927efd1757300233c8e040f42e564ea44f32a5c3c2726db404d43d9fb5736 WHIRLPOOL 60ea958633d6fc9ca2e6b4940f30f9691c95c8d1a43a16763ab3532065be0872e0e6c0fe71a0b36ebd0d74422105cc745ab7d88ce0a5f7a552c9ca22c62f4a85
+EBUILD gtkevemon-1.8-r1.ebuild 1332 SHA256 b35d411544db5e759e112049bb1c633237f94d953d8315db73dfe4a611213ba3 SHA512 418b453e7c30fdf1f5f76898ba14672e72c738892cdefcc70dfc4bba52fe381e36337b130550954c92f0f5bcccc3eccdcbadb6b5d7fb597b84fe5dd97c2d2ade WHIRLPOOL 2bb43b9a9c46210d3f03f3fa464f317c2112024f1e0b8abfa18ced522dbe573cc9f20f5d2fe767829c4b3fadc0adaa8ccdba41ad78f41e6666fd089d4dc019d5
+EBUILD gtkevemon-9999.ebuild 978 SHA256 c5162b7f972286891c25f5009fb27fd9bab39885d89cdfc172641886e21423c0 SHA512 2f0e089603c247852f3e01cd4fe22dabecac4edfa12d897715041c161ae36149602d876121f5e15f053e4c656fef802df7e81777f703f3c8854c1992bb97f1da WHIRLPOOL 5e3308a251a11d698714aa193220a22f576d6c5e719ea17a085487bedb7724d20082bbe3f2dffa88e122caa4b293fcf0a471cc48586942a1ec7fe5dfb9113c19
+MISC ChangeLog 984 SHA256 f38d33d9539f26cca806c0dff92c97fea576b9f0ac3c3da3d6fe86fdec0b4ecd SHA512 92f710870055ac293203d87cdce9f7e15cb941c6a7d1112e17bc4136aa709edff16a8776a70d898345943ab50d5f1dc541ba791a84bb90221337de9bbe859c83 WHIRLPOOL acc651cebe52aebee98417ca31456228434cc4f4c01cd45b59dfd295eb586d7aed4a7d73b5746dd06182fd628928adf81ce18d8ede0ebe540fe87264244a1673
+MISC metadata.xml 575 SHA256 ef529497d925ff63694dda82e323667aebca12767230905351c278b607e8525a SHA512 23a6eb8237d7b4d63e6835f1cc43da865da25f7aee853d4d03ef18d9b0259f82aadd8780dad7e29d0303c95d951e0aee71615445020b3e4cd55af43aae35c27f WHIRLPOOL 89c295fe25de86cddfc9132499d42bea7a570dabe3f3853d983975b41695c11a330ecd7ff2b4792c426223745ea36d9d3ba82f3d6038e9413cb6cf8ed9c484b8
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQIcBAEBCgAGBQJQYHinAAoJEDZF8K7rm0r6oz0P/jrVjeObFxEUe/XW4ISlKx2i
+Svnjt02OuCTstfT81/ejrWdC9JUWGTxUDPj03KELJXPeIs7KvSzuLlBt72ow3csQ
+BR46kjFCEIvYOZGccATp8LIuFpSMEu+u2pqAxZ99RriIgZ1Ev0cZJ2YBlYINXoXw
+9KpSh1bAN8KcgWdQLDNAgzy0OqmDTRT4maK8LRXDmZntNNPpsDNa73xV0FCMuGsf
+1/2J+Ar5lsN8Fwn+SwifD35+ojFfhOEvALQk01OVA9e15wXKnFO6BfEL7oTexCXu
+/wa/LW8oe/FP+tJex40EMipUHwbNgsRUHuL1h0R2eFaV5qXcZSAqc/Upgse07f7Q
+0P6I1p3yDhPjofNmK9sYiAs2JR5bSYkS4ot8poWDZORcyIhT9fSDBt1x3ztavMXS
+RQEzGNLnXBUFMOdJp+3rX+Mh+Lttsta0rpUsezqIZ6CNMFtPGz2ulO9pIJq10U5T
+Q2BIZb32M8A94TnLgG8/oCW5/gTB1vzc8WR3BdGzOwC8Y9RtZWAOh7cSsOQKrtRL
+UK+Pp+xCG+YA/KVj/WRYpL/10gV02DkdWUVq78b6i5Fw57SYV3jDzFE1nbfYyuYm
+lq/vTTaUSeBrpRE3brFWE6IZ2nQlTlJIZUXk0/OFCd788F9ZWTAAgFbJT157x5CY
+yHIEIGMDNue8Cd7fOMJw
+=c/01
+-----END PGP SIGNATURE-----
diff --git a/games-util/gtkevemon/files/gtkevemon-1.8-pthreads-build-fix.patch b/games-util/gtkevemon/files/gtkevemon-1.8-pthreads-build-fix.patch
new file mode 100644
index 000000000000..3250680c7aa1
--- /dev/null
+++ b/games-util/gtkevemon/files/gtkevemon-1.8-pthreads-build-fix.patch
@@ -0,0 +1,32 @@
+https://bugs.gentoo.org/show_bug.cgi?id=423305
+https://bitbucket.org/BattleClinic/gtkevemon/changeset/4c365033418e
+
+# HG changeset patch
+# User ChickenMan <chickenman@exhale.de>
+# Date 1341445681 -7200
+# Node ID 4c365033418e2213caff57a0917851cc18c7f1a1
+# Parent  0b8a490b5f491bdd4a36d85918479595c861d3db
+Fix compilation on systems using pthreads and gcc 4.7.x
+
+This fixes issue 1.
+Thanks to l0ser140 for reporting and initial patch.
+
+--- src/thread.h
++++ src/thread.h
+@@ -13,7 +13,15 @@
+ #ifndef THREAD_HEADER
+ #define THREAD_HEADER
+ 
+-#if defined(_POSIX_THREADS) || defined(__SunOS)
++#if defined(__linux__) \
++    || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) \
++    || defined(__DragonFly__) \
++    || defined(__APPLE__) \
++    || defined(__SunOS)
++#  include <unistd.h> // for _POSIX_THREADS
++#endif
++
++#if defined(_POSIX_THREADS)
+ #  include "thread_posix.h"
+ #elif defined(WIN32)
+ #  include "thread_win32.h"
diff --git a/games-util/gtkevemon/gtkevemon-1.8-r1.ebuild b/games-util/gtkevemon/gtkevemon-1.8-r1.ebuild
index f3895b1981cf..d58490ae5aab 100644
--- a/games-util/gtkevemon/gtkevemon-1.8-r1.ebuild
+++ b/games-util/gtkevemon/gtkevemon-1.8-r1.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/games-util/gtkevemon/gtkevemon-1.8-r1.ebuild,v 1.3 2012/05/03 03:41:15 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-util/gtkevemon/gtkevemon-1.8-r1.ebuild,v 1.4 2012/09/24 14:58:07 wired Exp $
 
 EAPI=4
 
@@ -40,6 +40,8 @@ src_prepare() {
 	epatch "${FILESDIR}/${P}-portrait.patch"
 	# upstream fix for remap calculation after learning skills removal
 	epatch "${DISTDIR}/${P}-learning.patch.gz"
+	# pthreads build fix, bug #423305
+	epatch "${FILESDIR}/${P}-pthreads-build-fix.patch"
 }
 
 src_install() {