Add missing patch and add a new one from upstream, thanks to 'galtgendo' in bug #141990.

Package-Manager: portage-2.1.1_pre4

5 files changed, 77 insertions, 15 deletions

diff --git a/sys-libs/slang/ChangeLog b/sys-libs/slang/ChangeLog
index 637553f41998..315efbb572a4 100644
--- a/sys-libs/slang/ChangeLog
+++ b/sys-libs/slang/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-libs/slang
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/slang/ChangeLog,v 1.53 2006/07/28 00:05:33 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/slang/ChangeLog,v 1.54 2006/07/29 10:14:55 flameeyes Exp $
+
+  29 Jul 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +files/slang-2.0.6-foreground.patch, +files/slang-2.0.6-slsh-libs.patch,
+  slang-2.0.6.ebuild:
+  Add missing patch and add a new one from upstream, thanks to 'galtgendo' in
+  bug #141990.
 
 *slang-2.0.6 (28 Jul 2006)
 
diff --git a/sys-libs/slang/Manifest b/sys-libs/slang/Manifest
index 3880b30ece7a..a12457500145 100644
--- a/sys-libs/slang/Manifest
+++ b/sys-libs/slang/Manifest
@@ -5,6 +5,14 @@ AUX slang-1.4.9-fbsdlink.patch 932 RMD160 d23685d7011959bbee70328bc35d21e4f45727
 MD5 ae6604ecadc4c3bf3cb4d7924794260a files/slang-1.4.9-fbsdlink.patch 932
 RMD160 d23685d7011959bbee70328bc35d21e4f45727c0 files/slang-1.4.9-fbsdlink.patch 932
 SHA256 dc93f4f41721266136b6b7adb479132180ffc3051c2a32398e3515e5389f0494 files/slang-1.4.9-fbsdlink.patch 932
+AUX slang-2.0.6-foreground.patch 1223 RMD160 7a22b5f69d828602997209d652a6ebba5dbdf3ac SHA1 570f5b2e9fd9017247b1d9a0c4b9824cd9189f01 SHA256 3a1da7aad282dbdc37d5029f5f4dca55cbf0614da33941bdb8b07b4e17ac3da5
+MD5 38282c6b495bf23bf4c543cf61f0666a files/slang-2.0.6-foreground.patch 1223
+RMD160 7a22b5f69d828602997209d652a6ebba5dbdf3ac files/slang-2.0.6-foreground.patch 1223
+SHA256 3a1da7aad282dbdc37d5029f5f4dca55cbf0614da33941bdb8b07b4e17ac3da5 files/slang-2.0.6-foreground.patch 1223
+AUX slang-2.0.6-slsh-libs.patch 494 RMD160 267f1dd8192c41cc783422c0469e4d82c19b1d47 SHA1 a32541105aca6a75219a6d0b526dab0b5c864205 SHA256 5aea17871a908663316f78bb8b9c71e4571f24142b933aa15fca9ae2d53ee464
+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-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
@@ -16,14 +24,14 @@ EBUILD slang-1.4.9-r2.ebuild 1947 RMD160 6e37c50f6d9c0e01480bdc2317b9f11d2183be7
 MD5 5ccb2b0d897140d08f94a5032a6eb94e slang-1.4.9-r2.ebuild 1947
 RMD160 6e37c50f6d9c0e01480bdc2317b9f11d2183be7c slang-1.4.9-r2.ebuild 1947
 SHA256 4d1281cbd7ab0841352b7474dcd6d6a9a4796e0b595edd615b9ef694eee880d7 slang-1.4.9-r2.ebuild 1947
