summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Maier <tamiko@gentoo.org>2016-07-27 21:30:07 -0500
committerMatthias Maier <tamiko@gentoo.org>2016-07-27 21:31:05 -0500
commitbdbdb25690ae686cdb5316b5cf572389f8ba6e34 (patch)
tree164c151ab16b5c3ac2735677b3b5b56eb4439dec /net-firewall
parentapp-emulation/libvirt: Do not use REPLACING_VERSIONS, bug #589452 (diff)
downloadgentoo-bdbdb25690ae686cdb5316b5cf572389f8ba6e34.tar.gz
gentoo-bdbdb25690ae686cdb5316b5cf572389f8ba6e34.tar.bz2
gentoo-bdbdb25690ae686cdb5316b5cf572389f8ba6e34.zip
net-firewall/firewalld: Do not install /etc/xdg/autostart/* for -gui; #568844
Package-Manager: portage-2.2.28
Diffstat (limited to 'net-firewall')
-rw-r--r--net-firewall/firewalld/firewalld-0.3.13.ebuild1
-rw-r--r--net-firewall/firewalld/firewalld-0.4.2-r1.ebuild (renamed from net-firewall/firewalld/firewalld-0.4.2.ebuild)3
2 files changed, 3 insertions, 1 deletions
diff --git a/net-firewall/firewalld/firewalld-0.3.13.ebuild b/net-firewall/firewalld/firewalld-0.3.13.ebuild
index ac9924245e7c..091ee2c26781 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
index 7fa5f1d656a5..ced98904642f 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