[gentoo-commits] repo/gentoo:master commit in: net-im/cpop/, net-im/cpop/files/

[gentoo-commits] repo/gentoo:master commit in: net-im/cpop/, net-im/cpop/files/

[Sam James]

commit:     1fd49fddace78ca42521b9d54f7cd775fdd7bc44
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 19 18:53:41 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Apr 19 19:12:18 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1fd49fdd

net-im/cpop: port to EAPI 7

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

 net-im/cpop/cpop-0.0.4-r1.ebuild                             | 11 ++++-------
 .../cpop/files/cpop-0.0.4-implicit-exit_memset_strlen.patch  | 12 ++++++------
 2 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/net-im/cpop/cpop-0.0.4-r1.ebuild b/net-im/cpop/cpop-0.0.4-r1.ebuild
index 04b26d3a6a1..9315a2381ea 100644
--- a/net-im/cpop/cpop-0.0.4-r1.ebuild
+++ b/net-im/cpop/cpop-0.0.4-r1.ebuild
@@ -1,9 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-
-inherit epatch
+EAPI=7
 
 DESCRIPTION="GTK+ network popup message client. Compatible with the jpop protocol"
 HOMEPAGE="http://www.draxil.uklinux.net/hip/index.pl?page=cpop"
@@ -12,15 +10,14 @@ SRC_URI="mirror://gentoo/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
 
 RDEPEND="dev-libs/glib:2
 	x11-libs/gtk+:2"
 DEPEND="${RDEPEND}"
 
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-implicit-exit_memset_strlen.patch
-}
+PATCHES=(
+	"${FILESDIR}"/${P}-implicit-exit_memset_strlen.patch
+)
 
 src_install() {
 	emake DESTDIR="${D}" install

diff --git a/net-im/cpop/files/cpop-0.0.4-implicit-exit_memset_strlen.patch b/net-im/cpop/files/cpop-0.0.4-implicit-exit_memset_strlen.patch
index 3ce224c2910..d47bfcde9d8 100644
--- a/net-im/cpop/files/cpop-0.0.4-implicit-exit_memset_strlen.patch
+++ b/net-im/cpop/files/cpop-0.0.4-implicit-exit_memset_strlen.patch
@@ -5,8 +5,8 @@ pop_gui_client.c:58:4: warning: incompatible implicit declaration of built-in fu
 pop_gui_client.c:72:27: warning: incompatible implicit declaration of built-in function ‘strlen’
 pop_gui_client.c:128:3: warning: incompatible implicit declaration of built-in function ‘exit’
 
---- pop_client.c
-+++ pop_client.c
+--- a/pop_client.c
++++ b/pop_client.c
 @@ -1,11 +1,11 @@
  #include <stdio.h>
 +#include <stdlib.h>
@@ -20,16 +20,16 @@ pop_gui_client.c:128:3: warning: incompatible implicit declaration of built-in f
  #include <netdb.h>
  #include "pop_common.h"
  #include "pop_client.h"
---- pop_common.c
-+++ pop_common.c
+--- a/pop_common.c
++++ b/pop_common.c
 @@ -1,4 +1,5 @@
  #include <stdio.h>
 +#include <stdlib.h>
  void errquit(char *message)
  {
    perror(message);
---- pop_gui_client.c
-+++ pop_gui_client.c
+--- a/pop_gui_client.c
++++ b/pop_gui_client.c
 @@ -1,3 +1,5 @@
 +#include <stdlib.h>
 +#include <string.h>