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: Sat, 30 May 2020 17:18:56
Message-Id: 1590859126.acbf60f136e19fd2ad42bf35e886d0f14a82cf84.prometheanfire@gentoo
1 commit: acbf60f136e19fd2ad42bf35e886d0f14a82cf84
2 Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
3 AuthorDate: Sat May 30 17:15:13 2020 +0000
4 Commit: Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
5 CommitDate: Sat May 30 17:18:46 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=acbf60f1
7
8 dev-libs/leatherman: 1.12.0 stable amd64/x86 with cleanup
9
10 Package-Manager: Portage-2.3.99, Repoman-2.3.22
11 Signed-off-by: Matthew Thode <prometheanfire <AT> gentoo.org>
12
13 dev-libs/leatherman/Manifest | 1 -
14 dev-libs/leatherman/leatherman-1.11.0.ebuild | 58 ----------------------------
15 dev-libs/leatherman/leatherman-1.12.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 ba0a675f4ed..5a669ad1ac2 100644
20 --- a/dev-libs/leatherman/Manifest
21 +++ b/dev-libs/leatherman/Manifest
22 @@ -1,3 +1,2 @@
23 -DIST leatherman-1.11.0.tar.gz 815946 BLAKE2B 73afb7c517ea93d0c3dc1c88adb3e5041c764bbfb223357b14a6a3f864ff614d178e7a71293eb533f09013fe3f64d5afe40c9404882d2fe6836da7322e869d8f SHA512 0cbc558ba6976d4f14947efbc59e2ebc306a8c7e4590a22fa2e2f044b37ffd8804dbabaf96c599c47394fd9379f2de1330ce5282237b5009730d8d3b87349ae5
24 DIST leatherman-1.12.0.tar.gz 815947 BLAKE2B cc268275f7ef7e9bddca9a2ca25c1a6b0bca64d57f90a485b83103a2477d476a39fe91ccf46798f1885b29c697de6556890131c7aac2a9e61590edab66fd6ea7 SHA512 2ceb16f94bf3d06bfe477a40e15db5a1d3d3999eaa7023245a08ab4e0054179f28308d9bf6ba73a839ca3a68130259894593fc8e77664b672ac5f3d20511a4d2
25 DIST leatherman-1.3.0.tar.gz 434229 BLAKE2B e0c19bca2378afc4928554ac0862543504ba725aadc6cffd78220f7f7f1b725cad960fc6d9fdd2d54a43c233b35959ebcb9c71d1191a5535703599fa32e3301e SHA512 5e06be7add652f69b0d4a8d778e33dfb68183c4d598217cc6542d2431f7984f0af989c27bd69e89b77ab03d6dd2adab9d70f68cd87dae20d8e24ae05923fbe9b
26
27 diff --git a/dev-libs/leatherman/leatherman-1.11.0.ebuild b/dev-libs/leatherman/leatherman-1.11.0.ebuild
28 deleted file mode 100644
29 index 1421317e76f..00000000000
30 --- a/dev-libs/leatherman/leatherman-1.11.0.ebuild
31 +++ /dev/null
32 @@ -1,58 +0,0 @@
33 -# Copyright 1999-2020 Gentoo Authors
34 -# Distributed under the terms of the GNU General Public License v2
35 -
36 -EAPI=7
37 -
38 -inherit cmake-utils multilib
39 -
40 -DESCRIPTION="A C++ toolkit"
41 -HOMEPAGE="https://github.com/puppetlabs/leatherman"
42 -SRC_URI="https://github.com/puppetlabs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
43 -
44 -LICENSE="Apache-2.0"
45 -IUSE="debug static-libs test"
46 -RESTRICT="!test? ( 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 - )
67 - if ! use static-libs; then
68 - mycmakeargs+=(
69 - -DLEATHERMAN_SHARED=ON
70 - )
71 - else
72 - mycmakeargs+=(
73 - -DLEATHERMAN_SHARED=OFF
74 - )
75 - fi
76 - if use debug; then
77 - mycmakeargs+=(
78 - -DCMAKE_BUILD_TYPE=Debug
79 - )
80 - fi
81 - cmake-utils_src_configure
82 -}
83 -
84 -src_test() {
85 - "${WORKDIR}/${P}"_build/bin/leatherman_test
86 -}
87 -
88 -src_install() {
89 - cmake-utils_src_install
90 -}
91
92 diff --git a/dev-libs/leatherman/leatherman-1.12.0.ebuild b/dev-libs/leatherman/leatherman-1.12.0.ebuild
93 index aef4cd92309..1421317e76f 100644
94 --- a/dev-libs/leatherman/leatherman-1.12.0.ebuild
95 +++ b/dev-libs/leatherman/leatherman-1.12.0.ebuild
96 @@ -12,7 +12,7 @@ SRC_URI="https://github.com/puppetlabs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
97 LICENSE="Apache-2.0"
98 IUSE="debug static-libs test"
99 RESTRICT="!test? ( test )"
100 -KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
101 +KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc x86"
102 SLOT="0/${PV}"
103
104 RDEPEND="net-misc/curl"