From: Mike Gilbert <floppym@gentoo.org>
Date: Sun, 30 Sep 2018 17:54:37 +0000 (-0400)
Subject: dev-libs/botan: fixup ED references for EAPI 7
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=0728f77261bb2d645f755996ede8c0119e39ebc1;p=gentoo.git

dev-libs/botan: fixup ED references for EAPI 7

Closes: https://bugs.gentoo.org/667258
Package-Manager: Portage-2.3.50_p10, Repoman-2.3.11_p17
Signed-off-by: Mike Gilbert <floppym@gentoo.org>
---

diff --git a/dev-libs/botan/botan-1.10.17.ebuild b/dev-libs/botan/botan-1.10.17-r1.ebuild
similarity index 92%
rename from dev-libs/botan/botan-1.10.17.ebuild
rename to dev-libs/botan/botan-1.10.17-r1.ebuild
index 3288e91d07f7..755972c0fc64 100644
--- a/dev-libs/botan/botan-1.10.17.ebuild
+++ b/dev-libs/botan/botan-1.10.17-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -128,15 +128,15 @@ src_test() {
 }
 
 src_install() {
-	emake DESTDIR="${ED}usr" install
+	emake DESTDIR="${ED}/usr" install
 
 	if ! use static-libs; then
-		rm "${ED}usr/$(get_libdir)/libbotan"*.a || die 'remove of static libs failed'
+		rm "${ED}/usr/$(get_libdir)/libbotan"*.a || die 'remove of static libs failed'
 	fi
 
 	# Add compatibility symlinks.
-	[[ -e "${ED}usr/bin/botan-config" ]] && die "Compatibility code no longer needed"
-	[[ -e "${ED}usr/$(get_libdir)/pkgconfig/botan.pc" ]] && die "Compatibility code no longer needed"
+	[[ -e "${ED}/usr/bin/botan-config" ]] && die "Compatibility code no longer needed"
+	[[ -e "${ED}/usr/$(get_libdir)/pkgconfig/botan.pc" ]] && die "Compatibility code no longer needed"
 	dosym botan-config-1.10 /usr/bin/botan-config
 	dosym botan-1.10.pc /usr/$(get_libdir)/pkgconfig/botan.pc