Enable multilib support, bug #488376. Acked by Chainsaw.

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xEFB4464E!

3 files changed, 96 insertions, 6 deletions

diff --git a/sys-libs/gdbm/ChangeLog b/sys-libs/gdbm/ChangeLog
index 134f9d4fbc25..facce8c17083 100644
--- a/sys-libs/gdbm/ChangeLog
+++ b/sys-libs/gdbm/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-libs/gdbm
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/gdbm/ChangeLog,v 1.64 2013/02/17 20:03:35 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/gdbm/ChangeLog,v 1.65 2013/11/25 13:43:27 mgorny Exp $
+
+*gdbm-1.10-r1 (25 Nov 2013)
+
+  25 Nov 2013; Michał Górny <mgorny@gentoo.org> +gdbm-1.10-r1.ebuild:
+  Enable multilib support, bug #488376. Acked by Chainsaw.
 
   17 Feb 2013; Zac Medico <zmedico@gentoo.org> gdbm-1.10.ebuild:
   Add ~arm-linux keyword.
diff --git a/sys-libs/gdbm/Manifest b/sys-libs/gdbm/Manifest
index a640181a5294..673b4e0f579c 100644
--- a/sys-libs/gdbm/Manifest
+++ b/sys-libs/gdbm/Manifest
@@ -8,16 +8,29 @@ AUX gdbm-1.9.1-compat-link.patch 915 SHA256 a730f1f17713d1716cd68c20efd2d704b175
 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-r1.ebuild 2036 SHA256 ac79cdb98118df94a4d8f349708adc08af75edf2fd1fb1a36df8054082024172 SHA512 7453a6c59fa510159ac665fbef8b17a54315f62fb9c148fdcc079fe38a55010d8bb4e201a7b6805ba6961237f84004ae8bacc6850e8187b6a4a312912b39f9c3 WHIRLPOOL a3a26f8ddbe61dfcfd08b7fe4de0ef467ea34d3ba328b1e277e9f8984bb9873d8aaf04ce40ff03193ff717809b74ea33a94d00bd6556751b0b3f9bc8445c09d1
 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
