1 |
commit: 82fb9e8fe0195051f7e26ae30d5de37645d599cc |
2 |
Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Sep 22 17:54:37 2022 +0000 |
4 |
Commit: Matthew Thode <prometheanfire <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Sep 22 17:54:49 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=82fb9e8f |
7 |
|
8 |
dev-libs/leatherman: drop 1.12.6-r1, 1.12.6-r2 |
9 |
|
10 |
Signed-off-by: Matthew Thode <prometheanfire <AT> gentoo.org> |
11 |
|
12 |
dev-libs/leatherman/Manifest | 1 - |
13 |
dev-libs/leatherman/leatherman-1.12.6-r1.ebuild | 60 ------------------------ |
14 |
dev-libs/leatherman/leatherman-1.12.6-r2.ebuild | 62 ------------------------- |
15 |
3 files changed, 123 deletions(-) |
16 |
|
17 |
diff --git a/dev-libs/leatherman/Manifest b/dev-libs/leatherman/Manifest |
18 |
index 4ac2a94c10d1..d56b570c462e 100644 |
19 |
--- a/dev-libs/leatherman/Manifest |
20 |
+++ b/dev-libs/leatherman/Manifest |
21 |
@@ -1,3 +1,2 @@ |
22 |
-DIST leatherman-1.12.6.tar.gz 818106 BLAKE2B 056ea52c355cf178e16be03f2a4fb54bf0e6aece4045545e7e45c50664e711db2bb756f56c9cd33a6dfe1de24c4ecb98766d4bd158ffb7757958274ba38f76db SHA512 4e2a1ee2e7226224f115648a78bc3e4798ef0528ef32e01d1e7ebcbeb1250fd6ed88001c9db21456feeef3bd6ff201b0fd68fd5feb2671a66d13519dd3454386 |
23 |
DIST leatherman-1.12.7.tar.gz 815838 BLAKE2B 21284f5128c9264b751011b1d68c6baf553037612cab39cc339920091ae42980f6c3920f5b339d4cba31a40b190fa73d779f45dcc30b78e866708c3178ac6699 SHA512 dd763bf89d8356aa00805817af7029ee77452a9210b6aded16ac1434f233fbba9b41014ab55a076773f50da6d16e1cffae50e2a23d1c4b336df9cc88c05ede56 |
24 |
DIST leatherman-1.12.8.tar.gz 815817 BLAKE2B b0844527a470c0e54983d49abc84a7331a07f3cac76919f56e58a01d60b794e422f3ef8342e046c483a83c428d2c80ff8e8d6b71375f45ddb03a5721e63c7aef SHA512 c6096a7c0e95fb43c6998f26e8f28157f46b78af4eaf2caaa1caae832d2f23aa7591e3a29a17f24bc9b993421645d37d44249fd8cae15a3d18b40d614acd23ad |
25 |
|
26 |
diff --git a/dev-libs/leatherman/leatherman-1.12.6-r1.ebuild b/dev-libs/leatherman/leatherman-1.12.6-r1.ebuild |
27 |
deleted file mode 100644 |
28 |
index 00b2695e08b3..000000000000 |
29 |
--- a/dev-libs/leatherman/leatherman-1.12.6-r1.ebuild |
30 |
+++ /dev/null |
31 |
@@ -1,60 +0,0 @@ |
32 |
-# Copyright 1999-2022 Gentoo Authors |
33 |
-# Distributed under the terms of the GNU General Public License v2 |
34 |
- |
35 |
-EAPI=7 |
36 |
- |
37 |
-inherit cmake |
38 |
- |
39 |
-DESCRIPTION="A C++ toolkit" |
40 |
-HOMEPAGE="https://github.com/puppetlabs/leatherman" |
41 |
-SRC_URI="https://github.com/puppetlabs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" |
42 |
- |
43 |
-LICENSE="Apache-2.0" |
44 |
-SLOT="0/${PV}" |
45 |
-KEYWORDS="amd64 ~arm ~hppa ppc ppc64 sparc x86" |
46 |
-IUSE="debug static-libs test" |
47 |
-#RESTRICT="!test? ( test )" |
48 |
-RESTRICT="test" # restricted til we don't need the shared_nowide patch |
49 |
- |
50 |
-RDEPEND="dev-libs/boost:=[nls] |
51 |
- net-misc/curl" |
52 |
-DEPEND="${RDEPEND}" |
53 |
- |
54 |
-PATCHES=( |
55 |
- "${FILESDIR}"/portage-sandbox-test-fix.patch |
56 |
- "${FILESDIR}"/1.12.2-shared_nowide.patch |
57 |
-) |
58 |
- |
59 |
-src_prepare() { |
60 |
- sed -i 's/\-Werror\ //g' "cmake/cflags.cmake" || die |
61 |
- # vendored boost lib conflicts with boost 1.73 and above |
62 |
- cmake_src_prepare |
63 |
-} |
64 |
- |
65 |
-src_configure() { |
66 |
- local mycmakeargs=( |
67 |
- -DCMAKE_VERBOSE_MAKEFILE=ON |
68 |
- -DCMAKE_BUILD_TYPE=None |
69 |
- -DLEATHERMAN_ENABLE_TESTING=$(usex test) |
70 |
- # We depend on Boost with nls, so this is always true |
71 |
- -DLEATHERMAN_USE_ICU=ON |
72 |
- |
73 |
- -DLEATHERMAN_SHARED=$(usex !static-libs) |
74 |
- ) |
75 |
- |
76 |
- if use debug; then |
77 |
- mycmakeargs+=( |
78 |
- -DCMAKE_BUILD_TYPE=Debug |
79 |
- ) |
80 |
- fi |
81 |
- |
82 |
- cmake_src_configure |
83 |
-} |
84 |
- |
85 |
-src_test() { |
86 |
- "${WORKDIR}/${P}"_build/bin/leatherman_test || die |
87 |
-} |
88 |
- |
89 |
-src_install() { |
90 |
- cmake_src_install |
91 |
-} |
92 |
|
93 |
diff --git a/dev-libs/leatherman/leatherman-1.12.6-r2.ebuild b/dev-libs/leatherman/leatherman-1.12.6-r2.ebuild |
94 |
deleted file mode 100644 |
95 |
index 94708b8922ab..000000000000 |
96 |
--- a/dev-libs/leatherman/leatherman-1.12.6-r2.ebuild |
97 |
+++ /dev/null |
98 |
@@ -1,62 +0,0 @@ |
99 |
-# Copyright 1999-2022 Gentoo Authors |
100 |
-# Distributed under the terms of the GNU General Public License v2 |
101 |
- |
102 |
-EAPI=7 |
103 |
- |
104 |
-inherit cmake |
105 |
- |
106 |
-DESCRIPTION="A C++ toolkit" |
107 |
-HOMEPAGE="https://github.com/puppetlabs/leatherman" |
108 |
-SRC_URI="https://github.com/puppetlabs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" |
109 |
- |
110 |
-LICENSE="Apache-2.0" |
111 |
-SLOT="0/${PV}" |
112 |
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86" |
113 |
-IUSE="debug static-libs test" |
114 |
-#RESTRICT="!test? ( test )" |
115 |
-RESTRICT="test" # restricted til we don't need the shared_nowide patch |
116 |
- |
117 |
-RDEPEND="dev-libs/boost:=[nls] |
118 |
- net-misc/curl" |
119 |
-DEPEND="${RDEPEND}" |
120 |
- |
121 |
-PATCHES=( |
122 |
- "${FILESDIR}"/portage-sandbox-test-fix.patch |
123 |
- "${FILESDIR}"/1.12.2-shared_nowide.patch |
124 |
-) |
125 |
- |
126 |
-src_prepare() { |
127 |
- sed -i 's/\-Werror\ //g' "cmake/cflags.cmake" || die |
128 |
- # vendored boost lib conflicts with boost 1.73 and above |
129 |
- cmake_src_prepare |
130 |
-} |
131 |
- |
132 |
-src_configure() { |
133 |
- local mycmakeargs=( |
134 |
- -DCMAKE_VERBOSE_MAKEFILE=ON |
135 |
- -DCMAKE_BUILD_TYPE=None |
136 |
- -DLEATHERMAN_ENABLE_TESTING=$(usex test) |
137 |
- # We depend on Boost with nls, so this is always true |
138 |
- -DLEATHERMAN_USE_ICU=ON |
139 |
- |
140 |
- -DLEATHERMAN_SHARED=$(usex !static-libs) |
141 |
- ) |
142 |
- |
143 |
- if use debug; then |
144 |
- mycmakeargs+=( |
145 |
- -DCMAKE_BUILD_TYPE=Debug |
146 |
- ) |
147 |
- fi |
148 |
- |
149 |
- cmake_src_configure |
150 |
- cd "${BUILD_DIR}" |
151 |
- eapply "${FILESDIR}"/${P}-SIGSTKSZ.patch |
152 |
-} |
153 |
- |
154 |
-src_test() { |
155 |
- "${WORKDIR}/${P}"_build/bin/leatherman_test || die |
156 |
-} |
157 |
- |
158 |
-src_install() { |
159 |
- cmake_src_install |
160 |
-} |