Add patch to fix build on non-glibc systems as requested by blueness on irc.

Package-Manager: portage-2.2.9-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0xCF0ADD61

4 files changed, 48 insertions, 8 deletions

diff --git a/x11-terms/gnome-terminal/ChangeLog b/x11-terms/gnome-terminal/ChangeLog
index 4c7fda0e4216..86e57feb6b51 100644
--- a/x11-terms/gnome-terminal/ChangeLog
+++ b/x11-terms/gnome-terminal/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-terms/gnome-terminal
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/gnome-terminal/ChangeLog,v 1.283 2014/03/09 12:05:05 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/gnome-terminal/ChangeLog,v 1.284 2014/03/25 04:08:58 tetromino Exp $
+
+  25 Mar 2014; Alexandre Rostovtsev <tetromino@gentoo.org>
+  gnome-terminal-3.10.2.ebuild, +files/gnome-terminal-3.10.2-sys-wait.h.patch:
+  Add patch to fix build on non-glibc systems as requested by blueness on irc.
 
   09 Mar 2014; Pacho Ramos <pacho@gentoo.org> gnome-terminal-3.10.2.ebuild:
   x86 stable, bug 499954
diff --git a/x11-terms/gnome-terminal/Manifest b/x11-terms/gnome-terminal/Manifest
index c44faed0fa60..860b3c8e2adb 100644
--- a/x11-terms/gnome-terminal/Manifest
+++ b/x11-terms/gnome-terminal/Manifest
@@ -1,20 +1,25 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX gnome-terminal-3.10.2-sys-wait.h.patch 594 SHA256 e04e5f28540405d0a0527d641eafb5cef7e59bd61a493f1dee8832da41505bb9 SHA512 ccdb38bc1b7c987ac7dc6472e0cb79ed1bb791f3ba3f63d79bbf39e27a08d489351f703d3d7fe1c8fb6d4d188fc74c3e83967ef47d11e407e718d3e626770849 WHIRLPOOL 2593cc31c9e23d2ef6d005f199f2f98b5068d1a94a1e28723930b5b136ff1334dcaaebe21b1029666857541d16d13fb864c92f06c162dc08e5b0b77bd01eeadc
 AUX gnome-terminal-3.6.1-no-gnome-doc-utils.patch 818 SHA256 e6163f5e2794d238bd0bfe7c1997e423774a4579dcdb7e0d5108bc2247108634 SHA512 9c26ee63497f886b5cb3b779a7b7e08beeac8276349db0141c0544f94193305c640aecc6accb1cd9ce8cc8e0a66250a3bc46f735fededd5c0ceb16710d112ff2 WHIRLPOOL aa8c41d02febc9025d64b7140d93620899e6f4d3cbc55aeac51b15055fd3deebffb670f1e9814287d7e4e8608ab908f10a2a7b0c223d0d53c22b07561ec21a2f
 AUX gnome-terminal-3.6.1-window-resize.patch 986 SHA256 1ce91e6d4bf7ab8220ddadf1875a0ca065a2ff5a76653c5e7883bb45152522f2 SHA512 3df4ff654bdfbd12527bfc7c86da09bdcd064f4abd5eb53c1293e409c88fa279541857b06183581ec4b3bcee1a73af0d59f86218bad84be280bdd8ae6ca335ee WHIRLPOOL 50efc479dc2f8bc229c307d5717a11b8cd07d5d058f13d807d50fab359803b7201a698bcca79019ddf718197d15f0bf353bc8dfe121fe15281f8e9749c01bd22
 DIST gnome-terminal-2.32.1.tar.bz2 2319315 SHA256 7f41e4b185a2cf65ff417b89e429fc3b625c5e3f042ee1763bda6490fa4676fb SHA512 791591ecd219f605ae815c7ef6d464889f628124e077052805a6890508c570d635c8677d2a83262aa2029bdf9db3e6fb3294cb57bd988ac47534dc7023858f66 WHIRLPOOL 11c27188d5e0a8dd29c13130f84695dd30548c0cca263dcc723b4a63a6fd13b0503c439a0e5c9502cf5d335dd60b04f2caec2fb967fc8b13e96dd17b904aef72
 DIST gnome-terminal-3.10.2.tar.xz 1698184 SHA256 e02827c29de45c09973483d821ab29ea60ab3fbba34b62a81d67b8304a9ad913 SHA512 82a7667ccfdfc5e7d71827cea180c5381d8323d64c89de9916c104d3ef3d35d77b02e7a4af99f32437eeefa03e550ffd7cd7b1ac1b39a8a166e2e4db2239a169 WHIRLPOOL b0999d86230efa3eae390ed2b80c67bc3c1463b0552e574692f72246c7b4062176cf589624b1d88b5cd3a3346d3427c99df9113c8560623fcd1f5a1cd976f076
 DIST gnome-terminal-3.8.4.tar.xz 1625708 SHA256 5c1a1db9b4c5eb5780137bed5ed6a05afd82053bd5b2ad41180d4617c56a3f22 SHA512 456aff753fca2c7b6fad972dc9df4a3b8fd32e7bf02a2374e66bbf95c7c8cfdb80c480449a16d580abce061de6eb22e65636d1c4248fd1f2fa132240bac856e8 WHIRLPOOL c3a482b4d147f90349c6647eb463bdefd35545b6c7a56d0300254dc89c30c3bc3e1e76cf67d9c2d5ccaa415afc127d9b7d5daa3eb1484a2789ffcef37f2e85fd
 EBUILD gnome-terminal-2.32.1-r1.ebuild 1514 SHA256 963b028cfc0f7182474b18b28c36d02783244033d47449900677f1390fc8868a SHA512 f684fe3bee16e4cf59a35789da204649a1c50f8b8dea034229d2c47888758542bbd5a95e1c85bd06b79f4a38517586753434ea208b05ff6c540b6da422b862d3 WHIRLPOOL 28244e12fd519bf00bcf73a2e98caa7265d7e0f4469adc8770d3d4cf060001bb2fba22ee2831b7643694ec7a94c840714e60f4536567e50bb3afe6df419689b5
