| 1 |
commit: 0e011a3d8d82660823bc1b0be32a937ea38a970c |
| 2 |
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Feb 12 19:10:45 2020 +0000 |
| 4 |
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Feb 12 19:10:53 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e011a3d |
| 7 |
|
| 8 |
net-nds/openldap: fix UnnecessarySlashStrip |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.84, Repoman-2.3.20 |
| 11 |
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org> |
| 12 |
|
| 13 |
net-nds/openldap/openldap-2.4.49.ebuild | 16 ++++++++-------- |
| 14 |
1 file changed, 8 insertions(+), 8 deletions(-) |
| 15 |
|
| 16 |
diff --git a/net-nds/openldap/openldap-2.4.49.ebuild b/net-nds/openldap/openldap-2.4.49.ebuild |
| 17 |
index 6b4c5ba2ad9..065d0375a0b 100644 |
| 18 |
--- a/net-nds/openldap/openldap-2.4.49.ebuild |
| 19 |
+++ b/net-nds/openldap/openldap-2.4.49.ebuild |
| 20 |
@@ -738,19 +738,19 @@ multilib_src_install() { |
| 21 |
use prefix || fowners ldap:ldap /var/lib/openldap-data |
| 22 |
fperms 0700 /var/lib/openldap-data |
| 23 |
|
| 24 |
- echo "OLDPF='${PF}'" > "${ED%/}${OPENLDAP_DEFAULTDIR_VERSIONTAG}/${OPENLDAP_VERSIONTAG}" |
| 25 |
- echo "# do NOT delete this. it is used" >> "${ED%/}${OPENLDAP_DEFAULTDIR_VERSIONTAG}/${OPENLDAP_VERSIONTAG}" |
| 26 |
- echo "# to track versions for upgrading." >> "${ED%/}${OPENLDAP_DEFAULTDIR_VERSIONTAG}/${OPENLDAP_VERSIONTAG}" |
| 27 |
+ echo "OLDPF='${PF}'" > "${ED}${OPENLDAP_DEFAULTDIR_VERSIONTAG}/${OPENLDAP_VERSIONTAG}" |
| 28 |
+ echo "# do NOT delete this. it is used" >> "${ED}${OPENLDAP_DEFAULTDIR_VERSIONTAG}/${OPENLDAP_VERSIONTAG}" |
| 29 |
+ echo "# to track versions for upgrading." >> "${ED}${OPENLDAP_DEFAULTDIR_VERSIONTAG}/${OPENLDAP_VERSIONTAG}" |
| 30 |
|
| 31 |
# use our config |
| 32 |
- rm "${ED%/}"/etc/openldap/slapd.conf |
| 33 |
+ rm "${ED}"/etc/openldap/slapd.conf |
| 34 |
insinto /etc/openldap |
| 35 |
newins "${FILESDIR}"/${PN}-2.4.40-slapd-conf slapd.conf |
| 36 |
- configfile="${ED%/}"/etc/openldap/slapd.conf |
| 37 |
+ configfile="${ED}"/etc/openldap/slapd.conf |
| 38 |
|
| 39 |
# populate with built backends |
| 40 |
ebegin "populate config with built backends" |
| 41 |
- for x in "${ED%/}"/usr/$(get_libdir)/openldap/openldap/back_*.so; do |
| 42 |
+ for x in "${ED}"/usr/$(get_libdir)/openldap/openldap/back_*.so; do |
| 43 |
einfo "Adding $(basename ${x})" |
| 44 |
sed -e "/###INSERTDYNAMICMODULESHERE###$/a# moduleload\t$(basename ${x})" -i "${configfile}" || die |
| 45 |
done |
| 46 |
@@ -775,7 +775,7 @@ multilib_src_install() { |
| 47 |
# If built without SLP, we don't need to be before avahi |
| 48 |
sed -i \ |
| 49 |
-e '/before/{s/avahi-daemon//g}' \ |
| 50 |
- "${ED%/}"/etc/init.d/slapd \ |
| 51 |
+ "${ED}"/etc/init.d/slapd \ |
| 52 |
|| die |
| 53 |
|
| 54 |
if use cxx ; then |
| 55 |
@@ -809,7 +809,7 @@ multilib_src_install() { |
| 56 |
for l in */*.la */*/*.la; do |
| 57 |
[[ -e ${l} ]] || continue |
| 58 |
"${lt}" --mode=install cp ${l} \ |
| 59 |
- "${ED%/}"/usr/$(get_libdir)/openldap/openldap || \ |
| 60 |
+ "${ED}"/usr/$(get_libdir)/openldap/openldap || \ |
| 61 |
die "installing ${l} failed" |
| 62 |
done |
Archives