gentoo resync : 06.12.2017

4 files changed, 64 insertions, 50 deletions

diff --git a/net-firewall/fwbuilder/Manifest b/net-firewall/fwbuilder/Manifest
index 854904fc1ef7..58a174bcd2fe 100644
--- a/net-firewall/fwbuilder/Manifest
+++ b/net-firewall/fwbuilder/Manifest
@@ -1,10 +1,9 @@
 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 SHA256 22120de712844b5d89a3f2924964c16cc86f96f2156ace7c3f551bd0d713c94b SHA512 aac34c97963819f0dca4a6bfa63987df45cdd6905164b49ae6f6a423f044fc52aeb09b15b2fc294e1aa3da97d3d31e75bdf9a690e383f579a2fb40ef656f4885 WHIRLPOOL 436e5f8c802e6b25c588f3296ac0cbce89aa818c53871296615980aee6b71b84a64a44808f7d2390ee73b11e83b2acc88d94c7b236df5caf83788d735276211f
-DIST fwbuilder-5.3.6.tar.gz 7325429 SHA256 672c2870c3a2ce1eb504a97d17ea9a8eb6dd61ec314cf79b9488b48a356cdfa6 SHA512 70f6888d09c89a624ea35f119c1e00d5a7e57d993d8658fd164e35bce073503bf66f3c9e05ffa1b49ab9371cf219825d22a41c31604c63de5290dd64845e06af WHIRLPOOL a559061861447bff1657857c5a9f551e4eb0315fdea99199025d9cdaae3b1163cb69f97c36517bbe39998b0a9a97026d9737485b5a01144cd8296c502830e9b6
-DIST fwbuilder-5.3.7.tar.gz 7332419 SHA256 aba1ed8f690e9e4659c0e981120ea68da7ee327d6cf81260d51329351addf91e SHA512 d6504ddab17e80cb332f005b6bbb16c15a7b4735361733f0e0437cb94059a5c9039e563be6e0e8d328954db2416b2c0bdbb8afa36cd946f61e7c7edaee47453b WHIRLPOOL 0191f0f812b494bae9d4c00cc4a26315f32c378e5395270f56cd4e3d7d0c189d67ec154c28d9aaeecee0b0304c1bb5cf61db2a738b32b189ee53f306849fdfa9
+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.6.ebuild 939 BLAKE2B 1d2af12cfc5cfd08d7edc9233c3022b511d92988c3249666a459959900c04cf65fcff06ac6ede89f2b4405e20e2b8eba556a88376f67dde4c52bc7a67aa83763 SHA512 649a0fbaf7ee3cf0245cff85822f93f313f827cd66009964cd0bb5074c250fc850e12123c5f6d4f61a9824df789baa4d2ddd8076d73a95d6c3528087b5a907f4
-EBUILD fwbuilder-5.3.7.ebuild 1499 BLAKE2B 55edaca6d84759ab162adbd40072f10894a9e8b30971f2d7a4f809c7baaa575f84d2dd82f5f86bf465d2090e4350636b78ad9fde2251ee770f343d9b8780f403 SHA512 f95d657e018e8953ca17b938765e708e8a2d6794beed4b1f6762a941760aaac6e856cda46a63e1098399c3d4ff0de25809864327f255607a4e5ffcd9dba075ee
+EBUILD fwbuilder-5.3.7.ebuild 1423 BLAKE2B a764ac7065658f47da76992f16ffb6f65e732e60c8edece51172955e323aa5943c25a1be5213de29c0ef97d4974d58027f57b23682453a515f0e96feca404c3c SHA512 73476575bfbad3aab82bb95a3ced17a8ec8ebf95fb36b1bd5b6ede856d176b7421ed30246912bbbd596c69d02ea8e189a1405da3c147758e7fe4b06ee409f3c6
 MISC metadata.xml 520 BLAKE2B 396078caf521038a991589d7aaca8c6c35cec058a3e163f15372512138bfef9c523b7759005c86884ee17522275877ecdef32bdec0085d6d46d7adceb6f962ef SHA512 deda312a012b6b7e342fa3b37d53a6c6fc2b5de129121314856ea659dad92cf3e7b17923f2942bc606deab719907a26e9908c35d087596291b05c0f2e1645e62