-EBUILD gnome-terminal-3.10.2.ebuild 2125 SHA256 d13ff467fbe2d3560d11b7c07ebf17ad37a2dd6641784ba60f25e575b219ab0a SHA512 d55e9e5be0a62125f3bf774790a36296a0c872847e2306bac5e4ccb94ccbb08c77299a565c496c10c002a868d72b3afc50d7e49a85257250982325175798685a WHIRLPOOL 08b1dfb6e0e9648115de37533543c61f01539ca096e8e661a278731666ca0f070b8866de5eb2f0c5eaa08eb938bc63164fb8da0a1ce08d2a3deb84b0504ff660
+EBUILD gnome-terminal-3.10.2.ebuild 2280 SHA256 2fa30fff04418720142c46d4e7937089898e862c78d51b9e3552db6d2bab19ca SHA512 3c78cc5470e7b11a7852be4420080414d54d1803051acbaf4095c6b5fd81cca1904a6400559861146f2a4787271cae338b7887217bb0cad2b3fb974c4c60f350 WHIRLPOOL 0831e6d250874211218c86e71116777a3b7cc265c96fbae1c4b8d0ed297d8a711edc187afe982ee5dd6bbc7ef83b266c78967c31275b908ac938daf17474e797
 EBUILD gnome-terminal-3.8.4.ebuild 2117 SHA256 8695b777c6a6e6ec5363a47faf505ed8e0fac5436b427139890f0aad11883f70 SHA512 b9635f9ae1eb643eebca12d58c9ddc2e8ef59b5e74eb244fe028417d582c29599f67573a64926ea0f57fcc61772e7ef0e056423594f07090d6d53950dfbc8612 WHIRLPOOL becf1b76a2835e7845d3b9759214e11d54606ed8ebc47ded87b5da0329d0a2d0c9b63b7347683ce16b332be03c66440830243d7a90b52d8fbe7e8c1cfbe4279f
