diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2008-05-05 17:12:22 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2008-05-05 17:12:22 +0000 |
| commit | 0deac385e15ad42d43df56da1e19c502fab49f59 (patch) | |
| tree | 9262f142391be18bf2bac7074646dc03c0e51313 /app-misc/mc | |
| parent | version bump (diff) | |
| download | historical-0deac385e15ad42d43df56da1e19c502fab49f59.tar.gz historical-0deac385e15ad42d43df56da1e19c502fab49f59.tar.bz2 historical-0deac385e15ad42d43df56da1e19c502fab49f59.zip | |
USE unicode wrt #220365
Package-Manager: portage-2.1.5_rc6
Diffstat (limited to 'app-misc/mc')
| -rw-r--r-- | app-misc/mc/ChangeLog | 5 | ||||
| -rw-r--r-- | app-misc/mc/Manifest | 4 | ||||
| -rw-r--r-- | app-misc/mc/mc-4.6.2_pre1.ebuild | 22 |
3 files changed, 23 insertions, 8 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/Manifest b/app-misc/mc/Manifest index 34d9b028ddda..82443f8e2b06 100644 --- a/app-misc/mc/Manifest +++ b/app-misc/mc/Manifest @@ -16,6 +16,6 @@ DIST mc-4.6.2-pre1-patches-1.tbz2 48513 RMD160 d003bbc281fce5eb1b7040ff29f9ddff6 DIST mc-4.6.2-pre1.tar.gz 4009197 RMD160 335d032a9562814ebcab1b2848312d3ee1cb5bab SHA1 9eca70f0b1da9f66207b66c07c6bea49c08b818e SHA256 6aeb0ae5371c8beedec37958f73804f6da44bf9cf738647065b17d959b27be34 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 2006 RMD160 1606efdc141b0cd326600bac2c711a488e3918de SHA1 073e1efbdc06e1621d955e34587dc7391a4aa7bd SHA256 d13f7e08ee8ba6b8ab4ee806e498ed703efd23bdd7af399a82bfb58a22979690 -MISC ChangeLog 20250 RMD160 9dede040bd1900bd4b5fd8dd024e6708766a957c SHA1 e8293ba1e2577e83afb95414a5490a4de629103f SHA256 72a0fb77d2bd31624ec957351e88ce8a97dec50e72d5de257f32e556405cf961 +EBUILD mc-4.6.2_pre1.ebuild 2166 RMD160 993aa66c3aeada5fbce6edced9a326f4f6712492 SHA1 abf415f49295cdc268cc5fed968a09b8704a4289 SHA256 560974986e94d8bd42b57cc172d3ecddf9278f1b523a5923492a1a4d3d627f96 +MISC ChangeLog 20348 RMD160 0abf329127d45aafd26595fcd12de052313991e3 SHA1 fafe7b2a64eb08ecf2491ee6422c011f9758a2fc SHA256 87c1c9b30f3a08d3d2a0eb9483c8d0b18bee06b4e953b36dc40f6c5d9d369d07 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 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" |