commit: 70b497269b1aeaaba4d4796a5265288f5980221b Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Fri Jan 27 20:56:24 2023 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Fri Jan 27 22:33:38 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=70b49726
net-firewall/fwbuilder: drop 5.3.7 Closes: https://bugs.gentoo.org/814782 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> net-firewall/fwbuilder/Manifest | 1 - .../fwbuilder/files/fwbuilder-5.3.7-qtbindir.patch | 57 ----------------- net-firewall/fwbuilder/fwbuilder-5.3.7.ebuild | 72 ---------------------- 3 files changed, 130 deletions(-) diff --git a/net-firewall/fwbuilder/Manifest b/net-firewall/fwbuilder/Manifest index 46c6d21729dd..970f61899036 100644 --- a/net-firewall/fwbuilder/Manifest +++ b/net-firewall/fwbuilder/Manifest @@ -1,2 +1 @@ -DIST fwbuilder-5.3.7.tar.gz 7332419 BLAKE2B 130c5ab413263b61b7a78dfabe8d0db861ddfd8bfcee62eb11b9ac8c229c9a9e2b6d8a22e296a12e0e9d0fd9b503882eb06e62f7dc0f62487d760191fce8b553 SHA512 d6504ddab17e80cb332f005b6bbb16c15a7b4735361733f0e0437cb94059a5c9039e563be6e0e8d328954db2416b2c0bdbb8afa36cd946f61e7c7edaee47453b DIST fwbuilder-6.0.0_rc1.tar.gz 7281841 BLAKE2B 4adfb2c1ba22d781e98de2e02cc7cca6a1c214d3b63e156b76a351d1a7e399afaf0227ced4c9fa228c637c37247dd1cb6e88a0cc4231a3827ba2e5bd0b8a4c5e SHA512 11126c23d8b9f68e7cdcf0a6d3de1678f1b0c879959cef5484b30c2d41ab0377c70dce432d014331cfd376a5fd20e384db7342745a066e8159c2ae275d5bdec4 diff --git a/net-firewall/fwbuilder/files/fwbuilder-5.3.7-qtbindir.patch b/net-firewall/fwbuilder/files/fwbuilder-5.3.7-qtbindir.patch deleted file mode 100644 index 3ae4be71f24b..000000000000 --- a/net-firewall/fwbuilder/files/fwbuilder-5.3.7-qtbindir.patch +++ /dev/null @@ -1,57 +0,0 @@ ---- 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.7.ebuild b/net-firewall/fwbuilder/fwbuilder-5.3.7.ebuild deleted file mode 100644 index 2e5604a324f7..000000000000 --- a/net-firewall/fwbuilder/fwbuilder-5.3.7.ebuild +++ /dev/null @@ -1,72 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools qmake-utils xdg-utils - -DESCRIPTION="GUI management for iptables, PF, Cisco ASA/PIX/FWSM, Cisco router ACL and more" -HOMEPAGE="https://github.com/fwbuilder/fwbuilder"; -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" -IUSE="" - -DEPEND=" - dev-libs/libxml2 - dev-libs/libxslt - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5 - dev-qt/qtprintsupport:5 - dev-qt/qtwidgets:5 - sys-libs/zlib -" -RDEPEND="${DEPEND}" - -PATCHES=( "${FILESDIR}/${P}-qtbindir.patch" ) - -src_prepare() { - default - - # bug 398743 - sed -i -e '/dnl.*AM_INIT_AUTOMAKE/d' configure.in || die - - # we need to run qmake ourselves using eqmake5 in src_configure to - # ensure we respect CC, *FLAGS, etc. - sed -i -e "/runqmake.sh/d" configure.in || die - - # bug 426262 - mv configure.in configure.ac || die - - # don't install yet another copy of the GPL - sed -i -e '/COPYING/d' doc/doc.pro || die - - eautoreconf -} - -src_configure() { - econf \ - --without-{ccache,distcc} \ - --with-docdir="/usr/share/doc/${PF}" - - # yes, we really do need to run both econf and eqmake5... - eqmake5 -} - -src_install() { - emake INSTALL_ROOT="${D}" install -} - -pkg_postinst() { - xdg_icon_cache_update - - elog "You need to install sys-apps/iproute2" - elog "in order to run the firewall script." -} - -pkg_postrm() { - xdg_icon_cache_update -}
