gentoo resync : 22.01.2021

3 files changed, 3 insertions, 66 deletions

diff --git a/dev-libs/leatherman/Manifest b/dev-libs/leatherman/Manifest
index aac2cf127c40..54ca1916e55b 100644
--- a/dev-libs/leatherman/Manifest
+++ b/dev-libs/leatherman/Manifest
@@ -2,9 +2,7 @@ AUX 1.12.2-shared_nowide.patch 4647 BLAKE2B 602e72f4265a803b715b8605c1dee3ccec9c
 AUX portage-sandbox-test-fix.patch 2010 BLAKE2B 8e9e180c180f2059f57c953a9c828164a96b07d6a3054b555c572c6c80e79dbf5092da5fb23e9fb95f3db0bff02788ef4a9ac40483b1673382f4c1d11b0b3833 SHA512 35bfb2d3b1ca98cf7f10e9356e899532516d4a9671b0cebca1780e602ef53f9a5705ee6c4c03d70aecad163faccdce6ec15d7e32f00ebcda946d0cf6638a22a2
 AUX shared_nowide.patch 4627 BLAKE2B c29dae187c0056956498487e0b6c8a88b74253f5d221df3f274da9bea7ae5163b76f3027df99e06fec7999274751c6d173db6ca7ec896a687536d7199c1b4827 SHA512 cc05ed7250728490955cc464d3a32ce4d81cfd7a9518487fc7d0f7a397eb0ac522e474cfadc036f233080e508f148f644c41764e31f99b76ab75403a7ca78486
 DIST leatherman-1.12.2.tar.gz 816010 BLAKE2B 4b7b00b88ef0ba5cb01405aa24fd5ff72918a122cc8a1c0a029e374152964f77afa29a1f503ed5863a39bd13aa808dba2a0b351f65756e97c8e2e8408358cbfc SHA512 9be8333b616bd9772f234474ae874c7214fa0c1bc4658ff042233d6e1683cc61b63d666d750297c79a8058490e42c8b2ff8999cb7f04aa329644f52540e43bde
-DIST leatherman-1.12.3.tar.gz 816018 BLAKE2B 6245284856613b99df2ce412e497ba69fe1a016a82ca5ea7f78ba591dc287e2daef051214b303c1cc463efb537354a01ad6c57688f244382b3843b8bfdad6f3e SHA512 83f785ba7c69032e2c9c7f2fb07aa5c100ed9e1a81c88ece19d7a96647b9a46927b99fd7144c08d697863e44553f00adf6bc4964f45e900809827956c0949b36
 DIST leatherman-1.12.4.tar.gz 818043 BLAKE2B 7a8718d598bf48b70d555d2a21e2e930eba6b3407ad5414b43d30411acf4c9bf4193ad20058b63d3c8911b7c5b0d021f84d6eca6dd3d00165c7d145186f8177f SHA512 b2645a5049856f93c30bb89e87e3a47cf8137aeac73708248b2b228874818063fb31440ca2bd760783e8c95e880fe7ae34a387fcc448efee01dd0cda48089b55
 EBUILD leatherman-1.12.2.ebuild 1329 BLAKE2B b182be7c996de4512b7b0861ef56e9465fc797890b483b9d168d2cf3fb2059ad7de01b6bdd94fdff8e63b1cab2fb544f71fed9442d8aa9e43ca1876babee05aa SHA512 438ec777192a6fa0bb1ac13e3312cd463b968f6747f3277b7d157a995a666bcd560772d47dbb4a07057f3cc6d8f848df33bf86ac472044c7d502e102b94aca9a
