From: Akinori Hattori <hattya@gentoo.org>
Date: Sat, 13 Aug 2011 12:03:15 +0000 (+0000)
Subject: add static-libs use flag. fixes bug #359557.
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=2417b711d2f859324352bc4a67cc92b273e0adc2;p=gentoo.git

add static-libs use flag. fixes bug #359557.

Package-Manager: portage-2.1.10.3/cvs/Linux i686
---

diff --git a/dev-db/tinycdb/ChangeLog b/dev-db/tinycdb/ChangeLog
index ecd88ae9c5b4..ee4c952589a8 100644
--- a/dev-db/tinycdb/ChangeLog
+++ b/dev-db/tinycdb/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-db/tinycdb
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/tinycdb/ChangeLog,v 1.25 2010/04/11 08:26:13 hattya Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/tinycdb/ChangeLog,v 1.26 2011/08/13 12:03:15 hattya Exp $
+
+*tinycdb-0.77-r1 (13 Aug 2011)
+
+  13 Aug 2011; Akinori Hattori <hattya@gentoo.org> +tinycdb-0.77-r1.ebuild,
+  +files/tinycdb-0.77-gentoo.diff:
+  add static-libs use flag. fixes bug #359557.
 
   11 Apr 2010; Akinori Hattori <hattya@gentoo.org> -tinycdb-0.74.ebuild,
   -tinycdb-0.76.ebuild, -files/tinycdb-libbase.diff:
diff --git a/dev-db/tinycdb/Manifest b/dev-db/tinycdb/Manifest
index 6e6d6b5619f1..cbeb00565b62 100644
--- a/dev-db/tinycdb/Manifest
+++ b/dev-db/tinycdb/Manifest
@@ -1,4 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX tinycdb-0.77-gentoo.diff 738 RMD160 04a9f54b7aea716fbecfc4f8ffc404bf5a2c2361 SHA1 6e29d36998a7a4ee1fd766412a2f94290bafd793 SHA256 7b327ea78bdac31fd65fae5a4a850de0ed3284a812b30035dc26ba9c8b2db6d8
 DIST tinycdb_0.77.tar.gz 37728 RMD160 803581ebb84cc4db7abe16b3fb5b978c05652553 SHA1 2873a5f614e925e284cd71a7216a0d10340aec9c SHA256 82bc3ccf0afed0978472a070ce4506667b8035e65d0dc24388e33858d39b6bc6
+EBUILD tinycdb-0.77-r1.ebuild 1064 RMD160 39caebc818d5c9ede6c20604a7734df255c677e4 SHA1 ee47180b4d1dfd1b25dd66f3bbe04eec456e6471 SHA256 0f1df4383d0190641574bd31a3ed7d588890579eafc2d77190a8b859d40da717
 EBUILD tinycdb-0.77.ebuild 979 RMD160 7b0406e1f3a8b05ebd367f739a5599b8d2bf3c61 SHA1 aadc669f3a3b78ee454fd21ff64e541989e994f2 SHA256 c8865bcc1a11031c8c0e63623412ce9214690cc156ec44e5e60230d2b30aa311
-MISC ChangeLog 2666 RMD160 f87fcc51d8fbf74db4ec5036fceff536e2bd0ede SHA1 21f35e5a35442d39d51d4ece7e97091f8502f067 SHA256 b15840578df1447f6f7ed9287c89a538aef9bcf35f22a1439d7850aaee51525d
+MISC ChangeLog 2857 RMD160 074c3d12ec7e90eeb43b07e51e569d065394d06a SHA1 ed8b053ed6b032ec2b3dbb7d68422424e6404452 SHA256 6baf023e46a78b6f317ccb3105476de8c15e58d04161a11e016be280cffb6b7b
 MISC metadata.xml 230 RMD160 8e45109dbaf3c193afdb318002c1def7cb62dfa1 SHA1 9bd7aea9376c216b3f55303d1334a337cd6f06a2 SHA256 87fc07a55ee7814a0505ae1c24a871ac29ae7691c5383550647382a2b26277ae
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk5GaA0ACgkQL46suuyRem0AhwCfVXo5fTwC+HtFokeUYUjPbu7q
+47YAoIIMWzya3PzyJwq1Nv++M2/m4W1c
+=MVN1
+-----END PGP SIGNATURE-----
diff --git a/dev-db/tinycdb/files/tinycdb-0.77-gentoo.diff b/dev-db/tinycdb/files/tinycdb-0.77-gentoo.diff
new file mode 100644
index 000000000000..87ab43ff5c82
--- /dev/null
+++ b/dev-db/tinycdb/files/tinycdb-0.77-gentoo.diff
@@ -0,0 +1,28 @@
+--- tinycdb-0.77.orig/Makefile
++++ tinycdb-0.77/Makefile
+@@ -34,7 +34,7 @@
+ CDB_USELIB = $(LIB)
+ NSS_USELIB = $(PICLIB)
+ LIBMAP = $(LIBBASE).map
+-INSTALLPROG = cdb
++INSTALLPROG = cdb-shared
+ 
+ # The following assumes GNU CC/LD -
+ # used for building shared libraries only
+@@ -59,7 +59,7 @@
+  ChangeLog NEWS
+ DEBIANFILES = debian/control debian/rules debian/copyright debian/changelog
+ 
+-all: static
++all: shared
+ static: staticlib cdb
+ staticlib: $(LIB)
+ nss: $(NSS_CDB)
+@@ -128,6 +128,7 @@
+ 
+ do_install = \
+  while [ "$$1" ] ; do \
++   if [ ! -f $$1 ]; then shift 4; continue; fi; \
+    if [ .$$4 = .- ]; then f=$$1; else f=$$4; fi; \
+    d=$(DESTDIR)$$3 ; echo installing $$1 to $$d/$$f; \
+    [ -d $$d ] || mkdir -p $$d || exit 1 ; \
diff --git a/dev-db/tinycdb/tinycdb-0.77-r1.ebuild b/dev-db/tinycdb/tinycdb-0.77-r1.ebuild
new file mode 100644
index 000000000000..05cdba484e2a
--- /dev/null
+++ b/dev-db/tinycdb/tinycdb-0.77-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/tinycdb/tinycdb-0.77-r1.ebuild,v 1.1 2011/08/13 12:03:15 hattya Exp $
+
+EAPI="4"
+
+inherit eutils multilib toolchain-funcs
+
+DESCRIPTION="TinyCDB is a very fast and simple package for creating and reading constant data bases"
+HOMEPAGE="http://www.corpit.ru/mjt/tinycdb.html"
+SRC_URI="http://www.corpit.ru/mjt/${PN}/${P/-/_}.tar.gz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~x86"
+IUSE="static-libs"
+RESTRICT="test"
+
+RDEPEND="!dev-db/cdb"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gentoo.diff
+	# fix multilib support
+	sed -i "/^libdir/s:/lib:/$(get_libdir):" Makefile
+}
+
+src_compile() {
+	local targets="shared"
+	use static-libs && targets="${targets} staticlib piclib"
+
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS} ${LDFLAGS}" ${targets}
+}
+
+src_install() {
+	local targets="install-sharedlib"
+	use static-libs && targets="${targets} install-piclib"
+
+	einstall ${targets}
+	dodoc ChangeLog NEWS
+}