-MISC ChangeLog 8582 SHA256 ba17af1b592ca6a702acd199669c03cb93f133dfb8c038f1673843fceafe14d5 SHA512 1a1a9d273664b9e5200984640616bbf2bbb81b786d4c2309598e745ae7dd0a113c76e005314f68b3f905728d67f6bca81d711cd47b03bdc2ffc430531925e7cb WHIRLPOOL fd79aa853620dce424f07e19f366ef8771309d90a67dd0595af11d49ffbb2bbcf1f08c0a1d4d9e6c5bffbcaaf825b536524ed46ead46369537ebae8cf78b900c
+MISC ChangeLog 8742 SHA256 8d34eef9241a38b63d2f8d10a400c39ec5f129a9b70e7d6b8f8cf58dd81fc551 SHA512 308f48cf37a72661f8dc70497543efb376a75b1df27963e2eae98c13123a7de99c83b5ef24b630bccb265f23ea7ac940d75cab0bb9fe8de286e9d29615d396f0 WHIRLPOOL 948312c1b6e9c289ff609603da1f175651af2c52818aa06acb810d315888183f0fa8939b1b5d882639ba44539b39d8960e141b2ea2743d10db5c1dfd74874bad
 MISC metadata.xml 382 SHA256 08df40c74ce04dcb73a182dbb283233242bd568c16b00b20c7eaa97da80c75e2 SHA512 d496626e7351cd4266055755ff7ec3c5ceff5b73ec9c2100c45ce3f7930224e651ea3b92146e9808f1026f8af43617c236e79266323037607872a7c76592a7f7 WHIRLPOOL 3a76dff01b89a3e9a4cd27f41fdc09f6a40a3dc048d7efb5f83e1ca1bbcec6af62409126b2c97f6b03cb147c2b4d4a3cc9002185c0663320b2e0b02567ac72cd
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlEhN5oACgkQ/ejvha5XGaMYQgCg76TRPENdgHEmVg5RXr/fiLgB
-RzIAn3BFrZjyAjGOyVfNfV3hYe6vBlbq
-=z3Yb
+iQJ8BAEBCABmBQJSk1QFXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOIcIP/0TFDR2DPNYUYoRz3fontLQ/
+U/FgsShltnJhSEU3OYTNq3kuqiZgzjr+D8fLmlQfmw7j2dOCzrjgMLWpz8YCKMY5
+jdF2KArgm+qHcDARfvrhexKusAcDUM2YSQqoOu+MUZUPDSmxN1JpTKToXpPUJ/kL
+JUYY+S4Q6xIXG/mUVBOVu+P3V0XB3vYUG6qsJakKg03jZubnVzecqPObcLrZdNd/
+x5rwtBE5ABl0EBpDusMUTHg1ZsgvBXy8wuSl6G4ei715QjM0tAM9e5xG17JieYGq
+iuweN5zBj6xJG52EdhaKaWYwI2pUKR1okZMHSJzGTK3Jzx3te57xEAIE5KfQkExV
+UTMtb5EQlOR9ttkOgdi2pIZ2Yxeph++rKDg924zm8oa6i+LviJQz4MG5YOlycfA8
+MrUz+wHdbbODNFh76nCeiOSUrROdbvE8L+R0Yd4smB2xaQTINCIJS9uG4fyVStLU
+Hb67yrNmybaN2mdFyWr9L4R3Cd1+6Frb7Qq2cAP3orYhtF09AWRrtcCHZgzGa2HF
+rUt4ranWtY8B2SZcEh7zbqsyLGsx3ZtW+zcNr7UtH9evKxWmHQoh8cIiXkZv2TbN
+LKUHEYZx9NmxJ1hZkhMq4g/ThEjfLZQiKmuDbKFV2/pqd13/pEbnSVt6P+k7yJBB
+jdB1rJLeroWgbZnzXglG
+=FpG7
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/gdbm/gdbm-1.10-r1.ebuild b/sys-libs/gdbm/gdbm-1.10-r1.ebuild
new file mode 100644
index 000000000000..6d6281b24213
--- /dev/null
+++ b/sys-libs/gdbm/gdbm-1.10-r1.ebuild
@@ -0,0 +1,72 @@
+# 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-r1.ebuild,v 1.1 2013/11/25 13:43:27 mgorny Exp $
+
+EAPI="4"
+
+inherit flag-o-matic libtool multilib multilib-minimal
+
+EX_P="${PN}-1.8.3"
+DESCRIPTION="Standard GNU database libraries"
+HOMEPAGE="http://www.gnu.org/software/gdbm/"
+SRC_URI="mirror://gnu/gdbm/${P}.tar.gz
+	exporter? ( mirror://gnu/gdbm/${EX_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"
+IUSE="+berkdb exporter static-libs"
+
+RDEPEND="
+	abi_x86_32? (
+		!<=app-emulation/emul-linux-x86-baselibs-20131008-r4
+		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+	)"
+
+EX_S="${WORKDIR}"/${EX_P}
+
+src_prepare() {
+	elibtoolize
+}
+
+multilib_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 multilib_build_binaries && use exporter ; then
+		pushd "${EX_S}" >/dev/null
+		append-lfs-flags
+		econf --disable-shared
+		popd >/dev/null
+	fi
+
+	ECONF_SOURCE=${S} \
+	econf \
+		--includedir="${EPREFIX}"/usr/include/gdbm \
+		--with-gdbm183-libdir="${EX_S}/.libs" \
+		--with-gdbm183-includedir="${EX_S}" \
+		$(use_enable berkdb libgdbm-compat) \
+		$(multilib_build_binaries && use_enable exporter gdbm-export) \
+		$(use_enable static-libs static)
+}
+
+multilib_src_compile() {
+	if use exporter ; then
+		emake -C "${EX_S}" libgdbm.la
+	fi
+
+	emake
+}
+
+multilib_src_install_all() {
+	use static-libs || find "${ED}" -name '*.la' -delete
+	mv "${ED}"/usr/include/gdbm/gdbm.h "${ED}"/usr/include/ || die
+}
+
+pkg_preinst() {
+	preserve_old_lib libgdbm{,_compat}.so.{2,3} #32510
+}
+
+pkg_postinst() {
+	preserve_old_lib_notify libgdbm{,_compat}.so.{2,3} #32510
+}