From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id A4172158089 for ; Sat, 29 Jan 2022 15:20:20 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AB3A62BC01B; Sat, 29 Jan 2022 15:20:19 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 8C82C2BC01B for ; Sat, 29 Jan 2022 15:20:19 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4B402343342 for ; Sat, 29 Jan 2022 15:20:16 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E0B632C8 for ; Sat, 29 Jan 2022 15:20:10 +0000 (UTC) From: "Yixun Lan" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Yixun Lan" Message-ID: <1643469545.7c42c41102ce82a51acc08fdd1ee76c36b3e5d11.dlan@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/utfcpp/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/utfcpp/utfcpp-9999.ebuild X-VCS-Directories: dev-libs/utfcpp/ X-VCS-Committer: dlan X-VCS-Committer-Name: Yixun Lan X-VCS-Revision: 7c42c41102ce82a51acc08fdd1ee76c36b3e5d11 X-VCS-Branch: master Date: Sat, 29 Jan 2022 15:20:10 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 59a1e316-dcfb-4808-a686-57f83694b632 X-Archives-Hash: ab7fb5390da179b16358a483a618ecc9 commit: 7c42c41102ce82a51acc08fdd1ee76c36b3e5d11 Author: Arfrever Frehtes Taifersar Arahesis Apache Org> AuthorDate: Sat Jan 22 00:00:00 2022 +0000 Commit: Yixun Lan gentoo org> CommitDate: Sat Jan 29 15:19:05 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c42c411 dev-libs/utfcpp: Update live ebuild. https://github.com/nemtrif/utfcpp/commit/fe79d14ae764e0da411078927b1c60ea9271e408 Signed-off-by: Arfrever Frehtes Taifersar Arahesis Apache.Org> Signed-off-by: Yixun Lan gentoo.org> dev-libs/utfcpp/utfcpp-9999.ebuild | 33 +++++++++++++++++++++++++-------- 1 file changed, 25 insertions(+), 8 deletions(-) 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() {