gentoo resync : 15.02.2018

3 files changed, 2 insertions, 54 deletions

diff --git a/dev-libs/leatherman/Manifest b/dev-libs/leatherman/Manifest
index 2d646ac2f371..c47afe5d8b3a 100644
--- a/dev-libs/leatherman/Manifest
+++ b/dev-libs/leatherman/Manifest
@@ -1,11 +1,10 @@
 AUX portage-sandbox-test-fix.patch 2010 BLAKE2B 8e9e180c180f2059f57c953a9c828164a96b07d6a3054b555c572c6c80e79dbf5092da5fb23e9fb95f3db0bff02788ef4a9ac40483b1673382f4c1d11b0b3833 SHA512 35bfb2d3b1ca98cf7f10e9356e899532516d4a9671b0cebca1780e602ef53f9a5705ee6c4c03d70aecad163faccdce6ec15d7e32f00ebcda946d0cf6638a22a2
 DIST leatherman-0.10.1.tar.gz 423218 BLAKE2B 1c0af89efda8d899a703d92b7cb7c56cf37b06e4f35b026f511edfd444072b8fbd4870fa144b565e3d171be5ea09b1af2a871f18b9dc5d884e546c96fa48a396 SHA512 bbbb772c855f5ce1e38abe7186400d9a2c9663dcdc72bd0a822bbe171eed3d01e33a6ec2196d4f6f8f0895f309d031b1eb77ec188bd16b37e52b306fafb66d17
 DIST leatherman-1.2.1.tar.gz 431781 BLAKE2B 0fecfd8f1cdee49548e7408664b78c3edbc76f39dca6abfff3f052dcdae0aaca32ad6197d5cbdce8630116b801c1a8e55d9915531769a3327bde1ea3b242a354 SHA512 f12414093d09b86878558cbe68f03b7f36fc89131412edad0573dbc891b1c422b98b9923babbed9ac4acef2cad869ef452d602199ae4d3e90fca5a3e2eb688d2
-DIST leatherman-1.2.2.tar.gz 434088 BLAKE2B 40ba4903f7bf0b9e07237291364b664ca84c74d8289a9065cd86833fd30e7f8309b1ef4d36514b5c2abfff45b287ca8d3eb60bae5ecb7e1579ca4d60eb866517 SHA512 1142a9be30efc8b1d52c9e38347dc39250c00c97c0cd7a299b63d6abb7140ec75c1fff0dc166b436ca6f4f82d7699869ea6988d807e8be8058a689841ac73b2a
 DIST leatherman-1.3.0.tar.gz 434229 BLAKE2B e0c19bca2378afc4928554ac0862543504ba725aadc6cffd78220f7f7f1b725cad960fc6d9fdd2d54a43c233b35959ebcb9c71d1191a5535703599fa32e3301e SHA512 5e06be7add652f69b0d4a8d778e33dfb68183c4d598217cc6542d2431f7984f0af989c27bd69e89b77ab03d6dd2adab9d70f68cd87dae20d8e24ae05923fbe9b
+DIST leatherman-1.4.0.tar.gz 805151 BLAKE2B 38d5b895370997c91d2d1637ca23e3019bba97e27bc0aa0fb86cd931573c19a669c40ce8c9473c60b365b8474d75ec90b3e8dc2b0f1d488452cef4736668423d SHA512 dcc59928c4623ce0746e2583d4591ae5a9b0426f186ab4105a5a8156daf12d83901e496f2d7edf2a1b77c8087ad200fe90ec703081d65ecae0f999b12e53b0ca
 EBUILD leatherman-0.10.1.ebuild 981 BLAKE2B c4ba598588bb3b388e627a36f6401c596752a8683814283460e8ae1d5e575ede72d603859ac6c514c451f3f0f655fb3ed01f300f41bb8ce7cb3599c599cbd02f SHA512 1d6b8e7fe40dcd0188b246fd29ce34dcd70afdcb9260899f5bf662a7de9d517a05e40a7187091bba03f97b304c0cdcb8f493e478c3f0e5687edaf05c1467fe9f
 EBUILD leatherman-1.2.1.ebuild 1069 BLAKE2B 2415743c31d327115a44cd551902fa5f8a768a103074cec467b84e2e1f930d392b2e31d77f40f6037462e306b92079375d5c209508ea6744cc1b87be6497e38f SHA512 a16f251b7baa9bcd65dc45e31f744d0a00aba3bed5419825a9e538f7b611bb86820cdb24be67fa6fb996c31686f97bbc9f4ec7116e8cab5653c9773edda93636
