gentoo resync : 25.11.2020

6 files changed, 59 insertions, 76 deletions

diff --git a/dev-libs/ustr/Manifest b/dev-libs/ustr/Manifest
index 4facc13f4667..a1f53206589d 100644
--- a/dev-libs/ustr/Manifest
+++ b/dev-libs/ustr/Manifest
@@ -1,7 +1,7 @@
 AUX ustr-1.0.4-build-libs.patch 2058 BLAKE2B 93162c8a35b892dd55a5334bbbfc718be959d597f969fdf1a712b49e490d04510268dad927ecdd2c9333eeb39c9091240887bb59b9b69a7e6e7887654c4676dc SHA512 122c38e4779526ae821341b10757454b28c35d59d99aee919d23f691fc06b019983467c5bdd0b8ca8d3e939e357e9bb588f61d4dd2ebb33235d720d637f20f86
 AUX ustr-1.0.4-gcc_5-check.patch 1087 BLAKE2B bd0414477fa789f5f6c3ef5292bd5b58f7fa8c396a739752c3fc5c4e8b456912273c5ab5fce6cc4a71830c003ac5c8e43d371177f2ed07abe3e614cff8bffb69 SHA512 b669a40929cf45cb83aa5c738cb58676cc9c08ee6c84dd7c79352c6aaa7aa36526a0878e98d78b45cfe3c7f62e9b014fe9eaf01fb1b4b460658cfcb1e77d7dab
+AUX ustr-1.0.4-inline-check.patch 1098 BLAKE2B d51410975458329f1587f747d03cfec52e212e8b22e20f159db254007fb2b29b30c335e3912443797c1c03132e7d4dc584b6d66962cb8982e3782b326c9af46d SHA512 08559671006e20f8cfb10e85738e420529822ec916acca29ab14f3f0ab77805b102ae5a60779f09978e334c167550a62eb960853d5821e308c056b4fec93117e
 DIST ustr-1.0.4.tar.bz2 233723 BLAKE2B 47fd489cadda1487eb131b9a21148d4b21ad46320f5177a0f3c2b2e156a5756918e269053363d47608661a47d8969b8c505192edea316edbd9fc17649d8dbc91 SHA512 b7df6ca3a9f25ee6f5c9ab4325732d348de27c5e02ebff36a7d5706f56b2df994df35bd652825a28e27bbde731c6a5933248d99c670d192b1952e7534eec1510
