summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Robbins <drobbins@gentoo.org>2002-03-23 05:46:49 +0000
committerDaniel Robbins <drobbins@gentoo.org>2002-03-23 05:46:49 +0000
commit4fb9429564a0e496d8b54ee6824cf5fc92d3921f (patch)
tree6a3cfd2ea029bfa08f32bf9bc21822b17b3a16ad /sys-apps/kbd
parentupdate to latest; 5.22 (diff)
downloadgentoo-2-4fb9429564a0e496d8b54ee6824cf5fc92d3921f.tar.gz
gentoo-2-4fb9429564a0e496d8b54ee6824cf5fc92d3921f.tar.bz2
gentoo-2-4fb9429564a0e496d8b54ee6824cf5fc92d3921f.zip
fixed totally broken nls "fixes'
Diffstat (limited to 'sys-apps/kbd')
-rw-r--r--sys-apps/kbd/ChangeLog7
-rw-r--r--sys-apps/kbd/kbd-1.06-r1.ebuild25
2 files changed, 14 insertions, 18 deletions
diff --git a/sys-apps/kbd/ChangeLog b/sys-apps/kbd/ChangeLog
index 758278aadce5..0c8c7fabd1b8 100644
--- a/sys-apps/kbd/ChangeLog
+++ b/sys-apps/kbd/ChangeLog
@@ -1,11 +1,14 @@
# ChangeLog for sys-apps/kbd
# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/kbd/ChangeLog,v 1.1 2002/03/23 01:01:19 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kbd/ChangeLog,v 1.2 2002/03/23 05:46:49 drobbins Exp $
+
+ 22 Mar 2002; Daniel Robbins <drobbins@gentoo.org> kbd-1.06-r1.ebuild :
+ Fixed Matthew Kennedy's patch which was totally broken in every way and
+ killed this ebuild.
*kbd-1.06-r1 (22 Mar 2002)
22 Mar 2002; Seemant Kulleen <seemant@gentoo.org> kbd-1.06-r1.ebuild :
-
Added USE dependent nls support from a patch sent in by Matthew Kennedy.
*kbd-1.06 (1 Feb 2002)
diff --git a/sys-apps/kbd/kbd-1.06-r1.ebuild b/sys-apps/kbd/kbd-1.06-r1.ebuild
index 1f12a638857d..2ddda7f6afeb 100644
--- a/sys-apps/kbd/kbd-1.06-r1.ebuild
+++ b/sys-apps/kbd/kbd-1.06-r1.ebuild
@@ -6,30 +6,23 @@ S=${WORKDIR}/${P}
DESCRIPTION="Keyboard and console utilities"
SRC_URI="ftp://ftp.win.tue.nl/pub/home/aeb/linux-local/utils/kbd/${P}.tar.gz"
HOMEPAGE=""
-DEPEND="virtual/glibc
- nls? ( sys-devel/gettext )"
+DEPEND="virtual/glibc nls? ( sys-devel/gettext )"
PROVIDE="sys-apps/console-tools"
src_compile() {
local myopts
-
- if [ -z "`use nls`" ]
- then
- myopts="--disable-nls"
- else
- myopts="--enable-nls"
- fi
-
+ # non-standard configure script; --di to disable NLS, nothing to enable it.
+ use nls || myopts="--di"
./configure --mandir=/usr/share/man \
- --datadir=/usr/share \
- ${myopts} || die
+ --datadir=/usr/share \
+ ${myopts} || die
make || die
}
src_install() {
make \
- DESTDIR=${D} \
- DATADIR=${D}/usr/share \
- MANDIR=${D}/usr/share/man \
- install || die
+ DESTDIR=${D} \
+ DATADIR=${D}/usr/share \
+ MANDIR=${D}/usr/share/man \
+ install || die
}