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 5C120138350 for ; Wed, 12 Feb 2020 19:11:01 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9CB2AE086C; Wed, 12 Feb 2020 19:11:00 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 76609E086C for ; Wed, 12 Feb 2020 19:11:00 +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 2487B34EC50 for ; Wed, 12 Feb 2020 19:10:59 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C7CC210F for ; Wed, 12 Feb 2020 19:10:57 +0000 (UTC) From: "Mikle Kolyada" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mikle Kolyada" Message-ID: <1581534653.0e011a3d8d82660823bc1b0be32a937ea38a970c.zlogene@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.49.ebuild X-VCS-Directories: net-nds/openldap/ X-VCS-Committer: zlogene X-VCS-Committer-Name: Mikle Kolyada X-VCS-Revision: 0e011a3d8d82660823bc1b0be32a937ea38a970c X-VCS-Branch: master Date: Wed, 12 Feb 2020 19:10:57 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: fcaaf546-48d2-451c-95d7-d796612a0ae4 X-Archives-Hash: dfff93e59046d66c8b0bab829aa39ac8 commit: 0e011a3d8d82660823bc1b0be32a937ea38a970c Author: Mikle Kolyada gentoo org> AuthorDate: Wed Feb 12 19:10:45 2020 +0000 Commit: Mikle Kolyada gentoo org> CommitDate: Wed Feb 12 19:10:53 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e011a3d net-nds/openldap: fix UnnecessarySlashStrip Package-Manager: Portage-2.3.84, Repoman-2.3.20 Signed-off-by: Mikle Kolyada gentoo.org> net-nds/openldap/openldap-2.4.49.ebuild | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/net-nds/openldap/openldap-2.4.49.ebuild b/net-nds/openldap/openldap-2.4.49.ebuild index 6b4c5ba2ad9..065d0375a0b 100644 --- a/net-nds/openldap/openldap-2.4.49.ebuild +++ b/net-nds/openldap/openldap-2.4.49.ebuild @@ -738,19 +738,19 @@ multilib_src_install() { use prefix || fowners ldap:ldap /var/lib/openldap-data fperms 0700 /var/lib/openldap-data - echo "OLDPF='${PF}'" > "${ED%/}${OPENLDAP_DEFAULTDIR_VERSIONTAG}/${OPENLDAP_VERSIONTAG}" - echo "# do NOT delete this. it is used" >> "${ED%/}${OPENLDAP_DEFAULTDIR_VERSIONTAG}/${OPENLDAP_VERSIONTAG}" - echo "# to track versions for upgrading." >> "${ED%/}${OPENLDAP_DEFAULTDIR_VERSIONTAG}/${OPENLDAP_VERSIONTAG}" + echo "OLDPF='${PF}'" > "${ED}${OPENLDAP_DEFAULTDIR_VERSIONTAG}/${OPENLDAP_VERSIONTAG}" + echo "# do NOT delete this. it is used" >> "${ED}${OPENLDAP_DEFAULTDIR_VERSIONTAG}/${OPENLDAP_VERSIONTAG}" + echo "# to track versions for upgrading." >> "${ED}${OPENLDAP_DEFAULTDIR_VERSIONTAG}/${OPENLDAP_VERSIONTAG}" # use our config - rm "${ED%/}"/etc/openldap/slapd.conf + rm "${ED}"/etc/openldap/slapd.conf insinto /etc/openldap newins "${FILESDIR}"/${PN}-2.4.40-slapd-conf slapd.conf - configfile="${ED%/}"/etc/openldap/slapd.conf + configfile="${ED}"/etc/openldap/slapd.conf # populate with built backends ebegin "populate config with built backends" - for x in "${ED%/}"/usr/$(get_libdir)/openldap/openldap/back_*.so; do + 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 done @@ -775,7 +775,7 @@ multilib_src_install() { # If built without SLP, we don't need to be before avahi sed -i \ -e '/before/{s/avahi-daemon//g}' \ - "${ED%/}"/etc/init.d/slapd \ + "${ED}"/etc/init.d/slapd \ || die if use cxx ; then @@ -809,7 +809,7 @@ multilib_src_install() { for l in */*.la */*/*.la; do [[ -e ${l} ]] || continue "${lt}" --mode=install cp ${l} \ - "${ED%/}"/usr/$(get_libdir)/openldap/openldap || \ + "${ED}"/usr/$(get_libdir)/openldap/openldap || \ die "installing ${l} failed" done