[gentoo-commits] repo/gentoo:master commit in: dev-util/lcov/

["Sam James" <sam@gentoo.org>]

commit:     3a461e386f87fc17b90d2f45d767d2ed1ddf334c
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 14 01:37:46 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Oct 14 01:37:46 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a461e38

dev-util/lcov: fix destdir leakage

Closes: https://bugs.gentoo.org/915698
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-util/lcov/{lcov-1.16.ebuild => lcov-1.16-r1.ebuild} | 5 +++--
 dev-util/lcov/{lcov-2.0.ebuild => lcov-2.0-r1.ebuild}   | 5 +++--
 dev-util/lcov/lcov-9999.ebuild                          | 5 +++--
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/dev-util/lcov/lcov-1.16.ebuild b/dev-util/lcov/lcov-1.16-r1.ebuild
similarity index 92%
rename from dev-util/lcov/lcov-1.16.ebuild
rename to dev-util/lcov/lcov-1.16-r1.ebuild
index aaf34d6df283..11ab700358b7 100644
--- a/dev-util/lcov/lcov-1.16.ebuild
+++ b/dev-util/lcov/lcov-1.16-r1.ebuild
@@ -40,8 +40,9 @@ src_test() {
 
 src_install() {
 	emake -j1 \
-		PREFIX="${ED}/usr" \
-		CFG_DIR="${ED}/etc" \
+		DESTDIR="${D}" \
+		CFG_DIR="${EPREFIX}/etc" \
+		PREFIX="${EPREFIX}/usr" \
 		LCOV_PERL_PATH="${EPREFIX}/usr/bin/perl" \
 		install
 }

diff --git a/dev-util/lcov/lcov-2.0.ebuild b/dev-util/lcov/lcov-2.0-r1.ebuild
similarity index 95%
rename from dev-util/lcov/lcov-2.0.ebuild
rename to dev-util/lcov/lcov-2.0-r1.ebuild
index 18570df4f842..5f3d996311f4 100644
--- a/dev-util/lcov/lcov-2.0.ebuild
+++ b/dev-util/lcov/lcov-2.0-r1.ebuild
@@ -68,8 +68,9 @@ src_test() {
 
 src_install() {
 	emake -j1 \
-		PREFIX="${ED}/usr" \
-		CFG_DIR="${ED}/etc" \
+		DESTDIR="${D}" \
+		CFG_DIR="${EPREFIX}/etc" \
+		PREFIX="${EPREFIX}/usr" \
 		LCOV_PERL_PATH="${EPREFIX}/usr/bin/perl" \
 		install
 }

diff --git a/dev-util/lcov/lcov-9999.ebuild b/dev-util/lcov/lcov-9999.ebuild
index 18570df4f842..5f3d996311f4 100644
--- a/dev-util/lcov/lcov-9999.ebuild
+++ b/dev-util/lcov/lcov-9999.ebuild
@@ -68,8 +68,9 @@ src_test() {
 
 src_install() {
 	emake -j1 \
-		PREFIX="${ED}/usr" \
-		CFG_DIR="${ED}/etc" \
+		DESTDIR="${D}" \
+		CFG_DIR="${EPREFIX}/etc" \
+		PREFIX="${EPREFIX}/usr" \
 		LCOV_PERL_PATH="${EPREFIX}/usr/bin/perl" \
 		install
 }