From 4f2d7949f03e1c198bc888f2d05f421d35c57e21 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 9 Oct 2017 18:53:29 +0100 Subject: reinit the tree, so we can have metadata --- sys-libs/ldb/Manifest | 17 ++++ .../ldb/files/ldb-1.1.24-optional-python.patch | 72 ++++++++++++++ .../ldb/files/ldb-1.1.27-optional_packages.patch | 92 ++++++++++++++++++ sys-libs/ldb/files/ldb-1.1.29-disable-python.patch | 48 ++++++++++ ....31-fix_PKGCONFIGDIR-when-python-disabled.patch | 17 ++++ .../ldb/files/ldb-1.1.31-optional_packages.patch | 57 +++++++++++ .../files/ldb-1.1.31-talloc-disable-python.patch | 34 +++++++ sys-libs/ldb/ldb-1.1.26.ebuild | 97 +++++++++++++++++++ sys-libs/ldb/ldb-1.1.29-r1.ebuild | 102 ++++++++++++++++++++ sys-libs/ldb/ldb-1.1.31.ebuild | 104 +++++++++++++++++++++ sys-libs/ldb/ldb-1.2.2.ebuild | 102 ++++++++++++++++++++ sys-libs/ldb/metadata.xml | 8 ++ 12 files changed, 750 insertions(+) create mode 100644 sys-libs/ldb/Manifest create mode 100644 sys-libs/ldb/files/ldb-1.1.24-optional-python.patch create mode 100644 sys-libs/ldb/files/ldb-1.1.27-optional_packages.patch create mode 100644 sys-libs/ldb/files/ldb-1.1.29-disable-python.patch create mode 100644 sys-libs/ldb/files/ldb-1.1.31-fix_PKGCONFIGDIR-when-python-disabled.patch create mode 100644 sys-libs/ldb/files/ldb-1.1.31-optional_packages.patch create mode 100644 sys-libs/ldb/files/ldb-1.1.31-talloc-disable-python.patch create mode 100644 sys-libs/ldb/ldb-1.1.26.ebuild create mode 100644 sys-libs/ldb/ldb-1.1.29-r1.ebuild create mode 100644 sys-libs/ldb/ldb-1.1.31.ebuild create mode 100644 sys-libs/ldb/ldb-1.2.2.ebuild create mode 100644 sys-libs/ldb/metadata.xml (limited to 'sys-libs/ldb') diff --git a/sys-libs/ldb/Manifest b/sys-libs/ldb/Manifest new file mode 100644 index 000000000000..b9d2b0126ddd --- /dev/null +++ b/sys-libs/ldb/Manifest @@ -0,0 +1,17 @@ +AUX ldb-1.1.24-optional-python.patch 2746 SHA256 5e97f0d4146411c4b28ef733257ebbc58d0fc8a6b85dea1001898fc1deba0a2c SHA512 caf287ceaa980cebf667d0dcb76f302ff5ab7e1a13f0dca94dfc0da5e96f9cc5d31a2f0facd1d82a74a19507f090e1138216ad7a6d847323c56344c13735ddcc WHIRLPOOL 0b36dd2524c3e29f609e3b3ae98c7faa14e5d60dadeae2d3a211af1418d0f74170ededb56284ec483e17ff038584f6cc717637ce377f7db607333b6cdc57acf3 +AUX ldb-1.1.27-optional_packages.patch 3596 SHA256 040a008ee2563d9a380da03f04594146d8d34991c74736d27cbec2ae6bf4366a SHA512 ddc567f926a82fd855ef1690ff14dd6995f3beec9cec3796377edf10d787f89bca7375c6990c29fc8a0dfd88a519f29bf331d8ecdc7a37a6f6e1de21780e4b4a WHIRLPOOL d96313a7e0b7a3b7087279ad5b3febcbaeb66c8bda46fdfca03afac2789fe60aa18b2ed57fc25417863c87f969939ed3772b9ed0bc08f1baaaa5dbda53147ab1 +AUX ldb-1.1.29-disable-python.patch 2294 SHA256 b7e4a4b2993e94a74b33b9d7a53c3590c242fbafb4fd13d7dcc0cfea7e4c587c SHA512 f13ebcae2b4c1a844cad65729b31926249887d82ad6d295857c5402a07fd88e76150adce5b34e1a4dc059e4ba29356d60f7f7a8e24b8ae622f2a3477914d7fe1 WHIRLPOOL d26f667a566348f928bf49351efd05b1b6d7019624f56439c921795d5e6a61c2930b5f88cf3abaa8e8b2722d6a7696d4db814a43d68b52af478def72d4743cb7 +AUX ldb-1.1.31-fix_PKGCONFIGDIR-when-python-disabled.patch 701 SHA256 c6486f924cd3043f567d6fa5e9a17f61dd5a2864d7ad40bd50f28c35c45ab1a6 SHA512 35ba295d94ab5ce767f39c4cd5eb48d57a6e4993977013ee6ae0d640f74b5437a4dff6f1d14dc44dbcdc25d4e51e5084b0e3216353b2af383d8f544993228170 WHIRLPOOL 0f8d184e08d8e37bf9511280b30a658c4c848e0253d687bf9b922e0fbe43a1530dc720e8a69b84a2f98cbac876e03d8ef247b4dab4ab1127b3e57f819be93a73 +AUX ldb-1.1.31-optional_packages.patch 2022 SHA256 352830f35e5a12d258d8edd1bccc3564b871c5a3a13b063d5116a0ddd207498c SHA512 c9bc21fb306d4322874009e8eaded220f9ea1a3027781d2f6ae0f393f357349582cab8204e5a9343a88f61ab8d15f772bfb2e0d8bd42c0780b593ff9bdb9ad09 WHIRLPOOL 79006f4d15570de5150413d3f9093fe076313b8be41ddc8bf670cfdfaf0a118bb2511793468b32b56ed67caac03af95e092103e817e83296dbc7c78369365670 +AUX ldb-1.1.31-talloc-disable-python.patch 1706 SHA256 005dabcd79697577ea3ad0c5e65c0c0511492ba925c2af87b655acb91fbdcb2d SHA512 ac0bf82e8ed8b918a5efbdeb0a6cbaaef22bb72231abb09026637d62b8ce35b25212960d26c07abe63661328ab7ea8a82590cd93f04de583e23239211daf6efa WHIRLPOOL 9b18876c86af3d9211c87137ba628b0bb4f0b69cd961eb75b9ed1de461d9a157c75fc7605cba63f5024544d3bbb7270027894074a3d8cec03d99456153d1e9fb +DIST ldb-1.1.26.tar.gz 1262660 SHA256 8843c7a72b980d9413ba6c494c039bccd10c524b37fda2917afb147745d8b2e6 SHA512 484689c5b87f223820e3613c056de5528a87736baef7b884df506fc47a3412b35ba2ef8e85f62e2d3da803fdab6b37bb328d4347a20bfc8fef8ed557646b6bbe WHIRLPOOL eb72c85faaf4aaf5fa647c084f9ceb8938e940390618b1dfc486b6bc8f344d1296314cb4f07770a04de3c6597798420347fdb90ede380db9e29a04a35c88bfcb +DIST ldb-1.1.29.tar.gz 1277551 SHA256 59d84f9a5b799f519ba7b2685bb46f5a26f1bbf05b7a144b2f5e017d01d80f97 SHA512 d37bbe84358e05d17483e2e963b8477da5ea351b855b454142c94af35f7987bede0f19faeaff17779efe04e3bb37c510437fcc59be99a17c826620fc25fd659c WHIRLPOOL 57370e31249d7df8a23a7162eed9ed45d625f11edb1d57df8bd42c687bb80531e74ddf7399bd5411a1546460378903f27506a4cd56685e8fc533dfc2014086fd +DIST ldb-1.1.31.tar.gz 1337586 SHA256 04d53e2ab5b35688f5ed7a4471f5b273da121016e1af0630b36a36506afaeb46 SHA512 49ccd57000cbcc6d828160f4457236b28853d766d641841471f61226156b6103fe563c43c950577b038ea3c0a54506bca94c640d3d5f912a3b8af95eb9ef2824 WHIRLPOOL 8c368317ed7efe218e66b8dac9722552a6d9346daed87788d78a07263491977402a442f950b437022bc6473b3d4452e3f47c23209abef78c1a47372e2455af99 +DIST ldb-1.2.2.tar.gz 1348041 SHA256 0cedeadb75de401c9735127f654dbc1a391c4327a2b83be54078be286fed1113 SHA512 7d9bd88c6a654967f092758146a8115ab6c66db69a8be269a1f536f0aa3b27fb0d2ea3848cd952ef0f1885c9c4d8b76940f9902b835fe3f79f86b22a4350129b WHIRLPOOL 35565cc8c6a5013fd5acb2538adc9c1e767444811858b32907e0546c709beed304abea51bd871fff695df0af5aa7cccb75dccc3f8cbc663ba49f4b8f69da83b7 +EBUILD ldb-1.1.26.ebuild 2351 SHA256 713e7d70b2a77935de3a46194000e586428a951c94519b4ca0276cc07bee64a4 SHA512 bc4ddc45b17ff2195ed56709a05d53f67bb10bb3cff45375b9622a0465c3447e4350138b1a83a2b39f364e063cba01821fce2f53f447406a3f68520be1a3c07b WHIRLPOOL da906fd490d25d8817742d04d8389e3ed09c4b976be907e7bb03bf0e3447a52cacf26668e3c9e0c69ca4a3dc7df8b19f5c044149c09bf234b53ec9e0dd0ad600 +EBUILD ldb-1.1.29-r1.ebuild 2555 SHA256 f3a09bb5cc6dcd85263f57e4393f4a97f0205fd3d44a63b1f53623d3596ac436 SHA512 47ea0de6eab1494f217a2e4efe0f2d19ebd24504c9dd70d5bf7427c46f4600591ec87a9e2e5afbd2a8a1c97cc269570124194839ba612905ed2eab76ab309b18 WHIRLPOOL 87a8055cf39bca90809e51ece1a66ab0447cc815826428cb59538c4516090ab9b07872a7ef7c49c523776f0b8554925b0c5324206158ddc1bfe653f8da7567dd +EBUILD ldb-1.1.31.ebuild 2688 SHA256 22fa25402c5c5dcb6a8f302933124bf0fe306aa89465714e764cbd6f1a99444c SHA512 7dcc681909322c59e98cb69320f961250965820a02c74b90bed35a6de5e2337fabfcf89e3c1f78a02918d82492edf69ad39bf0e61edabffe0f96b6d903cfe28f WHIRLPOOL 0da71c1eb26cbb403f83cac29a7d511c323f633504fc6790c390ba0f24f4d2f6905e447428ab66451767470eed4f7f5b526926aa50465325c16e68237f3c09b4 +EBUILD ldb-1.2.2.ebuild 2568 SHA256 fce1b90b0b3ed2ada22cbe03ef5c6888bc2a02124cffdf4382af8a47995a6128 SHA512 8eee170a9b6381b148d70fc20c3922daab38d98ba6305a734992303b833750e0c56b9c7edf0505bdee76062e721cc2b1212f389d3300edd61d746be50f4da87e WHIRLPOOL f8b25734bea4196f0e5ebd409343e7e8f9cf72b0ea0ace8be6dd9ab2b159066a02dd8153eca1b380fa2bdf41798b39ed169b4a3de5f7d65324a6208c4e9fd70a +MISC ChangeLog 10867 SHA256 a6abc3e37c299797a50e29798d2060011fb8eb81f254fb00aeb4829a9eaecea4 SHA512 a48482095be3b5705e6dec7e1ea2ff73f5d0444b1a03280c277965c93112504b0b9a2b15c962efb6b1f9efc04126e620dd436810f231422a50edab8b5f48820b WHIRLPOOL b50bf65f01c962e7be16ab762ab6ec699aef1de32c1ed067e02d5b900067cb0929086cf07eceb4ff39de96170e4c4f3ef76d9b9abaf1a53845d842b101016646 +MISC ChangeLog-2015 9552 SHA256 d14c0a59dece3d3616c98e97698d65b8a278ac954feb80df2b210b70adb7f92a SHA512 5f693bad8f9c18f41f101c44dba6b5ff2bb82f545c9a2c3a617924d220c1ff6a8cb5492712357f9e30ccd195eb7b42ac7860e4674af865640acedd486fbfc865 WHIRLPOOL 16d6b8d13aacf96262249fc6e895af6a10c1b3a8f42d1cefe0741a4d96fa1737579ab1618d45ea813123f6b093ca89d9ab5859c13e45471b953f7a0beff8ae44 +MISC metadata.xml 234 SHA256 53349d489ac79de20551dcbe0753476342d1940b2049db8d85ea21fa8b8434ff SHA512 31c30a4b01e860c3bcf28264630d9fb75feb1caa584c6877bc3e6b3d6a52aa2d986d0ffcf4214664dd887b51c5319d7163a7ed6734cfbc8f184b53bf92fd852d WHIRLPOOL d4c03d7461d890cfc5e7df149258fd19ec2e4f8649a19ca6a4f761ed4bac0648487f87c5ed3134abca5043786b10444f4d70da2d6b8b1a3f7d4884e36123eaa1 diff --git a/sys-libs/ldb/files/ldb-1.1.24-optional-python.patch b/sys-libs/ldb/files/ldb-1.1.24-optional-python.patch new file mode 100644 index 000000000000..d8dda63d44b7 --- /dev/null +++ b/sys-libs/ldb/files/ldb-1.1.24-optional-python.patch @@ -0,0 +1,72 @@ +--- a/wscript 2015-12-10 06:01:40.000000000 -0500 ++++ b/wscript 2016-01-06 15:05:57.013617848 -0500 +@@ -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,17 @@ + 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) ++ + + def configure(conf): ++ conf.env.standalone_ldb = conf.IN_LAUNCH_DIR() ++ ++ conf.env.disable_python = getattr(Options.options, 'disable_python', False) ++ + conf.RECURSE('lib/tdb') + conf.RECURSE('lib/tevent') + +@@ -44,16 +54,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', +--- a/lib/talloc/wscript 2015-11-06 08:28:25.000000000 -0500 ++++ b/lib/talloc/wscript 2016-01-06 15:07:43.673478788 -0500 +@@ -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) + 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 new file mode 100644 index 000000000000..92e14c651c86 --- /dev/null +++ b/sys-libs/ldb/files/ldb-1.1.27-optional_packages.patch @@ -0,0 +1,92 @@ +--- 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 new file mode 100644 index 000000000000..bc4120e8acf6 --- /dev/null +++ b/sys-libs/ldb/files/ldb-1.1.29-disable-python.patch @@ -0,0 +1,48 @@ +--- 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-fix_PKGCONFIGDIR-when-python-disabled.patch b/sys-libs/ldb/files/ldb-1.1.31-fix_PKGCONFIGDIR-when-python-disabled.patch new file mode 100644 index 000000000000..c45b13feba99 --- /dev/null +++ b/sys-libs/ldb/files/ldb-1.1.31-fix_PKGCONFIGDIR-when-python-disabled.patch @@ -0,0 +1,17 @@ +--- a/wscript 2017-07-05 15:35:52.178964698 -0400 ++++ b/wscript 2017-07-05 15:49:20.137977649 -0400 +@@ -208,6 +208,14 @@ + ldb_headers = ('include/ldb.h include/ldb_errors.h ' + 'include/ldb_module.h include/ldb_handlers.h') + ++ # we're not currently linking against the ldap libs, but ldb.pc.in ++ # has @LDAP_LIBS@ ++ bld.env.LDAP_LIBS = '' ++ ++ if not 'PACKAGE_VERSION' in bld.env: ++ bld.env.PACKAGE_VERSION = VERSION ++ bld.env.PKGCONFIGDIR = '${LIBDIR}/pkgconfig' ++ + bld.SAMBA_LIBRARY('ldb', + COMMON_SRC + ' ' + LDB_MAP_SRC, + deps='tevent LIBLDB_MAIN replace', 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 new file mode 100644 index 000000000000..1e9b51773570 --- /dev/null +++ b/sys-libs/ldb/files/ldb-1.1.31-optional_packages.patch @@ -0,0 +1,57 @@ +--- 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 new file mode 100644 index 000000000000..6ef45eb37fb8 --- /dev/null +++ b/sys-libs/ldb/files/ldb-1.1.31-talloc-disable-python.patch @@ -0,0 +1,34 @@ +--- 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/ldb-1.1.26.ebuild b/sys-libs/ldb/ldb-1.1.26.ebuild new file mode 100644 index 000000000000..4c4921722c57 --- /dev/null +++ b/sys-libs/ldb/ldb-1.1.26.ebuild @@ -0,0 +1,97 @@ +# Copyright 1999-2016 Gentoo Foundation +# 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="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.27[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 ) + +PATCHES=( + "${FILESDIR}"/${PN}-1.1.24-optional-python.patch +) + +pkg_setup() { + python-single-r1_pkg_setup +} + +src_prepare() { + default + 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 + 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.29-r1.ebuild b/sys-libs/ldb/ldb-1.1.29-r1.ebuild new file mode 100644 index 000000000000..3a65143b0958 --- /dev/null +++ b/sys-libs/ldb/ldb-1.1.29-r1.ebuild @@ -0,0 +1,102 @@ +# Copyright 1999-2017 Gentoo Foundation +# 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="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 +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-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 new file mode 100644 index 000000000000..7ce11c05b7b0 --- /dev/null +++ b/sys-libs/ldb/ldb-1.1.31.ebuild @@ -0,0 +1,104 @@ +# Copyright 1999-2017 Gentoo Foundation +# 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="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 +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-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.2.ebuild b/sys-libs/ldb/ldb-1.2.2.ebuild new file mode 100644 index 000000000000..af7b0ac5cd34 --- /dev/null +++ b/sys-libs/ldb/ldb-1.2.2.ebuild @@ -0,0 +1,102 @@ +# Copyright 1999-2017 Gentoo Foundation +# 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="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 +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.33[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 +) + +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/metadata.xml b/sys-libs/ldb/metadata.xml new file mode 100644 index 000000000000..62c9222b8dd3 --- /dev/null +++ b/sys-libs/ldb/metadata.xml @@ -0,0 +1,8 @@ + + + + + samba@gentoo.org + Samba + + -- cgit v1.2.3