Version bump. cleanup

Package-Manager: portage-2.2.0_alpha10/cvs/Linux x86_64

5 files changed, 88 insertions, 7 deletions

diff --git a/sys-libs/slang/ChangeLog b/sys-libs/slang/ChangeLog
index ec7bfb12bef9..e06d18c35cb8 100644
--- a/sys-libs/slang/ChangeLog
+++ b/sys-libs/slang/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-libs/slang
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/slang/ChangeLog,v 1.118 2010/05/24 18:51:07 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/slang/ChangeLog,v 1.119 2010/12/27 12:51:44 ssuominen Exp $
+
+*slang-2.2.3 (27 Dec 2010)
+
+  27 Dec 2010; Samuli Suominen <ssuominen@gentoo.org> +slang-2.2.3.ebuild,
+  +files/slang-2.2.3-slsh-libs.patch:
+  Version bump.
 
   24 May 2010; Pacho Ramos <pacho@gentoo.org> slang-2.2.2.ebuild:
   stable amd64, bug 318313
diff --git a/sys-libs/slang/Manifest b/sys-libs/slang/Manifest
index f882cde2d1c7..880f4d7d5550 100644
--- a/sys-libs/slang/Manifest
+++ b/sys-libs/slang/Manifest
@@ -1,6 +1,9 @@
 AUX slang-2.1.2-slsh-libs.patch 637 RMD160 0c8b60cf026ab7fc5ad079f04766b907325ed4df SHA1 fd1a58367e2d94f55154d66fedfe69fe921cb794 SHA256 fe5e969a51b6de0874c6b903dcf0ad21f6d5b27813e0e4c79a4dc929ab737ea8
 AUX slang-2.1.3-uclibc.patch 494 RMD160 28ce3d06e5554697bf90f4991128820b19aba11e SHA1 a09a554c6166d81e223a77edc629a19bb8bf0b53 SHA256 7b88890ae8787617065d693f0469b2d462148964e3de9d74e28c0b202590fd69
+AUX slang-2.2.3-slsh-libs.patch 678 RMD160 ee6d556b220aaa8743b5cf084a77d0b3222478e3 SHA1 c24e52f35d10b5c67ef960d75e1d5e7f107ec085 SHA256 820bb560dc76105756a0fa75661dd3cbf6fc6ecb7802dcbdb9fc4625de4ffb22
 DIST slang-2.2.2.tar.bz2 1366850 RMD160 d642c7d513aee198ad5d6d1b710c5c0f65dc381a SHA1 13bb6344f71779cad8c05e1b6b1ef2d073888d58 SHA256 cfaf8551fa3855f9b0043309bb553ef6d457f931b404df5a6ba6a5a69371fc42
-EBUILD slang-2.2.2.ebuild 1583 RMD160 438066d9f54b85e5437ab172e0e3ef67feb5e684 SHA1 1e2438eea100df6b5268573b75659389c7abbd4e SHA256 86ab808457260370cd90b379db5c7120ba2f635d64f57f1adfc2fd7febb22583
-MISC ChangeLog 15142 RMD160 9667d61edb3bf8f968538c9054ba4451815e681e SHA1 cd3d16d428a9f59e8e328ac787499455120b6f52 SHA256 dde3d4ddcc49fc05206318223e5bee0762f20fdc9835bb3e4cb589c3c4bb37cc
+DIST slang-2.2.3.tar.bz2 1424726 RMD160 ca4c8d0a594b76fc6d2bcc62a5f5b3b6edc24535 SHA1 a474b02f8fcaf979ac677aa4f50e8f210d124d01 SHA256 6f69809e463ff98db1dd6591c5b8d023400a56c53734ecba6db7fca8dd2e7a41
+EBUILD slang-2.2.2.ebuild 1566 RMD160 1074797fa9665e738622f2ba3fc53dc8c1a94f5a SHA1 8c2576e6fa7a634b167c0b17b9cc098a2525b032 SHA256 0b9a28f677bd957419a4c4d7dcef8010102580e01771b87e9778025bdda05a49
+EBUILD slang-2.2.3.ebuild 1529 RMD160 fef6451d13adcd5a1e7e365d630af9d4205b5cae SHA1 65d955b76454e2b9592e722c126b0c75ab3b280d SHA256 b13bac61fac3a2c6472bc85d3879d890681bd400101e0314b3af90da65c6563d
+MISC ChangeLog 15304 RMD160 120315d1aeada5fdf761d57ec52d012f3f6ebe51 SHA1 33ad5d55f726e219aece454343555b3b961c9d74 SHA256 0286fd8685260b973c7cabf95db3feed96d783fe3505484f0edca7c82effc606
 MISC metadata.xml 157 RMD160 1305e8c09c6d49c0db2a18bb50b045460c124ebe SHA1 874689ae30dfe223d487e0e6a5e0a0dbf06a69f4 SHA256 c3c089740b31ec0f4d7fbc3bf2d6bb8460ccfd0694f01bf91b22a2e1930d6d5d
