From e74ffc2a88f02da3ced20db9362a055c4ba6bc92 Mon Sep 17 00:00:00 2001 From: Ian Stakenvicius Date: Tue, 12 Jan 2016 12:45:11 -0500 Subject: [PATCH] sys-libs/ldb: resolve automagic header usage on libbsd by RDEPENDing on it The lib/replace code configures and depends on bsd/* headers depending solely on its existence; as libbsd is a non-optional dep for samba-4.2 and newer anyways, ensure it is installed now with matching MULTILIB_USDEP on non-fbsd to avoid the potential headers mis-matches between bsd/*.h and other unistd.h or types.h on the system. This should address bug 571622. Package-Manager: portage-2.2.26 --- sys-libs/ldb/{ldb-1.1.24-r1.ebuild => ldb-1.1.24-r2.ebuild} | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) rename sys-libs/ldb/{ldb-1.1.24-r1.ebuild => ldb-1.1.24-r2.ebuild} (95%) diff --git a/sys-libs/ldb/ldb-1.1.24-r1.ebuild b/sys-libs/ldb/ldb-1.1.24-r2.ebuild similarity index 95% rename from sys-libs/ldb/ldb-1.1.24-r1.ebuild rename to sys-libs/ldb/ldb-1.1.24-r2.ebuild index 92aba6716a2b..d3323d376b19 100644 --- a/sys-libs/ldb/ldb-1.1.24-r1.ebuild +++ b/sys-libs/ldb/ldb-1.1.24-r2.ebuild @@ -17,7 +17,8 @@ SLOT="0/${PV}" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd" IUSE="doc" -RDEPEND="dev-libs/popt[${MULTILIB_USEDEP}] +RDEPEND="!elibc_FreeBSD? ( dev-libs/libbsd[${MULTILIB_USEDEP}] ) + dev-libs/popt[${MULTILIB_USEDEP}] >=sys-libs/talloc-2.1.5[python,${MULTILIB_USEDEP}] >=sys-libs/tevent-0.9.26[python(+),${MULTILIB_USEDEP}] >=sys-libs/tdb-1.3.8[python,${MULTILIB_USEDEP}] -- 2.26.2