1 files changed, 0 insertions, 64 deletions
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)