Add patch for SUA 6.0, by David Holm, bug #435034

Package-Manager: portage-2.2.01.21143-prefix/cvs/Darwin i386

4 files changed, 69 insertions, 17 deletions

diff --git a/sys-libs/suacomp/ChangeLog b/sys-libs/suacomp/ChangeLog
index 16fdf324ca0e..46792130083a 100644
--- a/sys-libs/suacomp/ChangeLog
+++ b/sys-libs/suacomp/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-libs/suacomp
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/suacomp/ChangeLog,v 1.14 2012/04/16 08:42:10 haubi Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/suacomp/ChangeLog,v 1.15 2012/09/29 13:02:23 grobian Exp $
+
+  29 Sep 2012; Fabian Groffen <grobian@gentoo.org>
+  +files/suacomp-0.6.14-strtoll.patch, suacomp-0.6.14.ebuild:
+  Add patch for SUA 6.0, by David Holm, bug #435034
 
   16 Apr 2012; Michael Haubenwallner <haubi@gentoo.org> metadata.xml:
   add myself as co-maintainer
@@ -73,4 +77,3 @@
   13 Jul 2010; Markus Duft <mduft@gentoo.org> +suacomp-0.4.ebuild,
   +metadata.xml:
   initial add of suacomp to the tree. for interix-prefix only
