summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrad Teaford Cowan <bcowan@gentoo.org>2002-11-05 07:05:11 +0000
committerBrad Teaford Cowan <bcowan@gentoo.org>2002-11-05 07:05:11 +0000
commit36abf187e636581619698133b6cf72cd98b89c08 (patch)
treed2402b75b34c0a6ef2d408f8a91a7c607325decd /gnome-extra
parenthuge build update to support esd and ssl. Please test and report on (diff)
downloadgentoo-2-36abf187e636581619698133b6cf72cd98b89c08.tar.gz
gentoo-2-36abf187e636581619698133b6cf72cd98b89c08.tar.bz2
gentoo-2-36abf187e636581619698133b6cf72cd98b89c08.zip
code cleanup
Diffstat (limited to 'gnome-extra')
-rw-r--r--gnome-extra/mc/files/digest-mc-4.6.0_pre1-r22
-rw-r--r--gnome-extra/mc/mc-4.6.0_pre1-r2.ebuild26
2 files changed, 15 insertions, 13 deletions
diff --git a/gnome-extra/mc/files/digest-mc-4.6.0_pre1-r2 b/gnome-extra/mc/files/digest-mc-4.6.0_pre1-r2
index 7b9ababf5d79..6f48f663aee1 100644
--- a/gnome-extra/mc/files/digest-mc-4.6.0_pre1-r2
+++ b/gnome-extra/mc/files/digest-mc-4.6.0_pre1-r2
@@ -1,2 +1,2 @@
MD5 76e9a94f99af475fed6eed4b4a1ea6e4 mc-4.6.0-pre1.tar.gz 3976955
-MD5 075e043ebb0307e739237f58342ef094 mc-4.6.0-pre1-2002-11-02-18.diff.bz2 813784
+MD5 7e045082816c77f5b3edb99df5f84a80 mc-4.6.0-pre1-2002-11-04-13.diff.bz2 815426
diff --git a/gnome-extra/mc/mc-4.6.0_pre1-r2.ebuild b/gnome-extra/mc/mc-4.6.0_pre1-r2.ebuild
index 02a07fa48994..75071eb7e58c 100644
--- a/gnome-extra/mc/mc-4.6.0_pre1-r2.ebuild
+++ b/gnome-extra/mc/mc-4.6.0_pre1-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2002 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/mc/mc-4.6.0_pre1-r2.ebuild,v 1.2 2002/11/03 02:27:25 bcowan Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/mc/mc-4.6.0_pre1-r2.ebuild,v 1.3 2002/11/05 07:05:11 bcowan Exp $
IUSE="gpm nls samba ncurses X slang"
@@ -11,16 +11,15 @@ DESCRIPTION="GNU Midnight Commander cli-based file manager"
HOMEPAGE="http://www.ibiblio.org/mc/"
SRC_URI="http://www.ibiblio.org/pub/Linux/utils/file/managers/${PN}/${MY_P}.tar.gz
- http://www.gentoo.org/~bcowan/${MY_P}-2002-11-02-18.diff.bz2"
+ http://www.gentoo.org/~bcowan/${MY_P}-2002-11-04-13.diff.bz2"
DEPEND=">=sys-apps/e2fsprogs-1.19
ncurses? ( >=sys-libs/ncurses-5.2-r5 )
- =dev-libs/glib-1.2*
+ =dev-libs/glib-2*
>=sys-libs/pam-0.72
gpm? ( >=sys-libs/gpm-1.19.3 )
slang? ( >=sys-libs/slang-1.4.2 )
- nls? ( sys-devel/gettext )
samba? ( >=net-fs/samba-2.2.3a-r1 )
X? ( virtual/x11 )"
@@ -31,7 +30,7 @@ KEYWORDS="~x86"
src_unpack() {
unpack ${A}
cd ${S}
- patch -E -p1 < ${WORKDIR}/${MY_P}-2002-11-02-18.diff
+ patch -E -p1 < ${WORKDIR}/${MY_P}-2002-11-04-13.diff
}
src_compile() {
@@ -39,20 +38,22 @@ src_compile() {
if ! use slang && ! use ncurses
then
- myconf="${myconf} --with-included-slang"
+ myconf="${myconf} --with-screen=mcslang"
elif
use ncurses && ! use slang
then
- myconf="${myconf} --with-ncurses --without-slang"
+ myconf="${myconf} --with-screen=ncurses"
else
- use slang && myconf="${myconf} --with-slang"
+ use slang && myconf="${myconf} --with-screen=slang"
fi
use gpm \
- && myconf="${myconf} --with-gpm-mouse=/usr" \
+ && myconf="${myconf} --with-gpm-mouse" \
|| myconf="${myconf} --without-gpm-mouse"
- use nls || myconf="${myconf} --disable-nls"
+ use nls \
+ && myconf="${myconf} --with-included-gettext" \
+ || myconf="${myconf} --disable-nls"
use X \
&& myconf="${myconf} --with-tm-x-support --with-x" \
@@ -69,8 +70,9 @@ src_compile() {
--mandir=/usr/share/man \
--sysconfdir=/etc \
--localstatedir=/var/lib \
+ --with-glib2 \
--with-vfs \
- --with-netrc \
+ --with-gnu-ld \
--with-ext2undel \
--with-edit \
${myconf} || die
@@ -81,6 +83,6 @@ src_compile() {
src_install() {
einstall
- dodoc ABOUT-NLS COPYING* FAQ INSTALL* NEWS README*
+ dodoc ABOUT-NLS COPYING* ChangeLog AUTHORS MAINTAINERS FAQ INSTALL* NEWS README*
}