gentoo Easter resync : 12.04.2020

18 files changed, 25 insertions, 1211 deletions

diff --git a/sys-libs/ldb/Manifest b/sys-libs/ldb/Manifest
index 8d711672fb80..4fd3319e3663 100644
--- a/sys-libs/ldb/Manifest
+++ b/sys-libs/ldb/Manifest
@@ -1,31 +1,9 @@
-AUX ldb-1.1.27-optional_packages.patch 3596 BLAKE2B 0913225b0bb4a0918102d3eb399cf0f4eb690eb55483e24ade75d064e47d423714cdac00f816d8676e9f56e29f79f98c044cc50c9c42bd665b14311b1027708b SHA512 ddc567f926a82fd855ef1690ff14dd6995f3beec9cec3796377edf10d787f89bca7375c6990c29fc8a0dfd88a519f29bf331d8ecdc7a37a6f6e1de21780e4b4a
-AUX ldb-1.1.29-disable-python.patch 2294 BLAKE2B 3a9d7da3c6c82e849d2b0fad8bd4906203645eeee23d69088ff3dfc2ac86eb2c6b3826fecb6328343de6897ff52d7ca2ce1b72acb63c05f950059cb8ef514911 SHA512 f13ebcae2b4c1a844cad65729b31926249887d82ad6d295857c5402a07fd88e76150adce5b34e1a4dc059e4ba29356d60f7f7a8e24b8ae622f2a3477914d7fe1
 AUX ldb-1.1.31-fix_PKGCONFIGDIR-when-python-disabled.patch 701 BLAKE2B dd2398f9e1fa39bfc3de89928dd3b935fd6ee9db4bc2c4e381ba5672098ae9209b2d6e475fa2549a9cef2e3ce5e9a789557413fbdb1bbd68842cca89ce1e8094 SHA512 35ba295d94ab5ce767f39c4cd5eb48d57a6e4993977013ee6ae0d640f74b5437a4dff6f1d14dc44dbcdc25d4e51e5084b0e3216353b2af383d8f544993228170
-AUX ldb-1.1.31-optional_packages.patch 2022 BLAKE2B df114c2248602d64bfb75c6910fde240840f7fea5ac2e7ba1507dc0615357753c3c11eacc005fe219b9f3e85638f7314104e37e321df3c5fcabdb7fce8a82812 SHA512 c9bc21fb306d4322874009e8eaded220f9ea1a3027781d2f6ae0f393f357349582cab8204e5a9343a88f61ab8d15f772bfb2e0d8bd42c0780b593ff9bdb9ad09
-AUX ldb-1.1.31-talloc-disable-python.patch 1706 BLAKE2B cc447f5077c82d7eb584692121b9b34c03afb5f7dda2b799ea518d08421d31ce54fe2422c5ca7efe74f66011951c97b171a326604bd67446a15ad2849bade919 SHA512 ac0bf82e8ed8b918a5efbdeb0a6cbaaef22bb72231abb09026637d62b8ce35b25212960d26c07abe63661328ab7ea8a82590cd93f04de583e23239211daf6efa
-AUX ldb-1.2.3-disable_python.patch 2632 BLAKE2B c46ac5265168b37e94730b3a8a30b49199fdc722492248a69eb23306761df5764667e5c2e1f09e97c06a7c2a7932a8cdd047fb2d9d8e2ba9cff4d21bee148b06 SHA512 3b32d478318ef37fd221b06f427f0efce943c6da9a0a58b92ad935657fc29105b1ab79f2c9d1e1fa24cd6c4e8b701e6d631cbd04b3ebed8adeee47c4510f89a8
-AUX ldb-1.4.0-optional_packages.patch 1662 BLAKE2B 3d6c8c31ad53b62a999934d1994475e502e83498df86ca590b560dc2bf34e6cce7b0896f2d747fadaf69da277b116f1cedbe27443f75e85206d482bd1df3dd15 SHA512 7e26631f93dbca355eaf08e32bbc95eeabdf196e75ba8cd0618ef8c772f17661e68e307d8742dabcde34ebe02aaf50c5ad966b77e862394f0683279babbdfb01
 AUX ldb-1.5.2-optional_packages.patch 1441 BLAKE2B 0b9413cd9690aae2b2eb26f097d2509c0bbe0fc59f81bab22add57ffe0c603a8fb0c9be038d06693dcbb1d3817d4ad97a5931120b18bd9783efaac599fe0ccbc SHA512 2f313c3377385279ca3da6db21d926df0559d971e1fd42f8cce57b4001078c3817f472b85088a1f3b0e5ddcdfbbfd943199485d6e4a00412f62c883c6ea04afd
