Version bumped, bug #182339.

Package-Manager: portage-2.1.3.9

5 files changed, 103 insertions, 15 deletions

diff --git a/sys-libs/slang/ChangeLog b/sys-libs/slang/ChangeLog
index 2638c1c05fd8..7de82c3e7c5a 100644
--- a/sys-libs/slang/ChangeLog
+++ b/sys-libs/slang/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-libs/slang
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/slang/ChangeLog,v 1.61 2007/08/30 12:45:53 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/slang/ChangeLog,v 1.62 2007/09/18 16:47:16 matsuu Exp $
+
+*slang-2.1.2 (18 Sep 2007)
+
+  18 Sep 2007; MATSUU Takuto <matsuu@gentoo.org>
+  +files/slang-2.1.2-slsh-libs.patch, +slang-2.1.2.ebuild:
+  Version bumped, bug #182339.
 
   30 Aug 2007; Christian Heim <phreak@gentoo.org> metadata.xml:
   Removing liquidx from metadata due to his retirement (see #171155 for
diff --git a/sys-libs/slang/Manifest b/sys-libs/slang/Manifest
index d3339c5193ed..7105affb6476 100644
--- a/sys-libs/slang/Manifest
+++ b/sys-libs/slang/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX slang-1.4.9-fbsdlink.patch 932 RMD160 d23685d7011959bbee70328bc35d21e4f45727c0 SHA1 d27f9f46a67c8a6c644c7d3573cea2ba2ce2eb84 SHA256 dc93f4f41721266136b6b7adb479132180ffc3051c2a32398e3515e5389f0494
 MD5 ae6604ecadc4c3bf3cb4d7924794260a files/slang-1.4.9-fbsdlink.patch 932
 RMD160 d23685d7011959bbee70328bc35d21e4f45727c0 files/slang-1.4.9-fbsdlink.patch 932
@@ -13,9 +10,14 @@ AUX slang-2.0.6-slsh-libs.patch 494 RMD160 267f1dd8192c41cc783422c0469e4d82c19b1
 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
+AUX slang-2.1.2-slsh-libs.patch 637 RMD160 0c8b60cf026ab7fc5ad079f04766b907325ed4df SHA1 fd1a58367e2d94f55154d66fedfe69fe921cb794 SHA256 fe5e969a51b6de0874c6b903dcf0ad21f6d5b27813e0e4c79a4dc929ab737ea8
+MD5 d4800197304491ae1c9374464da97dba files/slang-2.1.2-slsh-libs.patch 637
+RMD160 0c8b60cf026ab7fc5ad079f04766b907325ed4df files/slang-2.1.2-slsh-libs.patch 637
+SHA256 fe5e969a51b6de0874c6b903dcf0ad21f6d5b27813e0e4c79a4dc929ab737ea8 files/slang-2.1.2-slsh-libs.patch 637
 DIST slang-1.4.9-patches.tar.gz 12132 RMD160 02c7df8f7d51c39c0bf9e729606aa1b94c3e6aaf SHA1 e8cce42f2e7159cbe21ae6cf184ee771ec0a5161 SHA256 487174a2b5df8564b99589e789319b37ee75c52d09ce98bfb12656414cdca3fb
 DIST slang-1.4.9.tar.bz2 631079 RMD160 bd2c37554129134e4e874502af0ebcb6fc7e151b SHA1 667709eb1bc1b0f68ce36b31204bf8a99d31eefa SHA256 fa42e57e902f2161dc2b297e0dcb24ca180024770afa379027db582803ffa2fa
 DIST slang-2.0.6.tar.gz 1325084 RMD160 caf879e440f28297b00cea8bf504af813998424a SHA1 9a39e0098e3269745f60faf2dd1a81084bdd815e SHA256 5e73fddd052c1a62a20002dafbe7215cf9e449d8a50e81065972f0317caa286c
+DIST slang-2.1.2.tar.gz 1474249 RMD160 f275ad760ef53b83d7de77db0c9066bb7ff15dcb SHA1 78d110ecd2a160a564390ea82c3aedc7b5d41f06 SHA256 9b5d22c23af0cb79132e2bfdbc1e39ab4c8bdbc5da32c4b3201d9c473b0ec5f5
 EBUILD slang-1.4.9-r1.ebuild 1730 RMD160 754f31e639a7403d97101bbddf68b5da56dd7288 SHA1 7caff9f56bbf000890633df20705a89c3a4ba139 SHA256 28867a54ea5a2b258d17868ba0b8e21291655e82756501913bef2c5d7f5181f4
 MD5 3e3646098c98c7dfd89f9d9eeb71a805 slang-1.4.9-r1.ebuild 1730
 RMD160 754f31e639a7403d97101bbddf68b5da56dd7288 slang-1.4.9-r1.ebuild 1730
@@ -28,10 +30,14 @@ EBUILD slang-2.0.6.ebuild 2109 RMD160 e63d3624cf8f5e2682c30b647e5d9a748e9e0ccc S
 MD5 49e0945d62aa4ece7ab3e9474b59eed5 slang-2.0.6.ebuild 2109
 RMD160 e63d3624cf8f5e2682c30b647e5d9a748e9e0ccc slang-2.0.6.ebuild 2109
 SHA256 25f639078a3b61f78cb473f1133289b5f833b477b93d5505ffd2bd325c9ce766 slang-2.0.6.ebuild 2109
-MISC ChangeLog 8390 RMD160 da10802947ac18a8eab2aef4f37dea5df269d85f SHA1 7f01dad8eb04f129d7853ba44eaa55bab99f3a3e SHA256 b80a3387d4047f6c6e2f3e4a3ea74f095731a82cf6bf6014c581d6d806421f28
-MD5 7f8cae3d92bc8fb6df704a258dfc303a ChangeLog 8390
-RMD160 da10802947ac18a8eab2aef4f37dea5df269d85f ChangeLog 8390
-SHA256 b80a3387d4047f6c6e2f3e4a3ea74f095731a82cf6bf6014c581d6d806421f28 ChangeLog 8390
+EBUILD slang-2.1.2.ebuild 1876 RMD160 6c16f7e285cc90410bfdfc15f9b073348adc29c8 SHA1 13b9304d0425bc07132f546911f7e65c88b23730 SHA256 2f1557133069945cd3d633b69d9af54cb732447fe3aa31a363e1cc041bce9e7c
+MD5 5c57493f5e24418f220aab4ee57560a8 slang-2.1.2.ebuild 1876
+RMD160 6c16f7e285cc90410bfdfc15f9b073348adc29c8 slang-2.1.2.ebuild 1876
+SHA256 2f1557133069945cd3d633b69d9af54cb732447fe3aa31a363e1cc041bce9e7c slang-2.1.2.ebuild 1876
+MISC ChangeLog 8558 RMD160 f4fb6e7e890a58c1a5471b208cc1aac5331179e6 SHA1 7085370ef59002e8a661242767222c40348d66e1 SHA256 70a82b0a1643ec68a5e1130c7940e06911ec3f08a18772d894d3181f68ceb4ae
+MD5 fd07f33c2ca0d5473b54dbcba1eb39e1 ChangeLog 8558
+RMD160 f4fb6e7e890a58c1a5471b208cc1aac5331179e6 ChangeLog 8558
+SHA256 70a82b0a1643ec68a5e1130c7940e06911ec3f08a18772d894d3181f68ceb4ae ChangeLog 8558
 MISC metadata.xml 157 RMD160 1305e8c09c6d49c0db2a18bb50b045460c124ebe SHA1 874689ae30dfe223d487e0e6a5e0a0dbf06a69f4 SHA256 c3c089740b31ec0f4d7fbc3bf2d6bb8460ccfd0694f01bf91b22a2e1930d6d5d
 MD5 8210d6f935850078086b42115e906b33 metadata.xml 157
 RMD160 1305e8c09c6d49c0db2a18bb50b045460c124ebe metadata.xml 157
@@ -45,10 +51,6 @@ SHA256 c9f9566aec42fda74490eb91710d5630b85bcf5c6a25e5c6a56b6af5638e6c4a files/di
 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
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.6 (GNU/Linux)
-
-iD8DBQFG1rwKyuNVb5qfaOYRAmKHAKCY1OoJCGcixpRWOLYAxTuutLT5KwCcCAl6
-rhAjRbeV2wiRzW5Fna/NvYQ=
-=utAg
------END PGP SIGNATURE-----
+MD5 6f7720aebba790fe294bf9d42857dd53 files/digest-slang-2.1.2 238
+RMD160 97f7e3216bee3229605bab6bdac75e06e24c830e files/digest-slang-2.1.2 238
+SHA256 34dda6b2c067ba5336ea219c7baee5b2cab615ddb24b187e8d80635918836238 files/digest-slang-2.1.2 238
diff --git a/sys-libs/slang/files/digest-slang-2.1.2 b/sys-libs/slang/files/digest-slang-2.1.2
new file mode 100644
index 000000000000..276045be1d22
--- /dev/null
+++ b/sys-libs/slang/files/digest-slang-2.1.2
@@ -0,0 +1,3 @@
+MD5 2e038bae1d7e800980372b46da5212fe slang-2.1.2.tar.gz 1474249
+RMD160 f275ad760ef53b83d7de77db0c9066bb7ff15dcb slang-2.1.2.tar.gz 1474249
+SHA256 9b5d22c23af0cb79132e2bfdbc1e39ab4c8bdbc5da32c4b3201d9c473b0ec5f5 slang-2.1.2.tar.gz 1474249
diff --git a/sys-libs/slang/files/slang-2.1.2-slsh-libs.patch b/sys-libs/slang/files/slang-2.1.2-slsh-libs.patch
new file mode 100644
index 000000000000..da9c3ecfaa09
--- /dev/null
+++ b/sys-libs/slang/files/slang-2.1.2-slsh-libs.patch
@@ -0,0 +1,12 @@
+diff -Naur slang-2.1.2.orig/slsh/Makefile.in slang-2.1.2/slsh/Makefile.in
+--- slang-2.1.2.orig/slsh/Makefile.in	2007-09-09 10:39:18.000000000 +0900
++++ slang-2.1.2/slsh/Makefile.in	2007-09-19 01:31:41.000000000 +0900
+@@ -74,7 +74,7 @@
+ slsh_exe: slsh.o readline.o
+ 	$(CC) $(CFLAGS) slsh.o readline.o -o slsh_exe $(LDFLAGS) $(SRC_LIBS)
+ slsh: slsh.o readline.o
+-	$(CC) $(CFLAGS) slsh.o readline.o -o slsh $(LDFLAGS) $(INST_LIBS)
++	$(CC) $(CFLAGS) slsh.o readline.o -o slsh $(LDFLAGS) $(SRC_LIBS)
+ slsh.o: slsh.c slsh.h config.h Makefile
+ 	$(CC) -c $(CFLAGS) $(SLANG_SRCINC) $(DEFS) slsh.c
+ readline.o: readline.c slsh.h config.h Makefile
diff --git a/sys-libs/slang/slang-2.1.2.ebuild b/sys-libs/slang/slang-2.1.2.ebuild
new file mode 100644
index 000000000000..1951b85f1c2d
--- /dev/null
+++ b/sys-libs/slang/slang-2.1.2.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/slang/slang-2.1.2.ebuild,v 1.1 2007/09/18 16:47:16 matsuu Exp $
+
+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 )"
+
+MAKEOPTS="${MAKEOPTS} -j1"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/${P}-slsh-libs.patch"
+
+	sed -i -e '/^THIS_LIB/s/slang/slang-2/' src/Makefile.in || die
+
+	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 all || die "make all failed"
+	cd slsh
+	emake slsh || die "make slsh failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install install-static || 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,slsh}"
+
+	dodoc NEWS README *.txt
+	dodoc doc/*.txt doc/internal/*.txt doc/text/*.txt
+	dohtml doc/slangdoc.html
+	dohtml slsh/doc/html/*.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."
+}