summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Thode <prometheanfire@gentoo.org>2018-11-08 11:31:06 -0600
committerMatthew Thode <prometheanfire@gentoo.org>2018-11-08 11:31:27 -0600
commitb8c8c6b1dac0b2ba9b5d27222aa84c7a4fb83a22 (patch)
treef1e415bfdbdca3593337646da6329c8773fca7c2
parentsys-cluster/cinder: 12.0.4 and 13.0.1 stable amd64 and x86 (diff)
downloadgentoo-b8c8c6b1dac0b2ba9b5d27222aa84c7a4fb83a22.tar.gz
gentoo-b8c8c6b1dac0b2ba9b5d27222aa84c7a4fb83a22.tar.bz2
gentoo-b8c8c6b1dac0b2ba9b5d27222aa84c7a4fb83a22.zip
dev-libs/leatherman: 1.4.4 stable amd64 and x86 with cleanup
Package-Manager: Portage-2.3.51, Repoman-2.3.12 Signed-off-by: Matthew Thode <prometheanfire@gentoo.org>
-rw-r--r--dev-libs/leatherman/Manifest1
-rw-r--r--dev-libs/leatherman/leatherman-1.4.2.ebuild58
-rw-r--r--dev-libs/leatherman/leatherman-1.4.4.ebuild2
3 files changed, 1 insertions, 60 deletions
diff --git a/dev-libs/leatherman/Manifest b/dev-libs/leatherman/Manifest
index 25e17450762a..654539f31aa7 100644
--- a/dev-libs/leatherman/Manifest
+++ b/dev-libs/leatherman/Manifest
@@ -1,5 +1,4 @@
DIST leatherman-1.3.0.tar.gz 434229 BLAKE2B e0c19bca2378afc4928554ac0862543504ba725aadc6cffd78220f7f7f1b725cad960fc6d9fdd2d54a43c233b35959ebcb9c71d1191a5535703599fa32e3301e SHA512 5e06be7add652f69b0d4a8d778e33dfb68183c4d598217cc6542d2431f7984f0af989c27bd69e89b77ab03d6dd2adab9d70f68cd87dae20d8e24ae05923fbe9b
-DIST leatherman-1.4.2.tar.gz 814263 BLAKE2B 5ca8123f264ed0f7843c6fc1b0966c577fb9d12933e5baa375e0beef8ba17afe4388f1e05e1022e392c50e32e159b765531137cf069bd0f5b8baa3626c860949 SHA512 e0cb19605163b68ac5a8fc74e875d856af5e34345f19c38f0db45da7536ec27ba6cf4b4e8c5883ceb9a5978cdc8831181ec89ad4105252366b198af4f3f22bff
DIST leatherman-1.4.4.tar.gz 814289 BLAKE2B d53ff660e28eaea1c11f95cc70348a2a5883e0dc5ae56482b0afe96e61938e4d15688f8abf9783976443c00b6a69e9037b5080194babb97200e25e2c548b9153 SHA512 a1955a3f7a7fd190f7d85ad07e30dee74b0f4b7ed670a4a9a7613317d2898faf776cbed0c5c7b6da25ddd5099c9638e9abb2aca16aec61c568fc2f8c9789ffe4
DIST leatherman-1.5.2.tar.gz 814349 BLAKE2B 1bc2d85426683e9f82d31ba9e3b63b4c9185b0bfa5ae832ea252ecbd922b44dfa67b6011145489d5c5809a76011aef8b143f6b705ea0436d914fc0d8ca8091a2 SHA512 9cef854fd7a95c54fcfc2e639e469dfaa4625757ea8aceeb9ac2162bfc89cbcbc1d5e8217af5f1fad4f31d98528475e22157ca6b1046a36e0928074f866ddafd
DIST leatherman-1.5.3.tar.gz 814340 BLAKE2B 7dec42f1a62511a4f63ca197212f3b81f5baa862b0a7f825c2caa7e9af6bdd15e7b5aad39649d7e5dbb6bd62df19895bbf851421f9aa2795ced785c2e28bcdcf SHA512 e2616a42c6879755f338f9f0291bf28c7465d51caa3326be521ae3e0d5d79e82099c8720dc19223ad9112cde81c4579faf28a2b467f802baefc99dd59212b818
diff --git a/dev-libs/leatherman/leatherman-1.4.2.ebuild b/dev-libs/leatherman/leatherman-1.4.2.ebuild
deleted file mode 100644
index 94a5c158e9d5..000000000000
--- a/dev-libs/leatherman/leatherman-1.4.2.ebuild
+++ /dev/null
@@ -1,58 +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"
-IUSE="debug static-libs test"
-KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc x86"
-SLOT="0/1.4"
-
-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
- )
- 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.4.4.ebuild b/dev-libs/leatherman/leatherman-1.4.4.ebuild
index cc7a76208a23..29a1dceafddd 100644
--- a/dev-libs/leatherman/leatherman-1.4.4.ebuild
+++ b/dev-libs/leatherman/leatherman-1.4.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/puppetlabs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
LICENSE="Apache-2.0"
IUSE="debug static-libs test"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc x86"
SLOT="0/${PV}"
RDEPEND="net-misc/curl"