gentoo auto-resync : 21:11:2023 - 11:12:11

6 files changed, 8 insertions, 62 deletions

diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 2e3abfeb3815..4a163a93996f 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/linuxptp/Manifest b/net-misc/linuxptp/Manifest
index 605b8fb6123d..f88bb1f0e9a1 100644
--- a/net-misc/linuxptp/Manifest
+++ b/net-misc/linuxptp/Manifest
@@ -3,8 +3,6 @@ AUX linuxptp-3.1.1-user_cpp.patch 329 BLAKE2B e99f87e5e8c42ac3eff67b8fea87994718
 AUX phc2sysAT.service 248 BLAKE2B b0e1926a7755314bd0def600e81dbf7b60707216ff3844194512511ce99407cc88da7a2c83e019b20571098eba3f2297c1a1fe54da47f8fb5e07a58c20a007a2 SHA512 55f048ae44eb43894aad957b35842b0b21aa27e922be85bd286847281f8716bdde9b8187ca90d90d31c9d4587de4c35eebaf0e47498f9b950279037e03069086
 AUX ptp4lAT.service 242 BLAKE2B 2b0ca6ca5b7e4adde39ca360713af02450c0d36b1f4a2393350a59d80dcb0cc26000862546b732aac9f6b89ed6fdec0175485685cc3343d2d33fc48d671cca03 SHA512 f182fc52ebfc8fa878d94604fd398d071fcf8347cc8c251a2f8f78fbce518181c543f2eae971ecfb768bc9337c816d894ab150b37ce1642e854a65792324a50b
 AUX timemaster.service 234 BLAKE2B c59cfb10a85db09dc48830b166e6c3338949a2f12b4170a00d0f5b44f118fff5a56dd2fb74fecead5068f8b345399bb27dfef1e382fa27a777e9ddc65b7b92a9 SHA512 d3b1f7fb31ca0b233575bc491ba52700be8d586ead5657facda3b84141cd1467b55c52f4cafea972f13d1c647cc8b3bb1092bca580fd0b0d135688d00a641a82
-DIST linuxptp-4.0.tgz 250862 BLAKE2B 2c790e35677ee443b39130459b51e9b7237ec780f6e9774028e3c956de6e962ae8272157bf5e6bea847a098654b8cf9621a907b57c38778d55383182ec2d63aa SHA512 763de5654f0426f2f489223e02fb3dd39a3a830751b366406657efe33bb923b5b38edada7b62de3efed6d257d5d386ece0d42a5eb92da5e5d443eac9b32e105d
 DIST linuxptp-4.1.tgz 252373 BLAKE2B 9dc6bb69c98a8b452250554b5e06b39d445b81a3e0c7ce2beaa7bd1d2cb969928496827bd3d3e32136c9fe55f1103ab312441c2a4cdee035c7d6b7526f0c1327 SHA512 144c03677f2c61c58d05c5c5dbb771b7aac3860507d9ba814f67f6da024c3cb2019f9e8cf39b983d39a6feddd1b24a1f40a678b4ff7af8aa564ee813e322dfae
-EBUILD linuxptp-4.0.ebuild 1240 BLAKE2B fe28e6be6b601885d0172ddde0ebb2dd9ce0cb74bae9df3b62a2b270ed1298cb18cadce448da2357fbf844001a2590df191ffffe1d1ade761e0b70dd47c77e41 SHA512 2abdbcbabbdc8b49c0447d2a5e1395f48cbf84df9f17865126ff228df64c5261ce98562082db7cf8deaa09b9b55967486b3f7b3370b506392456aa6f43ada823
 EBUILD linuxptp-4.1.ebuild 1240 BLAKE2B fe28e6be6b601885d0172ddde0ebb2dd9ce0cb74bae9df3b62a2b270ed1298cb18cadce448da2357fbf844001a2590df191ffffe1d1ade761e0b70dd47c77e41 SHA512 2abdbcbabbdc8b49c0447d2a5e1395f48cbf84df9f17865126ff228df64c5261ce98562082db7cf8deaa09b9b55967486b3f7b3370b506392456aa6f43ada823
 MISC metadata.xml 434 BLAKE2B 6294b76d69b7459ff51a8b3f679ca7bfd940a70088eb53be6e15092465a3cb01f4a7b8b5430244b871321c320ec389ac1b05b239f3eef54e9284e881910e13cf SHA512 7f2fb3921793510144e823c70d1ac263297d3591055c680fc8192dd8402e8a763bc8de8882f9c441e060e23cebaa5e6c684873d82738a6ae8f54b6e027b5c837
