If USE readline is used, and it's enabled by default in profiles use system readline...

Package-Manager: portage-2.1.4.4

diff --git a/sys-libs/slang/ChangeLog b/sys-libs/slang/ChangeLog
index 82d31b5e0968bc0f75bfbecefe9531a50f399135..798fb262057170f3877c8ba9a9e777d4b89dfc32 100644 (file)
--- 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/Manifest b/sys-libs/slang/Manifest
index 15599c2cb9244f747c7515a650eaeb4a0bcebe6c..7634ea7465edc9f0eafb45d0f075f4524bc38d47 100644 (file)
--- a/sys-libs/slang/Manifest
+++ b/sys-libs/slang/Manifest
@@ -4,6 +4,6 @@ DIST slang-1.4.9-patches.tar.gz 12132 RMD160 02c7df8f7d51c39c0bf9e729606aa1b94c3
 DIST slang-1.4.9.tar.bz2 631079 RMD160 bd2c37554129134e4e874502af0ebcb6fc7e151b SHA1 667709eb1bc1b0f68ce36b31204bf8a99d31eefa SHA256 fa42e57e902f2161dc2b297e0dcb24ca180024770afa379027db582803ffa2fa
 DIST slang-2.1.3.tar.bz2 1191425 RMD160 b59424972e52c361a15b23874d1a0539683608e5 SHA1 31fc6162684f69d9dd0377372dfdc336f0c4343a SHA256 534b80d31f582a00163c2abdcc0317585fa06918c96af65d008718f3b68fddfc
 EBUILD slang-1.4.9-r2.ebuild 1985 RMD160 7ec07161893923053a1eb44f4ad4241ef974ad87 SHA1 3a5b81aa30d36b05089cfd30e196e8297fad3cc1 SHA256 121ddf17f0d41542a1a418d360a7818931f126f22af52393cead0728d3d80bef
-EBUILD slang-2.1.3-r1.ebuild 1406 RMD160 45ac1fe1ce672aea30e646cc0830f7b8d9643b22 SHA1 277c9e347c4b47f111851c751bcc71a5350d87ee SHA256 f146fe61f4b0f45e2644b428936b700deda09a605cc3f09351908bd89f09aafa
-MISC ChangeLog 10719 RMD160 4e87025b49edf2fa7886f29133364306003b279c SHA1 b70f082044be158d1fb572427997e2c41ba3451f SHA256 441dd143629691ec115a749b3d4c515c52c00b063a15c488ee59d7b465b493a3
+EBUILD slang-2.1.3-r1.ebuild 1565 RMD160 5de78dda602dbae370a8fb7b201ae9c3986f4114 SHA1 f3ea950473d187ff30e432f0f60920bd4a6fd229 SHA256 07788bb8009709b389a1a39e7a628dc923c4edaba06d2ce1cba523ccaa231e8c
+MISC ChangeLog 10915 RMD160 c0c904eb3e2e56faf3c7cc495053278d0c33367f SHA1 caec84430ac990eed81383ceb094d672932e9037 SHA256 e8c8a399618e7956938d4225ecb00840a4a065d92f7e57b3ab32efa479580978
 MISC metadata.xml 157 RMD160 1305e8c09c6d49c0db2a18bb50b045460c124ebe SHA1 874689ae30dfe223d487e0e6a5e0a0dbf06a69f4 SHA256 c3c089740b31ec0f4d7fbc3bf2d6bb8460ccfd0694f01bf91b22a2e1930d6d5d

diff --git a/sys-libs/slang/slang-2.1.3-r1.ebuild b/sys-libs/slang/slang-2.1.3-r1.ebuild
index f30ee8241f2391037860eb3a6fc93a6a8242b33a..4dac8dc8a8ba7a7336ef67dc2605fbb58c6e1245 100644 (file)
--- 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}