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 BEBAA158170 for ; Sun, 21 Jul 2024 17:41:35 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C8246E2AE5; Sun, 21 Jul 2024 17:41:34 +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) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A8A3AE2AE5 for ; Sun, 21 Jul 2024 17:41:34 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9DD7F343003 for ; Sun, 21 Jul 2024 17:41:33 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0A4801E52 for ; Sun, 21 Jul 2024 17:41:32 +0000 (UTC) From: "Arthur Zamarin" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Arthur Zamarin" Message-ID: <1721583680.6b9405a31c42e18828fdb05f0d90a2e804d474d9.arthurzam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-i18n/librime/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-i18n/librime/librime-1.11.2.ebuild X-VCS-Directories: app-i18n/librime/ X-VCS-Committer: arthurzam X-VCS-Committer-Name: Arthur Zamarin X-VCS-Revision: 6b9405a31c42e18828fdb05f0d90a2e804d474d9 X-VCS-Branch: master Date: Sun, 21 Jul 2024 17:41:32 +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: 29b13ea9-a717-4bd0-8c38-5172995a5d8b X-Archives-Hash: be6612a8654b14017693d99b23706b57 commit: 6b9405a31c42e18828fdb05f0d90a2e804d474d9 Author: Arthur Zamarin gentoo org> AuthorDate: Sun Jul 21 17:40:07 2024 +0000 Commit: Arthur Zamarin gentoo org> CommitDate: Sun Jul 21 17:41:20 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b9405a3 app-i18n/librime: refactor after PR Closes: https://github.com/gentoo/gentoo/pull/37654 Signed-off-by: Arthur Zamarin gentoo.org> app-i18n/librime/librime-1.11.2.ebuild | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/app-i18n/librime/librime-1.11.2.ebuild b/app-i18n/librime/librime-1.11.2.ebuild index 1c2d933f72f8..30ed5c8e5578 100644 --- a/app-i18n/librime/librime-1.11.2.ebuild +++ b/app-i18n/librime/librime-1.11.2.ebuild @@ -1,9 +1,9 @@ # Copyright 2012-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="8" +EAPI=8 -inherit cmake multiprocessing +inherit cmake multiprocessing flag-o-matic DESCRIPTION="RIME (Rime Input Method Engine) core library" HOMEPAGE="https://rime.im/ https://github.com/rime/librime" @@ -16,36 +16,33 @@ IUSE="debug test" RESTRICT="!test? ( test )" RDEPEND=" + app-i18n/opencc:= dev-cpp/glog:= + dev-cpp/yaml-cpp:= >=dev-libs/boost-1.74:= - app-i18n/opencc:0= - dev-cpp/yaml-cpp:0= - dev-libs/leveldb:0= - dev-libs/marisa:0= + dev-libs/leveldb:= + dev-libs/marisa " DEPEND="${RDEPEND} test? ( dev-cpp/gtest ) " -DOCS=(CHANGELOG.md README.md) +DOCS=( CHANGELOG.md README.md ) src_configure() { - local -x CXXFLAGS="${CXXFLAGS}" - # for glog if use debug; then - CXXFLAGS+=" -DDCHECK_ALWAYS_ON" - CMAKE_BUILD_TYPE=Debug + append-cxxflags -DDCHECK_ALWAYS_ON + local CMAKE_BUILD_TYPE=Debug else - CXXFLAGS+=" -DNDEBUG" + append-cxxflags -DNDEBUG fi local mycmakeargs=( - -DBUILD_TEST=$(usex test ON OFF) + -DBUILD_TEST=$(usex test) -DCMAKE_BUILD_PARALLEL_LEVEL=$(makeopts_jobs) -DENABLE_EXTERNAL_PLUGINS=ON -DINSTALL_PRIVATE_HEADERS=ON ) - cmake_src_configure }