commit: 3d4a1abe1ccbc6d32dd6d860d0701c88bea83399 Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> AuthorDate: Sat Jul 22 19:30:47 2017 +0000 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> CommitDate: Sat Jul 22 19:35:39 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3d4a1abe
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 net-nds/openldap/openldap-2.4.44-r1.ebuild | 12 +++++------- net-nds/openldap/openldap-2.4.44.ebuild | 12 +++++------- net-nds/openldap/openldap-2.4.45.ebuild | 12 +++++------- 3 files changed, 15 insertions(+), 21 deletions(-) diff --git a/net-nds/openldap/openldap-2.4.44-r1.ebuild b/net-nds/openldap/openldap-2.4.44-r1.ebuild index 23c66c3db53..9b5a6d372a1 100644 --- 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 ea8e84e9cf0..099049a509a 100644 --- 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 0ead191e540..6d2ffdfb34d 100644 --- 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 \
