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 8C450138334 for ; Sat, 20 Jul 2019 22:35:01 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E2C8BE0806; Sat, 20 Jul 2019 22:34:59 +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 A8F46E0802 for ; Sat, 20 Jul 2019 22:34:59 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 9A0B334827E for ; Sat, 20 Jul 2019 22:34:58 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 07F7372B for ; Sat, 20 Jul 2019 22:34:55 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1563662080.3a542a2ead185237a2899e9b06fad164da6a9b19.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-devel/clang/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-devel/clang/clang-9999.ebuild X-VCS-Directories: sys-devel/clang/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 3a542a2ead185237a2899e9b06fad164da6a9b19 X-VCS-Branch: master Date: Sat, 20 Jul 2019 22:34:55 +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: 2f51a5e7-0007-4e92-9b39-01aa177d2c1c X-Archives-Hash: 5c2dcb0d84f4bda590eaab1c8ba73d0a commit: 3a542a2ead185237a2899e9b06fad164da6a9b19 Author: Michał Górny gentoo org> AuthorDate: Sat Jul 20 20:55:15 2019 +0000 Commit: Michał Górny gentoo org> CommitDate: Sat Jul 20 22:34:40 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a542a2e sys-devel/clang: Bump -9999 to EAPI 7 Signed-off-by: Michał Górny gentoo.org> sys-devel/clang/clang-9999.ebuild | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/sys-devel/clang/clang-9999.ebuild b/sys-devel/clang/clang-9999.ebuild index 6465115dc35..071fea2b586 100644 --- a/sys-devel/clang/clang-9999.ebuild +++ b/sys-devel/clang/clang-9999.ebuild @@ -1,16 +1,15 @@ # Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 : ${CMAKE_MAKEFILE_GENERATOR:=ninja} # (needed due to CMAKE_BUILD_TYPE != Gentoo) CMAKE_MIN_VERSION=3.7.0-r1 PYTHON_COMPAT=( python{2_7,3_{5,6,7}} ) -inherit cmake-utils eapi7-ver flag-o-matic git-r3 llvm \ - multilib-minimal multiprocessing pax-utils python-single-r1 \ - toolchain-funcs +inherit cmake-utils git-r3 llvm multilib-minimal multiprocessing \ + pax-utils python-single-r1 toolchain-funcs DESCRIPTION="C language family frontend for LLVM" HOMEPAGE="https://llvm.org/" @@ -212,9 +211,9 @@ src_install() { multilib-minimal_src_install # Move runtime headers to /usr/lib/clang, where they belong - mv "${ED%/}"/usr/include/clangrt "${ED%/}"/usr/lib/clang || die + mv "${ED}"/usr/include/clangrt "${ED}"/usr/lib/clang || die # move (remaining) wrapped headers back - mv "${ED%/}"/usr/include "${ED%/}"/usr/lib/llvm/${SLOT}/include || die + mv "${ED}"/usr/include "${ED}"/usr/lib/llvm/${SLOT}/include || die # Apply CHOST and version suffix to clang tools # note: we use two version components here (vs 3 in runtime path) @@ -234,7 +233,7 @@ src_install() { # - clang, clang++, clang-cl, clang-cpp -> clang*-X # also in CHOST variant for i in "${clang_tools[@]:1}"; do - rm "${ED%/}/usr/lib/llvm/${SLOT}/bin/${i}" || die + rm "${ED}/usr/lib/llvm/${SLOT}/bin/${i}" || die dosym "clang-${clang_version}" "/usr/lib/llvm/${SLOT}/bin/${i}-${clang_version}" dosym "${i}-${clang_version}" "/usr/lib/llvm/${SLOT}/bin/${i}" done @@ -261,9 +260,9 @@ multilib_src_install() { # move headers to /usr/include for wrapping & ABI mismatch checks # (also drop the version suffix from runtime headers) - rm -rf "${ED%/}"/usr/include || die - mv "${ED%/}"/usr/lib/llvm/${SLOT}/include "${ED%/}"/usr/include || die - mv "${ED%/}"/usr/lib/llvm/${SLOT}/$(get_libdir)/clang "${ED%/}"/usr/include/clangrt || die + rm -rf "${ED}"/usr/include || die + mv "${ED}"/usr/lib/llvm/${SLOT}/include "${ED}"/usr/include || die + mv "${ED}"/usr/lib/llvm/${SLOT}/$(get_libdir)/clang "${ED}"/usr/include/clangrt || die } multilib_src_install_all() { @@ -280,7 +279,7 @@ multilib_src_install_all() { } pkg_postinst() { - if [[ ${ROOT} == / && -f ${EPREFIX}/usr/share/eselect/modules/compiler-shadow.eselect ]] ; then + if [[ -z ${ROOT} && -f ${EPREFIX}/usr/share/eselect/modules/compiler-shadow.eselect ]] ; then eselect compiler-shadow update all fi @@ -293,7 +292,7 @@ pkg_postinst() { } pkg_postrm() { - if [[ ${ROOT} == / && -f ${EPREFIX}/usr/share/eselect/modules/compiler-shadow.eselect ]] ; then + if [[ -z ${ROOT} && -f ${EPREFIX}/usr/share/eselect/modules/compiler-shadow.eselect ]] ; then eselect compiler-shadow clean all fi }