From b9566eec89e732db935db19b0065bf8167f1c4b1 Mon Sep 17 00:00:00 2001
From: Matthew Thode <prometheanfire@gentoo.org>
Date: Mon, 16 Oct 2017 20:39:17 -0500
Subject: [PATCH] dev-libs/leatherman: 1.3.0 stable amd64 and x86

Package-Manager: Portage-2.3.8, Repoman-2.3.3
---
 dev-libs/leatherman/Manifest                 |  1 -
 dev-libs/leatherman/leatherman-0.12.2.ebuild | 50 --------------------
 dev-libs/leatherman/leatherman-1.3.0.ebuild  |  2 +-
 3 files changed, 1 insertion(+), 52 deletions(-)
 delete mode 100644 dev-libs/leatherman/leatherman-0.12.2.ebuild

diff --git a/dev-libs/leatherman/Manifest b/dev-libs/leatherman/Manifest
index 2ae39bc3f0184..258fea021d644 100644
--- a/dev-libs/leatherman/Manifest
+++ b/dev-libs/leatherman/Manifest
@@ -1,4 +1,3 @@
 DIST leatherman-0.10.1.tar.gz 423218 SHA256 79b0eded49a02cb8f6ce6260ae39e3f1bdd2dc2c62c02f661308e04c08edb69e SHA512 bbbb772c855f5ce1e38abe7186400d9a2c9663dcdc72bd0a822bbe171eed3d01e33a6ec2196d4f6f8f0895f309d031b1eb77ec188bd16b37e52b306fafb66d17 WHIRLPOOL 19ff51352c49e9fca7d45683117809cf916e15066015e40cbe2eb10e3eb4ae3e6d27595e8bae8291bd5fac874f845399b9c87a5fcc6b645dd174bf3c9b1a8229
-DIST leatherman-0.12.2.tar.gz 423879 SHA256 32873bc61109e4fa64f26c810cad76315f90721711742c9a04cfed687f43829e SHA512 4c6aab859901a5685f23cfe023cd2ca922548e7068835a34e2665e9f7384a8efd9d7fe49de384a20c17d685a672c994bca6c1612f70d01f83c87db0a74683841 WHIRLPOOL af513b04076090bb6782c176bb386dc02d564c05c992c2f48f92d91d6346b54061d55585a24283073b1a4441acbcdb7cc34e1d7f798c2062fc300d83368c1cec
 DIST leatherman-1.2.1.tar.gz 431781 SHA256 747a12948167634d2c3db8c7be741ceb1eb486f54ed6b5b96fecfd68827e4efb SHA512 f12414093d09b86878558cbe68f03b7f36fc89131412edad0573dbc891b1c422b98b9923babbed9ac4acef2cad869ef452d602199ae4d3e90fca5a3e2eb688d2 WHIRLPOOL 87effe1fdccb432959f2ab530675ab8ca893c306fd4eafa94758961975db374e35254fbade1300a8bf1340b915197b59eca1b89bc52e0356532db2ae2628345f
 DIST leatherman-1.3.0.tar.gz 434229 SHA256 282bc54ca28e8269a392bbda423b940177a5925246ab961c7a5c338046b51ba0 SHA512 5e06be7add652f69b0d4a8d778e33dfb68183c4d598217cc6542d2431f7984f0af989c27bd69e89b77ab03d6dd2adab9d70f68cd87dae20d8e24ae05923fbe9b WHIRLPOOL a47441215397c185959414362dbb4956d0b5ea38fd21db3185723bc9b1d1b4cd58931fa6ce23628c678403b21069998aed66b4bc62ecffa172bd7539a21b7c02
diff --git a/dev-libs/leatherman/leatherman-0.12.2.ebuild b/dev-libs/leatherman/leatherman-0.12.2.ebuild
deleted file mode 100644
index 5d4cd509cd67e..0000000000000
--- a/dev-libs/leatherman/leatherman-0.12.2.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby21 ruby22"
-
-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 ~hppa ~ppc ~ppc64 ~sparc x86"
-
-RDEPEND="net-misc/curl"
-DEPEND=">=dev-libs/boost-1.54[nls]
-	net-misc/curl
-	>=sys-devel/gcc-4.8:*"
-
-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() {
-	cmake-utils_src_test
-}
-
-src_install() {
-	cmake-utils_src_install
-}
diff --git a/dev-libs/leatherman/leatherman-1.3.0.ebuild b/dev-libs/leatherman/leatherman-1.3.0.ebuild
index 71062c83c1c4d..6c6f5808f8148 100644
--- a/dev-libs/leatherman/leatherman-1.3.0.ebuild
+++ b/dev-libs/leatherman/leatherman-1.3.0.ebuild
@@ -13,7 +13,7 @@ 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"
+KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc x86"
 
 RDEPEND="net-misc/curl"
 DEPEND=">=dev-libs/boost-1.54[nls]