-MISC ChangeLog 41153 SHA256 6553dbf266def487f027a87b2e1f88364f162d8613cd5aeb301ccdfbb76c8abb SHA512 763ba9b8130b6b038866f212814364d152d6dfb0be2bbf9a5cfe3fedac65d3ddc089464297a314d5a64eb016eadf4c463785b4b92c0ad9255731a5c647c6718a WHIRLPOOL 39569282515f8a58aa3a5776f56fe48fa473c48b5140ca74cc9fc99c230ef54eb0e3a37ab176bffe978f42737a95c33a688cbb6ae6779f0a08d61944ef4f0987
+MISC ChangeLog 41375 SHA256 b88fea0e5184db73507b407aebaa955545a3403a38df2064551dfeb97909bcd7 SHA512 f3bd0615b97e72ceb8cfddfcaa1c2cd26ae6875c3fc54bc39ec910ef3773412bef2507a48b3c96490fbf1d361ba4b7322f3988ef32b0bbf8fe9242c4eebe2758 WHIRLPOOL c5251ccf9644d343841fca74f13bbe85dd48abb838881404a669000cc457047552f22fcf6aceaf8f6317326a270142e8cff18ee36a4fc3413251dd0d93de4b95
 MISC metadata.xml 236 SHA256 52438878641b84b1b1c969ebdc240f8d350fb89cecfb53cd4ec717db936b99e2 SHA512 297d39a91b7518ae511e2144c83891f4f1410adb57aa0c3bebdf1f63c7071571c2e681051d12aa26ff55fca3f53670ebf81900db79eb391700d8730db30841fa WHIRLPOOL 3d97a2de485fc202f0e6b25bb188398a385284a63a4eff38a48fc0ba14565b650f7bc31b7ec70467c1dfda63ccfe1a862c56b76cee5e151e9d0023f8f32a8763
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlMcWPIACgkQCaWpQKGI+9TGvQCfU3B8AHowjDRQQk1pN1sYgEOw
-TzMAnAkquUR3EMarg93FAL4XWa0+Hl8y
-=w2tl
+iQEcBAEBCAAGBQJTMQEoAAoJEJ0WA1zPCt1hF3UH/3nQSyQxXmGL1KxVXba7EI55
+Fnyf0x3M5yyeLjibe2GrSWbDWsWcfEvCgxaL4JleCmsoxiho7qlsiNaEQKOhkPiV
+37HzYjF/k5ih71SmkYoYEupP+JsvucLMRLWC+oTdDJpB4ElwvRy8TW1WFfis9ZrS
+1VCt20/gFt4QoiAeAPKIRPKjSxbz1cekY1bAJY2nlTzn6wk/MgNrewUdP/sUFsE1
+wIwKWznuQvGQ1YfiTAQF66z1zB8LDqeFG5iRSuY1ltLQuBIX82a4zNlvaS7icebj
+7f37tKFZEWqqj6SNxtmT7NcKz73ee9VZ74MX66nmwKauiBXlC5Co+kK3PUTfkHI=
+=74/Q
 -----END PGP SIGNATURE-----
diff --git a/x11-terms/gnome-terminal/files/gnome-terminal-3.10.2-sys-wait.h.patch b/x11-terms/gnome-terminal/files/gnome-terminal-3.10.2-sys-wait.h.patch
new file mode 100644
index 000000000000..b51d03c0c55f
--- /dev/null
+++ b/x11-terms/gnome-terminal/files/gnome-terminal-3.10.2-sys-wait.h.patch
@@ -0,0 +1,24 @@
+From 4c82fe8c37718ce2d6040a48d4e643ae6d862be6 Mon Sep 17 00:00:00 2001
+From: Jasper Lievisse Adriaanse <jasper@humppa.nl>
+Date: Mon, 1 Apr 2013 11:23:36 +0200
+Subject: [PATCH] Pull in sys/wait.h for WIFEXITED/WEXITSTATUS
+
+---
+ src/terminal-app.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/terminal-app.c b/src/terminal-app.c
+index 448e1ae..a92826c 100644
+--- a/src/terminal-app.c
++++ b/src/terminal-app.c
+@@ -41,6 +41,7 @@
+ #include "terminal-defines.h"
+ #include "terminal-prefs.h"
+ 
++#include <sys/wait.h>
+ #include <errno.h>
+ #include <string.h>
+ #include <stdlib.h>
+-- 
+1.9.1
+
diff --git a/x11-terms/gnome-terminal/gnome-terminal-3.10.2.ebuild b/x11-terms/gnome-terminal/gnome-terminal-3.10.2.ebuild
index 9dcde1459e30..f3dfc30fa19d 100644
--- a/x11-terms/gnome-terminal/gnome-terminal-3.10.2.ebuild
+++ b/x11-terms/gnome-terminal/gnome-terminal-3.10.2.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/gnome-terminal/gnome-terminal-3.10.2.ebuild,v 1.5 2014/03/09 12:05:05 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/gnome-terminal/gnome-terminal-3.10.2.ebuild,v 1.6 2014/03/25 04:08:58 tetromino Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 
-inherit gnome2 readme.gentoo
+inherit eutils gnome2 readme.gentoo
 
 DESCRIPTION="The Gnome Terminal"
 HOMEPAGE="https://help.gnome.org/users/gnome-terminal/"
@@ -42,6 +42,13 @@ DOC_CONTENTS="To get previous working directory inherited in new opened
 	tab you will need to add the following line to your ~/.bashrc:\n
 	. /etc/profile.d/vte.sh"
 
+src_prepare() {
+	# patch from 3.12, fixes buld on non-glibc systems
+	epatch "${FILESDIR}/${PN}-3.10.2-sys-wait.h.patch"
+
+	gnome2_src_prepare
+}
+
 src_configure() {
 	# FIXME: leave smclient configure unset until it accepts values from the
 	# switch and not from GDK_TARGET, bug #363033