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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 666761382C5 for ; Sat, 15 May 2021 15:17:51 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A5E77E0821; Sat, 15 May 2021 15:17:50 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 8BFB3E0821 for ; Sat, 15 May 2021 15:17:50 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3D219340D8C for ; Sat, 15 May 2021 15:17:49 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BB3624C3 for ; Sat, 15 May 2021 15:17:47 +0000 (UTC) From: "Keri Harris" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Keri Harris" Message-ID: <1621091809.a06d96cfdc4d632adb86e5d519f7a337da5d9331.keri@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lang/yap/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-lang/yap/yap-6.3.4.ebuild X-VCS-Directories: dev-lang/yap/ X-VCS-Committer: keri X-VCS-Committer-Name: Keri Harris X-VCS-Revision: a06d96cfdc4d632adb86e5d519f7a337da5d9331 X-VCS-Branch: master Date: Sat, 15 May 2021 15:17:47 +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: ea6e90ee-ac68-4ef5-8dbd-f1071f152f93 X-Archives-Hash: 96b53fc837eec733b10524b2e3263ba5 commit: a06d96cfdc4d632adb86e5d519f7a337da5d9331 Author: Keri Harris gentoo org> AuthorDate: Sat May 15 15:16:27 2021 +0000 Commit: Keri Harris gentoo org> CommitDate: Sat May 15 15:16:49 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a06d96cf dev-lang/yap: migrate to cmake.eclass Package-Manager: Portage-3.0.18, Repoman-3.0.2 Signed-off-by: Keri Harris gentoo.org> dev-lang/yap/yap-6.3.4.ebuild | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/dev-lang/yap/yap-6.3.4.ebuild b/dev-lang/yap/yap-6.3.4.ebuild index ffa33f60439..f45b3f336d3 100644 --- a/dev-lang/yap/yap-6.3.4.ebuild +++ b/dev-lang/yap/yap-6.3.4.ebuild @@ -7,7 +7,7 @@ MY_P=YAP-${PV} PYTHON_COMPAT=( python3_{7,8} ) -inherit cmake-utils flag-o-matic multilib python-r1 +inherit cmake flag-o-matic python-r1 PATCHSET_VER="0" @@ -45,14 +45,11 @@ DEPEND="${RDEPEND} python? ( dev-lang/swig )" S="${WORKDIR}"/yap-6.3-${MY_P} -BUILD_DIR="${S}"/build -CMAKE_USE_DIR="${S}" src_prepare() { if [[ -d "${WORKDIR}"/${PV} ]] ; then eapply "${WORKDIR}"/${PV} fi - eapply_user sed -i \ -e "s|\(set ( libdir \"\${exec_prefix}\)/lib\")|\1/$(get_libdir)\")|" \ @@ -61,7 +58,7 @@ src_prepare() { CMakeLists.txt || die rm -rf "${S}"/yap || die "failed to remove yap xcode project" - cmake-utils_src_prepare + cmake_src_prepare } src_configure() { @@ -92,14 +89,14 @@ src_configure() { -DWITH_Matlab=no ) - cmake-utils_src_configure + cmake_src_configure } src_compile() { - cmake-utils_src_compile + cmake_src_compile if use doc ; then - cmake-utils_src_compile doc + cmake_src_compile doc fi } @@ -110,7 +107,7 @@ src_test() { } src_install() { - cmake-utils_src_install + cmake_src_install dodoc changes*.html README