From 622c6e98890e92c83d68572b90dadfb561019658 Mon Sep 17 00:00:00 2001
From: Sandino Araico Sanchez <sandino@sandino.net>
Date: Sat, 23 Jul 2022 13:18:38 -0500
Subject: [PATCH] net-analyzer/pinger: EAPI 7

---
 net-analyzer/pinger/Manifest                |  4 +-
 net-analyzer/pinger/pinger-0.33-r101.ebuild | 59 ---------------------
 net-analyzer/pinger/pinger-0.33-r102.ebuild |  9 ++--
 3 files changed, 7 insertions(+), 65 deletions(-)
 delete mode 100644 net-analyzer/pinger/pinger-0.33-r101.ebuild

diff --git a/net-analyzer/pinger/Manifest b/net-analyzer/pinger/Manifest
index 25846a1..6bc2839 100644
--- a/net-analyzer/pinger/Manifest
+++ b/net-analyzer/pinger/Manifest
@@ -3,7 +3,7 @@ AUX pinger-0.32e-tinfo.patch 907 BLAKE2B 8b6f43e44ec59353c1c59a4af6de4aab254182e
 AUX pinger-0.33-descs.patch 432 BLAKE2B 7091590c8d7ca38d1f0454b0f4ea0104906eee23b2948aa6c2aa3603ae91f9d66dee5072d7f317e358fc6fd7d3973aba8611c5d951058e0b96ac3177e0ba645f SHA512 8367757fbd8c6ddc22ea1d16a6495c68cc704c19974d280720e9b613765b877ee4eac0002b019e1b50b3245af381b4d3682108d59e4c27db528530977aa7785c
 AUX pinger-0.33-gentoo.patch 2488 BLAKE2B a94bf31ad31089f5a8686cc316437984c570677ce60cff01a4ce517f1557256cdc3c440049c68aebd642c4d92d76b29cd56ef18da1d9161e06dac20504ce4207 SHA512 7ebda41ab5caf068476e82f181893b688a0c211cc3e26750517e2cdd4db872bfba4b8d389708bb39fedf103d29cb5b98be3ba0064cd73453735ece3a68776730
 AUX pinger-0.33-getpid.patch 686 BLAKE2B a096f0459fbcf2378e7399ad1f06b8549ee6b131449ab4ace602da3319274dcd655190f30df3f15c13a5ef3ac2b708014265ca0093489b128de9dcbc4922bbff SHA512 300d8f9bc48a3b3c8ecd0b29be01fa85431611176cc8f86fe8f02a940577dca0fbc240bc6020dca893db7c81d1ccc50c1078a8a59a5bbcf2efc1d1cee04be570
+AUX pinger-0.33-ncurses.patch 817 BLAKE2B f7dc22f353e703f77cdb84840ba3f237af64d2a3ca996349d466cb980805a9b27c51888fe321f6a8450f96c84da29f697a6de02c54beaf640fc2d36aa5edc2b1 SHA512 e8f0acd65d5ec4812fa2f97045584c20f6be9f99208cf612ff551c9c62bc9f3e506321291d73013f5ae7b1359f0bcbd4e530d5c1f8c0b0c0b97e9bc525034e93
 DIST pinger-0.33.tar.gz 247827 BLAKE2B 6139044be634438945c92a431b97276b5556b513a948a675d6d70c73e4e22d08a58b9cf6607170f804354c18371af54a222b0e064cc1c8275ba77f67ddbd6699 SHA512 fff07599ef91fbdcff9be7806eca57a71e8e6fac7e9afc67c4147e6246b0bcdadf379de28f87054dbe7c409955c0e0ddeae7f529e954231bea0cfb39e4e29bc1
