robbat2 14/10/13 21:03:07 Modified: ChangeLog openldap-2.4.40.ebuild Log: Bug #440470: Clean up elog stuff with Arfrever's suggestion. (Portage version: 2.2.10/cvs/Linux x86_64, unsigned Manifest commit)
Revision Changes Path 1.480 net-nds/openldap/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-nds/openldap/ChangeLog?rev=1.480&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-nds/openldap/ChangeLog?rev=1.480&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-nds/openldap/ChangeLog?r1=1.479&r2=1.480 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/net-nds/openldap/ChangeLog,v retrieving revision 1.479 retrieving revision 1.480 diff -u -r1.479 -r1.480 --- ChangeLog 13 Oct 2014 09:30:56 -0000 1.479 +++ ChangeLog 13 Oct 2014 21:03:06 -0000 1.480 @@ -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 <[email protected]> openldap-2.4.40.ebuild: + Bug #440470: Clean up elog stuff with Arfrever's suggestion. 13 Oct 2014; Michał Górny <[email protected]> openldap-2.4.40.ebuild: Wrap lmdb.h for USE=-minimal, bug #525220. 1.4 net-nds/openldap/openldap-2.4.40.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-nds/openldap/openldap-2.4.40.ebuild?rev=1.4&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-nds/openldap/openldap-2.4.40.ebuild?rev=1.4&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-nds/openldap/openldap-2.4.40.ebuild?r1=1.3&r2=1.4 Index: openldap-2.4.40.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.4.40.ebuild,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- openldap-2.4.40.ebuild 13 Oct 2014 09:30:56 -0000 1.3 +++ openldap-2.4.40.ebuild 13 Oct 2014 21:03:06 -0000 1.4 @@ -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 @@ 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 @@ 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)
