Depend strictly on tdb version, bug 420713. Remove old 1.1.3

Package-Manager: portage-2.1.10.65/cvs/Linux x86_64

5 files changed, 21 insertions, 95 deletions

diff --git a/sys-libs/ldb/ChangeLog b/sys-libs/ldb/ChangeLog
index e130f3190d36..f2cdd8703156 100644
--- a/sys-libs/ldb/ChangeLog
+++ b/sys-libs/ldb/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-libs/ldb
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/ldb/ChangeLog,v 1.25 2012/06/11 09:23:50 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/ldb/ChangeLog,v 1.26 2012/06/19 14:03:31 maksbotan Exp $
+
+  19 Jun 2012; Maxim Koltsov <maksbotan@gentoo.org> -ldb-1.1.3.ebuild,
+  ldb-1.1.4.ebuild, ldb-1.1.6.ebuild:
+  Depend strictly on tdb version, bug 420713. Remove old 1.1.3
 
   11 Jun 2012; Agostino Sarubbo <ago@gentoo.org> ldb-1.1.4.ebuild:
   Stable for amd64, wrt bug #419961
diff --git a/sys-libs/ldb/Manifest b/sys-libs/ldb/Manifest
index 33c0803b5da0..bf9ff6aa6cd6 100644
--- a/sys-libs/ldb/Manifest
+++ b/sys-libs/ldb/Manifest
@@ -1,22 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA1
 
-DIST ldb-1.1.3.tar.gz 1432513 RMD160 3f1515306887ac8675087c53bb91a930793cedf3 SHA1 7fb7af6dff8b9d68cd49b4d1da64a51dd9615dc5 SHA256 c6154a476c03970737405784a4fcdbdd21e7b92f6e3b61e8db8aeb93c67f83f1
 DIST ldb-1.1.4.tar.gz 1433689 RMD160 cd3341f25e32b692be2f42acd98f6c3d7edc5749 SHA1 15d308c7bf382270b6019f051ad494598e78df19 SHA256 6eb3b7f11ff8d1a4f6c229a4fe5f5b9f615a1ee744e83622594907d0193c4970
 DIST ldb-1.1.6.tar.gz 1597609 RMD160 6b8f94cb68218e86b470da6a1496b016afafaf7e SHA1 0c92445ba1736d597364250461a7bb2d06d30569 SHA256 986107d365a3a495c1be57997c45b2a5ab2e17477eb050f0b3d289f1ec23d314
