gentoo resync : 02.02.2022

4 files changed, 97 insertions, 13 deletions

diff --git a/dev-libs/utfcpp/Manifest b/dev-libs/utfcpp/Manifest
index 09618952d392..6f8eada954ff 100644
--- a/dev-libs/utfcpp/Manifest
+++ b/dev-libs/utfcpp/Manifest
@@ -1,8 +1,11 @@
+DIST ftest-20211106174116.tar.gz 3232 BLAKE2B 9a2184e82a19465333600b7c31de9a51e6716a4099f23145d93c967636da6539a0e71bfdd082507bf19a440df1199a1abf6f528b3957391f8b2a5c3e4dfb26ec SHA512 d92d3a3abd4f7b35971bfe7d74e1b822931818f60149a56ad29dd3238300ad71de1989fedc602a44a9c1a253da7bce758adf8d5b6da63ca6f322fb06dcefc98a
 DIST utfcpp-3.1.1.tar.gz 26374 BLAKE2B 93ad55c113c922e0105b509adf8dc1505e625bfeed0c60dabe7243ec288e3dd13b79b9382af2fff6daf780c5ebf9da32a492263d4998204222c1e446d16f4473 SHA512 720e2eba5c04f0bc4903a287138149a9cd432bc68bb163fe36b2e0d26d8bf616b4665f389b4a9c97af6ae7869e78973d97db976a4745512a241eebf774608997
 DIST utfcpp-3.1.2.tar.gz 26388 BLAKE2B f0ebf7f054c488259d2a409b2c5201b73e928901cf337cdc2a99a2f64deaf431ee60328b3b61e134d3cd49428eb0c921057ea248269029ef2838ed72dd8af7d7 SHA512 d43df19d9e8652291f1301a326ec0d592bad43d6ecf9086947037f0ae0c1e70c2d96082c48066639e2b7c57c0ea0e4782d6b215d017cf96a4c73ff3a15feec75
 DIST utfcpp-3.1.tar.gz 25871 BLAKE2B 6bafb933b777e842375b3dc6b1b5bc41efb0e9f40bbd33ccbbaf07b57a28c4e485d596725297fc2de83c23fa3c66872519883727714d236f4a37e07ed4825fc9 SHA512 826ac7aa61215ac2144fa3f5edc7f291c3dd25dc69b0c82526840f4651f822515ec262915e1117d975e5c5dd729f6166806a5d397262f59a2b323eb7009671f5
+DIST utfcpp-3.2.1.tar.gz 27377 BLAKE2B 27c4becfa7e1f5e8b63ee0e03b9f66cf5d6743cff3706222dde6e21c3feb51897eddd7dcaeaaacc66513fdb209d5be392e83ba22ab7a7d848bdf9721577d6444 SHA512 5798487f12b1bc55d3e06aed38f7604271ca3402963efcf85d181fd590d8a088d21e961e77698e60dc2cdae8cf4506645903442c45fd328201752d9589180e0d
 EBUILD utfcpp-3.1.1.ebuild 935 BLAKE2B 7baf8b90a10408faea6792eede2b0ec01ed88b7408141c769e0bf3a1ccd397298656a398cc6be46dfe4ebc949ec0260aad01f719a6596f53dc5a7ee323a79ed1 SHA512 9ad08d27cc85de20535298dc2429fa3f7937834170e2260fb444bd387540b023d7b932a86157393f25afe9e1c169cde57ff0cfc914a813a5507d04ab7ad6e72e
 EBUILD utfcpp-3.1.2.ebuild 934 BLAKE2B 799839e521d6c2c881b937c610cc7016907325d5ded407fbd452fda66ec1be1365fa696856b3fa8d18c11a822807c25f8f5c509bb023788b6d471afad856c0ce SHA512 a0b28f7086b5b2e3b4fc8b6cb4f0336a3697eaa9b77c9f711ae5e090561f2b7c62306c2abaea62f2424441fd0ffce5f3c8810878f25b579df8add3e300d441a8
 EBUILD utfcpp-3.1.ebuild 929 BLAKE2B 98b8653c0a5a8dfccbe50f191c8505fa38d5f707c1c229d6b65e6a793a270b6914f6849e0a3a56b12539a57ff88a65b35deec68ff224ff8cf28d3d1561ab9dd4 SHA512 b126f8b1ec192eda63d84dd44023c5c18a9772becb08f9b611cffb72938023212c65b2cda98e6009274983138a90fe8fa8e11759b8d30f2f440354862379e54c
