Fix liblangtag build on older gccs wrt bug#475494. Thanks to Fabio Rossi for finding the patch.

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

4 files changed, 58 insertions, 18 deletions

diff --git a/app-text/liblangtag/ChangeLog b/app-text/liblangtag/ChangeLog
index 7ea80d716c7d..8e363a6eb356 100644
--- a/app-text/liblangtag/ChangeLog
+++ b/app-text/liblangtag/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-text/liblangtag
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/liblangtag/ChangeLog,v 1.19 2013/06/25 12:49:27 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/liblangtag/ChangeLog,v 1.20 2013/07/30 07:09:38 scarabeus Exp $
+
+  30 Jul 2013; Tomáš Chvátal <scarabeus@gentoo.org>
+  +files/liblangtag-0.5.1-gcc45.patch, liblangtag-0.5.1.ebuild:
+  Fix liblangtag build on older gccs wrt bug#475494. Thanks to Fabio Rossi for
+  finding the patch.
 
   25 Jun 2013; Agostino Sarubbo <ago@gentoo.org> liblangtag-0.5.1.ebuild:
   Stable for amd64, wrt bug #474156
diff --git a/app-text/liblangtag/Manifest b/app-text/liblangtag/Manifest
index 88e55d8ec7f0..10c29f556798 100644
--- a/app-text/liblangtag/Manifest
+++ b/app-text/liblangtag/Manifest
@@ -1,29 +1,30 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX liblangtag-0.4.0-arm.patch 378 SHA256 472fae5f0cd562eb15e3e5bbf59e92c0902496e6d610cdb2d1faae2a6300ce2f SHA512 2465407af07a8e55ae407b246e58112f42587126312d089e25c5ca6d01217d61976e2debea28737b74973de865962bc5d5a846d8e7a292d3263274330fa9aaed WHIRLPOOL ee04cbbdab48f8f631b3eb33d05f99b17c37d400af25cf55f0bb0b41e2e02db1cb6449ee64ae71a6a877f9154e63b3bd3879768d04b452f6046278a8132964fd
 AUX liblangtag-0.4.0-introspection.patch 552 SHA256 4144b90343fcc89f7fee0919c9d3b75f842919f3056ba2f1bff0e4f5cad7d3e7 SHA512 b4c795b6f5ec4a61dab2e6b51aa88588ec18134daa1e2bf392922cce71cd477329643861d9edab46a44f0d0c226d7ac1576b083a4d21dc76b02cce1ce08b312e WHIRLPOOL 3c15e77f374e6c132dc87dd967c1cf4fa862472d892a8e85ccd47dd7397c4139f1e1e8f83d2b5c8b76c4843f56e8117f75d4a2b11cd39534f1515a604fe8326f
 AUX liblangtag-0.4.0-module.patch 436 SHA256 7287f8dea3ad4d4c78dce7a0b350546551d22a5e429114c3ba1cd5c9ef4e5745 SHA512 8648da59146fa5f7e2149fd3cddf1ce1454a16ca2d5d560c066cd94e78cb1ee3be9d915ebf033a821ec3f24adc9ecca8bc9e8f31d1a997832810e9e6f1d752a6 WHIRLPOOL ac95cd631bca409ffd9bc89c2047b08bb7cc07dc444e244d36e82f992d8c96102023afafdec45b90e0afbe2ba6d837a320229d802e21b2f26645380028430593
+AUX liblangtag-0.5.1-gcc45.patch 737 SHA256 a4f5606eb811ef617ce042a505658d460d748809429bf43f6d8e85975b639ede SHA512 1f5c86c02c1223ac1dc0adee6e33564a75cc7ec261288bc6ab39c2ba5ce24c9e4c86b1b3b15cc04d204b31f195b126062b386a449aeba843256d3f54a72ad53f WHIRLPOOL 707724f8ca4a054b4784a35d15c5d5d5bcecc88e7cd1856a6110b9135cb9993f9622f6e4d9e15e6c99cedf1ee3266ff89c3dd80bb90c606d338bc7320584ee73
 DIST liblangtag-0.4.0.tar.bz2 613182 SHA256 cbb71d5d1af345c3bd9ceebbc78ddfbe70e3747c3cf95532a4fdef2abb034bae SHA512 d04f188d8cad68504d322bb9461f1be564ae831735afbde4b9f7a7b09819ba20b2e9a72f68e7660e69d8b80d33ea2beb4bfcbb6f521d58c06b2c2182fd7928c8 WHIRLPOOL 420c39e7c6ff7b12f071538338611430b9edb4322c3cf9fe2df2276bbd6a7aaa288958a01316cf885edd285e38fea59fd1ce2c8dbed9d78694dab37606e0abe5
 DIST liblangtag-0.5.1.tar.bz2 651785 SHA256 c3dd456762cd0b5fd1687f066c4bdf253d70b14729851b9cd05936a1cb46923b SHA512 006ed5b8621bfc4330589eeba8581dd2214a29c985f782b0c123012105ac6ea447f1d7593daec86b0126daf7929e6845208c633c63df67beca2d6201a6961bbf WHIRLPOOL 80f48834b00ba7732f07a7e88ae092a3f0f0168c3de176ad0544e130b8e0c3991a169ed4d502cdc9aff0af1fe3df43ac961d4c8517b9240b9934ea901c0626e5
 EBUILD liblangtag-0.4.0-r1.ebuild 1261 SHA256 4ebe0de196e8d019bc075abe42161c987965715b46b6bc30a88f0551767dc689 SHA512 94c696b5a2aa6f71bbdaecee229e34308477daf90a2a15b1fbf130a2761ef05206975d26f525bc7c196909e9e16a67bd51024c2d59047701ffd7833730325360 WHIRLPOOL 3fc1c7dc31dce7ceb2fcbe4ca41db12061726b80964c078bf7cf055f2846e7e089575aaf39cffafe4a6496051daf84cc381154e6bdb7528a2da7b1c3f33c21db
