gentoo resync : 05.12.2021

3 files changed, 141 insertions, 11 deletions

diff --git a/dev-util/bbe/Manifest b/dev-util/bbe/Manifest
index 0594f3dcdf10..e42b03d7d4b3 100644
--- a/dev-util/bbe/Manifest
+++ b/dev-util/bbe/Manifest
@@ -1,3 +1,4 @@
+AUX bbe-0.2.2-inline.patch 2825 BLAKE2B f3e72d6e1565a5a3f2d99ed0bfb5e60c2f93ac6a858a78a6e843811e3d3687ee41b93701954e7aa7269e28c3931ef6b8c019ac9c181711993de9e088078a0dc0 SHA512 ced6d61c9e070f81b29176b9b98c56bec4077adfd2c99a9c73f4e4995af6ea0aa7d0243a4658e8c62ea9d9b0338a39428ff1fc0c38fa6a3c95c03242d13b3bda
 DIST bbe-0.2.2.tar.gz 211590 BLAKE2B 47eb57d07419342377b9e21f15db6619e2c94ed835c059d50992a8166fa4020c87586cd4085f5cefe044794494b359aa4db5b2a400d638a93e75d9192397133d SHA512 6ac31aa005f18cbfd3fbacfe86b3d81ee61a027764296f574c4180da6ccc23dbf716a835fb013730d30c09c045197a70e28584303f3521afab0e5c63d0cf693f
-EBUILD bbe-0.2.2-r1.ebuild 570 BLAKE2B 8a1eb92c7acba979298709f60621360ddf033f9acd04311b7f97b75e01ec08fcf2690c1bfc723c1864460571df085090630a9ae5f16b19346ac25f2af0399efb SHA512 9d5abcf2dc2209caeb94afdaeb3b70ca6d8aaf9acd3076638b372c5a841d5e0acf3e2b475f9a5edf95c92f79f62e5444c346986767c99496af145c0effda0f1e
+EBUILD bbe-0.2.2-r1.ebuild 504 BLAKE2B 1be7fa94e73c902549a6f6c49491965f864df8c8556630fd885771e57ad9077c6506d5598d4a553bfd29597244097dade774c95852fd4f58edcf5ba2a99f0f5b SHA512 94d77a0b07412a7030f7cef64a051bda640ab220bad1ae4da5ba6bc7d4a90b735be6dd6dc7a2be11b71cd00cfb1f50611ff4e908afb8e66f883fe27101f47849
 MISC metadata.xml 324 BLAKE2B afbcfb2597d970aefaaf670e5ab652473a0767439a4fd69e0cb13f15664e5592d514cc0a6ef4296b79ce491a42de8020167b690640731702bc7a455c96cd3298 SHA512 1976297fb1fe046a58fc16c6b6ce92917b13861ba6dffd8428849797c8ce6e525042f982c78da41166060089faf3aa280b7395b7f989296b0390324b4d8e5725
diff --git a/dev-util/bbe/bbe-0.2.2-r1.ebuild b/dev-util/bbe/bbe-0.2.2-r1.ebuild
index 63a113fdda81..fe27af9582f8 100644
--- a/dev-util/bbe/bbe-0.2.2-r1.ebuild
+++ b/dev-util/bbe/bbe-0.2.2-r1.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=7
 
-inherit autotools flag-o-matic
+inherit autotools
 
 DESCRIPTION="Sed-like editor for binary files"
 HOMEPAGE="https://sourceforge.net/projects/bbe-/"
@@ -14,17 +14,13 @@ SLOT="0"
 KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
+PATCHES=(
+	"${FILESDIR}"/bbe-0.2.2-inline.patch
+)
+
 src_prepare() {
 	default
 
 	sed -i -e '/^htmldir/d' doc/Makefile.am || die
-	eaclocal
 	eautoreconf
 }