diff --git a/sys-libs/slang/files/slang-2.2.3-slsh-libs.patch b/sys-libs/slang/files/slang-2.2.3-slsh-libs.patch
new file mode 100644
index 000000000000..2c999fb184d3
--- /dev/null
+++ b/sys-libs/slang/files/slang-2.2.3-slsh-libs.patch
@@ -0,0 +1,11 @@
+--- slsh/Makefile.in
++++ slsh/Makefile.in
+@@ -80,7 +80,7 @@
+ $(OBJDIR)/slsh_exe: $(OBJDIR)/slsh.o $(OBJDIR)/readline.o
+ 	$(CC) $(CFLAGS) $(OBJDIR)/slsh.o $(OBJDIR)/readline.o -o $(OBJDIR)/slsh_exe $(LDFLAGS) $(SRC_LIBS)
+ $(OBJDIR)/slsh: $(OBJDIR)/slsh.o $(OBJDIR)/readline.o
+-	$(CC) $(CFLAGS) $(OBJDIR)/slsh.o $(OBJDIR)/readline.o -o $(OBJDIR)/slsh $(LDFLAGS) $(INST_LIBS)
++	$(CC) $(CFLAGS) $(OBJDIR)/slsh.o $(OBJDIR)/readline.o -o $(OBJDIR)/slsh $(LDFLAGS) $(SRC_LIBS)
+ $(OBJDIR)/slsh.o: $(OBJDIR) slsh.c slsh.h config.h Makefile
+ 	cd $(OBJDIR) && $(CC) -c $(CFLAGS) $(SLANG_SRCINC) $(DEFS) $(SRCDIR)/slsh.c
+ $(OBJDIR)/readline.o: $(OBJDIR) readline.c slsh.h config.h Makefile
diff --git a/sys-libs/slang/slang-2.2.2.ebuild b/sys-libs/slang/slang-2.2.2.ebuild
index 9bb80960c21e..a3473f3e6630 100644
--- a/sys-libs/slang/slang-2.2.2.ebuild
+++ b/sys-libs/slang/slang-2.2.2.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/slang/slang-2.2.2.ebuild,v 1.8 2010/05/24 18:51:07 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/slang/slang-2.2.2.ebuild,v 1.9 2010/12/27 12:51:44 ssuominen Exp $
 
 EAPI=2
 inherit eutils
 
-DESCRIPTION="a portable programmer's library designed to allow a developer to create robust portable software."
-HOMEPAGE="http://www.s-lang.org"
-SRC_URI="ftp://ftp.fu-berlin.de/pub/unix/misc/slang/v${PV%.*}/${P}.tar.bz2"
+DESCRIPTION="A portable programmer's library designed to allow a developer to create robust portable software"
+HOMEPAGE="http://www.jedsoft.org/slang/"
+SRC_URI="mirror://slang/v${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/sys-libs/slang/slang-2.2.3.ebuild b/sys-libs/slang/slang-2.2.3.ebuild
new file mode 100644
index 000000000000..f5a03db4647c
--- /dev/null
+++ b/sys-libs/slang/slang-2.2.3.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/slang/slang-2.2.3.ebuild,v 1.1 2010/12/27 12:51:44 ssuominen Exp $
+
+EAPI=2
+inherit eutils
+
+DESCRIPTION="A multi-platform programmer's library designed to allow a developer to create robust software"
+HOMEPAGE="http://www.jedsoft.org/slang/"
+SRC_URI="mirror://slang/v${PV%.*}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+IUSE="cjk pcre png readline zlib"
+
+# ncurses for ncurses5-config to get terminfo directory
+RDEPEND="sys-libs/ncurses
+	pcre? ( dev-libs/libpcre )
+	png? ( >=media-libs/libpng-1.4 )
+	cjk? ( dev-libs/oniguruma )
+	readline? ( sys-libs/readline )
+	zlib? ( sys-libs/zlib )"
+DEPEND="${RDEPEND}"
+
+MAKEOPTS="${MAKEOPTS} -j1"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-2.2.3-slsh-libs.patch
+
+	# avoid linking to -ltermcap race with some systems
+	sed -i -e '/^TERMCAP=/s:=.*:=:' configure || die
+}
+
+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)
+}
+
+src_compile() {
+	emake elf static || die
+
+	cd slsh
+	emake slsh || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" install-all || die
+
+	rm -rf "${D}"/usr/share/doc/{slang,slsh}
+
+	dodoc NEWS README *.txt doc/{,internal,text}/*.txt
+	dohtml doc/slangdoc.html slsh/doc/html/*.html
+}