Whitespace, remove unused useflag description from metadata.xml

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

5 files changed, 15 insertions, 12 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/Manifest b/net-nds/openldap/Manifest
index 99b7085512f9..63d69252b88e 100644
--- a/net-nds/openldap/Manifest
+++ b/net-nds/openldap/Manifest
@@ -60,7 +60,7 @@ EBUILD openldap-2.4.35.ebuild 22183 SHA256 c85606e0e461306d3da36f2ebacffea27edfd
 EBUILD openldap-2.4.38-r1.ebuild 22526 SHA256 82c788d06106e4e5dad38f900469e077db5ffcd514628adaa106b11a801aa174 SHA512 0847b7fd3d9c473501e08fe3af0562476eb2325c4749c2f7f7ae63f55d0c8aa940d2ca1e3667ff45bafcabe32a23175bf9e99a37b5fad1f2c612c42e20d54b1d WHIRLPOOL 735b128508f135849fea5c9c4310c2faed5e612b8b662f3f44ff89d05d87edf68a86d4c00c22470e6d634876b910e629b741ee9c8d8f3607bc77a565f7f77deb
 EBUILD openldap-2.4.38-r2.ebuild 23988 SHA256 4d35a67fd87f7b25ab939b17d2a7efe314f19cc937ab148d36dd1cfe12a82fe4 SHA512 46e72b3e2a02281d6dd96e80e9519a62fc3951f8c68cc24a5eb4c291f89ac52155c158e7f0dd9d714d7f64f6e46cb9e5ecd61ad367c09be23339c5f8323f028f WHIRLPOOL 22f6fd3d6cc418ab16caf96109f4aee3cd872aec377f57656ad5c97df6b69199ac8ab9c587e45c7f928c164ed8e869bd96094c39c9702177920d63b774e6abaa
 EBUILD openldap-2.4.39.ebuild 23993 SHA256 60c0d2a86303f67cb7d4e8bac0398a48f309439e7628ddc1e99b71e27cb613be SHA512 291722e8516f9db02b35b721e57f5b2a299a9cab032d3a99ca776dbba025873cb8dde7bf711a39283ffd65952952dbd7996a930857baac3c1ad7c7ccb5dfa0dd WHIRLPOOL 219d7a3500d2fccc23496f1b9fe2adf34e46c179a691fc60e2ef37af11778981e5e89369fd5ffcff23aed7a99df56d7c4d7b62ac42a740e3a3a3daf405628fc2
-EBUILD openldap-2.4.40-r2.ebuild 26172 SHA256 f1fcfc059d3539f9e2d6423d0ed94ece0c58018fb3fd216d24cb576d4d224638 SHA512 83a3f30a60d07377adf712cecc5878a7bde1ba86d04116db1433d572683d2812074ad9c2c030d994eacb37b0025b5f8836f61277728e747cdc0967f2bfd515c9 WHIRLPOOL 980584435a5838825ddf12f8b26ef53217d02750e9345ca5b9bd360d3d7ee9b009806f1ea49df84691c06e2afd0cd9e079f3ff575629a1bc0517035cec7b8f84
-EBUILD openldap-2.4.40.ebuild 26649 SHA256 00fda023cac73b0415bddc4bbdc1b310fbbc94d91fd8a01d11ba38921b87f0b0 SHA512 744649e5b44c0259386a78c2cd0c3bd236f6cdbdb4bc2e32c8dbcab91bcdab4c48df20f0722d409b89e9ea207e8951ba0bc25a1fc7ac8cff93641e4aacaf48d1 WHIRLPOOL 7e119156ffcaeca06b1920e970d2acaf4aec2cd28bfd741ce7bf0a4ec7f8905a0963b5c94b46195c2f049068e7ec91e8b92acd2c90b4c4aab06a101c621f6096
-MISC ChangeLog 85072 SHA256 34bddd2995abfe975b414ddc8f8dced2c4da76c4b81865bed7cffcb6675b3767 SHA512 fbb819ac3ed7b62939049363870bc86427587eaba35fa0e2c9b277799861ffd599ec28a960dddd6c81e8bf00289d643ddbbde8d4962cdb9fe391091decd423a4 WHIRLPOOL 0144fbdab4384a0ac4fe6f84abd327367a5d99478cde1718187ea09d4af7c6a27964b9fab533e24df8c73bf8f45d9d0e1dbbe8c83d3001cec41224f48f4c6ff6
-MISC metadata.xml 773 SHA256 cbf6a17e91453ce562af82e2bdb3cc37c422f5b15574c2c9c401e8ef4de45476 SHA512 551553fc55a55e9b1c38670dcebe01eb746df423cd205e65c92b940b40b5035594fce7f22b7860935a552ef7515210826a973da2c429156615c0394776d53070 WHIRLPOOL 99e74da58ceb71a13cf5720c81ef83be48ef9d4b19f4a286b38c5621ed471dd4253328ec23ed276d35ec5e46e5b685c3b7508f91448e60d72db0c46984c9d3bd
+EBUILD openldap-2.4.40-r2.ebuild 26171 SHA256 e4ef03b4c2014259fc839d08f51dad61927df4bb99b4ac180d16cdd36c08c960 SHA512 e1a901d8f9009366b7a9a2c4f519af82d615466f1cdd22d1e815dce4133e3dcc414c05a6637085ff547e89b18ebd476c891e0157e3621b426d232a7330173a74 WHIRLPOOL 8e0ccb6157be1667c88590e49ee49777b977b5cced7d451ebe6028aa438c6e293f9e795a05a756549283021640fce1cdda06d5246e012eb204aeffda1d23e374
+EBUILD openldap-2.4.40.ebuild 26646 SHA256 021a75dcadcd94b29aafa606f9c98fc168f51e7a52952584c00c0db8b2c2bc79 SHA512 c8b5d878b637c5eed7aa19df862374f94b86a280554b6c1e7dfbf317547ba43cdc731a0b206648cd74b54e7b20def8319f06df92b5a922b93074166df7bf7bd3 WHIRLPOOL a408075136c389e8faf020ab6d377ebb53a3dc6f0bfa6b5670eeee47fd113a8fcaac4d3c9498e17d9bdac937ccc10dcfcf269c495e5284e04337949a673772f1
+MISC ChangeLog 85256 SHA256 1fa8e7230e29f4b6a3c379de8048c476da8684ba134178751ef95af28c288acb SHA512 d0ebb21acd390f421bf25606118737cd083161a3ab03494f0faf311f6dad681b76d19f47e5fcc66b642ac48edcfdb831941d422ea571bb082e68cdebd6296ac7 WHIRLPOOL 01dd7b43d6a774492845eab06266fcbe4ee7447c2136752d82d2366b63994377a216175c64aa3ab12237ef137d0a6003998994c6de7b98db3dbac963044d2799
+MISC metadata.xml 664 SHA256 70c2b3ca29517c6cafffef5802fcd6a513517d320a118bf2205b0033ffa384ea SHA512 55e576a18ae7c71f3fa413b252a40945059d9f9308f4036739124bd241cc6c409816124c7e4fd30df965963d93907bce03ee117489fdb3443e62bf00dac9da25 WHIRLPOOL ce3c30df03e9026415bd72d5f3c132bb3273a597a6ca8e8928957baae1b4bc6d80ab8f7f0698d72cd8d5773a957ee2a929d3c2bdd4f5a6cd6ba88f9b9e0aa4c7
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=$((! $?))