net-nds/openldap: sed init script and systemd unit before install

Bug: https://bugs.gentoo.org/625960
Package-Manager: Portage-2.3.6_p23, Repoman-2.3.3_p1

diff --git a/net-nds/openldap/openldap-2.4.44-r1.ebuild b/net-nds/openldap/openldap-2.4.44-r1.ebuild
index 23c66c3db5307b3c85ffcbd80808005882259a22..9b5a6d372a18104f6dec6dfde5b71bb6208d74d2 100644 (file)
--- a/net-nds/openldap/openldap-2.4.44-r1.ebuild
+++ b/net-nds/openldap/openldap-2.4.44-r1.ebuild
@@ -716,18 +716,16 @@ multilib_src_install() {
 
                # install our own init scripts and systemd unit files
                einfo "Install init scripts"
-               newinitd "${FILESDIR}"/slapd-initd-2.4.40-r2 slapd
+               sed -e "s,/usr/lib/,/usr/$(get_libdir)/," "${FILESDIR}"/slapd-initd-2.4.40-r2 > "${T}"/slapd || die
+               doinitd "${T}"/slapd
                newconfd "${FILESDIR}"/slapd-confd-2.4.28-r1 slapd
+
                einfo "Install systemd service"
-               systemd_dounit "${FILESDIR}"/slapd.service
+               sed -e "s,/usr/lib/,/usr/$(get_libdir)/," "${FILESDIR}"/slapd.service > "${T}"/slapd.service || die
+               systemd_dounit "${T}"/slapd.service
                systemd_install_serviced "${FILESDIR}"/slapd.service.conf
                systemd_newtmpfilesd "${FILESDIR}"/slapd.tmpfilesd slapd.conf
 
-               if [[ $(get_libdir) != lib ]]; then
-                       sed -e "s,/usr/lib/,/usr/$(get_libdir)/," -i \
-                               "${ED}"/etc/init.d/slapd \
-                               "${ED}"/usr/lib/systemd/system/slapd.service || die
-               fi
                # If built without SLP, we don't need to be before avahi
                use slp \
                        || sed -i \

diff --git a/net-nds/openldap/openldap-2.4.44.ebuild b/net-nds/openldap/openldap-2.4.44.ebuild
index ea8e84e9cf0accb191f39c5e72f44394920bb348..099049a509a6736d6ce0b39ca7d536bb89fa7018 100644 (file)
--- a/net-nds/openldap/openldap-2.4.44.ebuild
+++ b/net-nds/openldap/openldap-2.4.44.ebuild
@@ -694,18 +694,16 @@ multilib_src_install() {
 
                # install our own init scripts and systemd unit files
                einfo "Install init scripts"
-               newinitd "${FILESDIR}"/slapd-initd-2.4.40-r2 slapd
+               sed -e "s,/usr/lib/,/usr/$(get_libdir)/," "${FILESDIR}"/slapd-initd-2.4.40-r2 > "${T}"/slapd || die
+               doinitd "${T}"/slapd
                newconfd "${FILESDIR}"/slapd-confd-2.4.28-r1 slapd
+
                einfo "Install systemd service"
-               systemd_dounit "${FILESDIR}"/slapd.service
+               sed -e "s,/usr/lib/,/usr/$(get_libdir)/," "${FILESDIR}"/slapd.service > "${T}"/slapd.service || die
+               systemd_dounit "${T}"/slapd.service
                systemd_install_serviced "${FILESDIR}"/slapd.service.conf
                systemd_newtmpfilesd "${FILESDIR}"/slapd.tmpfilesd slapd.conf
 
-               if [[ $(get_libdir) != lib ]]; then
-                       sed -e "s,/usr/lib/,/usr/$(get_libdir)/," -i \
-                               "${ED}"/etc/init.d/slapd \
-                               "${ED}"/usr/lib/systemd/system/slapd.service || die
-               fi
                # If built without SLP, we don't need to be before avahi
                use slp \
                        || sed -i \

diff --git a/net-nds/openldap/openldap-2.4.45.ebuild b/net-nds/openldap/openldap-2.4.45.ebuild
index 0ead191e5409e89616ee4994a4ea2b4b699592c1..6d2ffdfb34d77861fb26c682828130fa8926117a 100644 (file)
--- a/net-nds/openldap/openldap-2.4.45.ebuild
+++ b/net-nds/openldap/openldap-2.4.45.ebuild
@@ -748,18 +748,16 @@ multilib_src_install() {
 
                # install our own init scripts and systemd unit files
                einfo "Install init scripts"
-               newinitd "${FILESDIR}"/slapd-initd-2.4.40-r2 slapd
+               sed -e "s,/usr/lib/,/usr/$(get_libdir)/," "${FILESDIR}"/slapd-initd-2.4.40-r2 > "${T}"/slapd || die
+               doinitd "${T}"/slapd
                newconfd "${FILESDIR}"/slapd-confd-2.4.28-r1 slapd
+
                einfo "Install systemd service"
-               systemd_dounit "${FILESDIR}"/slapd.service
+               sed -e "s,/usr/lib/,/usr/$(get_libdir)/," "${FILESDIR}"/slapd.service > "${T}"/slapd.service || die
+               systemd_dounit "${T}"/slapd.service
                systemd_install_serviced "${FILESDIR}"/slapd.service.conf
                systemd_newtmpfilesd "${FILESDIR}"/slapd.tmpfilesd slapd.conf
 
-               if [[ $(get_libdir) != lib ]]; then
-                       sed -e "s,/usr/lib/,/usr/$(get_libdir)/," -i \
-                               "${ED}"/etc/init.d/slapd \
-                               "${ED}"/usr/lib/systemd/system/slapd.service || die
-               fi
                # If built without SLP, we don't need to be before avahi
                use slp \
                        || sed -i \