Fix aix build issue, bug#492866, thanks to Michael Haubenwallner

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xBF20DC51

4 files changed, 72 insertions, 7 deletions

diff --git a/dev-libs/libksba/ChangeLog b/dev-libs/libksba/ChangeLog
index 3d486ebfd16f..b7feb506a9e1 100644
--- a/dev-libs/libksba/ChangeLog
+++ b/dev-libs/libksba/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/libksba
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libksba/ChangeLog,v 1.147 2013/11/29 19:13:21 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libksba/ChangeLog,v 1.148 2013/11/29 19:29:18 alonbl Exp $
+
+  29 Nov 2013; Alon Bar-Lev <alonbl@gentoo.org> +files/libksba-1.3.0-aix.patch,
+  libksba-1.3.0.ebuild:
+  Fix aix build issue, bug#492866, thanks to  Michael Haubenwallner
 
   29 Nov 2013; Alon Bar-Lev <alonbl@gentoo.org> -libksba-1.2.0.ebuild:
   remove old ebuild
diff --git a/dev-libs/libksba/Manifest b/dev-libs/libksba/Manifest
index 212bf1a8b9bf..2f07dbe9fdde 100644
--- a/dev-libs/libksba/Manifest
+++ b/dev-libs/libksba/Manifest
@@ -1,14 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX libksba-1.3.0-aix.patch 1386 SHA256 d2f0f035d902ee74d622f52d0f458ddd07a129531633673bd2f8bf4339a97069 SHA512 f3f38e14775803fe2ca6abafe4d0a511678bd649a21568ce0439b2af53ee8a1c92373c1fb2949bc1c7f30714aa12bf8ebf9ebbd4156a8c259bd94f0293f72d64 WHIRLPOOL bed56c858fd6968f015953d5a350ebe7f603c7ced9962284a9211706c43e285c4c24a2951605972eb993eedb0a6e84085eb2b123fbb9b64a8b119ad809ea6f40
 DIST libksba-1.3.0.tar.bz2 624704 SHA256 5a61eed50550d4d0dcb47457ce7b6a90f8e719d42a3b25f7e79333e8cd721971 SHA512 51023119346fb7ffa31eee205376b7efb0fab42dee73c669c3174c2ebf4100008d3f508f8d49da27b1ea865c46d407b430c47ce503a8d63c069f59132ee638d9 WHIRLPOOL 26dfb3230a00f2fa3dbee161b192e6fd8ce404ce0020379a847a3842a16c1092959f5f69f6e1ebc668dc531be2de6fe4c5e8bbab08c508a152fab40a2640aa77
