gentoo resync : 20.03.2022

4 files changed, 6 insertions, 69 deletions

diff --git a/app-misc/dvtm/Manifest b/app-misc/dvtm/Manifest
index ab11e4ec9ade..9c324ee7a634 100644
--- a/app-misc/dvtm/Manifest
+++ b/app-misc/dvtm/Manifest
@@ -2,7 +2,6 @@ AUX dvtm-0.15-gentoo.patch 961 BLAKE2B 611e19b936957c80eb234186a4199f32e83aefc7a
 AUX dvtm-0.15-stop-installing-terminfo.patch 474 BLAKE2B a2a1552592b51bc21d817039b3f09e8108c36e3cdb77c9b6f43f12ebc3f856e9a0d21e9ec8fc82f843166ad16ebf9644ccbd9fc8a80746ce9670d9b7ce191653 SHA512 cea8b8e6974ffc6d891fa176c1d7ef67dfb994bea779b3e7485094f4cd414b8be928ecb0db14e16ce5508b0454465084cde37ee4d09de21f91e18a5a2958931b
 AUX dvtm-9999-gentoo.patch 426 BLAKE2B b5cd8066a16005b240c5725374ea31fa42394076ea477f9ed35576b57a2d816123fbd4adfd877a092b56ecd42f321d4a092a20b20a7848a16df8fdb93fcfb7d3 SHA512 ee3d94108e8d74ef4777c2bdbb2887af9a4f62832311524cde7a69b0307a71edd89616e475c486745b2f5461932cb13cb46dbb2a6ab4af0a8ad8caae92e10275
 DIST dvtm-0.15.tar.gz 40511 BLAKE2B cc5075b5337a66b3eb5a3845f18aaadc6be36804e1a0e217e6bfe640893ec5af7553aa69578f8bda6c3b11b28c02ba5398e19f9cad9844bfcb1bd32ca4f24c12 SHA512 48a0c8fd6a50fe5d43414d0223c9f4b9920a31d42fe3bfc428ce1ae7d0e41a41ebe2597eae0824c7c76bfb0e32a13e440c8d5fcdb1886d55d6791fa3fe3fd77b
-EBUILD dvtm-0.15-r4.ebuild 1255 BLAKE2B 4c5c939fdfb29b9e6ffb9e53fbcd5c606c5001cb811c6d19a2160016021418996e8848b1ed747907c68fbd07a97403273dffe7a94d71671a69c3520f27330d2a SHA512 58d2d52abe7a055c8c8820a087bd6af749759d9bfca8f81d6ec72af3c1393305f616186c0fd0d7d69a6c834933d1d929321e2c350a27ee47be6f1a7c81996dac
-EBUILD dvtm-0.15-r5.ebuild 1264 BLAKE2B afc5e87670daac59334b3eb515deb443f15a6a12192cba7553a5939f6992a9425cc0fdeb96721959622200a86e85626da19f32d77612368f5943a7a2a64c8e1a SHA512 ea37ae444e8cc9507e39b803fde07d4f3c7cee5e026d260d7dabfb4be411bd83493bd7566ddfb2f1e1a13d5de40ab378aca1a62f62445e241d3d04866de91185
-EBUILD dvtm-9999.ebuild 1254 BLAKE2B d0d1bd15242cf412a8db216d10e1ba0e197ed41187552f62fcd93e024555a500f5bbbdc9569caa6709ded0bed761b5abf9d89dbb5448004b48a001d4347025a3 SHA512 3b1eade56ba262e4bb27583907acd4548eca7daa770814e6e8aa192111f029861626b087cebaf8298d6754cb8f2ea3a02c6c27859b761572244a770d61be5a82
+EBUILD dvtm-0.15-r5.ebuild 1266 BLAKE2B 6853a6ee8e484c7e6cc193a1e53c2722622b69f4a9c57ffba7ce9bd31a92893bedf6497ca2014b325f6aa3a99e4f9d31efb4ad75402eeb2ac8ed03e1568178a8 SHA512 bbbb9571c6d5269a7c75c9c5d52cb8ed7d9ec54362526707641dbc71d9739271d58027209297eedf9e44e57f049d471ae2b80aad8813ef5ac7ab16e74a48980b
+EBUILD dvtm-9999.ebuild 1256 BLAKE2B 9223f5980a391c41f84155016781be8c5f45bfdaa9aa6962085ad2b900196f1bef798b1aea09052f881ac1c008dbeecbb06d15d2548c98b5e0a9d519c3805718 SHA512 b70a071446f15a2b97a6b707a0c4b51c63f1194f870cd3a3520074e1951193def9973e2030467dac31f6ec842d6b9b9f646a8a3ced93cbe89fa54f73bfc677fc
 MISC metadata.xml 267 BLAKE2B 15dbae618f9047d37b671714f3615b968ff63cd013ec0dfe03fefd1b172d68c19f27276151efe8e005b7e59c4eaa017ec6693f2f03ec005894d8c67b1c8e47c2 SHA512 391ca69b1498920f9678a1e8cafbe14090bfdf6666fac4b508f11990f656de77717ce124cf435c2025474cc2034a22bc7df47257b5dec44c55d7bd99108fcf55
