gentoo resync : 28.04.2021

5 files changed, 36 insertions, 26 deletions

diff --git a/dev-libs/libvterm/Manifest b/dev-libs/libvterm/Manifest
index acb3fd58dcce..e8de7ff01d07 100644
--- a/dev-libs/libvterm/Manifest
+++ b/dev-libs/libvterm/Manifest
@@ -2,8 +2,8 @@ DIST libvterm-0.0_pre20181126.tar.gz 65524 BLAKE2B 00ad4cbc60739aae173e86ae7aa35
 DIST libvterm-0.1.1.tar.gz 69044 BLAKE2B 2e521a26238772370718e3c643e2225c9be7877f6312573d54c8cf3b34e38996886f1100ddae12e34ced1c8eace1a307238024fb91b2a96e6b9e2e85d30a5073 SHA512 beb21ae2bcc5f5e7dbc8cb645e004ce923f2b77f756b48a9ec835dbe1c99afa8cdbce12c5f982b5ca880b5b1ea113570d48733a1d043a7b16ae271f5718a6757
 DIST libvterm-0.1.2.tar.gz 69050 BLAKE2B bd547e14ef2b2b7c733a88ccd975db5ccc936ad5df49221cc6877be223e48da41fd8e5cf40dbc8750a95d6efaa6e5b97d337d4a013ec534a4bbfd68279325bc0 SHA512 5d6a17b98d4dda9d0529c3686cadc1f788e48667fa133100bfb0cdc92a6b08d0ea2f1a6058f58941e1408788c4f1d5a86941ec2457e31c6582f5ddd13bcdf7c4
 DIST libvterm-0.1.3.tar.gz 69115 BLAKE2B befdb173a75652a42f3ba72682cc5c411ee170f2cfe46a22f133ca2b414f40f3af97331a4aaa34ca2a36f39b2ef92b63f2730bd872db8181512fd18f95921034 SHA512 de68b36c589638cc727fdd8153af66cc9288d32567bca1213e3769418a7b98afff68565dfd34f73f74625c39e66b60da7e658e9afa9bef4efa2072ff91d872e5
