| 1 |
commit: 9f0fd42565ac0d36114f297d107eda68d5072e7f |
| 2 |
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Nov 1 19:14:46 2018 +0000 |
| 4 |
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Nov 1 21:06:07 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f0fd425 |
| 7 |
|
| 8 |
x11-base/xorg-server: Don't install empty directory |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/647302 |
| 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, 4 insertions(+) |
| 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 df7aded6d35..bd82494b526 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 |
@@ -198,6 +198,8 @@ src_install() { |
| 22 |
# install the @x11-module-rebuild set for Portage |
| 23 |
insinto /usr/share/portage/config/sets |
| 24 |
newins "${FILESDIR}"/xorg-sets.conf xorg.conf |
| 25 |
+ |
| 26 |
+ [ -d "${ED}"/var/log ] && rmdir "${ED}"/var/log || 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 b5e027d78c1..0baf77843d4 100644 |
| 33 |
--- a/x11-base/xorg-server/xorg-server-9999.ebuild |
| 34 |
+++ b/x11-base/xorg-server/xorg-server-9999.ebuild |
| 35 |
@@ -198,6 +198,8 @@ src_install() { |
| 36 |
# install the @x11-module-rebuild set for Portage |
| 37 |
insinto /usr/share/portage/config/sets |
| 38 |
newins "${FILESDIR}"/xorg-sets.conf xorg.conf |
| 39 |
+ |
| 40 |
+ [ -d "${ED}"/var/log ] && rmdir "${ED}"/var/log || die |
| 41 |
} |
| 42 |
|
| 43 |
pkg_postinst() { |
Archives