gentoo resync : 13.06.2020

3 files changed, 5 insertions, 43 deletions

diff --git a/net-misc/linuxptp/Manifest b/net-misc/linuxptp/Manifest
index 483cbdf0d27e..039cda7c5b54 100644
--- a/net-misc/linuxptp/Manifest
+++ b/net-misc/linuxptp/Manifest
@@ -1,5 +1,3 @@
-DIST linuxptp-1.8.tgz 147764 BLAKE2B f0dec589cf4f27c03f901262980f1c471382eefdd00772da0065077bab29ed7c1350d70b1ec4b0c912dd82304220b9c550320b82cf269d99478d40c5a7ed8541 SHA512 8ac52428b7addf1c43769083e660ca0ceb2813994107b8b9c59338e480f1d2e45666ebcc3f59f7b8cf9a02301b55aa54b26cbbbf81622a525a704f2d08fd383e
 DIST linuxptp-2.0.tgz 184942 BLAKE2B 79ef9d3c379769a71e652a77f05ab661db444a76a339e72106055cf900de9cabfe303c48760f11701fefe5e641d07b73fc5a250078bedf7faa3ae995ace24da3 SHA512 c33487a803f8cc461f790d9a137d5cf8b35cb6d292bdd2cf7a16aa666359d8c5e24667473be843182bef1e9f8d5c6af8aab8918978f10bf08257dd408bba66d6
-EBUILD linuxptp-1.8.ebuild 722 BLAKE2B 97d6de01f6ff2ee009d29ba9b88a998548ec5dcc04b22bc60ecf045dafd34e4e00167f1856336a105e5041cc622655fb063301b25079c0f4b3fc0fa2f81109e8 SHA512 00c6f58bce0eff4bff18e7efe2ca3ecac87c827b17b9dd3ca0eac8b882ac4508ee854f4ac36f3d72b2d85e2d6b48393a4ff96b127655aa1a3b202dc1808a4716
-EBUILD linuxptp-2.0.ebuild 722 BLAKE2B 4e2fa0cf213c2c68a33b0421d739aac77a30d10bd427cf3fff04ae323f47797cc0dea6c900a2939cae70c77fbf731626494fe75147a693b9d23d7abd07f21798 SHA512 060f6868ef72d2aacf5c1f2ed2322feb7bbe1f4f5733b0b2c4157da9b30d43daa828c440aa38b73960e88e67341b1f244a89b568ca080173e38e460be4adfa75
+EBUILD linuxptp-2.0.ebuild 762 BLAKE2B 4aae3a869826fc311459f7bb2aeda456c6ab3cb09378842361b85f8e98a7915550451c4d9efd67f1fe751b6e78cee5fd99e13731b4e7b175cb99cb4e5ee8d964 SHA512 85bb3b3f52ca6744b33fa4e04d0e5bf96698c90bf2bc442edca4e11ac6741437f68e3d34019acfc5cc927a674bf0b2afcd4c96c03ab27f7f0204cf09a44cd5d0
 MISC metadata.xml 445 BLAKE2B abfb043154cd84cb3a40212f54d9be67e89bfda3f83cdb9a8d65d8032b8d1f0a0b8dcfb4fdbaa5ed303dfa65f35715ee714a84026b730c26964a1e06a41b32e2 SHA512 6016bb962e61088156d9f2b78d8dfc0f4b07e6a22016d7d591459b8254ef42798c902a2cdfe183972703d3c1911ab48d7b3c95a0bc1b470a4dcc1a34ea66d232
diff --git a/net-misc/linuxptp/linuxptp-1.8.ebuild b/net-misc/linuxptp/linuxptp-1.8.ebuild
deleted file mode 100644
index aa5a2f7ccf00..000000000000
--- a/net-misc/linuxptp/linuxptp-1.8.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit linux-info
-
-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 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-CONFIG_CHECK="~PPS ~NETWORK_PHY_TIMESTAMPING ~PTP_1588_CLOCK"
-
-src_compile() {
-	export EXTRA_CFLAGS=${CFLAGS}
-	emake 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
-
-	dodoc README.org
-}
diff --git a/net-misc/linuxptp/linuxptp-2.0.ebuild b/net-misc/linuxptp/linuxptp-2.0.ebuild
index 3d391a525a97..716fbf22a46d 100644
--- a/net-misc/linuxptp/linuxptp-2.0.ebuild
+++ b/net-misc/linuxptp/linuxptp-2.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit linux-info
+inherit linux-info toolchain-funcs
 
 DESCRIPTION="The Linux Precision Time Protocol (PTP) implementation"
 HOMEPAGE="http://linuxptp.sourceforge.net/"
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/v${PV}/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE=""
 
 DEPEND=""
@@ -21,7 +21,7 @@ CONFIG_CHECK="~PPS ~NETWORK_PHY_TIMESTAMPING ~PTP_1588_CLOCK"
 
 src_compile() {
 	export EXTRA_CFLAGS=${CFLAGS}
-	emake prefix=/usr mandir=/usr/share/man
+	emake CC="$(tc-getCC)" prefix=/usr mandir=/usr/share/man
 }
 
 src_install() {