-DIST ldb-1.1.29.tar.gz 1277551 BLAKE2B 449333d40073fd63d6d013ba0ae43fc3a0b8201948eabd440d164d182492002c1d92047d652105c2fb6a3e8383d4b75f45e38cc52efc5d9a0e2811113676203a SHA512 d37bbe84358e05d17483e2e963b8477da5ea351b855b454142c94af35f7987bede0f19faeaff17779efe04e3bb37c510437fcc59be99a17c826620fc25fd659c
-DIST ldb-1.1.31.tar.gz 1337586 BLAKE2B 9454f91a621368cfc7cfdb709781653e947d63b275bb3b288049acb43ee3c02ae4f0be820ccf9e3bb32938d12598a91b7a6292b08c638ccfd59bd1be182f09c0 SHA512 49ccd57000cbcc6d828160f4457236b28853d766d641841471f61226156b6103fe563c43c950577b038ea3c0a54506bca94c640d3d5f912a3b8af95eb9ef2824
-DIST ldb-1.2.4.tar.gz 1346413 BLAKE2B 441cdf679ab4852e1c8d90ca8d9544d7983436c864cb3ea76b63f45177061c2763f9700b4be4be9ba53a4bcc9cec49b509dd39efb8f5f2171bc432641d1329c2 SHA512 093815cfa9e950299c4f09c58362136d72c439692f7d8670ecbf9cac49ecef6fd365f8fab5d39f41a4dd39e07f6c8d1a2616e843653d2fa0d7bdff346a118aa9
-DIST ldb-1.3.6.tar.gz 1374574 BLAKE2B 654f35eb25aeb373540ead7cb10da66c92970ea6b100631cb14bacf937fec64e09b19ed3e09a976406e3f8d6347c4e17144c0a0bff8795316559be45353edbf7 SHA512 8fcd72598e948c55adaa832d6ebcbc03b979281032cb900af4304c1c68ce9cc94a1e1d4729d0c2a0b83a618cab716749d851160005a0093cf8a178e6dbea298d
-DIST ldb-1.3.8.tar.gz 1375782 BLAKE2B dbca935e762af86b268308253615019b24af6727411e77947ceeadd3e0114c2ad2a14d4a4f1121bf58ccb080d44a8513d2094314b043604d885977a26e622c57 SHA512 06d1b4c2badbf0c27733a64f979c48af8b599747cef7cd7f5417cd55a76447e8f8987bd061694c5af63261fdb35433e3844122c14103d5cc8b4eaab1f4752541
-DIST ldb-1.4.8.tar.gz 1433045 BLAKE2B bd2441d97216976a149d43ab037c64053adae0e1ac931ceb6313491eea09813324dd97ab754d09fdc2789327932ee8a8268d94457dd48f557a125890a6c4e721 SHA512 cfb10c9ca45aed6d181020fc7b55a5fb5915d288035ef7245ccc63ac040aa64fb7591629c34db5ff49f15c4eb4e2037954beeadd1f5a695eb19e3807cad864e7
-DIST ldb-1.5.4.tar.gz 1629123 BLAKE2B 3c71af079f2e5cb81e493d16d453c53bd0ee4c63720b0261ea6116244b2652ca581499c0b8c64949dccc95460aba7b4ef3afe7850563a830f3fb4b8753bdea2f SHA512 fc323e4283671c14d6dd4feb7e9ca943a63a166688077dbf3591f9d957cf821f9e739869842e15ca1ec4fd3764123d5afc6f4954b1af437bd1ec54df58366a22
-DIST ldb-1.5.6.tar.gz 1637795 BLAKE2B ac70f6dcaa1cd34bfdae8bf7844f1084282ea947a3c85b3a6c504a5fd3028eca2e4c26a7ffd2d36b3fadd50affded8bcf90546c56d138b30091cdaae86a9f730 SHA512 038b85caff82a2566197bc6bae9fdef91675e42f0a3b269d9d5608363777a12b4ae3faa81854b9b33b9ee374fa5ba92686e945d60f6ad1f53a453fead59f6712
-DIST ldb-1.6.3.tar.gz 1628668 BLAKE2B e9b6535eddf49496151e544f6879641c58a614f6de95463f7d0bf1953744953a5d55dde935d39b690d4c87e66914d8de0f0f5d4816a61fdecc81f8797584013e SHA512 a41b1fd2afa9a02dec37519f28e0e720b649c2a0aa6caebeb6697dbefdc6a055ef26500c5ccb0439b495d8c03218920b389fb9601d1cf5ca4d5046f192a5fefd
-DIST ldb-2.0.7.tar.gz 1674063 BLAKE2B e61f7bf4cfefcb5c1bf735c19a00027ce20ef393b613117e5637f7680ba7fcab1798744505b0db88e8bbdab41e0264e0fd1e643110ec47864de02ef315bd0dfd SHA512 0b1bd5970421c32bee1209179eac60682d7304aca597bca11dd477903f59b53a2fbc7d9e1717809e9a8e550564a9ca9139dd1127b9f4cefcc2437d7c8050985a
 DIST ldb-2.0.8.tar.gz 1676902 BLAKE2B b86b24a597bd81ae11382311f3b60aeb8aca78ddbe63413b9a8cdbbfa4f52b05a0d2e325d483e260b15aa396c2ad9f2828ac4b6214af86d891281d05b24125b5 SHA512 23a44968c9b4b57deb3f7b7b2466f140b4d8534a07a5e866545dd108c3d305ee4b0ea9bceec3177fcd09a4efcb4876a8283ca58b5c496fcf323b810666e1e79a
