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 0321D158086 for ; Tue, 21 Dec 2021 04:19:35 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3B5742BC024; Tue, 21 Dec 2021 04:19: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)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 229762BC024 for ; Tue, 21 Dec 2021 04:19:34 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 1C76C343046 for ; Tue, 21 Dec 2021 04:19:33 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A5401257 for ; Tue, 21 Dec 2021 04:19:31 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1640060359.b133beeb3fd21ef368c3fe9b8b05b026ec5cd562.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-devel/icecream/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-devel/icecream/icecream-1.3.1.ebuild X-VCS-Directories: sys-devel/icecream/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: b133beeb3fd21ef368c3fe9b8b05b026ec5cd562 X-VCS-Branch: master Date: Tue, 21 Dec 2021 04:19:31 +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: 8bea8bf2-c074-4f73-aeb2-c85948f39929 X-Archives-Hash: 28a66e85f3fddbcf183ad0be50e728a2 commit: b133beeb3fd21ef368c3fe9b8b05b026ec5cd562 Author: Sam James gentoo org> AuthorDate: Tue Dec 21 04:10:01 2021 +0000 Commit: Sam James gentoo org> CommitDate: Tue Dec 21 04:19:19 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b133beeb sys-devel/icecream: update EAPI 7 -> 8, post-review fixes - Use EAPI 8 - Use conventional double quotes everywhere - Unconditionally install systemd units (see small files policy) - Adapt pkg_* for EAPI 7+ (${ROOT} suffix) - Style changes (place eclass variables before inherit in general, whitespace) - Drop unnecessary econf arg (--enable-fast-install) - Add missing dependencies (libarchive, lzo) Bug: https://bugs.gentoo.org/602492 Closes: https://bugs.gentoo.org/527376 Closes: https://bugs.gentoo.org/642674 Closes: https://bugs.gentoo.org/828135 Signed-off-by: Sam James gentoo.org> sys-devel/icecream/icecream-1.3.1.ebuild | 64 +++++++++++++++----------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/sys-devel/icecream/icecream-1.3.1.ebuild b/sys-devel/icecream/icecream-1.3.1.ebuild index d9443057aaaf..72ab4fad07b2 100644 --- a/sys-devel/icecream/icecream-1.3.1.ebuild +++ b/sys-devel/icecream/icecream-1.3.1.ebuild @@ -1,63 +1,57 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 +AT_NOELIBTOOLIZE="yes" inherit autotools systemd tmpfiles -DESCRIPTION='Distributed compiling of C(++) code across several machines; based on distcc' -HOMEPAGE='https://github.com/icecc/icecream' +DESCRIPTION="Distributed compiler with a central scheduler to share build load" +HOMEPAGE="https://github.com/icecc/icecream" SRC_URI="https://github.com/icecc/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" -LICENSE='GPL-2' -SLOT='0' +LICENSE="GPL-2" +SLOT="0" KEYWORDS="~amd64 ~arm ~hppa ~ppc ~sparc ~x86" -IUSE='systemd' -DEPEND=' +DEPEND="app-arch/libarchive:= + app-arch/zstd:= acct-user/icecream acct-group/icecream - sys-libs/libcap-ng - app-text/docbook2X - app-arch/zstd -' -RDEPEND=" - ${DEPEND} - dev-util/shadowman - systemd? ( sys-apps/systemd ) -" - -AT_NOELIBTOOLIZE='yes' + dev-libs/lzo:2 + sys-libs/libcap-ng" +RDEPEND="${DEPEND} + dev-util/shadowman" +BDEPEND="app-text/docbook2X" src_prepare() { default + eautoreconf } src_configure() { econf \ --enable-clang-rewrite-includes \ - --enable-clang-wrappers \ - --disable-fast-install + --enable-clang-wrappers } src_install() { default - find "${D}" -name '*.la' -delete || die - - if use systemd; then - systemd_dounit "${FILESDIR}/iceccd.service" - systemd_dounit "${FILESDIR}/icecc-scheduler.service" - else - newconfd suse/sysconfig.icecream icecream - newinitd "${FILESDIR}/icecream.openrc" icecream - fi + + find "${ED}" -name '*.la' -delete || die + + systemd_dounit "${FILESDIR}"/iceccd.service + systemd_dounit "${FILESDIR}"/icecc-scheduler.service + + newconfd suse/sysconfig.icecream icecream + newinitd "${FILESDIR}"/icecream.openrc icecream keepdir /var/log/icecream fowners icecream:icecream /var/log/icecream - fperms 0750 /var/log/icecream + fperms 0750 /var/log/icecream - newtmpfiles "${FILESDIR}/icecream-tmpfiles.conf" icecream.conf + newtmpfiles "${FILESDIR}"/icecream-tmpfiles.conf icecream.conf insinto /etc/logrotate.d newins suse/logrotate icecream @@ -67,11 +61,11 @@ src_install() { doins suse/icecc-scheduler.xml insinto /usr/share/shadowman/tools - newins - icecc <<<'/usr/libexec/icecc/bin' + newins - icecc <<<"${EPREFIX}"/usr/libexec/icecc/bin } pkg_prerm() { - if [[ -z ${REPLACED_BY_VERSION} && ${ROOT} == / ]]; then + if [[ -z ${REPLACED_BY_VERSION} && -z ${ROOT} ]]; then eselect compiler-shadow remove icecc fi } @@ -79,7 +73,7 @@ pkg_prerm() { pkg_postinst() { tmpfiles_process icecream.conf - if [[ ${ROOT} == / ]]; then + if [[ -z ${ROOT} ]]; then eselect compiler-shadow update icecc fi }