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

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 92aba6716a2b62b9fb2c86dfb0b1a4c61bbc8004..d3323d376b19d91ef99f6b70ea16c534a027a6ff 100644 (file)
--- 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}]