Version bump. Removed old

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0x981CA6FC

4 files changed, 28 insertions, 99 deletions

diff --git a/sys-libs/ldb/ChangeLog b/sys-libs/ldb/ChangeLog
index 6b2ad022efb1..9d05ac3a296d 100644
--- a/sys-libs/ldb/ChangeLog
+++ b/sys-libs/ldb/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-libs/ldb
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/ldb/ChangeLog,v 1.67 2014/10/06 19:02:11 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/ldb/ChangeLog,v 1.68 2014/12/02 08:32:05 polynomial-c Exp $
+
+*ldb-1.1.18 (02 Dec 2014)
+
+  02 Dec 2014; Lars Wendler <polynomial-c@gentoo.org> -ldb-1.1.16.ebuild,
+  -ldb-1.1.17.ebuild, +ldb-1.1.18.ebuild:
+  Version bump. Removed old.
 
   06 Oct 2014; Agostino Sarubbo <ago@gentoo.org> ldb-1.1.17-r1.ebuild:
   Stable for x86, wrt bug #511670
diff --git a/sys-libs/ldb/Manifest b/sys-libs/ldb/Manifest
index ad585daf0225..1ed7147db987 100644
--- a/sys-libs/ldb/Manifest
+++ b/sys-libs/ldb/Manifest
@@ -3,29 +3,28 @@ Hash: SHA256
 
 DIST ldb-1.1.12.tar.gz 1110134 SHA256 b6444a1bfc9b8c8f43df171b12b5a581c44a64b4d92062d4959fed17e4cf1b4c SHA512 e00af0367b99b8829bbca636859beee75c1c0828fc15f760a2b2fed6e4fadd850b55bfa6a57e4c6cc3a698fec70f1446635b152ed3a0559ef4483907e5a2102c WHIRLPOOL ebf339d27b0a14b56dcb9e4fe85af9e034f0670567b982edb9927fa808e8eac51c672083d76e747d58d29067b441d158e78d1cb2ee343589aba44bf9aa11689b
 DIST ldb-1.1.15.tar.gz 1121684 SHA256 6bd8317e82747461394ab8ad1ee5873589d9a46d12f021571aca9fac45de8997 SHA512 48aada749986cf636aa8ae259c9ba1f07899e136129414752f2e4932f396348d56eef987fa96595c940bd159f8c03795973ba66fc49f00e204339986bf49a970 WHIRLPOOL 683e5abf53817527d42bff83330b5b8e6b07b0d2b5936ee7ac794d037091dd85b4f6674ef8538a7d6489933473908ed2026265b4b6db8a253ff711f86a9661a6
-DIST ldb-1.1.16.tar.gz 1167348 SHA256 15c679fc4f1ae5956f5f81bc7caf5840992db65da6c804854a893d1f6423daf9 SHA512 dc0803e46dd8dfdbbe2c7e287ab97a54c38598a091b5aee55924f10cbf443ab44eb79295f50c373d28a037a442473375eee0d56ab9ee629d0ee2c66d0ba185d8 WHIRLPOOL fca660ad218634cd103da411a36535086815d10237346aa51c3530d52cfb509201fc161ac9eb220ab4b90717201150d89a33dca1703215b7e350e782780e2195
 DIST ldb-1.1.17.tar.gz 1177926 SHA256 b9a312aad19e9463716d257d8f2529fd7fc1a5ef24f6dcdc0c4a1930d7bdb6e6 SHA512 bbdb79bc584bb26e053d21c47457b0c10c62080034e44d41ae9c0a6225f6d30f6976b30617f57fc4cb0776af770a4e9c569726d2385a8ec4545b1f732d366f17 WHIRLPOOL 56cbe6763010eba49c94146b1cb7748d643d2233eb5d26a1bf0a8aa02fcf2afa11b9d22a13608b753385a9817ee37804281651e47668bdc61eefd5ffa200a8c0
