Cleanup a bit.

(Portage version: 2.2.0_alpha125/cvs/Linux x86_64)

4 files changed, 11 insertions, 159 deletions

diff --git a/sys-libs/ldb/ChangeLog b/sys-libs/ldb/ChangeLog
index 2a08d74a4f29..543a9d9899ab 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.32 2012/08/21 14:35:07 qnikst Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/ldb/ChangeLog,v 1.33 2012/09/13 19:09:27 scarabeus Exp $
+
+  13 Sep 2012; Tomáš Chvátal <scarabeus@gentoo.org> -ldb-1.1.6-r1.ebuild,
+  -ldb-1.1.8.ebuild, ldb-1.1.10.ebuild, ldb-1.1.9.ebuild:
+  Cleanup a bit.
 
 *ldb-1.1.10 (21 Aug 2012)
 
diff --git a/sys-libs/ldb/ldb-1.1.10.ebuild b/sys-libs/ldb/ldb-1.1.10.ebuild
index c995fd77c43e..524fc220836d 100644
--- a/sys-libs/ldb/ldb-1.1.10.ebuild
+++ b/sys-libs/ldb/ldb-1.1.10.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.10.ebuild,v 1.1 2012/08/21 14:35:07 qnikst Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/ldb/ldb-1.1.10.ebuild,v 1.2 2012/09/13 19:09:27 scarabeus Exp $
 
 EAPI="4"
 PYTHON_DEPEND="2"
@@ -39,10 +39,11 @@ pkg_setup() {
 }
 
 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
+	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(){
@@ -58,7 +59,6 @@ src_test() {
 
 src_install() {
 	waf-utils_src_install
-#	rm "${D}/$(python_get_sitedir)/"_tevent.so
 
 	if use doc; then
 		dohtml -r apidocs/html/*
diff --git a/sys-libs/ldb/ldb-1.1.6-r1.ebuild b/sys-libs/ldb/ldb-1.1.6-r1.ebuild
deleted file mode 100644
index 877c58e24bba..000000000000
--- a/sys-libs/ldb/ldb-1.1.6-r1.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.6-r1.ebuild,v 1.1 2012/08/21 12:43:43 qnikst 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 ~amd64-fbsd ~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.10[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"
-
-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  --disable-tdb2
-}
-
-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.8.ebuild b/sys-libs/ldb/ldb-1.1.8.ebuild
deleted file mode 100644
index 7ef639c74322..000000000000
--- a/sys-libs/ldb/ldb-1.1.8.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.8.ebuild,v 1.1 2012/08/01 11:30:30 maksbotan 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 ~amd64-fbsd ~x86-fbsd"
-IUSE="doc"
-
-RDEPEND="dev-libs/popt
-	>=sys-libs/talloc-2.0.7[python]
-	~sys-libs/tevent-0.9.16
-	~sys-libs/tdb-1.2.10[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"
-
-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
-}