-EBUILD libksba-1.3.0.ebuild 765 SHA256 e3e978e59701b42c01060946cd65df3c243f4ab1ccf36e76dc1d189ea5fa5f3b SHA512 5da03426e34c437a356e4054bfe894f6b817d6823fde84357fe0f3307c90f367e0ab922e9ca71c038a2d4c0b15c4e373a7fb5f88d62d8b5a77a34481b4f3c068 WHIRLPOOL 73147a178d9a718176272103addf46c9f4e203566f93f1bbc0f176ab989a8147f80d9d052f752e618420c3d00cdbc1fa998ffeb411f8fd58d20f54a45eb4b96b
-MISC ChangeLog 16997 SHA256 7a4615fa0e377225c45598bdb7a464879aa1fdaf6e9ddb672f91f363f3fff8dc SHA512 9741ba1ca513deec30b52aab20307da30ac2bbace01bd604d27ee7998ab462ff23bb48a8434c6fa00acc0e57d970815868011cfc44504b4b479ef246ec4e9eca WHIRLPOOL 06afaa44826bcfbe9ffff1286602b35f79f46bcf7d0e4b5f43fad683eab7960945efaca9e9c1ad86f24a2f0d0a3af6db03046c84cb3c10ce1b41df1b1d3bbb68
+EBUILD libksba-1.3.0.ebuild 811 SHA256 0a039fc38742cd0c1076ab5c589e33651cd84492fbd7ad115d20a3eb8c5ffac9 SHA512 7ad56d61515a45fef4afea527af477f5c387c13adad31a0c128d0bdeae52fc1a328c1e1eb388e62a1a70dbd5c567f55d43aa56fa871096bde0669c31a2612b3a WHIRLPOOL c75063a962fe3eed1352ca8a3ed539ff866262a0c36ceb8165b344148e11796ae0e53ba1cc6b73c409e4c56e4a6fad7db6fb669d8f42f8b2dbc739caf46cf0ad
+MISC ChangeLog 17170 SHA256 661a96077627426de9bbc1d4104d9b9b7aca0882d821e52d681605ce7d0f1bdf SHA512 0417efa3b9a7421af65159a80536bc46100863e11d7593dab2d6b7dac614858a0030891d36d9f3cedce229f4a1e41c4ba47fe8fde42d50337a419c0269483700 WHIRLPOOL 63851c5fbeba648b439421d64eded711bff7fa18926e0b592170213682f4460b27a2544421de8ef02f34b64ee1752b7b090e78a911f87e2f672d2608c18732ae
 MISC metadata.xml 159 SHA256 fabd15e2740a2a68e0bda738d0cd4300b133ff11239802afe7e60aa3862c9c03 SHA512 96a1f7f082adc57e52a1a32666e1206e68f8ff03c728fdb7666ff98c255905977491fc4dfc37bc8bdf5da0eb50cdc408adec357bbd75bd980bc90659cc157194 WHIRLPOOL 82fca1c4b75b090abdb0a4233c8e49fc43535ca6e470f725c1872653ea922b6693e9646bc3ee1fd6f1293ebedad661642cec13b2817fb5315268300f7675a751
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iF4EAREIAAYFAlKY51UACgkQXYk9GL8g3FETiAD/f4bPDEZwOuzPPVd+4lqfCx/V
-0sBWyA5sLh8LAdGkr9sA/0nLw/dG7SgQHru4NCX0Q+/PXPKbqR/TVWgYpA7oGQDd
-=A60L
+iF4EAREIAAYFAlKY6xIACgkQXYk9GL8g3FFWJQD/ega/na3Qb3D+qixTIEeB+HAs
+d6M6l3Vy0CJ3ZY1KDnsA/jhnMcWSpZmtPPCeF3oyOxh/OqdWPEzrex8qM4Fqhm5m
+=dHYf
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/libksba/files/libksba-1.3.0-aix.patch b/dev-libs/libksba/files/libksba-1.3.0-aix.patch
new file mode 100644
index 000000000000..8544202b7ef8
--- /dev/null
+++ b/dev-libs/libksba/files/libksba-1.3.0-aix.patch
@@ -0,0 +1,56 @@
+From 475ee015cb32010f735ea82272ce2a35701e85bf Mon Sep 17 00:00:00 2001
+From: Alon Bar-Lev <alon.barlev@gmail.com>
+Date: Fri, 29 Nov 2013 21:18:51 +0200
+Subject: [PATCH] aix: fix conflict with sys/types.h
+
+AIX header file <sys/types.h> defines TRUE and FALSE when _ALL_SOURCE is
+defined, conflicts with tokens within yacc.
+
+Bug-Url: https://bugs.gentoo.org/show_bug.cgi?id=492866
+Bug-Url: https://bugs.g10code.com/gnupg/issue1574
+---
+ src/asn1-parse.c | 8 ++++++++
+ src/asn1-parse.y | 8 ++++++++
+ 2 files changed, 16 insertions(+)
+
+diff --git a/src/asn1-parse.c b/src/asn1-parse.c
+index e84e13d..07294e7 100644
+--- a/src/asn1-parse.c
++++ b/src/asn1-parse.c
+@@ -89,6 +89,14 @@
+ 
+ #include "asn1-func.h"
+ 
++/* aix conflict */
++#ifdef TRUE
++#undef TRUE
++#endif
++#ifdef FALSE
++#undef FALSE
++#endif
++
+ /* It would be better to make yyparse static but there is no way to do
+    this.  Let's hope that this macros works. */
+ #define yyparse _ksba_asn1_yyparse
+diff --git a/src/asn1-parse.y b/src/asn1-parse.y
+index eedaa0a..da8bd0c 100755
+--- a/src/asn1-parse.y
++++ b/src/asn1-parse.y
+@@ -59,6 +59,14 @@
+ 
+ #include "asn1-func.h"
+ 
++/* aix conflict */
++#ifdef TRUE
++#undef TRUE
++#endif
++#ifdef FALSE
++#undef FALSE
++#endif
++
+ /* It would be better to make yyparse static but there is no way to do
+    this.  Let's hope that this macros works. */
+ #define yyparse _ksba_asn1_yyparse
+-- 
+1.8.3.2
+
diff --git a/dev-libs/libksba/libksba-1.3.0.ebuild b/dev-libs/libksba/libksba-1.3.0.ebuild
index 0d9aacb7540c..1fd664231006 100644
--- a/dev-libs/libksba/libksba-1.3.0.ebuild
+++ b/dev-libs/libksba/libksba-1.3.0.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/dev-libs/libksba/libksba-1.3.0.ebuild,v 1.13 2013/03/01 12:44:08 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libksba/libksba-1.3.0.ebuild,v 1.14 2013/11/29 19:29:18 alonbl Exp $
 
 EAPI="4"
 
@@ -17,3 +17,7 @@ IUSE="static-libs"
 
 RDEPEND=">=dev-libs/libgpg-error-1.8"
 DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${P}-aix.patch"
+)