From e74ffc2a88f02da3ced20db9362a055c4ba6bc92 Mon Sep 17 00:00:00 2001 From: Ian Stakenvicius Date: Tue, 12 Jan 2016 12:45:11 -0500 Subject: 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 | 93 -------------------------------------- sys-libs/ldb/ldb-1.1.24-r2.ebuild | 94 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 94 insertions(+), 93 deletions(-) delete mode 100644 sys-libs/ldb/ldb-1.1.24-r1.ebuild create mode 100644 sys-libs/ldb/ldb-1.1.24-r2.ebuild (limited to 'sys-libs') diff --git a/sys-libs/ldb/ldb-1.1.24-r1.ebuild b/sys-libs/ldb/ldb-1.1.24-r1.ebuild deleted file mode 100644 index 92aba6716a2b..000000000000 --- a/sys-libs/ldb/ldb-1.1.24-r1.ebuild +++ /dev/null @@ -1,93 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -PYTHON_COMPAT=( python2_7 ) -PYTHON_REQ_USE="threads" - -inherit python-single-r1 waf-utils multilib-minimal eutils - -DESCRIPTION="An LDAP-like embedded database" -HOMEPAGE="http://ldb.samba.org" -SRC_URI="http://www.samba.org/ftp/pub/${PN}/${P}.tar.gz" - -LICENSE="LGPL-3" -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}] - >=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}] - net-nds/openldap - !!=net-fs/samba-4.0.0[ldb] - ${PYTHON_DEPS} - " - -DEPEND="dev-libs/libxslt - doc? ( app-doc/doxygen ) - virtual/pkgconfig - ${RDEPEND}" - -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -WAF_BINARY="${S}/buildtools/bin/waf" - -MULTILIB_WRAPPED_HEADERS=( /usr/include/pyldb.h ) - -pkg_setup() { - python-single-r1_pkg_setup -} - -src_prepare() { - epatch "${FILESDIR}"/${P}-optional-python.patch - epatch_user - multilib_copy_sources -} - -multilib_src_configure() { - local myconf=( - --disable-rpath \ - --disable-rpath-install --bundled-libraries=NONE \ - --with-modulesdir="${EPREFIX}"/usr/$(get_libdir)/samba \ - --builtin-libraries=NONE - ) - if ! multilib_is_native_abi; then - myconf+=( --disable-python ) - fi - waf-utils_src_configure "${myconf[@]}" -} - -multilib_src_compile(){ - waf-utils_src_compile - multilib_is_native_abi && use doc && doxygen Doxyfile -} - -multilib_src_test() { - if multilib_is_native_abi; then - WAF_MAKE=1 \ - PATH=buildtools/bin:../../../buildtools/bin:$PATH:"${BUILD_DIR}"/bin/shared/private/ \ - LD_LIBRARY_PATH=$LD_LIBRARY_PATH:"${BUILD_DIR}"/bin/shared/private/:"${BUILD_DIR}"/bin/shared \ - waf test || die - fi -} - -multilib_src_install() { - waf-utils_src_install - - if multilib_is_native_abi && use doc; then - dohtml -r apidocs/html/* - doman apidocs/man/man3/*.3 - fi -} - -pkg_postinst() { - if has_version sys-auth/sssd; then - ewarn "You have sssd installed. It is known to break after ldb upgrades," - ewarn "so please try to rebuild it before reporting bugs." - ewarn "See https://bugs.gentoo.org/404281" - fi -} diff --git a/sys-libs/ldb/ldb-1.1.24-r2.ebuild b/sys-libs/ldb/ldb-1.1.24-r2.ebuild new file mode 100644 index 000000000000..d3323d376b19 --- /dev/null +++ b/sys-libs/ldb/ldb-1.1.24-r2.ebuild @@ -0,0 +1,94 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +PYTHON_COMPAT=( python2_7 ) +PYTHON_REQ_USE="threads" + +inherit python-single-r1 waf-utils multilib-minimal eutils + +DESCRIPTION="An LDAP-like embedded database" +HOMEPAGE="http://ldb.samba.org" +SRC_URI="http://www.samba.org/ftp/pub/${PN}/${P}.tar.gz" + +LICENSE="LGPL-3" +SLOT="0/${PV}" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd" +IUSE="doc" + +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}] + net-nds/openldap + !!=net-fs/samba-4.0.0[ldb] + ${PYTHON_DEPS} + " + +DEPEND="dev-libs/libxslt + doc? ( app-doc/doxygen ) + virtual/pkgconfig + ${RDEPEND}" + +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +WAF_BINARY="${S}/buildtools/bin/waf" + +MULTILIB_WRAPPED_HEADERS=( /usr/include/pyldb.h ) + +pkg_setup() { + python-single-r1_pkg_setup +} + +src_prepare() { + epatch "${FILESDIR}"/${P}-optional-python.patch + epatch_user + multilib_copy_sources +} + +multilib_src_configure() { + local myconf=( + --disable-rpath \ + --disable-rpath-install --bundled-libraries=NONE \ + --with-modulesdir="${EPREFIX}"/usr/$(get_libdir)/samba \ + --builtin-libraries=NONE + ) + if ! multilib_is_native_abi; then + myconf+=( --disable-python ) + fi + waf-utils_src_configure "${myconf[@]}" +} + +multilib_src_compile(){ + waf-utils_src_compile + multilib_is_native_abi && use doc && doxygen Doxyfile +} + +multilib_src_test() { + if multilib_is_native_abi; then + WAF_MAKE=1 \ + PATH=buildtools/bin:../../../buildtools/bin:$PATH:"${BUILD_DIR}"/bin/shared/private/ \ + LD_LIBRARY_PATH=$LD_LIBRARY_PATH:"${BUILD_DIR}"/bin/shared/private/:"${BUILD_DIR}"/bin/shared \ + waf test || die + fi +} + +multilib_src_install() { + waf-utils_src_install + + if multilib_is_native_abi && use doc; then + dohtml -r apidocs/html/* + doman apidocs/man/man3/*.3 + fi +} + +pkg_postinst() { + if has_version sys-auth/sssd; then + ewarn "You have sssd installed. It is known to break after ldb upgrades," + ewarn "so please try to rebuild it before reporting bugs." + ewarn "See https://bugs.gentoo.org/404281" + fi +} -- cgit v1.2.3-65-gdbad