Gentoo Archives: gentoo-commits

From: Matthew Thode <prometheanfire@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/leatherman/
Date: Fri, 15 Nov 2019 16:23:39
Message-Id: 1573835007.91458cff45074464a6add33f74917710dc2da3cd.prometheanfire@gentoo
1 commit: 91458cff45074464a6add33f74917710dc2da3cd
2 Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
3 AuthorDate: Fri Nov 15 16:13:45 2019 +0000
4 Commit: Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
5 CommitDate: Fri Nov 15 16:23:27 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91458cff
7
8 dev-libs/leatherman: 1.8.0 stable amd64/x86
9
10 Package-Manager: Portage-2.3.76, Repoman-2.3.18
11 Signed-off-by: Matthew Thode <prometheanfire <AT> gentoo.org>
12
13 dev-libs/leatherman/Manifest | 1 -
14 dev-libs/leatherman/leatherman-1.7.3.ebuild | 58 -----------------------------
15 dev-libs/leatherman/leatherman-1.8.0.ebuild | 2 +-
16 3 files changed, 1 insertion(+), 60 deletions(-)
17
18 diff --git a/dev-libs/leatherman/Manifest b/dev-libs/leatherman/Manifest
19 index 46e77334802..9011ae69806 100644
20 --- a/dev-libs/leatherman/Manifest
21 +++ b/dev-libs/leatherman/Manifest
22 @@ -1,4 +1,3 @@
23 DIST leatherman-1.3.0.tar.gz 434229 BLAKE2B e0c19bca2378afc4928554ac0862543504ba725aadc6cffd78220f7f7f1b725cad960fc6d9fdd2d54a43c233b35959ebcb9c71d1191a5535703599fa32e3301e SHA512 5e06be7add652f69b0d4a8d778e33dfb68183c4d598217cc6542d2431f7984f0af989c27bd69e89b77ab03d6dd2adab9d70f68cd87dae20d8e24ae05923fbe9b
24 -DIST leatherman-1.7.3.tar.gz 815236 BLAKE2B 26bb6cbf19675741c0d325f42ccce993cd7fa58b116601fa5fc79d2fb443f2c8b26799138289714a1663996247c267efb5485b04cfa68161bc291d91758f7f84 SHA512 4ce424d90c83e5268925095f267f3365b0a75e60d92af83836c790f538d381153c200fff1a1e152b60e247240698d3cbe9a59c4e366040eece0101819775ddff
25 DIST leatherman-1.8.0.tar.gz 815287 BLAKE2B a8377cedac49e0845e689e4e8ff58fb59e6e59c77e8cd363774d22650b4b286d85e0b5e52b926c3e4169ba2eadf9fc50f16f5161001a16f63c49f3ca66c996cc SHA512 fb308025f0807b12527fe6fc287fee861eb27b6987df38c03e1da73c477aec5a2a6c92860c983c4cc10282388ee34f2cf657a38831db007519c471f815f492f6
26 DIST leatherman-1.9.0.tar.gz 815504 BLAKE2B 62b4b9aeca3279b7f89fba1c3a7655e59c5d490cb44ba92e4c2dfe5ffa78eeb02a448bd6c6e6b08c324531b799ab5d1800a3b57c4e490794f76bf9737db16963 SHA512 d8e0fe7f165845056a0308241ef0e656077269cd6cbc656b1a72295ff475e813d3f523c8d45b14d7e10a8deebe786ac7fc836c46d4230142812a9c0362cd8967
27
28 diff --git a/dev-libs/leatherman/leatherman-1.7.3.ebuild b/dev-libs/leatherman/leatherman-1.7.3.ebuild
29 deleted file mode 100644
30 index 3e365ff23fc..00000000000
31 --- a/dev-libs/leatherman/leatherman-1.7.3.ebuild
32 +++ /dev/null
33 @@ -1,58 +0,0 @@
34 -# Copyright 1999-2019 Gentoo Authors
35 -# Distributed under the terms of the GNU General Public License v2
36 -
37 -EAPI=6
38 -
39 -inherit cmake-utils multilib
40 -
41 -DESCRIPTION="A C++ toolkit"
42 -HOMEPAGE="https://github.com/puppetlabs/leatherman"
43 -SRC_URI="https://github.com/puppetlabs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
44 -
45 -LICENSE="Apache-2.0"
46 -IUSE="debug static-libs test"
47 -KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc x86"
48 -SLOT="0/${PV}"
49 -
50 -RDEPEND="net-misc/curl"
51 -DEPEND=">=dev-libs/boost-1.54:=[nls]
52 - net-misc/curl
53 - >=sys-devel/gcc-4.8:*"
54 -
55 -PATCHES=( "${FILESDIR}"/portage-sandbox-test-fix.patch )
56 -
57 -src_prepare() {
58 - sed -i 's/\-Werror\ //g' "cmake/cflags.cmake" || die
59 - cmake-utils_src_prepare
60 -}
61 -
62 -src_configure() {
63 - local mycmakeargs=(
64 - -DCMAKE_VERBOSE_MAKEFILE=ON
65 - -DCMAKE_BUILD_TYPE=None
66 - -DCMAKE_INSTALL_PREFIX=/usr
67 - )
68 - if ! use static-libs; then
69 - mycmakeargs+=(
70 - -DLEATHERMAN_SHARED=ON
71 - )
72 - else
73 - mycmakeargs+=(
74 - -DLEATHERMAN_SHARED=OFF
75 - )
76 - fi
77 - if use debug; then
78 - mycmakeargs+=(
79 - -DCMAKE_BUILD_TYPE=Debug
80 - )
81 - fi
82 - cmake-utils_src_configure
83 -}
84 -
85 -src_test() {
86 - "${WORKDIR}/${P}"_build/bin/leatherman_test
87 -}
88 -
89 -src_install() {
90 - cmake-utils_src_install
91 -}
92
93 diff --git a/dev-libs/leatherman/leatherman-1.8.0.ebuild b/dev-libs/leatherman/leatherman-1.8.0.ebuild
94 index 33542697140..3e365ff23fc 100644
95 --- a/dev-libs/leatherman/leatherman-1.8.0.ebuild
96 +++ b/dev-libs/leatherman/leatherman-1.8.0.ebuild
97 @@ -11,7 +11,7 @@ SRC_URI="https://github.com/puppetlabs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
98
99 LICENSE="Apache-2.0"
100 IUSE="debug static-libs test"
101 -KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
102 +KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc x86"
103 SLOT="0/${PV}"
104
105 RDEPEND="net-misc/curl"