Gentoo Archives: gentoo-commits

From: David Seifert <soap@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/crypto++/
Date: Sun, 11 Aug 2019 11:50:31
Message-Id: 1565524196.dc7f97dfd64e90c43d2966565f25e69c8aec6f00.soap@gentoo
1 commit: dc7f97dfd64e90c43d2966565f25e69c8aec6f00
2 Author: David Seifert <soap <AT> gentoo <DOT> org>
3 AuthorDate: Sun Aug 11 11:49:56 2019 +0000
4 Commit: David Seifert <soap <AT> gentoo <DOT> org>
5 CommitDate: Sun Aug 11 11:49:56 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dc7f97df
7
8 dev-libs/crypto++: [QA] Fix double-prefix
9
10 Package-Manager: Portage-2.3.71, Repoman-2.3.17
11 Signed-off-by: David Seifert <soap <AT> gentoo.org>
12
13 dev-libs/crypto++/crypto++-5.6.5-r1.ebuild | 6 +++---
14 dev-libs/crypto++/crypto++-7.0.0-r3.ebuild | 2 +-
15 dev-libs/crypto++/crypto++-8.2.0-r2.ebuild | 2 +-
16 dev-libs/crypto++/crypto++-8.2.0.ebuild | 2 +-
17 4 files changed, 6 insertions(+), 6 deletions(-)
18
19 diff --git a/dev-libs/crypto++/crypto++-5.6.5-r1.ebuild b/dev-libs/crypto++/crypto++-5.6.5-r1.ebuild
20 index 03281fc6285..a9e3e6b14be 100644
21 --- a/dev-libs/crypto++/crypto++-5.6.5-r1.ebuild
22 +++ b/dev-libs/crypto++/crypto++-5.6.5-r1.ebuild
23 @@ -1,4 +1,4 @@
24 -# Copyright 1999-2018 Gentoo Foundation
25 +# Copyright 1999-2019 Gentoo Authors
26 # Distributed under the terms of the GNU General Public License v2
27
28 EAPI=7
29 @@ -43,11 +43,11 @@ src_install() {
30
31 # remove leftovers as build system sucks
32 rm -fr "${ED}"/usr/bin "${ED}"/usr/share/cryptopp
33 - use static-libs || rm -f "${ED}${EPREFIX}"/usr/$(get_libdir)/*.a
34 + use static-libs || rm -f "${ED}"/usr/$(get_libdir)/*.a
35
36 # compatibility
37 dosym cryptopp "${EPREFIX}"/usr/include/crypto++
38 - for f in "${ED}${EPREFIX}"/usr/$(get_libdir)/*; do
39 + for f in "${ED}"/usr/$(get_libdir)/*; do
40 ln -s "$(basename "${f}")" "$(echo "${f}" | sed 's/cryptopp/crypto++/')" || die
41 done
42 }
43
44 diff --git a/dev-libs/crypto++/crypto++-7.0.0-r3.ebuild b/dev-libs/crypto++/crypto++-7.0.0-r3.ebuild
45 index b9882c54d47..b8e97a92fc8 100644
46 --- a/dev-libs/crypto++/crypto++-7.0.0-r3.ebuild
47 +++ b/dev-libs/crypto++/crypto++-7.0.0-r3.ebuild
48 @@ -44,5 +44,5 @@ src_compile() {
49 src_install() {
50 default
51
52 - use static-libs || rm -f "${ED}${EPREFIX}"/usr/$(get_libdir)/*.a
53 + use static-libs || rm -f "${ED}"/usr/$(get_libdir)/*.a
54 }
55
56 diff --git a/dev-libs/crypto++/crypto++-8.2.0-r2.ebuild b/dev-libs/crypto++/crypto++-8.2.0-r2.ebuild
57 index 41b85ded021..0aaec92008f 100644
58 --- a/dev-libs/crypto++/crypto++-8.2.0-r2.ebuild
59 +++ b/dev-libs/crypto++/crypto++-8.2.0-r2.ebuild
60 @@ -56,5 +56,5 @@ src_compile() {
61 src_install() {
62 default
63
64 - use static-libs || rm -f "${ED}${EPREFIX}"/usr/$(get_libdir)/*.a
65 + use static-libs || rm -f "${ED}"/usr/$(get_libdir)/*.a
66 }
67
68 diff --git a/dev-libs/crypto++/crypto++-8.2.0.ebuild b/dev-libs/crypto++/crypto++-8.2.0.ebuild
69 index 3adfa849d2f..fbe99b4b3ce 100644
70 --- a/dev-libs/crypto++/crypto++-8.2.0.ebuild
71 +++ b/dev-libs/crypto++/crypto++-8.2.0.ebuild
72 @@ -48,5 +48,5 @@ src_compile() {
73 src_install() {
74 default
75
76 - use static-libs || rm -f "${ED}${EPREFIX}"/usr/$(get_libdir)/*.a
77 + use static-libs || rm -f "${ED}"/usr/$(get_libdir)/*.a
78 }