uclibc fixes

4 files changed, 33 insertions, 26 deletions

diff --git a/sys-apps/util-linux/ChangeLog b/sys-apps/util-linux/ChangeLog
index c8bdb51d3a58..506443accdcd 100644
--- a/sys-apps/util-linux/ChangeLog
+++ b/sys-apps/util-linux/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/util-linux
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/ChangeLog,v 1.79 2004/06/02 04:39:28 lv Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/ChangeLog,v 1.80 2004/06/16 02:03:32 dragonheart Exp $
+
+  16 Jun 2004; Daniel Black <dragonheart@gentoo.org>
+  util-linux-2.12-r4.ebuild, util-linux-2.12-r5.ebuild:
+  uclibc fixes thanks to Peter S. Mazinger <ps.m@gmx.net>
 
   02 Jun 2004; Travis Tilley <lv@gentoo.org> util-linux-2.12-r5.ebuild:
   stable on amd64
diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest
index 360116f13196..bc2770e96d0f 100644
--- a/sys-apps/util-linux/Manifest
+++ b/sys-apps/util-linux/Manifest
@@ -1,29 +1,29 @@
-MD5 6a0f84df4ae9fd7fdcd83d2c9cb56fce util-linux-2.12-r3.ebuild 3734
-MD5 1ff3b4333c763ef3563c36df85e6b5de util-linux-2.12-r5.ebuild 4133
+MD5 5a6b77975651fb24948ee1eed3f9f0c1 ChangeLog 12933
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+MD5 b5441e9a6affef79fe855edc4733d3d7 util-linux-2.11z-r8.ebuild 3188
 MD5 7489b064e5753bda6a5739a01e892d15 util-linux-2.11z-r9.ebuild 3403
 MD5 7f695fb568961c0e4d1517dbd653e4fd util-linux-2.12-r2.ebuild 3217
-MD5 a071356178ad13e5743ce82a6dca8930 util-linux-2.12-r4.ebuild 4053
-MD5 b5441e9a6affef79fe855edc4733d3d7 util-linux-2.11z-r8.ebuild 3188
-MD5 017682faf1c3e194cad92b5ac132643c ChangeLog 12757
-MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
-MD5 0be8df03dae23c81a0e929e58a4114e0 files/util-linux-2.11z-01-nfsv4.dif 13442
-MD5 18371db840b08f5782e3f8f96c4efe8d files/util-linux-2.11z-pic.patch 3056
-MD5 4460875a6ebcf24a7ca5b41ed12f9fe5 files/util-linux-2.12-gcloop.patch 3806
-MD5 7ce604460c5607e6eb5d894b6c8b2064 files/util-linux-2.12-fat-LABEL-support.patch 11583
-MD5 8d4f1146f0699deb1e6872e1c81293e3 files/util-linux-2.12-selinux.diff.bz2 2558
-MD5 d927611f34139a40f1fc9f4162c61f8a files/util-linux-2.12-kernel-2.6.patch 2964
-MD5 a43d2b8c70c5f40a195721dc536abace files/util-linux-2.12-swapon-unistd.patch 289
-MD5 0f2f1ddaeaf52622fa80f4f08bb25a6b files/util-linux-2.11z-01-nfsv4-crypt.dif 13460
+MD5 6a0f84df4ae9fd7fdcd83d2c9cb56fce util-linux-2.12-r3.ebuild 3734
+MD5 86800800c5dc4707b9561a707b1d37ea util-linux-2.12-r4.ebuild 4148
+MD5 a1e4dd9aefc0f9ddc57eb6ceb8e2c519 util-linux-2.12-r5.ebuild 4233
 MD5 02afa4d774f45ab0b9ef42ecc1748005 files/digest-util-linux-2.11z-r8 153
 MD5 02afa4d774f45ab0b9ef42ecc1748005 files/digest-util-linux-2.11z-r9 153
-MD5 6dc0134d8d5f325a86257698d2184718 files/util-linux-2.11z-mips-fdisk-fix.patch 1698
-MD5 65f42fbf981464410f7d5d84a429e920 files/util-linux-no-kill.patch 642
-MD5 11fdaf3d68904b318fbffd7243e719b7 files/util-linux-2.12-amd64_rdev_installation.patch 737
-MD5 6aa1c240dd789327ea92e36309052950 files/no-symlink-resolve.patch 316
-MD5 7d35ae646b52391076f7a329af8265bc files/util-linux-2.11z-agetty-domainname-option.patch 1810
 MD5 830453d37b748b7e2ec454603e33b920 files/digest-util-linux-2.12-r2 151
 MD5 5a1bf3d383850b6c8ca05cc4fe76c813 files/digest-util-linux-2.12-r3 154
 MD5 5a1bf3d383850b6c8ca05cc4fe76c813 files/digest-util-linux-2.12-r4 154
