gentoo resync : 02.06.2018

4 files changed, 2 insertions, 112 deletions

diff --git a/net-firewall/Manifest.gz b/net-firewall/Manifest.gz
index e95358c02325..ed0fc3e2b3fb 100644
--- a/net-firewall/Manifest.gz
+++ b/net-firewall/Manifest.gz
diff --git a/net-firewall/firewalld/Manifest b/net-firewall/firewalld/Manifest
index efb7794096ec..3e92eb4e18d5 100644
--- a/net-firewall/firewalld/Manifest
+++ b/net-firewall/firewalld/Manifest
@@ -1,8 +1,6 @@
 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 2847 BLAKE2B cf0e43d67a294593156842ce228bc740f6115e40287fb0a0d0739c54468bb13f53d95d5a3440fc41c7d4af220108bd0705fbefe3f3d5b38ec0d9b155aded1eac SHA512 5c4d6dea7ce7ba85ef2efb8ea5f36bccadac91ce0042890f4e4c49e92264ff0363a12362f6583a338a14542bc51ac4cb81ed385caa18d138d110983981ccb1ee
+EBUILD firewalld-0.5.1-r2.ebuild 2846 BLAKE2B 34acbe45a138d3a70fa394843844ba7174de03e1c4aff26a9b2020baefaaff1e3781c0d053580b32bbb584094d6d633b46ba765237b06c80adf27f2719ca7a86 SHA512 08aaa0728b191bfbd69804ca359d634c828b0e7ad9e8ffd78927d6b2d192a80404dee0c15a629290e05332bc7e6717f38a334ed329a0dddb1fdab9873dfe5a22
 MISC metadata.xml 365 BLAKE2B f5f2b3b7646cec193cffcef9ca3fe51f4f071a996c20dcd5669f428a6759be96a014f477281d58a127149d82422862178289b362b0f30603a9fbac62c59ff6e2 SHA512 b317c52dc7ab211183555f45d1b84786f9aede73f3b59eee54aa696b4e358e42dd7c30044e89931c2362f3a11c5180f1136f7631bf19c1fe02e29d68bea4c5a6
diff --git a/net-firewall/firewalld/firewalld-0.4.3.3.ebuild b/net-firewall/firewalld/firewalld-0.4.3.3.ebuild
deleted file mode 100644
index 566a084ed4b0..000000000000
--- a/net-firewall/firewalld/firewalld-0.4.3.3.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-#BACKPORTS=
-
-inherit autotools eutils gnome2-utils python-r1 systemd multilib bash-completion-r1
-
-DESCRIPTION="A firewall daemon with D-BUS interface providing a dynamic firewall"
-HOMEPAGE="http://www.firewalld.org/"
-SRC_URI="https://fedorahosted.org/released/${PN}/${P}.tar.bz2
-	${BACKPORTS:+https://dev.gentoo.org/~cardoe/distfiles/${P}-${BACKPORTS}.tar.xz}"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="gui"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-python/dbus-python[${PYTHON_USEDEP}]
-	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/ipset
-	|| ( >=sys-apps/openrc-0.11.5 sys-apps/systemd )
-	gui? (
-		x11-libs/gtk+:3
-		dev-python/PyQt4[${PYTHON_USEDEP}]
-	)"
-DEPEND="${RDEPEND}
-	dev-libs/glib:2
-	>=dev-util/intltool-0.35
-	sys-devel/gettext"
-
-src_prepare() {
-	[[ -n ${BACKPORTS} ]] && \
-		EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/patches" \
-			epatch
-
-	epatch_user
-	eautoreconf
-}
-
-src_configure() {
-	python_setup
-
-	econf \
-		--enable-systemd \
-		--with-iptables="${EPREFIX}/sbin/iptables" \
-		--with-ip6tables="${EPREFIX}/sbin/ip6tables" \
-		--with-iptables_restore="${EPREFIX}/sbin/iptables-restore" \
-		--with-ip6tables_restore="${EPREFIX}/sbin/ip6tables-restore" \
-		--with-ebtables="${EPREFIX}/sbin/ebtables" \
-		--with-ebtables_restore="${EPREFIX}/sbin/ebtables-restore" \
-		"$(systemd_with_unitdir 'systemd-unitdir')" \
-		--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"
-
-	# Get rid of junk
-	rm -rf "${D}/etc/rc.d/"
-	rm -rf "${D}/etc/sysconfig/"
-
-	# 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/applications"
-		rm -rf "${D}/usr/share/icons"
-	fi
-
-	newinitd "${FILESDIR}"/firewalld.init firewalld
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-	gnome2_schemas_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	gnome2_schemas_update
-}
diff --git a/net-firewall/firewalld/firewalld-0.5.1-r2.ebuild b/net-firewall/firewalld/firewalld-0.5.1-r2.ebuild
index 40e93d003c6b..40994d87e221 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}"