gentoo resync : 18.03.2018

4 files changed, 94 insertions, 2 deletions

diff --git a/net-firewall/firewalld/Manifest b/net-firewall/firewalld/Manifest
index 808bc047e8e1..99edb4f067c5 100644
--- a/net-firewall/firewalld/Manifest
+++ b/net-firewall/firewalld/Manifest
@@ -1,6 +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 272 BLAKE2B 0ba8a50a1e11f0416bc1d133a4e1c864958f2a60314cc97ea3cec9c0ac26ff7eb05d54c1a1f59feb4672a8e873c4d69ec39d8d100a2152048d59a568bae14e34 SHA512 ed71564d92f4235bb1209cf1141e28f825e4b0e3d84e7214456399e1ac0a787c02d06fecd38eaa7643b4c571b90bfe2e3c93d9826ea448ebd480c0794b62265d
 DIST firewalld-0.4.3.3.tar.bz2 679617 BLAKE2B 37d3acda80f046e7e208f570688e9b554feb985c4b6c4d910236ed296113385bbc0c86fd4ae815538e0b68bef216154568b095023098d2b0620a1749af5cea4f SHA512 21cb91b9545263f6da4a6ff218c939b610c7fe5dba2ad509803673d9c01cf6fecb4ab32bacf1a04e3d579fd9699a03760475285f824a6641902037c81ad2243a
 DIST firewalld-0.5.1.tar.gz 1155989 BLAKE2B 8e5f67dc74738cec178715b0e3713afa7296be61b376a8d545b1ae1c01c0f0df78ec48222b6926bdce1d93c58f7d02fad14bc46c1ddd24840e8853e5e76b73ff SHA512 8c8ea1a07fc81b12f53fbc84112d18c65c4332e8f7b7d575dc1ccba8a12418c874f8503b0062b49990f8bcfdf5fdaa7c0e4e3ddc0e9b1d0a91f49eff284b22be
 EBUILD firewalld-0.4.3.3.ebuild 2876 BLAKE2B 4819918d3781b5ad2f9947b17ba3b05c82f2d928ca5006c314319c6dcc9cbd66cf8aaca3f49e8a75073ea18415cbc8af51d8529bab7999c3fed485b05dc0ac2b SHA512 2b54e9c497656c7fa090a1db378f3559e13a3315e4ff58f3cc06372b4b7db1aaf2d6c5948db6bfa51bb4c0193deb05317c44fc86f5a446e7a712dc1c5b984dc4
-EBUILD firewalld-0.5.1-r2.ebuild 2764 BLAKE2B 7611f93d7802dec9b8c45891ce4ce7f262b385dc93a798058b8408390263059b89e1ce69a663b6abd3e37b85b270d3076b7cfb0481066990cdf2d047729c1101 SHA512 f748c0d0ffa7111fa57d738bcc81a4403a8205428ec81c8761a5da3d95e2c7332fce4f44deb8d0f0a48ea9595b1ba8f6296f2601199c81f4595e2cd91865cab1
+EBUILD firewalld-0.5.1-r2.ebuild 2817 BLAKE2B 34006854dfceb0aa91a14336091a55347091f4751f9f0c7be004f35adf49f0c8a65e14444f7c919929103abc79a86b5952710eff24b2330e9d2a8067bad4a9b9 SHA512 66d7328ea4e177f88f05164c764645da4d560633e2be08a8e802e1cca3715f7eedb17440074fbb1b3859aec5c9a182b4834003bd956a4ba534fb1e510abdb4cb
 MISC metadata.xml 365 BLAKE2B f5f2b3b7646cec193cffcef9ca3fe51f4f071a996c20dcd5669f428a6759be96a014f477281d58a127149d82422862178289b362b0f30603a9fbac62c59ff6e2 SHA512 b317c52dc7ab211183555f45d1b84786f9aede73f3b59eee54aa696b4e358e42dd7c30044e89931c2362f3a11c5180f1136f7631bf19c1fe02e29d68bea4c5a6
