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 841BE158003 for ; Fri, 9 Sep 2022 07:59:42 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C4348E0909; Fri, 9 Sep 2022 07:59: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) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A7D3BE0909 for ; Fri, 9 Sep 2022 07:59: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) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A42CC3407E6 for ; Fri, 9 Sep 2022 07:59:40 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id F32F91E for ; Fri, 9 Sep 2022 07:59:38 +0000 (UTC) From: "David Seifert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" Message-ID: <1662710338.b70522335c001076efc45b3fa5382e5e579ae7fa.soap@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/libsass/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/libsass/libsass-3.6.5-r1.ebuild dev-libs/libsass/libsass-3.6.5.ebuild dev-libs/libsass/libsass-9999.ebuild X-VCS-Directories: dev-libs/libsass/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: b70522335c001076efc45b3fa5382e5e579ae7fa X-VCS-Branch: master Date: Fri, 9 Sep 2022 07:59:38 +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: 81cc9607-750d-4b3f-a3f5-323d89e5f0fa X-Archives-Hash: 800aa748aa9d5169fd8720c4b1969b9e commit: b70522335c001076efc45b3fa5382e5e579ae7fa Author: Sam James gentoo org> AuthorDate: Fri Sep 9 07:58:58 2022 +0000 Commit: David Seifert gentoo org> CommitDate: Fri Sep 9 07:58:58 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b7052233 dev-libs/libsass: drop multilib, static-libs No multilib or static-libs reverse dependencies. Signed-off-by: Sam James gentoo.org> Signed-off-by: David Seifert gentoo.org> ...ibsass-3.6.5.ebuild => libsass-3.6.5-r1.ebuild} | 24 +++++++------------ dev-libs/libsass/libsass-9999.ebuild | 28 +++++++++------------- 2 files changed, 20 insertions(+), 32 deletions(-) diff --git a/dev-libs/libsass/libsass-3.6.5.ebuild b/dev-libs/libsass/libsass-3.6.5-r1.ebuild similarity index 65% rename from dev-libs/libsass/libsass-3.6.5.ebuild rename to dev-libs/libsass/libsass-3.6.5-r1.ebuild index c1a6d0479eb3..80400548f196 100644 --- a/dev-libs/libsass/libsass-3.6.5.ebuild +++ b/dev-libs/libsass/libsass-3.6.5-r1.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -inherit autotools multilib-minimal +inherit autotools if [[ ${PV} = *9999 ]]; then EGIT_REPO_URI="https://github.com/sass/libsass.git" @@ -17,7 +17,6 @@ DESCRIPTION="A C/C++ implementation of a Sass CSS compiler" HOMEPAGE="https://github.com/sass/libsass" LICENSE="MIT" SLOT="0/1" # libsass soname -IUSE="static-libs" DOCS=( Readme.md SECURITY.md ) @@ -27,27 +26,22 @@ src_prepare() { if [[ ${PV} != *9999 ]]; then [[ -f VERSION ]] || echo "${PV}" > VERSION fi - eautoreconf - # only sane way to deal with various version-related scripts, env variables etc. - multilib_copy_sources + eautoreconf } -multilib_src_configure() { +src_configure() { local myeconfargs=( - $(use_enable static-libs static) --enable-shared ) econf "${myeconfargs[@]}" } -multilib_src_install() { - emake DESTDIR="${D}" install - find "${D}" -name '*.la' -delete || die -} +src_install() { + default + + dodoc -r docs -multilib_src_install_all() { - einstalldocs - dodoc -r "${S}/docs" + find "${ED}" -name '*.la' -delete || die } diff --git a/dev-libs/libsass/libsass-9999.ebuild b/dev-libs/libsass/libsass-9999.ebuild index 04fbd70077d4..80400548f196 100644 --- a/dev-libs/libsass/libsass-9999.ebuild +++ b/dev-libs/libsass/libsass-9999.ebuild @@ -1,23 +1,22 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -inherit autotools multilib-minimal +inherit autotools if [[ ${PV} = *9999 ]]; then EGIT_REPO_URI="https://github.com/sass/libsass.git" inherit git-r3 else SRC_URI="https://github.com/sass/libsass/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux" + KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv x86 ~amd64-linux" fi DESCRIPTION="A C/C++ implementation of a Sass CSS compiler" HOMEPAGE="https://github.com/sass/libsass" LICENSE="MIT" SLOT="0/1" # libsass soname -IUSE="static-libs" DOCS=( Readme.md SECURITY.md ) @@ -27,27 +26,22 @@ src_prepare() { if [[ ${PV} != *9999 ]]; then [[ -f VERSION ]] || echo "${PV}" > VERSION fi - eautoreconf - # only sane way to deal with various version-related scripts, env variables etc. - multilib_copy_sources + eautoreconf } -multilib_src_configure() { +src_configure() { local myeconfargs=( - $(use_enable static-libs static) --enable-shared ) econf "${myeconfargs[@]}" } -multilib_src_install() { - emake DESTDIR="${D}" install - find "${D}" -name '*.la' -delete || die -} +src_install() { + default + + dodoc -r docs -multilib_src_install_all() { - einstalldocs - dodoc -r "${S}/docs" + find "${ED}" -name '*.la' -delete || die }