gentoo resync : 08.01.2018

6 files changed, 3 insertions, 131 deletions

diff --git a/net-firewall/fwbuilder/Manifest b/net-firewall/fwbuilder/Manifest
index 2a9ee5363720..c29d9b209e80 100644
--- a/net-firewall/fwbuilder/Manifest
+++ b/net-firewall/fwbuilder/Manifest
@@ -1,9 +1,4 @@
-AUX fwbuilder-5.0.0.3568-ldflags.patch 469 BLAKE2B fa9a993161e025759366a75222b46c1728b50405903d464860987f24b0ccd852ca154a7c067abc44219bbfd0e6ebaf4a29cc5e2f0fae6a81ab17cb1dcb34d190 SHA512 3047ad8ecd868eca28a58b9c124f2c05f7bdc68c08da7017896a13cf77c9ed9d033e227d9c520973174d3551334af26319b31491a4264062be94dd04cd97f372
-AUX fwbuilder-5.0.1.3592-gcc47.patch 321 BLAKE2B 5a5fb1e3ae3eafb0e76171da5f8a6f27eb496ce584f6a4c86e57ae7f944dc7a375f385aaee1c47e732b5f6cf9f647b38b6b51a9193ab4b8c9e0451b974c86c61 SHA512 13800468ef7958fe811b42833b101d221a5126f13f3191c8d84c8cd7da3e02163e522bf7c87a5c739ef6ab935ab80798e947c2b81fc90168881eec502dd861a8
-AUX fwbuilder-5.0.1.3592-stdc-format-macros.patch 1684 BLAKE2B f12660456d3deb63b93d7b8e9e95cafcc8fb9b42f37d4d12179fdc3858445fe84b5b47ff668042134ef6e0f5ea8f19af08e4c5570fc864af522a7d2cfd3dbaa0 SHA512 ec13849e07683ce6ebc0098f1eae803a232fdde692e46c591a3a7c9cf0fb22d28d9de6ff773051089ce75a7dd55cbab63063f0391f6f9960b631c21ec4ca38ef
 AUX fwbuilder-5.3.7-qtbindir.patch 1833 BLAKE2B 715f3e218f2e1dd48a58b969da0035bc0caf228d928fc17b3035a57b2170f50efc29d9199193530894ccaae096a285a655093d63548d4a0450fb611833d642cc SHA512 926ea0ebd8fbb58e37c225d84b1e6674ee4e8838ebad35303045e982b689d9b511057d3bdbc93039ad9aa0cd58d875ddcf1717d83c77208bfd1aa125b7b7c2de
-DIST fwbuilder-5.0.1.3592.tar.gz 6733502 BLAKE2B eb234f0b3609c33527321c9589a1f229df7a7aaabaab8b254af4e560b19ed8f798c1b4e51590d8ef6c86b5f57c69ac0ba654adb0c09fb0fbb3085962470588b4 SHA512 aac34c97963819f0dca4a6bfa63987df45cdd6905164b49ae6f6a423f044fc52aeb09b15b2fc294e1aa3da97d3d31e75bdf9a690e383f579a2fb40ef656f4885
 DIST fwbuilder-5.3.7.tar.gz 7332419 BLAKE2B 130c5ab413263b61b7a78dfabe8d0db861ddfd8bfcee62eb11b9ac8c229c9a9e2b6d8a22e296a12e0e9d0fd9b503882eb06e62f7dc0f62487d760191fce8b553 SHA512 d6504ddab17e80cb332f005b6bbb16c15a7b4735361733f0e0437cb94059a5c9039e563be6e0e8d328954db2416b2c0bdbb8afa36cd946f61e7c7edaee47453b
