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 3350E138359 for ; Mon, 7 Sep 2020 09:15:08 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 28BDFE094A; Mon, 7 Sep 2020 09:15:07 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.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 13546E094A for ; Mon, 7 Sep 2020 09:15:07 +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 09A95335D31 for ; Mon, 7 Sep 2020 09:15:06 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7C5E7320 for ; Mon, 7 Sep 2020 09:15:04 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1599470098.5c5352e5cb5d7e88ab5823c068093840d662a8ce.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/netifrc/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-misc/netifrc/netifrc-9999.ebuild X-VCS-Directories: net-misc/netifrc/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: 5c5352e5cb5d7e88ab5823c068093840d662a8ce X-VCS-Branch: master Date: Mon, 7 Sep 2020 09:15:04 +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: 2f13f10a-4294-4acb-a4c3-c158768057fc X-Archives-Hash: a5f72a03d7cd554aea9fc1d70aed2269 commit: 5c5352e5cb5d7e88ab5823c068093840d662a8ce Author: Lars Wendler gentoo org> AuthorDate: Mon Sep 7 09:01:49 2020 +0000 Commit: Lars Wendler gentoo org> CommitDate: Mon Sep 7 09:14:58 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c5352e5 net-misc/netifrc: Bumped live ebuild to EAPI-7 - Added https EGIT_REPO_URI - Added missing quoting Package-Manager: Portage-3.0.5, Repoman-3.0.1 Signed-off-by: Lars Wendler gentoo.org> net-misc/netifrc/netifrc-9999.ebuild | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/net-misc/netifrc/netifrc-9999.ebuild b/net-misc/netifrc/netifrc-9999.ebuild index fa0a59bb5e6..4503bec9c25 100644 --- a/net-misc/netifrc/netifrc-9999.ebuild +++ b/net-misc/netifrc/netifrc-9999.ebuild @@ -1,15 +1,15 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 -inherit eutils systemd udev +inherit systemd udev DESCRIPTION="Gentoo Network Interface Management Scripts" HOMEPAGE="https://www.gentoo.org/proj/en/base/openrc/" if [[ ${PV} == "9999" ]]; then - EGIT_REPO_URI="git://anongit.gentoo.org/proj/${PN}.git" + EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/netifrc.git" #EGIT_REPO_URI="https://github.com/gentoo/${PN}" # Alternate inherit git-r3 else @@ -21,11 +21,11 @@ LICENSE="BSD-2" SLOT="0" IUSE="" -DEPEND="kernel_linux? ( virtual/pkgconfig ) - !"${S}"/ChangeLog fi - # Allow user patches to be applied without modifying the ebuild - epatch_user + default } src_compile() { @@ -44,7 +43,7 @@ src_compile() { UDEVDIR=${EPREFIX}$(get_udevdir) LIBEXECDIR=${EPREFIX}/lib/${PN} PF=${PF}" - use prefix && MAKE_ARGS="${MAKE_ARGS} MKPREFIX=yes PREFIX=${EPREFIX}" + use prefix && MAKE_ARGS+=" MKPREFIX=yes PREFIX=${EPREFIX}" emake ${MAKE_ARGS} all } @@ -54,15 +53,15 @@ src_install() { dodoc README CREDITS FEATURE-REMOVAL-SCHEDULE STYLE TODO # Install the service file - LIBEXECDIR=${EPREFIX}/lib/${PN} - UNIT_DIR="$(systemd_get_unitdir)" + LIBEXECDIR="${EPREFIX}/lib/${PN}" + UNIT_DIR="$(systemd_get_systemunitdir)" sed "s:@LIBEXECDIR@:${LIBEXECDIR}:" "${S}/systemd/net_at.service.in" > "${T}/net_at.service" || die systemd_newunit "${T}/net_at.service" 'net@.service' dosym "${UNIT_DIR#${EPREFIX}}/net@.service" "${UNIT_DIR#${EPREFIX}}/net@lo.service" } pkg_postinst() { - if [[ ! -e "${EROOT}"/etc/conf.d/net && -z $REPLACING_VERSIONS ]]; then + if [[ ! -e "${EROOT}"/etc/conf.d/net && -z ${REPLACING_VERSIONS} ]]; then elog "The network configuration scripts will use dhcp by" elog "default to set up your interfaces." elog "If you need to set up something more complete, see"