Version bump and clean up.

Package-Manager: portage-2.2_rc42/cvs/Linux x86_64

6 files changed, 29 insertions, 92 deletions

diff --git a/app-misc/mc/ChangeLog b/app-misc/mc/ChangeLog
index 541ea9d09b18..ae693af2d990 100644
--- a/app-misc/mc/ChangeLog
+++ b/app-misc/mc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-misc/mc
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/mc/ChangeLog,v 1.168 2009/09/26 13:38:17 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/mc/ChangeLog,v 1.169 2009/10/02 18:26:25 ssuominen Exp $
+
+*mc-4.7.0_pre3 (02 Oct 2009)
+
+  02 Oct 2009; Samuli Suominen <ssuominen@gentoo.org> +mc-4.7.0_pre3.ebuild:
+  Version bump wrt #287375, thanks to Lars Wendler for reporting.
 
   26 Sep 2009; Brent Baude <ranger@gentoo.org> mc-4.7.0_pre1.ebuild:
   Marking mc-4.7.0_pre1 ppc64 for bug 281667
diff --git a/app-misc/mc/Manifest b/app-misc/mc/Manifest
index 9a6ac8fe4042..76786dec7b4d 100644
--- a/app-misc/mc/Manifest
+++ b/app-misc/mc/Manifest
@@ -18,11 +18,10 @@ AUX mc.ini 43 RMD160 2254610744c484553cd3332a4f45e439b13cceed SHA1 dde4fa7bc4486
 DIST mc-4.6.1-utf8-r2.patch.bz2 30449 RMD160 ffe89eb0cef217ba87398c93b65ebc0e5fefac5d SHA1 f0994ddc412b4f86a7dab83686e846156fc36de2 SHA256 f58de9e412694958c00c7ef831995f2b56b7add7ea1e26567281516db02f483e
 DIST mc-4.6.1.tar.gz 3928370 RMD160 d565ee95a8916d73fad5e0defeb9f2f57e50962b SHA1 92be0802143245e0fb7e3847d70da614cad7d5fb SHA256 086ab03daaac28a28c0ddb9a709040b59e1322f6bfa68e39d004d9c66b119e7e
 DIST mc-4.7.0-pre1.tar.bz2 2783935 RMD160 0f63d2a3b30af097697ae5fb715bb04249877e9b SHA1 028dcdc998f012445cb9a3c707f9411bbe46ac65 SHA256 a774ff52ef9ba4654e3bf48081f4775ad90fb4d86f1670d6a3a6804d090213ef
-DIST mc-4.7.0-pre2.tar.bz2 2858435 RMD160 b183a234d5a42a21591422d4fdb087940bae7593 SHA1 421f25179c01fc17af1dcb3d54d84bf0a6d10128 SHA256 d03e9f5ce534fc04983ee7e1dfae99f2649e7eb8dcf9308d78a39642fce4a45c
+DIST mc-4.7.0-pre3.tar.bz2 2815368 RMD160 301a961bc7a5305f72de5fa85e730d36883a367d SHA1 2c67b231e29f6d1c410e7da51bb49cf84eeb83d9 SHA256 267ba6546665da7eae5d25b7b6ea5800f527027c45497d20385b5c218f170e88
 DIST u7z-4.29.tar.bz2 2951 RMD160 1ab0cfea1563e81bdde9c0552d37efe710ea14bf SHA1 1a8c65dcb58a8f1be9d7fa8a3b91b1819fbb3360 SHA256 0d046e76fade7c7e31be01626bb3fcb0afcb5f62809733d0c70e0e12c655348d
 EBUILD mc-4.6.1-r4.ebuild 4435 RMD160 3fb4884c84cea9ebc1d25712c5cfd82f4cd32a83 SHA1 8299104edf60b0b62ba8b565a88c003029f0c6b2 SHA256 92a93a2dbf14c086a9a0684f813a7d7b05e58835ba1969bae4b7f8f94aa3f315
