Bug #440470: Clean up elog stuff with Arfrever's suggestion.

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

3 files changed, 18 insertions, 33 deletions

diff --git a/net-nds/openldap/ChangeLog b/net-nds/openldap/ChangeLog
index c7616ff7efc3..520e881737c3 100644
--- a/net-nds/openldap/ChangeLog
+++ b/net-nds/openldap/ChangeLog
@@ -1,6 +1,9 @@
 # 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.479 2014/10/13 09:30:56 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/ChangeLog,v 1.480 2014/10/13 21:03:06 robbat2 Exp $
+
+  13 Oct 2014; Robin H. Johnson <robbat2@gentoo.org> openldap-2.4.40.ebuild:
+  Bug #440470: Clean up elog stuff with Arfrever's suggestion.
 
   13 Oct 2014; Michał Górny <mgorny@gentoo.org> openldap-2.4.40.ebuild:
   Wrap lmdb.h for USE=-minimal, bug #525220.
diff --git a/net-nds/openldap/Manifest b/net-nds/openldap/Manifest
index 95e76b16434a..9e3efd4ab6b2 100644
--- a/net-nds/openldap/Manifest
+++ b/net-nds/openldap/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX DB_CONFIG.fast.example 746 SHA256 69fc9aa6e4f0b888bc02d3f75642fe1ebf9345c685257a5c1236b2e79ed56e0b SHA512 07199416b7c91864a1dd5ad45642367c4f79ee8b694214305289c47afb5b53420f0fb81cf7c8b117400c903535e88a2dd47bda28d57e969aeeec669debf6dc9e WHIRLPOOL 1d6a2adcdbbac2698d8d5ab1867ecfafee23c8561c34addaea30f59bde8b4bfad88c576ffd7df102aa428c2588ed3b9376de49606eb6608c8e873f8119326c5a
 AUX openldap-2.2.14-perlthreadsfix.patch 614 SHA256 bb719cc1fed47ff0f111c960f3295781ae6f0d9e98b4266a87751044b4bb3175 SHA512 e2579de72194c63e445108a39a85635622c1a629cec9d276df84ce9d770dbe7e2df2057663bac192558af3dee60fa2f0ae92f4cc34145c300fe141ae7f3f13b3 WHIRLPOOL 24cab36ff0368f81f555ba0fa0ea0f78d245d1863bf4c6c6d291536b16bdbe628a9a204ffccce12a6014b71717f3dd722c9f95061c1a519e273c0535316ad97d
 AUX openldap-2.2.6-ntlm.patch 5011 SHA256 1f7e766bcafb412ec336aad7e07295d6d62d2e2a62b6804b07b06a5056102243 SHA512 8140dba85c56f269c953b0b23b2ca7eecb42f8e5167f4d0f08511dc8c06c30bcb42c3e38ed3b77d5622780a94c0aa9eb65bb8e45af50075acab97e7f466a1a9d WHIRLPOOL 75c2394c46242f738b5ee0db8473b05b5e7e75821e89dcea3ca7a139e34cc61f5848d0601dc66499dad35beefdd02aed5486ed138cfd8e216041aa5ceb85c920
