gentoo auto-resync : 02:02:2023 - 21:08:25

3 files changed, 32 insertions, 28 deletions

diff --git a/net-misc/netifrc/Manifest b/net-misc/netifrc/Manifest
index e09c940ce0ac..337f71c5fac8 100644
--- a/net-misc/netifrc/Manifest
+++ b/net-misc/netifrc/Manifest
@@ -1,5 +1,5 @@
 DIST netifrc-0.7.3.tar.gz 84770 BLAKE2B 075440bfd81e4dedd406d9555a18f530b07a47f9268130ebcca6d43d35e9cc5f01105a3eb0ddc084a16e17912aa10e378833b1eef1defd2fc6b22f817cd220bd SHA512 a82ac6835c15763becb5845a8c8d90dfd8d6c289ea5e00b0d7ae332d3e7ad6797f0fdcbf27bb9f44ff345c98884cdfa13210c76089585b8dd9970ded5f6236d8
-EBUILD netifrc-0.7.3-r1.ebuild 2126 BLAKE2B 0e4c4c4d3cb75346129f3b80f3507cb7faad3c7161cc91ec18394089ba2fd8a8b5a73a3b87a10d5cae3119ba28c4277c5449122acb88cbca176c49155d72a1a2 SHA512 960cb238f765d6e8cd92af43acf655883488d4005020fed0b309d80d39b2361a33e04793d46a84c8659b0cd2df7707a45ed4bcb3c8b71324d520f107644bbc19
+EBUILD netifrc-0.7.3-r1.ebuild 2078 BLAKE2B 097b16de98bc6d322cd913c3ec3cc34e6def14143488661b838504d79adf05f48115758c53cc75da3a3c3bb67671a7962ba4e98b95f95e632b1b948e96236fff SHA512 5fec8bff2cdcbb659729bdaec8122ef2fd781763a0216de5a775dc0b40b6930dfeceb0cb86d2aa3b93388b4383b890680b04b0f5869cbbe929d228ced0c2dfac
 EBUILD netifrc-0.7.3.ebuild 2059 BLAKE2B 04bce3c3cdf9b43384e6918de8e91b59ee43fa74a23715c409bff93a7861b968225e604d40a412cb20440d0f3afaa53ea750eeded1a4b674074ee2e306da9ed5 SHA512 c907ae80e8b9a4552b2f5129efe0133ea48341584cae701acc3b37f3a172936413a0a6f9bb93e04b98139590230373121a0bd24cdfd5e4a3dddc7e64bd87fe5f
-EBUILD netifrc-9999.ebuild 2060 BLAKE2B 1d366d74654ce50998e446ad389b0c363b5295422f5d1a1d18634b904d1ebefb7e0ab4b793c6589d3dcfdcaf900d103f12afd373b9fcb1a805f8498eb55a3282 SHA512 3af84d8a1c1e7a031f376f16f4fd874dbe5c43431cb1164d86f81b4b444ca989fbb66209ccf105a59ee0b3a65697d6f386cb115bbc1699c205fa4a01f11f96ef
+EBUILD netifrc-9999.ebuild 2012 BLAKE2B bb63340644d173eb42992fdde37ed654285465ca1a938478515c052173a584350536d20e3dc038e14c09f40570947f8c1fa880916bba2b2163dc83b07866ce0b SHA512 083befaa94a2bf24c769ed55d74b49387576652d087be062e7a5af6094cf15183344123c94f9944b0acc67384d0c7e21a38b75a021ed98819f397ded0a1d2b76
 MISC metadata.xml 459 BLAKE2B 2f21ebec95bd3cbb5e031d3b75255cd1238c8102aec86f24a308802da200243303cb9dc055e539c6fc9b4b466813931fbd8ef90812391bda0612a69b1d09f491 SHA512 4b96b583ea7c9e3fe9b1e0a6023d5e32c640ebd6d532e98ad337952c9d083be5049c03ee8e3190cd9ebe9f2a7401a5cb23027ba903b328ea032ad0197bf47c47
diff --git a/net-misc/netifrc/netifrc-0.7.3-r1.ebuild b/net-misc/netifrc/netifrc-0.7.3-r1.ebuild
index 33d349ea52b6..0f04017a43cb 100644
--- a/net-misc/netifrc/netifrc-0.7.3-r1.ebuild
+++ b/net-misc/netifrc/netifrc-0.7.3-r1.ebuild
@@ -21,10 +21,8 @@ LICENSE="BSD-2"
 SLOT="0"
 IUSE="+dhcp"
 