diff --git a/app-misc/dvtm/dvtm-0.15-r4.ebuild b/app-misc/dvtm/dvtm-0.15-r4.ebuild
deleted file mode 100644
index 33e5a76f88a3..000000000000
--- a/app-misc/dvtm/dvtm-0.15-r4.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit savedconfig toolchain-funcs
-
-DESCRIPTION="Dynamic virtual terminal manager"
-HOMEPAGE="https://www.brain-dump.org/projects/dvtm/"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://repo.or.cz/dvtm.git"
-else
-	SRC_URI="https://www.brain-dump.org/projects/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-
-COMMON_DEPEND="sys-libs/ncurses:=[unicode(+)]"
-RDEPEND="${COMMON_DEPEND}
-	!>=sys-libs/ncurses-6.1
-"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.15-gentoo.patch
-)
-
-src_prepare() {
-	default
-
-	restore_config config.h
-}
-
-src_compile() {
-	tc-export PKG_CONFIG
-	local msg=""
-	use savedconfig && msg=", please check the configfile"
-	emake CC=$(tc-getCC) ${PN}
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" STRIP=true install
-
-	insinto /usr/share/${PN}
-	newins config.h ${PF}.config.h
-
-	dodoc README.md
-
-	save_config config.h
-}
-
-pkg_postinst() {
-	elog "This ebuild has support for user defined configs"
-	elog "Please read this ebuild for more details and re-emerge as needed"
-	elog "if you want to add or remove functionality for ${PN}"
-}
diff --git a/app-misc/dvtm/dvtm-0.15-r5.ebuild b/app-misc/dvtm/dvtm-0.15-r5.ebuild
index 03d27797b75b..f84d708753a0 100644
--- a/app-misc/dvtm/dvtm-0.15-r5.ebuild
+++ b/app-misc/dvtm/dvtm-0.15-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -39,7 +39,7 @@ src_compile() {
 	tc-export PKG_CONFIG
 	local msg=""
 	use savedconfig && msg=", please check the configfile"
-	emake CC=$(tc-getCC) ${PN}
+	emake CC="$(tc-getCC)" ${PN}
 }
 
 src_install() {
diff --git a/app-misc/dvtm/dvtm-9999.ebuild b/app-misc/dvtm/dvtm-9999.ebuild
index da58898096e0..c7b6d74ec5e0 100644
--- a/app-misc/dvtm/dvtm-9999.ebuild
+++ b/app-misc/dvtm/dvtm-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -39,7 +39,7 @@ src_compile() {
 	tc-export PKG_CONFIG
 	local msg=""
 	use savedconfig && msg=", please check the configfile"
-	emake CC=$(tc-getCC) ${PN}
+	emake CC="$(tc-getCC)" ${PN}
 }
 
 src_install() {