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

(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key A792A613)

3 files changed, 82 insertions, 1 deletions

diff --git a/dev-libs/libmba/ChangeLog b/dev-libs/libmba/ChangeLog
index 8019ec715b6e..30d181c66b4a 100644
--- 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/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
index 000000000000..4d5651cc5d12
--- /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
index 000000000000..94741f72439c
--- /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/*
+}