-EBUILD ldb-1.1.3.ebuild 1808 RMD160 293a33f51bf57096c1c67e8d390c9f4cce68ef7d SHA1 952ba7bac8178d2700750f3bafd2c2dd92330f6d SHA256 620c7a0915a662ffb7e65f9d591b9ea019a98d41eeaefaa5b9237064ede3f423
-EBUILD ldb-1.1.4.ebuild 1812 RMD160 c70d54594c035702c396f8ab3438138cd5d9e75f SHA1 0d49c0415adb9679f5bf92058185f84bd309418d SHA256 483994eb7504dc84dfd76b4b2a2b382f369bcdb007d02983e8df97a7d1a2f47e
-EBUILD ldb-1.1.6.ebuild 1842 RMD160 e234df15cd3001cbef61e1a996a97b6fb69022fc SHA1 c2278b4a14b13ef2ac3a6898fde5b26a513e5980 SHA256 097bc621eed55d8680f8c75d2d3cf7080f1abcf912f59bc50d3058854e6f941c
-MISC ChangeLog 2895 RMD160 dd58407ebda9b5e85ea03532b227855c341681d5 SHA1 323db7c9a9713310a5b3aeea3aeb7765af2e2274 SHA256 463e991ee164258ae23fb5f314de47021f271244e72108a7083a6218a5814345
+EBUILD ldb-1.1.4.ebuild 1817 RMD160 a7161da6260c44015a61bd3f923a0801fafd38dc SHA1 1fc320e110d4506a8c7ea0007450bc29e6cfa71b SHA256 5a66ba0f4338118cd7567e200f1f65a2a28eb98b30e292b0586a84c85d9d4a4b
+EBUILD ldb-1.1.6.ebuild 1843 RMD160 459067878b42a9716ddb75fb8d9603c1a821c8be SHA1 d42fff7c3c5260a2342d1724e627b1389430e31b SHA256 cb9da962606761b7be27800dd730a208490fb19fed63309ed23ad7a8d00783b7
+MISC ChangeLog 3074 RMD160 0da7e60128723285e8b9882dfd9391f59b4e7086 SHA1 5d5a267bbf85f81f5acc3d207e7ac58ab4881a0f SHA256 57c4d4ed889c34644083deca6267935fd6976c43fff768d87722c999ff324973
 MISC metadata.xml 371 RMD160 4cbb128e783df067acccd7aa7bb9dec813120fc2 SHA1 3472653318adf6c2f472d9dce9177c5b8534b91a SHA256 73871971ce1c02ddb9edae56b17431d304055310b38ca074149f9bfce1e742d9
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCgAGBQJP1bksAAoJEOTDgjZ80txdkRIH/RrufjT6bUECKeC0GPYMKOC+
-dnx8qf635j7tFdDYOALdVMwDrJ7vszWP02tlmqC5xKj+aGUEEgDL3zc3xzk2zUSV
-MbDrC8bVCk+xHrMnlnjZ0PSk1VYTtFpK9+sZg7A6oUWRPFXAa0CwAAJ4+CHr03cH
-rwV0NUJRIVnpq8GwH6VVoxBG5z853PU6PXHtkmWJb/cIQAe8jClXHtdK4NU0pkTN
-+HW8tMp62ZRA2MHDBmJ0mQMkzCSFJHGJpSlQD/KAskdGqXGlwvH6a2ZFseGXRXCF
-kIL9yV4U2IEfjDA+Vqau9JVJh9GtPuRScIxxCGAV7aQRXa7wawSMSUwcV0ow27k=
-=/Buq
+iQEcBAEBAgAGBQJP4IbWAAoJEAmJmMX429reL0cH/3KzuBp27wGwXR5NVyHoefhQ
+9Oiv+PlUqanvvaFsQBczROcfJt8y9jSp4KopUnv8q3t6N12NkZmIqZB/HOIIjU5R
+MPyHDIMPqaf6MrVGwSZUqUPLI05PvqvmiJh4b5c26dSwm4lTJEWxSeW2hhZuk1kI
+U6poHn5alc/EjNme1HsiQjXuoCxNB/+qOvIXPQabrDQBQeTSKEzbWiN654LfgZ9k
+F+67gAFi+ef0F77UGrx6Wm9R4Ez0FetiQik9B/VA5OA/xEbcC+wU1HaYar8qXwP6
+ZbMxMtMdjXS0HwDYXrEfd6cpzd0tTkzeulpn/tgZWjWOHGQRlOBTQcRb54iXr20=
+=rqPG
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/ldb/ldb-1.1.3.ebuild b/sys-libs/ldb/ldb-1.1.3.ebuild
deleted file mode 100644
index 0f30fd351f08..000000000000
--- a/sys-libs/ldb/ldb-1.1.3.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/ldb/ldb-1.1.3.ebuild,v 1.7 2012/05/04 07:33:11 jdhore Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2"
-
-inherit python waf-utils multilib
-
-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"
-KEYWORDS="amd64 ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd"
-IUSE="doc"
-
-RDEPEND="dev-libs/popt
-	>=sys-libs/talloc-2.0.7[python]
-	>=sys-libs/tevent-0.9.14
-	>=sys-libs/tdb-1.2.9[python]
-	net-nds/openldap
-	!!<net-fs/samba-3.6.0[ldb]
-	!!>=net-fs/samba-4.0.0[ldb]
-	"
-
-DEPEND="dev-libs/libxslt
-	doc? ( app-doc/doxygen )
-	virtual/pkgconfig
-	${RDEPEND}"
-
-WAF_BINARY="${S}/buildtools/bin/waf-svn"
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-	python_need_rebuild
-}
-
-src_configure() {
-	waf-utils_src_configure --disable-rpath \
-	--disable-rpath-install --bundled-libraries=NONE \
-	--with-modulesdir="${EPREFIX}"/usr/$(get_libdir)/ldb/modules \
-	--builtin-libraries=NONE
-}
-
-src_compile(){
-	waf-utils_src_compile
-	use doc && doxygen Doxyfile
-}
-
-src_test() {
-	WAF_MAKE=1 \
-	PATH=buildtools/bin:../../../buildtools/bin:$PATH:"${S}"/bin/shared/private/ \
-	LD_LIBRARY_PATH=$LD_LIBRARY_PATH:"${S}"/bin/shared/private/:"${S}"/bin/shared waf test || die
-}
-
-src_install() {
-	waf-utils_src_install
-	rm "${D}/$(python_get_sitedir)/"_tevent.so
-
-	if use doc; then
-		dohtml -r apidocs/html/*
-		doman  apidocs/man/man3/*.3
-	fi
-}
-
-pkg_postinst() {
-	python_need_rebuild
-	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 http://bugs.gentoo.org/404281"
-	fi
-}
diff --git a/sys-libs/ldb/ldb-1.1.4.ebuild b/sys-libs/ldb/ldb-1.1.4.ebuild
index 51687e6c5787..b80e59c1ce94 100644
--- a/sys-libs/ldb/ldb-1.1.4.ebuild
+++ b/sys-libs/ldb/ldb-1.1.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/ldb/ldb-1.1.4.ebuild,v 1.5 2012/06/11 09:23:50 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/ldb/ldb-1.1.4.ebuild,v 1.6 2012/06/19 14:03:31 maksbotan Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2"
@@ -19,7 +19,7 @@ IUSE="doc"
 RDEPEND="dev-libs/popt
 	>=sys-libs/talloc-2.0.7[python]
 	>=sys-libs/tevent-0.9.14
-	>=sys-libs/tdb-1.2.9[python]
+	~sys-libs/tdb-1.2.9[python]
 	net-nds/openldap
 	!!<net-fs/samba-3.6.0[ldb]
 	!!>=net-fs/samba-4.0.0[ldb]
diff --git a/sys-libs/ldb/ldb-1.1.6.ebuild b/sys-libs/ldb/ldb-1.1.6.ebuild
index ca0f7f76e8c2..22c2b3ed6ea5 100644
--- a/sys-libs/ldb/ldb-1.1.6.ebuild
+++ b/sys-libs/ldb/ldb-1.1.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/ldb/ldb-1.1.6.ebuild,v 1.2 2012/05/30 22:42:44 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/ldb/ldb-1.1.6.ebuild,v 1.3 2012/06/19 14:03:31 maksbotan Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2"
@@ -19,7 +19,7 @@ IUSE="doc"
 RDEPEND="dev-libs/popt
 	>=sys-libs/talloc-2.0.7[python]
 	>=sys-libs/tevent-0.9.14
-	>=sys-libs/tdb-1.2.9[python]
+	~sys-libs/tdb-1.2.10[python]
 	net-nds/openldap
 	!!<net-fs/samba-3.6.0[ldb]
 	!!>=net-fs/samba-4.0.0[ldb]