gentoo auto-resync : 26:09:2022 - 03:05:22

4 files changed, 2 insertions, 105 deletions

diff --git a/net-misc/linuxptp/Manifest b/net-misc/linuxptp/Manifest
index 77abf044d8fe..8d107a235dab 100644
--- a/net-misc/linuxptp/Manifest
+++ b/net-misc/linuxptp/Manifest
@@ -1,11 +1,8 @@
-AUX linuxptp-2.0_nettstamp-systypes.patch 1374 BLAKE2B 2b90a983e99cea7c686cbb28eb7c53fece2ad22dda0a898fa3ba0a867686d500f288e24c18c473729d48deda99565069b4983ee02f56214bab6367e6a19ff9cd SHA512 e9e0ae1be45c1d3d71cbf9c7df30584e52d8169755f516e920eb49e52c0dea5e388c36e92d9d000112d7630631cdc97d2eaa55fab1413d13d145a4970b1b7120
 AUX linuxptp-3.1.1-string-include.patch 630 BLAKE2B 7b9dbbb6988282f0a600414440708663ef802896b3b8a674eea4937bb6edc013526faffb2647c1995b881f41699eda868cee9adeca8efb9e49633c1b8af880c8 SHA512 898f30ce82bae0c070814825a11d050fcbbcd6b769c4207bb988ec69edc8a31d920475e86e847ec99e815f18c147640763f3e123517222f273a1953abd366fc7
 AUX linuxptp-3.1.1-user_cpp.patch 329 BLAKE2B e99f87e5e8c42ac3eff67b8fea87994718ab7531dac0a69b609cd2fda0e3d88762439c1dbcfe9b76ef07bea8a159476e32624c146c9a89756e22560b691d0b27 SHA512 03a40f08cd783a16849ebfbf033e1f0a953d8aac31c56ea69adad4e4c2fede3a8acc7ecc8bc62706b9fbc7271fb5781c95fd7f7b03aa4c67da8a2afae65dfa19
 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-2.0.tgz 184942 BLAKE2B 79ef9d3c379769a71e652a77f05ab661db444a76a339e72106055cf900de9cabfe303c48760f11701fefe5e641d07b73fc5a250078bedf7faa3ae995ace24da3 SHA512 c33487a803f8cc461f790d9a137d5cf8b35cb6d292bdd2cf7a16aa666359d8c5e24667473be843182bef1e9f8d5c6af8aab8918978f10bf08257dd408bba66d6
 DIST linuxptp-3.1.1.tgz 218784 BLAKE2B 5b46580a0e1b6e003f5f03e512c4f9b348c086f356fd47d3480da5e8223ba291fdb213798c696c37759896a99bccf21cd7e7daddce5aa5ed5701afb0e622a755 SHA512 c3c40987fe68480a8473097ebc3c506fb4f8f3b6456bbe637b2b3cb0b3e0182f1513b511fdc04b3607d5f7d8bd1bd22502bb86eb13f9fa4fa63a3331846b33ec
-EBUILD linuxptp-2.0-r1.ebuild 1042 BLAKE2B c1ca710e95c14a358dfa16ee99fbe0fe5594e7e7c403a987a79b03eb9a74464a3f72a7f585c0ec779d5aceceb8f5a25afc4d3f55ac4a0038fde8fd5b4a992f42 SHA512 3cd615b214e0f519f6ec63fbadc36169aee412742debeffbf3364b05d301cae2361a7d0ad9ac79567e25713f38744160f359abb72fad840eeafd5c0d53364017
-EBUILD linuxptp-3.1.1-r1.ebuild 1245 BLAKE2B 29e16fbdc8f434df6a414486d105e902a5975bc2798e9982db79837f6b336aaa6a76baac9a93adb2926c6875f5620ae374d1ad14e44b119e13f8da6b838de338 SHA512 ca38c01ccb87e25039e0cad058a00ab5e338aa05b0bf55b96b5017e672122074e74f6878f56e4f76257e3d9eb93cb789cf196d1667646818e4c7073342137ce0
+EBUILD linuxptp-3.1.1-r1.ebuild 1244 BLAKE2B 3d3fd5c5fd85addbaddfec4e4344722ac57bc9ebb91699c501ed0ce9e36e9f48eb45e63b0d4c049c7aa717b7ec2cbf6dfa46283df39b239a48086eb39a3f3aa6 SHA512 92dd2c98a1391bf8a6ce22d8bcd354f705a83e38352a1175c240770705fc0251f65bf8276282b08a53ec565bf5abba3264db4a59cb0c516f45260eb4228a550a
 MISC metadata.xml 434 BLAKE2B 6294b76d69b7459ff51a8b3f679ca7bfd940a70088eb53be6e15092465a3cb01f4a7b8b5430244b871321c320ec389ac1b05b239f3eef54e9284e881910e13cf SHA512 7f2fb3921793510144e823c70d1ac263297d3591055c680fc8192dd8402e8a763bc8de8882f9c441e060e23cebaa5e6c684873d82738a6ae8f54b6e027b5c837
