Version bump wrt #218921

Package-Manager: portage-2.1.5_rc6

4 files changed, 87 insertions, 6 deletions

diff --git a/app-misc/mc/ChangeLog b/app-misc/mc/ChangeLog
index 1e0ee3fabc4a..6cd5d2d496ac 100644
--- a/app-misc/mc/ChangeLog
+++ b/app-misc/mc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-misc/mc
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/mc/ChangeLog,v 1.137 2008/03/01 14:02:55 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/mc/ChangeLog,v 1.138 2008/04/27 08:57:39 drac Exp $
+
+*mc-4.6.2_pre1 (27 Apr 2008)
+
+  27 Apr 2008; Samuli Suominen <drac@gentoo.org> +mc-4.6.2_pre1.ebuild:
+  Version bump wrt #218921 with patchset.
 
   01 Mar 2008; Diego Pettenò <flameeyes@gentoo.org> mc-4.6.1-r3.ebuild,
   mc-4.6.1-r4.ebuild:
@@ -8,7 +13,7 @@
   installed anymore.
 
   09 Feb 2008; Samuli Suominen <drac@gentoo.org> mc-4.6.1-r4.ebuild:
-  Fix mc to work with slang 2.1.3.
+  Change slang dep. to allow 2.1.3.
 
   19 Nov 2007; Joshua Kinard <kumba@gentoo.org> mc-4.6.1-r4.ebuild:
   Stable on mips, per #197144.
diff --git a/app-misc/mc/Manifest b/app-misc/mc/Manifest
index 5d6938d11d91..c06a89198cdf 100644
--- a/app-misc/mc/Manifest
+++ b/app-misc/mc/Manifest
@@ -12,7 +12,10 @@ AUX mc.gentoo 322 RMD160 957d5127be68de3eca20ac3121607faa1370d997 SHA1 c13e36256
 AUX mc.ini 43 RMD160 2254610744c484553cd3332a4f45e439b13cceed SHA1 dde4fa7bc44867f9e1b34e170aec07484e8497dc SHA256 ed0921487e74b913fa34f4d672584b64da6cf5d592b17c65328621934a4d46f1
 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.6.2-pre1.tar.gz 4009197 RMD160 335d032a9562814ebcab1b2848312d3ee1cb5bab SHA1 9eca70f0b1da9f66207b66c07c6bea49c08b818e SHA256 6aeb0ae5371c8beedec37958f73804f6da44bf9cf738647065b17d959b27be34
+DIST mc-4.6.2_pre1-patchset-1.tbz2 48599 RMD160 5b4f1d85f888baec1291723b69fc69beba21329c SHA1 ea2b32944531fa048f409be32da6515077c50a9b SHA256 ab855b6f95b76547a77e7f67d968ac520545b8eca3d7d7578844fe1b280b4c55
 DIST u7z-4.29.tar.bz2 2951 RMD160 1ab0cfea1563e81bdde9c0552d37efe710ea14bf SHA1 1a8c65dcb58a8f1be9d7fa8a3b91b1819fbb3360 SHA256 0d046e76fade7c7e31be01626bb3fcb0afcb5f62809733d0c70e0e12c655348d
-EBUILD mc-4.6.1-r4.ebuild 4212 RMD160 a29a173c1815ccfcfec6d05726b3cfa596a3fee0 SHA1 10a48e231929768576ebe277bf80b180598c2d56 SHA256 3916d5f6a687881383cbc92588a2ad8b006a5ddd876de3fd39c1a8a48efe0cd7
-MISC ChangeLog 19772 RMD160 5ed6477cd171b5a12f8b7574abb23585c4649daa SHA1 7c142407f0f44805d47ad5840673397a58eae21d SHA256 4bb3c6237f1a30123541a636c8775a0a039f11e784aef53b4827f759a5f72b60
+EBUILD mc-4.6.1-r4.ebuild 4208 RMD160 6940219c7eb7cd0a890d589c3251279262ce1127 SHA1 7b35fb39e89265ffe70a2e9ecb7a87636548758b SHA256 dbac8580a4524868bbba601d3e01f318dd016d9e7c72e1d2f0e0667e4cbf3f5b
+EBUILD mc-4.6.2_pre1.ebuild 1919 RMD160 84c1b6746c46c88ca573de983e8e24b37611807c SHA1 7145214e67d729ac0f2aba6863dc64235876bdde SHA256 3f640ae9f29b4317043b8a092d1fb45efcfe4e157f9848fc38d17f5288e7db88
+MISC ChangeLog 19913 RMD160 09e0c57cf603076a1b691b888ff72b349f230bd2 SHA1 fcf5d8b5080904865f46e12d08881f46cd4d5e38 SHA256 99cdfc9c4d28cbd4a2166ef97bd564f64439bac3c348ac74f07749d13758116b
 MISC metadata.xml 231 RMD160 c13056229989c3d4f448a7c7abcff3f4ee7ce13c SHA1 2d63dfb700b223f8f37c078692a81b2237896bce SHA256 4595c2615fd7c9095517949b1a920d4457f92801eb9d46307b18aafe58ec2a8a