-EBUILD pinger-0.33-r101.ebuild 1117 BLAKE2B 13fc2f0b52340b0603f5918c8cd9061db22318dd17834232d40db6328cdf8f1bdaf727384116ef3806739ac08124f880bd235523a000edd62dbe41d8300f69a9 SHA512 ac1139fc643a0c6bd31c803bd430e951fbdd33255eb8a064ff374383111397e2e5016493d13a702341c04b7c2b03347ca946edbf92860caa9cd4cb61acf39558
-EBUILD pinger-0.33-r102.ebuild 1157 BLAKE2B e4aac73a6b21221bf3af821c2d8ecbf79d790c3aefbd4502f77d9c500d98aad0e0360bb1cc85ac905c830a5e4045b4775a45151192e28d03281a413f2367b25e SHA512 e46503a3eb864c884c688a3be6bef2a34c186b977f5830101fc498ddfad66dc560f359b2676716cb8b6a0e354fafeb449a115ace62907388e38e45938eb2f618
+EBUILD pinger-0.33-r102.ebuild 1208 BLAKE2B 15e53a782af508d97b3f4fd73fad701f2efba2c65244f407601124f897d6573007069a7199def83a627e55bf8ad0b3c098e138398d507b4dcc47bcf8beeb9d0f SHA512 ad31173e78c942e7987fd47cb0c1a83e9bd9db0d551a6d6b36e8749509c8ab31c912cff310298236ebb27027f74e90f2f36e1b54507d55929037c5097f24379e
 MISC metadata.xml 477 BLAKE2B 63658143ec172ecc577c273faae8655ca0e12b4c2e4b518ed7a046875189485904955c4313e69d63bf158a0092b6338fd9673461ccfc358f716e3446e207f04a SHA512 ee9a6e27f4467c86d4f3b2069cc0202f249d2c1d4aa027b6c0a87dad61f7d6b9097faf64848a5d4b5d88300fb5c29cdb7532cb1288bca017d178f3d1e4cd95f0
diff --git a/net-analyzer/pinger/pinger-0.33-r101.ebuild b/net-analyzer/pinger/pinger-0.33-r101.ebuild
deleted file mode 100644
index 7151e66..0000000
--- a/net-analyzer/pinger/pinger-0.33-r101.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools eutils flag-o-matic
-
-DESCRIPTION="Cyclic multi ping utility for selected adresses using GTK/ncurses"
-HOMEPAGE="http://aa.vslib.cz/silk/projekty/pinger/"
-SRC_URI="http://mirrors.sandino.net/gentoo/distfiles/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="gtk2 gtk3 ncurses nls"
-
-REQUIRED_USE="
-	|| ( gtk2 gtk3 ncurses )
-	?? ( gtk2 gtk3 )
-"
-GTK_DEPEND="
-	dev-libs/glib:2
-"
-RDEPEND="
-	gtk2? (
-		${GTK_DEPEND}
-		>=x11-libs/gtk+-2.4:2
-	)
-	gtk3? (
-		${GTK_DEPEND}
-		>=x11-libs/gtk+-3.12:3
-	)
-	ncurses? ( sys-libs/ncurses )
-"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-"
-
-DOCS=( AUTHORS BUGS ChangeLog NEWS README )
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-gentoo.patch
-	epatch "${FILESDIR}"/${P}-descs.patch
-
-	sed -i -e '/Root privileges/d' src/Makefile.am || die
-
-	eautoreconf
-}
-
-src_configure() {
-	append-cppflags -D_GNU_SOURCE
-
-	econf \
-		$(usex gtk2 --enable-gtk=gtk2 '') \
-		$(usex gtk3 --enable-gtk=gtk3 '') \
-		$(use_enable ncurses) \
-		$(use_enable nls)
-}
diff --git a/net-analyzer/pinger/pinger-0.33-r102.ebuild b/net-analyzer/pinger/pinger-0.33-r102.ebuild
index 0fa6895..bc160a6 100644
--- a/net-analyzer/pinger/pinger-0.33-r102.ebuild
+++ b/net-analyzer/pinger/pinger-0.33-r102.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 inherit autotools eutils flag-o-matic
 
@@ -40,13 +40,14 @@ DEPEND="
 DOCS=( AUTHORS BUGS ChangeLog NEWS README )
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-gentoo.patch
-	epatch "${FILESDIR}"/${P}-descs.patch
-	epatch "${FILESDIR}"/${P}-getpid.patch
+	eapply "${FILESDIR}"/${P}-gentoo.patch
+	eapply "${FILESDIR}"/${P}-descs.patch
+	eapply "${FILESDIR}"/${P}-getpid.patch
 
 	sed -i -e '/Root privileges/d' src/Makefile.am || die
 
 	eautoreconf
+	default
 }
 
 src_configure() {