sys-libs/gdbm: multi-abi support

Signed-off-by: Gregory M. Turner <gmt@be-evil.net>

2 files changed, 33 insertions, 37 deletions

diff --git a/sys-libs/gdbm/Manifest b/sys-libs/gdbm/Manifest
index a640181..2efc4d3 100644
--- a/sys-libs/gdbm/Manifest
+++ b/sys-libs/gdbm/Manifest
@@ -1,23 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX gdbm-1.8.3-build.patch 691 SHA256 be5b2a90e85bdfd1c2e24937510f303ed06def19ba074be502a9edc9c3eff4ca SHA512 36966cc1bf703ef891a24185846b3514d8a767555f1577906566d96cea18b7f007fdd960b027db09e1eafbad14c3a763fd695a71e07af6fa2a51f99ceea0b685 WHIRLPOOL a2d768c16bcd276665bf4a252eaf48c3fe5061038d0471b107edbe2799dc04613e4eaf54edd8b9c35fbd59693bb70b179bd87ea7fa00563384e6970f9b4fc6a7
 AUX gdbm-1.8.3-compat-linking.patch 611 SHA256 832cfffff5d1cb26cf3f2618014e8e1ff4d30153f34abda8db074788abef7dac SHA512 b8a6d2afa27c273710d5d1a7273d8f78f4068e3e89f3c24e304cc4e677a7f91c01a37f7db67cb0859266a4ddad1042cbab6c25f431efa130f348428a8bdbf193 WHIRLPOOL fcdfc61d44ea4bec721b86847c304dce83a708503bf12561f4b6afd1475d277963d6df3f70ea2a9e403bc6f78d7d7cbc41f7d0b4efd7394966320e63f77ee28f
 AUX gdbm-1.8.3-fix-install-ownership.patch 1567 SHA256 e08df8b252176475c47615fbe87e554fc7391b29192131aba03e91f687a8076c SHA512 4a96fd90775aa12a88d3d0c426389f61196c6d9b8191d8985eb71b69ce52778ebb4f0b163f67d0daedd6d19cd27be7faa19e330cf6714d08a530454f2a4427dc WHIRLPOOL d5bcbe3e012869b5c7f471f3f00c57d6e39333b1fd7382e1dbb652f8291946133bda764f3cf444a0e22f096a679c1fcce21042c9ed77928122a7aaf4387a04bb
 AUX gdbm-1.9.1-compat-link.patch 915 SHA256 a730f1f17713d1716cd68c20efd2d704b175348213ee322a45e5aab9873e0779 SHA512 583b1596abbe168d91440172708f091778d2bc6a86df87ef69f8a482a8811afd21dcd8a28ba2b67f2f36f81ae7e754a2ea8a9244fc9448963540a13867988556 WHIRLPOOL b5d62e4261b121274455180b3822662aa6b00b46c61e3a91bb1a84c01f18759ec50ace2055518abadb758bc3bedac93ec233c246807f02f870378c1d2b3b39ce
 DIST gdbm-1.10.tar.gz 655599 SHA256 23f8134c5b94bbfb06d756a6b78f074fba6e6028cf2fe01341d40b26db773441 SHA512 e93604a79d693ccc4be5ba4b41bb3f046186d95ebfdb075f8b201adde8405299cf34011c4863438bef2f5eda38304ad9ad562a56644b46c46036dc8f45b4dd9c WHIRLPOOL 3d71980caa96697c30679af99bcdaad0c595f15636c6ababe33dc9ff243101fd7f6cf25372dfb943c3ae91c5ab3364ca9599e16332ee3086abdd166fb1bef6f7
 DIST gdbm-1.8.3.tar.gz 228695 SHA256 cc340338a2e28b40058ab9eb5354a21d53f88a1582ea21ba0bb185c37a281dc9 SHA512 2a01751ee8f730db563b4f52185c72f1c7a4f66530d6736f05f7446153be685ea0bb6ea1d2bad16ce31547fea879dc48507ff65ad35b0973df9aa385713b10d7 WHIRLPOOL 9d2e402b2ec00cadfc64e40d87da095f293f157386abbe9a64ebe8b7a2af9b965546805826ffe3d5c88212dec0628ab2ae3ebef91de2da7fc69d0937d03d7075
