1 |
commit: e0fbb22752542b806291b79858c6a6e4665e004e |
2 |
Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Aug 16 19:58:53 2019 +0000 |
4 |
Commit: Matthew Thode <prometheanfire <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Aug 16 20:07:04 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e0fbb227 |
7 |
|
8 |
dev-libs/leatherman: 1.6.1 stable amd64 and x86 |
9 |
|
10 |
Package-Manager: Portage-2.3.69, Repoman-2.3.17 |
11 |
Signed-off-by: Matthew Thode <prometheanfire <AT> gentoo.org> |
12 |
|
13 |
dev-libs/leatherman/Manifest | 1 - |
14 |
dev-libs/leatherman/leatherman-1.6.0.ebuild | 58 ----------------------------- |
15 |
dev-libs/leatherman/leatherman-1.6.1.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 7680d7d718e..2cf436aff35 100644 |
20 |
--- a/dev-libs/leatherman/Manifest |
21 |
+++ b/dev-libs/leatherman/Manifest |
22 |
@@ -1,3 +1,2 @@ |
23 |
DIST leatherman-1.3.0.tar.gz 434229 BLAKE2B e0c19bca2378afc4928554ac0862543504ba725aadc6cffd78220f7f7f1b725cad960fc6d9fdd2d54a43c233b35959ebcb9c71d1191a5535703599fa32e3301e SHA512 5e06be7add652f69b0d4a8d778e33dfb68183c4d598217cc6542d2431f7984f0af989c27bd69e89b77ab03d6dd2adab9d70f68cd87dae20d8e24ae05923fbe9b |
24 |
-DIST leatherman-1.6.0.tar.gz 814463 BLAKE2B 1c990c261ded1fd32bb5b1912f84a4bef8ac3ccfae9172e0496f90283e1a2ac210bf9dc1c7e88bcb8776798674d93c1313359135051b4c7f023e1e3080104e2e SHA512 d0d22b60db2c164183268d29fe1bc1ee9ed16797d38174849eaa74841f801869d038e5672664aae89517487811a70f689a345a2c87d3a2f0a04d55214e7f9eaa |
25 |
DIST leatherman-1.6.1.tar.gz 814463 BLAKE2B b3370eaf1312894dadb9e754869cf72d498c452ef4c740acc9550d1c3fd881a673439f35fcfe2475635869910df52e81d0cc9b97a7a2fc62227a14376297f55b SHA512 0803b985b57bd5e34ba31137b31fdfece53cb545dffb6a9447aa3de0353c9300e2d9e41b2b4f761b7683e02ed6577decfb1938d238314fd8439eccb16aa9475a |
26 |
|
27 |
diff --git a/dev-libs/leatherman/leatherman-1.6.0.ebuild b/dev-libs/leatherman/leatherman-1.6.0.ebuild |
28 |
deleted file mode 100644 |
29 |
index 3e365ff23fc..00000000000 |
30 |
--- a/dev-libs/leatherman/leatherman-1.6.0.ebuild |
31 |
+++ /dev/null |
32 |
@@ -1,58 +0,0 @@ |
33 |
-# Copyright 1999-2019 Gentoo Authors |
34 |
-# Distributed under the terms of the GNU General Public License v2 |
35 |
- |
36 |
-EAPI=6 |
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 |
-KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc x86" |
47 |
-SLOT="0/${PV}" |
48 |
- |
49 |
-RDEPEND="net-misc/curl" |
50 |
-DEPEND=">=dev-libs/boost-1.54:=[nls] |
51 |
- net-misc/curl |
52 |
- >=sys-devel/gcc-4.8:*" |
53 |
- |
54 |
-PATCHES=( "${FILESDIR}"/portage-sandbox-test-fix.patch ) |
55 |
- |
56 |
-src_prepare() { |
57 |
- sed -i 's/\-Werror\ //g' "cmake/cflags.cmake" || die |
58 |
- cmake-utils_src_prepare |
59 |
-} |
60 |
- |
61 |
-src_configure() { |
62 |
- local mycmakeargs=( |
63 |
- -DCMAKE_VERBOSE_MAKEFILE=ON |
64 |
- -DCMAKE_BUILD_TYPE=None |
65 |
- -DCMAKE_INSTALL_PREFIX=/usr |
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.6.1.ebuild b/dev-libs/leatherman/leatherman-1.6.1.ebuild |
93 |
index 33542697140..3e365ff23fc 100644 |
94 |
--- a/dev-libs/leatherman/leatherman-1.6.1.ebuild |
95 |
+++ b/dev-libs/leatherman/leatherman-1.6.1.ebuild |
96 |
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/puppetlabs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz |
97 |
|
98 |
LICENSE="Apache-2.0" |
99 |
IUSE="debug static-libs 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" |