+DIST ldb-1.1.18.tar.gz 1215995 SHA256 2fea993ea2b3a61abd4faee2e7df13dd4afd2261e92c5d69a9ec436d14d5c9c8 SHA512 80ac8e7aab1a41e546b04da03397a465390611e2f7d0485ee5435a19acf429db4f189fea06399871e13b3728bed4038a5091d4078f42a79584a3d5e60214411e WHIRLPOOL 2556c347cb2d5a68eff3d5ca5ca13eac71f96123d1c35196239a2e3a0035b1e67039410c5428caf18c4f3f711d0225af9b66a3ff87b52077eba7ef11223f91ef
 EBUILD ldb-1.1.12.ebuild 1795 SHA256 10f2945ccbaffef3a4357e0950862ef05295c1f795435a78a7cf213ed6ddf30d SHA512 ee341447312375ba105e87628bdaf4af5e1f2bce041744591bbe74422d7258e0c57e62d4f25697eeca8512dc29549b8502cdafd3a85e66b04a3ed36bd0d834e8 WHIRLPOOL 9e0539fbe915c870da4ba6daf3cfd768bb28a1a3093ebbe9b7397b65464b2babd52dffad0111993ca2ef72f5a0d211b04da9fe8f0c61fd2d3407b495528193d0
 EBUILD ldb-1.1.15.ebuild 1812 SHA256 6525b555c49532c920e2c6c65f6e3a9302761f14809528c464c70a2de3747b35 SHA512 0dc325f31f8b7a0f9e715d6d9f8df66c637291e7a032445a249d169ceed717e0ea115125d0926d5f5092472ff932bc1665beeb7ca4f7f67938a5284ae4c6e763 WHIRLPOOL 72516012c07ef89a4fca0b51fc1173849fb96139765316372c39210f3708fb96326c394d1ff2f8b910eb8111800572ef90e41eb06958e5c7b2ce1d623e23e208
-EBUILD ldb-1.1.16.ebuild 1837 SHA256 81c69b559d101bf1c37205bda26e80e4cad1ea6e0525db4f0582783a637666d0 SHA512 38870f3cfad6b60117bd696c464138ba2b4afccd9829999dac45d116ca77671a3d93e37cfe5a090a29a9e1bb3b0b4c2d0b3e4abf8008fb66166ccdaab50859e6 WHIRLPOOL 40e1218b191610a3bc7abe67b10d14f81fa2a1831b81bace88afafa5a3c07d9a71dfb33cdf44b05989fbfcdf96949224ac8c3a3a43aea233dfad8576b168520c
 EBUILD ldb-1.1.17-r1.ebuild 1841 SHA256 9e838020c5314e22e095194f11b2f6769e5595aa2c7f437aadaf526af0dc1a4a SHA512 cf661ded009646bf74c9c7684caa28c2241fd12f79cdbee8d80025ab594116c95934d57d7dd965daed452752380f4afc6be3ee39c4264dd19712571daf9fd28d WHIRLPOOL 80daddc425c428966ad530c2e3960290e8df96f96c7107e0eff4cc63b1365fef8939166530cf7971009bc1f929d1ca002e22143c7f8d4de2f284d4e3e9f5794b
