[gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/

[Matthias Maier]

commit:     bdbdb25690ae686cdb5316b5cf572389f8ba6e34
Author:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 28 02:30:07 2016 +0000
Commit:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Thu Jul 28 02:31:05 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bdbdb256

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

Package-Manager: portage-2.2.28

 net-firewall/firewalld/firewalld-0.3.13.ebuild                         | 1 +
 .../firewalld/{firewalld-0.4.2.ebuild => firewalld-0.4.2-r1.ebuild}    | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/net-firewall/firewalld/firewalld-0.3.13.ebuild b/net-firewall/firewalld/firewalld-0.3.13.ebuild
index ac99242..091ee2c 100644
--- 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 7fa5f1d..ced9890 100644
--- 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