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 A7ED215852A for ; Tue, 20 Aug 2024 06:37:42 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9575F2BC014; Tue, 20 Aug 2024 06:37:41 +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 7A9722BC014 for ; Tue, 20 Aug 2024 06:37:41 +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)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 90404340DE6 for ; Tue, 20 Aug 2024 06:37:40 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2EE5D1EFD for ; Tue, 20 Aug 2024 06:37:39 +0000 (UTC) From: "Joonas Niilola" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Joonas Niilola" Message-ID: <1724135855.6591ac044612e0459478ce64c9b5a63825140a64.juippis@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: www-client/seamonkey/ X-VCS-Repository: repo/gentoo X-VCS-Files: www-client/seamonkey/seamonkey-2.53.18.2-r1.ebuild X-VCS-Directories: www-client/seamonkey/ X-VCS-Committer: juippis X-VCS-Committer-Name: Joonas Niilola X-VCS-Revision: 6591ac044612e0459478ce64c9b5a63825140a64 X-VCS-Branch: master Date: Tue, 20 Aug 2024 06:37:39 +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: 74cb8ef1-dd99-42c6-be6c-60c732189bfc X-Archives-Hash: f67296a9b771c2cade064e08c32b90fe commit: 6591ac044612e0459478ce64c9b5a63825140a64 Author: Myckel Habets habets-dobben nl> AuthorDate: Mon Aug 19 16:51:21 2024 +0000 Commit: Joonas Niilola gentoo org> CommitDate: Tue Aug 20 06:37:35 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6591ac04 www-client/seamonkey: migrate to llvm-r1.eclass Signed-off-by: Myckel Habets habets-dobben.nl> Closes: https://github.com/gentoo/gentoo/pull/38200 Signed-off-by: Joonas Niilola gentoo.org> www-client/seamonkey/seamonkey-2.53.18.2-r1.ebuild | 30 ++++++---------------- 1 file changed, 8 insertions(+), 22 deletions(-) diff --git a/www-client/seamonkey/seamonkey-2.53.18.2-r1.ebuild b/www-client/seamonkey/seamonkey-2.53.18.2-r1.ebuild index c51469d4666f..5eabcd388561 100644 --- a/www-client/seamonkey/seamonkey-2.53.18.2-r1.ebuild +++ b/www-client/seamonkey/seamonkey-2.53.18.2-r1.ebuild @@ -8,7 +8,7 @@ WANT_AUTOCONF="2.1" PYTHON_COMPAT=( python3_{10..11} ) PYTHON_REQ_USE='ncurses,sqlite,ssl,threads(+)' -LLVM_MAX_SLOT=18 +LLVM_COMPAT=( {17..18} ) # This list can be updated with scripts/get_langs.sh from the mozilla overlay # note - could not roll langpacks for: ca fi @@ -33,7 +33,7 @@ S="${WORKDIR}/${MY_MOZ_P}" MOZ_GENERATE_LANGPACKS=1 MOZ_L10N_SOURCEDIR="${S}/${P}-l10n" -inherit autotools check-reqs desktop edos2unix flag-o-matic llvm mozcoreconf-v6 mozlinguas-v2 pax-utils \ +inherit autotools check-reqs desktop edos2unix flag-o-matic llvm-r1 mozcoreconf-v6 mozlinguas-v2 pax-utils \ toolchain-funcs xdg-utils DESCRIPTION="Seamonkey Web Browser" @@ -56,16 +56,10 @@ BDEPEND=" dev-lang/perl dev-util/cbindgen >=sys-devel/binutils-2.16.1 - || ( - ( - sys-devel/clang:18 - sys-devel/llvm:18 - ) - ( - sys-devel/clang:17 - sys-devel/llvm:17 - ) - ) + $(llvm_gen_dep ' + sys-devel/clang:${LLVM_SLOT}= + sys-devel/llvm:${LLVM_SLOT}= + ') virtual/pkgconfig virtual/rust amd64? ( >=dev-lang/yasm-1.1 ) @@ -150,15 +144,6 @@ QA_CONFIG_IMPL_DECL_SKIP=( BUILD_OBJ_DIR="${S}/seamonk" -llvm_check_deps() { - if ! has_version -b "sys-devel/clang:${LLVM_SLOT}" ; then - einfo "sys-devel/clang:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2 - return 1 - fi - - einfo "Using LLVM slot ${LLVM_SLOT} to build." >&2 -} - pkg_setup() { if [[ ${PV} == *_beta* ]] || [[ ${PV} == *_pre* ]] ; then ewarn @@ -167,7 +152,8 @@ pkg_setup() { ewarn "Those belong to upstream: https://bugzilla.mozilla.org" fi - llvm_pkg_setup + llvm-r1_pkg_setup + einfo "Using LLVM slot ${LLVM_SLOT} to build." >&2 moz_pkgsetup }