Do not use einstall to install, Makefile's support DESTDIR. Cleanup.

Package-Manager: portage-2.1.2_pre2-r5

3 files changed, 8 insertions, 170 deletions

diff --git a/app-misc/mc/Manifest b/app-misc/mc/Manifest
index 38f159d32a1f..e5bb7ac89d96 100644
--- a/app-misc/mc/Manifest
+++ b/app-misc/mc/Manifest
@@ -39,22 +39,18 @@ DIST mc-4.6.1-utf8.patch.bz2 30401 RMD160 f23680c85328b4b0435065f9e5cf430e0cd6b0
 DIST mc-4.6.1.tar.gz 3928370 RMD160 d565ee95a8916d73fad5e0defeb9f2f57e50962b SHA1 92be0802143245e0fb7e3847d70da614cad7d5fb SHA256 086ab03daaac28a28c0ddb9a709040b59e1322f6bfa68e39d004d9c66b119e7e
 DIST u7z-4.16beta.tar.bz2 3041 RMD160 4a682b3b4bc6c09c7414f8d585829763f6c112ea SHA1 5a4898c732ee423bbf9bd38d3b6f0ebab655881c SHA256 668ed6a0484358e51de1be8d8581cc36dd3c915872fb1082550437a2d7aa67dd
 DIST u7z-4.29.tar.bz2 2951 RMD160 1ab0cfea1563e81bdde9c0552d37efe710ea14bf SHA1 1a8c65dcb58a8f1be9d7fa8a3b91b1819fbb3360 SHA256 0d046e76fade7c7e31be01626bb3fcb0afcb5f62809733d0c70e0e12c655348d
-EBUILD mc-4.6.1-r1.ebuild 3840 RMD160 5e4f7ce7130d2edd3137d194c8913fd2156b572a SHA1 076c5cdffa2a8f5e518c624b9907ed04eb01b2b2 SHA256 9aa410bc0bec5b0d657ecd98bc2bcbd5226df1a8e9363d6be96da7e8e65c9545
-MD5 40872a695b897c1894f63143f0ec2b43 mc-4.6.1-r1.ebuild 3840
-RMD160 5e4f7ce7130d2edd3137d194c8913fd2156b572a mc-4.6.1-r1.ebuild 3840
-SHA256 9aa410bc0bec5b0d657ecd98bc2bcbd5226df1a8e9363d6be96da7e8e65c9545 mc-4.6.1-r1.ebuild 3840
-EBUILD mc-4.6.1-r2.ebuild 3837 RMD160 91cba91816e2411b33b99614cccc4b3a9750e947 SHA1 cd9d695f3172f84efc62eb5fa0bb7bb27168f350 SHA256 2203b2ad179b18a5e2325e5b7aae20f7b689288aa8ce56b37f09ae4043171c7e
-MD5 d72333676437bdadc286bf9c72582376 mc-4.6.1-r2.ebuild 3837
-RMD160 91cba91816e2411b33b99614cccc4b3a9750e947 mc-4.6.1-r2.ebuild 3837
-SHA256 2203b2ad179b18a5e2325e5b7aae20f7b689288aa8ce56b37f09ae4043171c7e mc-4.6.1-r2.ebuild 3837
+EBUILD mc-4.6.1-r2.ebuild 3856 RMD160 3428e2f28202985dcbc076a9c41883684ce78150 SHA1 b20db69624a5246078a6ad194061c668cc047d49 SHA256 8111b95340ee7a794f90d9ffe639e41be7e9557513377cee17f72274540b789c
+MD5 c1297e48c17504db25905c1c6deecb11 mc-4.6.1-r2.ebuild 3856
+RMD160 3428e2f28202985dcbc076a9c41883684ce78150 mc-4.6.1-r2.ebuild 3856
+SHA256 8111b95340ee7a794f90d9ffe639e41be7e9557513377cee17f72274540b789c mc-4.6.1-r2.ebuild 3856
 EBUILD mc-4.6.1.ebuild 3559 RMD160 4ee8d3db948c59834a2eb1904d2d33b10c99fe56 SHA1 cb026fdcd7f25615d4c9bd7d24ffa5aee8120f8c SHA256 6112ca92f85f292a9f8a27d7142fde444c670daa0e25af98f0715888e4d62f47
 MD5 b59816ddb22cba888c093d4aa4e0d525 mc-4.6.1.ebuild 3559
 RMD160 4ee8d3db948c59834a2eb1904d2d33b10c99fe56 mc-4.6.1.ebuild 3559
 SHA256 6112ca92f85f292a9f8a27d7142fde444c670daa0e25af98f0715888e4d62f47 mc-4.6.1.ebuild 3559