-EBUILD ldb-1.1.29-r1.ebuild 2533 BLAKE2B 1b6396c2e02ccd953f66978f32eeaecda40af69d1d7a2422021ed507b86fa7c53a49a4564635b7335006709e6d033dd031b13b1cd354a87a26cb73d4decfcf7d SHA512 49ba82b65d7eadcc2c0c95b1a13e74ac3c2b40d7aad4e917ce04f7f52a65a6790d2abb15de06fbc2cabf90f9f07fb7a7b591d67d7d544e740a828da919a65e67
-EBUILD ldb-1.1.31.ebuild 2666 BLAKE2B 2e10b4c1db7b390f63613ec191c6656a66cf2f1c4ba254fbb7e0e06db06af77ac0ff21e7d852178458ea95ee6fce29a5eed8bee0a4cbc94b282cf01b9ad0c24b SHA512 0dd17abac0462375cee3ea267fedc97e0386cdb60f7efb28884a6055c6bac6948b7a364c809271489322c2fea6f2c3c4fe5c307f2fffa8254cfe59925b7fd3d2
-EBUILD ldb-1.2.4.ebuild 2594 BLAKE2B 52959030dbaf15a8fe9f8dd55cd355ed67880ad0f396e77a3aa44dea2dd5de5cbf6e7122af3f3112c6112685d972f528f7601b478b3fce9ef94615fcbc7c23e7 SHA512 8fe345ec1d9ed74803041e08e0699b50f6f5106bf0fea10d96c4144c1a0b2f4aee4d2952303c1b3900e15909f5a470147b10bfa75005dd21201e3703ef83e291
-EBUILD ldb-1.3.6.ebuild 2541 BLAKE2B ca21a5d1fac9b5c2aa87efb133a144391366867e88f53697c760ea29ca840fb16c3f90f573c261c2ec4e6c28bcdb1225a493a7b2031274264f4a42ab9ffb0e95 SHA512 73c15170d9b178bcc02a2ab22b85443005c59692930081a709d3a70fc9440bdd024d66695ce50f5d3e3096a381e6d2831b6200451fe9bdbdbc017362a621e4ab
-EBUILD ldb-1.3.8.ebuild 2547 BLAKE2B cd8a8179d5e3a6d14f294b8cd1f3699d88bd3435e91ee7bd836dc33dfc4b63e1260f36bdf0768cc10ed50236ae15adb4ff0f4adc2e8b0538c805cbca5b42358b SHA512 578680ded950a2dd84dd01177343dff434505c41df0902f54d5444575cf3d65d55b7274e8412696c20cfd8bfda52e3c751c20079bd3f8800aa20fe6babf20ba2
-EBUILD ldb-1.4.8.ebuild 2641 BLAKE2B dd813cae8bd86dba7edeed0c18fd6d1aeb2975ba88485d4daf65509dd7025cfaf75aca563ecf603925959eaf184fde4aaeb82a6869aac1b0deb18b588fd60008 SHA512 c4b950ccfa1df521db6e82213fd8d84c29ed538b8368fb2c325d463f845b35a8259f50b094d294014e725e98df2d1b3a7f3fff6cddaa7c1894d2076f2080fbd3
-EBUILD ldb-1.5.4.ebuild 2647 BLAKE2B 06ef03eaed293d096a23eef2d16d07a527ea3902d87b9e1bdf95b3d174fb1b83412d2f0fd0b658d7547c50ec7d631e4ac5465c8a32d5992bd5400905922a934b SHA512 68c096a7209e57c37d1ed789f00a3949e7c90aa83801fee8e6941b4ff28e9627782ed6cbdb7fb5b7e5be1cc43aa196ae69d2acdb9e4dea1fc5c0955fa3611d92
-EBUILD ldb-1.5.6.ebuild 2648 BLAKE2B 2c655c275fc9f18fe2e51ff5b5d3ea5ce9715d06ea1b672616e0fe93cc5731b4932bff4a8951cb194476cc9a662938bfe1e889687e7a5b93b36fc2fc5c5cdd65 SHA512 5dec83758f2cc5cc26a39faf0d17a016964aa826f38468276289b342ad04c0514b934316d28a70a9b1329aae7c65f222f6483e6ea3d27de87f942d208fdb4364
-EBUILD ldb-1.6.3.ebuild 2648 BLAKE2B 2c655c275fc9f18fe2e51ff5b5d3ea5ce9715d06ea1b672616e0fe93cc5731b4932bff4a8951cb194476cc9a662938bfe1e889687e7a5b93b36fc2fc5c5cdd65 SHA512 5dec83758f2cc5cc26a39faf0d17a016964aa826f38468276289b342ad04c0514b934316d28a70a9b1329aae7c65f222f6483e6ea3d27de87f942d208fdb4364
-EBUILD ldb-2.0.7.ebuild 2646 BLAKE2B e86b9a1a66ab53c68ef5ce62f1d68b62d305dcc45e263f425746da41fc4946f13cea740cfd76f012c325df314312f8bbf571b6a3463cb1615a3e9301171cba7b SHA512 0847307c1b5b3bd88677e3cbd24c5870ba6f932ad41e41d5ed44c23ccd0376f1602c215893a5dd83ad7ffe63ce9fc79f06a97bed2fe9f2c0c938d158f6d017a8
-EBUILD ldb-2.0.8.ebuild 2707 BLAKE2B 1913bd94db6210b5860683367a76f8921b28d960f40b2d3de3abbb4ba03f6db394493d8a6d6ae512c9a570da60458d7f5dbc807ecee49644584e477d18394e3c SHA512 a3e7882dc30895ef0df88c7e3e343e570425b0555ca9e5b5ecc147be3727abbe5cee5789f4053cd86d9b1777bb47561fa4d7e5e2d4b878a138ef4c3ebf917143
+DIST ldb-2.0.9.tar.gz 1676176 BLAKE2B 0d18a570ca61fcdf159b6398ecef74bc983c24ffd4d8f85bc9cfcbb182f787d0deb50c5f446684b851993146e03bdaf10d80c083a9534446b829714fff025b8f SHA512 f4d2480491f16aac7837fa2ff071e81e429bd9b3a365264723245791aad1831a236ffeff0f01f85becb998b224c321b166f3edd3f9a828714b7c3b24aed11a5e
+DIST ldb-2.1.1.tar.gz 1671390 BLAKE2B a715cb17a2d113560d37e3e5d29adfe7db43f89388bb5a474388e3f7a6ae277ddb0ee4d09d45eed18a87085c70d98308d195b3867cc57259767cb61a50c8cc6e SHA512 dd87da0746790895c617108c64b718ab6e6e630f1e3269154b40fc0e5623199a4b132d41623ae00d5c263ce79c4d6da34f072a140bee91a59dd6934969315fc8
+EBUILD ldb-2.0.8.ebuild 2688 BLAKE2B ecc1ec7275796e6de5af9be875671301aa38da49e2345408d5f9054657ed4775d21cd1456a474217def897ccbd02e44be18a14cad14dd58ccaa816d8be968a9f SHA512 9c3320b50fdbb0e7912b731d6c6905de97b065c2c049ec046e35f09e296f0b1f350120062c3d1e3b29ada3e4fbff90e5d8576bc96397dc89c9536882d2a770bb
+EBUILD ldb-2.0.9.ebuild 2695 BLAKE2B 9ef1575d86dbe106a307851c63a8bbe84bc948a13c5837fb3a09caf996ed8e8f9b37ec76fcebc2faf423db3a0f7558464d150a1f64e142d94022a5607a1a1bf6 SHA512 fee1fd6ebdbd919332ae2b35506b9e69856761d340fd6ad117b27ce2f08c31a9eda4f4bb156a64e2f01ac35c95bec438a60d58fb696639376f32dde98ab02fc9
+EBUILD ldb-2.1.1.ebuild 2695 BLAKE2B c41b17921331a9677117f36bde021a244d548c3e2b3b5d9285e5ca104d96437a7723779b856276740d1e6a786fe2e3d2823fd2afce499bb3b5d1839cf034943e SHA512 21740fa246033d07d5ba0b16e72bdf26e787decd87095b7c32747bc48a7927b74fb25da9875afac670bf40b9b6c0c547574b7dd5b1bff7565e2b0cd229dc1579
 MISC metadata.xml 525 BLAKE2B 161146886c9d4b7139238e5753f02bbbd3eb4aa6c59415f45710c11b25e80d6e4085036e00808b38d06b671dc976922dacbab9ef3f4f18ed9793d5b5621ff546 SHA512 87a8414b97c3f08fed9395574f7be7739c845c593c2fa324e6928758e455e2ee9d45c2607dba298da2c1e21863878c147e613f6fc3750111952b7e7a7b7ada95