-EBUILD leatherman-1.12.3.ebuild 1332 BLAKE2B ef44d85818f9602a06e77e6a252ee88fae8dad1f5dd36c546efddc48c824d99f7e5bc4caeceb08b5be4496743cb52a76951e20a72e2f93f699079db1b7fb0d88 SHA512 a52e48a284895fe447e2783fa302f4b64eadaa69025699193d69dcb1db8c27dcb48b7b1dbc69f55cd9ec1cf454cbfffeee2d9075d9b1aa2271e6048d24b1fb6a
-EBUILD leatherman-1.12.4.ebuild 1334 BLAKE2B 40cf1da626e9e0b83b91c76d432fa7793456406335f8029cafc96010a396d2e880b40dd6515daa7ab5e74955562d517415907fd8764c2daccf7b5f3d8a89053f SHA512 d99e688e02e91b83edffd89b08f722ea43b1b927545f24a994e380450f257a555c35587a0d8834fbcaa8941e9c826283a4877d61d8767c203fe66a5d589253c4
+EBUILD leatherman-1.12.4.ebuild 1332 BLAKE2B 5f942d7a5e371eddf3312d28202ec9d4fdb93a9c524ec76081915641d776085dcfd77d66d13693369e94b3e57ffc7a62b1b9f1175ebfd02fade4b256323a45b8 SHA512 a49db9d2f88f8834e8641e67d005e1116bc02fa3c1dee06e97bca0b05f598c6283d0ac2ccfb46fd3f344f687a332950b498ecc11d84bc7aa0b514b8d234d0c47
 MISC metadata.xml 340 BLAKE2B 01f27cfaa9f6a13507f19e336f6171dd9b7321bd3ab7954b381d8200614a5e5e3706ab40d2472b6aaf2c0b2191c7d49c36fe9f8b218824101f85577fb700470c SHA512 f4b877e9d23996a6fca8d3c72c90bdc4a80e5218dcaea4f4c461473dff3d30db2aacc389bb156db6085ba02766ca69868842514ee6317c58373372cca4c48cf1
diff --git a/dev-libs/leatherman/leatherman-1.12.3.ebuild b/dev-libs/leatherman/leatherman-1.12.3.ebuild
deleted file mode 100644
index c7ed781d77ee..000000000000
--- a/dev-libs/leatherman/leatherman-1.12.3.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils multilib
-
-DESCRIPTION="A C++ toolkit"
-HOMEPAGE="https://github.com/puppetlabs/leatherman"
-SRC_URI="https://github.com/puppetlabs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-IUSE="debug static-libs test"
-#RESTRICT="!test? ( test )"
-RESTRICT="test"  # restricted til we don't need the shared_nowide patch
-KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc x86"
-SLOT="0/${PV}"
-
-RDEPEND="net-misc/curl"
-DEPEND=">=dev-libs/boost-1.73:=[nls]
-	net-misc/curl
-	>=sys-devel/gcc-4.8:*"
-
-PATCHES=( "${FILESDIR}"/portage-sandbox-test-fix.patch )
-PATCHES+=( "${FILESDIR}"/1.12.2-shared_nowide.patch )
-
-src_prepare() {
-	sed -i 's/\-Werror\ //g' "cmake/cflags.cmake" || die
-	# vendored boost lib conflicts with boost 1.73 and above
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_VERBOSE_MAKEFILE=ON
-		-DCMAKE_BUILD_TYPE=None
-	)
-	if ! use static-libs; then
-		mycmakeargs+=(
-			-DLEATHERMAN_SHARED=ON
-		)
-	else
-		mycmakeargs+=(
-			-DLEATHERMAN_SHARED=OFF
-		)
-	fi
-	if use debug; then
-		mycmakeargs+=(
-		  -DCMAKE_BUILD_TYPE=Debug
-		)
-	fi
-	cmake-utils_src_configure
-}
-
-src_test() {
-	"${WORKDIR}/${P}"_build/bin/leatherman_test
-}
-
-src_install() {
-	cmake-utils_src_install
-}
diff --git a/dev-libs/leatherman/leatherman-1.12.4.ebuild b/dev-libs/leatherman/leatherman-1.12.4.ebuild
index 75314013d9e0..75654f08f0ec 100644
--- a/dev-libs/leatherman/leatherman-1.12.4.ebuild
+++ b/dev-libs/leatherman/leatherman-1.12.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ LICENSE="Apache-2.0"
 IUSE="debug static-libs test"
 #RESTRICT="!test? ( test )"
 RESTRICT="test"  # restricted til we don't need the shared_nowide patch
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc x86"
 SLOT="0/${PV}"
 
 RDEPEND="net-misc/curl"