-EBUILD leatherman-1.2.2.ebuild 1073 BLAKE2B 6e46f69dec2e46fbf4ca43a94376d00650c368dfca841b65ab7de9561fd71a4534a84186651920db1acb289fbe637a959813f6773ba23d6deb32844bbbbaab9a SHA512 046b94798a40ae31b7b95dc49b1d1502c4b86b0b6057455c25fffa191db120c980557972e3d1c8479a25b9284aa686564bb287e039ba42027916c79e239b4f8a
-EBUILD leatherman-1.3.0-r1.ebuild 1218 BLAKE2B 064bd32081b3207ce77a0b9a09c05abc702045857f80f1c3db468f4b05286398fff03556c5c1d33a247362752c8689c28dc8cf91814e4a31c6bc65308b6dacac SHA512 bed02b2319ea24a6f40cf374212ffe2b90c5e03f8992fbe2fc2d3734a4313f9718424836563afadb50c6089a919e7b7c935a44399edba4a4c82525385110e48f
 EBUILD leatherman-1.3.0.ebuild 1067 BLAKE2B bcf0fd1db9579bdb3984cb0a7eab5e0e872cf69c2b4304678699d131b5106a02b8ff96a5ada99258ccfea9ae79b8868468e65aba548685ecb93f0e2084548475 SHA512 5195cc683cbce606a7221ae58ed251348559cc843cdb4a273d03a8abbb133a7c305bbe496caddfdaa534d560d6044e50376ce16d2773a04e43e378ebef2e9d8e
+EBUILD leatherman-1.4.0.ebuild 1218 BLAKE2B 064bd32081b3207ce77a0b9a09c05abc702045857f80f1c3db468f4b05286398fff03556c5c1d33a247362752c8689c28dc8cf91814e4a31c6bc65308b6dacac SHA512 bed02b2319ea24a6f40cf374212ffe2b90c5e03f8992fbe2fc2d3734a4313f9718424836563afadb50c6089a919e7b7c935a44399edba4a4c82525385110e48f
 MISC metadata.xml 415 BLAKE2B 9ab19e50b48bd911313c662cdae1221ba5c1222f6a80ec4836b63d1b07625011cfb1da7727fdd5f8156d24595df96a37376cf064f19eefc2d566fd6723afef06 SHA512 9450c72aff399df62f4479bee9e2e564bd7c451ee69fef1cf5c59b37331b312c982418de6d8dc1a5dcaec37050165413e13f83de5102e88e1c5fffa67d9b0023
diff --git a/dev-libs/leatherman/leatherman-1.2.2.ebuild b/dev-libs/leatherman/leatherman-1.2.2.ebuild
deleted file mode 100644
index c166cb33d18e..000000000000
--- a/dev-libs/leatherman/leatherman-1.2.2.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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"
-SLOT="0"
-IUSE="debug test"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
-
-RDEPEND="net-misc/curl"
-DEPEND=">=dev-libs/boost-1.54[nls]
-	net-misc/curl
-	>=sys-devel/gcc-4.8:*"
-
-PATCHES=( "${FILESDIR}"/portage-sandbox-test-fix.patch )
-
-src_prepare() {
-	sed -i 's/\-Werror\ //g' "cmake/cflags.cmake" || die
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_VERBOSE_MAKEFILE=ON
-		-DCMAKE_BUILD_TYPE=None
-		-DCMAKE_INSTALL_PREFIX=/usr
-		-DCMAKE_INSTALL_SYSCONFDIR=/etc
-		-DCMAKE_INSTALL_LOCALSTATEDIR=/var
-	)
-	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.3.0-r1.ebuild b/dev-libs/leatherman/leatherman-1.4.0.ebuild
index dd10169b1741..dd10169b1741 100644
--- a/dev-libs/leatherman/leatherman-1.3.0-r1.ebuild
+++ b/dev-libs/leatherman/leatherman-1.4.0.ebuild