Fix amd64 multilib support and marked stable for amd64 wrt bug #302064

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

diff --git a/dev-db/tinycdb/ChangeLog b/dev-db/tinycdb/ChangeLog
index a3d8adcabb2caa91f212d2258a50c8ad13d7fe8a..47a4b22dbfb6d04f389b7ad327733ae81047b1fe 100644 (file)
--- a/dev-db/tinycdb/ChangeLog
+++ b/dev-db/tinycdb/ChangeLog
@@ -1,6 +1,9 @@
 # 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.22 2010/02/12 00:38:52 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/tinycdb/ChangeLog,v 1.23 2010/03/14 10:15:05 hwoarang Exp $
+
+  14 Mar 2010; Markos Chandras <hwoarang@gentoo.org> tinycdb-0.77.ebuild:
+  Fix amd64 multilib support and marked stable for amd64 wrt bug #302064
 
   12 Feb 2010; Jeroen Roovers <jer@gentoo.org> tinycdb-0.77.ebuild:
   Stable for HPPA (bug #302064).

diff --git a/dev-db/tinycdb/Manifest b/dev-db/tinycdb/Manifest
index 0f7f95f8426a69434127054251dec8b45b90eb84..5354f11c8c8a6bb87a6b832c8a8d8fa7db5a53b5 100644 (file)
--- a/dev-db/tinycdb/Manifest
+++ b/dev-db/tinycdb/Manifest
@@ -4,6 +4,6 @@ DIST tinycdb_0.76.tar.gz 35777 RMD160 f95919d9f92a525fdc9d74ceee58ac8f5504237d S
 DIST tinycdb_0.77.tar.gz 37728 RMD160 803581ebb84cc4db7abe16b3fb5b978c05652553 SHA1 2873a5f614e925e284cd71a7216a0d10340aec9c SHA256 82bc3ccf0afed0978472a070ce4506667b8035e65d0dc24388e33858d39b6bc6
 EBUILD tinycdb-0.74.ebuild 778 RMD160 14a9d9f6ca4312ce6fe560221b44a28d32ec1a84 SHA1 1119da76803710a5b2a429de2d29d4d887272308 SHA256 0b5f3fa86d91ab6275d3390d84d4364f561dac5c057070a73b4674cd866e2f0e
 EBUILD tinycdb-0.76.ebuild 818 RMD160 348cb373f8e826b0b361cf599072ad2c9f29bc15 SHA1 e8727e70d88094b7120dd509f868b5c04e0ccb30 SHA256 7f9be6b04d22b53890ec082eb902f9da6dbe650ac0d60b7a584bf17dcdb8d3c9
-EBUILD tinycdb-0.77.ebuild 814 RMD160 a2ba53e3401bfdc7e84d7d0b8052f0d9daf6d2da SHA1 040e4e097b99b2b5a894fba141511d0bc0f1dfab SHA256 6aea4a9de184962d511d228bb7d00a08dd202365cd7bf98f7df0ebd4fa5dc256
-MISC ChangeLog 2251 RMD160 c2ae5a38e9cf56abbcd7402b23e02e1258eeeac3 SHA1 3e3a8fa86373a97dcf92b5e9c0d197638af70902 SHA256 09180a4e1cfbdf629e505ea2ab746a80b91257a475ad156e152a85f865cc099c
+EBUILD tinycdb-0.77.ebuild 980 RMD160 03f174b95b9e9285f52ddc6bb1472387c38bff6e SHA1 c57be2a2b6d087663fbc3b6e585a7373cf102075 SHA256 ec0857ad6e154f6b19d2fa5f30e06ac47109228b4b470632a5acec76eed8d1f6
+MISC ChangeLog 2404 RMD160 90015037a78dc5992dabe6ecccb503f56e450aad SHA1 f090b003a28b76325bd31fd7a60a1b06171bc9ad SHA256 1055698051977b15408d6bbe26da38f1d7af394107469dbb1561b4f1a9808a9e
 MISC metadata.xml 230 RMD160 8e45109dbaf3c193afdb318002c1def7cb62dfa1 SHA1 9bd7aea9376c216b3f55303d1334a337cd6f06a2 SHA256 87fc07a55ee7814a0505ae1c24a871ac29ae7691c5383550647382a2b26277ae

diff --git a/dev-db/tinycdb/tinycdb-0.77.ebuild b/dev-db/tinycdb/tinycdb-0.77.ebuild
index 4bffec34625cc4640425e089e693dde986fc415e..b4bf5c95ed6ab5881292914554dd68cadb9485a9 100644 (file)
--- a/dev-db/tinycdb/tinycdb-0.77.ebuild
+++ b/dev-db/tinycdb/tinycdb-0.77.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/tinycdb/tinycdb-0.77.ebuild,v 1.4 2010/02/12 00:38:52 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/tinycdb/tinycdb-0.77.ebuild,v 1.5 2010/03/14 10:15:05 hwoarang Exp $
 
-inherit eutils toolchain-funcs
+inherit eutils toolchain-funcs multilib
 
 IUSE=""
 
@@ -18,10 +18,13 @@ SLOT="0"
 DEPEND="!dev-db/cdb"
 
 src_compile() {
-
+       # fix multilib support
+       sed -i "/^libdir/s:\/lib:\/$(get_libdir):" Makefile \
+               || die "failed to patch Makefile"
        emake \
                CC="$(tc-getCC)" \
-               CFLAGS="${CFLAGS}" \
+               CFLAGS="${CFLAGS} ${LDFLAGS}" \
+               libdir="$(get_libdir)" \
                staticlib \
                sharedlib \
                piclib \