gentoo resync : 28.04.2021

5 files changed, 29 insertions, 30 deletions

diff --git a/net-nntp/newspost/Manifest b/net-nntp/newspost/Manifest
index 52933650a9d1..48b1563cbb45 100644
--- a/net-nntp/newspost/Manifest
+++ b/net-nntp/newspost/Manifest
@@ -1,6 +1,6 @@
-AUX CAN-2005-0101.patch 284 BLAKE2B 6b1173bc170fe23d4ad312a11abddb8673c0a3a6fc2b85b928f5e313820dd3926ad26316809d970de9122bcab664ac4fd75deb20a73e950a3d4e9707e7c9c956 SHA512 fca2c27d94310c786ffa6b3b376c5dc04752f9c41688ac335bbbf440e972dcc06f8495090fd52bdb4f33c34009fc0536bf411809f93310f474f703d28c199dc5
-AUX newspost-2.1.1-glibc-2.10.patch 2038 BLAKE2B c65a47609867bfc08369e31966c874028b5b74b96c626214014fbac9b024801b34b2db53ddb032f018440316ac1f8e4967e843e5a87549bcad2d31dfe0688535 SHA512 6e1c9a30d282dd2e3e133571bb747d5c7b133dab54f9f464e32e23655d8534e4e1cfb388291116c8c28ef3ad7515cde5c9d7ce053407928df38bdcf014f14a2f
-AUX newspost-2.1.1-nntp.patch 1845 BLAKE2B dd9c900da59f5c6e5eebfebfa9b5dbfdc092cd21282b99f447f9e15a92a5aaa4dcff5da449044be5a8a8f750224e9734343816c8f0bac08967f028fa325a6d0d SHA512 c636657d1e33ba6861c1625f5798e5b98e546719331a91b455156e3af45be71873feee357d72a778da81058457299476d39a1c3674a2572185fd355f96b4f77d
+AUX CAN-2005-0101.patch 226 BLAKE2B 6547caace477d9e2824c768f5a747e80eddc4f47fa9554e85d6715e709f97529cc32d1994300e6a346b9db9275b76075baf5e448b93688881e5862db38dcad9b SHA512 3bf8a304044f2873f0aa10fba01b08a75a6d6d7476b323dd9421285104aceadc9338fcbe3e1bbeb7e69cb8e5992b511cf72788de4defbea17f034e48788d1fb5
+AUX newspost-2.1.1-glibc-2.10.patch 1340 BLAKE2B 558501614425b8461efcceb3824526cd72eaf6b7eb1d728b95f9241ec5362aa17bcc8e69ea3654fe32899d2fe1e072c9899e4ab3fbe02bf0683577e320ef472b SHA512 7b28f90904db586d64b0e22a95588023204bb7a70e50d4af32ca657f52353359c33d536e071f4bbcd3b098b701567afd0c00ca8c75cddcd469bcf2c4ee8c359c
+AUX newspost-2.1.1-nntp.patch 1783 BLAKE2B 838f9716c30d655385038f041062df3b0732af7d4e7ee5ec695589b40d8f85ad023fb1564e3f108aff28f2fb1a00b7b9b38b30cc75292fd49ef211c0fbf97bff SHA512 1c955ee41ea532f3c04cef79a7bc6f61e8ee6a6cf60b91fca3a3bf3c09aadbcf218fafd9179fa30b2736ce6a19e4059a573145c3459591691518cc914a631039
 DIST newspost-2.1.1.tar.gz 61412 BLAKE2B f5dad9ff397ed8536961c7364b9ade1e325bda8fa2fbd2e874c4db022112d45accb1d7800fd0c52eed5a17cc7e9298600b9ec6a6e95eccb560090f0c42d5de57 SHA512 d7f5b583ef5619a65e87f2ce2edbad307d60da7f29e5c6bef8eaa7c757f97f82f08654409a75ea7b28e5575fd267af57cbc170f467f6737f701bfbd6bd4b2f66
-EBUILD newspost-2.1.1-r3.ebuild 805 BLAKE2B cd03a084a3c3991b4b59b8ac8ec0a3736629ee11bf2bdd72991e86f6191083f11acf3d3f260de579dd392420e4358dc39e321856548100c4269977d5536cffda SHA512 216891c207e189f31238853c89e48f4aea77c69311e856cd4063c34c3b84d2ca648b92635b3af27bad313c8952ad495d19cfb31fb51ecced5210467e5fc28b73
+EBUILD newspost-2.1.1-r3.ebuild 791 BLAKE2B 2c6262fe5f3cc343c7bf2e6c99809e85521f2cc47c1b8fd5a2ae7c20efa194c8ec677a8d51ab43d51c0f76b31eb44441baef194a0939d13da0d2a54ce6629f7e SHA512 c0f96b522599a35ec1a6912684f21dad08b4352c7c1fa1e9a80b4707ea472424f2fa17e266ff7e416efa190f169ad4acc1576fbed2e27a09b8179572e59a47bd
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-nntp/newspost/files/CAN-2005-0101.patch b/net-nntp/newspost/files/CAN-2005-0101.patch
index 2bfdfc2c190d..c81936be61ba 100644
--- a/net-nntp/newspost/files/CAN-2005-0101.patch
+++ b/net-nntp/newspost/files/CAN-2005-0101.patch
@@ -1,5 +1,5 @@
---- base/socket.c.orig  Tue Jan 18 11:08:02 2005
-+++ base/socket.c       Tue Jan 18 11:10:08 2005
+--- a/base/socket.c
++++ b/base/socket.c
 @@ -126,7 +126,7 @@
  
  	i = 0;