-EBUILD utfcpp-9999.ebuild 898 BLAKE2B 3412683e554ceae20d79a57b4487f614175decaf501be0f4dc33f95ab81a822cdef2a3d736442f2fe7b1c8ecba30f62b9db3ed7638300d9fac3ae289dac7ba39 SHA512 3ddbc5569ebe18570ab9f6f437240c707706df91c23851761e8749c6b9efc11abd1ea1393ed2b9dd8bce497939715de56de8d0121810123773fc63f30496b812
-MISC metadata.xml 490 BLAKE2B 37e2294a4fb66b2f057dce77d4a6104ae7f4cb993aba2383fea9814238926f76d79006fb533fa05509deedad222b0347f6ff6dcf42418e4008862412ace3329a SHA512 b6df12771b42f42e268b239bc7dfe07493b2f56bf366ae24a03f42f71368feaacc596facfb8875e76fed01b807685affe90aab02ffd7f9e5dcd7df52d0844ccc
+EBUILD utfcpp-3.2.1.ebuild 1364 BLAKE2B 1f76d53808d8578de1b735659ca8c79001ed4cba1ce626ddeb51ae74310066e33491f0fb9e700dd0bd65cecb817caa6ce1e26ac60b31536df15d19cec68c2742 SHA512 7bdf80c5da8bd190c8407a343621e061e479d4ba18e88d68767c45948a6abe82305e56145dc31da551ac0bb62285ed6f208a9de628ce5a95548791c3cb2a068a
+EBUILD utfcpp-9999.ebuild 1268 BLAKE2B 991a901db757f36b9ebc115a45b585ec3e0eca396820a3456106fd3c3872c22060f6821a5c3f6d35b7fed3f28bd8792df01ea2547e58325e92d477450fb99366 SHA512 067403e83fdbc062b9d82e676a156f7b867a4efdae70cccff1b3f00010655d9e65930874ae672d203a9a2c27fe4048ad42b709218111dbd98f530e9a2319b72d
+MISC metadata.xml 462 BLAKE2B 647bb7ccdffe7c2a5ca47f431b83c31d298430e4fbfba009bccaac39a3a514239318bab1dc946f5f49ea07169c79a1e1502b7d5d669e9e2afb886f405e8499ae SHA512 52bca2028d95d47e93f52295f9c3082e232e0cf14d24bf8e19eb4443d667703b3f1b34c641ed4a9038813cccb92ac1af2674acd20d6c2060db1f96878061a680
diff --git a/dev-libs/utfcpp/metadata.xml b/dev-libs/utfcpp/metadata.xml
index 3aee5d1f054e..b9907b54a199 100644
--- a/dev-libs/utfcpp/metadata.xml
+++ b/dev-libs/utfcpp/metadata.xml
@@ -5,9 +5,9 @@
 		<email>arfrever.fta@gmail.com</email>
 		<name>Arfrever Frehtes Taifersar Arahesis</name>
 	</maintainer>
-	<maintainer type="person" proxied="proxy">
-		<email>floppym@gentoo.org</email>
-		<name>Mike Gilbert</name>
+	<maintainer type="project">
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
 	</maintainer>
 	<upstream>
 		<remote-id type="github">nemtrif/utfcpp</remote-id>
