1 |
Package-Manager: Portage-2.3.40, Repoman-2.3.9 |
2 |
--- |
3 |
eclass/gnome2.eclass | 12 ++++++------ |
4 |
1 file changed, 6 insertions(+), 6 deletions(-) |
5 |
|
6 |
diff --git a/eclass/gnome2.eclass b/eclass/gnome2.eclass |
7 |
index c4418df92bb..57eafcd451b 100644 |
8 |
--- a/eclass/gnome2.eclass |
9 |
+++ b/eclass/gnome2.eclass |
10 |
@@ -256,7 +256,7 @@ gnome2_src_install() { |
11 |
# create bogus directories in /var/lib/ |
12 |
if has ${EAPI:-0} 4 5; then |
13 |
dodir "${sk_tmp_dir}" || die "dodir failed" |
14 |
- emake DESTDIR="${D}" "scrollkeeper_localstate_dir=${ED}${sk_tmp_dir} " "$@" install || die "install failed" |
15 |
+ emake DESTDIR="${D}" "scrollkeeper_localstate_dir=${ED%/}${sk_tmp_dir} " "$@" install || die "install failed" |
16 |
else |
17 |
default |
18 |
fi |
19 |
@@ -282,14 +282,14 @@ gnome2_src_install() { |
20 |
|
21 |
# Do not keep /var/lib/scrollkeeper because: |
22 |
# 1. The scrollkeeper database is regenerated at pkg_postinst() |
23 |
- # 2. ${ED}/var/lib/scrollkeeper contains only indexes for the current pkg |
24 |
+ # 2. ${ED%/}/var/lib/scrollkeeper contains only indexes for the current pkg |
25 |
# thus it makes no sense if pkg_postinst ISN'T run for some reason. |
26 |
- rm -rf "${ED}${sk_tmp_dir}" |
27 |
- rmdir "${ED}/var/lib" 2>/dev/null |
28 |
- rmdir "${ED}/var" 2>/dev/null |
29 |
+ rm -rf "${ED%/}${sk_tmp_dir}" |
30 |
+ rmdir "${ED%/}/var/lib" 2>/dev/null |
31 |
+ rmdir "${ED%/}/var" 2>/dev/null |
32 |
|
33 |
# Make sure this one doesn't get in the portage db |
34 |
- rm -fr "${ED}/usr/share/applications/mimeinfo.cache" |
35 |
+ rm -fr "${ED%/}/usr/share/applications/mimeinfo.cache" |
36 |
|
37 |
# Delete all .la files |
38 |
if has ${EAPI:-0} 4; then |
39 |
-- |
40 |
2.17.1 |