gentoo resync : 28.04.2021

4 files changed, 22 insertions, 370 deletions

diff --git a/app-arch/p7zip/Manifest b/app-arch/p7zip/Manifest
index 5edfa2709395..97aae81e9606 100644
--- a/app-arch/p7zip/Manifest
+++ b/app-arch/p7zip/Manifest
@@ -5,7 +5,5 @@ AUX CVE-2018-5996.patch 6427 BLAKE2B a60d4c51470d9a1ee58afc4ced5190dc589c78604df
 AUX WimHandler.cpp.patch 413 BLAKE2B 06e1ef38fbb8ae11f9c28df68c7e15db52060974930f61bdd5a04d970bc71f724a5122b05ad24b0e89d6b2142f54762ce4b6467d25345fca89075d6626abf9b3 SHA512 c246a7d912ec965b5212a510893aa1c9bd47b66b8f0fb47c03d46e5f3f891e2134cb8733594fd84f7e6034ebf07a9aac633230e2a0eebfb476f6429469058a75
 AUX p7zip-16.02-darwin.patch 2134 BLAKE2B f8890b8b3e0a3ade007f162e5d3b7fdc9925e8960c6e22463a5ebc474e4ebb2577f0cc0312fda6c129bd1a02dc3ac6d3de17f2c551ee710ab36d0658acfaec52 SHA512 ed8689e39e5bd55eb9cc74c02c94782ac893fc30079492dbde459f24d07037ca63c91526ea428934814febbfbcd1f80c0683cd40d48eab055a3f856b1d78fb37
 DIST p7zip_16.02_src_all.tar.bz2 4239909 BLAKE2B 075356fba5284cbb124e30c36364a910ae5a7ac6bee8a8fb682c5a7ce2f1870ef83d3160c84f8dabad1d616c13d642cba1f19fb9384160d21590cf678dd8f1a6 SHA512 d2c4d53817f96bb4c7683f42045198d4cd509cfc9c3e2cb85c8d9dc4ab6dfa7496449edeac4e300ecf986a9cbbc90bd8f8feef8156895d94617c04e507add55f
-EBUILD p7zip-16.02-r4.ebuild 4626 BLAKE2B de3aa55ac83dcf37923a0e78ea8d6bf9615e032ed6d2e03a5b02ef72f56fc962aa74f8d0e1cc1b1dfdccc9f30c6e5e12c8ba8cd74c36ced378abc62dd94c3ba7 SHA512 505a65e89ee9b95fb25783431465315170d5a2566abcef63e02a4c59dd620580aaf78386f282829f997488b0190f507d7e89d12e3d6967c32626a0808b8f95cc
-EBUILD p7zip-16.02-r5.ebuild 4791 BLAKE2B 0f50cfa479b53a2416caef68dd5cae3e2631f69251a0da39ab3ef56c712af1a1d1f32c03cda3d5c4018fabbe6632b444f96ab345cc66e35815452870d27c681f SHA512 e481261da736c57fc870c3891c929927d71f77272641da7eb203871527fd6a7ec5348bf09dce225d096c5507cfdad09efd8bf06e0280dfb8b1afdd796a2fa8b4
-EBUILD p7zip-16.02-r6.ebuild 4776 BLAKE2B 5b53d4b964d1e2e6db7e00e521b9808962d30a53572a82084072f7ee4589e37be9804cdf5e31baef52b6153dafcad1f3e6839b3220d5ab4fcd71de1fdc0989cd SHA512 6b54c96587cd5bdc6dcf6fb39ced6fb88256f5f5a7e64306b690c48f5894bb789464f6c504ee345a387ba5f5a7db21a932b4da4d27945bb6f5d928ae206ae7f7
+EBUILD p7zip-16.02-r8.ebuild 4270 BLAKE2B 777d68aad2371428f48198b02d2fbc3ebcd1f653421e12719a40d86fe79e847f870cebce3015468acaf9788c55d3f89bd98884e3911d3f8f25c29cda89ffedfd SHA512 b346e1dc7f2f723c1c19a40f710705fd6102e2095111d85aefee437170479f282daffba872982f8f74f2d03e0a4f9438fa832dd4ee98c9e26d667a0130b07ccf
 MISC metadata.xml 393 BLAKE2B 6ab87f3e2f35dded47136efbf8f93c7a899a5918b4a8e3ab6658a427da8085e8eb0e6ce2aec09fd0ea5fb14909081600b79027878b7e5b8ef9d476def057e52f SHA512 50eb24c1e60e0be2c02d8054a5039c5e2b11ac82aea3f90c0a37c21e68b01135de88878b1079ec46eeb8d1f8ab52fb8c9f58f88a498feb38ae5743adb7519176
