1 |
commit: 12686d113989e083ab8088374358311855c8603d |
2 |
Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Jul 16 20:14:27 2018 +0000 |
4 |
Commit: Matt Thode <prometheanfire <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Jul 16 20:17:54 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=12686d11 |
7 |
|
8 |
dev-libs/leatherman: 1.4.2 stable amd64 and x86 with cleanup |
9 |
|
10 |
Package-Manager: Portage-2.3.40, Repoman-2.3.9 |
11 |
|
12 |
dev-libs/leatherman/Manifest | 1 - |
13 |
dev-libs/leatherman/leatherman-1.4.1.ebuild | 60 ----------------------------- |
14 |
dev-libs/leatherman/leatherman-1.4.2.ebuild | 2 +- |
15 |
3 files changed, 1 insertion(+), 62 deletions(-) |
16 |
|
17 |
diff --git a/dev-libs/leatherman/Manifest b/dev-libs/leatherman/Manifest |
18 |
index fe3d72b5931..1c6f17ad1b4 100644 |
19 |
--- a/dev-libs/leatherman/Manifest |
20 |
+++ b/dev-libs/leatherman/Manifest |
21 |
@@ -1,3 +1,2 @@ |
22 |
DIST leatherman-1.3.0.tar.gz 434229 BLAKE2B e0c19bca2378afc4928554ac0862543504ba725aadc6cffd78220f7f7f1b725cad960fc6d9fdd2d54a43c233b35959ebcb9c71d1191a5535703599fa32e3301e SHA512 5e06be7add652f69b0d4a8d778e33dfb68183c4d598217cc6542d2431f7984f0af989c27bd69e89b77ab03d6dd2adab9d70f68cd87dae20d8e24ae05923fbe9b |
23 |
-DIST leatherman-1.4.1.tar.gz 814131 BLAKE2B 53851ce0e875a5953a445b594659d494b127956694b2488c343694b9d4adff9890dc0e462671950c9d920dd5828951ad7629cae20de57625aef02522789024f5 SHA512 71fa4723d231ffd6c582a332d6e57da8d1631d787ac7eeef55a505217b9d216ada11efc2636f2238c0272c30d943c61e1f391941f1c4531f911cce597062ffa6 |
24 |
DIST leatherman-1.4.2.tar.gz 814263 BLAKE2B 5ca8123f264ed0f7843c6fc1b0966c577fb9d12933e5baa375e0beef8ba17afe4388f1e05e1022e392c50e32e159b765531137cf069bd0f5b8baa3626c860949 SHA512 e0cb19605163b68ac5a8fc74e875d856af5e34345f19c38f0db45da7536ec27ba6cf4b4e8c5883ceb9a5978cdc8831181ec89ad4105252366b198af4f3f22bff |
25 |
|
26 |
diff --git a/dev-libs/leatherman/leatherman-1.4.1.ebuild b/dev-libs/leatherman/leatherman-1.4.1.ebuild |
27 |
deleted file mode 100644 |
28 |
index 41db96ea9c0..00000000000 |
29 |
--- a/dev-libs/leatherman/leatherman-1.4.1.ebuild |
30 |
+++ /dev/null |
31 |
@@ -1,60 +0,0 @@ |
32 |
-# Copyright 1999-2018 Gentoo Foundation |
33 |
-# Distributed under the terms of the GNU General Public License v2 |
34 |
- |
35 |
-EAPI=6 |
36 |
- |
37 |
-inherit cmake-utils multilib |
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 |
-IUSE="debug static-libs test" |
45 |
-KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc x86" |
46 |
-SLOT="0/1.4" |
47 |
- |
48 |
-RDEPEND="net-misc/curl" |
49 |
-DEPEND=">=dev-libs/boost-1.54:=[nls] |
50 |
- net-misc/curl |
51 |
- >=sys-devel/gcc-4.8:*" |
52 |
- |
53 |
-PATCHES=( "${FILESDIR}"/portage-sandbox-test-fix.patch ) |
54 |
- |
55 |
-src_prepare() { |
56 |
- sed -i 's/\-Werror\ //g' "cmake/cflags.cmake" || die |
57 |
- cmake-utils_src_prepare |
58 |
-} |
59 |
- |
60 |
-src_configure() { |
61 |
- local mycmakeargs=( |
62 |
- -DCMAKE_VERBOSE_MAKEFILE=ON |
63 |
- -DCMAKE_BUILD_TYPE=None |
64 |
- -DCMAKE_INSTALL_PREFIX=/usr |
65 |
- -DCMAKE_INSTALL_SYSCONFDIR=/etc |
66 |
- -DCMAKE_INSTALL_LOCALSTATEDIR=/var |
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.4.2.ebuild b/dev-libs/leatherman/leatherman-1.4.2.ebuild |
94 |
index 2df52d6356d..94a5c158e9d 100644 |
95 |
--- a/dev-libs/leatherman/leatherman-1.4.2.ebuild |
96 |
+++ b/dev-libs/leatherman/leatherman-1.4.2.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/1.4" |
104 |
|
105 |
RDEPEND="net-misc/curl" |