@@ -61,25 +58,6 @@ 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.ebuild 26364 SHA256 739a0d79215a88aa28fa66a7d3fbfa16752ac21cd36aac8a0608097fca946c93 SHA512 03ff944e382268d0e6dddcc502ccb9b2c5fdb4949958c3da423a93aa4c9391f959f8c92a2548b6f4317d5ec8c81b8cb5dbad59fb024bf45a5b8d0875dba823bc WHIRLPOOL b04c465f7e43f85dbd07573dd6ed1693d09aabb82810582413d2ebd3fb212e2472243155b619a058caa53d3ff60b4149cea020473a6685010c8a0b14525de493
-MISC ChangeLog 84207 SHA256 5d7119079b8601edb02a2c01b9f396ed37fd292db17f1931e6e9a1979ff78608 SHA512 9fdf7dc1c6b2e3d6090b08603fbe8547b47f27a210628df9ffb10e4a290f1ec008e891d8d6300f19d9d0837231af6de4782cc707475bab928358628978739b79 WHIRLPOOL 0ce59d2e9a7248514e750f8d8c5ae18654d05aee77392f343aa701e535c1cdaf95b17fdb4a881b89b9096e3706498cd40427240ec1e45faf71ee32dcfc442519
+EBUILD openldap-2.4.40.ebuild 26649 SHA256 00fda023cac73b0415bddc4bbdc1b310fbbc94d91fd8a01d11ba38921b87f0b0 SHA512 744649e5b44c0259386a78c2cd0c3bd236f6cdbdb4bc2e32c8dbcab91bcdab4c48df20f0722d409b89e9ea207e8951ba0bc25a1fc7ac8cff93641e4aacaf48d1 WHIRLPOOL 7e119156ffcaeca06b1920e970d2acaf4aec2cd28bfd741ce7bf0a4ec7f8905a0963b5c94b46195c2f049068e7ec91e8b92acd2c90b4c4aab06a101c621f6096
+MISC ChangeLog 84349 SHA256 aa8c2ad99b935cfe9c70183d06aa2e47d1992ee9b741e2cdf0369416a3a319d6 SHA512 a4aaf3a958d91ca9072308ee3b7ececfc8c87d621a93d0f70e1346d705c42cc5f423a10310fa67167bae235c9d86464f2d39b6822ce98d67aeb811648bc435f6 WHIRLPOOL 6f33b82f2eba784b21c844e35cf596beca8d05d1080e303875fb7b0e770849cff1f432fba8364e0bda3a80e7d640636c4006ead0bc9d619f7704df2c5833f447
 MISC metadata.xml 664 SHA256 70c2b3ca29517c6cafffef5802fcd6a513517d320a118bf2205b0033ffa384ea SHA512 55e576a18ae7c71f3fa413b252a40945059d9f9308f4036739124bd241cc6c409816124c7e4fd30df965963d93907bce03ee117489fdb3443e62bf00dac9da25 WHIRLPOOL ce3c30df03e9026415bd72d5f3c132bb3273a597a6ca8e8928957baae1b4bc6d80ab8f7f0698d72cd8d5773a957ee2a929d3c2bdd4f5a6cd6ba88f9b9e0aa4c7
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iQJ8BAEBCABmBQJUO5vRXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOqTQP/Rkcf3gYDPPS/pwaXUppH5OE
-3i9lMkjP8zc2hbf9ufumTIGrDDVVbZb8MLROtcKtQ7bta6Da6dA2chv6udqbOo4g
-naSto1XIjBWliVM9e7tVc9c6b29ntjFsu1kiR5Cuisww2vRgrXBENuiaKw7PSLcN
-o953Fgva/h/JCtffQZ5KEneZldXD0kSsMIuKCVmmHDBVInOsWReW524cU6ll+JFP
-tUuokTq7yHtpQFKFBB68zV9qMny2W65PxicgFbG4ileBHHynsGqXFdyNjeLsRRZu
-LMQ/cKnxLS2p/9qNUmQuooYKIyhzHOqJTrMfnDsyKLJM3CiRBp7u3ARvn3Dp53j4
-GluW/j7UD7DX/NaBgD/ih0KQonyubMSeHtMwH1fYTsYu3+COZWHMfIzzXCzncB5z
-4D6pATEQaH+0qfZdi82bSvQWQPosFzTUtsVA4mz75dKoD/8SZfB4qP5AXGKeqm+L
-763fTl++HyVQWvYx60WyTw/FWqQ8YDCumzAtH53446S2tp6BghY66M4okNxLVc+M
-LufZtc9XTHKm4R6Nl8r0IcCvZwy+uGMElPcAb8Yj5V62+8FdeInH8OhfaOlYKj/z
-Do3AF1fp1DvAYtkar+3U2n5rWNL5sS+OSjLNfpX/QFtGpTP1Vq4CJhlhp7dYqou8
-xQiyBN05xdIFHMJwMVbC
-=T542
------END PGP SIGNATURE-----
diff --git a/net-nds/openldap/openldap-2.4.40.ebuild b/net-nds/openldap/openldap-2.4.40.ebuild
index 39da70adcf3c..7b769cbbc613 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.3 2014/10/13 09:30:56 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.4.40.ebuild,v 1.4 2014/10/13 21:03:06 robbat2 Exp $
 
 EAPI="5"
 
@@ -764,6 +764,10 @@ multilib_src_install_all() {
 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, 
+	# or we are going to a non-minimal build
+	! has_version net-nds/openldap || has_version 'net-nds/openldap[minimal]'
+	OPENLDAP_PRINT_MESSAGES=$((! $?))
 }
 
 pkg_postinst() {
@@ -795,13 +799,13 @@ pkg_postinst() {
 		use prefix || chown ldap:ldap "${EROOT}"var/lib/openldap-data
 	fi
 
-	if ! has_version 'net-nds/openldap'; then
-	elog "Getting started using OpenLDAP? There is some documentation available:"
-	elog "Gentoo Guide to OpenLDAP Authentication"
-	elog "(http://www.gentoo.org/doc/en/ldap-howto.xml)"
-	elog "---"
-	elog "An example file for tuning BDB backends with openldap is"
-	elog "DB_CONFIG.fast.example in /usr/share/doc/${PF}/"
+	if has_version 'net-nds/openldap[-minimal]' && ((${OPENLDAP_PRINT_MESSAGES})); then
+		elog "Getting started using OpenLDAP? There is some documentation available:"
+		elog "Gentoo Guide to OpenLDAP Authentication"
+		elog "(http://www.gentoo.org/doc/en/ldap-howto.xml)"
+		elog "---"
+		elog "An example file for tuning BDB backends with openldap is"
+		elog "DB_CONFIG.fast.example in /usr/share/doc/${PF}/"
 	fi
 
 	preserve_old_lib_notify /usr/$(get_libdir)/{liblber,libldap,libldap_r}-2.3$(get_libname 0)