| 1 |
commit: 5c5352e5cb5d7e88ab5823c068093840d662a8ce |
| 2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Sep 7 09:01:49 2020 +0000 |
| 4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Sep 7 09:14:58 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c5352e5 |
| 7 |
|
| 8 |
net-misc/netifrc: Bumped live ebuild to EAPI-7 |
| 9 |
|
| 10 |
- Added https EGIT_REPO_URI |
| 11 |
- Added missing quoting |
| 12 |
|
| 13 |
Package-Manager: Portage-3.0.5, Repoman-3.0.1 |
| 14 |
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> |
| 15 |
|
| 16 |
net-misc/netifrc/netifrc-9999.ebuild | 21 ++++++++++----------- |
| 17 |
1 file changed, 10 insertions(+), 11 deletions(-) |
| 18 |
|
| 19 |
diff --git a/net-misc/netifrc/netifrc-9999.ebuild b/net-misc/netifrc/netifrc-9999.ebuild |
| 20 |
index fa0a59bb5e6..4503bec9c25 100644 |
| 21 |
--- a/net-misc/netifrc/netifrc-9999.ebuild |
| 22 |
+++ b/net-misc/netifrc/netifrc-9999.ebuild |
| 23 |
@@ -1,15 +1,15 @@ |
| 24 |
# Copyright 1999-2020 Gentoo Authors |
| 25 |
# Distributed under the terms of the GNU General Public License v2 |
| 26 |
|
| 27 |
-EAPI=5 |
| 28 |
+EAPI=7 |
| 29 |
|
| 30 |
-inherit eutils systemd udev |
| 31 |
+inherit systemd udev |
| 32 |
|
| 33 |
DESCRIPTION="Gentoo Network Interface Management Scripts" |
| 34 |
HOMEPAGE="https://www.gentoo.org/proj/en/base/openrc/" |
| 35 |
|
| 36 |
if [[ ${PV} == "9999" ]]; then |
| 37 |
- EGIT_REPO_URI="git://anongit.gentoo.org/proj/${PN}.git" |
| 38 |
+ EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/netifrc.git" |
| 39 |
#EGIT_REPO_URI="https://github.com/gentoo/${PN}" # Alternate |
| 40 |
inherit git-r3 |
| 41 |
else |
| 42 |
@@ -21,11 +21,11 @@ LICENSE="BSD-2" |
| 43 |
SLOT="0" |
| 44 |
IUSE="" |
| 45 |
|
| 46 |
-DEPEND="kernel_linux? ( virtual/pkgconfig ) |
| 47 |
- !<sys-fs/udev-172" |
| 48 |
+DEPEND="!<sys-fs/udev-172" |
| 49 |
RDEPEND="sys-apps/gentoo-functions |
| 50 |
>=sys-apps/openrc-0.15 |
| 51 |
!<sys-fs/udev-init-scripts-27" |
| 52 |
+BDEPEND="kernel_linux? ( virtual/pkgconfig )" |
| 53 |
|
| 54 |
src_prepare() { |
| 55 |
if [[ ${PV} == "9999" ]] ; then |
| 56 |
@@ -35,8 +35,7 @@ src_prepare() { |
| 57 |
GIT_DIR="${S}/.git" git log >"${S}"/ChangeLog |
| 58 |
fi |
| 59 |
|
| 60 |
- # Allow user patches to be applied without modifying the ebuild |
| 61 |
- epatch_user |
| 62 |
+ default |
| 63 |
} |
| 64 |
|
| 65 |
src_compile() { |
| 66 |
@@ -44,7 +43,7 @@ src_compile() { |
| 67 |
UDEVDIR=${EPREFIX}$(get_udevdir) |
| 68 |
LIBEXECDIR=${EPREFIX}/lib/${PN} PF=${PF}" |
| 69 |
|
| 70 |
- use prefix && MAKE_ARGS="${MAKE_ARGS} MKPREFIX=yes PREFIX=${EPREFIX}" |
| 71 |
+ use prefix && MAKE_ARGS+=" MKPREFIX=yes PREFIX=${EPREFIX}" |
| 72 |
|
| 73 |
emake ${MAKE_ARGS} all |
| 74 |
} |
| 75 |
@@ -54,15 +53,15 @@ src_install() { |
| 76 |
dodoc README CREDITS FEATURE-REMOVAL-SCHEDULE STYLE TODO |
| 77 |
|
| 78 |
# Install the service file |
| 79 |
- LIBEXECDIR=${EPREFIX}/lib/${PN} |
| 80 |
- UNIT_DIR="$(systemd_get_unitdir)" |
| 81 |
+ LIBEXECDIR="${EPREFIX}/lib/${PN}" |
| 82 |
+ UNIT_DIR="$(systemd_get_systemunitdir)" |
| 83 |
sed "s:@LIBEXECDIR@:${LIBEXECDIR}:" "${S}/systemd/net_at.service.in" > "${T}/net_at.service" || die |
| 84 |
systemd_newunit "${T}/net_at.service" 'net@.service' |
| 85 |
dosym "${UNIT_DIR#${EPREFIX}}/net@.service" "${UNIT_DIR#${EPREFIX}}/net@××.service" |
| 86 |
} |
| 87 |
|
| 88 |
pkg_postinst() { |
| 89 |
- if [[ ! -e "${EROOT}"/etc/conf.d/net && -z $REPLACING_VERSIONS ]]; then |
| 90 |
+ if [[ ! -e "${EROOT}"/etc/conf.d/net && -z ${REPLACING_VERSIONS} ]]; then |
| 91 |
elog "The network configuration scripts will use dhcp by" |
| 92 |
elog "default to set up your interfaces." |
| 93 |
elog "If you need to set up something more complete, see" |
Archives