gentoo resync : 20.03.2021

3 files changed, 11 insertions, 96 deletions

diff --git a/net-analyzer/fwlogwatch/Manifest b/net-analyzer/fwlogwatch/Manifest
index b698f758af42..6cf778d1bac6 100644
--- a/net-analyzer/fwlogwatch/Manifest
+++ b/net-analyzer/fwlogwatch/Manifest
@@ -1,5 +1,3 @@
-DIST fwlogwatch-1.4.tar.bz2 92652 BLAKE2B 94c5ecd6e17c3ce07ffaa33f738109162913253b837bcc4c4fc79068edb610c046b3a178db5481c3e145482686f3f837ecd2fc579700b4a5a68bbaae47f9e537 SHA512 0a67c0ae8b096fdf7a06e279a11b0bc71f2d514790c1669f60606b17a7f3f3ec97dedc2005438ce0ec82efcd66a822b62dbb36603f4b02e010f469fb885b87e6
 DIST fwlogwatch-1.5.tar.bz2 94451 BLAKE2B c0456931dc425df4ec190f1c8bcba21e0784009dae66869a5f5c0371b68d0bdb1bf57c788468f7c9fd32abf8b676a4029bcde7d348c37e4b7f5771bc48f04297 SHA512 d4890596859929ddc6adfd7f9e735e0c414bad40eff6732120a522a8bd4fb8d1442c7d1026f0f3c6ac5c4d51b76a2bac486d04f0fbceae67395c585098afef85
-EBUILD fwlogwatch-1.4.ebuild 1620 BLAKE2B 2ecc86069f004a55ebdb5977e69c238eb6d7530dc24a481286e77abde84aaf231be0e1d14a6c153ab896aeaa7bc103cbbabee8f9fbdd4b686c3e09154a0ca9b2 SHA512 e9d3dcf9c862b7088111ef5b72c405d8650b577245766eeae2a725458c3cf7ba6c38d3efcb9babf69e70bf95ed0edfdd6d8fac6b8c2f25ba52ad75fe733e5970
-EBUILD fwlogwatch-1.5.ebuild 1766 BLAKE2B d931f1a22b0f4b5fd63ffc4c82de623726d1b7d04297ec230238430418ed2e09c425f22c1841716aa060aaa036eca4aff4895f2b4cead8078799691598652310 SHA512 8914d7daa87bb4e1d41e946d7637bb2aeb4bd6cac974fcb67ea48fdaf71b8b6061df436e93102906d6767b81f854c2147a76132f4505a6f612814cedc075078f
+EBUILD fwlogwatch-1.5.ebuild 1778 BLAKE2B db89bf6716b60763d6fe07cf7ef3bf37766b00fda87e3adb9c198810bb99c8b13b0eb2c0925007fc712f0d8f976db4b875b43b8fc65fc91bd1a90e0374e0d3de SHA512 e1551363a1f65fdaf559c0d4805fbc6da9b6912344c4eb818f9e5144e30384ea35dabb423d4f74fc4e8e0545d30d1a4933d911c88c18f4987e8ee1d77f78fc28
 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250
