[gentoo-commits] repo/gentoo:master commit in: app-admin/reportmagic/

[gentoo-commits] repo/gentoo:master commit in: app-admin/reportmagic/

[Mike Gilbert]

commit:     b7234c663025bce672adc4cf9d51f0aedcf47d81
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Mon Apr  5 02:19:21 2021 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Mon Apr  5 02:19:21 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b7234c66

app-admin/reportmagic: avoid using D in src_unpack

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

 app-admin/reportmagic/metadata.xml            |  2 +-
 app-admin/reportmagic/reportmagic-2.21.ebuild | 13 ++++---------
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/app-admin/reportmagic/metadata.xml b/app-admin/reportmagic/metadata.xml
index 585b0dc75dd..7a38bb90096 100644
--- a/app-admin/reportmagic/metadata.xml
+++ b/app-admin/reportmagic/metadata.xml
@@ -2,4 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
-	</pkgmetadata>
+</pkgmetadata>

diff --git a/app-admin/reportmagic/reportmagic-2.21.ebuild b/app-admin/reportmagic/reportmagic-2.21.ebuild
index 2993a06ce84..11cbe8bbd02 100644
--- a/app-admin/reportmagic/reportmagic-2.21.ebuild
+++ b/app-admin/reportmagic/reportmagic-2.21.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=5
@@ -28,16 +28,11 @@ DEPEND="sys-libs/zlib
 
 S="${WORKDIR}/rmagic-${PV}"
 
-src_unpack() {
-	unpack ${A} ; cd "${S}"
-
+src_install() {
 	sed -i \
-		-e "s:^\$DEST.*:\$DEST='${D}/usr/share/reportmagic';:g" \
-		-e "s:^\$DOC.*:\$DOC='${D}/usr/share/doc/${PF}';:g" \
+		-e "s:^\$DEST.*:\$DEST='${ED}/usr/share/reportmagic';:g" \
+		-e "s:^\$DOC.*:\$DOC='${ED}/usr/share/doc/${PF}';:g" \
 		Install.PL \
 		|| die "sed failed"
-}
-
-src_install() {
 	perl Install.PL -no_modules
 }