gentoo resync : 02.08.2019

3 files changed, 19 insertions, 27 deletions

diff --git a/net-firewall/firewalld/Manifest b/net-firewall/firewalld/Manifest
index 69a9e2ea2f5a..3909583ea2d1 100644
--- a/net-firewall/firewalld/Manifest
+++ b/net-firewall/firewalld/Manifest
@@ -1,8 +1,8 @@
 AUX firewalld-0.5.1-errorcodes1.patch 1491 BLAKE2B 63e10fa5628fdb766b03f544ec16f095a0c1ff0de92af0d2f959f209e842af0cd53a24165e4fc06e15dea35f933387c25a3289049e828409d2aede00d1dfa3cf SHA512 3f293d48455f9ecfd454eb2cb950b853b0bc43fd709de291a963e9a62cddb1685c7a8bffb735178f79966fc2a8031fdb382c61fdadf8dd0134741741461e7ba6
 AUX firewalld-0.5.1-errorcodes2.patch 1465 BLAKE2B 67da2f57a445113ac0334af5f58cd8425e11153d7b6be6183614d31897527afa5d24dec72a6102805ec14f1fe18ab72684e545d352672c950077e26d842f279b SHA512 92c34604f4e22e4e647255ffa51528c7daed9fc738c3fe118e51a2263732c24c416ab0604dbacb86601d9e9b247cef56c74024fc0eb2550c42b9b57b999fcd39
 AUX firewalld.init 250 BLAKE2B 1c0f690e24313037b801902aa772a9d1cb6889a05f142bc3d84602002ef053cd059b5193983f9fe6d89065a070a566a6a9ba8212a092435953ebed80ea7c7b40 SHA512 457cda01449f38563e98e1db937fe1c50745eab91797f52687e3ab9f5d94dd42d129740ae6669e99666a3f096d631dd3a44e66010b638b31b9c6ba798362403e
-DIST firewalld-0.5.1.tar.gz 1155989 BLAKE2B 8e5f67dc74738cec178715b0e3713afa7296be61b376a8d545b1ae1c01c0f0df78ec48222b6926bdce1d93c58f7d02fad14bc46c1ddd24840e8853e5e76b73ff SHA512 8c8ea1a07fc81b12f53fbc84112d18c65c4332e8f7b7d575dc1ccba8a12418c874f8503b0062b49990f8bcfdf5fdaa7c0e4e3ddc0e9b1d0a91f49eff284b22be
 DIST firewalld-0.6.3.tar.gz 2294470 BLAKE2B 09bb971d8142e5d28b6a085527e7f5275090f15e5dc4ccf2b16b6ed837049ed75443b09a54db76e37c6f0c5db6524ba85cf34c5117c1139bba0e3b223f289d57 SHA512 ea9e8bad34d3608257ef2a38851855974eff97b21dbab93ca3d8cfad90339734a8124447ed531a978b41546ab4040135bb61c8fdc9677ba0df9188d7ee4422ee
-EBUILD firewalld-0.5.1-r2.ebuild 2839 BLAKE2B 5560e10a2c297e5f0c1f51ee28a2ecbdcfb14b5f38235b19719b1c33bc12f763c7138e50cdf2795157ab09f4e4cad4d49f05e0a6036ae22fb60b74f03b14386d SHA512 2d26fbf9c9d2fb507d8da8c036ddb3ea81a4d95c5dc64fec2baf2bdce76271a69d40fc6ba8979da0e8d17d6f989cc036ce7eb3fbc81630365cbcafdc926e23f9
-EBUILD firewalld-0.6.3.ebuild 2514 BLAKE2B 0a3982fb6a2bdbf30968867247563a2760432aeef24d014d0dcd122876515f5bc9472708eca28ec99a9e3c93b54b6534541c7c4b12e75770902f07ebd37af8f3 SHA512 06827644dad6f6d64b0461d3b53c9550285689e7eb0aac6d2df852fc7fe4e141c3e866c71610f124f97d145b415d77e6caf9a786a9b35eed832172da382a4219
+DIST firewalld-0.7.1.tar.gz 2326020 BLAKE2B 1ab435bfd97608ce246657a24daebe6ca83f72560a627c702e940de64bf4fb34f26ebe9abf62468972fd8cd9394c5e885acd6882ec3cad112dfe62bca3905c7a SHA512 6be842d4c2849f56fc0e6c13219aed7d767635a3b190ef41f1516cecf51de71ad9af77ccc96b699d11bed56407abf9837cdbd0cfbf93ab716b5de5e4c2f94c68
+EBUILD firewalld-0.6.3.ebuild 2553 BLAKE2B 1669bed72abbd2bf430504fc7f89cc5404f3468af70b6b72f52b0269c91a463e17ff714659ba2ce99f1d87216224f9b942759e4491529923d96293dae17c0a7a SHA512 12e36c15e3be88d8d215c7c1fcaf8eba87af29eba3b5ef089dcbcf5d99c14194c24d22412f150ffd63abfcff64825a0867756bc6b87c103f76a84946b902e1a4
+EBUILD firewalld-0.7.1.ebuild 2537 BLAKE2B 3f6de216cfc1bb8de84c5498589c865fc36496a38053ae3972a59dc9a02b78735472046ae9744c399639230dede1ba8d843d596bae405afe964f9dda793204d8 SHA512 63de5926880c0a7b155330407ab2b210c23075ef4e7c3321d2f3234a7d047ee8963295ce5c1b11ea3c7e4b7e4577f2591106009143abecc109b397a8727480b1
 MISC metadata.xml 365 BLAKE2B f5f2b3b7646cec193cffcef9ca3fe51f4f071a996c20dcd5669f428a6759be96a014f477281d58a127149d82422862178289b362b0f30603a9fbac62c59ff6e2 SHA512 b317c52dc7ab211183555f45d1b84786f9aede73f3b59eee54aa696b4e358e42dd7c30044e89931c2362f3a11c5180f1136f7631bf19c1fe02e29d68bea4c5a6