-DIST gdbm-1.9.1.tar.gz 554843 SHA256 6025852637772b0699f2294b5f14fd4a084bca3c8161d29d64d1f30d6d1a9aed SHA512 4e491d956ed3212ab735d77463c7d62c16910d526951568ca728e03e4a184b5a9825d722e1a4b34d93a703fe31bf4c92972c9f7daad82670d85c2aa113b4c509 WHIRLPOOL f2aa9a7d65456c35a7b24e35601fffc8c55732f59e17802789a8e7303d2c07e92a38cf7167fbe4d25f2fa01313916994f5fe0b80e4b8c4e367666b70f0399cc3
-EBUILD gdbm-1.10.ebuild 1780 SHA256 dcc8a857fad9049b9b4670237a002e04e0e6e05fc989093cf6e012650a539739 SHA512 56ba8f3cb12a808f004489074568f110e26e587670cb04996a98ee9d7d48c2d83e9818a4814db902627c1dd5c1bf5fda89f3702382e4c2fb4a95f65c21f05eda WHIRLPOOL 66fcfe55d9530d01d0f9c490057282f8119274ca16889356c1f14398df63084e2915d10912e772b6334b776511d6f27aa8e9a8c06ae94974d7afde57f129fabf
-EBUILD gdbm-1.8.3-r3.ebuild 1171 SHA256 c9c4fb7821237ae2f6d9a45ebae1b07dd1864cbe8d8077f7690e9c5a5bb19ab0 SHA512 e50b9586a1bb1267dcc5b78c907ebab50cd626a448280bd1141121de712e51e7fb1a69e7bce74441d7f7a28cc3446dda14261b6f41604aadbc9466bbf3fda6ce WHIRLPOOL 44383f60aec3fdde368f71c7b6bf6db2e174677e8e3eef34c9933ed27e63bc9104dcc0eed72ca259a5036db10cef96ad886677926f656645af255e3c22884e11
-EBUILD gdbm-1.8.3-r4.ebuild 1969 SHA256 6a6b0dd702118bd9eb23074aa605f3e5a618a422570bde2d40bf1b6c37c66986 SHA512 942a45940becbbeb5faec68c1b5ffc35ab39b6cabddc4ad160d07cdafb40d5dc84a386d7a7915a2d3a969d0164632c8a4a4dab84e17afdcec4d9cb29e4299628 WHIRLPOOL cbfea841053d0037ef6704ac1cf466cb142eb545f866be6ab5e70924cc200d996702683ce5ccf6bca48f1aff7e69b9373a7b19530d7ea790c2fd236762884f85
-EBUILD gdbm-1.9.1-r2.ebuild 1894 SHA256 2ccf8fa8edf745715301e0903af0422f085a58743a80584738b8b697ab73eedc SHA512 ea74b6e0343c2558cf0bde10fe8315e0a50639154bbae5532ff9817e0c4ed62ee5efee7b26d941b890b500e0cd8905e40b8e9a0f1410bee0da7b7bf64a9afa26 WHIRLPOOL 57a13aa3a398bdfe39d4c797178802da017ae0196cff11e55029f01b9732f0c641c22633f9e560602527c02cb4605602cf32988988914f569d7fb10ec13f2f75
+EBUILD gdbm-1.10-r1.ebuild 1864 SHA256 3092ec71dfa617ee9581f1b5316dd5afe7595073c4aea260745d0fbb6d867734 SHA512 49d3e447ed750d5ad525a9e815ef26a4172f04aa18a5346ecc8105a162d39c6971a87570faae59f8ae6634cbea3eeaddf6825bacda28c12935aa91d6897462db WHIRLPOOL fd5506fdb8cb62837ab76365952ac6971b6c92311c5ffafc0a7d1ec08d0b71c1ab7420ddbd59d05cb58433ef7939cf6ae11611a6b5f973d7cab2f2af110e2ba7
 MISC ChangeLog 8582 SHA256 ba17af1b592ca6a702acd199669c03cb93f133dfb8c038f1673843fceafe14d5 SHA512 1a1a9d273664b9e5200984640616bbf2bbb81b786d4c2309598e745ae7dd0a113c76e005314f68b3f905728d67f6bca81d711cd47b03bdc2ffc430531925e7cb WHIRLPOOL fd79aa853620dce424f07e19f366ef8771309d90a67dd0595af11d49ffbb2bbcf1f08c0a1d4d9e6c5bffbcaaf825b536524ed46ead46369537ebae8cf78b900c
 MISC metadata.xml 382 SHA256 08df40c74ce04dcb73a182dbb283233242bd568c16b00b20c7eaa97da80c75e2 SHA512 d496626e7351cd4266055755ff7ec3c5ceff5b73ec9c2100c45ce3f7930224e651ea3b92146e9808f1026f8af43617c236e79266323037607872a7c76592a7f7 WHIRLPOOL 3a76dff01b89a3e9a4cd27f41fdc09f6a40a3dc048d7efb5f83e1ca1bbcec6af62409126b2c97f6b03cb147c2b4d4a3cc9002185c0663320b2e0b02567ac72cd
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iEYEAREIAAYFAlEhN5oACgkQ/ejvha5XGaMYQgCg76TRPENdgHEmVg5RXr/fiLgB
-RzIAn3BFrZjyAjGOyVfNfV3hYe6vBlbq
-=z3Yb
------END PGP SIGNATURE-----
diff --git a/sys-libs/gdbm/gdbm-1.10-r1.ebuild b/sys-libs/gdbm/gdbm-1.10-r1.ebuild
index e348fb7..64be950 100644
--- a/sys-libs/gdbm/gdbm-1.10-r1.ebuild
+++ b/sys-libs/gdbm/gdbm-1.10-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/gdbm/gdbm-1.10.ebuild,v 1.3 2013/02/17 20:03:35 zmedico Exp $
+# $Header: $
 
 EAPI="4"
 
