1 |
commit: 8f369984ab8372de9fee366673978e7b7ca08fd4 |
2 |
Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Sep 13 13:53:05 2021 +0000 |
4 |
Commit: Matthew Thode <prometheanfire <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Sep 13 13:55:06 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f369984 |
7 |
|
8 |
dev-libs/leatherman: 1.12.5 clean up |
9 |
|
10 |
Package-Manager: Portage-3.0.20, Repoman-3.0.3 |
11 |
Signed-off-by: Matthew Thode <prometheanfire <AT> gentoo.org> |
12 |
|
13 |
dev-libs/leatherman/Manifest | 1 - |
14 |
dev-libs/leatherman/leatherman-1.12.5.ebuild | 61 ---------------------------- |
15 |
2 files changed, 62 deletions(-) |
16 |
|
17 |
diff --git a/dev-libs/leatherman/Manifest b/dev-libs/leatherman/Manifest |
18 |
index d96cc0b0fed..3968c41f1a3 100644 |
19 |
--- a/dev-libs/leatherman/Manifest |
20 |
+++ b/dev-libs/leatherman/Manifest |
21 |
@@ -1,2 +1 @@ |
22 |
-DIST leatherman-1.12.5.tar.gz 818066 BLAKE2B 9d30fb224d3f4389f398294712dc85af782eeff877dd0a214fc60ee67d4a70467c1d32255cf8814f0cfc5428c660a315c24a9becdb1aa05f4d5c43ede8552af7 SHA512 dad1ee67f98a4cd12d9c6f022ae2b8c748e4c081918744030191d7c33f84983691f6bcfba3ddf5c0e5b4c36109ebd757325d6e42d88c74caaff942e6603d333e |
23 |
DIST leatherman-1.12.6.tar.gz 818106 BLAKE2B 056ea52c355cf178e16be03f2a4fb54bf0e6aece4045545e7e45c50664e711db2bb756f56c9cd33a6dfe1de24c4ecb98766d4bd158ffb7757958274ba38f76db SHA512 4e2a1ee2e7226224f115648a78bc3e4798ef0528ef32e01d1e7ebcbeb1250fd6ed88001c9db21456feeef3bd6ff201b0fd68fd5feb2671a66d13519dd3454386 |
24 |
|
25 |
diff --git a/dev-libs/leatherman/leatherman-1.12.5.ebuild b/dev-libs/leatherman/leatherman-1.12.5.ebuild |
26 |
deleted file mode 100644 |
27 |
index 93aeee4fe22..00000000000 |
28 |
--- a/dev-libs/leatherman/leatherman-1.12.5.ebuild |
29 |
+++ /dev/null |
30 |
@@ -1,61 +0,0 @@ |
31 |
-# Copyright 1999-2021 Gentoo Authors |
32 |
-# Distributed under the terms of the GNU General Public License v2 |
33 |
- |
34 |
-EAPI=7 |
35 |
- |
36 |
-inherit cmake |
37 |
- |
38 |
-DESCRIPTION="A C++ toolkit" |
39 |
-HOMEPAGE="https://github.com/puppetlabs/leatherman" |
40 |
-SRC_URI="https://github.com/puppetlabs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" |
41 |
- |
42 |
-LICENSE="Apache-2.0" |
43 |
-IUSE="debug static-libs test" |
44 |
-#RESTRICT="!test? ( test )" |
45 |
-RESTRICT="test" # restricted til we don't need the shared_nowide patch |
46 |
-KEYWORDS="amd64 ~arm ~hppa ppc ppc64 sparc x86" |
47 |
-SLOT="0/${PV}" |
48 |
- |
49 |
-RDEPEND="net-misc/curl" |
50 |
-DEPEND=">=dev-libs/boost-1.73:=[nls] |
51 |
- net-misc/curl |
52 |
- >=sys-devel/gcc-4.8:*" |
53 |
- |
54 |
-PATCHES=( "${FILESDIR}"/portage-sandbox-test-fix.patch ) |
55 |
-PATCHES+=( "${FILESDIR}"/1.12.2-shared_nowide.patch ) |
56 |
- |
57 |
-src_prepare() { |
58 |
- sed -i 's/\-Werror\ //g' "cmake/cflags.cmake" || die |
59 |
- # vendored boost lib conflicts with boost 1.73 and above |
60 |
- cmake_src_prepare |
61 |
-} |
62 |
- |
63 |
-src_configure() { |
64 |
- local mycmakeargs=( |
65 |
- -DCMAKE_VERBOSE_MAKEFILE=ON |
66 |
- -DCMAKE_BUILD_TYPE=None |
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_src_configure |
83 |
-} |
84 |
- |
85 |
-src_test() { |
86 |
- "${WORKDIR}/${P}"_build/bin/leatherman_test |
87 |
-} |
88 |
- |
89 |
-src_install() { |
90 |
- cmake_src_install |
91 |
-} |