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

[Matt Thode]

commit:     3684270159a2d9deed8b9fbc4d61f18612b506b7
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Wed May  3 17:28:04 2017 +0000
Commit:     Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Wed May  3 17:28:04 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=36842701

dev-libs/leatherman: cleanup and stable 0.12.1 amd64 and x86

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 dev-libs/leatherman/Manifest                 |  1 -
 dev-libs/leatherman/leatherman-0.12.0.ebuild | 49 ----------------------------
 dev-libs/leatherman/leatherman-0.12.1.ebuild |  2 +-
 3 files changed, 1 insertion(+), 51 deletions(-)

diff --git a/dev-libs/leatherman/Manifest b/dev-libs/leatherman/Manifest
index cd81535f124..3a60171ab78 100644
--- a/dev-libs/leatherman/Manifest
+++ b/dev-libs/leatherman/Manifest
@@ -3,7 +3,6 @@ DIST leatherman-0.10.2.tar.gz 423470 SHA256 eca6cf88a233bb6c21be2b2d3954763e523d
 DIST leatherman-0.11.0.tar.gz 423516 SHA256 b625b7e7c54495f60a9166e7da85d2fd70a877b3e4cd81bba9e67da51dd261cd SHA512 af1a985ad4fe84a38193282a35d01ba939a8e35854158083387829c45887a2cde6c15f426770771ad17c6088d405b29209b5e772b477803f1fc6537538581367 WHIRLPOOL 1c8dd17c8b093ff6425702b1f5757468f5f1d27006700d48a02295116cbf735ae10a006a260415a49a527773be2e7d2d4922a751a354edb741212ab62bf8ffb2
 DIST leatherman-0.11.1.tar.gz 423537 SHA256 3059ecd28ce8468e5d535a7e21eea4b0cdf6aabdaec71deab5e5d18b715ecf73 SHA512 aa46fdb18ec535e458ba9802792606dc6ff5aec47b22b25722ba2b11fcfcbb2bdeabc46d456fae3e106da435aca7b2f06197a0ea50845d9b190c1b7c088b5691 WHIRLPOOL 47a40c8f799f592fda3914ee0eb17b8888c583cf6f24add354257e765b7f9224726ffab0ddca9f47067641a20a324b5466cb7e25136e361bdaffa5c94aacd4cb
 DIST leatherman-0.11.2.tar.gz 423569 SHA256 a0d3b2308aaddfb31ed4d4bcccb52206c4ad7d5da332b5254d1a6c3223ae980b SHA512 eb73971661834beef49585d1f631523c03115d682ecaf3c18ff5f3004c604b1b3ca7e6533e2e8b69ad7222922cd9afb61cb6888e0db03474b43294f326e2d667 WHIRLPOOL 78c46bf0fd465f0b275707c64f15c959a62f98e48ccc4346e84a550c7e4162dcde057014a92e98cbdfef59a3170206b95ffd33f74ad27c0a20cabe18d5bae964
-DIST leatherman-0.12.0.tar.gz 423780 SHA256 e7c07546ecf1e43e9c1c2439b4dc904864771050fe8f00998ee9ac10ca333113 SHA512 f7bf0b0993ca5a444a4bd40a38d8cf9246721e9b9c574d8134d5cdbe5963794ae39d5881c930a74d22f17579bc129fcabf74b59cb1562b07b47542c5c23be8db WHIRLPOOL cac3171766d735f0558692b6a5911663474f88e34ec974a36b0ece7d55384281d0570b460eac63db19f20b2ec441637b6a66bd8259ea6e719a5c14f1e7559630
 DIST leatherman-0.12.1.tar.gz 423884 SHA256 656a49bdb1181932a8606b58dd19efd8cf428dd0ebbb4af619e3737f2131bdc0 SHA512 f93b6b0f1051507469bcb8d964cd38b238a269bf277f3b540d4b0e53700012aba3eefc8dc5656a4158ad55b8570ebdb09f528fb586621972b847e10305912ce4 WHIRLPOOL bb2ea8b025aa07b18c485e5d5b98cad035590cb2f13d59780b683a3c2003cfe676e160769e6293b185a8fb1c16c542e033fc10cb27ac6be705345d8c672b8e47
 DIST leatherman-0.9.0.tar.gz 392308 SHA256 8d79a998caa47047bfc52093e6a50618458b5c0aa502a6cf61f9fb7a6451c3bb SHA512 25c5edd58abad4e20d36ec7badb94aacc0f9a9e44200e710dcb3da116685396bba5b12ae806f9865e48d5d50c43a31486d8aa39fd853551ccf2c3eaa28859c8d WHIRLPOOL 492ae8971368a8c7e3527a875c8cb4a46d5a767b80b45d32b33fa2f1c66a7d2ea4825c923a6993b1147ac8e68bb111c682ef5315c13a11a68bd583b3423e6656
 DIST leatherman-0.9.4.tar.gz 418077 SHA256 a396514fef1ab5d14ebc745a9166ac4fcdf229e5378824302de751ef5ec2bee9 SHA512 c08401856f5afc1b9d48cf31fa3c037ee9f316f4356419785c021696dff4628bfde92318ad0e50faf83aa9b205ebd479bbb46379431811cfec1dcbd5c88021f7 WHIRLPOOL cdae73fc20e08603c81d98127f642e6720fae449f1f1fbb9ca591ffed051bb1efc5ba21ea93a041d9cc8c7c58844ed5fc7467f6e9107d325687609780e8e2a6d

diff --git a/dev-libs/leatherman/leatherman-0.12.0.ebuild b/dev-libs/leatherman/leatherman-0.12.0.ebuild
deleted file mode 100644
index 65653be4cc7..00000000000
--- a/dev-libs/leatherman/leatherman-0.12.0.ebuild
+++ /dev/null
@@ -1,49 +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
-}
-
-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-0.12.1.ebuild b/dev-libs/leatherman/leatherman-0.12.1.ebuild
index 73b510ec315..65653be4cc7 100644
--- a/dev-libs/leatherman/leatherman-0.12.1.ebuild
+++ b/dev-libs/leatherman/leatherman-0.12.1.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 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~hppa ~ppc ~ppc64 ~sparc x86"
 
 RDEPEND="net-misc/curl"
 DEPEND=">=dev-libs/boost-1.54[nls]