diff --git a/sys-libs/ldb/files/ldb-1.1.27-optional_packages.patch b/sys-libs/ldb/files/ldb-1.1.27-optional_packages.patch
deleted file mode 100644
index 92e14c651c86..000000000000
--- a/sys-libs/ldb/files/ldb-1.1.27-optional_packages.patch
+++ /dev/null
@@ -1,92 +0,0 @@
---- ldb-1.1.27/lib/talloc/wscript
-+++ ldb-1.1.27/lib/talloc/wscript
-@@ -48,7 +48,7 @@
-         if conf.CHECK_BUNDLED_SYSTEM_PKG('talloc', minversion=VERSION,
-                                      implied_deps='replace'):
-             conf.define('USING_SYSTEM_TALLOC', 1)
--        if conf.CHECK_BUNDLED_SYSTEM_PKG('pytalloc-util', minversion=VERSION,
-+        if not conf.env.disable_python and conf.CHECK_BUNDLED_SYSTEM_PKG('pytalloc-util', minversion=VERSION,
-                                      implied_deps='talloc replace'):
-             conf.define('USING_SYSTEM_PYTALLOC_UTIL', 1)
- 
---- ldb-1.1.27/wscript
-+++ ldb-1.1.27/wscript
-@@ -5,6 +5,7 @@
- 
- blddir = 'bin'
- 
-+import Logs
- import sys, os
- 
- # find the buildtools directory
-@@ -13,7 +14,7 @@
-     srcdir = srcdir + '/..'
- sys.path.insert(0, srcdir + '/buildtools/wafsamba')
- 
--import wafsamba, samba_dist, Utils
-+import wafsamba, samba_dist, Utils, Options
- 
- samba_dist.DIST_DIRS('''lib/ldb:. lib/replace:lib/replace lib/talloc:lib/talloc
-                         lib/tdb:lib/tdb lib/tdb:lib/tdb lib/tevent:lib/tevent
-@@ -28,8 +29,21 @@
-     opt.RECURSE('lib/tevent')
-     opt.RECURSE('lib/replace')
-     opt.tool_options('python') # options for disabling pyc or pyo compilation
-+    if opt.IN_LAUNCH_DIR():
-+        opt.add_option('--disable-python',
-+        help=("disable the pyldb modules"),
-+        action="store_true", dest='disable_python', default=False)
-+    if opt.IN_LAUNCH_DIR():
-+        opt.add_option('--disable-ldap',
-+        help=("disable ldap support"),
-+        action="store_true", dest='disable_ldap', default=False)
- 
- def configure(conf):
-+    conf.env.standalone_ldb = conf.IN_LAUNCH_DIR()
-+
-+    conf.env.disable_python = getattr(Options.options, 'disable_python', False)
-+    conf.env.disable_ldap = getattr(Options.options, 'disable_ldap', False)
-+
-     conf.RECURSE('lib/tdb')
-     conf.RECURSE('lib/tevent')
- 
-@@ -44,16 +58,18 @@
-     conf.RECURSE('lib/replace')
-     conf.find_program('python', var='PYTHON')
-     conf.find_program('xsltproc', var='XSLTPROC')
--    conf.check_tool('python')
--    conf.check_python_version((2,4,2))
--    conf.SAMBA_CHECK_PYTHON_HEADERS(mandatory=True)
-+
-+    if not conf.env.disable_python:
-+      conf.SAMBA_CHECK_PYTHON(mandatory=False, version=(2,4,2))
-+      conf.SAMBA_CHECK_PYTHON_HEADERS(mandatory=False)
-+      if not conf.env.HAVE_PYTHON_H:
-+        Logs.warn('Disabling pyldb-util as python devel libs not found')
-+        conf.env.disable_python = True
- 
-     # where does the default LIBDIR end up? in conf.env somewhere?
-     #
-     conf.CONFIG_PATH('LDB_MODULESDIR', conf.SUBST_ENV_VAR('MODULESDIR') + '/ldb')
- 
--    conf.env.standalone_ldb = conf.IN_LAUNCH_DIR()
--
-     if not conf.env.standalone_ldb:
-         if conf.CHECK_BUNDLED_SYSTEM_PKG('pyldb-util', minversion=VERSION,
-                                      onlyif='talloc tdb tevent',
-@@ -67,9 +83,12 @@
-     if conf.env.standalone_ldb:
-         conf.CHECK_XSLTPROC_MANPAGES()
- 
--        # we need this for the ldap backend
--        if conf.CHECK_FUNCS_IN('ber_flush ldap_open ldap_initialize', 'lber ldap', headers='lber.h ldap.h'):
--            conf.env.ENABLE_LDAP_BACKEND = True
-+        if not conf.env.disable_ldap:
-+    	    # we need this for the ldap backend
-+    	    if conf.CHECK_FUNCS_IN('ber_flush ldap_open ldap_initialize', 'lber ldap', headers='lber.h ldap.h'):
-+        	conf.env.ENABLE_LDAP_BACKEND = True
-+        else:
-+    	    conf.env.ENABLE_LDAP_BACKEND = False
- 
-         # we don't want any libraries or modules to rely on runtime
-         # resolution of symbols
diff --git a/sys-libs/ldb/files/ldb-1.1.29-disable-python.patch b/sys-libs/ldb/files/ldb-1.1.29-disable-python.patch
deleted file mode 100644
index bc4120e8acf6..000000000000
--- a/sys-libs/ldb/files/ldb-1.1.29-disable-python.patch
+++ /dev/null
@@ -1,48 +0,0 @@
---- a/lib/tdb/wscript	2016-11-30 09:56:00.000000000 -0500
-+++ b/lib/tdb/wscript	2017-02-08 16:37:49.160987205 -0500
-@@ -77,16 +77,16 @@
-     conf.env.standalone_tdb = conf.IN_LAUNCH_DIR()
-     conf.env.building_tdb = True
- 
-+    conf.env.disable_python = getattr(Options.options, 'disable_python', False)
-+
-     if not conf.env.standalone_tdb:
-         if conf.CHECK_BUNDLED_SYSTEM_PKG('tdb', minversion=VERSION,
-                                      implied_deps='replace'):
-             conf.define('USING_SYSTEM_TDB', 1)
-             conf.env.building_tdb = False
--            if conf.CHECK_BUNDLED_SYSTEM_PYTHON('pytdb', 'tdb', minversion=VERSION):
-+            if not conf.env.disable_python and conf.CHECK_BUNDLED_SYSTEM_PYTHON('pytdb', 'tdb', minversion=VERSION):
-                 conf.define('USING_SYSTEM_PYTDB', 1)
- 
--    conf.env.disable_python = getattr(Options.options, 'disable_python', False)
--
-     if (conf.CONFIG_SET('HAVE_ROBUST_MUTEXES') and
-         conf.env.building_tdb and
-         not conf.env.disable_tdb_mutex_locking):
---- a/lib/tevent/wscript	2016-10-07 00:45:35.000000000 -0400
-+++ b/lib/tevent/wscript	2017-02-08 16:39:22.478733175 -0500
-@@ -34,11 +34,13 @@
- 
-     conf.env.standalone_tevent = conf.IN_LAUNCH_DIR()
- 
-+    conf.env.disable_python = getattr(Options.options, 'disable_python', False)
-+
-     if not conf.env.standalone_tevent:
-         if conf.CHECK_BUNDLED_SYSTEM_PKG('tevent', minversion=VERSION,
-                                      onlyif='talloc', implied_deps='replace talloc'):
-             conf.define('USING_SYSTEM_TEVENT', 1)
--            if conf.CHECK_BUNDLED_SYSTEM_PYTHON('pytevent', 'tevent', minversion=VERSION):
-+            if not conf.env.disable_python and conf.CHECK_BUNDLED_SYSTEM_PYTHON('pytevent', 'tevent', minversion=VERSION):
-                 conf.define('USING_SYSTEM_PYTEVENT', 1)
- 
-     if conf.CHECK_FUNCS('epoll_create', headers='sys/epoll.h'):
-@@ -61,8 +63,6 @@
-     if not conf.CONFIG_SET('USING_SYSTEM_TEVENT'):
-         conf.DEFINE('TEVENT_NUM_SIGNALS', tevent_num_signals)
- 
--    conf.env.disable_python = getattr(Options.options, 'disable_python', False)
--
-     if not conf.env.disable_python:
-         # also disable if we don't have the python libs installed
-         conf.find_program('python', var='PYTHON')
diff --git a/sys-libs/ldb/files/ldb-1.1.31-optional_packages.patch b/sys-libs/ldb/files/ldb-1.1.31-optional_packages.patch
deleted file mode 100644
index 1e9b51773570..000000000000
--- a/sys-libs/ldb/files/ldb-1.1.31-optional_packages.patch
+++ /dev/null
@@ -1,57 +0,0 @@
---- ldb-1.1.27/wscript
-+++ ldb-1.1.27/wscript
-@@ -5,6 +5,7 @@
- 
- blddir = 'bin'
- 
-+import Logs
- import sys, os
- 
- # find the buildtools directory
-@@ -13,7 +14,7 @@
-     srcdir = srcdir + '/..'
- sys.path.insert(0, srcdir + '/buildtools/wafsamba')
- 
--import wafsamba, samba_dist, Utils
-+import wafsamba, samba_dist, Utils, Options
- 
- samba_dist.DIST_DIRS('''lib/ldb:. lib/replace:lib/replace lib/talloc:lib/talloc
-                         lib/tdb:lib/tdb lib/tdb:lib/tdb lib/tevent:lib/tevent
-@@ -28,8 +29,21 @@
-     opt.RECURSE('lib/tevent')
-     opt.RECURSE('lib/replace')
-     opt.tool_options('python') # options for disabling pyc or pyo compilation
-+    if opt.IN_LAUNCH_DIR():
-+        opt.add_option('--disable-python',
-+        help=("disable the pyldb modules"),
-+        action="store_true", dest='disable_python', default=False)
-+    if opt.IN_LAUNCH_DIR():
-+        opt.add_option('--disable-ldap',
-+        help=("disable ldap support"),
-+        action="store_true", dest='disable_ldap', default=False)
- 
- def configure(conf):
-+    conf.env.standalone_ldb = conf.IN_LAUNCH_DIR()
-+
-+    conf.env.disable_python = getattr(Options.options, 'disable_python', False)
-+    conf.env.disable_ldap = getattr(Options.options, 'disable_ldap', False)
-+
-     conf.RECURSE('lib/tdb')
-     conf.RECURSE('lib/tevent')
- 
-@@ -67,9 +81,12 @@
-     if conf.env.standalone_ldb:
-         conf.CHECK_XSLTPROC_MANPAGES()
- 
--        # we need this for the ldap backend
--        if conf.CHECK_FUNCS_IN('ber_flush ldap_open ldap_initialize', 'lber ldap', headers='lber.h ldap.h'):
--            conf.env.ENABLE_LDAP_BACKEND = True
-+        if not conf.env.disable_ldap:
-+    	    # we need this for the ldap backend
-+    	    if conf.CHECK_FUNCS_IN('ber_flush ldap_open ldap_initialize', 'lber ldap', headers='lber.h ldap.h'):
-+        	conf.env.ENABLE_LDAP_BACKEND = True
-+        else:
-+    	    conf.env.ENABLE_LDAP_BACKEND = False
- 
-         # we don't want any libraries or modules to rely on runtime
-         # resolution of symbols
diff --git a/sys-libs/ldb/files/ldb-1.1.31-talloc-disable-python.patch b/sys-libs/ldb/files/ldb-1.1.31-talloc-disable-python.patch
deleted file mode 100644
index 6ef45eb37fb8..000000000000
--- a/sys-libs/ldb/files/ldb-1.1.31-talloc-disable-python.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- a/lib/talloc/wscript	2017-04-28 04:57:26.000000000 -0400
-+++ b/lib/talloc/wscript	2017-07-05 14:30:42.700580464 -0400
-@@ -74,19 +74,22 @@
-                                      implied_deps='replace'):
-             conf.define('USING_SYSTEM_TALLOC', 1)
- 
--        using_system_pytalloc_util = True
--        if not conf.CHECK_BUNDLED_SYSTEM_PKG('pytalloc-util', minversion=VERSION,
--                                             implied_deps='talloc replace'):
-+        if conf.env.disable_python:
-             using_system_pytalloc_util = False
--
--        # We need to get a pytalloc-util for all the python versions
--        # we are building for
--        if conf.env['EXTRA_PYTHON']:
--            name = 'pytalloc-util' + conf.all_envs['extrapython']['PYTHON_SO_ABI_FLAG']
--            if not conf.CHECK_BUNDLED_SYSTEM_PKG(name, minversion=VERSION,
-+        else:
-+            using_system_pytalloc_util = True
-+            if not conf.CHECK_BUNDLED_SYSTEM_PKG('pytalloc-util', minversion=VERSION,
-                                                  implied_deps='talloc replace'):
-                 using_system_pytalloc_util = False
- 
-+            # We need to get a pytalloc-util for all the python versions
-+            # we are building for
-+            if conf.env['EXTRA_PYTHON']:
-+                name = 'pytalloc-util' + conf.all_envs['extrapython']['PYTHON_SO_ABI_FLAG']
-+                if not conf.CHECK_BUNDLED_SYSTEM_PKG(name, minversion=VERSION,
-+                                                     implied_deps='talloc replace'):
-+                    using_system_pytalloc_util = False
-+
-         if using_system_pytalloc_util:
-             conf.define('USING_SYSTEM_PYTALLOC_UTIL', 1)
- 
diff --git a/sys-libs/ldb/files/ldb-1.2.3-disable_python.patch b/sys-libs/ldb/files/ldb-1.2.3-disable_python.patch
deleted file mode 100644
index 133e2acf3125..000000000000
--- a/sys-libs/ldb/files/ldb-1.2.3-disable_python.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-Revert talloc/wscript to the one from ldb-1.2.2
-
---- ldb-1.2.3/lib/talloc/wscript
-+++ ldb-1.2.3/lib/talloc/wscript
-@@ -1,7 +1,7 @@
- #!/usr/bin/env python
- 
- APPNAME = 'talloc'
--VERSION = '2.1.9'
-+VERSION = '2.1.10'
- 
- 
- blddir = 'bin'
-@@ -74,19 +74,22 @@
-                                      implied_deps='replace'):
-             conf.define('USING_SYSTEM_TALLOC', 1)
- 
--        using_system_pytalloc_util = True
--        if not conf.CHECK_BUNDLED_SYSTEM_PKG('pytalloc-util', minversion=VERSION,
--                                             implied_deps='talloc replace'):
-+        if conf.env.disable_python:
-             using_system_pytalloc_util = False
--
--        # We need to get a pytalloc-util for all the python versions
--        # we are building for
--        if conf.env['EXTRA_PYTHON']:
--            name = 'pytalloc-util' + conf.all_envs['extrapython']['PYTHON_SO_ABI_FLAG']
--            if not conf.CHECK_BUNDLED_SYSTEM_PKG(name, minversion=VERSION,
-+        else:
-+            using_system_pytalloc_util = True
-+            if not conf.CHECK_BUNDLED_SYSTEM_PKG('pytalloc-util', minversion=VERSION,
-                                                  implied_deps='talloc replace'):
-                 using_system_pytalloc_util = False
- 
-+            # We need to get a pytalloc-util for all the python versions
-+            # we are building for
-+            if conf.env['EXTRA_PYTHON']:
-+                name = 'pytalloc-util' + conf.all_envs['extrapython']['PYTHON_SO_ABI_FLAG']
-+                if not conf.CHECK_BUNDLED_SYSTEM_PKG(name, minversion=VERSION,
-+                                                     implied_deps='talloc replace'):
-+                    using_system_pytalloc_util = False
-+
-         if using_system_pytalloc_util:
-             conf.define('USING_SYSTEM_PYTALLOC_UTIL', 1)
- 
-@@ -171,12 +174,18 @@
- def test(ctx):
-     '''run talloc testsuite'''
-     import Utils, samba_utils
-+
-+    samba_utils.ADD_LD_LIBRARY_PATH('bin/shared')
-+    samba_utils.ADD_LD_LIBRARY_PATH('bin/shared/private')
-+
-     cmd = os.path.join(Utils.g_module.blddir, 'talloc_testsuite')
-     ret = samba_utils.RUN_COMMAND(cmd)
-     print("testsuite returned %d" % ret)
-     magic_helper_cmd = os.path.join(Utils.g_module.blddir, 'talloc_test_magic_differs_helper')
-     magic_cmd = os.path.join(srcdir, 'lib', 'talloc',
-                              'test_magic_differs.sh')
-+    if not os.path.exists(magic_cmd):
-+        magic_cmd = os.path.join(srcdir, 'test_magic_differs.sh')
- 
-     magic_ret = samba_utils.RUN_COMMAND(magic_cmd + " " +  magic_helper_cmd)
-     print("magic differs test returned %d" % magic_ret)
diff --git a/sys-libs/ldb/files/ldb-1.4.0-optional_packages.patch b/sys-libs/ldb/files/ldb-1.4.0-optional_packages.patch
deleted file mode 100644
index 37813890dcd9..000000000000
--- a/sys-libs/ldb/files/ldb-1.4.0-optional_packages.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- ldb-1.4.0/wscript
-+++ ldb-1.4.0/wscript
-@@ -31,6 +31,14 @@
-     opt.RECURSE('lib/tevent')
-     opt.RECURSE('lib/replace')
-     opt.tool_options('python') # options for disabling pyc or pyo compilation
-+    if opt.IN_LAUNCH_DIR():
-+	opt.add_option('--disable-python',
-+	help=("disable the pyldb modules"),
-+	action="store_true", dest='disable_python', default=False)
-+    if opt.IN_LAUNCH_DIR():
-+	opt.add_option('--disable-ldap',
-+	help=("disable ldap support"),
-+	action="store_true", dest='disable_ldap', default=False)
- 
-     opt.add_option('--without-ldb-lmdb',
-                    help='disable new LMDB backend for LDB',
-@@ -38,6 +46,11 @@
- 
- 
- def configure(conf):
-+    conf.env.standalone_ldb = conf.IN_LAUNCH_DIR()
-+
-+    conf.env.disable_python = getattr(Options.options, 'disable_python', False)
-+    conf.env.disable_ldap = getattr(Options.options, 'disable_ldap', False)
-+    
-     conf.RECURSE('lib/tdb')
-     conf.RECURSE('lib/tevent')
- 
-@@ -142,9 +155,12 @@
-     if conf.env.standalone_ldb:
-         conf.CHECK_XSLTPROC_MANPAGES()
- 
--        # we need this for the ldap backend
--        if conf.CHECK_FUNCS_IN('ber_flush ldap_open ldap_initialize', 'lber ldap', headers='lber.h ldap.h'):
--            conf.env.ENABLE_LDAP_BACKEND = True
-+        if not conf.env.disable_ldap:
-+    	    # we need this for the ldap backend
-+    	    if conf.CHECK_FUNCS_IN('ber_flush ldap_open ldap_initialize', 'lber ldap', headers='lber.h ldap.h'):
-+        	conf.env.ENABLE_LDAP_BACKEND = True
-+    	else:
-+    	    conf.env.ENABLE_LDAP_BACKEND = False
- 
-         # we don't want any libraries or modules to rely on runtime
-         # resolution of symbols
diff --git a/sys-libs/ldb/ldb-1.1.29-r1.ebuild b/sys-libs/ldb/ldb-1.1.29-r1.ebuild
deleted file mode 100644
index a6c0906ceed5..000000000000
--- a/sys-libs/ldb/ldb-1.1.29-r1.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="threads"
-
-inherit python-single-r1 waf-utils multilib-minimal eutils
-
-DESCRIPTION="An LDAP-like embedded database"
-HOMEPAGE="https://ldb.samba.org/"
-SRC_URI="https://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"
-IUSE="doc +ldap python"
-
-RDEPEND="!elibc_FreeBSD? ( dev-libs/libbsd[${MULTILIB_USEDEP}] )
-	dev-libs/popt[${MULTILIB_USEDEP}]
-	>=sys-libs/talloc-2.1.8[python?,${MULTILIB_USEDEP}]
-	>=sys-libs/tevent-0.9.31[python(+)?,${MULTILIB_USEDEP}]
-	>=sys-libs/tdb-1.3.12[python?,${MULTILIB_USEDEP}]
-	!!<net-fs/samba-3.6.0[ldb]
-	!!>=net-fs/samba-4.0.0[ldb]
-	python? ( ${PYTHON_DEPS} )
-	ldap? ( net-nds/openldap )
-	"
-
-DEPEND="dev-libs/libxslt
-	doc? ( app-doc/doxygen )
-	virtual/pkgconfig
-	${PYTHON_DEPS}
-	${RDEPEND}"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-WAF_BINARY="${S}/buildtools/bin/waf"
-
-MULTILIB_WRAPPED_HEADERS=( /usr/include/pyldb.h )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.1.27-optional_packages.patch
-	"${FILESDIR}"/${P}-disable-python.patch
-)
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	local myconf=(
-		$(usex ldap '' --disable-ldap) \
-		--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
-		myconf+=( $(usex python '' '--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
-}
-
-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.31.ebuild b/sys-libs/ldb/ldb-1.1.31.ebuild
deleted file mode 100644
index eefafd3a0468..000000000000
--- a/sys-libs/ldb/ldb-1.1.31.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="threads"
-
-inherit python-single-r1 waf-utils multilib-minimal eutils
-
-DESCRIPTION="An LDAP-like embedded database"
-HOMEPAGE="https://ldb.samba.org/"
-SRC_URI="https://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"
-IUSE="doc +ldap python"
-
-RDEPEND="!elibc_FreeBSD? ( dev-libs/libbsd[${MULTILIB_USEDEP}] )
-	dev-libs/popt[${MULTILIB_USEDEP}]
-	>=dev-util/cmocka-1.1.1[${MULTILIB_USEDEP}]
-	>=sys-libs/talloc-2.1.9[python?,${MULTILIB_USEDEP}]
-	>=sys-libs/tevent-0.9.31[python(+)?,${MULTILIB_USEDEP}]
-	>=sys-libs/tdb-1.3.13[python?,${MULTILIB_USEDEP}]
-	!!<net-fs/samba-3.6.0[ldb]
-	!!>=net-fs/samba-4.0.0[ldb]
-	python? ( ${PYTHON_DEPS} )
-	ldap? ( net-nds/openldap )
-	"
-
-DEPEND="dev-libs/libxslt
-	doc? ( app-doc/doxygen )
-	virtual/pkgconfig
-	${PYTHON_DEPS}
-	${RDEPEND}"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-WAF_BINARY="${S}/buildtools/bin/waf"
-
-MULTILIB_WRAPPED_HEADERS=( /usr/include/pyldb.h )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.1.31-optional_packages.patch
-	"${FILESDIR}"/${PN}-1.1.31-talloc-disable-python.patch
-	"${FILESDIR}"/${PN}-1.1.31-fix_PKGCONFIGDIR-when-python-disabled.patch
-)
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	local myconf=(
-		$(usex ldap '' --disable-ldap) \
-		--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
-}
-
-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.2.4.ebuild b/sys-libs/ldb/ldb-1.2.4.ebuild
deleted file mode 100644
index cf8a380ede1d..000000000000
--- a/sys-libs/ldb/ldb-1.2.4.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="threads"
-
-inherit python-single-r1 waf-utils multilib-minimal eutils
-
-DESCRIPTION="An LDAP-like embedded database"
-HOMEPAGE="https://ldb.samba.org/"
-SRC_URI="https://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"
-IUSE="doc +ldap python"
-
-RDEPEND="!elibc_FreeBSD? ( dev-libs/libbsd[${MULTILIB_USEDEP}] )
-	dev-libs/popt[${MULTILIB_USEDEP}]
-	>=dev-util/cmocka-1.1.1[${MULTILIB_USEDEP}]
-	>=sys-libs/talloc-2.1.10[python?,${MULTILIB_USEDEP}]
-	>=sys-libs/tevent-0.9.36[python(+)?,${MULTILIB_USEDEP}]
-	>=sys-libs/tdb-1.3.15[python?,${MULTILIB_USEDEP}]
-	python? ( ${PYTHON_DEPS} )
-	ldap? ( net-nds/openldap )
-"
-
-DEPEND="dev-libs/libxslt
-	doc? ( app-doc/doxygen )
-	virtual/pkgconfig
-	${PYTHON_DEPS}
-	${RDEPEND}
-"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-WAF_BINARY="${S}/buildtools/bin/waf"
-
-MULTILIB_WRAPPED_HEADERS=( /usr/include/pyldb.h )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.1.31-optional_packages.patch
-	"${FILESDIR}"/${PN}-1.1.31-fix_PKGCONFIGDIR-when-python-disabled.patch
-	"${FILESDIR}"/${PN}-1.2.3-disable_python.patch
-)
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	local myconf=(
-		$(usex ldap '' --disable-ldap)
-		--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
-}
-
-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.3.6.ebuild b/sys-libs/ldb/ldb-1.3.6.ebuild
deleted file mode 100644
index dd10d39ce1e3..000000000000
--- a/sys-libs/ldb/ldb-1.3.6.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="threads"
-
-inherit python-single-r1 waf-utils multilib-minimal eutils
-
-DESCRIPTION="An LDAP-like embedded database"
-HOMEPAGE="https://ldb.samba.org"
-SRC_URI="https://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"
-IUSE="doc +ldap python"
-
-RDEPEND="
-	!elibc_FreeBSD? ( dev-libs/libbsd[${MULTILIB_USEDEP}] )
-	dev-libs/popt[${MULTILIB_USEDEP}]
-	>=dev-util/cmocka-1.1.1[${MULTILIB_USEDEP}]
-	>=sys-libs/talloc-2.1.11[python?,${MULTILIB_USEDEP}]
-	>=sys-libs/tdb-1.3.15[python?,${MULTILIB_USEDEP}]
-	>=sys-libs/tevent-0.9.36[python(+)?,${MULTILIB_USEDEP}]
-	ldap? ( net-nds/openldap )
-	python? ( ${PYTHON_DEPS} )
-"
-
-DEPEND="dev-libs/libxslt
-	doc? ( app-doc/doxygen )
-	virtual/pkgconfig
-	${PYTHON_DEPS}
-	${RDEPEND}
-"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-WAF_BINARY="${S}/buildtools/bin/waf"
-
-MULTILIB_WRAPPED_HEADERS=( /usr/include/pyldb.h )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.1.31-optional_packages.patch
-	"${FILESDIR}"/${PN}-1.1.31-fix_PKGCONFIGDIR-when-python-disabled.patch
-)
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	local myconf=(
-		$(usex ldap '' --disable-ldap)
-		--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
-}
-
-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.3.8.ebuild b/sys-libs/ldb/ldb-1.3.8.ebuild
deleted file mode 100644
index c67965ec43e4..000000000000
--- a/sys-libs/ldb/ldb-1.3.8.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="threads"
-
-inherit python-single-r1 waf-utils multilib-minimal eutils
-
-DESCRIPTION="An LDAP-like embedded database"
-HOMEPAGE="https://ldb.samba.org"
-SRC_URI="https://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"
-IUSE="doc +ldap python"
-
-RDEPEND="
-	!elibc_FreeBSD? ( dev-libs/libbsd[${MULTILIB_USEDEP}] )
-	dev-libs/popt[${MULTILIB_USEDEP}]
-	>=dev-util/cmocka-1.1.1[${MULTILIB_USEDEP}]
-	>=sys-libs/talloc-2.1.11[python?,${MULTILIB_USEDEP}]
-	>=sys-libs/tdb-1.3.15[python?,${MULTILIB_USEDEP}]
-	>=sys-libs/tevent-0.9.36[python(+)?,${MULTILIB_USEDEP}]
-	ldap? ( net-nds/openldap )
-	python? ( ${PYTHON_DEPS} )
-"
-
-DEPEND="dev-libs/libxslt
-	doc? ( app-doc/doxygen )
-	virtual/pkgconfig
-	${PYTHON_DEPS}
-	${RDEPEND}
-"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-WAF_BINARY="${S}/buildtools/bin/waf"
-
-MULTILIB_WRAPPED_HEADERS=( /usr/include/pyldb.h )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.1.31-optional_packages.patch
-	"${FILESDIR}"/${PN}-1.1.31-fix_PKGCONFIGDIR-when-python-disabled.patch
-)
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	local myconf=(
-		$(usex ldap '' --disable-ldap)
-		--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
-}
-
-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.4.8.ebuild b/sys-libs/ldb/ldb-1.4.8.ebuild
deleted file mode 100644
index 79adbc97587d..000000000000
--- a/sys-libs/ldb/ldb-1.4.8.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="threads"
-
-inherit python-single-r1 waf-utils multilib-minimal eutils
-
-DESCRIPTION="An LDAP-like embedded database"
-HOMEPAGE="https://ldb.samba.org"
-SRC_URI="https://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"
-IUSE="doc +ldap +lmdb python"
-
-RDEPEND="
-	!elibc_FreeBSD? ( dev-libs/libbsd[${MULTILIB_USEDEP}] )
-	dev-libs/popt[${MULTILIB_USEDEP}]
-	>=dev-util/cmocka-1.1.1[${MULTILIB_USEDEP}]
-	>=sys-libs/talloc-2.1.14[python?,${MULTILIB_USEDEP}]
-	>=sys-libs/tdb-1.3.16[python?,${MULTILIB_USEDEP}]
-	>=sys-libs/tevent-0.9.37[python(+)?,${MULTILIB_USEDEP}]
-	ldap? ( net-nds/openldap )
-	lmdb? ( >=dev-db/lmdb-0.9.16[${MULTILIB_USEDEP}] )
-	python? ( ${PYTHON_DEPS} )
-"
-
-DEPEND="dev-libs/libxslt
-	doc? ( app-doc/doxygen )
-	virtual/pkgconfig
-	${PYTHON_DEPS}
-	${RDEPEND}
-"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-WAF_BINARY="${S}/buildtools/bin/waf"
-
-MULTILIB_WRAPPED_HEADERS=( /usr/include/pyldb.h )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.4.0-optional_packages.patch
-	"${FILESDIR}"/${PN}-1.1.31-fix_PKGCONFIGDIR-when-python-disabled.patch
-)
-
-pkg_setup() {
-	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
-}
-
-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.5.4.ebuild b/sys-libs/ldb/ldb-1.5.4.ebuild
deleted file mode 100644
index 4d482e984348..000000000000
--- a/sys-libs/ldb/ldb-1.5.4.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{6,7} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit python-single-r1 waf-utils multilib-minimal eutils
-
-DESCRIPTION="An LDAP-like embedded database"
-HOMEPAGE="https://ldb.samba.org"
-SRC_URI="https://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"
-IUSE="doc +ldap +lmdb python"
-
-RDEPEND="
-	!elibc_FreeBSD? ( dev-libs/libbsd[${MULTILIB_USEDEP}] )
-	dev-libs/popt[${MULTILIB_USEDEP}]
-	>=dev-util/cmocka-1.1.3[${MULTILIB_USEDEP}]
-	>=sys-libs/talloc-2.1.16[python?,${MULTILIB_USEDEP}]
-	>=sys-libs/tdb-1.3.18[python?,${MULTILIB_USEDEP}]
-	>=sys-libs/tevent-0.9.39[python(+)?,${MULTILIB_USEDEP}]
-	ldap? ( net-nds/openldap )
-	lmdb? ( >=dev-db/lmdb-0.9.16[${MULTILIB_USEDEP}] )
-	python? ( ${PYTHON_DEPS} )
-"
-
-DEPEND="dev-libs/libxslt
-	doc? ( app-doc/doxygen )
-	virtual/pkgconfig
-	${PYTHON_DEPS}
-	${RDEPEND}
-"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-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() {
-	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
-}
-
-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.6.3.ebuild b/sys-libs/ldb/ldb-1.6.3.ebuild
deleted file mode 100644
index e923eb6743da..000000000000
--- a/sys-libs/ldb/ldb-1.6.3.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{6,7} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit python-single-r1 waf-utils multilib-minimal eutils
-
-DESCRIPTION="An LDAP-like embedded database"
-HOMEPAGE="https://ldb.samba.org"
-SRC_URI="https://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"
-IUSE="doc +ldap +lmdb python"
-
-RDEPEND="
-	!elibc_FreeBSD? ( dev-libs/libbsd[${MULTILIB_USEDEP}] )
-	dev-libs/popt[${MULTILIB_USEDEP}]
-	>=dev-util/cmocka-1.1.3[${MULTILIB_USEDEP}]
-	>=sys-libs/talloc-2.1.16[python?,${MULTILIB_USEDEP}]
-	>=sys-libs/tdb-1.3.18[python?,${MULTILIB_USEDEP}]
-	>=sys-libs/tevent-0.9.39[python(+)?,${MULTILIB_USEDEP}]
-	ldap? ( net-nds/openldap )
-	lmdb? ( >=dev-db/lmdb-0.9.16[${MULTILIB_USEDEP}] )
-	python? ( ${PYTHON_DEPS} )
-"
-
-DEPEND="dev-libs/libxslt
-	doc? ( app-doc/doxygen )
-	virtual/pkgconfig
-	${PYTHON_DEPS}
-	${RDEPEND}
-"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-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() {
-	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
-}
-
-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.0.8.ebuild b/sys-libs/ldb/ldb-2.0.8.ebuild
index 7907603045a3..ef525af0a11a 100644
--- a/sys-libs/ldb/ldb-2.0.8.ebuild
+++ b/sys-libs/ldb/ldb-2.0.8.ebuild
@@ -13,11 +13,10 @@ SRC_URI="https://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"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
 IUSE="doc +ldap +lmdb python test"
 
 RESTRICT="!test? ( test )"
