From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 1A025139694 for ; Sat, 22 Jul 2017 19:37:07 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 69015E0BDF; Sat, 22 Jul 2017 19:37:06 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 38C48E0BDF for ; Sat, 22 Jul 2017 19:37:06 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id ECC6F34186A for ; Sat, 22 Jul 2017 19:37:04 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 16FE674D2 for ; Sat, 22 Jul 2017 19:37:03 +0000 (UTC) From: "Mike Gilbert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Gilbert" Message-ID: <1500752139.3d4a1abe1ccbc6d32dd6d860d0701c88bea83399.floppym@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-nds/openldap/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-nds/openldap/openldap-2.4.44-r1.ebuild net-nds/openldap/openldap-2.4.44.ebuild net-nds/openldap/openldap-2.4.45.ebuild X-VCS-Directories: net-nds/openldap/ X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert X-VCS-Revision: 3d4a1abe1ccbc6d32dd6d860d0701c88bea83399 X-VCS-Branch: master Date: Sat, 22 Jul 2017 19:37:03 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 51a91b7f-1771-4d82-a1d2-697e48e1c93f X-Archives-Hash: 97ddba2c9513c2e320dab538e22d3d4c commit: 3d4a1abe1ccbc6d32dd6d860d0701c88bea83399 Author: Mike Gilbert gentoo org> AuthorDate: Sat Jul 22 19:30:47 2017 +0000 Commit: Mike Gilbert gentoo 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 \