diff options
| author |   Mikle Kolyada <zlogene@gentoo.org> | 2020-02-12 22:10:45 +0300 |
|---|---|---|
| committer | Mikle Kolyada <zlogene@gentoo.org> | 2020-02-12 22:10:53 +0300 |
| commit | 0e011a3d8d82660823bc1b0be32a937ea38a970c (patch) | |
| tree | b64b917466d96a5884764e0482acd06262f4ff0f /net-nds/openldap | |
| parent | dev-lang/python: Add deps on virtual/libcrypt:= (diff) | |
| download | gentoo-0e011a3d8d82660823bc1b0be32a937ea38a970c.tar.gz gentoo-0e011a3d8d82660823bc1b0be32a937ea38a970c.tar.bz2 gentoo-0e011a3d8d82660823bc1b0be32a937ea38a970c.zip | |
net-nds/openldap: fix UnnecessarySlashStrip
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Mikle Kolyada <zlogene@gentoo.org>
Diffstat (limited to 'net-nds/openldap')
| -rw-r--r-- | net-nds/openldap/openldap-2.4.49.ebuild | 16 |
1 files 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 6b4c5ba2ad93..065d0375a0bf 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 |