[gentoo-commits] repo/gentoo:master commit in: dev-libs/leatherman/

["Matt Thode" <prometheanfire@gentoo.org>]

commit:     ab48a5c9fece1ae6aa6edfc96a43b5e610eea431
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 14 02:42:26 2018 +0000
Commit:     Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Wed Feb 14 02:42:26 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab48a5c9

dev-libs/leatherman: 1.4.0 bup with cleanup

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 dev-libs/leatherman/Manifest                       |  2 +-
 dev-libs/leatherman/leatherman-1.2.2.ebuild        | 51 ----------------------
 ...man-1.3.0-r1.ebuild => leatherman-1.4.0.ebuild} |  0
 3 files changed, 1 insertion(+), 52 deletions(-)

diff --git a/dev-libs/leatherman/Manifest b/dev-libs/leatherman/Manifest
index 66de712bb3b..0fd5bdd6022 100644
--- a/dev-libs/leatherman/Manifest
+++ b/dev-libs/leatherman/Manifest
@@ -1,4 +1,4 @@
 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

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 c166cb33d18..00000000000
--- 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
similarity index 100%
rename from dev-libs/leatherman/leatherman-1.3.0-r1.ebuild
rename to dev-libs/leatherman/leatherman-1.4.0.ebuild