diff options
Diffstat (limited to 'sys-libs/ldb')
-rw-r--r-- | sys-libs/ldb/Manifest | 12 | ||||
-rw-r--r-- | sys-libs/ldb/ldb-2.3.2-r1.ebuild | 120 | ||||
-rw-r--r-- | sys-libs/ldb/ldb-2.4.1-r1.ebuild | 120 | ||||
-rw-r--r-- | sys-libs/ldb/ldb-2.4.3.ebuild | 121 | ||||
-rw-r--r-- | sys-libs/ldb/ldb-2.5.0-r1.ebuild | 121 | ||||
-rw-r--r-- | sys-libs/ldb/ldb-2.6.1.ebuild (renamed from sys-libs/ldb/ldb-2.5.1.ebuild) | 76 |
6 files changed, 63 insertions, 507 deletions
diff --git a/sys-libs/ldb/Manifest b/sys-libs/ldb/Manifest index c520ed6d2e24..738d889b2d22 100644 --- a/sys-libs/ldb/Manifest +++ b/sys-libs/ldb/Manifest @@ -2,24 +2,16 @@ AUX ldb-1.1.31-fix_PKGCONFIGDIR-when-python-disabled.patch 701 BLAKE2B dd2398f9e AUX ldb-1.5.2-optional_packages.patch 1441 BLAKE2B 0b9413cd9690aae2b2eb26f097d2509c0bbe0fc59f81bab22add57ffe0c603a8fb0c9be038d06693dcbb1d3817d4ad97a5931120b18bd9783efaac599fe0ccbc SHA512 2f313c3377385279ca3da6db21d926df0559d971e1fd42f8cce57b4001078c3817f472b85088a1f3b0e5ddcdfbbfd943199485d6e4a00412f62c883c6ea04afd AUX ldb-2.4.2-skip-32bit-time_t-tests.patch 1308 BLAKE2B 1ff687160b92c5395c7838ade8af32ba77637a2b18153d146b9e1496f96ec9c411cc5e5f9721a8dea1730118e6574a091ee7fd1edca1830cc54c5d4fddb007ab SHA512 27a35123cb9a1f6e39b88c91de8241ecfc0f0ed125a235ba26b95767dc3121d176b267ba97b1579e5b68cfb9e3879f40326f0163a31e311f01a1b2eb7751caf4 AUX ldb-2.5.2-skip-waf-tevent-check.patch 606 BLAKE2B 9cfe1afd1adfca20e1fcdead2f2a60f52a64f181b85c227be6cf9c9373a64528afbe4e9db1970e8316d5bddf76ba9395a75b194f27bcf25eb4d2e7695c5530eb SHA512 19028447cbde09a425f1a07fe2d9a2a6f16cada1785e6e9684a8b573db5705b6694a29cd6f5480047360920562fcc654fc10faad39e73c565f7d475558cb57c8 -DIST ldb-2.3.2.tar.gz 1718583 BLAKE2B 48b9fb77e414af0f9fffe0cda9cf49971d79ed8b66213b01b73f53a61969e03f9e6426a04a33ff70da906c814470d8fa356902a68aa1169d969cc597e8c234d7 SHA512 be324e8f20db50529634548451dbc5f95f26a701e124bfb40ae2b0a5069de78b7c5c1a66222097209ea24ef6077373d996e67c00257a5a05198f1b81bf0ed53e DIST ldb-2.3.3.tar.gz 1719542 BLAKE2B 2a5cfe3ddac2054d167c2857e0cd92e0f88d2c196f9285c029b2a525d781025a956a296bd6d793b65f848188cf7adf70f99542999061a85be473b3fc3b2856f1 SHA512 ffb50208fe971afd544a431b79905ec8fce67d78d20c3fcfb8345a56f3b278fb664bc48079d7239a8ca5b70aae8b32076b6007cb63e080cd536e9fe458efeccd DIST ldb-2.3.4.tar.gz 1721000 BLAKE2B be54c0bffdc910029b5e324578ed2f1e0350dfd19202749cb0c05dff20f3786d0cb612f18ef6f9534c7e34e94c0a283adb3dd935ca3c3252aba0290faca590ef SHA512 e0128a0e36411424fbb092ce24f503f530d0bc75dc98f31e0f457df34c3c2c01c23456d55722eca9965ff89f4dec5cde36c1dabbfaf3ddee536ff4d1dedb1c1d -DIST ldb-2.4.1.tar.gz 1719769 BLAKE2B 868d3dcc51bd8272d99f2335ed1af2e37506b6a175254f1aca37f758488ba0997e37419a7d8c81def77698128307df97de26d4807ac78c34088f7a623f8d9e68 SHA512 14ab5397d28c369142b2ccf55a2ab4e678a3fe6e018541cfce46241f8226400bc169360bbef254fae4410a6e15024ae986f02298d3d324e3d3a8b88801bf76d7 DIST ldb-2.4.2.tar.gz 1720169 BLAKE2B d144218bf62dde57560df8b8a641e9f58bee001fdfa7b1527d9eb9a1a55e428662db81912173cbcdb9f993c0b316faab7d758a4878beeff1daadd487e9aa44a9 SHA512 77705ad284eed9105c9aba0459d2e48cd66ca19b657a55f7513e10281dd2e96540d24d1c8df53adc84109a918900687dc75b635cda05c4e788424ed71b5ff989 -DIST ldb-2.4.3.tar.gz 1729139 BLAKE2B 90dbb41ec6db19c562f275cdbf8fe273763633ca6a86d5a2f2428fc2063f5f88fcae23543f588f4df16ae5315e597145eecce3d87b616f8a27c0df91ab8bf81c SHA512 681433c5bbd1cc1fcddc35403c538f1511a83a7555b9113ac9247c6a22718ad6d7b21a86def50e6b5df91c9c8e04f2c45ffd264cd0ad1a715dc4b85681569622 DIST ldb-2.4.4.tar.gz 1726595 BLAKE2B c01440e7032dbd3f7b735cb8d2078d7e1dbb56370bd1defe5f170eff006d3979daa654698e6e046c0583288dacd2cda9a5cde249fd6382db52c4aadb83f55e34 SHA512 2e4c762525eee9db40083b21e2a23f9cdfad5d2969cc628b3ea5414f9ec1be2c12d0aa65137cd8d8a5395c0414166ba14fc3dd57d53c533596762d80b9c561f4 -DIST ldb-2.5.0.tar.gz 1722847 BLAKE2B 880a5a516b0b423854f8a3f9c54da89e4640f8462ccc54a7b147c70c3a9eb073dc9e914d1906ab914a9ddd9b9aa0e7d177ef3ecb4c0b506f5417db931b017849 SHA512 f16a235f1409e06266c51735ac645cf2708d31dd731ee7b95d6778498b115f4252b0a528952e620767d1616a4e1e7c5f2cdc69f3fa32d79288cf14da2f52a010 -DIST ldb-2.5.1.tar.gz 1736209 BLAKE2B f06df9878ca664a456859464895e91c21da55c340e6dc94dc1bae22002e1c93ce9c7c87e3435b362e01e7d3d407d4968a529445d465a3d37ecf95f969866b40b SHA512 679ad695d4467a38e6cb87ba2b7d61049a42c59792b39f0a40256456ac673849adf58dc0759a89be982b80bb4a0834d34b51779424f7b997a53ea95f02f410ad DIST ldb-2.5.2.tar.gz 1730347 BLAKE2B a0d3a9ae02f79c27b396314b804195ecd37b8bcd843fb94f9813a69fb15773db94ed2210f4102e395333562c2dccebabde1c2dcc0c2fceac97dfa31b2ad97e3d SHA512 02ae1246f99d9b6d6b33c5030488aa46c6abb535b4da4b13799a62b49d32c490b7c088ef41c0bc5a1b2f7263c680faceb8033827834cb6f66916adcdb5be421c -EBUILD ldb-2.3.2-r1.ebuild 2942 BLAKE2B d2495240018b7ecece8c88092c30ea64f411ea0f073f0ff2404ca6184fe931ada8342ea3beffd710fb0d3c137174cc01fba37d73d7884ad11edba84855f2ae08 SHA512 8711a2758689c818b66af5548af9881cf217839d5ea951cbcdbc83531ec602a9b39e1d2b12e8452e60691f09ef4e9db0d0d639e7d4a45d16cc7e75db583c714b +DIST ldb-2.6.1.tar.gz 1740497 BLAKE2B 3e831e4689297f3415928507c4c498cba937df104f1e94792a66691a2c0fefa641989badc1d89b0030d164eff5fdb0b3c75646f12961808e37c54d741f745a76 SHA512 7b920c5ec1252446584caeedf9ec18aeb5c1b689c2ecc8ae65c0d5b64bf0bca0cbaa887c07fca90b36b16904e3a08534fc513fec6bac288e80f94d2980c36211 EBUILD ldb-2.3.3.ebuild 2942 BLAKE2B d2495240018b7ecece8c88092c30ea64f411ea0f073f0ff2404ca6184fe931ada8342ea3beffd710fb0d3c137174cc01fba37d73d7884ad11edba84855f2ae08 SHA512 8711a2758689c818b66af5548af9881cf217839d5ea951cbcdbc83531ec602a9b39e1d2b12e8452e60691f09ef4e9db0d0d639e7d4a45d16cc7e75db583c714b EBUILD ldb-2.3.4.ebuild 3010 BLAKE2B 632921f7638af2e4b226b67daf4a8129aa939261e1f2dd9000b86be4027a2e415b532b26b1a6356c5da0d2e89eb54617e218e7aba768fab8815d2829660cf29f SHA512 23a97f3a216f9059da3e0181d5c30bd2409675ac0d18a099d6e3b1a8dacba1e9733ef33d0b7aafadd201621783adf4df8ccb6eb5206b61604c11ca6942d2cb43 -EBUILD ldb-2.4.1-r1.ebuild 2943 BLAKE2B e96f5909024e90dd48096bd1a80d123460cd86c6a1743372992cdab7ed758f0759f889f558ce999cd493b625a231f8185852e18cf678f086bc221a61f895e887 SHA512 60ffaadddc5007e6c3aa8cbad369b20e5691b26ed163e747196cc7c1fb40ee74477ea00e022cfd94ff69eb9c911aaa51945d793913aa3056321b8026bd38bb66 EBUILD ldb-2.4.2-r1.ebuild 3000 BLAKE2B b792c10c41f0f6aa6e05ee45fc59bfb88c7bdec2a3e6c191a374b387e9b4d169b9179fcf698e8d0856b4335dff27741e1d6873a013f298faf3e73889a7210671 SHA512 a9b6fe64a246d67c6193a2d14377a479a4dca9c851b9c183984c217dcfb32a0a5e15bf32ba5f373eb6aa2c4d106c2403f11c39123685ddd001c93072b6cb3e7b -EBUILD ldb-2.4.3.ebuild 3007 BLAKE2B 543d57e1e3e50a57fdde0a15003fbd04990b16300df7e38b0be8021549f57e2bbfc30417a81b8519ca47d236cfbf3be3bf10d8dbeeff2b5d06e575ab9acff22b SHA512 71027d7877c6af0db3b859aa3271aefb3e9bb0134d732393e5c7d6a2b14da9a55d255fac0e04de271caf269a9d627f4203a932ed13d74137558d1c7adfcccc51 EBUILD ldb-2.4.4.ebuild 3067 BLAKE2B 367048331bd26f4920b2b4d6d514bfc11a4ece835eb6939ff397c47998a7d8b9f552b2297209df23dc0712ae755043c4596405af15dee84cbf090bf3d38e2ac7 SHA512 13dc06b1f368da58fdc3b920fe94d051babc57b836a08dc97edddc0b15b4e9456b41486ba54107a8201fd653c465562440758e60c82e7cc931ab4ce07ed53396 -EBUILD ldb-2.5.0-r1.ebuild 3007 BLAKE2B 0abb5aa964f1b945d2bddd1154421bf35d24e9fb78dde2b0ae34b4495326142dbda601c1aa2579bdfb81face8bf6072f0dafb676524d2aa3c1f2e9947c7a9cf7 SHA512 ff46752cb5c33374665b52eef69398821f7c463deaa1a5c8c05115b94fb97cc56c805df49826f09ded208adf91a50799fa9f43e878f36291676ff7e2c9f917a7 -EBUILD ldb-2.5.1.ebuild 3007 BLAKE2B 170849834a556b081cbc072f591d766eaf65d930165d3cee11cc01de81eb8325b15cdc8e4e2abd083e630f6c956bf70140982172c360d0f49c1a818d8551cfa1 SHA512 62f423a99c35d367122e6edae52aa76a387d569c824bd2cbf4b4c22221be655926b3db3e7b5d0230b7ba34c376c9a274feacc78855e00ded0580f4e1ac605a93 EBUILD ldb-2.5.2.ebuild 3074 BLAKE2B ca2228344bada5c0f6a2625f246adc4d276ce0bd361c66ecfa2c4efc1ff26999058abf1b372aa94443ac144ce1dc068a57d2d501dab2998c7d2b860121ee43da SHA512 6481ffaff1571d1f68db2d5d8f1d4c49fb533ff7ab0781b980226ebf2aeb31521af4caf8588fc4cb926df69d8c8f85e50af67032b1ef98f5ef0670de20e0626b +EBUILD ldb-2.6.1.ebuild 4544 BLAKE2B d22cfccbd5938706d0c4103d8fdfcaca1b815c72e8ce5281b5558720516ba9559dab1780ccb71c9aa6cb8162d7849c9d9b0eda3ef241974529fa7c664fcb44b8 SHA512 3e43cd3373baeb6370196da88614c3551b596d79f1824685ff58e888a5aa6e4731025d374c7ae3bad89f93dc59c695e8e61d91d0794fbb1c33f85e27b0e1c6d5 MISC metadata.xml 526 BLAKE2B 004dbbf0286ced4bcd404eb3caf091f973e67e00b9230d2399f07dcb31d93a423045b353c1813958da151cded2f52996608de1b4294e3cb90cb8da0ac8877f9f SHA512 9f8008b5b57e5f73e79df68d828f1644edb0a154fa97504c3088301aa60e6ba3ac83a2e06d55d14c06cded89196dd635598f1d767ca93398cbf9610af3b49038 diff --git a/sys-libs/ldb/ldb-2.3.2-r1.ebuild b/sys-libs/ldb/ldb-2.3.2-r1.ebuild deleted file mode 100644 index 49ea629050ba..000000000000 --- a/sys-libs/ldb/ldb-2.3.2-r1.ebuild +++ /dev/null @@ -1,120 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{8..9} ) -PYTHON_REQ_USE="threads(+)" -inherit python-single-r1 waf-utils multilib-minimal - -DESCRIPTION="LDAP-like embedded database" -HOMEPAGE="https://ldb.samba.org" -SRC_URI="https://samba.org/ftp/pub/${PN}/${P}.tar.gz" - -LICENSE="LGPL-3" -SLOT="0/${PV}" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86" -IUSE="doc ldap +lmdb python test" - -REQUIRED_USE="${PYTHON_REQUIRED_USE} - test? ( python )" - -RESTRICT="!test? ( test )" - -RDEPEND=" - dev-libs/libbsd[${MULTILIB_USEDEP}] - dev-libs/popt[${MULTILIB_USEDEP}] - >=dev-util/cmocka-1.1.3[${MULTILIB_USEDEP}] - >=sys-libs/talloc-2.3.2[${MULTILIB_USEDEP}] - >=sys-libs/tdb-1.4.3[${MULTILIB_USEDEP}] - >=sys-libs/tevent-0.10.2[${MULTILIB_USEDEP}] - ldap? ( net-nds/openldap:= ) - lmdb? ( >=dev-db/lmdb-0.9.16:=[${MULTILIB_USEDEP}] ) - python? ( - ${PYTHON_DEPS} - sys-libs/talloc[python,${PYTHON_SINGLE_USEDEP}] - sys-libs/tdb[python,${PYTHON_SINGLE_USEDEP}] - sys-libs/tevent[python,${PYTHON_SINGLE_USEDEP}] - ) -" -DEPEND="${RDEPEND} - virtual/libcrypt -" -BDEPEND="${PYTHON_DEPS} - dev-libs/libxslt - virtual/pkgconfig - doc? ( app-doc/doxygen ) -" - -WAF_BINARY="${S}/buildtools/bin/waf" - -MULTILIB_WRAPPED_HEADERS=( /usr/include/pyldb.h ) - -PATCHES=( - "${FILESDIR}"/${PN}-1.5.2-optional_packages.patch - "${FILESDIR}"/${PN}-1.1.31-fix_PKGCONFIGDIR-when-python-disabled.patch -) - -pkg_setup() { - # Package fails to build with distcc - export DISTCC_DISABLE=1 - - # waf requires a python interpreter - python-single-r1_pkg_setup -} - -src_prepare() { - default - multilib_copy_sources -} - -multilib_src_configure() { - local myconf=( - $(usex ldap '' --disable-ldap) - $(usex lmdb '' --without-ldb-lmdb) - --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 ) - else - use python || 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 - doman apidocs/man/man3/*.3 - docinto html - dodoc -r apidocs/html/. - fi - - use python && python_optimize #726454 -} - -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-2.4.1-r1.ebuild b/sys-libs/ldb/ldb-2.4.1-r1.ebuild deleted file mode 100644 index eae274809755..000000000000 --- a/sys-libs/ldb/ldb-2.4.1-r1.ebuild +++ /dev/null @@ -1,120 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{8..10} ) -PYTHON_REQ_USE="threads(+)" -inherit python-single-r1 waf-utils multilib-minimal - -DESCRIPTION="LDAP-like embedded database" -HOMEPAGE="https://ldb.samba.org" -SRC_URI="https://samba.org/ftp/pub/${PN}/${P}.tar.gz" - -LICENSE="LGPL-3" -SLOT="0/${PV}" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86" -IUSE="doc ldap +lmdb python test" - -REQUIRED_USE="${PYTHON_REQUIRED_USE} - test? ( python )" - -RESTRICT="!test? ( test )" - -RDEPEND=" - dev-libs/libbsd[${MULTILIB_USEDEP}] - dev-libs/popt[${MULTILIB_USEDEP}] - >=dev-util/cmocka-1.1.3[${MULTILIB_USEDEP}] - >=sys-libs/talloc-2.3.3[${MULTILIB_USEDEP}] - >=sys-libs/tdb-1.4.4[${MULTILIB_USEDEP}] - >=sys-libs/tevent-0.11.0[${MULTILIB_USEDEP}] - ldap? ( net-nds/openldap:= ) - lmdb? ( >=dev-db/lmdb-0.9.16:=[${MULTILIB_USEDEP}] ) - python? ( - ${PYTHON_DEPS} - sys-libs/talloc[python,${PYTHON_SINGLE_USEDEP}] - sys-libs/tdb[python,${PYTHON_SINGLE_USEDEP}] - sys-libs/tevent[python,${PYTHON_SINGLE_USEDEP}] - ) -" -DEPEND="${RDEPEND} - virtual/libcrypt -" -BDEPEND="${PYTHON_DEPS} - dev-libs/libxslt - virtual/pkgconfig - doc? ( app-doc/doxygen ) -" - -WAF_BINARY="${S}/buildtools/bin/waf" - -MULTILIB_WRAPPED_HEADERS=( /usr/include/pyldb.h ) - -PATCHES=( - "${FILESDIR}"/${PN}-1.5.2-optional_packages.patch - "${FILESDIR}"/${PN}-1.1.31-fix_PKGCONFIGDIR-when-python-disabled.patch -) - -pkg_setup() { - # Package fails to build with distcc - export DISTCC_DISABLE=1 - - # waf requires a python interpreter - python-single-r1_pkg_setup -} - -src_prepare() { - default - multilib_copy_sources -} - -multilib_src_configure() { - local myconf=( - $(usex ldap '' --disable-ldap) - $(usex lmdb '' --without-ldb-lmdb) - --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 ) - else - use python || 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 - doman apidocs/man/man3/*.3 - docinto html - dodoc -r apidocs/html/. - fi - - use python && python_optimize #726454 -} - -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-2.4.3.ebuild b/sys-libs/ldb/ldb-2.4.3.ebuild deleted file mode 100644 index 54d9456e59cd..000000000000 --- a/sys-libs/ldb/ldb-2.4.3.ebuild +++ /dev/null @@ -1,121 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{8..10} ) -PYTHON_REQ_USE="threads(+)" -inherit python-single-r1 waf-utils multilib-minimal - -DESCRIPTION="LDAP-like embedded database" -HOMEPAGE="https://ldb.samba.org" -SRC_URI="https://samba.org/ftp/pub/${PN}/${P}.tar.gz" - -LICENSE="LGPL-3" -SLOT="0/${PV}" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" -IUSE="doc ldap +lmdb python test" - -REQUIRED_USE="${PYTHON_REQUIRED_USE} - test? ( python )" - -RESTRICT="!test? ( test )" - -RDEPEND=" - dev-libs/libbsd[${MULTILIB_USEDEP}] - dev-libs/popt[${MULTILIB_USEDEP}] - >=dev-util/cmocka-1.1.3[${MULTILIB_USEDEP}] - >=sys-libs/talloc-2.3.3[${MULTILIB_USEDEP}] - >=sys-libs/tdb-1.4.4[${MULTILIB_USEDEP}] - >=sys-libs/tevent-0.11.0[${MULTILIB_USEDEP}] - ldap? ( net-nds/openldap:= ) - lmdb? ( >=dev-db/lmdb-0.9.16:=[${MULTILIB_USEDEP}] ) - python? ( - ${PYTHON_DEPS} - sys-libs/talloc[python,${PYTHON_SINGLE_USEDEP}] - sys-libs/tdb[python,${PYTHON_SINGLE_USEDEP}] - sys-libs/tevent[python,${PYTHON_SINGLE_USEDEP}] - ) -" -DEPEND="${RDEPEND} - virtual/libcrypt -" -BDEPEND="${PYTHON_DEPS} - dev-libs/libxslt - virtual/pkgconfig - doc? ( app-doc/doxygen ) -" - -WAF_BINARY="${S}/buildtools/bin/waf" - -MULTILIB_WRAPPED_HEADERS=( /usr/include/pyldb.h ) - -PATCHES=( - "${FILESDIR}"/${PN}-1.5.2-optional_packages.patch - "${FILESDIR}"/${PN}-1.1.31-fix_PKGCONFIGDIR-when-python-disabled.patch - "${FILESDIR}"/${PN}-2.4.2-skip-32bit-time_t-tests.patch -) - -pkg_setup() { - # Package fails to build with distcc - export DISTCC_DISABLE=1 - - # waf requires a python interpreter - python-single-r1_pkg_setup -} - -src_prepare() { - default - multilib_copy_sources -} - -multilib_src_configure() { - local myconf=( - $(usex ldap '' --disable-ldap) - $(usex lmdb '' --without-ldb-lmdb) - --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 ) - else - use python || 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 - doman apidocs/man/man3/*.3 - docinto html - dodoc -r apidocs/html/. - fi - - use python && python_optimize #726454 -} - -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-2.5.0-r1.ebuild b/sys-libs/ldb/ldb-2.5.0-r1.ebuild deleted file mode 100644 index 4b4ed4c7fa5b..000000000000 --- a/sys-libs/ldb/ldb-2.5.0-r1.ebuild +++ /dev/null @@ -1,121 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{8..10} ) -PYTHON_REQ_USE="threads(+)" -inherit python-single-r1 waf-utils multilib-minimal - -DESCRIPTION="LDAP-like embedded database" -HOMEPAGE="https://ldb.samba.org" -SRC_URI="https://samba.org/ftp/pub/${PN}/${P}.tar.gz" - -LICENSE="LGPL-3" -SLOT="0/${PV}" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" -IUSE="doc ldap +lmdb python test" - -REQUIRED_USE="${PYTHON_REQUIRED_USE} - test? ( python )" - -RESTRICT="!test? ( test )" - -RDEPEND=" - dev-libs/libbsd[${MULTILIB_USEDEP}] - dev-libs/popt[${MULTILIB_USEDEP}] - >=dev-util/cmocka-1.1.3[${MULTILIB_USEDEP}] - >=sys-libs/talloc-2.3.3[${MULTILIB_USEDEP}] - >=sys-libs/tdb-1.4.5[${MULTILIB_USEDEP}] - >=sys-libs/tevent-0.11.0[${MULTILIB_USEDEP}] - ldap? ( net-nds/openldap:= ) - lmdb? ( >=dev-db/lmdb-0.9.16:=[${MULTILIB_USEDEP}] ) - python? ( - ${PYTHON_DEPS} - sys-libs/talloc[python,${PYTHON_SINGLE_USEDEP}] - sys-libs/tdb[python,${PYTHON_SINGLE_USEDEP}] - sys-libs/tevent[python,${PYTHON_SINGLE_USEDEP}] - ) -" -DEPEND="${RDEPEND} - virtual/libcrypt -" -BDEPEND="${PYTHON_DEPS} - dev-libs/libxslt - virtual/pkgconfig - doc? ( app-doc/doxygen ) -" - -WAF_BINARY="${S}/buildtools/bin/waf" - -MULTILIB_WRAPPED_HEADERS=( /usr/include/pyldb.h ) - -PATCHES=( - "${FILESDIR}"/${PN}-1.5.2-optional_packages.patch - "${FILESDIR}"/${PN}-1.1.31-fix_PKGCONFIGDIR-when-python-disabled.patch - "${FILESDIR}"/${PN}-2.4.2-skip-32bit-time_t-tests.patch -) - -pkg_setup() { - # Package fails to build with distcc - export DISTCC_DISABLE=1 - - # waf requires a python interpreter - python-single-r1_pkg_setup -} - -src_prepare() { - default - multilib_copy_sources -} - -multilib_src_configure() { - local myconf=( - $(usex ldap '' --disable-ldap) - $(usex lmdb '' --without-ldb-lmdb) - --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 ) - else - use python || 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 - doman apidocs/man/man3/*.3 - docinto html - dodoc -r apidocs/html/. - fi - - use python && python_optimize #726454 -} - -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-2.5.1.ebuild b/sys-libs/ldb/ldb-2.6.1.ebuild index bfd7de97a612..78ec93f70bf1 100644 --- a/sys-libs/ldb/ldb-2.5.1.ebuild +++ b/sys-libs/ldb/ldb-2.6.1.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 PYTHON_COMPAT=( python3_{8..10} ) PYTHON_REQ_USE="threads(+)" @@ -13,21 +13,24 @@ SRC_URI="https://samba.org/ftp/pub/${PN}/${P}.tar.gz" LICENSE="LGPL-3" SLOT="0/${PV}" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" IUSE="doc ldap +lmdb python test" REQUIRED_USE="${PYTHON_REQUIRED_USE} - test? ( python )" + test? ( lmdb python )" RESTRICT="!test? ( test )" +TALLOC_VERSION="2.3.4" +TDB_VERSION="1.4.7" +TEVENT_VERSION="0.13.0" + RDEPEND=" dev-libs/libbsd[${MULTILIB_USEDEP}] dev-libs/popt[${MULTILIB_USEDEP}] - >=dev-util/cmocka-1.1.3[${MULTILIB_USEDEP}] - >=sys-libs/talloc-2.3.3[${MULTILIB_USEDEP}] - >=sys-libs/tdb-1.4.6[${MULTILIB_USEDEP}] - >=sys-libs/tevent-0.11.0[${MULTILIB_USEDEP}] + >=sys-libs/talloc-${TALLOC_VERSION}[${MULTILIB_USEDEP}] + >=sys-libs/tdb-${TDB_VERSION}[${MULTILIB_USEDEP}] + >=sys-libs/tevent-${TEVENT_VERSION}[${MULTILIB_USEDEP}] ldap? ( net-nds/openldap:= ) lmdb? ( >=dev-db/lmdb-0.9.16:=[${MULTILIB_USEDEP}] ) python? ( @@ -37,8 +40,10 @@ RDEPEND=" sys-libs/tevent[python,${PYTHON_SINGLE_USEDEP}] ) " -DEPEND="${RDEPEND} +DEPEND=" + ${RDEPEND} virtual/libcrypt + test? ( >=dev-util/cmocka-1.1.3[${MULTILIB_USEDEP}] ) " BDEPEND="${PYTHON_DEPS} dev-libs/libxslt @@ -54,35 +59,75 @@ PATCHES=( "${FILESDIR}"/${PN}-1.5.2-optional_packages.patch "${FILESDIR}"/${PN}-1.1.31-fix_PKGCONFIGDIR-when-python-disabled.patch "${FILESDIR}"/${PN}-2.4.2-skip-32bit-time_t-tests.patch + "${FILESDIR}"/${PN}-2.5.2-skip-waf-tevent-check.patch ) pkg_setup() { # Package fails to build with distcc export DISTCC_DISABLE=1 + export PYTHONHASHSEED=1 # waf requires a python interpreter python-single-r1_pkg_setup } +check_samba_dep_versions() { + actual_talloc_version=$(sed -En '/^VERSION =/{s/[^0-9.]//gp}' lib/talloc/wscript || die) + if [[ ${actual_talloc_version} != ${TALLOC_VERSION} ]] ; then + eerror "Source talloc version: ${TALLOC_VERSION}" + eerror "Ebuild talloc version: ${actual_talloc_version}" + die "Ebuild needs to fix TALLOC_VERSION!" + fi + + actual_tdb_version=$(sed -En '/^VERSION =/{s/[^0-9.]//gp}' lib/tdb/wscript || die) + if [[ ${actual_tdb_version} != ${TDB_VERSION} ]] ; then + eerror "Source tdb version: ${TDB_VERSION}" + eerror "Ebuild tdb version: ${actual_tdb_version}" + die "Ebuild needs to fix TDB_VERSION!" + fi + + actual_tevent_version=$(sed -En '/^VERSION =/{s/[^0-9.]//gp}' lib/tevent/wscript || die) + if [[ ${actual_tevent_version} != ${TEVENT_VERSION} ]] ; then + eerror "Source tevent version: ${TEVENT_VERSION}" + eerror "Ebuild tevent version: ${actual_tevent_version}" + die "Ebuild needs to fix TEVENT_VERSION!" + fi +} + src_prepare() { default + + check_samba_dep_versions + multilib_copy_sources } multilib_src_configure() { + # When specifying libs for samba build you must append NONE to the end to + # stop it automatically including things + local bundled_libs="NONE" + + # We "use" bundled cmocka when we're not running tests as we're + # not using it anyway. Means we avoid making users install it for + # no reason. bug #802531 + if ! use test; then + bundled_libs="cmocka,${bundled_libs}" + fi + local myconf=( $(usex ldap '' --disable-ldap) $(usex lmdb '' --without-ldb-lmdb) --disable-rpath - --disable-rpath-install --bundled-libraries=NONE + --disable-rpath-install --with-modulesdir="${EPREFIX}"/usr/$(get_libdir)/samba + --bundled-libraries="${bundled_libs}" --builtin-libraries=NONE ) - if ! multilib_is_native_abi; then + + if ! use python || ! multilib_is_native_abi; then myconf+=( --disable-python ) - else - use python || myconf+=( --disable-python ) fi + waf-utils_src_configure "${myconf[@]}" } @@ -94,8 +139,8 @@ multilib_src_compile() { 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 \ + 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 } @@ -109,7 +154,8 @@ multilib_src_install() { dodoc -r apidocs/html/. fi - use python && python_optimize #726454 + # bug #726454 + use python && python_optimize } pkg_postinst() { |