using flameeyes slotted slang-2 and modified my version of jed to support it

svn path=/; revision=31

6 files changed, 94 insertions, 12 deletions

diff --git a/app-editors/jed/Manifest b/app-editors/jed/Manifest
index 8ad096c..633aacd 100644
--- a/app-editors/jed/Manifest
+++ b/app-editors/jed/Manifest
@@ -1,8 +1,8 @@
 DIST jed-0.99-18.tar.bz2 762826 RMD160 6925b67eab24d6dd2d5b5a975c350cfda515632d SHA1 fa4b3313fdde0466546e36100b0de2d9cc75806d SHA256 71c394640cf07286ffc7abe45d91477a64310e2024f81a1d5a79729887d8d43e
-EBUILD jed-0.99.18.ebuild 2460 RMD160 4e40866bb51ef1fe078c69944aac8ebcf6b33ce5 SHA1 bfffcc314f1b6c513bfa5c016be82e1b2f51cbdf SHA256 3dc1c26213964ab6c1091246879634511b9dba27b82418647d3ec5d47431233d
-MD5 560e9bb20b6ca9c9aba7880c8dba51bf jed-0.99.18.ebuild 2460
-RMD160 4e40866bb51ef1fe078c69944aac8ebcf6b33ce5 jed-0.99.18.ebuild 2460
-SHA256 3dc1c26213964ab6c1091246879634511b9dba27b82418647d3ec5d47431233d jed-0.99.18.ebuild 2460
+EBUILD jed-0.99.18.ebuild 2636 RMD160 fa16e9e6ba0d0477a35cec203f176053f5870020 SHA1 ba1b7999879317bc7fb581931d02cb27ed68b70c SHA256 5d60cb94aff08f650e0282b6209c83aa983ddd9edcea8ff746bd0a7b4eb5cef4
+MD5 33a9d129436c3258f586fd9f4c002a2d jed-0.99.18.ebuild 2636
+RMD160 fa16e9e6ba0d0477a35cec203f176053f5870020 jed-0.99.18.ebuild 2636
+SHA256 5d60cb94aff08f650e0282b6209c83aa983ddd9edcea8ff746bd0a7b4eb5cef4 jed-0.99.18.ebuild 2636
 MD5 9a9a9bcb716b9b999f4d26b1e8fb6df5 files/digest-jed-0.99.18 238
 RMD160 7631b9495dad26abbea346902d8209ca4a5bcbf8 files/digest-jed-0.99.18 238
 SHA256 11458f3452f8b90e4293fd2fc33c2e8550743e2d8c99ae763f19c19b4ebcd038 files/digest-jed-0.99.18 238
diff --git a/app-editors/jed/jed-0.99.18.ebuild b/app-editors/jed/jed-0.99.18.ebuild
index 7206161..891b397 100644
--- a/app-editors/jed/jed-0.99.18.ebuild
+++ b/app-editors/jed/jed-0.99.18.ebuild
@@ -31,6 +31,12 @@ PROVIDE="virtual/editor"
 
 src_unpack() {
 	unpack ${A}
+
+	# Gennto slotted slang-2
+	cd ${S}
+	sed -e 's:-lslang:-lslang-2:g' -i src/Makefile.in
+	sed -e 's:libslang:libslang-2:g' -i configure
+
 	#cd ${S}; epatch ${FILESDIR}/${P}-jed.info.patch
 	#use userland_Darwin && epatch ${FILESDIR}/${P}-darwin.patch
 }
