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 b3a10716dcffa886a62d968fca0417fd314e6ead..0f8072e2a4de902e35b87473e44e08b48f2762eb 100644 (file)
--- 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 3c10d062348c19b7ee8279993d6d71680ce57f26..6f158c57aacd9552c9bbefd9201f75fd5ea94e51 100644 (file)
--- 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() {