-EBUILD fwbuilder-5.0.1.3592-r1.ebuild 1115 BLAKE2B 3ebe69acea4d95d3bee87609386a8b193621526b00420fb76e5b4ef84ea04eefd1f2644b6a6ffbeaf3fa7173a003138cb8fb26c05d227519ba60eea8c5067844 SHA512 ef2bf4477c51ec91de9a03f5ae4a3a52a65ce68b326a402f678c4f6d84bbbcc7f2bb09bc7ca194d4e5e1267681592493cce40d6168f56fc4955277123b7bc4c0
-EBUILD fwbuilder-5.3.7.ebuild 1420 BLAKE2B 48f8ad1728e49c9e3951b64019c29cdb8cb5ceb106623f78651d8f280bdbdd0504d6199c833a7e76816b02365cb328829bc4b649fef4d1550c9f21050a61444d SHA512 247fe547656a945c27116ae236150ef21ffa665fb0436db8d3d92f280fa675686526d80c16c01b668c8922c3b7e8a725b6cc496d633b166895bf1a288cfb3df3
+EBUILD fwbuilder-5.3.7.ebuild 1419 BLAKE2B 554981de2730a50840309e822c73ca362abfd22c58fce313cfaefc179a5a85d80d46b1ab0d8db628a4dcc1437dd60fa8206046ddef688343dabadc69b7bab509 SHA512 778f843817d904b2348a9565e2eefa4587b654300696633a485de2bd3c9bded0cd98c0a571dfccf2881ca32dd3464c846ebf9e89c805272c9cb46674f9c578cc
 MISC metadata.xml 520 BLAKE2B 396078caf521038a991589d7aaca8c6c35cec058a3e163f15372512138bfef9c523b7759005c86884ee17522275877ecdef32bdec0085d6d46d7adceb6f962ef SHA512 deda312a012b6b7e342fa3b37d53a6c6fc2b5de129121314856ea659dad92cf3e7b17923f2942bc606deab719907a26e9908c35d087596291b05c0f2e1645e62