@@ -41,7 +47,8 @@ src_compile() {
 	./configure	--host=${CHOST} \
 		--prefix=$JED_ROOT \
 		--bindir=/usr/bin \
-		--mandir=/usr/share/man || die
+		--mandir=/usr/share/man \
+		--with-slanginc=/usr/include/slang-2 || die
 
 	if use gpm ; then
 		cd src
diff --git a/sys-libs/slang/Manifest b/sys-libs/slang/Manifest
index ff850ce..a0d103d 100644
--- a/sys-libs/slang/Manifest
+++ b/sys-libs/slang/Manifest
@@ -3,10 +3,18 @@ MD5 9b59c2ce3842ba5713bbf0276d28123b files/slang-2.0.6-slsh-libs.patch 494
 RMD160 267f1dd8192c41cc783422c0469e4d82c19b1d47 files/slang-2.0.6-slsh-libs.patch 494
 SHA256 5aea17871a908663316f78bb8b9c71e4571f24142b933aa15fca9ae2d53ee464 files/slang-2.0.6-slsh-libs.patch 494
 DIST slang-2.0.6.tar.gz 1325084 RMD160 caf879e440f28297b00cea8bf504af813998424a SHA1 9a39e0098e3269745f60faf2dd1a81084bdd815e SHA256 5e73fddd052c1a62a20002dafbe7215cf9e449d8a50e81065972f0317caa286c
-EBUILD slang-2.0.6.ebuild 1262 RMD160 2d7c0da58bd1f4b42a49fe1575cd63d1b7303001 SHA1 80e846ccbd7a01f70ffbb7b71d5455f546d93229 SHA256 1d5b68079f2ca2b84e7b00463a42c3a55c400917be7d14ae50d58c8f821a56dc
-MD5 1d33b624fd9586fc965368f911800c51 slang-2.0.6.ebuild 1262
-RMD160 2d7c0da58bd1f4b42a49fe1575cd63d1b7303001 slang-2.0.6.ebuild 1262
-SHA256 1d5b68079f2ca2b84e7b00463a42c3a55c400917be7d14ae50d58c8f821a56dc slang-2.0.6.ebuild 1262
-MD5 d9eb9e7c1abb5ebf49d75fde8d526722 files/digest-slang-2.0.6 238
-RMD160 dd8bf2a934cf2c4b8f168afb637f9ef2d3b584d7 files/digest-slang-2.0.6 238
-SHA256 79551e42720f588ef68b3e513a8fcadf63849f4e6ffa0132b405b7bd1d5e1858 files/digest-slang-2.0.6 238
+EBUILD slang-2.0.6-r1.ebuild 1946 RMD160 00b66cd6661e6beea4f046cc5c6eb2b246d70e01 SHA1 803bd127c163bc9f98f68224893536af33090bae SHA256 9cec6e3bd9532ce960bd6c0a20950be501b459ff85e5d7b8abac8f68f6be932f
+MD5 f2f6c433a7f44062e87b2a72b9ccb8b2 slang-2.0.6-r1.ebuild 1946
+RMD160 00b66cd6661e6beea4f046cc5c6eb2b246d70e01 slang-2.0.6-r1.ebuild 1946
+SHA256 9cec6e3bd9532ce960bd6c0a20950be501b459ff85e5d7b8abac8f68f6be932f slang-2.0.6-r1.ebuild 1946
+EBUILD slang-2.0.6_rc0.ebuild 1262 RMD160 b5d8eaa8190e178eda5ec9cb831037183d451ea0 SHA1 34d47ad9ec7a2f846034c6adcd4fcf3c725325b6 SHA256 49545dd84a8b7837dc5ec4ab483d98c187ba5a60750b158249325adf7b946231
+MD5 94f8b38688a0c7c0d6d350a753ffd068 slang-2.0.6_rc0.ebuild 1262
+RMD160 b5d8eaa8190e178eda5ec9cb831037183d451ea0 slang-2.0.6_rc0.ebuild 1262
+SHA256 49545dd84a8b7837dc5ec4ab483d98c187ba5a60750b158249325adf7b946231 slang-2.0.6_rc0.ebuild 1262
+MISC bug_95247 0 RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 SHA1 da39a3ee5e6b4b0d3255bfef95601890afd80709 SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855
+MD5 d41d8cd98f00b204e9800998ecf8427e bug_95247 0
+RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 bug_95247 0
+SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 bug_95247 0
+MD5 d9eb9e7c1abb5ebf49d75fde8d526722 files/digest-slang-2.0.6-r1 238
+RMD160 dd8bf2a934cf2c4b8f168afb637f9ef2d3b584d7 files/digest-slang-2.0.6-r1 238
+SHA256 79551e42720f588ef68b3e513a8fcadf63849f4e6ffa0132b405b7bd1d5e1858 files/digest-slang-2.0.6-r1 238
diff --git a/sys-libs/slang/files/digest-slang-2.0.6-r1 b/sys-libs/slang/files/digest-slang-2.0.6-r1
new file mode 100644
index 0000000..bdebd18
--- /dev/null
+++ b/sys-libs/slang/files/digest-slang-2.0.6-r1
@@ -0,0 +1,3 @@
+MD5 fb8ab2dfc3d8f44b9161b9b0e0c94141 slang-2.0.6.tar.gz 1325084
+RMD160 caf879e440f28297b00cea8bf504af813998424a slang-2.0.6.tar.gz 1325084
+SHA256 5e73fddd052c1a62a20002dafbe7215cf9e449d8a50e81065972f0317caa286c slang-2.0.6.tar.gz 1325084
diff --git a/sys-libs/slang/slang-2.0.6-r1.ebuild b/sys-libs/slang/slang-2.0.6-r1.ebuild
new file mode 100644
index 0000000..5947faa
--- /dev/null
+++ b/sys-libs/slang/slang-2.0.6-r1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+inherit eutils
+
+DESCRIPTION="Console display library used by most text viewer"
+HOMEPAGE="http://www.s-lang.org/"
+SRC_URI="ftp://space.mit.edu/pub/davis/slang/v${PV%.*}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="2"
+KEYWORDS="~amd64 ~x86"
+# USE=cjk is broken; see http://www.jedsoft.org/pipermail/slang-users_jedsoft.org/2006/000399.html
+IUSE="pcre png"
+
+DEPEND=">=sys-libs/ncurses-5.2-r2
+	pcre? ( dev-libs/libpcre )
+	png? ( media-libs/libpng )"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	sed -i \
+		-e '/^SLANG_INST_INC/s/-I@includedir@/-I@SRCDIR@ -I@includedir@/' \
+		-e '/^SLANG_INST_LIB/s/-L@libdir@/-L@OBJDIR@ -L@ELFDIR@ -L@libdir@/' \
+		slsh/Makefile.in || die
+
+	epatch "${FILESDIR}"/${PN}-2.0.6-slsh-libs.patch
+
+	grep -rlZ -- '-lslang\>' "${S}" | xargs -0 sed -i -e 's:-lslang:-lslang-2:g'
+}
+
+src_compile() {
+	econf \
+		$(use_with pcre) \
+		$(use_with png) || die "econf failed"
+	emake THIS_LIB="slang-2" all || die "make all failed"
+	emake THIS_LIB="slang-2" elf || die "make elf failed"
+	cd slsh
+	emake THIS_LIB="slang-2" slsh || die "make slsh failed"
+}
+
+src_install() {
+	emake THIS_LIB="slang-2" DESTDIR="${D}" install install-elf || die "make install failed"
+
+	# Move headers around
+	dodir /usr/include/slang-2
+	mv "${D}"/usr/include/*.h "${D}/usr/include/slang-2"
+
+	rm -rf "${D}/usr/share/doc/slang"
+	dodoc NEWS README *.txt
+	dodoc doc/*.txt doc/internal/*.txt doc/text/*.txt
+	dohtml doc/slangdoc.html
+}
+
+pkg_postinst() {
+	elog "For compatibility reason slang 2.x is installed in Gentoo as libslang-2."
+	elog "This has the unfortunate consequence that if you want to build something"
+	elog "from sources that uses slang 2.x, you need to change the linking library"
+	elog "to -lslang-2 instead of simply -lslang."
+	elog "We're sorry for the inconvenience, but it's to overcome an otherwise"
+	elog "problematic situation."
+}
diff --git a/sys-libs/slang/slang-2.0.6.ebuild b/sys-libs/slang/slang-2.0.6_rc0.ebuild
index 4af4908..4af4908 100644
--- a/sys-libs/slang/slang-2.0.6.ebuild
+++ b/sys-libs/slang/slang-2.0.6_rc0.ebuild