-REQUIRED_USE="test? ( python )"
 
 RDEPEND="
 	!elibc_FreeBSD? ( dev-libs/libbsd[${MULTILIB_USEDEP}] )
@@ -38,7 +37,8 @@ DEPEND="dev-libs/libxslt
 	${RDEPEND}
 "
 
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
+	test? ( python )"
 
 WAF_BINARY="${S}/buildtools/bin/waf"
 
diff --git a/sys-libs/ldb/ldb-2.0.7.ebuild b/sys-libs/ldb/ldb-2.0.9.ebuild
index 7ff1765745cd..484c8a1afd84 100644
--- a/sys-libs/ldb/ldb-2.0.7.ebuild
+++ b/sys-libs/ldb/ldb-2.0.9.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 PYTHON_REQ_USE="threads(+)"
 
 inherit python-single-r1 waf-utils multilib-minimal eutils
@@ -13,8 +13,10 @@ SRC_URI="https://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"
-IUSE="doc +ldap +lmdb python"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="doc +ldap +lmdb python test"
+
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	!elibc_FreeBSD? ( dev-libs/libbsd[${MULTILIB_USEDEP}] )
@@ -35,7 +37,8 @@ DEPEND="dev-libs/libxslt
 	${RDEPEND}
 "
 
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
+	test? ( python )"
 
 WAF_BINARY="${S}/buildtools/bin/waf"
 