-EBUILD mc-4.7.0_pre1.ebuild 1812 RMD160 3d70ac84d737d649dd6c1212556086957aed401e SHA1 1b4b3df0a2bc504b42e8d31b0241250f44af315e SHA256 a0b5258b2b6c10f33c1a3dbd1edf3e555d86b045f4e6049be1e22544b1159f04
-EBUILD mc-4.7.0_pre2-r1.ebuild 1645 RMD160 1d3d7bf4090e34e4de575d49eee06ca02974b209 SHA1 9002aff95a94fb3cd1400abfee51f458d82d6bdf SHA256 0a70ac3b6cf33e40fd8833b946c24f49950f292751789344bd239423ced88ac0
-EBUILD mc-4.7.0_pre2.ebuild 1558 RMD160 9be2ebfd884e98282e87b2373019d8699c5bd2f3 SHA1 d9379c02000eaf1a9d0da08534200fb0a9eda514 SHA256 65a8ce6b83be522e59aee3fe70cab39eb161eff44c40018fc1b6c4a5693149d7
-MISC ChangeLog 23852 RMD160 71401bd2107f468265b6d74f6f11936e756b4baa SHA1 7f172681452220bc5cc5502009628ec3d5c8fd32 SHA256 08d0f14fe771028bcf66682e9683fc3d94823c425c76aa2150156f682d1d627f
-MISC metadata.xml 423 RMD160 2efdb411affba9683ab491bf079acc785f7b5857 SHA1 678c4e7e2c9488b82b52f0c544ee8306a1305e5d SHA256 e5865811a2bfece6f846866fb7f8991f06dd3f777844e183a6edbd4e01185249
+EBUILD mc-4.7.0_pre1.ebuild 1871 RMD160 d73d48a9af5a4963fa8101b7a3f405c0693d5103 SHA1 0436e5eca71132c578473f568004f50abb0ee715 SHA256 398b3a60533461cd92a760d34608f984a852bb74ffe4e6792d9e59f8ee884f59
+EBUILD mc-4.7.0_pre3.ebuild 1591 RMD160 b5db97bde8d137fb34e1b9b7dc778c9ab5e7e327 SHA1 c0e482cb58f898dbcf4f86c6a9efa62908c26da9 SHA256 14ffac628443e8d203b22e3e5ab6f6d5d4ed7621668f1c769ae4e48ccf7f5e75
+MISC ChangeLog 24029 RMD160 f921debc4c8fc2fc6f642dca5a83ca828f247ba4 SHA1 984c4dc8ef60fad18ca4ac4f8163c0c26dc0a4ff SHA256 12855b011a21fd402527235fa2fa66a77692fb80242a5fad463c94cd9ea5be81
+MISC metadata.xml 352 RMD160 814964a42e2604c5b2ef52369ac71edaf8433b46 SHA1 bad0f2bfa047a1a53dc29a6260be399479d17340 SHA256 f56d036f03e91a8f515451bc057f91ec187e6675dba87c74bc5640e5b5c00572
diff --git a/app-misc/mc/mc-4.7.0_pre1.ebuild b/app-misc/mc/mc-4.7.0_pre1.ebuild
index d251946ef476..64533d5fa363 100644
--- a/app-misc/mc/mc-4.7.0_pre1.ebuild
+++ b/app-misc/mc/mc-4.7.0_pre1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/mc/mc-4.7.0_pre1.ebuild,v 1.17 2009/09/26 13:38:17 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/mc/mc-4.7.0_pre1.ebuild,v 1.18 2009/10/02 18:26:25 ssuominen Exp $
 
 EAPI=2
 inherit autotools eutils
@@ -14,7 +14,7 @@ SRC_URI="http://www.midnight-commander.org/downloads/${MY_P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 ~arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd"
-IUSE="chdir gpm nls samba +slang X"
+IUSE="gpm nls samba +slang X"
 
 RDEPEND=">=dev-libs/glib-2.6:2
 	gpm? ( sys-libs/gpm )