-EBUILD ldb-1.1.17.ebuild 1837 SHA256 e3c974d3f7a53f830e9e094e6ff9470c83c873e9401f1d4e08a06e85f5343e88 SHA512 7061ec5c8fa51dc643d1d7b82c0e0c11d6b5fe5d45c3c710e154ca2d156f4c064fbda72d54f12229ecbaa86cb55d7ea3d17e4c83cc658e3fc59344c693fd9fe6 WHIRLPOOL 3be828e848e4c56da755bc9e48223f02f36389a9ef9d05ba495fe5daa5140f219c28d1489a3b1434def437d0d64040c9289e344009c8a4f370caa0f300bb9a05
-MISC ChangeLog 8330 SHA256 78b06697cdf70e9ff1cefd4170479344dec1e1f43fb4dee7ce1b7e95613f44cf SHA512 6c0c4a1609bf79d6539d9d144cf4f3963a39f436eaaadd9b31106f993c6fe1d66c93dfc624db22d7f25633ae3d42453631f377b3ebe1bd143c6f29e341219174 WHIRLPOOL f39b7a133cf7433c0fb5967348148cce5e8974873f4acdcd46d1598d137c76af05567770862469b34572536d2b0b382c5201f2ee6dcba4814fe9f1faefb4e32b
+EBUILD ldb-1.1.18.ebuild 1848 SHA256 b75c1f5a1e2c199cd230d062aa85acc35792912f2f4a4e41a8fe3363e1053f4d SHA512 8fbb3cd9222464af8334058679652baf50056e6866a4fe401c1919310e969045da30b6b8b847ce83cabf32c287d42b0815a5283a1afc58f871c3a93e9b777189 WHIRLPOOL 6bd18bb35c25ace2377fe37ae594c2a0dd5a1b813e9dff405197b1724d6b23fbe0bdcb670c3c2c9327e92d226cfe9315ddd480b9090a52bbcd8b8eb7484b3e5d
+MISC ChangeLog 8512 SHA256 bd1edfdc38976ee2a1896817d62b11903b85ecdb8768a918a1230fe9c11c7820 SHA512 77c951b6891583f69e6d522cd25f4de51ab5eff1949d1460534637c1153f0cd5307182f5bb28adce14f130c20eded8fbd195083d5398fd47c454d5c19260f358 WHIRLPOOL 2f9a6052f744da3627e11ede2296ecab5d973c221ead92952f39a6034ad2130c50a680ccad1730c41e562c507ecd2f065e433c42eda2c20a8a138b16a186e647
 MISC metadata.xml 158 SHA256 d96140a5870e6f49fd382f26aaade7bf71d767243bfc3ac1ad6a986718386a38 SHA512 0ffff3c888cb55425b043e280bcbc9d7e258e61c26c544e9e3627b1ad602729d816c4a64f7ef2437f2f8003407f03703ef9adf87bdeaa5e4ebdbdb761e3d0f6d WHIRLPOOL 381c5a457ad04ffc4d4505f61cbe16a70387974bb09cce96da79e729c04c4cbb19c1e278c8a2e964e6f62a290540c1ac021386d7ba5cfc5c9d06dd4334a809d3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUMuc0AAoJELp701BxlEWfQisP/25G7HvJXwfHB9qhk17U485m