-EBUILD liblangtag-0.5.1.ebuild 1055 SHA256 6d97b2b1b663d32c10e1ee55e9a7595516d1ee17eb76ad8f1f07f1b6667bf6a5 SHA512 8537a75703686ed92b6ae2101b2a8db3ced69b8039536a4b8ce03ac044aa14a1527b362beb2d53a82d25ea706cbe1bbf7dc013ae25a6f5e097553f3b26bb1280 WHIRLPOOL 3e3ec21352c29e629ab6212ee9c1d25530b81090ebe5bb323fd91922bf65c5a105b1708b9fcbb74e9d82b4e3f1bd6d307bd321dd987cb8c862ef2615b648414f
-MISC ChangeLog 3100 SHA256 197e253692406f0897139f4c54a6d5b5a3ae762d3c863fb5068fd787cc0e6b01 SHA512 0f30030d7447ff293628ff9b5f6f2948f1a915a5926e6da485615ff7b75fd31f0e53c589afa8caee2adee4a50da8163e55dfcfb39377555707a7411a7766b2df WHIRLPOOL 6d6737667805d6928377025414ad01c411b70e49a4cbc211de37d4e77330fcf7169e778e61bbd7c36eb536914beb3a71f006554fc7d3494c0bb1f133d403fd06
+EBUILD liblangtag-0.5.1.ebuild 1106 SHA256 faacda08651668935d487bccff91595f710b4df34e339d677495df5cc2a1aeb1 SHA512 935dbaa45f835af63bbf1d63eafbf0cc6c668aec9ed764eca329a87b006d74845f43767d798c7e034f36233703fe68755e18640d0f9a5d0b3b2715b306eb66ce WHIRLPOOL f55e5fd6c6dd44cffbd09003909871ce41bbebfeaf7e560a3fa15078aa77df556c42d3f19e23880cdd6eb1a176a290c337132c48bbca420616135e7e9fd997ab
+MISC ChangeLog 3326 SHA256 e9780c3f1b0a55adf3fe597773cd9c2d141104a036a486d19ffdfa92f410debd SHA512 4aa2ac62cafe27e6359c95be44c8b15d0d98b7e33a2b93302e928a29eed56de05b0ba119bcf07c8ec0dd0153cda77408660923e5acb06a6f6c09446be12ebb09 WHIRLPOOL 9f117d722a888363cab9c70a1535919f31eb40f83f117d01922e58f7202e282cee12e85b640b27b0b184035ac7ba705662eb23825b7ccc0a412a65c5936390f0
 MISC metadata.xml 284 SHA256 e937a46d00fe6cbe1cf553eeaf44f3308e413fca5fe652a4e74c35fe336d0610 SHA512 6b883e0602ff9b5dd1a0055adfd0b9a9a5d74f32b0961e733d32cae582ff45e6e0ee00121cc455ce0b4402c8c44e152bb1708a183b69cd6c893d078bc50b8420 WHIRLPOOL 1402cf934cc79c53a85edca224eb2268f2b2e0fca5dbb273822510eaa22b6a26da722b16cc6a575e9184fd49ae776deef32cbddaebbb0d6bc2a331000bb56d7b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCgAGBQJRyZHRAAoJELp701BxlEWfmVQP/0kvycOd8RiFSMhHyRRQIJAA
