Fix building against sys-libs/glibc-2.20 (bug #535838).

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

diff --git a/dev-libs/libmba/ChangeLog b/dev-libs/libmba/ChangeLog
index 8019ec715b6ed39275938c15b92063c2b7c1e742..30d181c66b4aa07dae15d1bce751ad6e9c7a226b 100644 (file)
--- a/dev-libs/libmba/ChangeLog
+++ b/dev-libs/libmba/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/libmba
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libmba/ChangeLog,v 1.10 2015/01/07 09:50:42 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libmba/ChangeLog,v 1.11 2015/01/07 10:28:50 jer Exp $
+
+*libmba-0.9.1-r3 (07 Jan 2015)
+
+  07 Jan 2015; Jeroen Roovers <jer@gentoo.org> +libmba-0.9.1-r3.ebuild,
+  +files/libmba-0.9.1-glibc-2.20.patch:
+  Fix building against sys-libs/glibc-2.20 (bug #535838).
 
   07 Jan 2015; Jeroen Roovers <jer@gentoo.org> files/libmba-0.9.1-qa.patch:
   Ensure make fails on mktool -i failure.

diff --git a/dev-libs/libmba/Manifest b/dev-libs/libmba/Manifest
index 4e597e8415df57734a813a0c0b55fc5241f95617..50e845437095f6d37c6ab30db1616d7a94c364ea 100644 (file)
--- a/dev-libs/libmba/Manifest
+++ b/dev-libs/libmba/Manifest
@@ -1,15 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX libmba-0.9.1-glibc-2.20.patch 1039 SHA256 72c0f0d02a464b0e3588e98710ab81e5cccbd6fb0427802a2ba67f769db95058 SHA512 b0d0ea1425dd4dbba685eee62609f0627c4d8a579a566d52d1c7f333a92109cf700faaba8ed0f0697d08409feb14ceb5bebf9a799c23e9de1aef388ba1ba4b95 WHIRLPOOL 4d0bc564626dd3939966c8dc4a6ee57058c608c5edae811a5f363db5e4eaa353b59e5a6ef1f8bd130c540097213591ff6cd6a073135a4f14b6178402f2f5f466
 AUX libmba-0.9.1-qa.patch 2927 SHA256 cfe43906d41d1f7a7868c94cbd4bcf39989bed22bf6ed9fc95806133ad1635bc SHA512 b5886f89c4ea4739e6bfe34e9f8026946ffbbc619922cbd25bab0d7c5df3fefbaf1f198f1321feaf5bbffa79951c58b329cf1d47f4f7ee0f3014de4434c179ea WHIRLPOOL 14259b1a934fe91d24bf79ed6b01007602f00044f65108d17ff7a7d612f8a58b0029884ba5773c2e07eb0ed1979ea95859981c185fcb349a6df8a2ae5adf99ec
 DIST libmba-0.9.1.tar.gz 290080 SHA256 1482c6c1a32794d1c40df471d25006ee1cae5b07ebd76b0301268dddb8629394 SHA512 28696e6066cb6c54434e1a35576c1e2430e3b83a478fddeabb20ddf1d8b889edac023de15090762fb95a759ebb9d2d8fcf1b0d19ec22f6a98ef2780400456da6 WHIRLPOOL 3dab2a36821049859d9f6e65af70fee8756c94e5135b6070d589fa46e8d95849221231d9b80cf6df4e81b254b80e8a27072da4ba5b227f252f80312ff7265cd3
 EBUILD libmba-0.9.1-r2.ebuild 863 SHA256 3283e392d9a0a05b1ca486cdcebc1a80005954138e78ab6fc3cd84a51c0a2888 SHA512 3f39bc01f0abca1713cd49eceec4a54718d7a6126957beaf301faa931112e738f094ccd43986803cf385061d9955a60c9913e176f88bcbbcc1cefdbe6e68682c WHIRLPOOL aa4e51f44bc5026b7295aceab99e0bfc03868a9d935df70efef508a29bbd4bc8dfd93770f994547956e5dbf73d63ffcfcdbed1cb6df7ed41ec4d3bed60071763
-MISC ChangeLog 1697 SHA256 94ea19a72210d2b0528c7c4d0cec2868774ad657fd012c0c1cec821f3574d27d SHA512 a70f376af68d3f7307485a0f554ce54ffdddd378867c227e4ca209814b881958d07393fcdf2d18f9443a1c88c808527fdddf016797cf010fd93d1d94f6e3c483 WHIRLPOOL 3c726a51415c7123c5470ba8a59e6259fb78df026d8bc4fec0eaa2458271d8033bd002177a8dc0d2a89a22129ca4148cb62ac521fbdc3ba84c61368a4171243d
+EBUILD libmba-0.9.1-r3.ebuild 1015 SHA256 71ce7e87545af61ba74e18858293cefcef63cb33a3188db4b8a969d29ff721c2 SHA512 02162cb7dd885b487484f9631937877c203921b03995892c160b163b8a037f44fd332c7ee0b93d13ae694f6f8e84dc330dc8eefc4e45f61a523cf633446f76d9 WHIRLPOOL 66844d9a016fcca0547304ba721ebd4e80d86b0f50e73d817c87bde0c2e9ace3e8eaa70f83d0e1d238c43bb18f6428c48a2d05f2e79ac4ad14a05f77524ad5f3
+MISC ChangeLog 1900 SHA256 cd285c5e0023d7addacc62d3bdf3f5e64f22451b965d950ad390c6b8426c3a92 SHA512 a00d730a5090baa7d30471e8afccd40d7bf210da03757c5e576740ad7e90ecc43d2ad1e6f639d32e38de3da3aac4da16a53e90783b9967bd45f82e4e6c7df978 WHIRLPOOL e8df974a4e4b2f20ea3c2023c514679cd3b6176bbfe2a447eb3c3c62c3e9df560579bacc874fa4529b6a09d460cd32e42d9bbd45413f55b9f730c79a2ef685f4
 MISC metadata.xml 214 SHA256 0e019c1dee563e5b23815be471ae1b65fcaf721a91ec48037446d41ca787d3e5 SHA512 701b8c51f43f8660d40700929c243a2dae9f19dcbc7b8eca877e20eadc1ae2e0c84f7c7d8c3cb576055c1a49a55e9c759ef469eeda67026ce252d341937f6691 WHIRLPOOL 977119e736e0795137df14faae681f7fa07ba8297a19ef4a7d7b93de7efceaed16f7103f179a762be41b8849c33c535b55d16d2fd0ea795df0525592752e0156
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlStAXMACgkQVWmRsqeSphMZTwCdFbXYTbNzNt4cyKW22Efw8ALj
-ypAAnR/Hj+UYf7b6gDKvnSvUEaAmPmMP
-=9QxZ
+iEYEAREIAAYFAlStCmQACgkQVWmRsqeSphPETwCeLUUEPpNi4ZeGQAri/SMlNtbJ
+YTMAnjv68qaNO2om8bYsNB7t6jElIN+o
+=j2hd
 -----END PGP SIGNATURE-----

diff --git a/dev-libs/libmba/files/libmba-0.9.1-glibc-2.20.patch b/dev-libs/libmba/files/libmba-0.9.1-glibc-2.20.patch
new file mode 100644 (file)
index 0000000..4d5651c
--- /dev/null
+++ b/dev-libs/libmba/files/libmba-0.9.1-glibc-2.20.patch
@@ -0,0 +1,34 @@
+--- a/src/mba/text.h
++++ b/src/mba/text.h
+@@ -315,31 +315,6 @@
+ /* "dumb" snprintf returns -1 on overflow */
+ LIBMBA_API int dsnprintf(char *str, size_t size, const char *format, ...);
+ 
+-#if !defined(_GNU_SOURCE)
+-
+-#if !defined(_BSD_SOURCE) && \
+-      !defined(_XOPEN_SOURCE_EXTENDED) && \
+-      !defined(_WIN32) && \
+-      !(defined(__APPLE__) && defined(__MACH__))
+-LIBMBA_API char *strdup(const char *s);
+-#endif
+-
+-LIBMBA_API wchar_t *wcsdup(const wchar_t *s);
+-LIBMBA_API size_t strnlen(const char *s, size_t maxlen);
+-
+-#if (__STDC_VERSION__ < 199901L) && \
+-      !defined(_BSD_SOURCE) && \
+-      (_XOPEN_VERSION < 500) && \
+-      !(defined(__APPLE__) && defined(__MACH__))
+-#include <stdarg.h>
+-int vsnprintf(char *str, size_t size, const char *format, va_list ap);
+-#endif
+-
+-LIBMBA_API size_t wcsnlen(const wchar_t *s, size_t maxlen);
+-LIBMBA_API int wcscasecmp(const wchar_t *s1, const wchar_t *s2);
+-
+-#endif /* _GNU_SOURCE */
+-
+ /*
+ wchar_t *wcschrnul(const wchar_t *s, wchar_t wc);
+ int wcsncasecmp(const wchar_t *s1, const wchar_t *s2, size_t n);

diff --git a/dev-libs/libmba/libmba-0.9.1-r3.ebuild b/dev-libs/libmba/libmba-0.9.1-r3.ebuild
new file mode 100644 (file)
index 0000000..94741f7
--- /dev/null
+++ b/dev-libs/libmba/libmba-0.9.1-r3.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libmba/libmba-0.9.1-r3.ebuild,v 1.1 2015/01/07 10:28:50 jer Exp $
+
+EAPI=5
+inherit eutils flag-o-matic multilib toolchain-funcs
+
+DESCRIPTION="A library of generic C modules"
+LICENSE="MIT"
+HOMEPAGE="http://www.ioplex.com/~miallen/libmba/"
+SRC_URI="${HOMEPAGE}dl/${P}.tar.gz"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="static-libs"
+
+src_prepare() {
+       use static-libs && export STATIC="1"
+
+       epatch "${FILESDIR}"/${P}-qa.patch
+       epatch "${FILESDIR}"/${P}-glibc-2.20.patch
+
+       tc-export CC
+       sed -i -e "s:gcc:${CC}:g" mktool.c || die
+
+       # prevent reinventing strdup(), wcsdup() and strnlen()
+       append-cflags -D_XOPEN_SOURCE=500
+}
+
+src_compile() {
+       emake LIBDIR="$(get_libdir)"
+}
+
+src_install() {
+       emake DESTDIR="${D}" LIBDIR="$(get_libdir)" install
+
+       dodoc README.txt docs/*.txt
+       dohtml -r docs/*.html docs/www/* docs/ref
+
+       insinto /usr/share/doc/${PF}/examples
+       doins examples/*
+}