gentoo resync : 24.09.2020

5 files changed, 47 insertions, 86 deletions

diff --git a/dev-libs/libbytesize/Manifest b/dev-libs/libbytesize/Manifest
index 2dd5cf08e251..9c9ec3d26b46 100644
--- a/dev-libs/libbytesize/Manifest
+++ b/dev-libs/libbytesize/Manifest
@@ -1,7 +1,6 @@
-DIST libbytesize-2.2.tar.gz 443040 BLAKE2B 04035f99f1da4d2d426106e1f292d71089dae89923d41425fa815a72e375639a7d8b6fc5552a3f08462597ce9c19797c7fce5b79fdad504b9062168093a70a4f SHA512 4538ac3499a24023c21fe07f527e400f99509921e377248970ac2da0eaf1655ddb261f432eed46a59ef69a1275ba7d1e5b0cc488d64eeea936b6cfa54c552ac1
+AUX libbytesize-2.4-no_Werror.patch 827 BLAKE2B a9192908e7ec0bad0cd4d1f853fd6f48a17977380d6f2e6a0c8255058d1e3ebecbfdaff68311f70f8d26291ed0c917dafb8f7d85fd5ad8f097ea929f4a200677 SHA512 6972e86cdc8de7f27b850742c4e0d8c492e354c1a526e103f4f4ec080cc6543db7ad4abd54a9674807521d083eb19fa811e351942330a73591e0a9700e876bd7
 DIST libbytesize-2.3.tar.gz 438198 BLAKE2B 583450b66781bbb16298507292ffe60012ccc296f0822784ead13bcf1ce3f9a9cf7c2341d5f64d3356fb78aefb3e6b0770bce64ebf85aa92d168277d35f9629c SHA512 23720b90f4dbf7880a640ec04e910c4c1f34637dd3621900772187cb2e1d04ec34d4900ce3c9b4083ac462b411d5a409a644f62ed76b2c57ef1f11432c58be8a
 DIST libbytesize-2.4.tar.gz 437416 BLAKE2B 4739b6ce5bf852112a5c662e3b5a29428df4a6b0fdd933293a1352e7f81f7ca3c274ed160ade38a705e9858bd2c37131a7409126d28d12ba0d47b64f88c78e31 SHA512 faa546823c95576516a5f4250ea51b381fe5ff6b9d09fc49346e65278e9be42fffd2566dcc24b4e0045cee15dcaead05c1fd1f5f51048c87c382298f7340e1d6