@@ -63,10 +63,11 @@ src_configure() {
 
 src_install() {
 	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS NEWS README
+	dodoc AUTHORS README
+}
 
-	if use chdir; then
-		insinto /etc/profile.d
-		doins "${FILESDIR}"/mc-chdir.sh
-	fi
+pkg_postinst() {
+	elog "To enable exiting to latest working directory at exit,"
+	elog "put this to your ~/.bashrc:"
+	elog ". /usr/libexec/mc/mc.sh"
 }
diff --git a/app-misc/mc/mc-4.7.0_pre2-r1.ebuild b/app-misc/mc/mc-4.7.0_pre2-r1.ebuild
deleted file mode 100644
index cfd6e1a4e733..000000000000
--- a/app-misc/mc/mc-4.7.0_pre2-r1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/mc/mc-4.7.0_pre2-r1.ebuild,v 1.1 2009/09/04 13:05:24 ssuominen Exp $
-
-EAPI=2
-MY_P=${P/_/-}
-inherit eutils
-
-DESCRIPTION="GNU Midnight Commander is a text based file manager"
-HOMEPAGE="http://www.midnight-commander.org"
-SRC_URI="http://www.midnight-commander.org/downloads/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="chdir +edit gpm nls samba slang X"
-
-RDEPEND=">=dev-libs/glib-2.6:2
-	gpm? ( sys-libs/gpm )
-	kernel_linux? ( sys-fs/e2fsprogs )
-	samba? ( net-fs/samba )
-	slang? ( >=sys-libs/slang-2 )
-	!slang? ( sys-libs/ncurses )
-	X? ( x11-libs/libX11
-		x11-libs/libICE
-		x11-libs/libXau
-		x11-libs/libXdmcp
-		x11-libs/libSM )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-horizontal_split.patch
-}
-
-src_configure() {
-	local myscreen=ncurses
-
-	use slang && myscreen=slang
-
-	econf \
-		--disable-dependency-tracking \
-		$(use_enable nls) \
-		--enable-vfs \
-		$(use_enable kernel_linux vfs-undelfs) \
-		--enable-charset \
-		$(use_with X x) \
-		$(use_with samba) \
-		--with-configdir=/etc/samba \
-		--with-codepagedir=/var/lib/samba/codepages \
-		$(use_with gpm gpm-mouse) \
-		--with-screen=${myscreen} \
-		$(use_with edit)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS NEWS README
-
-	if use chdir; then
-		insinto /etc/profile.d
-		doins "${FILESDIR}"/mc-chdir.sh
-	fi
-}
diff --git a/app-misc/mc/mc-4.7.0_pre2.ebuild b/app-misc/mc/mc-4.7.0_pre3.ebuild
index 793445113f55..a6c935ab6d47 100644
--- a/app-misc/mc/mc-4.7.0_pre2.ebuild
+++ b/app-misc/mc/mc-4.7.0_pre3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/mc/mc-4.7.0_pre2.ebuild,v 1.2 2009/08/29 13:39:21 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/mc/mc-4.7.0_pre3.ebuild,v 1.1 2009/10/02 18:26:25 ssuominen Exp $
 
 EAPI=2
 MY_P=${P/_/-}
@@ -12,9 +12,9 @@ SRC_URI="http://www.midnight-commander.org/downloads/${MY_P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="chdir +edit gpm nls samba slang X"
+IUSE="+edit gpm nls samba slang X"
 
-RDEPEND=">=dev-libs/glib-2.6:2
+RDEPEND=">=dev-libs/glib-2.14:2
 	gpm? ( sys-libs/gpm )
 	kernel_linux? ( sys-fs/e2fsprogs )
 	samba? ( net-fs/samba )
@@ -33,7 +33,6 @@ S=${WORKDIR}/${MY_P}
 
 src_configure() {
 	local myscreen=ncurses
-
 	use slang && myscreen=slang
 
 	econf \
@@ -52,11 +51,12 @@ src_configure() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS NEWS README
+	emake DESTDIR="${D}" install || die
+	dodoc AUTHORS README
+}
 
-	if use chdir; then
-		insinto /etc/profile.d
-		doins "${FILESDIR}"/mc-chdir.sh
-	fi
+pkg_postinst() {
+	elog "To enable exiting to latest working directory at exit,"
+	elog "put this to your ~/.bashrc:"
+	elog ". /usr/libexec/mc/mc.sh"
 }
diff --git a/app-misc/mc/metadata.xml b/app-misc/mc/metadata.xml
index 056b19f62908..076e32fe1099 100644
--- a/app-misc/mc/metadata.xml
+++ b/app-misc/mc/metadata.xml
@@ -7,7 +7,6 @@
 </maintainer>
 <use>
   <flag name="7zip">Add support for 7zip archives</flag>
-  <flag name="chdir">Change to latest working directory at exit</flag>
   <flag name="edit">Build mcedit application</flag>
 </use>
 </pkgmetadata>