diff --git a/net-nntp/newspost/files/newspost-2.1.1-glibc-2.10.patch b/net-nntp/newspost/files/newspost-2.1.1-glibc-2.10.patch
index fdaa78cbefb7..8778ab41c253 100644
--- a/net-nntp/newspost/files/newspost-2.1.1-glibc-2.10.patch
+++ b/net-nntp/newspost/files/newspost-2.1.1-glibc-2.10.patch
@@ -1,6 +1,5 @@
-diff -ur newspost-2.1.1.orig/base/newspost.c newspost-2.1.1/base/newspost.c
---- newspost-2.1.1.orig/base/newspost.c	2003-04-23 18:33:23.000000000 +0300
-+++ newspost-2.1.1/base/newspost.c	2009-08-06 14:46:41.000000000 +0300
+--- a/base/newspost.c
++++ b/base/newspost.c
 @@ -342,7 +342,7 @@
  	file = fopen(filename, "r");
  	if (file != NULL) {
@@ -10,9 +9,8 @@ diff -ur newspost-2.1.1.orig/base/newspost.c newspost-2.1.1/base/newspost.c
  			if(line == NULL){
  				text_buffer = buff_add(text_buffer, "\r\n");
  				continue;
-diff -ur newspost-2.1.1.orig/base/utils.c newspost-2.1.1/base/utils.c
---- newspost-2.1.1.orig/base/utils.c	2009-08-06 14:44:35.000000000 +0300
-+++ newspost-2.1.1/base/utils.c	2009-08-06 14:45:20.000000000 +0300
+--- a/base/utils.c
++++ b/base/utils.c
 @@ -43,7 +43,7 @@
  	return NULL;
  }
@@ -22,9 +20,8 @@ diff -ur newspost-2.1.1.orig/base/utils.c newspost-2.1.1/base/utils.c
  	int c = fgetc(file);
  	buff = buff_free(buff);
  	while(TRUE){
-diff -ur newspost-2.1.1.orig/base/utils.h newspost-2.1.1/base/utils.h
---- newspost-2.1.1.orig/base/utils.h	2003-02-08 17:09:41.000000000 +0200
-+++ newspost-2.1.1/base/utils.h	2009-08-06 14:45:13.000000000 +0300
+--- a/base/utils.h
++++ b/base/utils.h
 @@ -26,7 +26,7 @@
  file_entry * file_entry_alloc();
  file_entry * file_entry_free(file_entry *fe);
@@ -34,9 +31,8 @@ diff -ur newspost-2.1.1.orig/base/utils.h newspost-2.1.1/base/utils.h
  Buff *buff_add(Buff *buff, char *data, ... );
  Buff * buff_free(Buff *buff);
  Buff *buff_create(Buff *buff, char *data, ... );
-diff -ur newspost-2.1.1.orig/ui/options.c newspost-2.1.1/ui/options.c
---- newspost-2.1.1.orig/ui/options.c	2003-04-23 18:33:33.000000000 +0300
-+++ newspost-2.1.1/ui/options.c	2009-08-06 14:46:31.000000000 +0300
+--- a/ui/options.c
++++ b/ui/options.c
 @@ -332,7 +332,7 @@
  		file = fopen(filename->data, "r");
  		if (file != NULL) {
diff --git a/net-nntp/newspost/files/newspost-2.1.1-nntp.patch b/net-nntp/newspost/files/newspost-2.1.1-nntp.patch
index 8779e8f36b47..7482d6203e0e 100644
--- a/net-nntp/newspost/files/newspost-2.1.1-nntp.patch
+++ b/net-nntp/newspost/files/newspost-2.1.1-nntp.patch
@@ -1,5 +1,5 @@
---- newspost-2.1.1.orig/base/nntp.c
-+++ newspost-2.1.1/base/nntp.c
+--- a/base/nntp.c
++++ b/base/nntp.c
 @@ -26,6 +26,10 @@
  *** Public Routines
  **/
@@ -56,8 +56,8 @@
  	}
  	
  	buff = buff_add(buff, "From: %s\r\n", data->from->data);
---- newspost-2.1.1.orig/base/utils.c
-+++ newspost-2.1.1/base/utils.c
+--- a/base/utils.c
++++ b/base/utils.c
 @@ -44,7 +44,7 @@
  }
  
diff --git a/net-nntp/newspost/newspost-2.1.1-r3.ebuild b/net-nntp/newspost/newspost-2.1.1-r3.ebuild
index 20161ec62506..b0633bc47a2a 100644
--- a/net-nntp/newspost/newspost-2.1.1-r3.ebuild
+++ b/net-nntp/newspost/newspost-2.1.1-r3.ebuild
@@ -1,9 +1,9 @@
-# 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 usenet binary autoposter for unix"
 HOMEPAGE="http://newspost.unixcab.org/"
@@ -12,13 +12,16 @@ SRC_URI="http://newspost.unixcab.org/download/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
 
-src_prepare() {
+PATCHES=(
 	# Should fix some problems with unexpected server replies, cf. bug 185468
-	epatch "${FILESDIR}"/${P}-nntp.patch
-	epatch "${FILESDIR}"/CAN-2005-0101.patch
-	epatch "${FILESDIR}"/${P}-glibc-2.10.patch
+	"${FILESDIR}"/${P}-nntp.patch
+	"${FILESDIR}"/CAN-2005-0101.patch
+	"${FILESDIR}"/${P}-glibc-2.10.patch
+)
+
+src_prepare() {
+	default
 
 	sed -e "/-strip newspost/d" -i Makefile || die
 }