summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <drac@gentoo.org>2008-02-15 19:58:42 +0000
committerSamuli Suominen <drac@gentoo.org>2008-02-15 19:58:42 +0000
commit01f5e8909932bdf12220be0eb52cdf9483b19cf1 (patch)
tree58a36bd35c3ba303424df8522354bdabd1faaaf9 /sys-libs
parentlibgg gets ppc64 love for mplayer dep (diff)
downloadgentoo-2-01f5e8909932bdf12220be0eb52cdf9483b19cf1.tar.gz
gentoo-2-01f5e8909932bdf12220be0eb52cdf9483b19cf1.tar.bz2
gentoo-2-01f5e8909932bdf12220be0eb52cdf9483b19cf1.zip
If USE readline is used, and it's enabled by default in profiles use system readline for slsh instead of native slang.
(Portage version: 2.1.4.4)
Diffstat (limited to 'sys-libs')
-rw-r--r--sys-libs/slang/ChangeLog6
-rw-r--r--sys-libs/slang/slang-2.1.3-r1.ebuild23
2 files changed, 22 insertions, 7 deletions
diff --git a/sys-libs/slang/ChangeLog b/sys-libs/slang/ChangeLog
index 82d31b5e0968..798fb2620571 100644
--- a/sys-libs/slang/ChangeLog
+++ b/sys-libs/slang/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sys-libs/slang
# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/slang/ChangeLog,v 1.79 2008/02/15 19:24:50 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/slang/ChangeLog,v 1.80 2008/02/15 19:58:42 drac Exp $
+
+ 15 Feb 2008; Samuli Suominen <drac@gentoo.org> slang-2.1.3-r1.ebuild:
+ If USE readline is used, and it's enabled by default in profiles use system
+ readline for slsh instead of native slang.
15 Feb 2008; Samuli Suominen <drac@gentoo.org> slang-2.1.3-r1.ebuild:
sys-libs/ncurses is required for /usr/share/terminfo files which means it
diff --git a/sys-libs/slang/slang-2.1.3-r1.ebuild b/sys-libs/slang/slang-2.1.3-r1.ebuild
index f30ee8241f23..4dac8dc8a8ba 100644
--- a/sys-libs/slang/slang-2.1.3-r1.ebuild
+++ b/sys-libs/slang/slang-2.1.3-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/slang/slang-2.1.3-r1.ebuild,v 1.7 2008/02/15 19:24:50 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/slang/slang-2.1.3-r1.ebuild,v 1.8 2008/02/15 19:58:42 drac Exp $
inherit eutils
@@ -11,12 +11,13 @@ SRC_URI="ftp://ftp.fu-berlin.de/pub/unix/misc/slang/v${PV%.*}/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="cjk pcre png"
+IUSE="cjk pcre png readline"
RDEPEND="sys-libs/ncurses
pcre? ( dev-libs/libpcre )
png? ( media-libs/libpng )
- cjk? ( dev-libs/oniguruma )"
+ cjk? ( dev-libs/oniguruma )
+ readline? ( sys-libs/readline )"
DEPEND="${RDEPEND}
!=sys-libs/slang-2.1.2"
@@ -35,15 +36,25 @@ src_unpack() {
}
src_compile() {
- econf $(use_with pcre) $(use_with png) \
- $(use_with cjk onig)
+ local readline
+
+ if use readline; then
+ readline=gnu
+ else
+ readline=slang
+ fi
+
+ econf $(use_with cjk onig) $(use_with pcre) $(use_with png) \
+ --with-readline=${readline}
+
emake -j1 elf static || die "emake elf static failed."
+
cd slsh
emake -j1 slsh || die "emake slsh failed."
}
src_install() {
- emake -j1 DESTDIR="${D}" install-all || die "emake install failed."
+ emake -j1 DESTDIR="${D}" install-all || die "emake install-all failed."
rm -rf "${D}"/usr/share/doc/{slang,slsh}