-DEPEND="!<sys-fs/udev-172"
 RDEPEND="sys-apps/gentoo-functions
 	>=sys-apps/openrc-0.15
-	!<sys-fs/udev-init-scripts-27
 	dhcp? ( || ( net-misc/dhcpcd net-misc/dhcp[client] ) )"
 BDEPEND="kernel_linux? ( virtual/pkgconfig )"
 
@@ -40,25 +38,29 @@ src_prepare() {
 }
 
 src_compile() {
-	MAKE_ARGS="${MAKE_ARGS}
-		UDEVDIR=${EPREFIX}$(get_udevdir)
-		LIBEXECDIR=${EPREFIX}/lib/${PN} PF=${PF}"
+	MAKE_ARGS=(
+		PREFIX="${EPREFIX}"
+		UPREFIX="${EPREFIX}/usr"
+		UDEVDIR="${EPREFIX}$(get_udevdir)"
+		LIBEXECDIR="${EPREFIX}/lib/${PN}"
+		PF="${PF}"
+	)
 
-	use prefix && MAKE_ARGS+=" MKPREFIX=yes PREFIX=${EPREFIX}"
-
-	emake ${MAKE_ARGS} all
+	emake "${MAKE_ARGS[@]}" all
 }
 
 src_install() {
-	emake ${MAKE_ARGS} DESTDIR="${D}" install
+	emake "${MAKE_ARGS[@]}" DESTDIR="${D}" install
 	dodoc README CREDITS FEATURE-REMOVAL-SCHEDULE STYLE TODO
 
 	# Install the service file
-	LIBEXECDIR="${EPREFIX}/lib/${PN}"
-	UNIT_DIR="$(systemd_get_systemunitdir)"
+	local LIBEXECDIR="${EPREFIX}/lib/${PN}"
 	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"
+
+	local UNIT_DIR="$(systemd_get_systemunitdir)"
+	UNIT_DIR="${UNIT_DIR#"${EPREFIX}"}"
+	dosym net@.service "${UNIT_DIR}/net@lo.service"
 }
 
 pkg_postinst() {
diff --git a/net-misc/netifrc/netifrc-9999.ebuild b/net-misc/netifrc/netifrc-9999.ebuild
index 31f53c53facc..b9264c7f7cf7 100644
--- a/net-misc/netifrc/netifrc-9999.ebuild
+++ b/net-misc/netifrc/netifrc-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -21,10 +21,8 @@ LICENSE="BSD-2"
 SLOT="0"
 IUSE=""
 
-DEPEND="!<sys-fs/udev-172"
 RDEPEND="sys-apps/gentoo-functions
-	>=sys-apps/openrc-0.15
-	!<sys-fs/udev-init-scripts-27"
+	>=sys-apps/openrc-0.15"
 BDEPEND="kernel_linux? ( virtual/pkgconfig )"
 
 src_prepare() {
@@ -39,25 +37,29 @@ src_prepare() {
 }
 
 src_compile() {
-	MAKE_ARGS="${MAKE_ARGS}
-		UDEVDIR=${EPREFIX}$(get_udevdir)
-		LIBEXECDIR=${EPREFIX}/lib/${PN} PF=${PF}"
+	MAKE_ARGS=(
+		PREFIX="${EPREFIX}"
+		UPREFIX="${EPREFIX}/usr"
+		UDEVDIR="${EPREFIX}$(get_udevdir)"
+		LIBEXECDIR="${EPREFIX}/lib/${PN}"
+		PF="${PF}"
+	)
 
-	use prefix && MAKE_ARGS+=" MKPREFIX=yes PREFIX=${EPREFIX}"
-
-	emake ${MAKE_ARGS} all
+	emake "${MAKE_ARGS[@]}" all
 }
 
 src_install() {
-	emake ${MAKE_ARGS} DESTDIR="${D}" install
+	emake "${MAKE_ARGS[@]}" DESTDIR="${D}" install
 	dodoc README CREDITS FEATURE-REMOVAL-SCHEDULE STYLE TODO
 
 	# Install the service file
-	LIBEXECDIR="${EPREFIX}/lib/${PN}"
-	UNIT_DIR="$(systemd_get_systemunitdir)"
+	local LIBEXECDIR="${EPREFIX}/lib/${PN}"
 	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"
+
+	local UNIT_DIR="$(systemd_get_systemunitdir)"
+	UNIT_DIR="${UNIT_DIR#"${EPREFIX}"}"
+	dosym net@.service "${UNIT_DIR}/net@lo.service"
 }
 
 pkg_postinst() {