[gentoo-commits] gentoo-x86 commit in app-misc/mc: mc-4.6.2_pre1.ebuild ChangeLog

[Samuli Suominen (drac)]

drac        08/05/05 17:12:22

  Modified:             mc-4.6.2_pre1.ebuild ChangeLog
  Log:
  USE unicode wrt #220365
  (Portage version: 2.1.5_rc6)

Revision  Changes    Path
1.4                  app-misc/mc/mc-4.6.2_pre1.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-misc/mc/mc-4.6.2_pre1.ebuild?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-misc/mc/mc-4.6.2_pre1.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-misc/mc/mc-4.6.2_pre1.ebuild?r1=1.3&r2=1.4

Index: mc-4.6.2_pre1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-misc/mc/mc-4.6.2_pre1.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- mc-4.6.2_pre1.ebuild	28 Apr 2008 13:21:25 -0000	1.3
+++ mc-4.6.2_pre1.ebuild	5 May 2008 17:12:22 -0000	1.4
@@ -1,6 +1,8 @@
 # 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.3 2008/04/28 13:21:25 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/mc/mc-4.6.2_pre1.ebuild,v 1.4 2008/05/05 17:12:22 drac Exp $
+
+EAPI=1
 
 inherit eutils
 
@@ -14,10 +16,11 @@
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="gpm nls samba X"
+IUSE="gpm nls samba +unicode X"
 
 RDEPEND=">=dev-libs/glib-2
-	>=sys-libs/slang-2.1.3
+	unicode? ( >=sys-libs/slang-2.1.3 )
+	!unicode? ( sys-libs/ncurses )
 	gpm? ( sys-libs/gpm )
 	X? ( x11-libs/libX11
 		x11-libs/libICE
@@ -37,6 +40,10 @@
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
+
+	use unicode || \
+		EPATCH_EXCLUDE="48_all_deb_utf8-slang2.patch 60_all_deb_recode.patch"
+
 	EPATCH_SUFFIX="patch" epatch "${WORKDIR}"/patches
 
 	# Prevent lazy bindings in cons.saver binary for bug #135009
@@ -45,8 +52,13 @@
 }
 
 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"
+	local myconf="--with-vfs --with-ext2undel --enable-charset --with-edit"
+
+	if use unicode; then
+		myconf+=" --with-screen=slang"
+	else
+		myconf+=" --with-screen=ncurses"
+	fi
 
 	if use samba; then
 		myconf+=" --with-samba --with-configdir=/etc/samba --with-codepagedir=/var/lib/samba/codepages"



1.141                app-misc/mc/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-misc/mc/ChangeLog?rev=1.141&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-misc/mc/ChangeLog?rev=1.141&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-misc/mc/ChangeLog?r1=1.140&r2=1.141

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-misc/mc/ChangeLog,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -r1.140 -r1.141
--- ChangeLog	28 Apr 2008 13:21:25 -0000	1.140
+++ ChangeLog	5 May 2008 17:12:22 -0000	1.141
@@ -1,6 +1,9 @@
 # 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.140 2008/04/28 13:21:25 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/mc/ChangeLog,v 1.141 2008/05/05 17:12:22 drac Exp $
+
+  05 May 2008; Samuli Suominen <drac@g.o> mc-4.6.2_pre1.ebuild:
+  USE unicode wrt #220365
 
   28 Apr 2008; Samuli Suominen <drac@g.o> mc-4.6.2_pre1.ebuild:
   Prepare unmasking. Unkeyword arm/s390/sh because slang-2 is required for



-- 
gentoo-commits@l.g.o mailing list