[gentoo-commits] repo/gentoo:master commit in: net-analyzer/squidsites/files/, net-analyzer/squidsites/

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/squidsites/files/, net-analyzer/squidsites/

[Sam James]

commit:     5ee576294f545058be72f72e67a504d885c461df
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Apr  2 01:11:24 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Apr  3 15:55:12 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ee57629

net-analyzer/squidsites: EAPI 7, eutils--

Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../files/squidsites-1.01-format-security.patch         |  4 ++--
 net-analyzer/squidsites/squidsites-1.01-r2.ebuild       | 17 +++++++++++------
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/net-analyzer/squidsites/files/squidsites-1.01-format-security.patch b/net-analyzer/squidsites/files/squidsites-1.01-format-security.patch
index 3dd72203c30..0efa4d0817e 100644
--- a/net-analyzer/squidsites/files/squidsites-1.01-format-security.patch
+++ b/net-analyzer/squidsites/files/squidsites-1.01-format-security.patch
@@ -1,5 +1,5 @@
---- a/src/squidsites.c
-+++ b/src/squidsites.c
+--- a/squidsites.c
++++ b/squidsites.c
 @@ -286,7 +286,7 @@
  static
  void print_help()

diff --git a/net-analyzer/squidsites/squidsites-1.01-r2.ebuild b/net-analyzer/squidsites/squidsites-1.01-r2.ebuild
index 01f56bf30cc..c165a7e043d 100644
--- a/net-analyzer/squidsites/squidsites-1.01-r2.ebuild
+++ b/net-analyzer/squidsites/squidsites-1.01-r2.ebuild
@@ -1,25 +1,30 @@
-# 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 toolchain-funcs
+inherit toolchain-funcs
 
 DESCRIPTION="A tool that parses Squid access log file and generates a report of the most visited sites"
-LICENSE="GPL-2"
 HOMEPAGE="http://www.stefanopassiglia.com/misc.htm"
 SRC_URI="http://www.stefanopassiglia.com/downloads/${P}.tar.gz"
+S="${WORKDIR}/src"
+
+LICENSE="GPL-2"
 SLOT="1"
 KEYWORDS="amd64 ppc x86"
 
-S="${WORKDIR}/src"
+PATCHES=(
+	"${FILESDIR}"/${P}-format-security.patch
+)
 
 src_prepare() {
+	default
+
 	# Respect CFLAGS
 	sed -i Makefile \
 		-e '/^CCFLAGS=/s|-g| $(CFLAGS) $(LDFLAGS)|' \
 		|| die
-	epatch "${FILESDIR}"/${P}-format-security.patch
 }
 
 src_compile() {