app-arch/p7zip: Port to EAPI 7

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: David Seifert <soap@gentoo.org>

1 files changed, 19 insertions, 32 deletions

diff --git a/app-arch/p7zip/p7zip-16.02-r6.ebuild b/app-arch/p7zip/p7zip-16.02-r7.ebuild
index d4492d89358c..2001d122f099 100644
--- a/app-arch/p7zip/p7zip-16.02-r6.ebuild
+++ b/app-arch/p7zip/p7zip-16.02-r7.ebuild
@@ -1,33 +1,29 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 WX_GTK_VER="3.0"
-
-inherit eutils toolchain-funcs wxwidgets
+inherit multilib toolchain-funcs wrapper wxwidgets
 
 DESCRIPTION="Port of 7-Zip archiver for Unix"
 HOMEPAGE="http://p7zip.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV}_src_all.tar.bz2"
+S="${WORKDIR}/${PN}_${PV}"
 
 LICENSE="LGPL-2.1 rar? ( unRAR )"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris"
 IUSE="abi_x86_x32 doc kde +pch rar static wxwidgets"
-
 REQUIRED_USE="kde? ( wxwidgets )"
 
 RDEPEND="wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X] )"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	abi_x86_x32? ( >=dev-lang/yasm-1.2.0-r1 )
 	amd64? ( dev-lang/yasm )
 	x86? ( dev-lang/nasm )"
 
-S=${WORKDIR}/${PN}_${PV}
-
-DOCS=( ChangeLog README TODO )
-
 PATCHES=(
 	"${FILESDIR}"/${P}-darwin.patch
 	"${FILESDIR}"/CVE-2016-9296.patch
@@ -61,7 +57,7 @@ src_prepare() {
 			-e '/Rar/d' \
 			-e '/RAR/d' \
 			-i makefile* CPP/7zip/Bundles/Format7zFree/makefile || die
-		rm -rf CPP/7zip/Compress/Rar || die
+		rm -r CPP/7zip/Compress/Rar || die
 	fi
 
 	if use abi_x86_x32; then
@@ -75,7 +71,7 @@ src_prepare() {
 		# Mac OS X needs this special makefile, because it has a non-GNU
 		# linker, it doesn't matter so much for bitwidth, for it doesn't
 		# do anything with it
-		cp -f makefile.macosx_llvm_64bits makefile.machine
+		cp -f makefile.macosx_llvm_64bits makefile.machine || die
 		# bundles have extension .bundle but don't die because USE=-rar
 		# removes the Rar directory
 		sed -i -e '/strcpy(name/s/\.so/.bundle/' \
@@ -85,7 +81,7 @@ src_prepare() {
 			$(use rar && echo CPP/7zip/Compress/Rar/makefile.list) || die
 	elif use x86-fbsd; then
 		# FreeBSD needs this special makefile, because it hasn't -ldl
-		sed -e 's/-lc_r/-pthread/' makefile.freebsd > makefile.machine
+		sed -e 's/-lc_r/-pthread/' makefile.freebsd > makefile.machine || die
 	fi
 
 	if use static; then
@@ -103,7 +99,6 @@ src_compile() {
 	emake CC=$(tc-getCC) CXX=$(tc-getCXX) all3
 	if use kde || use wxwidgets; then
 		emake CC=$(tc-getCC) CXX=$(tc-getCXX) -- 7zG
-#		emake CC=$(tc-getCC) CXX=$(tc-getCXX) -- 7zFM
 	fi
 }
 
@@ -112,23 +107,19 @@ src_test() {
 }
 
 src_install() {
-	# this wrappers can not be symlinks, p7zip should be called with full path
-	make_wrapper 7zr "/usr/$(get_libdir)/${PN}/7zr"
-	make_wrapper 7za "/usr/$(get_libdir)/${PN}/7za"
-	make_wrapper 7z "/usr/$(get_libdir)/${PN}/7z"
+	# these wrappers cannot be symlinks, p7zip should be called with full path
+	make_wrapper 7zr /usr/$(get_libdir)/p7zip/7zr
+	make_wrapper 7za /usr/$(get_libdir)/p7zip/7za
+	make_wrapper 7z /usr/$(get_libdir)/p7zip/7z
 
 	if use kde || use wxwidgets; then
-		make_wrapper 7zG "/usr/$(get_libdir)/${PN}/7zG"
-#		make_wrapper 7zFM "/usr/$(get_libdir)/${PN}/7zFM"
-
-#		make_desktop_entry 7zFM "${PN} FM" ${PN} "GTK;Utility;Archiving;Compression"
+		make_wrapper 7zG /usr/$(get_libdir)/p7zip/7zG
 
 		dobin GUI/p7zipForFilemanager
-		exeinto /usr/$(get_libdir)/${PN}
-#		doexe bin/7z{G,FM}
+		exeinto /usr/$(get_libdir)/p7zip
 		doexe bin/7zG
 
-		insinto /usr/$(get_libdir)/${PN}
+		insinto /usr/$(get_libdir)/p7zip
 		doins -r GUI/Lang
 
 		insinto /usr/share/icons/hicolor/16x16/apps/
@@ -138,30 +129,26 @@ src_install() {
 			rm GUI/kde4/p7zip_compress.desktop || die
 			insinto /usr/share/kservices5/ServiceMenus
 			doins GUI/kde4/*.desktop
-			dodir /usr/share/kde4/services/ServiceMenus # drop these lines after konqueror:4/krusader:4 are gone
-			for item in "${ED}"/usr/share/kservices5/ServiceMenus/*.desktop; do
-				item="$(basename ${item})"
-				dosym ${EROOT}"/usr/share/kservices5/ServiceMenus/${item}" "/usr/share/kde4/services/ServiceMenus/${item}"
-			done
 		fi
 	fi
 
 	dobin contrib/gzip-like_CLI_wrapper_for_7z/p7zip
 	doman contrib/gzip-like_CLI_wrapper_for_7z/man1/p7zip.1
 
-	exeinto /usr/$(get_libdir)/${PN}
+	exeinto /usr/$(get_libdir)/p7zip
 	doexe bin/7z bin/7za bin/7zr bin/7zCon.sfx
 	doexe bin/*$(get_modname)
 	if use rar; then
-		exeinto /usr/$(get_libdir)/${PN}/Codecs/
+		exeinto /usr/$(get_libdir)/p7zip/Codecs
 		doexe bin/Codecs/*$(get_modname)
 	fi
 
 	doman man1/7z.1 man1/7za.1 man1/7zr.1
 
+	dodoc ChangeLog README TODO
 	if use doc; then
 		dodoc DOC/*.txt
 		docinto html
-		dodoc -r DOC/MANUAL/*
+		dodoc -r DOC/MANUAL/.
 	fi
 }