-EBUILD ustr-1.0.4-r5.ebuild 1255 BLAKE2B 8920416abdc8636b05b95573dba65bc88f7fc22d30c6deac8b3916a7f2fc59be42e0d437a8c81ba8af393a645d3ea6a01d7f060f1025a1aeede3c64fd60f1aaf SHA512 5275fb21937faafd1c03a4fddb9c568ba44d8db15ff6faa56293f0a38df42ba9412c444bef4da57700a76c6992592addb4ec1e87a8bbfa71476bc5bd9202faeb
-EBUILD ustr-1.0.4-r7.ebuild 1780 BLAKE2B 1ca34aca9a83d64f43729eb1c1eb5f85e640dd861d71c0b83e771067cfea7c39e2885fdb802b67a31618c00e7835baa6cb3ec21c8820b3909591a55b239f15d1 SHA512 68ae97b187d6a67e4ac54f0493f1e957d26a4fda38214c4ad34b1111b8936d09a953911d03ce058e8877133a1206195a4506c92bcb89d61ce7c7f3097d764ec6
-EBUILD ustr-1.0.4-r8.ebuild 2058 BLAKE2B 9e59a44c3468d4ca5da7bcf1bfc7dfaf8c4e4ddadd71a4a2a1fb527a2ab24b4d1e74cab0ecf8c08404c417ea66d86e7b345553150797063eea0748a7b1169eae SHA512 42d520b0307873fb899eb237a66c8f04a126cd067b501ac948b22743b80808272e84b7a9c6d04c0979d0032b02efb0326a999c85609e971e41a052392992dfe6
-MISC metadata.xml 280 BLAKE2B c3bf7b208a56dbbb5d3b3ed817937c68bad2240cf61761e138b678efbc019278b31f04d88b5950aa52847801ab1329bc0e81ece1bf25436dda6ba642f5f287cb SHA512 805e06bcd26f04facdcf6275f33d38b5981f25f0120fcb117a5c0e98e50a756bca0e258046bfbe76da17e5ec3f6d29fad0dade7d07b729a1874544a45a3a7406
+EBUILD ustr-1.0.4-r8.ebuild 2031 BLAKE2B 7580c709ff228617d1c44b8e576f60bd6d4227ae0a6b21cd261fa1d6a0c8f0d12eeb803b75620e6818bccaff5d1bee02b413cd22bb14609e656b0e731180cf8f SHA512 ca71a44e6e3ddd25a077712966aa711a83f27d3be129d2243a84bb4788e55dea94d100be948258ba5098ad239a4f5ed437c3df96235c1ecb92362a8a5a0e27a0
+EBUILD ustr-1.0.4-r9.ebuild 2039 BLAKE2B 1e24b6bd04be4535078479c7768b5c9434bed53d05f2711d0444a899262c53f35df90d5f155a5356e4461d570febc76e5cac244248327483c9679f0179997f89 SHA512 e58e53e73b4a8024a1531c19f13d919acf81d9714e60f7093a2b65c9ff1a857cabbe4ddd9c0854dc4d4e8acac7367630aa6082c1adb5573896c7c3f435849c9c
+MISC metadata.xml 479 BLAKE2B 4d19665a6413f27085ed035e5cd7fef83bae1d56dd2368079ec3166dd2a7e324ec1970aae754cec809014b5248fdc58053aff6277f3ae804d6f1e3300370984f SHA512 bf3530e0e77ddeaf0c97d4290d0f0a6101ceebfc41bc6df8758ed47938f2c791359ff723964bb8159e76fac6fb6ca64f1dee18a2e7fe445bbf59571a71d5bd3b
diff --git a/dev-libs/ustr/files/ustr-1.0.4-inline-check.patch b/dev-libs/ustr/files/ustr-1.0.4-inline-check.patch
new file mode 100644
index 000000000000..b38cf7829c9f
--- /dev/null
+++ b/dev-libs/ustr/files/ustr-1.0.4-inline-check.patch
@@ -0,0 +1,27 @@
+--- a/ustr-conf.h.in	2007-10-22 08:00:55.000000000 +0200
++++ b/ustr-conf.h.in	2015-09-10 12:24:34.998796842 +0200
+@@ -4,13 +4,23 @@
+ /* this is the custom version for the library itself, for everyone else
+  * ustr-import generates one depending on the options. */
+ 
++/* Ustr relies on GCC's traditional handling of inline functions, not
++ * the version that was actually standardized in C99. GCC-compatible
++ * compilers define __GNUC_STDC_INLINE__ when using the standard
++ * behavior. When this is set we must restore the old inline behavior:
++ */
++#if defined(__GNUC__) \
++ && defined(__GNUC_STDC_INLINE__)
++#  define inline inline __attribute__ ((gnu_inline))
++#endif
++
+ /* The default is now to link against libc. */
+ #ifndef USTR_CONF_INCLUDE_CODEONLY_HEADERS
+ #define USTR_CONF_INCLUDE_CODEONLY_HEADERS 0
+ #endif
+ 
+ /* We can't: if defined(__GLIBC__) && (!defined(_GNU_SOURCE) || !_GNU_SOURCE)
+- *  because by the time we've included a libc header it's too late. */ 
++ *  because by the time we've included a libc header it's too late. */
+ #ifndef _GNU_SOURCE
+ #define _GNU_SOURCE 1
+ #endif
diff --git a/dev-libs/ustr/metadata.xml b/dev-libs/ustr/metadata.xml
index 0fb02e2df52a..97b72ca3a65d 100644
--- a/dev-libs/ustr/metadata.xml
+++ b/dev-libs/ustr/metadata.xml
@@ -1,7 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>sven.eden@prydeworx.com</email>
+		<name>Sven Eden</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 <use>
 	<flag name="ustr-import">Install ustr-import developer program and source code for bundling.</flag>
 </use>
