1 |
commit: 0728f77261bb2d645f755996ede8c0119e39ebc1 |
2 |
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Sep 30 17:54:37 2018 +0000 |
4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Sep 30 17:55:09 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0728f772 |
7 |
|
8 |
dev-libs/botan: fixup ED references for EAPI 7 |
9 |
|
10 |
Closes: https://bugs.gentoo.org/667258 |
11 |
Package-Manager: Portage-2.3.50_p10, Repoman-2.3.11_p17 |
12 |
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> |
13 |
|
14 |
.../botan/{botan-1.10.17.ebuild => botan-1.10.17-r1.ebuild} | 10 +++++----- |
15 |
1 file changed, 5 insertions(+), 5 deletions(-) |
16 |
|
17 |
diff --git a/dev-libs/botan/botan-1.10.17.ebuild b/dev-libs/botan/botan-1.10.17-r1.ebuild |
18 |
similarity index 92% |
19 |
rename from dev-libs/botan/botan-1.10.17.ebuild |
20 |
rename to dev-libs/botan/botan-1.10.17-r1.ebuild |
21 |
index 3288e91d07f..755972c0fc6 100644 |
22 |
--- a/dev-libs/botan/botan-1.10.17.ebuild |
23 |
+++ b/dev-libs/botan/botan-1.10.17-r1.ebuild |
24 |
@@ -1,4 +1,4 @@ |
25 |
-# Copyright 1999-2018 Gentoo Foundation |
26 |
+# Copyright 1999-2018 Gentoo Authors |
27 |
# Distributed under the terms of the GNU General Public License v2 |
28 |
|
29 |
EAPI=7 |
30 |
@@ -128,15 +128,15 @@ src_test() { |
31 |
} |
32 |
|
33 |
src_install() { |
34 |
- emake DESTDIR="${ED}usr" install |
35 |
+ emake DESTDIR="${ED}/usr" install |
36 |
|
37 |
if ! use static-libs; then |
38 |
- rm "${ED}usr/$(get_libdir)/libbotan"*.a || die 'remove of static libs failed' |
39 |
+ rm "${ED}/usr/$(get_libdir)/libbotan"*.a || die 'remove of static libs failed' |
40 |
fi |
41 |
|
42 |
# Add compatibility symlinks. |
43 |
- [[ -e "${ED}usr/bin/botan-config" ]] && die "Compatibility code no longer needed" |
44 |
- [[ -e "${ED}usr/$(get_libdir)/pkgconfig/botan.pc" ]] && die "Compatibility code no longer needed" |
45 |
+ [[ -e "${ED}/usr/bin/botan-config" ]] && die "Compatibility code no longer needed" |
46 |
+ [[ -e "${ED}/usr/$(get_libdir)/pkgconfig/botan.pc" ]] && die "Compatibility code no longer needed" |
47 |
dosym botan-config-1.10 /usr/bin/botan-config |
48 |
dosym botan-1.10.pc /usr/$(get_libdir)/pkgconfig/botan.pc |