gentoo resync : 16.09.2020

4 files changed, 63 insertions, 12 deletions

diff --git a/app-i18n/uchardet/Manifest b/app-i18n/uchardet/Manifest
index 133b087bef0a..c0acc1736da9 100644
--- a/app-i18n/uchardet/Manifest
+++ b/app-i18n/uchardet/Manifest
@@ -1,5 +1,7 @@
 AUX uchardet-0.0.6-enforce-IEEE-float-precision-r1.patch 2401 BLAKE2B 3f0cf425385d333488c7eeb37c37f3ec6a224e0a96d2c1bbcaded770c8ab6b5bd8277808fbce2bbc960cb3838e0e9de8d889ef9fe2af2e3b44ec4a81031d43f1 SHA512 fb684a362095810bb462609859018dd22987704ab9def0d0ea9ab6afc076fddcf338c622b9f587649d6f561a216b8bc234d3499c499ce3d4589113e908037972
 DIST uchardet-0.0.6.tar.xz 169192 BLAKE2B a0bc80ecd12565c1459b8136e3dc0530250571b5adbe4a7013c561f846f64f58482b9fd9cc5aa7493f20e913f59504a6e08c26571bf33ff34b4823f55d857b8c SHA512 eceeadae060bf277e298d709856609dde32921271140dc1fb0a33c7b6e1381033fc2960d616ebbd82c92815936864d2c0743b1b5ea1b7d4a200df87df80d6de5
+DIST uchardet-0.0.7.tar.xz 215492 BLAKE2B 1f8b171676bc6edf1f3493a4a370e32b7b956104ea0b12a03837d817c386d59aa512c3a107426aedb087987cf3a7b99c4b2df4a667ed685ff9959f6bc6b4506c SHA512 ddb7b63dd09c1d9acbe620d86217e583d9aa5340780ab4010ec9faa4fd331498859d5efa7829bf8847da89325accf8f7304b51d410210178fc1ffa6658064a6f
 EBUILD uchardet-0.0.6-r2.ebuild 854 BLAKE2B cf08d7188aeb89ed3b08956f404bd79392716206a2c8384f31978e0b5b726fc8d3916224bc0420ab2d085927d98629160116830c2a92a75cc8d6ee6dde257727 SHA512 254306625498713aa5406cdd3e2eeadb3a6b944656f806bb82bc5dca807574a68f0129fe2d94414a2ee7c39ab2e57f40d38ae49bd4c69de5a2dfc6b2452b7a6e
-EBUILD uchardet-9999.ebuild 733 BLAKE2B 906374917b288ccca166615ed84e3f98003c7878302c1eeb7914aea6ec20aa708a5e69ef041874ad55628e8a1476d86531a63f15dcc3c87073ff8c457f72336c SHA512 0760ac16abbbee9e3b7bfa666db0d26e7d76bade675dfdd9c35226cfe0da302088451de5b5aaa2b6327fb0106b34c956ea2bde80744e0b90303d9a8c849c13bb
-MISC metadata.xml 273 BLAKE2B 94626860410b060a578f7f9d3b5a398ba7c627e1a30d9e056e6f599e19edab3a3c695645ceee6300e77c88c3a8e28fa2b5840698aa1cc155c9443b2f6480712f SHA512 5d8167272e5a8d0e78b21250c91b5164d101f73eb7431bdbcc06dc7bbf43f5415dfd3ad46c0c995c8a1a06be063095a69c91e06e175d3da950c5104f11f35433
+EBUILD uchardet-0.0.7.ebuild 899 BLAKE2B 8986cc6e306cf85d8bd33944748450783aac0280e5415308dc3c005ebf33df275e37f680942823c244864c9bcffc05cd35b73171ac5f410453fd90d911a73689 SHA512 b802c47645927791f8ea8c64ca544ec7901aa7eec7f3d4067cadc767e7149d9203009ed64c2564f4753a5d54b2d3a31cb04d2f3efe35eda0cc832c389ef4cc95
+EBUILD uchardet-9999.ebuild 838 BLAKE2B 1fa9152117465b5e792942983a98d1a0f69373b34f723d1811d5bc8718cffa6f61f3a808d5e70e5837bd4969eb32a49b744a7e200d7d1760d60a0bdf1b08a6c2 SHA512 2a0a59e862a98c88f1a4186043e3eb6819ea09b5b28fa5ae8ec5edaa2f328ced05cd2ad19b2288ee119741987ed7f8ba8756d440d48c264996f2e3d6a6e39e04
+MISC metadata.xml 533 BLAKE2B 37f21d9d4553f2fcd80e5de0d6896005d21f5595a7d070aa385cc55a9dcb1a1ec6f50f06d81d99d18da5ff9dbdeb4afed3bd0eecf9ae7453f3d29645d0802400 SHA512 914c9c5d837e9508f5a33191971761d6d956b785e9ff8329d42c821eba4613e7e7d45e40fb112667c3891b1aa2d824f09d2b2c13e3e412e12d0d937bb3fef782
diff --git a/app-i18n/uchardet/metadata.xml b/app-i18n/uchardet/metadata.xml
index df067141bad0..3c431c24f073 100644
--- a/app-i18n/uchardet/metadata.xml
+++ b/app-i18n/uchardet/metadata.xml
@@ -1,8 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<bugs-to>https://bugs.freedesktop.org/enter_bug.cgi?product=uchardet</bugs-to>
-	</upstream>
+    <maintainer type="person">
+        <email>coppens.matthias.abc@gmail.com</email>
+        <name>Matthias Coppens</name>
+    </maintainer>
+    <maintainer type="project">
+        <email>proxy-maint@gentoo.org</email>
+        <name>Proxy Maintainers</name>
+    </maintainer>
+    <upstream>
+        <bugs-to>https://bugs.freedesktop.org/enter_bug.cgi?product=uchardet</bugs-to>
+    </upstream>
 </pkgmetadata>