diff --git a/net-firewall/firewalld/firewalld-0.6.3.ebuild b/net-firewall/firewalld/firewalld-0.6.3.ebuild
index 6b6f2a4cd0b3..cd1dbb2e527e 100644
--- a/net-firewall/firewalld/firewalld-0.6.3.ebuild
+++ b/net-firewall/firewalld/firewalld-0.6.3.ebuild
@@ -22,7 +22,7 @@ RDEPEND="${PYTHON_DEPS}
 	dev-python/decorator[${PYTHON_USEDEP}]
 	>=dev-python/python-slip-0.2.7[dbus,${PYTHON_USEDEP}]
 	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	net-firewall/ebtables
+	|| ( net-firewall/ebtables net-firewall/iptables[nftables] )
 	net-firewall/iptables[ipv6]
 	net-firewall/ipset
 	net-firewall/nftables
diff --git a/net-firewall/firewalld/firewalld-0.5.1-r2.ebuild b/net-firewall/firewalld/firewalld-0.7.1.ebuild
index 7f2c39160ee6..275e832e3802 100644
--- a/net-firewall/firewalld/firewalld-0.5.1-r2.ebuild
+++ b/net-firewall/firewalld/firewalld-0.7.1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+EAPI=7
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
 
-inherit autotools gnome2-utils python-r1 systemd bash-completion-r1
+inherit autotools bash-completion-r1 gnome2-utils linux-info python-single-r1 systemd xdg-utils
 
 DESCRIPTION="A firewall daemon with D-BUS interface providing a dynamic firewall"
 HOMEPAGE="http://www.firewalld.org/"
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="gui"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
@@ -22,9 +22,10 @@ RDEPEND="${PYTHON_DEPS}
 	dev-python/decorator[${PYTHON_USEDEP}]
 	>=dev-python/python-slip-0.2.7[dbus,${PYTHON_USEDEP}]
 	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	net-firewall/ebtables
 	net-firewall/iptables[ipv6]
+	|| ( net-firewall/iptables[nftables] net-firewall/ebtables )
 	net-firewall/ipset
+	net-firewall/nftables
 	|| ( >=sys-apps/openrc-0.11.5 sys-apps/systemd )
 	gui? (
 		x11-libs/gtk+:3
@@ -37,7 +38,10 @@ DEPEND="${RDEPEND}
 
 RESTRICT="test" # bug 650760
 
-PATCHES=( "${FILESDIR}"/${P}-errorcodes{1,2}.patch )
+pkg_setup() {
+	local CONFIG_CHECK="~NF_CONNTRACK ~NF_CONNTRACK_IPV4 ~NF_CONNTRACK_IPV6 ~NETFILTER_XT_MATCH_CONNTRACK"
+	linux-info_pkg_setup
+}
 
 src_prepare() {
 	default
@@ -55,25 +59,14 @@ src_configure() {
 		--with-ip6tables_restore="${EPREFIX}/sbin/ip6tables-restore" \
 		--with-ebtables="${EPREFIX}/sbin/ebtables" \
 		--with-ebtables_restore="${EPREFIX}/sbin/ebtables-restore" \
+		--with-nft="${EPREFIX}/sbin/nft" \
 		--with-systemd-unitdir="$(systemd_get_systemunitdir)" \
 		--with-bashcompletiondir="$(get_bashcompdir)"
 }
 
 src_install() {
-	# manually split up the installation to avoid "file already exists" errors
-	emake -C config DESTDIR="${D}" install
-	emake -C po DESTDIR="${D}" install
-	emake -C shell-completion DESTDIR="${D}" install
-	emake -C doc DESTDIR="${D}" install
-
-	install_python() {
-		emake -C src DESTDIR="${D}" pythondir="$(python_get_sitedir)" install
-		python_optimize
-	}
-	python_foreach_impl install_python
-
-	python_replicate_script "${D}"/usr/bin/firewall-{offline-cmd,cmd,applet,config}
-	python_replicate_script "${D}/usr/sbin/firewalld"
+	default
+	python_optimize
 
 	# Get rid of junk
 	rm -rf "${D}/etc/rc.d/" || die
@@ -92,16 +85,15 @@ src_install() {
 }
 
 pkg_preinst() {
-	gnome2_icon_savelist
 	gnome2_schemas_savelist
 }
 
 pkg_postinst() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 	gnome2_schemas_update
 }
 
 pkg_postrm() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 	gnome2_schemas_update
 }