Fixing multiple QA issues and --as-needed failure wrt bug 313673. Thanks Diego for reporting.

(Portage version: 2.1.8.3/cvs/Linux x86_64)

3 files changed, 140 insertions, 2 deletions

diff --git a/dev-libs/libmba/ChangeLog b/dev-libs/libmba/ChangeLog
index 7d28d4a09e4a..92906441fe91 100644
--- a/dev-libs/libmba/ChangeLog
+++ b/dev-libs/libmba/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-libs/libmba
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libmba/ChangeLog,v 1.3 2008/10/27 17:07:00 jokey Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libmba/ChangeLog,v 1.4 2010/06/20 18:52:58 xarthisius Exp $
+
+*libmba-0.9.1-r1 (20 Jun 2010)
+
+  20 Jun 2010; Kacper Kowalik <xarthisius@gentoo.org>
+  +libmba-0.9.1-r1.ebuild, +files/libmba-0.9.1-qa.patch:
+  Fixing multiple QA issues and --as-needed failure wrt bug 313673. Thanks
+  Diego for reporting.
 
   27 Oct 2008; Markus Ullmann <jokey@gentoo.org> libmba-0.9.1.ebuild:
   Fix emake call wrt bug #243922
diff --git a/dev-libs/libmba/files/libmba-0.9.1-qa.patch b/dev-libs/libmba/files/libmba-0.9.1-qa.patch
new file mode 100644
index 000000000000..16476dfd1e51
--- /dev/null
+++ b/dev-libs/libmba/files/libmba-0.9.1-qa.patch
@@ -0,0 +1,94 @@
+Addresing multiple QA issues:
+ - fixing CFLAGS, LDFLAGS, CC
+ - fixing parallel build
+ - fixing as-needed issues
+ - making static libs optional
+ - introducing make DESTDIR compatibility
+ - removing Makefile.PLATFORM bits, as they violate sandbox
+
+http://bugs.gentoo.org/show_bug.cgi?id=313673
+
+Patch written by Kacper Kowalik <xarthisius.kk@gmail.com>
+
+--- Makefile
++++ Makefile
+@@ -1,13 +1,13 @@
+ # Makefile for libmba
+ # Supported flags: -DVARRAY_INIT_SIZE=N -DUSE_WCHAR
+ 
+-MFLAGS     = -g -W1 -Isrc
++MFLAGS     = -Isrc
+ MKTOOL     = ./mktool
+ 
+-prefix     = /usr/local
++prefix     = $(DESTDIR)/usr
+ includedir = $(prefix)/include
+ libdir     = $(prefix)/lib
+-mandir     = $(prefix)/man
++mandir     = $(prefix)/share/man
+ LIBNAME    = mba
+ LIBVERS    = 0.9.1
+ ARNAME     = lib$(LIBNAME).a
+@@ -19,39 +19,49 @@
+ MAN        = diff.3m bitset.3m allocator.3m cfg.3m pool.3m varray.3m csv.3m text.3m path.3m suba.3m msgno.3m stack.3m linkedlist.3m hashmap.3m hexdump.3m shellout.3m eval.3m svsem.3m svcond.3m time.3m
+ MANGZ      = $(MAN:.3m=.3m.gz)
+ 
++.PHONY: all clean install uninstall install-ar uninstall-ar
+ .SUFFIXES: .pic.o .3m .3m.gz
+ 
+-all: mktool so ar
++ifeq ($(STATIC),1)
++all: $(MKTOOL) so ar
++install-ar: $(ARNAME)
++	-$(MKTOOL) -i $(ARNAME) $(libdir)
++uninstall-ar:
++	$(MKTOOL) -u $(ARNAME) $(libdir)
++else
++all: $(MKTOOL) so
++install-ar:
++uninstall-ar:
++endif
+ 
+-mktool:
++$(MKTOOL): mktool.c
+ 	$(CC) -g -o mktool mktool.c
+ 
+-ar: mktool $(OBJS)
++$(PICOBJS): $(MKTOOL)
++$(OBJS): $(MKTOOL)
++
++ar: $(OBJS)
+ 	ar $(ARFLAGS) $(ARNAME) $(OBJS)
+ 	ranlib $(ARNAME)
+-so: mktool $(PICOBJS)
+-	@$(MKTOOL) -l -v -libname $(LIBNAME) -libvers $(LIBVERS) -shared -soname -lutil $(PICOBJS)
++so: $(PICOBJS)
++	@$(MKTOOL) -l -v -libname $(LIBNAME) -libvers $(LIBVERS) -shared -soname $(LDFLAGS) $(PICOBJS) -lutil
+ 
+ .c.pic.o:
+-	@$(MKTOOL) -c -v $(MFLAGS) -fpic -c -o $*.pic.o $<
++	@$(MKTOOL) -c -v $(CFLAGS) $(MFLAGS) -fpic -c -o $*.pic.o $<
+ .c.o:
+-	@$(MKTOOL) -c -v $(MFLAGS) -c -o $*.o $<
++	@$(MKTOOL) -c -v $(CFLAGS) $(MFLAGS) -c -o $*.o $<
+ 
+-install: mktool
+-	-$(MKTOOL) -i $(ARNAME) $(libdir)
++install: install-ar
+ 	-$(MKTOOL) -i -libname $(LIBNAME) -libvers $(LIBVERS) $(libdir)
+ 	$(MKTOOL) -i $(HDRS) $(includedir)/mba
+ 	$(MKTOOL) -i docs/man/*.3m.gz $(mandir)/man3
+-	@-libdir=$(libdir) mandir="$(mandir)" MAN="$(MAN)" MANGZ="$(MANGZ)" $(MKTOOL) -m -v platform_specific_install
+ 	@echo
+ 	@echo installation successful
+-uninstall: mktool
+-	$(MKTOOL) -u $(ARNAME) $(libdir)
++uninstall: uninstall-ar
+ 	$(MKTOOL) -u -libname $(LIBNAME) -libvers $(LIBVERS) $(libdir)
+ 	$(MKTOOL) -u $(HDRS) $(includedir)/mba
+ 	rm -rf $(includedir)/mba
+ 	$(MKTOOL) -u $(MANGZ) $(mandir)/man3
+-	-@libdir=$(libdir) mandir="$(mandir)" MAN="$(MAN)" MANGZ="$(MANGZ)" $(MKTOOL) -m -v platform_specific_uninstall
+ 	@echo
+ 	@echo de-installation successful
+ 
diff --git a/dev-libs/libmba/libmba-0.9.1-r1.ebuild b/dev-libs/libmba/libmba-0.9.1-r1.ebuild
new file mode 100644
index 000000000000..397cd5e3120d
--- /dev/null
+++ b/dev-libs/libmba/libmba-0.9.1-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2010 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-r1.ebuild,v 1.1 2010/06/20 18:52:58 xarthisius Exp $
+
+EAPI="2"
+
+inherit eutils multilib toolchain-funcs
+
+DESCRIPTION="A library of generic C modules."
+HOMEPAGE="http://www.ioplex.com/~miallen/libmba/"
+SRC_URI="http://www.ioplex.com/~miallen/libmba/dl/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="static-libs"
+
+pkg_setup(){
+	use static-libs && export STATIC="1"
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-qa.patch
+	tc-export CC
+	sed -i -e "s:gcc:${CC}:g" mktool.c || die
+	sed -i -e "s:\$(prefix)/lib:\$(prefix)/$(get_libdir):" Makefile || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+
+	dodoc README.txt docs/*.txt || die
+	dohtml -r docs/*.html docs/www/* docs/ref || die
+
+	insinto /usr/share/doc/${PF}/examples
+	doins examples/* || die
+}