Whitespace, remove unused useflag description from metadata.xml

(Portage version: 2.2.14/cvs/Linux x86_64, unsigned Manifest commit)

4 files changed, 11 insertions, 8 deletions

diff --git a/net-nds/openldap/ChangeLog b/net-nds/openldap/ChangeLog
index bb1aab01143e..067e6012d479 100644
--- a/net-nds/openldap/ChangeLog
+++ b/net-nds/openldap/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-nds/openldap
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/ChangeLog,v 1.483 2014/10/27 19:15:09 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/ChangeLog,v 1.484 2014/10/30 02:22:07 patrick Exp $
+
+  30 Oct 2014; Patrick Lauer <patrick@gentoo.org> metadata.xml,
+  openldap-2.4.40-r2.ebuild, openldap-2.4.40.ebuild:
+  Whitespace, remove unused useflag description from metadata.xml
 
 *openldap-2.4.40-r2 (27 Oct 2014)
 
diff --git a/net-nds/openldap/metadata.xml b/net-nds/openldap/metadata.xml
index 18b77d178bad..cf1698e95ba0 100644
--- a/net-nds/openldap/metadata.xml
+++ b/net-nds/openldap/metadata.xml
@@ -12,6 +12,5 @@
 		<flag name='smbkrb5passwd'>Enable overlay for syncing ldap, unix and
 			lanman passwords</flag>
 		<flag name='minimal'>Build libraries &amp; userspace tools only. Does not install any server code.</flag>
-		<flag name='bindist'>Make the built binaries safe for redistribution: Disables use of Berkeley DB 6</flag>
 	</use>
 </pkgmetadata>
diff --git a/net-nds/openldap/openldap-2.4.40-r2.ebuild b/net-nds/openldap/openldap-2.4.40-r2.ebuild
index d0e8ce2202ce..f2aeab7b77de 100644
--- a/net-nds/openldap/openldap-2.4.40-r2.ebuild
+++ b/net-nds/openldap/openldap-2.4.40-r2.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/net-nds/openldap/openldap-2.4.40-r2.ebuild,v 1.1 2014/10/27 19:15:09 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.4.40-r2.ebuild,v 1.2 2014/10/30 02:22:07 patrick Exp $
 
 EAPI="5"
 
@@ -52,7 +52,7 @@ RDEPEND="icu? ( dev-libs/icu:= )
 		slp? ( net-libs/openslp )
 		perl? ( dev-lang/perl[-build(-)] )
 		samba? ( dev-libs/openssl )
-		berkdb? ( 
+		berkdb? (
 			>=sys-libs/db-4.4
 			<sys-libs/db-6
 			)
diff --git a/net-nds/openldap/openldap-2.4.40.ebuild b/net-nds/openldap/openldap-2.4.40.ebuild
index 7b769cbbc613..23b76b3666aa 100644
--- a/net-nds/openldap/openldap-2.4.40.ebuild
+++ b/net-nds/openldap/openldap-2.4.40.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/net-nds/openldap/openldap-2.4.40.ebuild,v 1.4 2014/10/13 21:03:06 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.4.40.ebuild,v 1.5 2014/10/30 02:22:07 patrick Exp $
 
 EAPI="5"
 
@@ -38,7 +38,7 @@ RDEPEND="icu? ( dev-libs/icu:= )
 	sasl? ( dev-libs/cyrus-sasl:= )
 	!minimal? (
 		sys-devel/libtool
-		sys-libs/e2fsprogs-libs 
+		sys-libs/e2fsprogs-libs
 		tcpd? ( sys-apps/tcp-wrappers )
 		odbc? ( !iodbc? ( dev-db/unixODBC )
 			iodbc? ( dev-db/libiodbc ) )
@@ -757,14 +757,14 @@ multilib_src_install() {
 }
 
 multilib_src_install_all() {
-	dodoc ANNOUNCEMENT CHANGES COPYRIGHT README 
+	dodoc ANNOUNCEMENT CHANGES COPYRIGHT README
 	docinto rfc ; dodoc doc/rfc/*.txt
 }
 
 pkg_preinst() {
 	# keep old libs if any
 	preserve_old_lib /usr/$(get_libdir)/{liblber,libldap_r,liblber}-2.3$(get_libname 0)
-	# bug 440470, only display the getting started help there was no openldap before, 
+	# bug 440470, only display the getting started help there was no openldap before,
 	# or we are going to a non-minimal build
 	! has_version net-nds/openldap || has_version 'net-nds/openldap[minimal]'
 	OPENLDAP_PRINT_MESSAGES=$((! $?))