[gentoo-commits] repo/gentoo:master commit in: sys-apps/ucspi-proxy/

[Mike Gilbert]

commit:     3f1d538050c6e79a6aff7c73a9ceaa2cf8edbe44
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sun Apr  4 18:14:10 2021 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sun Apr  4 18:15:36 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f1d5380

sys-apps/ucspi-proxy: avoid D in src_configure

Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>

 sys-apps/ucspi-proxy/ucspi-proxy-0.99.ebuild | 11 ++++++++---
 sys-apps/ucspi-proxy/ucspi-proxy-1.1.ebuild  | 11 ++++++++---
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/sys-apps/ucspi-proxy/ucspi-proxy-0.99.ebuild 
b/sys-apps/ucspi-proxy/ucspi-proxy-0.99.ebuild
index 28b9fea119e..003533b539b 100644
--- a/sys-apps/ucspi-proxy/ucspi-proxy-0.99.ebuild
+++ b/sys-apps/ucspi-proxy/ucspi-proxy-0.99.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -24,8 +24,13 @@ src_prepare() {
 src_configure() {
        echo "$(tc-getCC) ${CFLAGS}" > conf-cc
        echo "$(tc-getCC) ${LDFLAGS}" > conf-ld
-       echo "${D}/usr/bin" > conf-bin
-       echo "${D}/usr/share/man" > conf-man
+       echo "/usr/bin" > conf-bin
+       echo "/usr/share/man" > conf-man
        echo "/usr/include/bglibs" > conf-bgincs
        echo "/usr/$(get_libdir)/bglibs" > conf-bglibs
 }
+
+src_install() {
+       local -x install_prefix="${D}"
+       default
+}

diff --git a/sys-apps/ucspi-proxy/ucspi-proxy-1.1.ebuild 
b/sys-apps/ucspi-proxy/ucspi-proxy-1.1.ebuild
index efbc87c0209..05bc1325eda 100644
--- a/sys-apps/ucspi-proxy/ucspi-proxy-1.1.ebuild
+++ b/sys-apps/ucspi-proxy/ucspi-proxy-1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -20,6 +20,11 @@ DEPEND="${RDEPEND}"
 src_configure() {
        echo "$(tc-getCC) ${CFLAGS}" > conf-cc || die
        echo "$(tc-getCC) ${LDFLAGS}" > conf-ld || die
-       echo "${ED}/usr/bin" > conf-bin || die
-       echo "${ED}/usr/share/man" > conf-man || die
+       echo "${EPREFIX}/usr/bin" > conf-bin || die
+       echo "${EPREFIX}/usr/share/man" > conf-man || die
+}
+
+src_install() {
+       local -x install_prefix="${D}"
+       default
 }