Fix a regression from slang-1.4.9-r2, building on uclibc wrt bug 213925 thanks to Natanael Copa.

Package-Manager: portage-2.1.4.4

4 files changed, 23 insertions, 4 deletions

diff --git a/sys-libs/slang/ChangeLog b/sys-libs/slang/ChangeLog
index ff12f40e6830..45c2784f9634 100644
--- a/sys-libs/slang/ChangeLog
+++ b/sys-libs/slang/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-libs/slang
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/slang/ChangeLog,v 1.88 2008/03/13 16:00:06 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/slang/ChangeLog,v 1.89 2008/03/19 14:53:06 drac Exp $
+
+  19 Mar 2008; Samuli Suominen <drac@gentoo.org>
+  +files/slang-2.1.3-uclibc.patch, slang-2.1.3-r1.ebuild:
+  Fix a regression from slang-1.4.9-r2, building on uclibc wrt bug 213925
+  thanks to Natanael Copa.
 
   13 Mar 2008; Jeroen Roovers <jer@gentoo.org> slang-2.1.3-r1.ebuild:
   Stable for HPPA (bug #211986).
diff --git a/sys-libs/slang/Manifest b/sys-libs/slang/Manifest
index 7b477dfc21d9..e13d149f7d03 100644
--- a/sys-libs/slang/Manifest
+++ b/sys-libs/slang/Manifest
@@ -1,9 +1,10 @@
 AUX slang-1.4.9-fbsdlink.patch 932 RMD160 d23685d7011959bbee70328bc35d21e4f45727c0 SHA1 d27f9f46a67c8a6c644c7d3573cea2ba2ce2eb84 SHA256 dc93f4f41721266136b6b7adb479132180ffc3051c2a32398e3515e5389f0494
 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
 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.1.3.tar.bz2 1191425 RMD160 b59424972e52c361a15b23874d1a0539683608e5 SHA1 31fc6162684f69d9dd0377372dfdc336f0c4343a SHA256 534b80d31f582a00163c2abdcc0317585fa06918c96af65d008718f3b68fddfc
 EBUILD slang-1.4.9-r2.ebuild 1985 RMD160 7ec07161893923053a1eb44f4ad4241ef974ad87 SHA1 3a5b81aa30d36b05089cfd30e196e8297fad3cc1 SHA256 121ddf17f0d41542a1a418d360a7818931f126f22af52393cead0728d3d80bef
-EBUILD slang-2.1.3-r1.ebuild 1567 RMD160 898edefb51386847811cdb926bded78a7a58678e SHA1 11ad40b12b48e65886e04008903366a03629ad41 SHA256 4496e4506af20c5921925f7a9fa461ceef6bae4c83d787f8594087e127e64b3b
-MISC ChangeLog 11704 RMD160 ac716336c36897b0e9d627a13d7629dbdcfac7a4 SHA1 d2429c111f564ea122a14ff723a5c8b76720e249 SHA256 3413f31e0c23b8e6c01de8e374058bbce5c39b4fdb5659542d639bc6ff5f8f16
+EBUILD slang-2.1.3-r1.ebuild 1608 RMD160 dc901192da1b25070241ac5b7a5b8ade9f68c31e SHA1 a2221b7bf73585a5c90e32969c081e0e25b0a526 SHA256 a10aade9d35692a7b419950cbfe5d54010fd03f4246bf244bda468a70aea2fab
+MISC ChangeLog 11914 RMD160 7b17654933d7745059b6251f839b25fd600f897c SHA1 e86dc74ead3264d3f5156bb1ba52d4e4dd2a4d75 SHA256 da2e1777e2f626490b17be1648074b329fafd5939c66cf28a9670e9bd6b4ebf0
 MISC metadata.xml 157 RMD160 1305e8c09c6d49c0db2a18bb50b045460c124ebe SHA1 874689ae30dfe223d487e0e6a5e0a0dbf06a69f4 SHA256 c3c089740b31ec0f4d7fbc3bf2d6bb8460ccfd0694f01bf91b22a2e1930d6d5d
diff --git a/sys-libs/slang/files/slang-2.1.3-uclibc.patch b/sys-libs/slang/files/slang-2.1.3-uclibc.patch
new file mode 100644
index 000000000000..d7ed5a8d650f
--- /dev/null
+++ b/sys-libs/slang/files/slang-2.1.3-uclibc.patch
@@ -0,0 +1,12 @@
+diff -ur slang-2.1.3.orig/src/slcommon.c slang-2.1.3/src/slcommon.c
+--- slang-2.1.3.orig/src/slcommon.c	2007-01-10 18:09:07.000000000 +0200
++++ slang-2.1.3/src/slcommon.c	2008-03-19 16:09:09.000000000 +0200
+@@ -191,7 +191,7 @@
+    return p;
+ }
+ 
+-#if !defined(HAVE_ISSETUGID) && defined(__GLIBC__) && (__GLIBC__ >= 2)
++#if !defined(HAVE_ISSETUGID) && defined(__GLIBC__) && (__GLIBC__ >= 2) && !defined(__UCLIBC__)
+ extern int __libc_enable_secure;
+ # define HAVE___LIBC_ENABLE_SECURE 1
+ #endif
diff --git a/sys-libs/slang/slang-2.1.3-r1.ebuild b/sys-libs/slang/slang-2.1.3-r1.ebuild
index 4bd5d577d3ae..a0784202e257 100644
--- a/sys-libs/slang/slang-2.1.3-r1.ebuild
+++ b/sys-libs/slang/slang-2.1.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/slang/slang-2.1.3-r1.ebuild,v 1.15 2008/03/13 16:00:06 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/slang/slang-2.1.3-r1.ebuild,v 1.16 2008/03/19 14:53:06 drac Exp $
 
 inherit eutils
 
@@ -33,6 +33,7 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	epatch "${FILESDIR}"/${PN}-2.1.2-slsh-libs.patch
+	epatch "${FILESDIR}"/${P}-uclibc.patch
 }
 
 src_compile() {