net-firewall/firewalld: Do not install /etc/xdg/autostart/* for -gui; #568844

Package-Manager: portage-2.2.28

diff --git a/net-firewall/firewalld/firewalld-0.3.13.ebuild b/net-firewall/firewalld/firewalld-0.3.13.ebuild
index ac9924245e7c28e02ebc951177801bdc8cbc80d7..091ee2c267818c12500cb1da3e7221f36c3ee822 100644 (file)
--- a/net-firewall/firewalld/firewalld-0.3.13.ebuild
+++ b/net-firewall/firewalld/firewalld-0.3.13.ebuild
@@ -73,6 +73,7 @@ src_install() {
 
        # For non-gui installs we need to remove GUI bits
        if ! use gui; then
+               rm -rf "${D}/etc/xdg/autostart"
                rm -f "${D}/usr/bin/firewall-applet"
                rm -f "${D}/usr/bin/firewall-config"
                rm -rf "${D}/usr/share/icons"

diff --git a/net-firewall/firewalld/firewalld-0.4.2.ebuild b/net-firewall/firewalld/firewalld-0.4.2-r1.ebuild
similarity index 98%
rename from net-firewall/firewalld/firewalld-0.4.2.ebuild
rename to net-firewall/firewalld/firewalld-0.4.2-r1.ebuild
index 7fa5f1d656a52d2a35c6bae8596ab2613b8716a6..ced98904642f7add43045aee39b8809bf5e71a00 100644 (file)
--- a/net-firewall/firewalld/firewalld-0.4.2.ebuild
+++ b/net-firewall/firewalld/firewalld-0.4.2-r1.ebuild
@@ -82,10 +82,11 @@ src_install() {
 
        # For non-gui installs we need to remove GUI bits
        if ! use gui; then
+               rm -rf "${D}/etc/xdg/autostart"
                rm -f "${D}/usr/bin/firewall-applet"
                rm -f "${D}/usr/bin/firewall-config"
-               rm -rf "${D}/usr/share/icons"
                rm -rf "${D}/usr/share/applications"
+               rm -rf "${D}/usr/share/icons"
        fi
 
        newinitd "${FILESDIR}"/firewalld.init firewalld