diff --git a/net-firewall/firewalld/files/firewalld-0.5.1-errorcodes1.patch b/net-firewall/firewalld/files/firewalld-0.5.1-errorcodes1.patch
new file mode 100644
index 000000000000..0bf8aacc8395
--- /dev/null
+++ b/net-firewall/firewalld/files/firewalld-0.5.1-errorcodes1.patch
@@ -0,0 +1,48 @@
+From 7cf8dc935db45bc382930c6f2c9b11b5f9910283 Mon Sep 17 00:00:00 2001
+From: Eric Garver <e@erig.me>
+Date: Mon, 5 Feb 2018 10:20:54 -0500
+Subject: [PATCH] doc/xml: remove errorcodes ENITITY inclusion from docs that
+ don't use it
+
+---
+ doc/xml/firewall-applet.xml      | 1 -
+ doc/xml/firewall-config.xml      | 1 -
+ doc/xml/firewall-offline-cmd.xml | 1 -
+ 3 files changed, 3 deletions(-)
+
+diff --git a/doc/xml/firewall-applet.xml b/doc/xml/firewall-applet.xml
+index 831ec320..b86a62ad 100644
+--- a/doc/xml/firewall-applet.xml
++++ b/doc/xml/firewall-applet.xml
+@@ -4,7 +4,6 @@
+ <!ENTITY authors SYSTEM "authors.xml">
+ <!ENTITY seealso SYSTEM "seealso.xml">
+ <!ENTITY notes SYSTEM "notes.xml">
+-<!ENTITY errorcodes SYSTEM "errorcodes.xml">
+ ]>
+ 
+ <!--
+diff --git a/doc/xml/firewall-config.xml b/doc/xml/firewall-config.xml
+index ae0fb549..2e7627cc 100644
+--- a/doc/xml/firewall-config.xml
++++ b/doc/xml/firewall-config.xml
+@@ -4,7 +4,6 @@
+ <!ENTITY authors SYSTEM "authors.xml">
+ <!ENTITY seealso SYSTEM "seealso.xml">
+ <!ENTITY notes SYSTEM "notes.xml">
+-<!ENTITY errorcodes SYSTEM "errorcodes.xml">
+ ]>
+ 
+ <!--
+diff --git a/doc/xml/firewall-offline-cmd.xml b/doc/xml/firewall-offline-cmd.xml
+index e157f675..85757b4e 100644
+--- a/doc/xml/firewall-offline-cmd.xml
++++ b/doc/xml/firewall-offline-cmd.xml
+@@ -4,7 +4,6 @@
+ <!ENTITY authors SYSTEM "authors.xml">
+ <!ENTITY seealso SYSTEM "seealso.xml">
+ <!ENTITY notes SYSTEM "notes.xml">
+-<!ENTITY errorcodes SYSTEM "errorcodes.xml">
+ ]>
+ 
+ <!--
diff --git a/net-firewall/firewalld/files/firewalld-0.5.1-errorcodes2.patch b/net-firewall/firewalld/files/firewalld-0.5.1-errorcodes2.patch
new file mode 100644
index 000000000000..e2b31e3936fd
--- /dev/null
+++ b/net-firewall/firewalld/files/firewalld-0.5.1-errorcodes2.patch
@@ -0,0 +1,40 @@
+From 61286b73e21a75492abc8672e3812da9f85bfc35 Mon Sep 17 00:00:00 2001
+From: Eric Garver <e@erig.me>
+Date: Mon, 5 Feb 2018 10:25:21 -0500
+Subject: [PATCH] doc/xml/Makefile: firewallctl docs depend on errorcodes
+
+Fixes the below build error:
+
+$ make -C doc/xml ../html/firewallctl.html
+...
+xsltproc -o ../html/firewallctl.html --nonet --xinclude  transform-html.xsl firewallctl.xml
+warning: failed to load external entity "errorcodes.xml"
+firewallctl.xml:1937: parser error : Failure to process entity errorcodes
+            &errorcodes;
+                        ^
+firewallctl.xml:1937: parser error : Entity 'errorcodes' not defined
+            &errorcodes;
+                        ^
+unable to parse firewallctl.xml
+---
+ doc/xml/Makefile.am | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/doc/xml/Makefile.am b/doc/xml/Makefile.am
+index be89d803..129ec501 100644
+--- a/doc/xml/Makefile.am
++++ b/doc/xml/Makefile.am
+@@ -46,9 +46,11 @@ all: $(man_MANS) $(HTMLS)
+ clean:
+ 	-test -z "$(CLEAN_FILES)" || rm -f $(CLEAN_FILES)
+ 
+-../man/man1/firewall-cmd.1: errorcodes.xml firewall-cmd.xml
++../man/man1/firewallctl.1: errorcodes.xml
++../html/firewallctl.html: errorcodes.xml
+ 
+-../html/firewall-cmd.html: errorcodes.xml firewall-cmd.xml
++../man/man1/firewall-cmd.1: errorcodes.xml
++../html/firewall-cmd.html: errorcodes.xml
+ 
+ ../man/man1/%.1: %.xml authors.xml notes.xml seealso.xml transform-man.xsl
+ 	$(XSLTPROC) -o $@ $(XSLTPROC_MAN_FLAGS) $<
diff --git a/net-firewall/firewalld/firewalld-0.5.1-r2.ebuild b/net-firewall/firewalld/firewalld-0.5.1-r2.ebuild
index e5156d9770f5..fbfa9af7d4e6 100644
--- a/net-firewall/firewalld/firewalld-0.5.1-r2.ebuild
+++ b/net-firewall/firewalld/firewalld-0.5.1-r2.ebuild
@@ -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}"
 
@@ -35,6 +35,8 @@ DEPEND="${RDEPEND}
 	>=dev-util/intltool-0.35
 	sys-devel/gettext"
 
+PATCHES=( "${FILESDIR}"/${P}-errorcodes{1,2}.patch )
+
 src_prepare() {
 	default
 	eautoreconf