Prepare unmasking. Unkeyword arm/s390/sh because slang-2 is required for new unicode patch. Restore cons.server setuid hack.

Package-Manager: portage-2.1.5_rc6

3 files changed, 19 insertions, 8 deletions

diff --git a/app-misc/mc/ChangeLog b/app-misc/mc/ChangeLog
index b3859f900e34..556300448396 100644
--- a/app-misc/mc/ChangeLog
+++ b/app-misc/mc/ChangeLog
@@ -1,6 +1,10 @@
 # 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.139 2008/04/27 10:58:47 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/mc/ChangeLog,v 1.140 2008/04/28 13:21:25 drac Exp $
+
+  28 Apr 2008; Samuli Suominen <drac@gentoo.org> mc-4.6.2_pre1.ebuild:
+  Prepare unmasking. Unkeyword arm/s390/sh because slang-2 is required for
+  new unicode patch. Restore cons.server setuid hack.
 
   27 Apr 2008; Samuli Suominen <drac@gentoo.org> files/ebuild.syntax:
   Syntax update. Remove check_KV and PROVIDE. Add elog and EAPI.
diff --git a/app-misc/mc/Manifest b/app-misc/mc/Manifest
index 3ee729560ecd..34d9b028ddda 100644
--- a/app-misc/mc/Manifest
+++ b/app-misc/mc/Manifest
@@ -12,10 +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-patches-1.tbz2 48513 RMD160 d003bbc281fce5eb1b7040ff29f9ddff6139121e SHA1 6926944d54289a3779fe7da4e906ddc3c9cc8f57 SHA256 7a7465bcde781c174bf7e596f9772e2e027ffb3d54941c4d9d430c913a0e2483
 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 4208 RMD160 6940219c7eb7cd0a890d589c3251279262ce1127 SHA1 7b35fb39e89265ffe70a2e9ecb7a87636548758b SHA256 dbac8580a4524868bbba601d3e01f318dd016d9e7c72e1d2f0e0667e4cbf3f5b
-EBUILD mc-4.6.2_pre1.ebuild 1758 RMD160 d94bbb2764a28ff68b16e723d4466a26166e9f0f SHA1 e21145048659d312e68753a1d9a6dfcb5d239fc3 SHA256 55dbe52beacfb5eed9cac5118c905913339a32ca4d121b84ded99bf62ad69ef3
-MISC ChangeLog 20049 RMD160 40e979c815db387e5b5a110ddb15334c4ad61358 SHA1 6a9df415433d244ff968475888f5576e74771fb1 SHA256 0f06cfc9fe4f2bf382228553b238876b1a6971923707f6e63a2ed7d0e263a826
+EBUILD mc-4.6.2_pre1.ebuild 2006 RMD160 1606efdc141b0cd326600bac2c711a488e3918de SHA1 073e1efbdc06e1621d955e34587dc7391a4aa7bd SHA256 d13f7e08ee8ba6b8ab4ee806e498ed703efd23bdd7af399a82bfb58a22979690
+MISC ChangeLog 20250 RMD160 9dede040bd1900bd4b5fd8dd024e6708766a957c SHA1 e8293ba1e2577e83afb95414a5490a4de629103f SHA256 72a0fb77d2bd31624ec957351e88ce8a97dec50e72d5de257f32e556405cf961
 MISC metadata.xml 223 RMD160 2fff04beb8d1d190f0ade4a52bb13e3b29af65cb SHA1 a91cab263e44718b8d7e8e33c7aca01b2b4032e9 SHA256 b589c118502c8401bcc833956c80ac3cdb0e484a332e7509a332352721a9f8c6
diff --git a/app-misc/mc/mc-4.6.2_pre1.ebuild b/app-misc/mc/mc-4.6.2_pre1.ebuild
index 6b404741ad53..e0edcd15f708 100644
--- a/app-misc/mc/mc-4.6.2_pre1.ebuild
+++ b/app-misc/mc/mc-4.6.2_pre1.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.2_pre1.ebuild,v 1.2 2008/04/27 10:58:47 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/mc/mc-4.6.2_pre1.ebuild,v 1.3 2008/04/28 13:21:25 drac Exp $
 
 inherit eutils
 
@@ -9,11 +9,11 @@ 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"
+	http://dev.gentoo.org/~drac/${MY_P}-patches-1.tbz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="gpm nls samba X"
 
 RDEPEND=">=dev-libs/glib-2
@@ -37,7 +37,11 @@ S=${WORKDIR}/${MY_P}
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	epatch "${WORKDIR}"/patches/*.patch
+	EPATCH_SUFFIX="patch" epatch "${WORKDIR}"/patches
+
+	# Prevent lazy bindings in cons.saver binary for bug #135009
+	sed -i -e "s:^\(cons_saver_LDADD = .*\):\1 -Wl,-z,now:" \
+		src/Makefile.in || die "sed failed."
 }
 
 src_compile() {
@@ -63,6 +67,9 @@ src_install() {
 	emake DESTDIR="${D}" install || die "emake install failed."
 	dodoc AUTHORS FAQ HACKING MAINTAINERS NEWS README* TODO
 
+	# Install cons.saver setuid to actually work
+	fperms u+s /usr/libexec/mc/cons.saver
+
 	# Install ebuild syntax
 	insinto /usr/share/mc/syntax
 	doins "${FILESDIR}"/ebuild.syntax