1 |
commit: 4a3bf90ab5e8f122f238d0d2237c910a76890989 |
2 |
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Nov 2 19:26:51 2018 +0000 |
4 |
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Nov 2 19:35:53 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a3bf90a |
7 |
|
8 |
x11-base/xorg-server: Remove empty directories better |
9 |
|
10 |
Closes: https://bugs.gentoo.org/670158 |
11 |
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> |
12 |
|
13 |
x11-base/xorg-server/xorg-server-1.20.3.ebuild | 2 +- |
14 |
x11-base/xorg-server/xorg-server-9999.ebuild | 2 +- |
15 |
2 files changed, 2 insertions(+), 2 deletions(-) |
16 |
|
17 |
diff --git a/x11-base/xorg-server/xorg-server-1.20.3.ebuild b/x11-base/xorg-server/xorg-server-1.20.3.ebuild |
18 |
index b3a10716dcf..0f8072e2a4d 100644 |
19 |
--- a/x11-base/xorg-server/xorg-server-1.20.3.ebuild |
20 |
+++ b/x11-base/xorg-server/xorg-server-1.20.3.ebuild |
21 |
@@ -199,7 +199,7 @@ src_install() { |
22 |
insinto /usr/share/portage/config/sets |
23 |
newins "${FILESDIR}"/xorg-sets.conf xorg.conf |
24 |
|
25 |
- [ -d "${ED}"/var/log ] && rmdir "${ED}"/var/log || die |
26 |
+ find "${ED}"/var -type d -empty -delete || die |
27 |
} |
28 |
|
29 |
pkg_postinst() { |
30 |
|
31 |
diff --git a/x11-base/xorg-server/xorg-server-9999.ebuild b/x11-base/xorg-server/xorg-server-9999.ebuild |
32 |
index 3c10d062348..6f158c57aac 100644 |
33 |
--- a/x11-base/xorg-server/xorg-server-9999.ebuild |
34 |
+++ b/x11-base/xorg-server/xorg-server-9999.ebuild |
35 |
@@ -199,7 +199,7 @@ src_install() { |
36 |
insinto /usr/share/portage/config/sets |
37 |
newins "${FILESDIR}"/xorg-sets.conf xorg.conf |
38 |
|
39 |
- [ -d "${ED}"/var/log ] && rmdir "${ED}"/var/log || die |
40 |
+ find "${ED}"/var -type d -empty -delete || die |
41 |
} |
42 |
|
43 |
pkg_postinst() { |