-egAUiWxHYOfgh7ISZVUuIEeMdUI39QzvqdH9gUJEdp1Rl5uZbhfcovXL0gWr35Lw
-s4ymeTrvp1ZzOCUkpF2By3bhaIEsv9MKVWE6Snx7vMfFR/ZrRD8KEsDd7iwrLU+K
-zitOTBqwRl8u3CTnY8i4zCe8txdrshaIt4s4aocChWHcUUtgPanp7zgAFCcz7sDy
-YJP0F7r0Gq+Pv1VimHrT0iqAWQ919g40fzW6hcJb6OCpJQqNySv3LqgxjXMkBYmV
-HvUoTslwtuRclqtS+COV8fVH0nQoXrNW9RYj9k3Zjh1U5En7phIhT/XawYLJlPks
-mZy2x1K4jsK5IAg/ejFvG1MtOjkqKsTEOwVdc0HkqCwOTo63ofORkdeueYSvSdgO
-yS0199JS6VUvPkrjjhmQiJWdYmo6duTTadsS3WzI8xIVkIWgoZTgPxHTFMJxW5Ld
-hSSb6L6gMQPDx7/lrYEJdPDncjBMgVvSV55NVYKYlgYIrpt1i6rSxaYBcqtWMKFv
-gEZFNmxvx+mSetStCywgsOLafvjPCWwxeUzGX7mZ+Fi0zJPMDW4VUEiqF744xsvo
-uCezcCyFcF9OK5X4THkBwqUDUlSozEp2UX2rmchvb9qe1qCJ9sBTdWESsXpVOzyf
-PBSsZj/Lkn4gtaL9QBJT
-=INR1
+iQIcBAEBCAAGBQJUfXkGAAoJEPiazRVxLXTF5GMP/jkxixMbN0gp13HsX3rIF4ct
+sRA7XnDrgU8grQwrX3bsjUpfjFvrF0qgBvGU34C8EpYEQFkv4BV3/QWIRn5cbjkC
+GInMHaF6cpWBA5DRwprrc+vk9UoPaEfuh6iEWMiY2nsJPiBCZ9OStXO7ehx+9XoJ
+WwsdrY8OAtIPOEezkHVgGEeaDxaQC5yx8wqmfJCe+a0dkJv9eeWoKEatoBa4PH/7
+OR8T06ObrENRtqEVW4aL/hnKEg6w4CT/2HEplTW9rpzs7SJVUSii5grCJXswMyIQ
+wEgKU20q8gjTL5MdC2WYggr28ddS1b/VHR7Owgbpq5a23irdrQiUmySRlGsWtJgE
+aFRMf3xnZT+1+H9POnwG6dEhnSB0l7sc1Uk30q4RhWkj0F8BkVxsozWm62MbppLk
+8Q+rF/jBsLS3e+ZQazUGMP2utwIvIlDlb2aUmO8bbXddPykyYoLlTBR3z/UlOI/g
+iPjNUYiYYygU3zACMHh9mvyUnZ01AhPT0yj3fBADMJS75CK5itlZuugie7SYXWe9
+59aq3wiBzHVk5VPjHlg+rPdJAvMVFpdQBpnculKPm8FGmgy0HXrDv4QNwlFVIl08
+9nkxtpVyzX9KN1EarLG9vK0qleI/PoZ68vG3SjVSPY5OrdjN4iehLuW+1zhhCwtM
+lB3WW5I4RLOZ7LDXeKVS
+=lALs
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/ldb/ldb-1.1.17.ebuild b/sys-libs/ldb/ldb-1.1.17.ebuild
deleted file mode 100644
index 7afccf11411a..000000000000
--- a/sys-libs/ldb/ldb-1.1.17.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/ldb/ldb-1.1.17.ebuild,v 1.3 2014/05/26 19:52:14 mgorny Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python2_{6,7} )
-
-inherit python-single-r1 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="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="doc"
-
-RDEPEND="dev-libs/popt
-	>=sys-libs/talloc-2.1.0[python]
-	>=sys-libs/tevent-0.9.21[python(+)]
-	>=sys-libs/tdb-1.2.12[python]
-	net-nds/openldap
-	!!<net-fs/samba-3.6.0[ldb]
-	!!>=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"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_configure() {
-	waf-utils_src_configure \
-		--disable-rpath \
-		--disable-rpath-install --bundled-libraries=NONE \
-		--with-modulesdir="${EPREFIX}"/usr/$(get_libdir)/samba \
-		--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
-
-	if use doc; then
-		dohtml -r apidocs/html/*
-		doman  apidocs/man/man3/*.3
-	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 http://bugs.gentoo.org/404281"
-	fi
-}
diff --git a/sys-libs/ldb/ldb-1.1.16.ebuild b/sys-libs/ldb/ldb-1.1.18.ebuild
index 4c3729dbb925..75a63be6e80c 100644
--- a/sys-libs/ldb/ldb-1.1.16.ebuild
+++ b/sys-libs/ldb/ldb-1.1.18.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/ldb/ldb-1.1.16.ebuild,v 1.6 2014/05/26 19:52:14 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/ldb/ldb-1.1.18.ebuild,v 1.1 2014/12/02 08:32:05 polynomial-c Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_{6,7} )
@@ -12,14 +12,14 @@ HOMEPAGE="http://ldb.samba.org"
 SRC_URI="http://www.samba.org/ftp/pub/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-3"
-SLOT="0"
+SLOT="0/${PV}"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="doc"
 
 RDEPEND="dev-libs/popt
-	>=sys-libs/talloc-2.0.8[python]
-	>=sys-libs/tevent-0.9.17[python(+)]
-	>=sys-libs/tdb-1.2.12[python]
+	>=sys-libs/talloc-2.1.1[python]
+	>=sys-libs/tevent-0.9.22[python(+)]
+	>=sys-libs/tdb-1.3.2[python]
 	net-nds/openldap
 	!!<net-fs/samba-3.6.0[ldb]
 	!!>=net-fs/samba-4.0.0[ldb]