diff options
| author |   Samuli Suominen <drac@gentoo.org> | 2008-05-05 17:12:22 +0000 |
|---|---|---|
| committer | Samuli Suominen <drac@gentoo.org> | 2008-05-05 17:12:22 +0000 |
| commit | c166ea25f8af6423b33aee795c6a7bb2104ccd07 (patch) | |
| tree | 18e00c84810632cbdf0e0ec80cc967c3b3adb6a3 /app-misc | |
| parent | version bump (diff) | |
| download | gentoo-2-c166ea25f8af6423b33aee795c6a7bb2104ccd07.tar.gz gentoo-2-c166ea25f8af6423b33aee795c6a7bb2104ccd07.tar.bz2 gentoo-2-c166ea25f8af6423b33aee795c6a7bb2104ccd07.zip | |
USE unicode wrt #220365
(Portage version: 2.1.5_rc6)
Diffstat (limited to 'app-misc')
| -rw-r--r-- | app-misc/mc/ChangeLog | 5 | ||||
| -rw-r--r-- | app-misc/mc/mc-4.6.2_pre1.ebuild | 22 |
2 files changed, 21 insertions, 6 deletions
diff --git a/app-misc/mc/ChangeLog b/app-misc/mc/ChangeLog index 556300448396..7ab102879a47 100644 --- a/app-misc/mc/ChangeLog +++ b/app-misc/mc/ChangeLog @@ -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@gentoo.org> mc-4.6.2_pre1.ebuild: + USE unicode wrt #220365 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 diff --git a/app-misc/mc/mc-4.6.2_pre1.ebuild b/app-misc/mc/mc-4.6.2_pre1.ebuild index e0edcd15f708..1c1eaf9cd536 100644 --- a/app-misc/mc/mc-4.6.2_pre1.ebuild +++ b/app-misc/mc/mc-4.6.2_pre1.ebuild @@ -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 @@ SRC_URI="http://ftp.gnu.org/gnu/mc/${MY_P}.tar.gz 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 @@ S=${WORKDIR}/${MY_P} 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_unpack() { } 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" |