diff --git a/app-i18n/uchardet/uchardet-0.0.7.ebuild b/app-i18n/uchardet/uchardet-0.0.7.ebuild
new file mode 100644
index 000000000000..ca135f83ebee
--- /dev/null
+++ b/app-i18n/uchardet/uchardet-0.0.7.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+if [ "${PV}" = 9999 ]
+then
+	inherit git-r3
+	EGIT_REPO_URI="https://anongit.freedesktop.org/git/uchardet/uchardet.git"
+else
+	SRC_URI="https://www.freedesktop.org/software/uchardet/releases/${P}.tar.xz"
+fi
+
+DESCRIPTION="An encoding detector library"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/uchardet/"
+
+LICENSE="|| ( MPL-1.1 GPL-2+ LGPL-2.1+ )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="cpu_flags_x86_sse2 static-libs test"
+RESTRICT="!test? ( test )"
+
+src_prepare() {
+	cmake_src_prepare
+	use test || cmake_comment_add_subdirectory test
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DTARGET_ARCHITECTURE="${ARCH}"
+		-DBUILD_STATIC=$(usex static-libs)
+		-DCHECK_SSE2=$(usex cpu_flags_x86_sse2)
+	)
+	cmake_src_configure
+}
diff --git a/app-i18n/uchardet/uchardet-9999.ebuild b/app-i18n/uchardet/uchardet-9999.ebuild
index 0aef01cb3c64..031c6d829482 100644
--- a/app-i18n/uchardet/uchardet-9999.ebuild
+++ b/app-i18n/uchardet/uchardet-9999.ebuild
@@ -1,13 +1,19 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit cmake-utils git-r3
+inherit cmake
+if [ "${PV}" = 9999 ]
+then
+	inherit git-r3
+	EGIT_REPO_URI="https://anongit.freedesktop.org/git/uchardet/uchardet.git"
+else
+	SRC_URI="https://www.freedesktop.org/software/uchardet/releases/${P}.tar.xz"
+fi
 
 DESCRIPTION="An encoding detector library"
 HOMEPAGE="https://www.freedesktop.org/wiki/Software/uchardet/"
-EGIT_REPO_URI="https://anongit.freedesktop.org/git/uchardet/uchardet.git"
 
 LICENSE="|| ( MPL-1.1 GPL-2+ LGPL-2.1+ )"
 SLOT="0"
@@ -16,7 +22,7 @@ IUSE="cpu_flags_x86_sse2 static-libs test"
 RESTRICT="!test? ( test )"
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 	use test || cmake_comment_add_subdirectory test
 }
 
@@ -26,5 +32,5 @@ src_configure() {
 		-DBUILD_STATIC=$(usex static-libs)
 		-DCHECK_SSE2=$(usex cpu_flags_x86_sse2)
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }