commit:     54d6b965bc03481d743a874991ce4072a3a7d37b
Author:     Thomas Bracht Laumann Jespersen <t <AT> laumann <DOT> xyz>
AuthorDate: Wed Apr 20 20:13:02 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri May 13 20:03:35 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=54d6b965

net-nds/openldap: [QA] eend without argument

Remove the lone eend, and change the ebegin to einfo.

Signed-off-by: Thomas Bracht Laumann Jespersen <t <AT> laumann.xyz>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-nds/openldap/openldap-2.4.57-r2.ebuild | 3 +--
 net-nds/openldap/openldap-2.4.58-r2.ebuild | 3 +--
 net-nds/openldap/openldap-2.4.59-r2.ebuild | 3 +--
 net-nds/openldap/openldap-2.5.4-r1.ebuild  | 3 +--
 net-nds/openldap/openldap-2.6.1-r1.ebuild  | 3 +--
 5 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/net-nds/openldap/openldap-2.4.57-r2.ebuild 
b/net-nds/openldap/openldap-2.4.57-r2.ebuild
index 6071ea4e4bfc..5ec8d89d34fe 100644
--- a/net-nds/openldap/openldap-2.4.57-r2.ebuild
+++ b/net-nds/openldap/openldap-2.4.57-r2.ebuild
@@ -749,7 +749,7 @@ multilib_src_install() {
                configfile="${ED}"/etc/openldap/slapd.conf
 
                # populate with built backends
-               ebegin "populate config with built backends"
+               einfo "populate config with built backends"
                for x in "${ED}"/usr/$(get_libdir)/openldap/openldap/back_*.so; 
do
                        einfo "Adding $(basename ${x})"
                        sed -e "/###INSERTDYNAMICMODULESHERE###$/a# 
moduleload\t$(basename ${x})" -i "${configfile}" || die
@@ -758,7 +758,6 @@ multilib_src_install() {
                use prefix || fowners root:ldap /etc/openldap/slapd.conf
                fperms 0640 /etc/openldap/slapd.conf
                cp "${configfile}" "${configfile}".default || die
-               eend
 
                # install our own init scripts and systemd unit files
                einfo "Install init scripts"

diff --git a/net-nds/openldap/openldap-2.4.58-r2.ebuild 
b/net-nds/openldap/openldap-2.4.58-r2.ebuild
index 8ecc781450b2..dda39f5339c0 100644
--- a/net-nds/openldap/openldap-2.4.58-r2.ebuild
+++ b/net-nds/openldap/openldap-2.4.58-r2.ebuild
@@ -749,7 +749,7 @@ multilib_src_install() {
                configfile="${ED}"/etc/openldap/slapd.conf
 
                # populate with built backends
-               ebegin "populate config with built backends"
+               einfo "populate config with built backends"
                for x in "${ED}"/usr/$(get_libdir)/openldap/openldap/back_*.so; 
do
                        einfo "Adding $(basename ${x})"
                        sed -e "/###INSERTDYNAMICMODULESHERE###$/a# 
moduleload\t$(basename ${x})" -i "${configfile}" || die
@@ -758,7 +758,6 @@ multilib_src_install() {
                use prefix || fowners root:ldap /etc/openldap/slapd.conf
                fperms 0640 /etc/openldap/slapd.conf
                cp "${configfile}" "${configfile}".default || die
-               eend
 
                # install our own init scripts and systemd unit files
                einfo "Install init scripts"

diff --git a/net-nds/openldap/openldap-2.4.59-r2.ebuild 
b/net-nds/openldap/openldap-2.4.59-r2.ebuild
index 25141776f10a..0aca184d6849 100644
--- a/net-nds/openldap/openldap-2.4.59-r2.ebuild
+++ b/net-nds/openldap/openldap-2.4.59-r2.ebuild
@@ -749,7 +749,7 @@ multilib_src_install() {
                configfile="${ED}"/etc/openldap/slapd.conf
 
                # populate with built backends
-               ebegin "populate config with built backends"
+               einfo "populate config with built backends"
                for x in "${ED}"/usr/$(get_libdir)/openldap/openldap/back_*.so; 
do
                        einfo "Adding $(basename ${x})"
                        sed -e "/###INSERTDYNAMICMODULESHERE###$/a# 
moduleload\t$(basename ${x})" -i "${configfile}" || die
@@ -758,7 +758,6 @@ multilib_src_install() {
                use prefix || fowners root:ldap /etc/openldap/slapd.conf
                fperms 0640 /etc/openldap/slapd.conf
                cp "${configfile}" "${configfile}".default || die
-               eend
 
                # install our own init scripts and systemd unit files
                einfo "Install init scripts"

diff --git a/net-nds/openldap/openldap-2.5.4-r1.ebuild 
b/net-nds/openldap/openldap-2.5.4-r1.ebuild
index 53daba349ce5..8304dd4e70f1 100644
--- a/net-nds/openldap/openldap-2.5.4-r1.ebuild
+++ b/net-nds/openldap/openldap-2.5.4-r1.ebuild
@@ -681,7 +681,7 @@ multilib_src_install() {
                configfile="${ED}"/etc/openldap/slapd.conf
 
                # populate with built backends
-               ebegin "populate config with built backends"
+               einfo "populate config with built backends"
                for x in "${ED}"/usr/$(get_libdir)/openldap/openldap/back_*.so; 
do
                        einfo "Adding $(basename ${x})"
                        sed -e "/###INSERTDYNAMICMODULESHERE###$/a# 
moduleload\t$(basename ${x})" -i "${configfile}" || die
@@ -690,7 +690,6 @@ multilib_src_install() {
                use prefix || fowners root:ldap /etc/openldap/slapd.conf
                fperms 0640 /etc/openldap/slapd.conf
                cp "${configfile}" "${configfile}".default || die
-               eend
 
                # install our own init scripts and systemd unit files
                einfo "Install init scripts"

diff --git a/net-nds/openldap/openldap-2.6.1-r1.ebuild 
b/net-nds/openldap/openldap-2.6.1-r1.ebuild
index 2bb87baa4aa0..1223fd163d99 100644
--- a/net-nds/openldap/openldap-2.6.1-r1.ebuild
+++ b/net-nds/openldap/openldap-2.6.1-r1.ebuild
@@ -648,7 +648,7 @@ multilib_src_install() {
                configfile="${ED}"/etc/openldap/slapd.conf
 
                # populate with built backends
-               ebegin "populate config with built backends"
+               einfo "populate config with built backends"
                for x in "${ED}"/usr/$(get_libdir)/openldap/openldap/back_*.so; 
do
                        einfo "Adding $(basename ${x})"
                        sed -e "/###INSERTDYNAMICMODULESHERE###$/a# 
moduleload\t$(basename ${x})" -i "${configfile}" || die
@@ -657,7 +657,6 @@ multilib_src_install() {
                use prefix || fowners root:ldap /etc/openldap/slapd.conf
                fperms 0640 /etc/openldap/slapd.conf
                cp "${configfile}" "${configfile}".default || die
-               eend $?
 
                # install our own init scripts and systemd unit files
                einfo "Install init scripts"

Reply via email to