-MISC ChangeLog 16274 RMD160 24cd88c94526959bf7732801fcf2fe339b2953ff SHA1 e91951f936951247e2246656126bae0231181fa1 SHA256 e09d8fd4d14b3c43f7f02c81457dc564cc8a0de21807c320dbc51b11311fc211
-MD5 2449d333c5abb625a07b46ff0bd386d1 ChangeLog 16274
-RMD160 24cd88c94526959bf7732801fcf2fe339b2953ff ChangeLog 16274
-SHA256 e09d8fd4d14b3c43f7f02c81457dc564cc8a0de21807c320dbc51b11311fc211 ChangeLog 16274
+MISC ChangeLog 16440 RMD160 bd5cd3fc9308dd9ba2804b29819e5f812c637d0a SHA1 06cee554a6ec45490cbf621fb3e88115778e8db1 SHA256 7fa8cf76b73a39430b08030ec1fcfa3a0b10823200c4cf5564a11388f913414a
+MD5 c6523f1f65a0fbedb311e601800ab3dc ChangeLog 16440
+RMD160 bd5cd3fc9308dd9ba2804b29819e5f812c637d0a ChangeLog 16440
+SHA256 7fa8cf76b73a39430b08030ec1fcfa3a0b10823200c4cf5564a11388f913414a ChangeLog 16440
 MISC metadata.xml 233 RMD160 d81ec1a0582856aeac5ef3bfec5c80d9850216f6 SHA1 9b94f113e7f382076b1749c2a856e409c96cade3 SHA256 dce03f6cdd96135caf3c971a5ca4a8c916f44532fe8cfb6df88b7bdade407e8b
 MD5 4eda2fda81ea6a89d8f1f4a2dcd12a85 metadata.xml 233
 RMD160 d81ec1a0582856aeac5ef3bfec5c80d9850216f6 metadata.xml 233
@@ -62,9 +58,6 @@ SHA256 dce03f6cdd96135caf3c971a5ca4a8c916f44532fe8cfb6df88b7bdade407e8b metadata
 MD5 3ef06152e915e8603f9064ee6ee375b4 files/digest-mc-4.6.1 711
 RMD160 87bbf5334901ba270ce42c175c8fdd35f05982c1 files/digest-mc-4.6.1 711
 SHA256 b20f6209af8c836b2acba79723cf9854b69e0145a41af195932c947e2713123f files/digest-mc-4.6.1 711
-MD5 3ef06152e915e8603f9064ee6ee375b4 files/digest-mc-4.6.1-r1 711
-RMD160 87bbf5334901ba270ce42c175c8fdd35f05982c1 files/digest-mc-4.6.1-r1 711
-SHA256 b20f6209af8c836b2acba79723cf9854b69e0145a41af195932c947e2713123f files/digest-mc-4.6.1-r1 711
 MD5 e44020f133c8e16d56784bd3ae21041e files/digest-mc-4.6.1-r2 708
 RMD160 b4f25a3be25edbcc6ba52ae2be1a087955b3db16 files/digest-mc-4.6.1-r2 708
 SHA256 f9ded44bd363c563a74300baf1026ec9e962cf1ab22376f4cba7281ac008b71a files/digest-mc-4.6.1-r2 708