diff --git a/net-misc/linuxptp/linuxptp-4.0.ebuild b/net-misc/linuxptp/linuxptp-4.0.ebuild
deleted file mode 100644
index f121905d932c..000000000000
--- a/net-misc/linuxptp/linuxptp-4.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit linux-info systemd toolchain-funcs
-
-DESCRIPTION="The Linux Precision Time Protocol (PTP) implementation"
-HOMEPAGE="https://linuxptp.nwtime.org/"
-SRC_URI="mirror://sourceforge/project/${PN}/v$(ver_cut 1-2)/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~riscv ~x86"
-
-DEPEND="elibc_musl? ( sys-libs/queue-standalone )"
-
-CONFIG_CHECK="~NETWORK_PHY_TIMESTAMPING ~PPS ~PTP_1588_CLOCK"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.1.1-user_cpp.patch
-	"${FILESDIR}"/${PN}-3.1.1-string-include.patch
-)
-
-pkg_setup() {
-	linux-info_pkg_setup
-}
-
-src_compile() {
-	# parse needed additional CFLAGS
-	export MY_FLAGS=$(CPP="$(tc-getCPP)" ./incdefs.sh)
-	export EXTRA_CFLAGS="${CFLAGS} ${MY_FLAGS}"
-	emake CC="$(tc-getCC)" prefix=/usr mandir=/usr/share/man
-}
-
-src_install() {
-	emake \
-		prefix="${D}"/usr \
-		mandir="${D}"/usr/share/man \
-		infodir="${D}"/usr/share/info \
-		libdir="${D}"/usr/$(get_libdir) \
-		install
-
-	systemd_newunit "${FILESDIR}"/phc2sysAT.service phc2sys@.service
-	systemd_newunit "${FILESDIR}"/ptp4lAT.service ptp4l@.service
-	systemd_dounit "${FILESDIR}"/timemaster.service
-
-	dodoc README.org
-	dodoc -r configs
-}
diff --git a/net-misc/ptpd/Manifest b/net-misc/ptpd/Manifest
index 13a2d3da6d04..100c519a6025 100644
--- a/net-misc/ptpd/Manifest
+++ b/net-misc/ptpd/Manifest
@@ -1,7 +1,7 @@
 AUX ptpd-2.3.1-fix-snmp.patch 420 BLAKE2B c3b9da6337671c9a502bc36a8b2ad85bc7ff041cdc496a05c0e4e32d22dd5a933150d6e65252afb1c79c7fc45e148d4f2ba63adca8b18e6227581ee2515069fd SHA512 40e6f89dc922da9b3a68f7513a4d08f8708a1f4ebb87147c6ab3e6a75d8aaa5a627045e967c5256445897175205c7b95e77f0ca7322062fa6265b7e909097978
 AUX ptpd2.confd 61 BLAKE2B 0724014663c4e18dd2205982e4ebb20b6cc5af2eda0d1070515b2823924882f34b1f1879ba3ee3540d4918203c4b6f23d04da276aaf5f938963794e1eef7f87b SHA512 40ea56a92222eb10dc429343a23bdcc0e75f626e34fea139a09ca545a50aee0550253965de036218889554a2c0c7928c0051e3e71d9b9cd0a9d44d334e0bac47
-AUX ptpd2.rc 1372 BLAKE2B 071dce26d1343050b212312381a07af6b24d4923d715e4b7c4e065ab67283a3bcf4b350d1c28a9270cb9c03b8e04cffff6b3e422a80460d6210b546b684bd37d SHA512 37af776a265fbabdabed381d98cf50d78a512634fd84ce07466a47a0e96a6b2cccfb762732a043139b6c136eefdc6443ab9a5cba1c30234b6c66acc23e98a5b2
+AUX ptpd2.rc 1367 BLAKE2B 1a110bd0d224ad9dc4c4e322eb1343c7d8af71781ef31988793109b4e65f2c8e81ab849e0426b413cfcccd5c8e403d3486f62b01bf40ce2d8c35dfa1ec6d7669 SHA512 ae0131ac9d1abf66d38628a6c2279ba9b56f0f25b3fad77e44d61641f7ff4f6f6acaaddc3888645953d887cd5db2b4fb77dec5361872c70047ee60fd9468901f
 AUX ptpd2.service 228 BLAKE2B 89bb7a7b4352f9905032ca7efc778cc220282df8389f1da4f60af653cc71b2bc15d08c73730f326c9311f97ebeff2602b73cdbd55683a2d69cb57d0a63a28a47 SHA512 72d609c9b803921b55cc0528aafa5cbbff0b7ed2f1267fa5f06e410ec640295642717928bbf38c849f632d157132f01f60a8bad826428b846d8248bac27e932a
 DIST ptpd-2.3.1.tar.gz 884161 BLAKE2B 029eeff4ff427aec7a24365bd7f62a4f5d6bfe4bc0a003b0fa8ca1f7581b2395cb96c27bfa59c6333b0354ac0fb12fb11fd24319506c2168e0ff4ddfb3df9117 SHA512 25c128ce1920ae2c1469e986bfa5d5b8ebca04ec14b838fb8232b36e0a1ef94646507e1b25034846d11cf0f71d7e2da983b9f6408f8fcfc608904ecfec2a15c4