diff --git a/dev-libs/utfcpp/utfcpp-3.2.1.ebuild b/dev-libs/utfcpp/utfcpp-3.2.1.ebuild
new file mode 100644
index 000000000000..91f09205a24c
--- /dev/null
+++ b/dev-libs/utfcpp/utfcpp-3.2.1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 2015-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+inherit cmake
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/nemtrif/utfcpp"
+	EGIT_SUBMODULES=()
+else
+	FTEST_GIT_REVISION="1e14b77c2ab8489386fc7046a8bced696c0fc4d6"
+	FTEST_DATE="20211106174116"
+fi
+
+DESCRIPTION="UTF-8 C++ library"
+HOMEPAGE="https://github.com/nemtrif/utfcpp"
+if [[ "${PV}" == "9999" ]]; then
+	SRC_URI=""
+else
+	SRC_URI="https://github.com/nemtrif/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+		test? ( https://github.com/nemtrif/ftest/archive/${FTEST_GIT_REVISION}.tar.gz -> ftest-${FTEST_DATE}.tar.gz )"
+fi
+
+LICENSE="Boost-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND=""
+DEPEND=""
+RDEPEND=""
+
+src_unpack() {
+	if [[ "${PV}" == "9999" ]]; then
+		git-r3_src_unpack
+
+		if use test; then
+			git-r3_fetch https://github.com/nemtrif/ftest refs/heads/master
+			git-r3_checkout https://github.com/nemtrif/ftest "${WORKDIR}/ftest"
+		fi
+	else
+		default
+
+		if use test; then
+			mv ftest-${FTEST_GIT_REVISION} ftest || die
+		fi
+	fi
+
+	rmdir "${S}/extern/ftest" || die
+	ln -s ../../ftest "${S}/extern/ftest" || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DUTF8_SAMPLES=OFF
+		-DUTF8_TESTS=$(usex test ON OFF)
+	)
+
+	cmake_src_configure
+}
diff --git a/dev-libs/utfcpp/utfcpp-9999.ebuild b/dev-libs/utfcpp/utfcpp-9999.ebuild
index ca5002a61255..0b15d97bb35e 100644
--- a/dev-libs/utfcpp/utfcpp-9999.ebuild
+++ b/dev-libs/utfcpp/utfcpp-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 2015-2020 Gentoo Authors
+# Copyright 2015-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
+EAPI="8"
 
 inherit cmake
 
@@ -10,6 +10,9 @@ if [[ "${PV}" == "9999" ]]; then
 
 	EGIT_REPO_URI="https://github.com/nemtrif/utfcpp"
 	EGIT_SUBMODULES=()
+else
+	FTEST_GIT_REVISION=""
+	FTEST_DATE=""
 fi
 
 DESCRIPTION="UTF-8 C++ library"
@@ -17,7 +20,8 @@ HOMEPAGE="https://github.com/nemtrif/utfcpp"
 if [[ "${PV}" == "9999" ]]; then
 	SRC_URI=""
 else
-	SRC_URI="https://github.com/nemtrif/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/nemtrif/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+		test? ( https://github.com/nemtrif/ftest/archive/${FTEST_GIT_REVISION}.tar.gz -> ftest-${FTEST_DATE}.tar.gz )"
 fi
 
 LICENSE="Boost-1.0"
@@ -27,14 +31,27 @@ IUSE="test"
 RESTRICT="!test? ( test )"
 
 BDEPEND=""
-DEPEND="test? ( dev-cpp/gtest )"
+DEPEND=""
 RDEPEND=""
 
-src_prepare() {
-	sed -e "/add_subdirectory(extern\/gtest)/d" -i CMakeLists.txt || die
-	sed -e "s/gtest_main/gtest &/" -i tests/CMakeLists.txt || die
+src_unpack() {
+	if [[ "${PV}" == "9999" ]]; then
+		git-r3_src_unpack
+
+		if use test; then
+			git-r3_fetch https://github.com/nemtrif/ftest refs/heads/master
+			git-r3_checkout https://github.com/nemtrif/ftest "${WORKDIR}/ftest"
+		fi
+	else
+		default
+
+		if use test; then
+			mv ftest-${FTEST_GIT_REVISION} ftest || die
+		fi
+	fi
 
-	cmake_src_prepare
+	rmdir "${S}/extern/ftest" || die
+	ln -s ../../ftest "${S}/extern/ftest" || die
 }
 
 src_configure() {