From: Matt Turner <mattst88@gentoo.org>
Date: Thu, 1 Nov 2018 19:14:46 +0000 (-0700)
Subject: x11-base/xorg-server: Don't install empty directory
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=9f0fd42565ac0d36114f297d107eda68d5072e7f;p=gentoo.git

x11-base/xorg-server: Don't install empty directory

Closes: https://bugs.gentoo.org/647302
Signed-off-by: Matt Turner <mattst88@gentoo.org>
---

diff --git a/x11-base/xorg-server/xorg-server-1.20.3.ebuild b/x11-base/xorg-server/xorg-server-1.20.3.ebuild
index df7aded6d351..bd82494b526a 100644
--- a/x11-base/xorg-server/xorg-server-1.20.3.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.20.3.ebuild
@@ -198,6 +198,8 @@ src_install() {
 	# install the @x11-module-rebuild set for Portage
 	insinto /usr/share/portage/config/sets
 	newins "${FILESDIR}"/xorg-sets.conf xorg.conf
+
+	[ -d "${ED}"/var/log ] && rmdir "${ED}"/var/log || die
 }
 
 pkg_postinst() {
diff --git a/x11-base/xorg-server/xorg-server-9999.ebuild b/x11-base/xorg-server/xorg-server-9999.ebuild
index b5e027d78c1e..0baf77843d4d 100644
--- a/x11-base/xorg-server/xorg-server-9999.ebuild
+++ b/x11-base/xorg-server/xorg-server-9999.ebuild
@@ -198,6 +198,8 @@ src_install() {
 	# install the @x11-module-rebuild set for Portage
 	insinto /usr/share/portage/config/sets
 	newins "${FILESDIR}"/xorg-sets.conf xorg.conf
+
+	[ -d "${ED}"/var/log ] && rmdir "${ED}"/var/log || die
 }
 
 pkg_postinst() {