commit: ee55410f63d31e5831f00051905d6a77ab43412f Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Wed Feb 28 15:22:27 2024 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Wed Feb 28 15:22:57 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee55410f
dev-libs/utfcpp: Revert "Rebase onto upstream git master" This reverts commit 3dce81ef2a89e49713c924634162ba5abffa0745. Was not meant to be pushed yet. Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> dev-libs/utfcpp/utfcpp-9999.ebuild | 40 +++++++++++++++++++++----------------- 1 file changed, 22 insertions(+), 18 deletions(-) diff --git a/dev-libs/utfcpp/utfcpp-9999.ebuild b/dev-libs/utfcpp/utfcpp-9999.ebuild index f92cb7df4237..0b15d97bb35e 100644 --- a/dev-libs/utfcpp/utfcpp-9999.ebuild +++ b/dev-libs/utfcpp/utfcpp-9999.ebuild @@ -1,32 +1,41 @@ -# Copyright 2015-2024 Gentoo Authors +# Copyright 2015-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=8 +EAPI="8" inherit cmake -if [[ ${PV} == *9999* ]]; then +if [[ "${PV}" == "9999" ]]; then + inherit git-r3 + 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 @@ -46,15 +55,10 @@ src_unpack() { } src_configure() { - cmake_src_configure + local mycmakeargs=( + -DUTF8_SAMPLES=OFF + -DUTF8_TESTS=$(usex test ON OFF) + ) - 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 + cmake_src_configure }