-EBUILD ptpd-2.3.1-r2.ebuild 1355 BLAKE2B 79dea132eb4bb53e57377fa0f6f91c94db0dc49dd1cdf06fc386023e297683ae3b40e9c9890b3523e9812b07c1d09bedc5c3b6ed29ac0f5834716b0abf9725cd SHA512 a57208c0546ca61c18bccc3a376ab79a404402315e91e5105274ec145c1421cfa760b3e2a85f18809980337dae3dff687bd75c9cf9e1e0ce31e787a01470e4f8
+EBUILD ptpd-2.3.1-r2.ebuild 1356 BLAKE2B 1e6a17a46d623c66ffa04e85e7b2af3445daf968f763f662623c643b5620e28a96645452f729714bd5aa10137097eb4c74930dd48db558a9915f32cb086be2b4 SHA512 7e686d306555f36523058bdd615f15868bcfe26ba6907c038bc3ace1ef4a7d240e53c862bf78a6cbd2c843624e0c5425691cf544499e4f6a7f70d18d02dc1471
 MISC metadata.xml 1019 BLAKE2B c7befd03b655ee5a0b1864a243bc8bb20db4bd79c2bf86f3eac2508d1fae41007693dee179dfe0a7ae14be00b7d05cae62cfaf41578121745eb36c057bfd94fc SHA512 256f312985bf97cc531cc8f100ff7436bce503c22cbb231c9cba26a708f40a12a97bc3bf0980bcf9c306bfdbec1c628fb0c6caf8d9f678edcde87035eea468af
diff --git a/net-misc/ptpd/files/ptpd2.rc b/net-misc/ptpd/files/ptpd2.rc
index bf8e14332298..4896d68149c0 100644
--- a/net-misc/ptpd/files/ptpd2.rc
+++ b/net-misc/ptpd/files/ptpd2.rc
@@ -27,9 +27,9 @@ checkconfig() {
 
 	# colorize output
 	echo "$msgout" | while read ln; do
-		if [[ "$ln" == *ignored* ]]; then
+		if [ "$ln" = *ignored* ]; then
 			ewarn "$ln"
-		elif [[ "$ln" != "Configuration OK" ]]; then
+		elif [ "$ln" != "Configuration OK" ]; then
 			eerror "$ln"
 		fi
 	done
diff --git a/net-misc/ptpd/ptpd-2.3.1-r2.ebuild b/net-misc/ptpd/ptpd-2.3.1-r2.ebuild
index 96dae3022e0d..6b5600180760 100644
--- a/net-misc/ptpd/ptpd-2.3.1-r2.ebuild
+++ b/net-misc/ptpd/ptpd-2.3.1-r2.ebuild
@@ -1,13 +1,14 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 inherit autotools flag-o-matic systemd
 
 DESCRIPTION="Precision Time Protocol daemon"
 HOMEPAGE="https://github.com/ptpd/ptpd"
 SRC_URI="https://github.com/ptpd/ptpd/archive/${P}.tar.gz"
+S="${WORKDIR}/ptpd-${P}"
 
 KEYWORDS="~amd64 ~arm ~x86"
 LICENSE="BSD"
@@ -25,11 +26,8 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-2.3.1-fix-snmp.patch
 )
 
-S=${WORKDIR}/ptpd-${P}
-
 src_prepare() {
 	default
-
 	eautoreconf
 }
 
@@ -61,5 +59,5 @@ src_install() {
 
 pkg_postinst() {
 	elog "Do not forget to setup correct network interface."
-	elog "Change the config file ${EROOT}etc/ptpd2.conf to suit your needs."
+	elog "Change the config file ${EROOT}/etc/ptpd2.conf to suit your needs."
 }