-MD5 5a1bf3d383850b6c8ca05cc4fe76c813 files/digest-util-linux-2.12-r5 154
-MD5 90b5a47385e394b9112357282c35eb4a files/util-linux-2.11z-script.patch 1580
+MD5 6aa1c240dd789327ea92e36309052950 files/no-symlink-resolve.patch 316
+MD5 0f2f1ddaeaf52622fa80f4f08bb25a6b files/util-linux-2.11z-01-nfsv4-crypt.dif 13460
+MD5 0be8df03dae23c81a0e929e58a4114e0 files/util-linux-2.11z-01-nfsv4.dif 13442
+MD5 7d35ae646b52391076f7a329af8265bc files/util-linux-2.11z-agetty-domainname-option.patch 1810
+MD5 6dc0134d8d5f325a86257698d2184718 files/util-linux-2.11z-mips-fdisk-fix.patch 1698
 MD5 e3697bc8fd6a344e8cba1c7d32e34790 files/util-linux-2.11z-parallel-make.patch 369
+MD5 18371db840b08f5782e3f8f96c4efe8d files/util-linux-2.11z-pic.patch 3056
+MD5 90b5a47385e394b9112357282c35eb4a files/util-linux-2.11z-script.patch 1580
+MD5 7ce604460c5607e6eb5d894b6c8b2064 files/util-linux-2.12-fat-LABEL-support.patch 11583
+MD5 d927611f34139a40f1fc9f4162c61f8a files/util-linux-2.12-kernel-2.6.patch 2964
+MD5 8d4f1146f0699deb1e6872e1c81293e3 files/util-linux-2.12-selinux.diff.bz2 2558
+MD5 65f42fbf981464410f7d5d84a429e920 files/util-linux-no-kill.patch 642
+MD5 5a1bf3d383850b6c8ca05cc4fe76c813 files/digest-util-linux-2.12-r5 154
+MD5 11fdaf3d68904b318fbffd7243e719b7 files/util-linux-2.12-amd64_rdev_installation.patch 737
+MD5 4460875a6ebcf24a7ca5b41ed12f9fe5 files/util-linux-2.12-gcloop.patch 3806
+MD5 a43d2b8c70c5f40a195721dc536abace files/util-linux-2.12-swapon-unistd.patch 289
diff --git a/sys-apps/util-linux/util-linux-2.12-r4.ebuild b/sys-apps/util-linux/util-linux-2.12-r4.ebuild
index d05049ae717c..2c8a885c736c 100644
--- a/sys-apps/util-linux/util-linux-2.12-r4.ebuild
+++ b/sys-apps/util-linux/util-linux-2.12-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/util-linux-2.12-r4.ebuild,v 1.12 2004/05/09 01:45:29 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/util-linux-2.12-r4.ebuild,v 1.13 2004/06/16 02:03:32 dragonheart Exp $
 
 inherit eutils flag-o-matic
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://kernel/linux/utils/${PN}/${P}.tar.gz
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86 ~ppc sparc mips alpha arm hppa amd64 ia64 ~ppc64 s390"
-IUSE="crypt nls static pam selinux"
+IUSE="crypt nls static pam selinux uclibc"
 
 DEPEND="virtual/glibc
 	>=sys-apps/sed-4.0.5
@@ -112,6 +112,7 @@ src_unpack() {
 	# /bin/kill is provided by procps ONLY
 	epatch ${FILESDIR}/${PN}-no-kill.patch
 
+	use uclibc && sed -e 's/sys_siglist\[sig\]/strsignal(sig)/' -i ${S}/mount/fstab.c
 }
 
 src_compile() {
diff --git a/sys-apps/util-linux/util-linux-2.12-r5.ebuild b/sys-apps/util-linux/util-linux-2.12-r5.ebuild
index 5e82d6acae52..b7e43bf4113b 100644
--- a/sys-apps/util-linux/util-linux-2.12-r5.ebuild
+++ b/sys-apps/util-linux/util-linux-2.12-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/util-linux-2.12-r5.ebuild,v 1.9 2004/06/02 04:39:28 lv Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/util-linux-2.12-r5.ebuild,v 1.10 2004/06/16 02:03:32 dragonheart Exp $
 
 inherit eutils flag-o-matic
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://kernel/linux/utils/${PN}/${P}.tar.gz
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86 ~ppc ~sparc mips ~alpha arm ~hppa amd64 ~ia64 ~ppc64"
-IUSE="crypt nls static pam selinux"
+IUSE="crypt nls static pam selinux uclibc"
 
 DEPEND="virtual/glibc
 	>=sys-apps/sed-4.0.5
@@ -116,6 +116,8 @@ src_unpack() {
 
 	# Install rdev on amd64 platform
 	epatch ${FILESDIR}/${P}-amd64_rdev_installation.patch
+
+	use uclibc && sed -e 's/sys_siglist\[sig\]/strsignal(sig)/' -i ${S}/mount/fstab.c
 }
 
 src_compile() {