From: Matt Turner <mattst88@gentoo.org>
Date: Fri, 2 Nov 2018 19:26:51 +0000 (-0700)
Subject: x11-base/xorg-server: Remove empty directories better
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=4a3bf90ab5e8f122f238d0d2237c910a76890989;p=gentoo.git

x11-base/xorg-server: Remove empty directories better

Closes: https://bugs.gentoo.org/670158
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 b3a10716dcff..0f8072e2a4de 100644
--- a/x11-base/xorg-server/xorg-server-1.20.3.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.20.3.ebuild
@@ -199,7 +199,7 @@ src_install() {
 	insinto /usr/share/portage/config/sets
 	newins "${FILESDIR}"/xorg-sets.conf xorg.conf
 
-	[ -d "${ED}"/var/log ] && rmdir "${ED}"/var/log || die
+	find "${ED}"/var -type d -empty -delete || die
 }
 
 pkg_postinst() {
diff --git a/x11-base/xorg-server/xorg-server-9999.ebuild b/x11-base/xorg-server/xorg-server-9999.ebuild
index 3c10d062348c..6f158c57aacd 100644
--- a/x11-base/xorg-server/xorg-server-9999.ebuild
+++ b/x11-base/xorg-server/xorg-server-9999.ebuild
@@ -199,7 +199,7 @@ src_install() {
 	insinto /usr/share/portage/config/sets
 	newins "${FILESDIR}"/xorg-sets.conf xorg.conf
 
-	[ -d "${ED}"/var/log ] && rmdir "${ED}"/var/log || die
+	find "${ED}"/var -type d -empty -delete || die
 }
 
 pkg_postinst() {