diff --git a/net-analyzer/fwlogwatch/fwlogwatch-1.4.ebuild b/net-analyzer/fwlogwatch/fwlogwatch-1.4.ebuild
deleted file mode 100644
index 54a2095f9c3d..000000000000
--- a/net-analyzer/fwlogwatch/fwlogwatch-1.4.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils flag-o-matic toolchain-funcs
-
-DESCRIPTION="A packet filter and firewall log analyzer"
-HOMEPAGE="http://fwlogwatch.inside-security.de/"
-SRC_URI="http://fwlogwatch.inside-security.de/sw/${P}.tar.bz2"
-
-KEYWORDS="amd64 ~ppc sparc x86"
-LICENSE="GPL-1"
-SLOT="0"
-IUSE="nls zlib"
-
-RDEPEND="
-	zlib? ( sys-libs/zlib )
-"
-DEPEND="
-	${RDEPEND}
-	sys-devel/flex
-	nls? ( sys-devel/gettext )
-"
-
-src_prepare() {
-	if use nls; then
-		strip-linguas -i po/
-		local lingua pofile
-		for pofile in po/*.po; do
-			lingua=${pofile/po\/}
-			lingua=${lingua/.po}
-			if ! has ${lingua} ${LINGUAS}; then
-				sed -i \
-					-e "/${lingua}.[mp]o/d" \
-					Makefile po/Makefile || die
-			fi
-		done
-	fi
-
-	sed -i \
-		-e '/^INSTALL_/s|$| -D|g' \
-		-e 's|make|$(MAKE)|g ' \
-		Makefile || die
-}
-
-src_configure() {
-	if ! use zlib; then
-		sed -i Makefile -e '/^LIBS/ s|-lz||g' || die
-	else
-		append-cflags -DHAVE_ZLIB
-	fi
-
-	use nls && append-cflags -DHAVE_GETTEXT
-}
-
-src_compile() {
-	emake \
-		CC=$(tc-getCC) \
-		CFLAGS="${CFLAGS}" \
-		LDFLAGS="${LDFLAGS}"
-	use nls && emake -C po
-}
-
-src_install() {
-	emake \
-		LOCALE_DIR="${D}/usr" INSTALL_DIR="${D}/usr" \
-		install
-	use nls && emake \
-		LOCALE_DIR="${D}/usr" INSTALL_DIR="${D}/usr" \
-		install-i18n
-
-	dosbin contrib/fwlw_notify
-	dosbin contrib/fwlw_respond
-
-	dodoc AUTHORS ChangeLog CREDITS README
-
-	insinto /usr/share/fwlogwatch/contrib
-
-	doins contrib/fwlogsummary.cgi
-	doins contrib/fwlogsummary_small.cgi
-	doins contrib/fwlogwatch.php
-
-	insinto /etc
-	doins fwlogwatch.config
-}
diff --git a/net-analyzer/fwlogwatch/fwlogwatch-1.5.ebuild b/net-analyzer/fwlogwatch/fwlogwatch-1.5.ebuild
index 93b1e6a2a352..1f4f953ecd59 100644
--- a/net-analyzer/fwlogwatch/fwlogwatch-1.5.ebuild
+++ b/net-analyzer/fwlogwatch/fwlogwatch-1.5.ebuild
@@ -1,15 +1,15 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit eutils flag-o-matic toolchain-funcs
+inherit flag-o-matic toolchain-funcs
 
 DESCRIPTION="A packet filter and firewall log analyzer"
 HOMEPAGE="http://fwlogwatch.inside-security.de/"
 SRC_URI="http://fwlogwatch.inside-security.de/sw/${P}.tar.bz2"
 
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ~ppc sparc x86"
 LICENSE="GPL-1"
 SLOT="0"
 IUSE="geoip nls zlib"
@@ -18,13 +18,15 @@ RDEPEND="
 	geoip? ( dev-libs/geoip )
 	zlib? ( sys-libs/zlib )
 "
-DEPEND="
-	${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	sys-devel/flex
 	nls? ( sys-devel/gettext )
 "
 
 src_prepare() {
+	default
+
 	if use nls; then
 		strip-linguas -i po/
 		local lingua pofile
@@ -62,7 +64,7 @@ src_configure() {
 
 src_compile() {
 	emake \
-		CC=$(tc-getCC) \
+		CC="$(tc-getCC)" \
 		CFLAGS="${CFLAGS}" \
 		LDFLAGS="${LDFLAGS}"
 	use nls && emake -C po
@@ -72,6 +74,7 @@ src_install() {
 	emake \
 		LOCALE_DIR="${D}/usr" INSTALL_DIR="${D}/usr" \
 		install
+
 	use nls && emake \
 		LOCALE_DIR="${D}/usr" INSTALL_DIR="${D}/usr" \
 		install-i18n