commit:     4a3bf90ab5e8f122f238d0d2237c910a76890989
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Fri Nov  2 19:26:51 2018 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Fri Nov  2 19:35:53 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a3bf90a

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

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

 x11-base/xorg-server/xorg-server-1.20.3.ebuild | 2 +-
 x11-base/xorg-server/xorg-server-9999.ebuild   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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 b3a10716dcf..0f8072e2a4d 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 3c10d062348..6f158c57aac 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() {

Reply via email to