summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrad Teaford Cowan <bcowan@gentoo.org>2002-11-10 06:15:46 +0000
committerBrad Teaford Cowan <bcowan@gentoo.org>2002-11-10 06:15:46 +0000
commit3412daff395dd82c337222dd31405daaa7abfd35 (patch)
tree941be00a08052d519631ecf0a6f9ab82d3cc356a /gnome-extra
parentChanged emake to make... Fixes #10267 (diff)
downloadgentoo-2-3412daff395dd82c337222dd31405daaa7abfd35.tar.gz
gentoo-2-3412daff395dd82c337222dd31405daaa7abfd35.tar.bz2
gentoo-2-3412daff395dd82c337222dd31405daaa7abfd35.zip
code cleanup
Diffstat (limited to 'gnome-extra')
-rw-r--r--gnome-extra/mc/files/digest-mc-4.6.0_pre11
-rw-r--r--gnome-extra/mc/files/digest-mc-4.6.0_pre1-r12
-rw-r--r--gnome-extra/mc/mc-4.6.0_pre1-r1.ebuild86
-rw-r--r--gnome-extra/mc/mc-4.6.0_pre1.ebuild86
4 files changed, 37 insertions, 138 deletions
diff --git a/gnome-extra/mc/files/digest-mc-4.6.0_pre1 b/gnome-extra/mc/files/digest-mc-4.6.0_pre1
deleted file mode 100644
index a7ce37e048df..000000000000
--- a/gnome-extra/mc/files/digest-mc-4.6.0_pre1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 76e9a94f99af475fed6eed4b4a1ea6e4 mc-4.6.0-pre1.tar.gz 3976955
diff --git a/gnome-extra/mc/files/digest-mc-4.6.0_pre1-r1 b/gnome-extra/mc/files/digest-mc-4.6.0_pre1-r1
deleted file mode 100644
index 9cbfbb60917d..000000000000
--- a/gnome-extra/mc/files/digest-mc-4.6.0_pre1-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 76e9a94f99af475fed6eed4b4a1ea6e4 mc-4.6.0-pre1.tar.gz 3976955
-MD5 b394320bffc8da188887c2b85c57daad mc-4.6.0-pre1-2002-10-22-04.diff.gz 942139
diff --git a/gnome-extra/mc/mc-4.6.0_pre1-r1.ebuild b/gnome-extra/mc/mc-4.6.0_pre1-r1.ebuild
deleted file mode 100644
index f71ef5676892..000000000000
--- a/gnome-extra/mc/mc-4.6.0_pre1-r1.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# 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-r1.ebuild,v 1.2 2002/10/25 03:53:10 bcowan Exp $
-
-IUSE="gpm nls samba ncurses X slang"
-
-MY_P=${P/_/-}
-S=${WORKDIR}/${MY_P}
-
-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
- mirror://gentoo/${MY_P}-2002-10-22-04.diff.gz"
-
-
-DEPEND=">=sys-apps/e2fsprogs-1.19
- ncurses? ( >=sys-libs/ncurses-5.2-r5 )
- =dev-libs/glib-1.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 )"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86"
-
-src_unpack() {
- unpack ${A}
- cd ${S}
- patch -E -p1 < ${WORKDIR}/${MY_P}-2002-10-22-04.diff
-}
-
-src_compile() {
- local myconf=""
-
- if ! use slang && ! use ncurses
- then
- myconf="${myconf} --with-included-slang"
- elif
- use ncurses && ! use slang
- then
- myconf="${myconf} --with-ncurses --without-slang"
- else
- use slang && myconf="${myconf} --with-slang"
- fi
-
- use gpm \
- && myconf="${myconf} --with-gpm-mouse=/usr" \
- || myconf="${myconf} --without-gpm-mouse"
-
- use nls || myconf="${myconf} --disable-nls"
-
- use X \
- && myconf="${myconf} --with-tm-x-support --with-x" \
- || myconf="${myconf} --without-tm-x-support --without-x"
-
- use samba \
- && myconf="${myconf} --with-samba --with-configdir=/etc/samba
- --with-codepagedir=/var/lib/samba/codepages" \
- || myconf="${myconf} --without-samba"
-
- LDFLAGS="-lcrypt -lncurses -lpam"
- econf --host=${CHOST} \
- --prefix=/usr \
- --mandir=/usr/share/man \
- --sysconfdir=/etc \
- --localstatedir=/var/lib \
- --with-vfs \
- --with-netrc \
- --with-ext2undel \
- --with-edit \
- ${myconf} || die
-
- emake || die
-}
-
-src_install() {
- einstall
-
- dodoc ABOUT-NLS COPYING* FAQ INSTALL* NEWS README*
-}
-
diff --git a/gnome-extra/mc/mc-4.6.0_pre1.ebuild b/gnome-extra/mc/mc-4.6.0_pre1.ebuild
index 455f0844112a..c6eb874dc9cf 100644
--- a/gnome-extra/mc/mc-4.6.0_pre1.ebuild
+++ b/gnome-extra/mc/mc-4.6.0_pre1.ebuild
@@ -1,28 +1,25 @@
# 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.ebuild,v 1.3 2002/10/05 05:39:14 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/mc/mc-4.6.0_pre1.ebuild,v 1.4 2002/11/10 06:15:46 bcowan Exp $
-IUSE="gpm nls samba ncurses X pam slang"
+IUSE="gpm nls samba ncurses X slang"
-MY_T="${PN}-4.6.0-pre1"
-S=${WORKDIR}/${MY_T}
-DESCRIPTION="GNU Midnight Commander"
+MY_P="${P/_/-}"
+S=${WORKDIR}/${MY_P}
+DESCRIPTION="GNU Midnight Commander cli-based file manager"
HOMEPAGE="http://www.ibiblio.org/mc/"
-SRC_URI="ftp://ftp.ibiblio.org/pub/Linux/utils/file/managers/${PN}/${MY_T}.tar.gz"
+SRC_URI="http://www.ibiblio.org/pub/Linux/utils/file/managers/${PN}/${MY_P}.tar.gz"
-DEPEND="virtual/glibc
- >=sys-apps/e2fsprogs-1.19
+DEPEND=">=sys-apps/e2fsprogs-1.19
ncurses? ( >=sys-libs/ncurses-5.2-r5 )
=dev-libs/glib-1.2*
- pam? ( >=sys-libs/pam-0.72 )
+ >=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 )"
-RDEPEND="$DEPEND"
SLOT="0"
LICENSE="GPL-2"
@@ -32,54 +29,45 @@ src_compile() {
local myconf=""
if ! use slang && ! use ncurses
- then
- myconf="${myconf} --with-included-slang"
+ then
+ myconf="${myconf} --with-included-slang"
+ elif
+ use ncurses && ! use slang
+ then
+ myconf="${myconf} --with-ncurses --without-slang"
+ else
+ use slang && myconf="${myconf} --with-slang"
fi
- if use ncurses && ! use slang
- then
- myconf="${myconf} --with-ncurses
- --without-slang"
- fi
- use slang && myconf="${myconf} --with-slang"
- use gpm && myconf="${myconf} --with-gpm-mouse=/usr"
- use gpm || myconf="${myconf} --without-gpm-mouse"
-
+ use gpm \
+ && myconf="${myconf} --with-gpm-mouse=/usr" \
+ || myconf="${myconf} --without-gpm-mouse"
+
use nls || myconf="${myconf} --disable-nls"
- use X && myconf="${myconf} --with-tm-x-support
- --with-x"
- use X || myconf="${myconf} --without-tm-x-support
- --without-x"
-
- use samba && myconf="${myconf} --with-samba
- --with-configdir=/etc/samba
- --with-codepagedir=/var/lib/samba/codepages"
- use samba || myconf="${myconf} --without-samba"
+ use X \
+ && myconf="${myconf} --with-tm-x-support --with-x" \
+ || myconf="${myconf} --without-tm-x-support --without-x"
- cd ${S}
-
- LDFLAGS="-lcrypt -lncurses" ./configure --host=${CHOST} \
- --prefix=/usr \
- --mandir=/usr/share/man \
- --sysconfdir=/etc \
- --localstatedir=/var/lib \
- --with-vfs \
- --with-netrc \
- --with-ext2undel \
- --with-edit \
- $myconf || die
+ use samba \
+ && myconf="${myconf} --with-samba --with-configdir=/etc/samba
+ --with-codepagedir=/var/lib/samba/codepages" \
+ || myconf="${myconf} --without-samba"
+ export LDFLAGS="-lcrypt -lncurses"
+
+ econf \
+ --with-vfs \
+ --with-netrc \
+ --with-ext2undel \
+ --with-edit \
+ ${myconf} || die
emake || die
}
src_install() {
- make prefix=${D}/usr \
- mandir=${D}/usr/share/man \
- sysconfdir=${D}/etc \
- localstatedir=${D}/var/lib \
- install || die
-
+ einstall
+
dodoc ABOUT-NLS COPYING* FAQ INSTALL* NEWS README*
}