diff --git a/sys-libs/ldb/ldb-1.5.6.ebuild b/sys-libs/ldb/ldb-2.1.1.ebuild
index e923eb6743da..e1deb520305b 100644
--- a/sys-libs/ldb/ldb-1.5.6.ebuild
+++ b/sys-libs/ldb/ldb-2.1.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 PYTHON_REQ_USE="threads(+)"
 
 inherit python-single-r1 waf-utils multilib-minimal eutils
@@ -13,16 +13,18 @@ SRC_URI="https://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"
-IUSE="doc +ldap +lmdb python"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="doc +ldap +lmdb python test"
+
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	!elibc_FreeBSD? ( dev-libs/libbsd[${MULTILIB_USEDEP}] )
 	dev-libs/popt[${MULTILIB_USEDEP}]
 	>=dev-util/cmocka-1.1.3[${MULTILIB_USEDEP}]
-	>=sys-libs/talloc-2.1.16[python?,${MULTILIB_USEDEP}]
-	>=sys-libs/tdb-1.3.18[python?,${MULTILIB_USEDEP}]
-	>=sys-libs/tevent-0.9.39[python(+)?,${MULTILIB_USEDEP}]
+	>=sys-libs/talloc-2.3.1[python?,${MULTILIB_USEDEP}]
+	>=sys-libs/tdb-1.4.3[python?,${MULTILIB_USEDEP}]
+	>=sys-libs/tevent-0.10.2[python(+)?,${MULTILIB_USEDEP}]
 	ldap? ( net-nds/openldap )
 	lmdb? ( >=dev-db/lmdb-0.9.16[${MULTILIB_USEDEP}] )
 	python? ( ${PYTHON_DEPS} )
@@ -35,7 +37,8 @@ DEPEND="dev-libs/libxslt
 	${RDEPEND}
 "
 
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
+	test? ( python )"
 
 WAF_BINARY="${S}/buildtools/bin/waf"