diff --git a/app-misc/mc/files/digest-mc-4.6.1-r1 b/app-misc/mc/files/digest-mc-4.6.1-r1
deleted file mode 100644
index 17b4ba9611d2..000000000000
--- a/app-misc/mc/files/digest-mc-4.6.1-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 becd9c9ecefbaed5bfb453cad2e4725a mc-4.6.1-utf8.patch.bz2 30401
-RMD160 f23680c85328b4b0435065f9e5cf430e0cd6b0c4 mc-4.6.1-utf8.patch.bz2 30401
-SHA256 dbc0f41059c4010665027d6ab756c4ca6d65584bcfb771afa120da3219e8e61b mc-4.6.1-utf8.patch.bz2 30401
-MD5 18b20db6e40480a53bac2870c56fc3c4 mc-4.6.1.tar.gz 3928370
-RMD160 d565ee95a8916d73fad5e0defeb9f2f57e50962b mc-4.6.1.tar.gz 3928370
-SHA256 086ab03daaac28a28c0ddb9a709040b59e1322f6bfa68e39d004d9c66b119e7e mc-4.6.1.tar.gz 3928370
-MD5 60a8e4524554a550472622db7fcf728f u7z-4.16beta.tar.bz2 3041
-RMD160 4a682b3b4bc6c09c7414f8d585829763f6c112ea u7z-4.16beta.tar.bz2 3041
-SHA256 668ed6a0484358e51de1be8d8581cc36dd3c915872fb1082550437a2d7aa67dd u7z-4.16beta.tar.bz2 3041
diff --git a/app-misc/mc/mc-4.6.1-r1.ebuild b/app-misc/mc/mc-4.6.1-r1.ebuild
deleted file mode 100644
index 53ef11c9d070..000000000000
--- a/app-misc/mc/mc-4.6.1-r1.ebuild
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/mc/mc-4.6.1-r1.ebuild,v 1.4 2006/07/27 23:51:25 flameeyes Exp $
-
-inherit flag-o-matic eutils
-
-U7Z_PV="4.16"
-U7Z="u7z-${U7Z_PV}beta.tar.bz2"
-DESCRIPTION="GNU Midnight Commander cli-based file manager"
-HOMEPAGE="http://www.ibiblio.org/mc/"
-SRC_URI="http://www.ibiblio.org/pub/Linux/utils/file/managers/${PN}/${P}.tar.gz
-	mirror://gentoo/${P}-utf8.patch.bz2
-	7zip? ( http://sgh.nightmail.ru/files/u7z/${U7Z} )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="7zip X gpm ncurses nls pam samba slang unicode"
-
-PROVIDE="virtual/editor"
-
-RDEPEND="kernel_linux? ( >=sys-fs/e2fsprogs-1.19 )
-	ncurses? ( >=sys-libs/ncurses-5.2-r5 )
-	=dev-libs/glib-2*
-	pam? ( >=sys-libs/pam-0.72 )
-	gpm? ( >=sys-libs/gpm-1.19.3 )
-	slang? ( ~sys-libs/slang-1.4.9 )
-	samba? ( >=net-fs/samba-3.0.0 )
-	X? ( || ( (
-			x11-libs/libX11
-			x11-libs/libICE
-			x11-libs/libXau
-			x11-libs/libXdmcp
-			x11-libs/libSM
-			)
-			virtual/x11
-		)
-	)
-	x86? ( 7zip? ( >=app-arch/p7zip-4.16 ) )
-	ppc? ( 7zip? ( >=app-arch/p7zip-4.16 ) )
-	amd64? ( 7zip? ( >=app-arch/p7zip-4.16 ) )"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-src_unpack() {
-	if ( use x86 || use amd64 || use ppc ) && use 7zip; then
-		unpack ${U7Z}
-	fi
-	unpack ${P}.tar.gz
-	cd ${S}
-
-	epatch ${FILESDIR}/${P}-find.patch
-	if ( use x86 || use amd64 || use ppc ) && use 7zip; then
-		epatch ${FILESDIR}/${PN}-4.6.0-7zip.patch
-	fi
-	epatch ${FILESDIR}/${P}-largefile.patch
-	if use slang && use unicode; then
-		epatch ${DISTDIR}/${P}-utf8.patch.bz2
-	fi
-	epatch ${FILESDIR}/${P}-nonblock.patch
-
-	# Prevent lazy bindings in cons.saver binary. (bug #135009)
-	#  - not using bindnow-flags() because cons.saver is only built on GNU/Linux
-	sed -i -e "s:^\(cons_saver_LDADD = .*\):\1 -Wl,-z,now:" \
-		src/Makefile.in
-}
-
-src_compile() {
-	append-flags -I/usr/include/gssapi
-
-	filter-flags -malign-double
-
-	local myconf=""
-
-	if ! use slang && ! use ncurses ; then
-		myconf="${myconf} --with-screen=mcslang"
-	elif use ncurses && ! use slang ; then
-		myconf="${myconf} --with-screen=ncurses"
-	else
-		use slang && myconf="${myconf} --with-screen=slang"
-	fi
-
-	myconf="${myconf} `use_with gpm gpm-mouse`"
-
-	use nls \
-	    && myconf="${myconf} --with-included-gettext" \
-	    || myconf="${myconf} --disable-nls"
-
-	myconf="${myconf} `use_with X x`"
-
-	use samba \
-	    && myconf="${myconf} --with-samba --with-configdir=/etc/samba --with-codepagedir=/var/lib/samba/codepages --with-privatedir=/etc/samba/private" \
-	    || myconf="${myconf} --without-samba"
-
-	econf \
-	    --with-vfs \
-	    --with-ext2undel \
-	    --with-edit \
-		--enable-charset \
-	    ${myconf} || die
-
-	emake || die
-}
-
-src_install() {
-	 cat ${FILESDIR}/chdir-4.6.0.gentoo >>\
-		 ${S}/lib/mc-wrapper.sh
-
-	einstall || die
-
-	# install cons.saver setuid, to actually work
-	chmod u+s ${D}/usr/lib/mc/cons.saver
-
-	dodoc ChangeLog AUTHORS MAINTAINERS FAQ INSTALL* NEWS README*
-
-	insinto /usr/share/mc
-	doins ${FILESDIR}/mc.gentoo
-	doins ${FILESDIR}/mc.ini
-
-	if ( use x86 || use amd64 || use ppc ) && use 7zip; then
-		cd ../${U7Z_PV}
-		exeinto /usr/share/mc/extfs
-		doexe u7z
-		dodoc readme.u7z
-		newdoc ChangeLog ChangeLog.u7z
-	fi
-
-	insinto /usr/share/mc/syntax
-	doins ${FILESDIR}/ebuild.syntax
-	cd ${D}/usr/share/mc/syntax
-	epatch ${FILESDIR}/${PN}-4.6.0-ebuild-syntax.patch
-
-	# http://bugs.gentoo.org/show_bug.cgi?id=71275
-	rm -f ${D}/usr/share/locale/locale.alias
-}
-
-pkg_postinst() {
-	einfo "Add the following line to your ~/.bashrc to"
-	einfo "allow mc to chdir to its latest working dir at exit"
-	einfo ""
-	einfo "# Midnight Commander chdir enhancement"
-	einfo "if [ -f /usr/share/mc/mc.gentoo ]; then"
-	einfo "	. /usr/share/mc/mc.gentoo"
-	einfo "fi"
-}