sys-libs/slang: Bump to version 2.3.1

Package-Manager: portage-2.3.2
Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>

3 files changed, 90 insertions, 0 deletions

diff --git a/sys-libs/slang/Manifest b/sys-libs/slang/Manifest
index ab09b3dcf716..a4b3bed6520c 100644
--- a/sys-libs/slang/Manifest
+++ b/sys-libs/slang/Manifest
@@ -1,2 +1,3 @@
 DIST slang-2.2.4.tar.bz2 1427363 SHA256 9a8257a9a2a55099af858b13338dc8f3a06dd2069f46f0df2c9c3bb84a01d5db SHA512 aaf0dcea5f1583487732098bd9dfe47f4fd968d81783955f58ed7bbffb852c217cde8999f2a515d77c22d44efc79047fc841eea6fecc48f18b402461ce6a848f WHIRLPOOL 5a0c81ef103116733df952fec8593f476bd57c9b2799ee566b0bf93dfd465709ef5f565a369d89a92bfd13cfc7577a047c46116bcac2f0b3176e50556c7484e1
 DIST slang-2.3.0.tar.bz2 1532986 SHA256 f95224060f45e0d8212a5039b339afa5f1a94a1bb0298e796104e5b12e926129 SHA512 0b04d916409c59f66301877c078bcca63c8b71e5dfa6c1d804353e41949bca16e664a79381c4156068b1f878c333e618f1de165e4059b09831fa83a794613050 WHIRLPOOL 395dc36d2f571ed19d88ee1f1c3594ab50d3a955949724d46582191430aa0c23cf3f78f966b184f3220ab86f2939e4601821160455159783793df30597c53257
+DIST slang-2.3.1.tar.bz2 1577864 SHA256 a810d5da7b0c0c8c335393c6b4f12884be6fa7696d9ca9521ef21316a4e00f9d SHA512 9d485c6f758fbeada82c2ed6c48ecf6e101a3875a1d63ef1b6f5d9ccb1844645f23b9bddf3ba0e5c9f807f2e8394415c14788f00cfcd5a4d6fa153387be6648b WHIRLPOOL 3b6b5eb3ab89b98e1522483b84f284479561218a6f75efbd67a6435afd1f73a912ef1b093b2d656d10e9d060cf3658dbc11e32a6ce31b324d8c2208d7b78512b
diff --git a/sys-libs/slang/files/slang-2.3.1-slsh-libs.patch b/sys-libs/slang/files/slang-2.3.1-slsh-libs.patch
new file mode 100644
index 000000000000..b31d8a1c45dd
--- /dev/null
+++ b/sys-libs/slang/files/slang-2.3.1-slsh-libs.patch
@@ -0,0 +1,11 @@
+--- slang-2.3.1/slsh/Makefile.in
++++ slang-2.3.1/slsh/Makefile.in
+@@ -92,7 +92,7 @@
+ $(OBJDIR)/slsh_exe: $(OBJDIR)/slsh.o $(OBJDIR)/readline.o
+ 	$(CC) $(CFLAGS) $(OBJDIR)/slsh.o $(OBJDIR)/readline.o -o $(OBJDIR)/slsh_exe $(LDFLAGS) $(DLINK_FLAGS) $(SRC_LIBS)
+ $(OBJDIR)/slsh: $(OBJDIR)/slsh.o $(OBJDIR)/readline.o
+-	$(CC) $(CFLAGS) $(OBJDIR)/slsh.o $(OBJDIR)/readline.o -o $(OBJDIR)/slsh $(LDFLAGS) $(DLINK_FLAGS) $(INST_LIBS)
++	$(CC) $(CFLAGS) $(OBJDIR)/slsh.o $(OBJDIR)/readline.o -o $(OBJDIR)/slsh $(LDFLAGS) $(DLINK_FLAGS) $(SRC_LIBS)
+ $(OBJDIR)/slsh.o: $(OBJDIR_TSTAMP) slsh.c slsh.h config.h Makefile
+ 	cd $(OBJDIR) && $(CC) $(SLANG_SRCINC) $(CFLAGS) -c $(DEFS) $(SRCDIR)/slsh.c
+ $(OBJDIR)/readline.o: $(OBJDIR_TSTAMP) readline.c slsh.h config.h Makefile
diff --git a/sys-libs/slang/slang-2.3.1.ebuild b/sys-libs/slang/slang-2.3.1.ebuild
new file mode 100644
index 000000000000..26598fe050e0
--- /dev/null
+++ b/sys-libs/slang/slang-2.3.1.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit eutils multilib-minimal
+
+DESCRIPTION="A multi-platform programmer's library designed to allow a developer to create robust software"
+HOMEPAGE="http://www.jedsoft.org/slang/"
+SRC_URI="http://www.jedsoft.org/releases/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+IUSE="cjk pcre png readline static-libs zlib"
+
+# ncurses for ncurses5-config to get terminfo directory
+RDEPEND="sys-libs/ncurses:0=
+	pcre? ( >=dev-libs/libpcre-8.33-r1[${MULTILIB_USEDEP}] )
+	png? ( >=media-libs/libpng-1.6.10:0=[${MULTILIB_USEDEP}] )
+	cjk? ( >=dev-libs/oniguruma-5.9.5[${MULTILIB_USEDEP}] )
+	readline? ( >=sys-libs/readline-6.2_p5-r1:0=[${MULTILIB_USEDEP}] )
+	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
+	abi_x86_32? (
+		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+		!<=app-emulation/emul-linux-x86-baselibs-20140406-r1
+	)"
+DEPEND="${RDEPEND}"
+
+MAKEOPTS="${MAKEOPTS} -j1"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.3.1-slsh-libs.patch
+)
+
+src_prepare() {
+	default
+
+	# avoid linking to -ltermcap race with some systems
+	sed -i -e '/^TERMCAP=/s:=.*:=:' configure || die
+	# we use the GNU linker also on Solaris
+	sed -i -e 's/-G -fPIC/-shared -fPIC/g' \
+		-e 's/-Wl,-h,/-Wl,-soname,/g' configure || die
+
+	# slang does not support configuration from another dir
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	local myconf=slang
+	use readline && myconf=gnu
+
+	econf \
+		--with-readline=${myconf} \
+		$(use_with pcre) \
+		$(use_with cjk onig) \
+		$(use_with png) \
+		$(use_with zlib z)
+}
+
+multilib_src_compile() {
+	emake elf $(use static-libs && echo static)
+
+	pushd slsh >/dev/null
+	emake slsh
+	popd
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install $(use static-libs && echo install-static)
+}
+
+multilib_src_install_all() {
+	rm -r "${ED}"/usr/share/doc/{slang,slsh} || die
+	dodoc NEWS README *.txt doc/{,internal,text}/*.txt
+	docinto html
+	dodoc doc/slangdoc.html slsh/doc/html/*.html
+}