diff --git a/net-firewall/fwbuilder/files/fwbuilder-5.3.7-qtbindir.patch b/net-firewall/fwbuilder/files/fwbuilder-5.3.7-qtbindir.patch
new file mode 100644
index 000000000000..3ae4be71f24b
--- /dev/null
+++ b/net-firewall/fwbuilder/files/fwbuilder-5.3.7-qtbindir.patch
@@ -0,0 +1,57 @@
+--- a/configure.in	2017-12-04 21:30:44.000000000 +0100
++++ b/configure.in	2017-12-04 21:56:00.277286322 +0100
+@@ -45,44 +45,18 @@
+ #define GENERATION   "$GENERATION"
+ EOF
+ 
+-dnl try to find QT
+-dnl
+-AC_ARG_WITH(qtdir,[  --with-qtdir=DIR        Specify directory path for QT ])
+-
+-if test -n "$with_qtdir"; then
+-   AC_MSG_CHECKING(Using QT in )
+-   QTDIR="$with_qtdir";
+-   export QTDIR
+-   AC_MSG_RESULT($QTDIR)
+-fi
+-
+-# TODO: do we need to add $QTDIR/bin to PATH to find qmake?
+-EXTENDED_PATH="/usr/local/bin:$QTDIR/bin/:$PATH"
++EXTENDED_PATH="/usr/local/bin:$PATH"
++PKG_PROG_PKG_CONFIG
+ 
+-AC_ARG_WITH(qmake, [  --with-qmake=qmake     Specify the qmake to be used (debian qmake-qt4) ])
+-if test -n "$with_qmake"; then
+-    AC_PATH_PROG(QMAKE,  $with_qmake,      ,[$EXTENDED_PATH])
+-    if test -z "$QMAKE"; then
+-        AC_MSG_ERROR("Could not find qmake")
+-    fi
+-else
+-    AC_PATH_PROG(QMAKE,  qmake,      ,[$EXTENDED_PATH])
+-    if test -z "$QMAKE"; then
+-        AC_PATH_PROG(QMAKE,  qmake-qt4,      ,[$EXTENDED_PATH])
+-        if test -z "$QMAKE"; then
+-            AC_MSG_ERROR("Could not find qmake")
+-        fi
+-    fi
+-fi
+-
+-AC_MSG_CHECKING(checking version of QT this qmake is part of)
+-qmake_version=`$QMAKE -v 2>&1 | awk '/Using Qt version/ { print $4;}'`
+-case $qmake_version in
+-    4.*) AC_MSG_RESULT( $qmake_version ) ;;
+-    5.*) AC_MSG_RESULT( $qmake_version ) ;;
+-      *) AC_MSG_ERROR( "$qmake_version -- v4.x or v5.x is required") ;;
+-esac
++dnl try to find Qt5
++dnl
+ 
++PKG_CHECK_MODULES([QT5], [Qt5Core >= 5.1.0], [
++    QT_PATH="$( eval $PKG_CONFIG --variable=host_bins Qt5Core )"
++    AC_PATH_PROGS([QMAKE], [qmake-qt5 qmake], [qmake], [$QT_PATH])
++], [
++    AC_MSG_ERROR([Qt5 not found])
++])
+ 
+ 
+ AC_ARG_WITH(templatedir, [  --with-templatedir=DIR  Specify directory path for fwbuilder template files ])
diff --git a/net-firewall/fwbuilder/fwbuilder-5.3.6.ebuild b/net-firewall/fwbuilder/fwbuilder-5.3.6.ebuild
deleted file mode 100644
index 153671b7ee5b..000000000000
--- a/net-firewall/fwbuilder/fwbuilder-5.3.6.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit qmake-utils autotools
-
-DESCRIPTION="A firewall GUI"
-HOMEPAGE="http://www.fwbuilder.org/"
-SRC_URI="https://github.com/UNINETT/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="libressl"
-
-DEPEND="
-	!libressl? ( dev-libs/openssl:0 )
-	libressl? ( dev-libs/libressl )
-	dev-libs/elfutils
-	>=dev-qt/qtgui-5.5.1-r1:5"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	eapply_user
-	sed -i -e '/dnl.*AM_INIT_AUTOMAKE/d' configure.in || die #398743
-	mv configure.in configure.ac || die #426262
-	eautoreconf
-}
-
-src_configure() {
-	eqmake5
-	# 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"
-	elog "in order to 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 a3fb5b1aeb90..5b66d22b1b85 100644
--- a/net-firewall/fwbuilder/fwbuilder-5.3.7.ebuild
+++ b/net-firewall/fwbuilder/fwbuilder-5.3.7.ebuild
@@ -26,8 +26,10 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
+PATCHES=( "${FILESDIR}/${P}-qtbindir.patch" )
+
 src_prepare() {
-	eapply_user
+	default
 
 	# bug 398743
 	sed -i -e '/dnl.*AM_INIT_AUTOMAKE/d' configure.in || die
@@ -47,9 +49,8 @@ src_prepare() {
 
 src_configure() {
 	econf \
-		--without-{ccache,distcc} # portage handles ccache/distcc itself
+		--without-{ccache,distcc} \
 		--with-docdir="/usr/share/doc/${PF}"
-		--with-qmake="$(qt5_get_bindir)/qmake" # use fully-qualified qmake, bug #599466
 
 	# yes, we really do need to run both econf and eqmake5...
 	eqmake5