-EBUILD libbytesize-2.2.ebuild 1464 BLAKE2B 33d4475e703efef58b8039e29dc5c38fef87b2256a1ed84706ca3169188e67d0dbc4f9a9cb1a75ebd53352c240f6b8fffc98273658629436f2511f7c7599fe3c SHA512 a1f95c286915b32198816aaef5a25ff45356d3337a3b58a807b84d1e8128c3faf1acb1ea64096193e770eb54a6af5772facb91101f8a3f883e77f408ca6674ac
-EBUILD libbytesize-2.3.ebuild 1464 BLAKE2B 33d4475e703efef58b8039e29dc5c38fef87b2256a1ed84706ca3169188e67d0dbc4f9a9cb1a75ebd53352c240f6b8fffc98273658629436f2511f7c7599fe3c SHA512 a1f95c286915b32198816aaef5a25ff45356d3337a3b58a807b84d1e8128c3faf1acb1ea64096193e770eb54a6af5772facb91101f8a3f883e77f408ca6674ac
-EBUILD libbytesize-2.4.ebuild 1471 BLAKE2B c0842eec1dda3bb554f49f372f6063bf632a0c49ef25e75d347ba84b652ee8f7ff8d583ed5e9b8f5e44a207c7f2e19cfd858fecea832f3206136a15f2d8adfff SHA512 34f5bb741c18768a015b9c2eeb33d534ff62b88ba6cc60dc70fc6924e6693a181f02bfd6c11a2a60e4aff407fc1d4f395a83b34ab417600bf4570ef3d907710e
+EBUILD libbytesize-2.3.ebuild 1569 BLAKE2B b47bf41e4849cbe3894264344a21e1dc26b8b895c5afaeb4100319fd20f72c8d0b64f6e6d5ffe3fb2f7960fa8a398a52594ff98b066b8a97bb6f0604076c6832 SHA512 cd369a74b43f72fd57642c0ad9320b462c13cd9e3b28686906506a1a485dc8002c75b3c233bd3ea16718f5bcacdd179ce16db9e4104e2793e7ce66f88cfbb559
+EBUILD libbytesize-2.4.ebuild 1576 BLAKE2B 1549f79a999f725e5e0ef5d70d57122dced3973c69bdfa2848fc9dfb18832a5bd39f888bb99e6b5e3f0470a6f5f885e62c2690defa3860322f947bbb3a2f4b04 SHA512 8549381560a5c5bd7b9d7d443c8a0064fa9fc8a368114246cc85303752e954e9a1010312e1bd0d7f40439e61616f8ffe4958c37d1cb64b536ae0af576d33c7b0
 MISC metadata.xml 425 BLAKE2B 445bf1e0d46e04c766c4c81c90f9acb8e8f3c1c3eeb567c3101400139a7b2ab830efcf737e30332af5dd0e50d46bdf9f583cccbfb2e50186cbb6d3f5a396f0df SHA512 24b8980240c3513229ea2e181c64b7f89597be9cd121459ad62bce935fd52a7bbc0ee4871e15899b69b477fdbaf0850d55821a6fbcf3afc30d0cb81a3eb83b65
diff --git a/dev-libs/libbytesize/files/libbytesize-2.4-no_Werror.patch b/dev-libs/libbytesize/files/libbytesize-2.4-no_Werror.patch
new file mode 100644
index 000000000000..827bebe3ec93
--- /dev/null
+++ b/dev-libs/libbytesize/files/libbytesize-2.4-no_Werror.patch
@@ -0,0 +1,24 @@
+https://bugs.gentoo.org/744286
+
+--- libbytesize-2.4/configure.ac
++++ libbytesize-2.4/configure.ac
+@@ -6,7 +6,7 @@
+ # This needs to be set before initializing automake
+ AC_DISABLE_STATIC
+ 
+-AM_INIT_AUTOMAKE([foreign -Wall -Werror -Wno-syntax -Wno-portability])
++AM_INIT_AUTOMAKE([foreign -Wall -Wno-syntax -Wno-portability])
+ AC_CONFIG_MACRO_DIR([m4])
+ 
+ # Check for the gettext programs
+--- libbytesize-2.4/src/Makefile.am
++++ libbytesize-2.4/src/Makefile.am
+@@ -2,7 +2,7 @@
+ LDADD = $(LIBINTL)
+ 
+ lib_LTLIBRARIES = libbytesize.la
+-libbytesize_la_CFLAGS = -Wall -Wextra -Werror -Wno-overflow -D_GNU_SOURCE
++libbytesize_la_CFLAGS = -Wall -Wextra -Wno-overflow -D_GNU_SOURCE
+ libbytesize_la_LIBADD = -lgmp -lmpfr $(PCRE2_LIBS)
+ libbytesize_la_LDFLAGS = -version-info 1:0:0
+ libbytesize_la_SOURCES = bs_size.c bs_size.h gettext.h
diff --git a/dev-libs/libbytesize/libbytesize-2.2.ebuild b/dev-libs/libbytesize/libbytesize-2.2.ebuild
deleted file mode 100644
index bdb2d302c576..000000000000
--- a/dev-libs/libbytesize/libbytesize-2.2.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit python-r1
-
-DESCRIPTION="Tiny library providing a C \"class\" for working with arbitrary big sizes in bytes"
-HOMEPAGE="https://github.com/storaged-project/libbytesize"
-SRC_URI="https://github.com/storaged-project/libbytesize/releases/download/${PV}/${P}.tar.gz"
-LICENSE="LGPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 sparc x86"
-IUSE="doc python test tools"
-
-REQUIRED_USE="
-	python? ( ${PYTHON_REQUIRED_USE} )
-	tools? ( python )
-"
-
-RDEPEND="
-	dev-libs/gmp:0=
-	dev-libs/mpfr:=
-	dev-libs/libpcre2
-	python? ( ${PYTHON_DEPS} )
-"
-
-DEPEND="${RDEPEND}"
-
-BDEPEND="
-	sys-devel/gettext
-	doc? ( dev-util/gtk-doc )
-	test? (
-		dev-python/pocketlint[${PYTHON_USEDEP}]
-		dev-python/polib[${PYTHON_USEDEP}]
-	)
-"
-
-DOCS=( README.md )
-
-RESTRICT="test"
-
-python_do() {
-	if use python; then
-		python_foreach_impl run_in_build_dir "$@"
-	else
-		"$@"
-	fi
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_with doc gtk-doc)
-		$(use_with python python3)
-		$(use_with tools)
-	)
-	local ECONF_SOURCE="${S}"
-	python_do econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	python_do emake
-}
-
-src_test() {
-	python_do emake check
-}
-
-install_helper() {
-	emake DESTDIR="${D}" install
-	use python && python_optimize
-}
-
-src_install() {
-	python_do install_helper
-	einstalldocs
-	find "${ED}" -name "*.la" -type f -delete || die
-}
diff --git a/dev-libs/libbytesize/libbytesize-2.3.ebuild b/dev-libs/libbytesize/libbytesize-2.3.ebuild
index bdb2d302c576..e63686f19435 100644
--- a/dev-libs/libbytesize/libbytesize-2.3.ebuild
+++ b/dev-libs/libbytesize/libbytesize-2.3.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{6,7,8} )
 