-EBUILD libvterm-0.0_pre20181126.ebuild 788 BLAKE2B f7e9795a2b2a162d34bd32cb639d917fc6d52f41e0548b2dd85d906766f9129ea90355bd2e96ff2db5257c7a3e652901b00e1ee67af696a37dde1b41662189c6 SHA512 585e8bda6f77157a95c9451e3bd6491902eb20b23ef3b8c10358e3095e1e2c5aa405e90bccc76632a370cd1b4af2a0fc834c02abc87363bc01827335edc8183c
-EBUILD libvterm-0.1.1.ebuild 861 BLAKE2B b6bead0944e8b79cd6730db0b02d675245667a3d469e4175507ea0111b719393d93929c05afa833a213c328ac21f029d0eea4dd44a54a0aa2d82c9a2d1e9ff2b SHA512 5f51122dd4c01c4eae11be5fc8e9690bb3bbd9abf11b55d68622b4c6d1d9095ca02a85c8bf028b72343a647101d55dbf1172376d36a4c82705a513406ce627ae
-EBUILD libvterm-0.1.2.ebuild 832 BLAKE2B f037c535ecca36cc4140cd9bb2d46883526e252ba477189c283deadd8068cbd41e95fc775ea24e145d8b7ef581b6927f0e4f67b251fc6f50c9b2fd906550e89a SHA512 7d72d2bd2335e516dfed729797c57a1f4119f8c9e656f2c1d20333997dd1406efee3c699330007a46ab29c7e1a31d2c503d5fad3b1f2dbbeec793c756f82fb90
-EBUILD libvterm-0.1.3.ebuild 841 BLAKE2B 3b95bf1247ee69b2731a406523b61d199974d667654f7b4d6afd63eae426085e1549639128eca7e0e620106df6f3c3acb67c632f26531e2f2a9a142980f466f8 SHA512 aaa02f7be85278d20745bce9f3b190bca9e9a57445903ba0d9e3fae9903b483474b19e9ac7d737f8f2d462ecc1554559e36824c9ae341df5c376e0dce056b5b1
+EBUILD libvterm-0.0_pre20181126.ebuild 819 BLAKE2B 407c20beaada04be4a5ccf381780f9c4f3003a621f6fef0a300a261e58380a1771ab5448c4cdcfa2492dac558b18a083c5ec10bbb8a27b2ab948d08c72951249 SHA512 929568c1d1c5c56c43c39fb502cc1d08691dae6a6da69c6673baee415d8f17e6f0e7a0296d09d51ccac227d1accae9d147aef24762c665b516cdd154a552be07
+EBUILD libvterm-0.1.1.ebuild 877 BLAKE2B d7ccb94b2b5302528a32d1c5eb9cfd93b55a201059f117e5c07911a5f734e05d3b7a62c4694aec0b1e519c820e550ee65a41a28ae57f96454589477d031595af SHA512 f1a89cd21460683084fe86dfb511897ad60a45eae00f5d5f90b5053876f047fcbc4b8d1e81d1278e0486bf1e856f69c43a0673d5bd94e21b6197d5ebfeb5d85d
+EBUILD libvterm-0.1.2.ebuild 856 BLAKE2B f0280c1a73cab89dc1b306df9f2e690bb7ae4a524af4d1b5ba4bc1dfa12c07b4a777bf08214ce5fc27725e334fbd0dcf1a5d8baaf3e7ab808816caaa18620e7f SHA512 2de243264c74a0cb432b49615aa4400eb64833c502237c8eec95706625ca0b2130a5201a4f97c94b50d93d187ad9d79803e09a796a37100ffc31729249b98fcf
+EBUILD libvterm-0.1.3.ebuild 863 BLAKE2B 0c5bc8575e7e377f452b1c7d9e3ad93493d94e6a235773b5f97e6677bbd768a81759440b8e8e336f1933c2ffee7e7c351c94ecbc5abe5f40bc78e1053bb7ac99 SHA512 62a55f2f314507287739a31030257c07d8e8c74984c3648b2ff9501a8da0e7d1f88c95d33ae64efdb8bdb1dfe23a925589958fc51d650185ac287d3eaa8633f0
 MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/dev-libs/libvterm/libvterm-0.0_pre20181126.ebuild b/dev-libs/libvterm/libvterm-0.0_pre20181126.ebuild
index 00da1e7c0664..75e2b16d3eb5 100644
--- a/dev-libs/libvterm/libvterm-0.0_pre20181126.ebuild
+++ b/dev-libs/libvterm/libvterm-0.0_pre20181126.ebuild
@@ -1,27 +1,28 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit eutils flag-o-matic ltprune multilib
+EAPI=7
+
+inherit flag-o-matic toolchain-funcs
 
 DESCRIPTION="An abstract library implementation of a VT220/xterm/ECMA-48 terminal emulator"
 HOMEPAGE="http://www.leonerd.org.uk/code/libvterm/"
 SRC_URI="https://dev.gentoo.org/~tranquility/distfiles/${P}.tar.gz"
+S="${WORKDIR}"/libvterm-0.0
 
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
 
-DEPEND="
+BDEPEND="
 	sys-devel/libtool
 	virtual/pkgconfig"
-
 RDEPEND="!dev-libs/libvterm-neovim"
 
-S=${WORKDIR}/libvterm-0.0
-
 src_compile() {
+	tc-export CC
 	append-cflags -fPIC
+
 	emake PREFIX="${EPREFIX}/usr" LIBDIR="${EPREFIX}/usr/$(get_libdir)"
 }
 
