[gentoo-commits] repo/gentoo:master commit in: dev-libs/utfcpp/

[Andreas Sturmlechner]

commit:     1ab9fdb8622e280631035239af95c899750d8a37
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 30 20:25:06 2024 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Mar  7 23:44:30 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ab9fdb8

dev-libs/utfcpp: Rebase onto upstream git master

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 dev-libs/utfcpp/utfcpp-9999.ebuild | 40 +++++++++++++++++---------------------
 1 file changed, 18 insertions(+), 22 deletions(-)

diff --git a/dev-libs/utfcpp/utfcpp-9999.ebuild 
b/dev-libs/utfcpp/utfcpp-9999.ebuild
index 0b15d97bb35e..f92cb7df4237 100644
--- a/dev-libs/utfcpp/utfcpp-9999.ebuild
+++ b/dev-libs/utfcpp/utfcpp-9999.ebuild
@@ -1,41 +1,32 @@
-# Copyright 2015-2022 Gentoo Authors
+# Copyright 2015-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="8"
+EAPI=8
 
 inherit cmake
 
-if [[ "${PV}" == "9999" ]]; then
-       inherit git-r3
-
+if [[ ${PV} == *9999* ]]; then
        EGIT_REPO_URI="https://github.com/nemtrif/utfcpp";
        EGIT_SUBMODULES=()
+       inherit git-r3
 else
        FTEST_GIT_REVISION=""
        FTEST_DATE=""
+       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 )"
+       KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 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=""
 IUSE="test"
 RESTRICT="!test? ( test )"
 
-BDEPEND=""
-DEPEND=""
-RDEPEND=""
-
 src_unpack() {
-       if [[ "${PV}" == "9999" ]]; then
+       if [[ ${PV} == *9999* ]]; then
                git-r3_src_unpack
 
                if use test; then
@@ -55,10 +46,15 @@ src_unpack() {
 }
 
 src_configure() {
-       local mycmakeargs=(
-               -DUTF8_SAMPLES=OFF
-               -DUTF8_TESTS=$(usex test ON OFF)
-       )
-
        cmake_src_configure
+
+       pushd tests > /dev/null || die
+               cmake_src_configure
+       popd > /dev/null || die
+}
+
+src_test() {
+       pushd tests > /dev/null || die
+               cmake_src_test
+       popd > /dev/null || die
 }