-
diff --git a/sys-libs/suacomp/Manifest b/sys-libs/suacomp/Manifest
index 0d6428831db2..a63b77f11f97 100644
--- a/sys-libs/suacomp/Manifest
+++ b/sys-libs/suacomp/Manifest
@@ -1,17 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-DIST suacomp-0.6.13.tar.gz 35838 RMD160 9677636a07b90233cbde8ba872429c08b566db4f SHA1 01b661d27fe834344b4e133d7e1f156f4c4caf3b SHA256 e8f488cec531dd64b797900a10e13c35758fe20bc6ef97c3da538246318afd3f
-DIST suacomp-0.6.14.tar.gz 36712 RMD160 237ecf84dd642ffe25dc9c1ccc3c7d439da91856 SHA1 e1e5fd1f4eb64c98ba8453769e6990690a8d4fc7 SHA256 453c64c9c6c7f255a14fa19250696e7f3acc3a72498340b76eb681eb648df1a2
-EBUILD suacomp-0.6.13.ebuild 1347 RMD160 c0b594b43dad4bdaa43225bfc5030b992e3e2df7 SHA1 1f08a7755c0f727dd14e13331b672b063cd9b42c SHA256 d3c13987bf4603485140f6437fe5346d6ef4851edfa61e510348c3891b7e9cd5
-EBUILD suacomp-0.6.14.ebuild 1347 RMD160 685260d42770c475bda16bb9650192ef8c366848 SHA1 ad0dfeea2d3b8395b0b1dfccf6ab29efb88c7360 SHA256 40ad44f6e047b79f4239bbec5813438a71a41d870455dda7b520522d588860f8
-EBUILD suacomp-9999.ebuild 1264 RMD160 0be3e43bbe83649c501508e452e995c04ba1acf5 SHA1 06f554b142d13013a5ef0b8644f13fabd394d503 SHA256 32ffd23c3b27b1aeadacedafaac31429946d0b7566e5a4b833027f08a04f7a1e
-MISC ChangeLog 2420 RMD160 c1b3621b43f412718bc1de1d00004dee2f9ff7f4 SHA1 bfa56f83d970cc15c0dbe0301091c69be0b08bde SHA256 167660fe8552df7f98edbb3e9eb038b845061c435ea5675fd678b3fcc98d83f6
-MISC metadata.xml 538 RMD160 fa906d2572e4eeab1cca4a9eafc944d74c7f3dd5 SHA1 02a700407b8b1031d705519dd1d16d9202ec3d1b SHA256 02760475f0f64667b99c72846163425620ec0dca4d11cbcc152aaa500c192ede
+AUX suacomp-0.6.14-strtoll.patch 1456 SHA256 774318dfb6e7505362c03a240f38817bef7b28d59e562cb140579fba85fef2fb SHA512 603c49683d7cce6f6edc0b12a1aefddfffd0e9d3c57b34ae176fa94139d3b427bee5993f7d2cd35a575113a8c42becce8b49c4c334dc8cc8fe4902b49bf9cda3 WHIRLPOOL e21dea456f2017d7659d04a55ca329c09b07a5424d9987f6cd35599566a5cf91e8c42561026b426af29e97fedcc31ff87f5de1690b0785e7f5da37564c257f30
+DIST suacomp-0.6.13.tar.gz 35838 SHA256 e8f488cec531dd64b797900a10e13c35758fe20bc6ef97c3da538246318afd3f
+DIST suacomp-0.6.14.tar.gz 36712 SHA256 453c64c9c6c7f255a14fa19250696e7f3acc3a72498340b76eb681eb648df1a2
+EBUILD suacomp-0.6.13.ebuild 1347 SHA256 d3c13987bf4603485140f6437fe5346d6ef4851edfa61e510348c3891b7e9cd5 SHA512 07689aec3e67919135f0ba0dcd2b88fa814a6f7d68095eff73e7d4bc6ac8ee9f36d15d20fd29a9fa7c1ea1f7b026a98bfafa422ef9a9c6e23904d863a853ac91 WHIRLPOOL d42c0863201114c63eb66e46bdf9cf50aebb39f2ff5c7f8d8bf46c721dc9056d4246a087f8cfd72807fdd414aaff9170a07bdf7d850944f77425abbe3aae071a
+EBUILD suacomp-0.6.14.ebuild 1449 SHA256 7060134f4e66ea8686800357f5b5f739c0fc30056a8db8a42426785600f80c47 SHA512 e652ffd5570919746ed6c1add35a38b665e9188de8ec15138d0e7fd919bf3df0064b199ca2d07e844cd7bc6ecc68abe9c960db4fa8902d820d3057b425a37b8c WHIRLPOOL 907489fe527a22258873d2d2745c733a9b9818be8feea33bc908e58674f073e9b4f7de94e17bb49e9876fba5b4b7f6591f682baec91f1c97812c4609f978ed0d
+EBUILD suacomp-9999.ebuild 1264 SHA256 32ffd23c3b27b1aeadacedafaac31429946d0b7566e5a4b833027f08a04f7a1e SHA512 4575a365e8c72823fbc883b6e61abe75dadb81e142611b490e309f903d5abb7a435f392d8265ba6ee6e896656757971782153af9d007292d64685d265ff4df95 WHIRLPOOL d6f4fb1f783533891c68fa2217b8f97cc3087c012fe9001dc9a594957bce0001afb6d282954fdd150827cc85c795c8f9cbe9546052f281cb81cdb75097bd2ade
+MISC ChangeLog 2587 SHA256 9cba37a44e1307344c22cdc71e1888ace5f2034b347f477f4639ad7c04907097 SHA512 9c5193e6dd4949b241067141914245d5959c7ab09de763d8e4119400bb919ec4a7b442e46015a4bd307690288af6dae5924a9881aec31a13f578e9b0c20d8594 WHIRLPOOL 40521be8f154a7c6a8928cea40bc254cbad5916ad2e7c7263910d8d1604581c074802e0713f8aa1b4746aaa9b4790aca8cd7c7b2df4101cf8ea875d5bb494991
+MISC metadata.xml 538 SHA256 02760475f0f64667b99c72846163425620ec0dca4d11cbcc152aaa500c192ede SHA512 7d1ef5f798e04bbedbcb6503ab7d4b01c3c6e64572947ef1a6eaa8bf0d5247f4f8bea2f8e8a49ae1fbab14c3ca42272837aea6ab99399a689aaf083d04112188 WHIRLPOOL c4c1629e418c61d7aa6519dc00eb320804ce7985924eafc81c2acc3017aac2e3db8714727bc067ab8f7451b85d160b28691f81a31b28f2ea54d6295c12006f42
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (Darwin)
 
