gentoo resync : 28.04.2021

5 files changed, 65 insertions, 20 deletions

diff --git a/app-text/bogosort/Manifest b/app-text/bogosort/Manifest
index 0201c0572d8d..4aed3b7f9f75 100644
--- a/app-text/bogosort/Manifest
+++ b/app-text/bogosort/Manifest
@@ -1,5 +1,6 @@
-AUX bogosort-0.4.2-glibc-2.10.patch 1479 BLAKE2B 6d5a6e9ff7f43a5275e8db8d1478a06ab69863105ffdfb3ed821bdbb7b901f2b0ed9b9158ee0795ca4e1dc01b01c5a3fdaedf5bd4996d3d9bc5ec4a89492e6eb SHA512 742b473df18b8eee876857fc3fa14bacc95bce4e14d083deb066d4451385437cd040cf40b6c572762c047b1aaa3e2ee973f2d880c5915993bf6a4ba130a776e4
-AUX xmalloc.patch 395 BLAKE2B 0ec83824e8ac740512c3c241cf2df352ca5b5d05a38507288fe5f96512eebb94d5532af0cfb6e05fcfcac9c10c96091584b917966629268e9921d964e8adb0c5 SHA512 c1479f342d71e1c53a2b038bc7bf858292c6585b8360b41c6006a4ef0efbafc3260cf8523efedee945c084247851186dda3450ab0533465c33176b038a8c0243
+AUX bogosort-0.4.2-glibc-2.10.patch 1141 BLAKE2B f920abc08b250297c3569cab2c6bb1d8f5f1ff29ae352ba1664fd576bb6929c08c447062e4a2577e82f74c26bf7ae70724ab2bf9e0b600c2bebf36aa9d6c32e6 SHA512 4eecb3ce4463054ae0fe83a909951abb5db27d1b9adcec4d9206a07166c324fb568fe894930f7eed12e7f85c543df3ae36e13a4df301950654c801d268007e41
+AUX bogosort-0.4.2-implicit-decl.patch 786 BLAKE2B cf35c37e2d79e71f56bb0aef7ae6cba8340c4da8eb0cff9e78322e85a8fadb5132c448866cd1aef822c8fbe8fb68c91ef51a7f900da68158fe19aa454603157e SHA512 ec07bea1762cafd6f50706a5a22277305c6e5d856488dd6b9c50dc3e07876329229dd3d16e0de31e8b82f2a3da58cc3f02fea226328351b591c6628670a00eaa
+AUX xmalloc.patch 322 BLAKE2B 577c24ee19016f67f7c7e4510b60c8bdcbfcbb340f34def3efc1d3100f5f4e65dad74f16a6c1052b5c21b3341ba1967b97c95c7dcc56398160884608fb66cca8 SHA512 7a600c173db0502b42163474d75a50b1af539a55d704b000f7c9189af563569db8026499f082e02fe935a6b5fec7dd4a1c40cb2f224c8e96b7b0286ddb798191
 DIST bogosort-0.4.2.tar.gz 161628 BLAKE2B 92abbb809747e3fdfd2a6e33f7f753f1ddccd4ecd9883f0a02fc843f8f680e0a5e6e6b65c3943708ed074a944e5187bb889297365ae0dd34292215b056bd46fc SHA512 2d2f7be36ec08aa78323cbdc5f1030297706c364d6fc82554065cf737295d11c90dd6061323f2732b63c70401d710b2018075bff6d1e6ab0078069b405ea62e9
-EBUILD bogosort-0.4.2-r1.ebuild 689 BLAKE2B 2d8ccfe27f2dad5b91e6efb908e232f7b2aa08570442c1fffecbfe74669cbaf2bb0bf9bd7a9020a0507b6bec506bb327e958020a4e58f2e29e1e099b8e43fb50 SHA512 3e62d6ad521595f78f41d99561668e87f9bbeac80363c7472fca13353b9106ef70c7246d62081ae8f99606c7eda547f28ee454c4e373e41ce38216a3f7e504d7
+EBUILD bogosort-0.4.2-r1.ebuild 835 BLAKE2B 8ae3edd69ecd40f9d3d4b1dee28198d31ee56b7402bae2d8c7fa0fc89be96ad72e51107738edd313f59dd257e2bac649878db8058f3a4bc66ee1c5bd8a6baadd SHA512 ae6fc5959696aa2f3102799592c33035ccb7152d92de7b9ae8836bda327ba4d05c5323fca7a5b191b9fe6861047471c6f72ca4424309270d922175c96b94bcac
 MISC metadata.xml 500 BLAKE2B aeef2d2944fbcde35a34db35b8461e3fb22d5da60e0e6fee48cecbcd45991d44aa4511e0907587369c2a7c7bf2c735260ed516b5b9292e1fb60bd7a2e9c3859d SHA512 4975f3dcbf7a97db8c64835a83f45a0be5d3c34aaa9fe9f8b2e2e8bd5aaf102fe35a2f4dc609bbcd115ad08d86707818033c7b7759c17a3f233417af67604edb
