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

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

4 files changed, 149 insertions, 7 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/Manifest b/dev-libs/libmba/Manifest
index f66afd0e4c5f..3bab9fe680ca 100644
--- a/dev-libs/libmba/Manifest
+++ b/dev-libs/libmba/Manifest
@@ -1,14 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX libmba-0.9.1-qa.patch 2824 RMD160 86856b825d1c53a1c0d8a847568fa504771435e2 SHA1 c85c53856cf7ffc4b0c74728293adfe1703e2fea SHA256 f8d1343c8be2b3b2de568bce6a07c8d6df162f9c246dfdcfab7c5480e99e89d0
 DIST libmba-0.9.1.tar.gz 290080 RMD160 f13f99295347721628d06ec8824eae9f80515c4f SHA1 9787f02f0be5d1f4e61fb00c8bfc789116b5b7e9 SHA256 1482c6c1a32794d1c40df471d25006ee1cae5b07ebd76b0301268dddb8629394
+EBUILD libmba-0.9.1-r1.ebuild 947 RMD160 4a1886327c74a2947b632835c00155ca65793cf5 SHA1 c171372a29826eb54fce662a9df39680c62755b4 SHA256 9ea97ecc945eeae45b5e754cbb433f4bb665a74c46408e26bbe4f5da22a63f0f
 EBUILD libmba-0.9.1.ebuild 1066 RMD160 97310dbcf98469f5ce5043b2e85cbbcd5b8484c1 SHA1 2cb37f359d235eb8a3108da7f871c67d472b21e2 SHA256 837805401962afc2c24ccbd7b71cf097ceb233efaf725b47f592372361d22a79
-MISC ChangeLog 629 RMD160 e59925b6876e92abb4b39797162b95745e3e00a6 SHA1 1129e223838476467c982f55c01a8687b9a8c9f9 SHA256 f4e0e049d1b628dd4184d22b2689777eb2a1836a2bfdb4abd8e98d14371ed7b6
+MISC ChangeLog 876 RMD160 45ae1b3e7047f2c9494be61a91d908517ef8a5b6 SHA1 ddf8f06e5e98a9d13c53f13b13a76a6d08ce3422 SHA256 ae88486cc9db2d3414568eaa68586587a777f596de0d1371ad83e41bc210430d
 MISC metadata.xml 254 RMD160 ead1eab9abeaef08c710959cbfca90e51608d979 SHA1 8a77820fc93d56766e0653a776419a59509e5e62 SHA256 e34969f3f290037e6297cc1752634e8fda356dd6f7849e2372103728a3f4a5e9
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
+Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkkF9TgACgkQz974XjDVpbnEFQCfc9uBdcRBws/L1N0iPpbIZfxs
-CRQAoIU+xTNNKiYl4w3POppnRYaX9jPp
-=LmIP
+iJwEAQECAAYFAkweY5UACgkQIiMqcbOVdxTi3QP/R9c2BOIeIUZ6aiMpXTH025iq
+egxH6qOiQp7mhslSpsFmrXG8uIXVDXaBXcshhDp7i2iBsKuheM/NwTIanian6IXo
+dL0ch66rNKyVDWVCibDeNq8bLQzZq9/P0PK361HabuUR1hfjPnJQ9C9Vmy1YTSkI
+KRyC+MPuJ59go/Wlmv0=
+=/9FL
 -----END PGP SIGNATURE-----
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
+}