diff --git a/dev-libs/ustr/ustr-1.0.4-r5.ebuild b/dev-libs/ustr/ustr-1.0.4-r5.ebuild
deleted file mode 100644
index dc3c5bb1983d..000000000000
--- a/dev-libs/ustr/ustr-1.0.4-r5.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit toolchain-funcs multilib-minimal
-
-DESCRIPTION="Low-overhead managed string library for C"
-HOMEPAGE="http://www.and.org/ustr/"
-SRC_URI="ftp://ftp.and.org/pub/james/ustr/${PV}/${P}.tar.bz2"
-
-LICENSE="|| ( BSD-2 MIT LGPL-2 )"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~mips x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-DOCS=(ChangeLog README README-DEVELOPERS AUTHORS NEWS TODO)
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/ustr-conf.h
-	/usr/include/ustr-conf-debug.h
-)
-
-src_prepare() {
-	multilib_copy_sources
-}
-
-multilib_src_compile() {
-	emake \
-		AR="$(tc-getAR)" \
-		CC="$(tc-getCC)" \
-		CFLAGS="${CFLAGS}" \
-		LDFLAGS="${LDFLAGS}" \
-		prefix="${EPREFIX}/usr" \
-		SHRDIR="/usr/share/${P}" \
-		HIDE= \
-		all-shared
-}
-
-multilib_src_install() {
-	emake \
-		DESTDIR="${D}" \
-		prefix="${EPREFIX}/usr" \
-		libdir="${EPREFIX}/usr/$(get_libdir)" \
-		mandir="/usr/share/man" \
-		SHRDIR="/usr/share/${P}" \
-		DOCSHRDIR="/usr/share/doc/${PF}" \
-		HIDE= \
-		install
-}
-
-multilib_src_test() {
-	emake \
-		AR="$(tc-getAR)" \
-		CC="$(tc-getCC)" \
-		CFLAGS="${CFLAGS}" \
-		LDFLAGS="${LDFLAGS}" \
-		prefix="${EPREFIX}/usr" \
-		SHRDIR="/usr/share/${P}" \
-		HIDE= \
-		check
-}
diff --git a/dev-libs/ustr/ustr-1.0.4-r8.ebuild b/dev-libs/ustr/ustr-1.0.4-r8.ebuild
index 6fb52670f3b5..e625d492455c 100644
--- a/dev-libs/ustr/ustr-1.0.4-r8.ebuild
+++ b/dev-libs/ustr/ustr-1.0.4-r8.ebuild
@@ -12,7 +12,7 @@ SRC_URI="ftp://ftp.and.org/pub/james/ustr/${PV}/${P}.tar.bz2"
 LICENSE="|| ( BSD-2 MIT LGPL-2 )"
 SLOT="0"
 KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
-IUSE="static-libs ustr-import"
+IUSE="ustr-import"
 
 DOCS=(ChangeLog README README-DEVELOPERS AUTHORS NEWS TODO)
 
@@ -29,7 +29,7 @@ src_prepare() {
 
 _emake() {
 	emake \
-		USE_STATIC=$(usex static-libs) \
+		USE_STATIC="no" \
 		AR="$(tc-getAR)" \
 		CC="$(tc-getCC)" \
 		CFLAGS="${CFLAGS} ${CPPFLAGS}" \
diff --git a/dev-libs/ustr/ustr-1.0.4-r7.ebuild b/dev-libs/ustr/ustr-1.0.4-r9.ebuild
index 0d4f3ece9d89..184372af56b2 100644
--- a/dev-libs/ustr/ustr-1.0.4-r7.ebuild
+++ b/dev-libs/ustr/ustr-1.0.4-r9.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 inherit toolchain-funcs multilib-minimal
 
@@ -11,7 +11,8 @@ SRC_URI="ftp://ftp.and.org/pub/james/ustr/${PV}/${P}.tar.bz2"
 
 LICENSE="|| ( BSD-2 MIT LGPL-2 )"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+IUSE="ustr-import"
 
 DOCS=(ChangeLog README README-DEVELOPERS AUTHORS NEWS TODO)
 
@@ -20,13 +21,19 @@ MULTILIB_WRAPPED_HEADERS=(
 	/usr/include/ustr-conf-debug.h
 )
 
+PATCHES=(
+	"${FILESDIR}/${P}-inline-check.patch"
+	"${FILESDIR}/${PN}-1.0.4-build-libs.patch"
+)
+
 src_prepare() {
-	epatch "${FILESDIR}/${P}-gcc_5-check.patch"
+	default
 	multilib_copy_sources
 }
 
 _emake() {
 	emake \
+		USE_STATIC="no" \
 		AR="$(tc-getAR)" \
 		CC="$(tc-getCC)" \
 		CFLAGS="${CFLAGS} ${CPPFLAGS}" \
@@ -66,6 +73,13 @@ multilib_src_compile() {
 
 multilib_src_install() {
 	_emake DESTDIR="${D}" install
+
+	if ! use ustr-import ; then
+		rm -r \
+			"${ED}/usr/bin/ustr-import" \
+			"${ED}/usr/share/man/man1/ustr-import.1" \
+			"${ED}/usr/share/${P}" || die
+	fi
 }
 
 multilib_src_test() {