diff --git a/app-text/bogosort/bogosort-0.4.2-r1.ebuild b/app-text/bogosort/bogosort-0.4.2-r1.ebuild
index c8b07c12cae0..a8a12ad1ae77 100644
--- a/app-text/bogosort/bogosort-0.4.2-r1.ebuild
+++ b/app-text/bogosort/bogosort-0.4.2-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# 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 autotools toolchain-funcs
 
 DESCRIPTION="A file sorting program which uses the bogosort algorithm"
 HOMEPAGE="http://www.lysator.liu.se/~qha/bogosort/"
@@ -12,15 +12,23 @@ SRC_URI="ftp://ulrik.haugen.se/pub/unix/bogosort/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~hppa ~mips ppc sparc x86 ~x86-linux ~ppc-macos"
-IUSE=""
 
-DEPEND=""
-RDEPEND=""
+PATCHES=(
+	"${FILESDIR}"/xmalloc.patch
+	"${FILESDIR}"/${P}-glibc-2.10.patch
+	"${FILESDIR}"/${PN}-0.4.2-implicit-decl.patch
+)
 
 src_prepare() {
-	epatch \
-		"${FILESDIR}"/xmalloc.patch \
-		"${FILESDIR}"/${P}-glibc-2.10.patch
+	default
+
+	mv configure.{in,ac} || die
+
+	sed -i \
+		-e 's:-O0::' \
+		-e '/maintainer-targets/d' \
+		Makefile.am || die
+	eautoreconf
 }
 
 src_configure() {
diff --git a/app-text/bogosort/files/bogosort-0.4.2-glibc-2.10.patch b/app-text/bogosort/files/bogosort-0.4.2-glibc-2.10.patch
index ac54c8b61b05..98a9eceb1377 100644
--- a/app-text/bogosort/files/bogosort-0.4.2-glibc-2.10.patch
+++ b/app-text/bogosort/files/bogosort-0.4.2-glibc-2.10.patch
@@ -1,6 +1,5 @@
-diff -ur bogosort-0.4.2.orig/getlines.c bogosort-0.4.2/getlines.c
---- bogosort-0.4.2.orig/getlines.c	2002-05-04 23:22:22.000000000 +0300
-+++ bogosort-0.4.2/getlines.c	2009-08-06 14:32:22.000000000 +0300
+--- a/getlines.c
++++ b/getlines.c
 @@ -49,7 +49,7 @@
      char **ss = NULL;
  
@@ -28,9 +27,8 @@ diff -ur bogosort-0.4.2.orig/getlines.c bogosort-0.4.2/getlines.c
  {
      int c, numchars = 0, allocated = 0;
      char *s = NULL;
-diff -ur bogosort-0.4.2.orig/getlines.h bogosort-0.4.2/getlines.h
---- bogosort-0.4.2.orig/getlines.h	2002-03-16 00:04:38.000000000 +0200
-+++ bogosort-0.4.2/getlines.h	2009-08-06 14:32:48.000000000 +0300
+--- a/getlines.h
++++ b/getlines.h
 @@ -39,6 +39,6 @@
   * getline: return a pointer to a newly allocated string containing the next
   * line in stream
diff --git a/app-text/bogosort/files/bogosort-0.4.2-implicit-decl.patch b/app-text/bogosort/files/bogosort-0.4.2-implicit-decl.patch
new file mode 100644
index 000000000000..2eefc4099fa4
--- /dev/null
+++ b/app-text/bogosort/files/bogosort-0.4.2-implicit-decl.patch
@@ -0,0 +1,38 @@
+diff --git a/xmalloc.c b/xmalloc.c
+index a2c7689..dd00346 100644
+--- a/xmalloc.c
++++ b/xmalloc.c
+@@ -29,6 +29,7 @@
+ 
+ #if STDC_HEADERS
+ # include <stdlib.h>
++# include <string.h>
+ #else
+ VOID *calloc ();
+ VOID *malloc ();
+diff --git a/system.h b/system.h
+index 993dd36..b9fee80 100644
+--- a/system.h
++++ b/system.h
+@@ -159,20 +159,7 @@ struct utimbuf
+ 
+ /* Don't use bcopy!  Use memmove if source and destination may overlap,
+    memcpy otherwise.  */
+-
+-#ifdef HAVE_STRING_H
+-# if !STDC_HEADERS && HAVE_MEMORY_H
+-#  include <memory.h>
+-# endif
+-# include <string.h>
+-#else
+-# ifndef HAVE_STRCHR
+-#  define strchr index
+-#  define strrchr rindex
+-# endif /* HAVE_STRCHR */
+-char *strchr(), *strrchr();
+-char *memchr ();
+-#endif
++#include <string.h>
+ 
+ #include <errno.h>
+ #ifndef errno
diff --git a/app-text/bogosort/files/xmalloc.patch b/app-text/bogosort/files/xmalloc.patch
index 41545ca34ba8..ed137e83727c 100644
--- a/app-text/bogosort/files/xmalloc.patch
+++ b/app-text/bogosort/files/xmalloc.patch
@@ -1,5 +1,5 @@
---- xmalloc.c.orig	2004-12-15 23:44:16.880786468 +0100
-+++ xmalloc.c	2004-12-15 23:44:21.846546805 +0100
+--- a/xmalloc.c
++++ b/xmalloc.c
 @@ -68,12 +68,6 @@
     The caller may set it to some other value.  */
  int xmalloc_exit_failure = EXIT_FAILURE;