-p+2usg9LntFiqDydan77YZ8UTz7aQIhP8xPxEbhT9pHCYlFqTpkKIhzrY58bdkbj
-1dHDjfwpxgCHCP9SVviu+K1DUz797+pcUX7pFWF6t/11wsh4nTbX01gXyNc/c6Gh
-NTC8RCykkQUPoY8JQ9aPGJZCFZ41aRbNRXQ4V3TnyQv26kAyTO/5hcDDRaM+iK8/
-nsnv5D1CPuLi6tbvL+7G8GsdndR/gZe8rMj4h2LXbFPJF5a4Y/64mUGPiYmm/kMe
-smEFYTJJWSZOm0kEwWf5wcx7xP2a0Ndfvgt89b17lnMUtqvKZzFodtm05Sm5RasM
-vCIrdIX4h5y7F1E7QjLOTgQz1+/Z67TuxFWTmm+7TjnxPKP8VkTRPv/e5fbCxTzv
-7ClbUm8Qc5e4/lUfXoBtYgofOxdpwLillkRwly6Oo/WHhFXnATgFeEZ9/ycZf3hY
-7B3m647EK/jDCz9a4mDVBUBnlzrBNpU3iJuVTchX1o5LbRXAQvo1VTyFbVnDjxHS
-KvFn87howh13Ao4zcYRejnzKTG5FP/H56I2AA0MeDt/pGNvuouqBhuB+ebwS301w
-xq7aJ4DQPSbiBltoAN/ox/sx1WNbTbVkI2BXOehH3pDx90w4ld9k0p92Vxuwc0kz
-XuRTTXweqce2zuiHEn1a
-=WGKj
+iQIcBAEBCAAGBQJR92fDAAoJEOSiRoyO7jvo0sAP/29RbNKFM+6ytDpaDg39b6ff
+/Rbyz8+RO5qx+c1gf0oZlMOoyc0nGWJjDM5NL84RejX5v1xL72C1NTd+pSo7sL6Z
+oDcnhG+B5gGEXsuhwcN52/yPaCs5J5m9RqF+tImw1iVxdBP+EW0IVoqtCGlMnjSB
+ZSaiaLvuX/NO92PjlyFoIt/3l87wrjUPNQeQgLh+Y4s9nhfnYiBU+oKKSF0m67Pc
+4vr3rm1V4Q8w5S2xCSwz4G6CyANWBZFqNlDvHMi2tebUuJu3KxsJfnlZ4Efrl5By
+o662B09ynZ01G6xdCqbbMzpUXXpDICYvxhk7YHKrXjsjPQHTyWXGQoS2uKZWpcHn
+nY6BahL2d0G8KOAnQz0ggwZxZmgPUrdI+TJmfIhjqVtg2LDNClaGQbA1ZjG5Jt7y
+bW+hwi6vpRqiDghHXx6FBnow0ZTYdRkjtnFFPBlB4wuFFllsh+RvTSoAVohyofA5
+93y4ZFkaQvZTrfySjeo2i9JCdPu4zCWvgWdb6KPg0PVbpYFoofF3FRvXK9jDtBz4
+HY5wLd/E27s+/hugsOZoRIZsrAdndJG5NrvE/he+tuLcflzYBkfhNHcL1FHIIjIf
+qraVlSpLTVK49piHFsq7cUKph1sW3EKHSNxnyWGxd8EGC9BX+z8/7Y/5SGiDKKcc
+IiGNQu7TO2U8THtRZymc
+=0b4M
 -----END PGP SIGNATURE-----
diff --git a/app-text/liblangtag/files/liblangtag-0.5.1-gcc45.patch b/app-text/liblangtag/files/liblangtag-0.5.1-gcc45.patch
new file mode 100644
index 000000000000..61bd1d041f7c
--- /dev/null
+++ b/app-text/liblangtag/files/liblangtag-0.5.1-gcc45.patch
@@ -0,0 +1,30 @@
+From 4a5ec00d229d9ccf293dc21ce64eb42de7e8118c Mon Sep 17 00:00:00 2001
+From: Jung-uk Kim <jkim@FreeBSD.org>
+Date: Thu, 9 May 2013 15:59:35 -0400
+Subject: [PATCH] Fix duplicate typedef introduced in 57c47aa.
+
+---
+ liblangtag/lt-trie.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/liblangtag/lt-trie.c b/liblangtag/lt-trie.c
+index d2162c9..301a6da 100644
+--- a/liblangtag/lt-trie.c
++++ b/liblangtag/lt-trie.c
+@@ -33,11 +33,11 @@ struct _lt_trie_t {
+ 	lt_iter_tmpl_t  parent;
+ 	lt_trie_node_t *root;
+ };
+-typedef struct _lt_trie_iter_t {
++struct _lt_trie_iter_t {
+ 	lt_iter_t    parent;
+ 	lt_list_t   *stack;
+ 	lt_string_t *pos_str;
+-} lt_trie_iter_t;
++};
+ 
+ /*< private >*/
+ static lt_trie_node_t *
+-- 
+1.8.2.3
+
diff --git a/app-text/liblangtag/liblangtag-0.5.1.ebuild b/app-text/liblangtag/liblangtag-0.5.1.ebuild
index 5081de49a262..e4e6d60c4318 100644
--- a/app-text/liblangtag/liblangtag-0.5.1.ebuild
+++ b/app-text/liblangtag/liblangtag-0.5.1.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/app-text/liblangtag/liblangtag-0.5.1.ebuild,v 1.4 2013/06/25 12:49:27 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/liblangtag/liblangtag-0.5.1.ebuild,v 1.5 2013/07/30 07:09:38 scarabeus Exp $
 
 EAPI=5
 
@@ -27,6 +27,10 @@ DEPEND="${RDEPEND}
 # Upstream expect liblangtag to be installed when one runs tests...
 RESTRICT="test"
 
+PATCHES=(
+	"${FILESDIR}/${P}-gcc45.patch"
+)
+
 src_configure() {
 	local myeconfargs=(
 		$(use_enable introspection)