-iEYEARECAAYFAk+L22sACgkQLc0TWKYwzLjoywCfSW3E1ET0BDvSRMI5WW8F/Soe
-vAUAn0S/pHfEvmJzEabUAAvOnEok3qLc
-=e2Ur
+iEYEAREIAAYFAlBm8WQACgkQX3X2B8XHTonZdgCffwdeh5Yupa86AYSCKfCQnew1
++8MAoIJRAz/+4vRIs+l5ev62vOVzTx7r
+=+olO
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/suacomp/files/suacomp-0.6.14-strtoll.patch b/sys-libs/suacomp/files/suacomp-0.6.14-strtoll.patch
new file mode 100644
index 000000000000..16ee7f4e5c41
--- /dev/null
+++ b/sys-libs/suacomp/files/suacomp-0.6.14-strtoll.patch
@@ -0,0 +1,44 @@
+From a498772e5fe942eafe06ed62a00a21c4b99164b5 Mon Sep 17 00:00:00 2001
+From: David Holm <dholmster@gmail.com>
+Date: Fri, 14 Sep 2012 20:57:30 +0200
+Subject: [PATCH] Fixes build issues on SUA 6.0
+
+The prototypes for strto[u]ll.c in SUA 6.0 use C99 and are defined using (u_)quad_t. This will cause compilation to fail since there is a mismatch between stdlib.h and the implementation in suacomp. This change switches to the C99 definition and undefines strto[u]ll in case stdlib.h wants to map them to existing implementations.
+
+https://sourceforge.net/p/suacomp/tickets/1/
+---
+ strtoll.c  |    3 ++-
+ strtoull.c |    3 ++-
+ 2 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/strtoll.c b/strtoll.c
+index 12f9886..c9e34b8 100644
+--- a/strtoll.c
++++ b/strtoll.c
+@@ -9,7 +9,8 @@
+ #include <unistd.h>
+ #include <stdlib.h>
+ 
+-long long int strtoll(const char* nptr, char** endptr, int base) {
++#undef strtoll
++quad_t strtoll(const char* nptr, char** endptr, int base) {
+     long long int ret;
+     DT("enter: %p, %p, %d\n", nptr, endptr, base);
+ 
+diff --git a/strtoull.c b/strtoull.c
+index d0e0e67..622ee9b 100644
+--- a/strtoull.c
++++ b/strtoull.c
+@@ -9,7 +9,8 @@
+ #include <unistd.h>
+ #include <stdlib.h>
+ 
+-long long int strtoull(const char* nptr, char** endptr, int base) {
++#undef strtoull
++u_quad_t strtoull(const char* nptr, char** endptr, int base) {
+     long long int ret;
+     DT("enter: %p, %p, %d\n", nptr, endptr, base);
+ 
+-- 
+1.7.6.1
+
diff --git a/sys-libs/suacomp/suacomp-0.6.14.ebuild b/sys-libs/suacomp/suacomp-0.6.14.ebuild
index aaf5d53fbb4a..e79d16f31f03 100644
--- a/sys-libs/suacomp/suacomp-0.6.14.ebuild
+++ b/sys-libs/suacomp/suacomp-0.6.14.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/suacomp/suacomp-0.6.14.ebuild,v 1.1 2011/09/13 07:16:53 mduft Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/suacomp/suacomp-0.6.14.ebuild,v 1.2 2012/09/29 13:02:23 grobian Exp $
 
 EAPI=3
 
-inherit toolchain-funcs flag-o-matic
+inherit toolchain-funcs flag-o-matic eutils
 
 DESCRIPTION="library wrapping the interix lib-c to make it less buggy."
 HOMEPAGE="http://suacomp.sf.net"
@@ -41,6 +41,10 @@ pkg_setup() {
 	fi
 }
 
+src_prepare() {
+	[[ ${CHOST} == *-interix6* ]] && epatch "${FILESDIR}"/${P}-strtoll.patch
+}
+
 src_compile() {
 	emake all CC=$(tc-getCC) $(get_opts) CFLAGS="${CFLAGS}" || die "emake failed"
 }