-inherit libtool flag-o-matic
+inherit flag-o-matic autotools-multilib
 
 EX_P="${PN}-1.8.3"
 DESCRIPTION="Standard GNU database libraries"
@@ -14,46 +14,56 @@ SRC_URI="mirror://gnu/gdbm/${P}.tar.gz
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64"
 IUSE="+berkdb exporter static-libs"
-
+RDEPEND="abi_x86_32? (
+		!<=app-emulation/emul-linux-x86-baselibs-20130224-r9
+		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+	)"
 EX_S="${WORKDIR}"/${EX_P}
 
-src_prepare() {
-	elibtoolize
-}
-
 src_configure() {
 	# gdbm doesn't appear to use either of these libraries
 	export ac_cv_lib_dbm_main=no ac_cv_lib_ndbm_main=no
 
-	if use exporter ; then
-		pushd "${EX_S}" >/dev/null
-		append-lfs-flags
-		econf --disable-shared
-		popd >/dev/null
-	fi
+	ehook autotools-utils-pre_src_configure gdbm_pre_src_configure
 
-	econf \
+	autotools-multilib_src_configure \
 		--includedir="${EPREFIX}"/usr/include/gdbm \
-		--with-gdbm183-libdir="${EX_S}/.libs" \
-		--with-gdbm183-includedir="${EX_S}" \
 		$(use_enable berkdb libgdbm-compat) \
 		$(use_enable exporter gdbm-export) \
 		$(use_enable static-libs static)
 }
 
-src_compile() {
+gdbm_pre_src_configure() {
+	einfo "${FUNCNAME} invoked: pwd=\"$(pwd)\", EX_S=\"${EX_S}\""
 	if use exporter ; then
-		emake -C "${WORKDIR}"/${EX_P} libgdbm.la
+		append-lfs-flags
+		econf --disable-shared
 	fi
+	myeconfargs+=(
+		--with-gdbm183-libdir="${BUILD_DIR}"/.libs
+		--with-gdbm183-includedir="${BUILD_DIR}"
+	)
+	return 0
+}
+
+src_compile() {
+	ehook autotools-utils-pre_src_compile gdbm_pre_src_compile
+	autotools-multilib_src_compile
+}
 
-	emake
+gdbm_pre_src_compile() {
+	cd "${BUILD_DIR}"
+	if use exporter ; then
+		autotools-utils_src_compile -C "${BUILD_DIR}" libgdbm.la
+	fi
+	return 0
 }
 
 src_install() {
-	default
-	use static-libs || find "${ED}" -name '*.la' -delete
+	use static-libs || AUTOTOOLS_PRUNE_LIBTOOL_FILES=all
+	autotools-multilib_src_install
 	mv "${ED}"/usr/include/gdbm/gdbm.h "${ED}"/usr/include/ || die
 }