diff --git a/app-misc/mc/mc-4.6.1-r4.ebuild b/app-misc/mc/mc-4.6.1-r4.ebuild
index 5f0daf4611c1..00b96436caa8 100644
--- a/app-misc/mc/mc-4.6.1-r4.ebuild
+++ b/app-misc/mc/mc-4.6.1-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 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-r4.ebuild,v 1.13 2008/03/01 14:02:55 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/mc/mc-4.6.1-r4.ebuild,v 1.14 2008/04/27 08:57:39 drac Exp $
 
 inherit flag-o-matic eutils
 
@@ -14,7 +14,7 @@ SRC_URI="http://www.ibiblio.org/pub/Linux/utils/file/managers/${PN}/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
 IUSE="7zip X gpm ncurses nls samba slang unicode"
 
 RDEPEND="kernel_linux? ( >=sys-fs/e2fsprogs-1.19 )
diff --git a/app-misc/mc/mc-4.6.2_pre1.ebuild b/app-misc/mc/mc-4.6.2_pre1.ebuild
new file mode 100644
index 000000000000..f78a601e2b52
--- /dev/null
+++ b/app-misc/mc/mc-4.6.2_pre1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/mc/mc-4.6.2_pre1.ebuild,v 1.1 2008/04/27 08:57:39 drac Exp $
+
+inherit eutils
+
+MY_P=${P/_/-}
+
+DESCRIPTION="GNU Midnight Commander is a s-lang based file manager."
+HOMEPAGE="http://www.gnu.org/software/mc"
+SRC_URI="http://ftp.gnu.org/gnu/mc/${MY_P}.tar.gz
+	http://dev.gentoo.org/~drac/${P}-patchset-1.tbz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="gpm nls samba X"
+
+RDEPEND=">=dev-libs/glib-2
+	>=sys-libs/slang-2.1.3
+	gpm? ( sys-libs/gpm )
+	X? ( x11-libs/libX11
+		x11-libs/libICE
+		x11-libs/libXau
+		x11-libs/libXdmcp
+		x11-libs/libSM )
+	samba? ( net-fs/samba )
+	kernel_linux? ( sys-fs/e2fsprogs )
+	app-arch/zip
+	app-arch/unzip"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )
+	dev-util/pkgconfig"
+
+S=${WORKDIR}/${MY_P}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${WORKDIR}"/patches/*.patch
+
+	# Prevent lazy bindings in cons.saver binary wrt bug #135009
+	sed -i -e "s:^\(cons_saver_LDADD = .*\):\1 -Wl,-z,now:" \
+		src/Makefile.in || die "sed failed."
+}
+
+src_compile() {
+	# Default is slang for unicode in Gentoo (which is also upstream default)
+	local myconf="--with-vfs --with-ext2undel --with-edit --enable-charset --with-screen=slang"
+
+	if use samba; then
+		myconf+=" --with-samba --with-configdir=/etc/samba --with-codepagedir=/var/lib/samba/codepages"
+	else
+		myconf+=" --without-samba"
+	fi
+
+	econf --disable-dependency-tracking \
+		$(use_enable nls) \
+		$(use_with gpm gpm-mouse) \
+		$(use_with X x) \
+		${myconf}
+
+	emake || die "emake failed."
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed."
+	dodoc AUTHORS FAQ HACKING MAINTAINERS NEWS README* TODO
+
+	# Install ebuild syntax
+	insinto /usr/share/mc/syntax
+	doins "${FILESDIR}"/ebuild.syntax
+}