@@ -30,5 +31,6 @@ src_install() {
 		PREFIX="${EPREFIX}/usr" \
 		LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
 		DESTDIR="${D}" install
-	prune_libtool_files
+
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/dev-libs/libvterm/libvterm-0.1.1.ebuild b/dev-libs/libvterm/libvterm-0.1.1.ebuild
index a9f83554b9e2..64440bd5eae4 100644
--- a/dev-libs/libvterm/libvterm-0.1.1.ebuild
+++ b/dev-libs/libvterm/libvterm-0.1.1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit flag-o-matic
+
+inherit flag-o-matic toolchain-funcs
 
 DESCRIPTION="An abstract library implementation of a VT220/xterm/ECMA-48 terminal emulator"
 HOMEPAGE="http://www.leonerd.org.uk/code/libvterm/"
@@ -11,18 +12,18 @@ SRC_URI="https://launchpad.net/${PN}/trunk/v$(ver_cut 1-2)/+download/${P}.tar.gz
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
 
 BDEPEND="
 	dev-lang/perl
 	sys-devel/libtool
 	virtual/pkgconfig
 "
-DEPEND=""
 RDEPEND="!dev-libs/libvterm-neovim"
 
 src_compile() {
+	tc-export CC
 	append-cflags -fPIC
+
 	emake VERBOSE=1 PREFIX="${EPREFIX}/usr" LIBDIR="${EPREFIX}/usr/$(get_libdir)"
 }
 
@@ -32,5 +33,6 @@ src_install() {
 		PREFIX="${EPREFIX}/usr" \
 		LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
 		DESTDIR="${D}" install
-	find "${D}" -name '*.la' -delete || die "Failed to prune libtool files"
+
+	find "${ED}" -name '*.la' -delete || die "Failed to prune libtool files"
 }
diff --git a/dev-libs/libvterm/libvterm-0.1.2.ebuild b/dev-libs/libvterm/libvterm-0.1.2.ebuild
index 6802cf9d98af..d4ac11e08b8e 100644
--- a/dev-libs/libvterm/libvterm-0.1.2.ebuild
+++ b/dev-libs/libvterm/libvterm-0.1.2.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit flag-o-matic
+
+inherit flag-o-matic toolchain-funcs
 
 DESCRIPTION="An abstract library implementation of a VT220/xterm/ECMA-48 terminal emulator"
 HOMEPAGE="http://www.leonerd.org.uk/code/libvterm/"
@@ -17,11 +18,12 @@ BDEPEND="
 	sys-devel/libtool
 	virtual/pkgconfig
 "
-DEPEND=""
 RDEPEND="!dev-libs/libvterm-neovim"
 
 src_compile() {
+	tc-export CC
 	append-cflags -fPIC
+
 	emake VERBOSE=1 PREFIX="${EPREFIX}/usr" \
 		LIBDIR="${EPREFIX}/usr/$(get_libdir)"
 }
@@ -32,5 +34,6 @@ src_install() {
 		PREFIX="${EPREFIX}/usr" \
 		LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
 		DESTDIR="${D}" install
-	find "${D}" -name '*.la' -delete || die "Failed to prune libtool files"
+
+	find "${ED}" -name '*.la' -delete || die "Failed to prune libtool files"
 }
diff --git a/dev-libs/libvterm/libvterm-0.1.3.ebuild b/dev-libs/libvterm/libvterm-0.1.3.ebuild
index fbc62d84bc3c..6530912e8f74 100644
--- a/dev-libs/libvterm/libvterm-0.1.3.ebuild
+++ b/dev-libs/libvterm/libvterm-0.1.3.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit flag-o-matic
+
+inherit flag-o-matic toolchain-funcs
 
 DESCRIPTION="An abstract library implementation of a VT220/xterm/ECMA-48 terminal emulator"
 HOMEPAGE="http://www.leonerd.org.uk/code/libvterm/"
@@ -10,17 +11,18 @@ SRC_URI="http://www.leonerd.org.uk/code/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 
 BDEPEND="
 	dev-lang/perl
 	sys-devel/libtool
 	virtual/pkgconfig
 "
-DEPEND=""
 RDEPEND="!dev-libs/libvterm-neovim"
 
 src_compile() {
+	tc-export CC
+
 	append-cflags -fPIC
 	emake VERBOSE=1 PREFIX="${EPREFIX}/usr" \
 		LIBDIR="${EPREFIX}/usr/$(get_libdir)"
@@ -32,5 +34,6 @@ src_install() {
 		PREFIX="${EPREFIX}/usr" \
 		LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
 		DESTDIR="${D}" install
-	find "${D}" -name '*.la' -delete || die "Failed to prune libtool files"
+
+	find "${ED}" -name '*.la' -delete || die "Failed to prune libtool files"
 }