-EBUILD slang-2.0.6.ebuild 2039 RMD160 dc1898f991a840eeead2377d34b3e59aab57db73 SHA1 3884a7ef1769d535d6301f08293669ff4fec8477 SHA256 869bce20afff1bbe9e967ee3cddc1c57dbe8cdbca3a7662d7d384a3cd9ccefbd
-MD5 2a417aea4fbd0661b46f4e302d676d29 slang-2.0.6.ebuild 2039
-RMD160 dc1898f991a840eeead2377d34b3e59aab57db73 slang-2.0.6.ebuild 2039
-SHA256 869bce20afff1bbe9e967ee3cddc1c57dbe8cdbca3a7662d7d384a3cd9ccefbd slang-2.0.6.ebuild 2039
-MISC ChangeLog 7264 RMD160 2959f88c8f17d724c67a5395ec624c343f092fa6 SHA1 3e504c58e7e77c655b3eb98731ec60a93ee59f25 SHA256 87a21931458e3bded5e60e63714e38f613d9d65d5852a1b1bc74f1a1d8f7f587
-MD5 d41ca4782921fe3091d22ba330eefafe ChangeLog 7264
-RMD160 2959f88c8f17d724c67a5395ec624c343f092fa6 ChangeLog 7264
-SHA256 87a21931458e3bded5e60e63714e38f613d9d65d5852a1b1bc74f1a1d8f7f587 ChangeLog 7264
+EBUILD slang-2.0.6.ebuild 2094 RMD160 6bf0e8fa3b43f7d59a38dd3bd9e3c1c90c2e33ee SHA1 7876d1e3f7c887ab324da5b2f16979fa574bae4b SHA256 6e285815f205287039ac79fd06aadb13e424edeb8cb7d8e04c368ac0139721e2
+MD5 492d9fe54b661885c94c2c08f36a2305 slang-2.0.6.ebuild 2094
+RMD160 6bf0e8fa3b43f7d59a38dd3bd9e3c1c90c2e33ee slang-2.0.6.ebuild 2094
+SHA256 6e285815f205287039ac79fd06aadb13e424edeb8cb7d8e04c368ac0139721e2 slang-2.0.6.ebuild 2094
+MISC ChangeLog 7508 RMD160 af5493fbabede99ac065c86e8d2769961ee2613b SHA1 d61e47fb8563cb15e3b68ee2bc4b69b0e3fb881f SHA256 06fdc016845e027b5bafe2bd8bfbc0f80151f07731a0a5dc19ecba2f94e468e2
+MD5 9c735e4c341de2716b5d51f7e1dc7f49 ChangeLog 7508
+RMD160 af5493fbabede99ac065c86e8d2769961ee2613b ChangeLog 7508
+SHA256 06fdc016845e027b5bafe2bd8bfbc0f80151f07731a0a5dc19ecba2f94e468e2 ChangeLog 7508
 MISC metadata.xml 219 RMD160 355a59738ac2c3bb2de2c5cdf45b5a15a91fe4aa SHA1 19724d267b336a9dbb0d3e770e4deba842215838 SHA256 2dd88647b8f46df7519fe3a112dba84d9af4c7933908984766cf3a25d2e30e3d
 MD5 bc00f0356947154d3250243bd5ec08f5 metadata.xml 219
 RMD160 355a59738ac2c3bb2de2c5cdf45b5a15a91fe4aa metadata.xml 219
@@ -40,7 +48,7 @@ SHA256 79551e42720f588ef68b3e513a8fcadf63849f4e6ffa0132b405b7bd1d5e1858 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.4 (GNU/Linux)
 