-
-src_configure() {
-	# Avoid linking problems, bug #750545.
-	replace-flags -Os -O2
-
-	default
-}
diff --git a/dev-util/bbe/files/bbe-0.2.2-inline.patch b/dev-util/bbe/files/bbe-0.2.2-inline.patch
new file mode 100644
index 000000000000..4429e01ed483
--- /dev/null
+++ b/dev-util/bbe/files/bbe-0.2.2-inline.patch
@@ -0,0 +1,133 @@
+Let's not bother trying to inline these -- the compiler is smart enough
+to do it if it wants to. They're not defined correctly right now if
+we wanted to keep them inline and this is far simpler.
+--- a/src/bbe.h
++++ b/src/bbe.h
+@@ -167,10 +167,10 @@ set_input_file(char *file);
+ extern void
+ init_buffer();
+ 
+-extern inline unsigned char  
++extern unsigned char
+ read_byte();
+ 
+-extern inline int 
++extern int
+ get_next_byte();
+ 
+ extern void
+@@ -179,16 +179,16 @@ mark_block_end();
+ extern int
+ find_block();
+ 
+-extern inline int
++extern int
+ last_byte();
+ 
+ extern void
+ write_buffer(unsigned char *buf,off_t length);
+ 
+-extern inline void
++extern void
+ put_byte(unsigned char byte);
+ 
+-extern inline void
++extern void
+ write_next_byte();
+  
+ extern void
+@@ -215,10 +215,10 @@ write_string(char *string);
+ extern char *
+ get_current_file(void);
+ 
+-extern inline unsigned char *
++extern unsigned char *
+ read_pos();
+ 
+-extern inline unsigned char *
++extern unsigned char *
+ block_end_pos();
+ 
+ extern char *
+--- a/src/buffer.c
++++ b/src/buffer.c
+@@ -191,21 +191,21 @@ read_input_stream()
+ }
+ 
+ /* reads byte from the buffer */
+-inline unsigned char  
++unsigned char
+ read_byte()
+ {
+     return *in_buffer.read_pos;
+ }
+ 
+ /* returns pointer to the read position */
+-inline unsigned char *
++unsigned char *
+ read_pos()
+ {
+     return in_buffer.read_pos;
+ }
+ 
+ /* return the block end pointer */
+-inline unsigned char *
++unsigned char *
+ block_end_pos()
+ {
+     return in_buffer.block_end;
+@@ -214,7 +214,7 @@ block_end_pos()
+ /* advances the read pointer, if buffer has reached low water, get more from stream to buffer */
+ /* returns false in case of end of stream */
+ 
+-inline int 
++int
+ get_next_byte()
+ {
+     if(in_buffer.read_pos >= in_buffer.low_pos) 
+@@ -335,14 +335,14 @@ mark_block_end()
+ }
+ 
+ /* returns true if current byte is last in block */
+-inline int
++int
+ last_byte()
+ {
+     return in_buffer.block_end == in_buffer.read_pos;
+ }
+ 
+ /* returns true if end of stream has been reached */
+-inline int
++int
+ end_of_stream()
+ {
+     if(in_buffer.stream_end != NULL && in_buffer.stream_end == in_buffer.read_pos) 
+@@ -487,7 +487,7 @@ write_buffer(unsigned char *buf,off_t length)
+ }
+ 
+ /* put_byte, put one byte att current write position */
+-inline void
++void
+ put_byte(unsigned char byte)
+ {
+     *out_buffer.write_pos = byte;
+@@ -495,7 +495,7 @@ put_byte(unsigned char byte)
+ 
+ /* next_byte, advance the write pointer by one */
+ /* if buffer full write it to disk */
+-inline void
++void
+ write_next_byte()
+ {
+     out_buffer.write_pos++;
+--- a/src/execute.c
++++ b/src/execute.c
+@@ -677,7 +677,7 @@ close_commands(struct commands *commands)
+ }
+ 
+ /* reset the rpos counter for next block, in case block was shorter eg. delete count */
+-inline void
++void
+ reset_rpos(struct command_list *c)
+ {
+     while(c != NULL)