diff --git a/app-arch/p7zip/p7zip-16.02-r4.ebuild b/app-arch/p7zip/p7zip-16.02-r4.ebuild
deleted file mode 100644
index 93e6132eddbb..000000000000
--- a/app-arch/p7zip/p7zip-16.02-r4.ebuild
+++ /dev/null
@@ -1,165 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-WX_GTK_VER="3.0"
-
-inherit eutils toolchain-funcs 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"
-
-LICENSE="LGPL-2.1 rar? ( unRAR )"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 ~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}
-	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
-	"${FILESDIR}"/CVE-2017-17969.patch
-	"${FILESDIR}"/CVE-2018-5996.patch
-	"${FILESDIR}"/CVE-2018-10115.patch
-)
-
-src_prepare() {
-	default
-
-	if ! use pch; then
-		sed "s:PRE_COMPILED_HEADER=StdAfx.h.gch:PRE_COMPILED_HEADER=:g" -i makefile.* || die
-	fi
-
-	sed \
-		-e 's|-m32 ||g' \
-		-e 's|-m64 ||g' \
-		-e 's|-pipe||g' \
-		-e '/ALLFLAGS/s|-s ||' \
-		-e "/OPTFLAGS=/s|=.*|=${CXXFLAGS}|" \
-		-i makefile* || die
-
-	# remove non-free RAR codec
-	if use rar; then
-		ewarn "Enabling nonfree RAR decompressor"
-	else
-		sed \
-			-e '/Rar/d' \
-			-e '/RAR/d' \
-			-i makefile* CPP/7zip/Bundles/Format7zFree/makefile || die
-		rm -rf CPP/7zip/Compress/Rar || die
-	fi
-
-	if use abi_x86_x32; then
-		sed -i -e "/^ASM=/s:amd64:x32:" makefile* || die
-		cp -f makefile.linux_amd64_asm makefile.machine || die
-	elif use amd64; then
-		cp -f makefile.linux_amd64_asm makefile.machine || die
-	elif use x86; then
-		cp -f makefile.linux_x86_asm_gcc_4.X makefile.machine || die
-	elif [[ ${CHOST} == *-darwin* ]] ; then
-		# 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
-		# bundles have extension .bundle but don't die because USE=-rar
-		# removes the Rar directory
-		sed -i -e '/strcpy(name/s/\.so/.bundle/' \
-			CPP/Windows/DLL.cpp || die
-		sed -i -e '/^PROG=/s/\.so/.bundle/' \
-			CPP/7zip/Bundles/Format7zFree/makefile.list \
-			$(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
-	fi
-
-	if use static; then
-		sed -i -e '/^LOCAL_LIBS=/s/LOCAL_LIBS=/&-static /' makefile.machine || die
-	fi
-
-	if use kde || use wxwidgets; then
-		need-wxwidgets unicode
-		einfo "Preparing dependency list"
-		emake depend
-	fi
-}
-
-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 -- 7zFM
-	fi
-}
-
-src_test() {
-	emake test test_7z test_7zr
-}
-
-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"
-
-	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"
-
-		dobin GUI/p7zipForFilemanager
-		exeinto /usr/$(get_libdir)/${PN}
-#		doexe bin/7z{G,FM}
-		doexe bin/7zG
-
-		insinto /usr/$(get_libdir)/${PN}
-		doins -r GUI/Lang
-		doins -r DOC/MANUAL
-
-		insinto /usr/share/icons/hicolor/16x16/apps/
-		newins GUI/p7zip_16_ok.png p7zip.png
-
-		if use kde; then
-			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 "/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}
-	doexe bin/7z bin/7za bin/7zr bin/7zCon.sfx
-	doexe bin/*$(get_modname)
-	if use rar; then
-		exeinto /usr/$(get_libdir)/${PN}/Codecs/
-		doexe bin/Codecs/*$(get_modname)
-	fi
-
-	doman man1/7z.1 man1/7za.1 man1/7zr.1
-
-	if use doc; then
-		dodoc DOC/*.txt
-		dohtml -r DOC/MANUAL/*
-	fi
-}
diff --git a/app-arch/p7zip/p7zip-16.02-r6.ebuild b/app-arch/p7zip/p7zip-16.02-r6.ebuild
deleted file mode 100644
index 49e822f2436e..000000000000
--- a/app-arch/p7zip/p7zip-16.02-r6.ebuild
+++ /dev/null
@@ -1,167 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-WX_GTK_VER="3.0"
-
-inherit eutils toolchain-funcs 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"
-
-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}
-	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
-	"${FILESDIR}"/CVE-2017-17969.patch
-	"${FILESDIR}"/CVE-2018-5996.patch
-	"${FILESDIR}"/CVE-2018-10115.patch
-	"${FILESDIR}"/WimHandler.cpp.patch
-)
-
-src_prepare() {
-	default
-
-	if ! use pch; then
-		sed "s:PRE_COMPILED_HEADER=StdAfx.h.gch:PRE_COMPILED_HEADER=:g" -i makefile.* || die
-	fi
-
-	sed \
-		-e 's|-m32 ||g' \
-		-e 's|-m64 ||g' \
-		-e 's|-pipe||g' \
-		-e "/[ALL|OPT]FLAGS/s|-s||;/OPTIMIZE/s|-s||" \
-		-e "/CFLAGS=/s|=|+=|" \
-		-e "/CXXFLAGS=/s|=|+=|" \
-		-i makefile* || die
-
-	# remove non-free RAR codec
-	if use rar; then
-		ewarn "Enabling nonfree RAR decompressor"
-	else
-		sed \
-			-e '/Rar/d' \
-			-e '/RAR/d' \
-			-i makefile* CPP/7zip/Bundles/Format7zFree/makefile || die
-		rm -rf CPP/7zip/Compress/Rar || die
-	fi
-
-	if use abi_x86_x32; then
-		sed -i -e "/^ASM=/s:amd64:x32:" makefile* || die
-		cp -f makefile.linux_amd64_asm makefile.machine || die
-	elif use amd64; then
-		cp -f makefile.linux_amd64_asm makefile.machine || die
-	elif use x86; then
-		cp -f makefile.linux_x86_asm_gcc_4.X makefile.machine || die
-	elif [[ ${CHOST} == *-darwin* ]] ; then
-		# 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
-		# bundles have extension .bundle but don't die because USE=-rar
-		# removes the Rar directory
-		sed -i -e '/strcpy(name/s/\.so/.bundle/' \
-			CPP/Windows/DLL.cpp || die
-		sed -i -e '/^PROG=/s/\.so/.bundle/' \
-			CPP/7zip/Bundles/Format7zFree/makefile.list \
-			$(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
-	fi
-
-	if use static; then
-		sed -i -e '/^LOCAL_LIBS=/s/LOCAL_LIBS=/&-static /' makefile.machine || die
-	fi
-
-	if use kde || use wxwidgets; then
-		need-wxwidgets unicode
-		einfo "Preparing dependency list"
-		emake CC=$(tc-getCC) CXX=$(tc-getCXX) depend
-	fi
-}
-
-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
-}
-
-src_test() {
-	emake test test_7z test_7zr
-}
-
-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"
-
-	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"
-
-		dobin GUI/p7zipForFilemanager
-		exeinto /usr/$(get_libdir)/${PN}
-#		doexe bin/7z{G,FM}
-		doexe bin/7zG
-
-		insinto /usr/$(get_libdir)/${PN}
-		doins -r GUI/Lang
-
-		insinto /usr/share/icons/hicolor/16x16/apps/
-		newins GUI/p7zip_16_ok.png p7zip.png
-
-		if use kde; then
-			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}
-	doexe bin/7z bin/7za bin/7zr bin/7zCon.sfx
-	doexe bin/*$(get_modname)
-	if use rar; then
-		exeinto /usr/$(get_libdir)/${PN}/Codecs/
-		doexe bin/Codecs/*$(get_modname)
-	fi
-
-	doman man1/7z.1 man1/7za.1 man1/7zr.1
-
-	if use doc; then
-		dodoc DOC/*.txt
-		docinto html
-		dodoc -r DOC/MANUAL/*
-	fi
-}
diff --git a/app-arch/p7zip/p7zip-16.02-r5.ebuild b/app-arch/p7zip/p7zip-16.02-r8.ebuild
index 2f8242418453..b41f7d8a8f5c 100644
--- a/app-arch/p7zip/p7zip-16.02-r5.ebuild
+++ b/app-arch/p7zip/p7zip-16.02-r8.ebuild
@@ -3,31 +3,27 @@
 
 EAPI=7
 
-WX_GTK_VER="3.0"
-
-inherit eutils toolchain-funcs wxwidgets
+WX_GTK_VER="3.0-gtk3"
+inherit multilib toolchain-funcs wrapper wxwidgets xdg
 
 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 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris"
+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
@@ -93,7 +89,7 @@ src_prepare() {
 	fi
 
 	if use kde || use wxwidgets; then
-		need-wxwidgets unicode
+		setup-wxwidgets unicode
 		einfo "Preparing dependency list"
 		emake CC=$(tc-getCC) CXX=$(tc-getCXX) depend
 	fi
@@ -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,25 +107,20 @@ 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
-		doins -r DOC/MANUAL
 
 		insinto /usr/share/icons/hicolor/16x16/apps/
 		newins GUI/p7zip_16_ok.png p7zip.png
@@ -139,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
 }