diff --git a/net-firewall/fwbuilder/files/fwbuilder-5.0.0.3568-ldflags.patch b/net-firewall/fwbuilder/files/fwbuilder-5.0.0.3568-ldflags.patch
deleted file mode 100644
index d9df8429d390..000000000000
--- a/net-firewall/fwbuilder/files/fwbuilder-5.0.0.3568-ldflags.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Naurp fwbuilder-5.0.0.3568.orig//qmake.inc.in fwbuilder-5.0.0.3568//qmake.inc.in
---- fwbuilder-5.0.0.3568.orig//qmake.inc.in	2011-07-25 19:27:44.000000000 -0400
-+++ fwbuilder-5.0.0.3568//qmake.inc.in	2011-08-19 17:00:41.259985388 -0400
-@@ -39,6 +39,7 @@ unix {
-     QMAKE_CFLAGS_RELEASE += -Wno-unused-parameter
-     QMAKE_CXXFLAGS_DEBUG += -Wno-unused-parameter
-     QMAKE_CXXFLAGS_RELEASE += -Wno-unused-parameter
-+    QMAKE_LFLAGS = @LDFLAGS@
- 
-     !macx {
- 
diff --git a/net-firewall/fwbuilder/files/fwbuilder-5.0.1.3592-gcc47.patch b/net-firewall/fwbuilder/files/fwbuilder-5.0.1.3592-gcc47.patch
deleted file mode 100644
index 7849e2b6da95..000000000000
--- a/net-firewall/fwbuilder/files/fwbuilder-5.0.1.3592-gcc47.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/libfwbuilder/src/fwbuilder/ThreadTools.h	2012-06-04 15:02:55.909203733 -0400
-+++ b/src/libfwbuilder/src/fwbuilder/ThreadTools.h	2012-06-04 15:04:54.079198998 -0400
-@@ -31,7 +31,7 @@
- 
- #include <time.h> //for time_t definition
- #include <pthread.h>
--
-+#include <unistd.h>
- #include <string>
- #include <queue>
- 
diff --git a/net-firewall/fwbuilder/files/fwbuilder-5.0.1.3592-stdc-format-macros.patch b/net-firewall/fwbuilder/files/fwbuilder-5.0.1.3592-stdc-format-macros.patch
deleted file mode 100644
index 3658c10a3eec..000000000000
--- a/net-firewall/fwbuilder/files/fwbuilder-5.0.1.3592-stdc-format-macros.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From: Vadim Kurland <vadim@slot.vk.crocodile.org>
-Date: Tue, 14 Feb 2012 04:59:26 +0000 (-0800)
-Subject: fix for SF bug #3468802. Define macro __STDC_FORMAT_MACROS. This still
-X-Git-Url: http://fwbuilder.git.sourceforge.net/git/gitweb.cgi?p=fwbuilder%2Ffwbuilder;a=commitdiff_plain;h=f97a1b50ba51be5fa31cc54dba829a9e77609160;hp=15565ade5dc843e5fefe83568a023c37256c3c3c
-
-fix for SF bug #3468802. Define macro __STDC_FORMAT_MACROS. This still
-needs to be tested on all build machines.
----
-
-diff --git a/qmake.inc.in b/qmake.inc.in
-index 6bf27e0..3e31fd6 100644
---- a/qmake.inc.in
-+++ b/qmake.inc.in
-@@ -67,6 +67,9 @@ unix {
- 
-         CONFIG += warn_on
- 
-+        QMAKE_CXXFLAGS_DEBUG += -D__STDC_FORMAT_MACROS
-+        QMAKE_CXXFLAGS_RELEASE += -D__STDC_FORMAT_MACROS
-+
-     }
- }
- 
-diff --git a/src/libfwbuilder/qmake.inc.in b/src/libfwbuilder/qmake.inc.in
-index b4f15bb..a8114cf 100644
---- a/src/libfwbuilder/qmake.inc.in
-+++ b/src/libfwbuilder/qmake.inc.in
-@@ -34,6 +34,9 @@ unix {
-     QMAKE_CXXFLAGS_DEBUG += -Wno-unused-parameter @CXXFLAGS@
-     QMAKE_CXXFLAGS_RELEASE += -Wno-unused-parameter @CXXFLAGS@
- 
-+    QMAKE_CXXFLAGS_DEBUG += -D__STDC_FORMAT_MACROS
-+    QMAKE_CXXFLAGS_RELEASE += -D__STDC_FORMAT_MACROS
-+
-     exec_prefix = @EXEC_PREFIX@
-     DESTDIR =
- 
-diff --git a/src/libfwbuilder/src/fwbuilder/uint128.h b/src/libfwbuilder/src/fwbuilder/uint128.h
-index 0a2e7a4..b00ab47 100644
---- a/src/libfwbuilder/src/fwbuilder/uint128.h
-+++ b/src/libfwbuilder/src/fwbuilder/uint128.h
-@@ -36,7 +36,7 @@
- 
- #include <stdio.h>
- 
--#define __STDC_FORMAT_MACROS
-+// #define __STDC_FORMAT_MACROS
- #include <inttypes.h>   // for sprintf formats for "long long"
- 
- // convinience macro
-
diff --git a/net-firewall/fwbuilder/fwbuilder-5.0.1.3592-r1.ebuild b/net-firewall/fwbuilder/fwbuilder-5.0.1.3592-r1.ebuild
deleted file mode 100644
index a43be83fccbc..000000000000
--- a/net-firewall/fwbuilder/fwbuilder-5.0.1.3592-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit eutils base qt4-r2 multilib autotools
-
-DESCRIPTION="A firewall GUI"
-HOMEPAGE="http://www.fwbuilder.org/"
-SRC_URI="mirror://sourceforge/fwbuilder/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE=""
-
-DEPEND=">=dev-qt/qtgui-4.3:4
-	dev-libs/openssl
-	dev-libs/elfutils"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-5.0.0.3568-ldflags.patch"
-	"${FILESDIR}/${PN}-5.0.1.3592-gcc47.patch"
-)
-
-src_prepare() {
-	# Fix a compile bug that affects some x86_64 platforms.
-	# Addressed in the upcoming 5.0.2.3596 release.
-	# Closes #395151.
-	epatch "${FILESDIR}/${P}-stdc-format-macros.patch"
-
-	qt4-r2_src_prepare
-	sed -i -e '/dnl.*AM_INIT_AUTOMAKE/d' configure.in || die #398743
-	eautoreconf
-}
-
-src_configure() {
-	eqmake4
-	# portage handles ccache/distcc itself
-	econf --without-{ccache,distcc}
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-}
-
-pkg_postinst() {
-	elog "You need to emerge sys-apps/iproute2 on the machine"
-	elog "that will run the firewall script."
-}
diff --git a/net-firewall/fwbuilder/fwbuilder-5.3.7.ebuild b/net-firewall/fwbuilder/fwbuilder-5.3.7.ebuild
index 21ac82a52ad2..c1b9b02547ef 100644
--- a/net-firewall/fwbuilder/fwbuilder-5.3.7.ebuild
+++ b/net-firewall/fwbuilder/fwbuilder-5.3.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/fwbuilder/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ppc ppc64 x86"
+KEYWORDS="amd64 ppc ppc64 x86"
 IUSE=""
 
 DEPEND="