add another utf8 fix from fedora, bug #92735

(Portage version: 2.0.51.19)

5 files changed, 92 insertions, 1 deletions

diff --git a/sys-libs/slang/ChangeLog b/sys-libs/slang/ChangeLog
index 7927fca62fb2..77fd580fff31 100644
--- a/sys-libs/slang/ChangeLog
+++ b/sys-libs/slang/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-libs/slang
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/slang/ChangeLog,v 1.40 2005/01/03 00:27:27 ciaranm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/slang/ChangeLog,v 1.41 2005/05/16 14:51:33 lanius Exp $
+
+*slang-1.4.9-r2 (16 May 2005)
+
+  16 May 2005; Heinrich Wendel <lanius@gentoo.org>
+  +files/slang-utf8-fix2.patch, +slang-1.4.9-r2.ebuild:
+  add another utf8 fix from fedora, bug #92735
 
   03 Jan 2005; Ciaran McCreesh <ciaranm@gentoo.org> :
   Change encoding to UTF-8 for GLEP 31 compliance
diff --git a/sys-libs/slang/Manifest b/sys-libs/slang/Manifest
index e4590d3bfe95..e7503092fdea 100644
--- a/sys-libs/slang/Manifest
+++ b/sys-libs/slang/Manifest
@@ -1,10 +1,13 @@
+MD5 56bdf4d8b795138d5179a3721f4efb5a slang-1.4.9-r2.ebuild 1848
 MD5 b5418d070920d8944a1bc3ed6a217851 ChangeLog 5308
 MD5 bc00f0356947154d3250243bd5ec08f5 metadata.xml 219
 MD5 aa05b5e6a399e3db621b204b914913ea slang-1.4.9-r1.ebuild 1792
 MD5 074ddbf39cb8b9708ca9de2b1fb24366 files/digest-slang-1.4.9-r1 64
+MD5 074ddbf39cb8b9708ca9de2b1fb24366 files/digest-slang-1.4.9-r2 64
 MD5 7ba45dd45645107adc167e543634b8eb files/slang-1.4.9-fsuid.patch 1661
 MD5 7f9b0cb76e754575d54b6ea8f5de59f4 files/slang-1.4.9.patch 1367
 MD5 e2ddc20bfbb1ac10becb53e1707b067c files/slang-debian-utf8.patch 21377
 MD5 3531d8ba2b07b43cf6d758815200bfa9 files/slang-utf8-acs.patch 14366
 MD5 4be647282e8c01060db9d1707098bd1d files/slang-utf8-fix.patch 855
+MD5 1d7e5eab24fec79cc60d8dbdede252e7 files/slang-utf8-fix2.patch 487
 MD5 11daf6d137e1d6ec0e3475e55522cd06 files/slang-1.4.9-autoconf.patch 4143
diff --git a/sys-libs/slang/files/digest-slang-1.4.9-r2 b/sys-libs/slang/files/digest-slang-1.4.9-r2
new file mode 100644
index 000000000000..7e9a9175d8b3
--- /dev/null
+++ b/sys-libs/slang/files/digest-slang-1.4.9-r2
@@ -0,0 +1 @@
+MD5 4fbb1a7f1257e065ca830deefe13d350 slang-1.4.9.tar.bz2 631079
diff --git a/sys-libs/slang/files/slang-utf8-fix2.patch b/sys-libs/slang/files/slang-utf8-fix2.patch
new file mode 100644
index 000000000000..f8df90a4e9b7
--- /dev/null
+++ b/sys-libs/slang/files/slang-utf8-fix2.patch
@@ -0,0 +1,15 @@
+diff -ru slang-1.4.5/src/slsmg.c slang-1.4.5-new/src/slsmg.c
+--- slang-1.4.5/src/slsmg.c	2002-07-25 00:09:00.000000000 -0400
++++ slang-1.4.5-new/src/slsmg.c	2002-07-25 00:04:02.000000000 -0400
+@@ -369,7 +369,10 @@
+ 
+   max_len = Start_Col + Screen_Cols;
+   len = This_Col;
+-  p = SL_Screen[This_Row - Start_Row].neew + len - Start_Col;
++
++       
++  p = SL_Screen[This_Row - Start_Row].neew;
++  if (len > Start_Col) p += len - Start_Col;
+   prev = 0;
+ 
+   for (i = 0; i < n; i++, str) {
diff --git a/sys-libs/slang/slang-1.4.9-r2.ebuild b/sys-libs/slang/slang-1.4.9-r2.ebuild
new file mode 100644
index 000000000000..ae429f9a4109
--- /dev/null
+++ b/sys-libs/slang/slang-1.4.9-r2.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/slang/slang-1.4.9-r2.ebuild,v 1.1 2005/05/16 14:51:33 lanius Exp $
+
+inherit eutils
+
+# Patches are taken from http://www.suse.de/~nadvornik/slang/
+# They were originally Red Hat and Debian's patches
+
+DESCRIPTION="Console display library used by most text viewer"
+HOMEPAGE="http://www.s-lang.org/"
+SRC_URI="ftp://space.mit.edu/pub/davis/slang/v1.4/${P}.tar.bz2"
+
+LICENSE="|| ( GPL-2 Artistic )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~ppc-macos ~s390 ~sh ~sparc ~x86"
+IUSE="cjk unicode"
+
+DEPEND=">=sys-libs/ncurses-5.2-r2"
+
+src_unpack() {
+	unpack ${P}.tar.bz2
+	cd ${S}
+
+	epatch ${FILESDIR}/${P}.patch
+	use ppc-macos || epatch ${FILESDIR}/${P}-fsuid.patch
+	epatch ${FILESDIR}/${P}-autoconf.patch
+	if use unicode ; then
+		epatch ${FILESDIR}/slang-debian-utf8.patch
+		epatch ${FILESDIR}/slang-utf8-acs.patch
+		epatch ${FILESDIR}/slang-utf8-fix.patch
+		epatch ${FILESDIR}/slang-utf8-fix2.patch
+	fi
+	if use cjk ; then
+		sed -i \
+			-e "/SLANG_HAS_KANJI_SUPPORT/s/0/1/" \
+			src/sl-feat.h
+	fi
+}
+
+src_compile() {
+	econf || die "econf failed"
+	emake -j1 all elf || die "make failed"
+}
+
+src_install() {
+	make install install-elf DESTDIR=${D} || die "make install failed"
+	if use ppc-macos ; then
+		chmod a+rx "${D}"/usr/$(get_libdir)/libslang*dylib || die "chmod failed"
+	else
+		chmod a+rx "${D}"/usr/$(get_libdir)/libslang*so* || die "chmod failed"
+	fi
+
+	if use unicode ; then
+		for i in ${D}/usr/$(get_libdir)/libslang-utf8* ; do
+			local libslang=${i/${D}/}
+			dosym ${libslang} ${libslang/-utf8/}
+		done
+		dosym /usr/$(get_libdir)/libslang{-utf8,}.a
+	fi
+
+	rm -rf ${D}/usr/doc
+	dodoc NEWS README *.txt
+	dodoc doc/*.txt doc/internal/*.txt doc/text/*.txt
+	dohtml doc/*.html
+}