diff --git a/net-misc/linuxptp/files/linuxptp-2.0_nettstamp-systypes.patch b/net-misc/linuxptp/files/linuxptp-2.0_nettstamp-systypes.patch
deleted file mode 100644
index d3f8e5d92906..000000000000
--- a/net-misc/linuxptp/files/linuxptp-2.0_nettstamp-systypes.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-net_tstamp.h needs clockid_t to be defined, so must include
-<sys/types.h> before including <linux/net_tstamp.h>
-
-
---- a/clock.c
-+++ b/clock.c
-@@ -17,6 +17,7 @@
-  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-  */
- #include <errno.h>
-+#include <sys/types.h>
- #include <linux/net_tstamp.h>
- #include <poll.h>
- #include <stdlib.h>
---- a/hwstamp_ctl.c	2018-08-12 23:08:43.000000000 +0200
-+++ b/hwstamp_ctl.c	2020-02-07 13:49:53.256859722 +0100
-@@ -23,6 +23,7 @@
- #include <string.h>
- #include <sys/ioctl.h>
- #include <unistd.h>
-+#include <sys/types.h>
- 
- #include <arpa/inet.h>
- #include <linux/net_tstamp.h>
---- a/sk.c	2018-08-12 23:08:43.000000000 +0200
-+++ b/sk.c	2020-02-07 13:50:12.334599236 +0100
-@@ -18,6 +18,7 @@
-  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-  */
- #include <errno.h>
-+#include <sys/types.h>
- #include <linux/net_tstamp.h>
- #include <linux/sockios.h>
- #include <linux/ethtool.h>
---- a/timemaster.c	2018-08-12 23:08:43.000000000 +0200
-+++ b/timemaster.c	2020-02-07 13:50:19.848500949 +0100
-@@ -22,7 +22,6 @@
- #include <errno.h>
- #include <libgen.h>
- #include <limits.h>
--#include <linux/net_tstamp.h>
- #include <net/if.h>
- #include <signal.h>
- #include <spawn.h>
-@@ -34,6 +33,7 @@
- #include <sys/types.h>
- #include <sys/wait.h>
- #include <unistd.h>
-+#include <linux/net_tstamp.h>
- 
- #include "print.h"
- #include "rtnl.h"
diff --git a/net-misc/linuxptp/linuxptp-2.0-r1.ebuild b/net-misc/linuxptp/linuxptp-2.0-r1.ebuild
deleted file mode 100644
index e979ea289cb2..000000000000
--- a/net-misc/linuxptp/linuxptp-2.0-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit linux-info systemd toolchain-funcs
-
-DESCRIPTION="The Linux Precision Time Protocol (PTP) implementation"
-HOMEPAGE="http://linuxptp.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/v${PV}/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
-IUSE=""
-
-DEPEND="elibc_musl? ( sys-libs/queue-standalone )"
-RDEPEND=""
-
-CONFIG_CHECK="~PPS ~NETWORK_PHY_TIMESTAMPING ~PTP_1588_CLOCK"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.0_nettstamp-systypes.patch
-)
-
-pkg_setup() {
-	linux-info_pkg_setup
-}
-
-src_compile() {
-	# parse needed additional CFLAGS
-	export MY_FLAGS=$(./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_dounit "${FILESDIR}"/timemaster.service
-
-	dodoc README.org
-}
diff --git a/net-misc/linuxptp/linuxptp-3.1.1-r1.ebuild b/net-misc/linuxptp/linuxptp-3.1.1-r1.ebuild
index df701b773917..de162a29e0a7 100644
--- a/net-misc/linuxptp/linuxptp-3.1.1-r1.ebuild
+++ b/net-misc/linuxptp/linuxptp-3.1.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/project/${PN}/v$(ver_cut 1-2)/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm64 ~riscv ~x86"
 
 DEPEND="elibc_musl? ( sys-libs/queue-standalone )"