-inherit python-r1
+inherit autotools python-r1
 
 DESCRIPTION="Tiny library providing a C \"class\" for working with arbitrary big sizes in bytes"
 HOMEPAGE="https://github.com/storaged-project/libbytesize"
@@ -42,6 +42,10 @@ DOCS=( README.md )
 
 RESTRICT="test"
 
+PATCHES=(
+	"${FILESDIR}/${PN}-2.4-no_Werror.patch"
+)
+
 python_do() {
 	if use python; then
 		python_foreach_impl run_in_build_dir "$@"
@@ -50,6 +54,11 @@ python_do() {
 	fi
 }
 
+src_prepare() {
+	default
+	eautoreconf
+}
+
 src_configure() {
 	local myeconfargs=(
 		$(use_with doc gtk-doc)
diff --git a/dev-libs/libbytesize/libbytesize-2.4.ebuild b/dev-libs/libbytesize/libbytesize-2.4.ebuild
index 0d91bc5f9998..7f18f969f367 100644
--- a/dev-libs/libbytesize/libbytesize-2.4.ebuild
+++ b/dev-libs/libbytesize/libbytesize-2.4.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{6,7,8} )
 
-inherit python-r1
+inherit autotools python-r1
 
 DESCRIPTION="Tiny library providing a C \"class\" for working with arbitrary big sizes in bytes"
 HOMEPAGE="https://github.com/storaged-project/libbytesize"
@@ -42,6 +42,10 @@ DOCS=( README.md )
 
 RESTRICT="test"
 
+PATCHES=(
+	"${FILESDIR}/${PN}-2.4-no_Werror.patch"
+)
+
 python_do() {
 	if use python; then
 		python_foreach_impl run_in_build_dir "$@"
@@ -50,6 +54,11 @@ python_do() {
 	fi
 }
 
+src_prepare() {
+	default
+	eautoreconf
+}
+
 src_configure() {
 	local myeconfargs=(
 		$(use_with doc gtk-doc)