-iD8DBQFEyVTUAiZjviIA2XgRArxkAJ0YM/WW/dUku9H+G/2hS0e2e9H3EACfe9nB
-iYpERS7dzcFqUvcLvgu5vYU=
-=FJcV
+iD8DBQFEyzUsAiZjviIA2XgRArwXAJwNMLVL7rTUAHG9jwCzIDcNDXctOQCg55Lc
+C3ZZj6VPg5j7WJULY214VSU=
+=ZpXL
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/slang/files/slang-2.0.6-foreground.patch b/sys-libs/slang/files/slang-2.0.6-foreground.patch
new file mode 100644
index 000000000000..c9c5bbb0c95b
--- /dev/null
+++ b/sys-libs/slang/files/slang-2.0.6-foreground.patch
@@ -0,0 +1,36 @@
+--- src/sldisply.c.old	2006-02-05 21:47:31.000000000 +0100
++++ src/sldisply.c	2006-07-28 09:41:34.000000000 +0200
+@@ -158,7 +158,7 @@
+ static Brush_Info_Type Brush_Table[JMAX_COLORS];
+ 
+ /* 0 if least significant bit is blue, not red */
+-/* static int Is_Fg_BGR = 0; */
++static int Is_Fg_BGR = 0;
+ static int Is_Bg_BGR = 0;
+ #define COLOR_ARG(color, is_bgr) ((is_bgr) ? RGB_to_BGR[(color)&0x7] : (color))
+ static SLCONST int RGB_to_BGR[] =
+@@ -1394,7 +1394,7 @@
+ 	     if (fg0 == SLSMG_COLOR_DEFAULT)
+ 	       tt_write_string (Default_Color_Fg_Str);
+ 	     else
+-	       tt_printf (Color_Fg_Str, COLOR_ARG(fg0, Is_Bg_BGR), 0);
++	       tt_printf (Color_Fg_Str, COLOR_ARG(fg0, Is_Fg_BGR), 0);
+ 	  }
+ 
+ 	if (unknown_attributes
+@@ -2554,13 +2554,13 @@
+    if (Color_Fg_Str == NULL)
+      {
+ 	Color_Fg_Str = SLtt_tgetstr ("Sf");   /* setf */
+-	/* Is_Fg_BGR = (Color_Fg_Str != NULL); */
++	Is_Fg_BGR = (Color_Fg_Str != NULL);
+      }
+    Color_Bg_Str = SLtt_tgetstr ("AB"); /* ANSI setbf */
+    if (Color_Bg_Str == NULL)
+      {
+ 	Color_Bg_Str = SLtt_tgetstr ("Sb");   /* setb */
+-	/* Is_Fg_BGR = (Color_Bg_Str != NULL); */
++	Is_Bg_BGR = (Color_Bg_Str != NULL);
+      }
+ 
+    if ((Max_Terminfo_Colors = SLtt_tgetnum ("Co")) < 0)
diff --git a/sys-libs/slang/files/slang-2.0.6-slsh-libs.patch b/sys-libs/slang/files/slang-2.0.6-slsh-libs.patch
new file mode 100644
index 000000000000..676cf46ee46b
--- /dev/null
+++ b/sys-libs/slang/files/slang-2.0.6-slsh-libs.patch
@@ -0,0 +1,11 @@
+--- ./slsh/Makefile.in.old	2006-07-15 22:02:01.000000000 -0700
++++ ./slsh/Makefile.in	2006-07-15 22:02:21.000000000 -0700
+@@ -69,7 +69,7 @@
+ slsh_exe: slsh.o readline.o
+ 	$(CC) slsh.o readline.o -o slsh_exe $(LDFLAGS) $(SRC_LIBS)
+ slsh: slsh.o readline.o
+-	$(CC) slsh.o readline.o -o slsh $(LDFLAGS) $(INST_LIBS)
++	$(CC) slsh.o readline.o -o slsh $(LDFLAGS) $(SRC_LIBS)
+ slsh.o: slsh.c slsh.h config.h
+ 	$(CC) -c $(CFLAGS) $(SLANG_SRCINC) $(DEFS) slsh.c
+ readline.o: readline.c slsh.h config.h
diff --git a/sys-libs/slang/slang-2.0.6.ebuild b/sys-libs/slang/slang-2.0.6.ebuild
index bb7eb548f5ea..3a4778982bc3 100644
--- a/sys-libs/slang/slang-2.0.6.ebuild
+++ b/sys-libs/slang/slang-2.0.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/slang/slang-2.0.6.ebuild,v 1.1 2006/07/28 00:05:33 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/slang/slang-2.0.6.ebuild,v 1.2 2006/07/29 10:14:55 flameeyes Exp $
 
 inherit eutils
 
@@ -26,7 +26,8 @@ src_unpack() {
 		-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
+	epatch "${FILESDIR}/${PN}-2.0.6-slsh-libs.patch"
+	epatch "${FILESDIR}/${PN}-2.0.6-foreground.patch"
 
 	grep -rlZ -- '-lslang\>' "${S}" | xargs -0 sed -i -e 's:-lslang:-lslang-2:g'
 }
@@ -42,7 +43,7 @@ src_compile() {
 }
 
 src_install() {
-	emake THIS_LIB="slang-2" DESTDIR="${D}" install install-elf || die "make install failed"
+	emake -j1 THIS_LIB="slang-2" DESTDIR="${D}" install install-elf || die "make install failed"
 
 	# Move headers around
 	dodir /usr/include/slang-2