Unify some ebuild differences and fix header-only install with newer versions #234748 by Nathan Brink.

Package-Manager: portage-2.2_rc12/cvs/Linux 2.6.26.2 x86_64

9 files changed, 88 insertions, 77 deletions

diff --git a/sys-libs/uclibc/ChangeLog b/sys-libs/uclibc/ChangeLog
index 6b7382bc8c27..7d4b261d9cf4 100644
--- a/sys-libs/uclibc/ChangeLog
+++ b/sys-libs/uclibc/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-libs/uclibc
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/uclibc/ChangeLog,v 1.38 2008/10/29 15:35:58 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/uclibc/ChangeLog,v 1.39 2008/11/01 07:33:09 vapier Exp $
+
+  01 Nov 2008; Mike Frysinger <vapier@gentoo.org> uclibc-0.9.27-r1.ebuild,
+  uclibc-0.9.28.3.ebuild, uclibc-0.9.28.3-r3.ebuild,
+  uclibc-0.9.28.3-r6.ebuild, uclibc-0.9.28.3-r7.ebuild,
+  uclibc-0.9.30_rc1.ebuild, uclibc-0.9.30_rc3.ebuild:
+  Unify some ebuild differences and fix header-only install with newer
+  versions #234748 by Nathan Brink.
 
 *uclibc-0.9.30_rc3 (29 Oct 2008)
 
diff --git a/sys-libs/uclibc/Manifest b/sys-libs/uclibc/Manifest
index 84c4c6843a71..17654292c22c 100644
--- a/sys-libs/uclibc/Manifest
+++ b/sys-libs/uclibc/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST uClibc-0.9.27-cvs-update-20050114.patch.bz2 839 RMD160 08439855b6dc481216132d3882b8f634ecbe4555 SHA1 0e1a400745f0cbd739c6c08f45951eea836b1102 SHA256 83b86570ed0f0109f2ff04e753daf18a9bf59eab5b01b8d04a2406bb4100c423
 DIST uClibc-0.9.27-patches-1.6.tar.bz2 24001 RMD160 eca81853e00e5144c165b2eb4733059d53f93234 SHA1 93beb60660145c1b661c577f1e89a7217841c0c9 SHA256 78ff8162423b5563b1a97ae5294ab1e919b9489e171962053da54c04ee127797
 DIST uClibc-0.9.27.tar.bz2 1693895 RMD160 4c580c0c468bcd7e77a6b4223847f17b6ad241cc SHA1 e0de53949998253e25e6b946b564062babb723b4 SHA256 d43098b9d1cac5cc983672f885d82b59459c3abcb12ef8141653581c77cd0d9c
@@ -10,12 +13,19 @@ DIST uClibc-0.9.30-rc1-patches-0.1.tar.bz2 15953 RMD160 f23788f547924f69ed0a0cb9
 DIST uClibc-0.9.30-rc1.tar.bz2 2304763 RMD160 e4503b4df92e6849966ad6822860a0bf1dd854df SHA1 2249f6cb1f561417daed8fa6d58d7c4be8f786d7 SHA256 494ce5d3c0ae09eaf17fccc7954e3698a8347d13d7d1c290a85618a40e82c779
 DIST uClibc-0.9.30-rc3.tar.bz2 2295161 RMD160 c865dcd704a95f7b454ef03bcc360bf467cad4e0 SHA1 0cec04645e4fe677af5940af965b35f779c80d41 SHA256 6de33cd7eb30432b514c4f0e32f63f88f119646f66cb272ec8bf3bb288657989
 DIST uClibc-locale-030818.tgz 236073 RMD160 8e3f4b20b94e07e535cbbbe81287186014c5f151 SHA1 78f901e6ed228ed84106bd034c1b97eee1eecb50 SHA256 c4362be318a38f18d98dccf462d22d95bab92f05548bb93f65298fe9afaebd57
-EBUILD uclibc-0.9.27-r1.ebuild 12375 RMD160 ff034d2c7f8177b65c3e46fc85db2944988e2dba SHA1 72a6f7fc3747621bfb6651df90697904b2d3a9dd SHA256 5c5cd57061e23a3453b3b3a016521f49c01cd1cbed6a4d260b821434f5d71dce
-EBUILD uclibc-0.9.28.3-r3.ebuild 14511 RMD160 dc6b4a141794753196ce4674d5fd56e3a5c29b90 SHA1 18562524b58e09353dfa89865cddb5fab86fda53 SHA256 7f1e85c1bb54908e97eb91522da252c73e7a37e130dbd74b07abd2b1b17d6995
-EBUILD uclibc-0.9.28.3-r6.ebuild 14514 RMD160 c507745dee707d3a1203c1f8caeec65f6114a17c SHA1 5487fd257b85fae3af8f6819541083c0d61d2cae SHA256 a816a25ee741b2eab64fe8001b45b84bc2de8d17ab054cb0ae2ab7a4b2b0da60
-EBUILD uclibc-0.9.28.3-r7.ebuild 14514 RMD160 95c9b595ddfff5757acedf80c2d06d1ee6502295 SHA1 c43d79397faa457a85631ed3991ee2d72a8d14ec SHA256 58d44b680e33326fc72d9405a7af0355d9d97e60afd6018ba908843de6fbc5c1
-EBUILD uclibc-0.9.28.3.ebuild 14505 RMD160 226435750e446dc1d0785dce9de3748a44bb3676 SHA1 61741ee151e44fd23888afa1a89169ab170965ed SHA256 beafe38b57d20ccec51702a4ffb2d48f81082ec7ec1c66d21977232e39db0beb
-EBUILD uclibc-0.9.30_rc1.ebuild 14432 RMD160 23555f2d147719c6f4a1d995e0a504a67fc275d6 SHA1 d97ac115f9a8d708f761623b3cce7dcc4b5c762e SHA256 e1a5a3a9a821ffc4a9d4214ee7a1dddaa46dad95e5b0d4723f8145f5c94a16e0
-EBUILD uclibc-0.9.30_rc3.ebuild 14429 RMD160 b0799cc5079eb46f58999aa753fbd0ee77e5073a SHA1 8f375c9196c04bdbf2cc0345ceb8a5a6619ff523 SHA256 469858692ee1753570e462fc580cb9de59f9857447009356a79dcbf63684a385
-MISC ChangeLog 14224 RMD160 cfc83d1176b5283f6fbba16dc76fe8c3023de15a SHA1 4eaa5ef4807d0be1ac6730c20e7e0ea78b27bdde SHA256 3e16dbb2be444a67aa9f9c61a8e9a9aaac4ff839af2e2baef0220ba32fe8ec85
+EBUILD uclibc-0.9.27-r1.ebuild 12349 RMD160 1907241e5b159e8e6dfe5758254e78529508da5c SHA1 6ccc353679842a15cec02e67370a53468b813c25 SHA256 ef45378f6dfbe838b5985c727e09f751dc099f8d61d22abdb347131cf51afc2e
+EBUILD uclibc-0.9.28.3-r3.ebuild 14519 RMD160 196cf32e0f8d9af1b8a4590ddce8a80fd847a709 SHA1 9e11b057d9bf475eabc1dc0bb9fded4eaf7d0ae7 SHA256 582e5eb25110ad74638a1ad0fa70f865e2668e127695a46a8fdbf2909a49073b
+EBUILD uclibc-0.9.28.3-r6.ebuild 14522 RMD160 34fb9b4cb94899aa70fa287c8b6def2e8148201c SHA1 da977552a3e520288e2cc7cbdd293cabb7d13874 SHA256 0c6b9319283e94bf4916c44d19876a58fa059151db266b29636d3b495b0dde96
+EBUILD uclibc-0.9.28.3-r7.ebuild 14522 RMD160 c951654646c8d3d6ec5559d70678092d256c1257 SHA1 d6ee1ff5ead3f338c5d6b3a0378ce82c471811b4 SHA256 6dfaa8c2fa10ffe2f0a93737e9045829a4922b12f0c70cfd7457e124a9e9d9a7
+EBUILD uclibc-0.9.28.3.ebuild 14513 RMD160 f0b09ee89ca6ab4255b06fb4a5d89d8363cde623 SHA1 11a32313695999f0d0b874e90a13add4cbb911a1 SHA256 cd1defc5347cf8bdadd6a04c1742c877b69f745afb7941f87621ee53a0763c69
+EBUILD uclibc-0.9.30_rc1.ebuild 14408 RMD160 60c6a0095fba847a039ef208e130b2fd8530d47e SHA1 699266bf848f61648763daf132e57aeb3f69e3ac SHA256 43994a8b66c3ff823aea4ad458d69008eb428fd207f33d121c08d66bae2e4343
+EBUILD uclibc-0.9.30_rc3.ebuild 14409 RMD160 498c0d30a86fa8f6d93007ef33fb71f218912c01 SHA1 52e0fbafdea7c42619ff8180040e42e39c86dbf6 SHA256 280b055045c0eff4ab494d550306121ce718b3a4d53df7d6eef610627ffff49d
+MISC ChangeLog 14571 RMD160 01f4b3b1cb8505790e5a5a9817c7ae858008d53d SHA1 200a218c2141708ffded250c80165a1ea56f7649 SHA256 c411d0f75462a62d293bc048a572cdd682cb3f2e003205d0d4b46ec659cbc1d3
 MISC metadata.xml 1382 RMD160 aec15535239f8395eb53ba3f0d1730f9e02693e3 SHA1 1ade2f09631f7c0bfe424dc775f6787928e21e5a SHA256 503af91d433a322b80e8ed4c9c1606c7be47dd5feecd46a07fd57eb5e5a3813f
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkkMBj0ACgkQ67wieSYcaxe/OACeMh5YOarcwEb8D+tU6f6w33Q2
+2FgAnjdLi92a2MkZ4jfc5aW2SNz6WpOc
+=chqz
+-----END PGP SIGNATURE-----
diff --git a/sys-libs/uclibc/uclibc-0.9.27-r1.ebuild b/sys-libs/uclibc/uclibc-0.9.27-r1.ebuild
index f1fb6560aecb..e2acb33eb83e 100644
--- a/sys-libs/uclibc/uclibc-0.9.27-r1.ebuild
+++ b/sys-libs/uclibc/uclibc-0.9.27-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/uclibc/uclibc-0.9.27-r1.ebuild,v 1.31 2008/10/27 06:53:14 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/uclibc/uclibc-0.9.27-r1.ebuild,v 1.32 2008/11/01 07:33:09 vapier Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -356,7 +356,7 @@ src_install() {
 
 	local target="install"
 	just_headers && target="install_dev"
-	make PREFIX="${sysroot}" ${target} || die "install failed"
+	emake PREFIX="${sysroot}" ${target} || die "install failed"
 
 	# remove files coming from kernel-headers
 	rm -rf "${D}"${sysroot}/usr/include/{asm,linux,asm-generic}
@@ -373,20 +373,18 @@ src_install() {
 		return 0
 	fi
 
-	if [[ ${CHOST} == *-uclibc ]] ; then
+	if [[ ${CHOST} == *-uclibc* ]] ; then
 		emake PREFIX="${D}" install_utils || die "install-utils failed"
 		dobin extra/scripts/getent
 	fi
 
-	if ! use build ; then
-		dodoc Changelog* README TODO docs/*.txt DEDICATION.mjn3
-		doman debian/*.1
-	fi
+	dodoc Changelog* README TODO docs/*.txt DEDICATION.mjn3
+	doman debian/*.1
 }
 
 pkg_postinst() {
 	[[ ${CTARGET} != ${CHOST} ]] && return 0
-	[[ ${CHOST} != *-uclibc ]] && return 0
+	[[ ${CHOST} != *-uclibc* ]] && return 0
 
 	if [[ ! -e ${ROOT}/etc/TZ ]] ; then
 		ewarn "Please remember to set your timezone in /etc/TZ"
diff --git a/sys-libs/uclibc/uclibc-0.9.28.3-r3.ebuild b/sys-libs/uclibc/uclibc-0.9.28.3-r3.ebuild
index cb1b279f4b14..811ab366d8d8 100644
--- a/sys-libs/uclibc/uclibc-0.9.28.3-r3.ebuild
+++ b/sys-libs/uclibc/uclibc-0.9.28.3-r3.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/uclibc/uclibc-0.9.28.3-r3.ebuild,v 1.3 2008/10/27 06:53:14 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/uclibc/uclibc-0.9.28.3-r3.ebuild,v 1.4 2008/11/01 07:33:09 vapier Exp $
 
 #ESVN_REPO_URI="svn://uclibc.org/trunk/uClibc"
 #inherit subversion
@@ -424,25 +424,25 @@ src_install() {
 	# system headers correctly.  See gcc/doc/gccinstall.info
 	if [[ ${CTARGET} != ${CHOST} ]] ; then
 		dosym usr/include /usr/${CTARGET}/sys-include
-		newbin utils/ldconfig.host ${CTARGET}-ldconfig || die
-		newbin utils/ldd.host ${CTARGET}-ldd || die
+		if ! just_headers ; then
+			newbin utils/ldconfig.host ${CTARGET}-ldconfig || die
+			newbin utils/ldd.host ${CTARGET}-ldd || die
+		fi
 		return 0
 	fi
 
-	if [[ ${CHOST} == *-uclibc ]] ; then
-		make DESTDIR="${D}" install_utils || die "install-utils failed"
+	if [[ ${CHOST} == *-uclibc* ]] ; then
+		emake DESTDIR="${D}" install_utils || die "install-utils failed"
 		dobin extra/scripts/getent
 	fi
 
-	if ! use build ; then
-		dodoc Changelog* README TODO docs/*.txt DEDICATION.mjn3
-		doman docs/man/*.[1-9]
-	fi
+	dodoc Changelog* README TODO docs/*.txt DEDICATION.mjn3
+	doman docs/man/*.[1-9]
 }
 
 pkg_postinst() {
 	[[ ${CTARGET} != ${CHOST} ]] && return 0
-	[[ ${CHOST} != *-uclibc ]] && return 0
+	[[ ${CHOST} != *-uclibc* ]] && return 0
 
 	if [[ ! -e ${ROOT}/etc/TZ ]] ; then
 		ewarn "Please remember to set your timezone in /etc/TZ"
diff --git a/sys-libs/uclibc/uclibc-0.9.28.3-r6.ebuild b/sys-libs/uclibc/uclibc-0.9.28.3-r6.ebuild
index 948970cd0121..6992da68367e 100644
--- a/sys-libs/uclibc/uclibc-0.9.28.3-r6.ebuild
+++ b/sys-libs/uclibc/uclibc-0.9.28.3-r6.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/uclibc/uclibc-0.9.28.3-r6.ebuild,v 1.2 2008/10/27 06:53:14 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/uclibc/uclibc-0.9.28.3-r6.ebuild,v 1.3 2008/11/01 07:33:09 vapier Exp $
 
 #ESVN_REPO_URI="svn://uclibc.org/trunk/uClibc"
 #inherit subversion
@@ -424,25 +424,25 @@ src_install() {
 	# system headers correctly.  See gcc/doc/gccinstall.info
 	if [[ ${CTARGET} != ${CHOST} ]] ; then
 		dosym usr/include /usr/${CTARGET}/sys-include
-		newbin utils/ldconfig.host ${CTARGET}-ldconfig || die
-		newbin utils/ldd.host ${CTARGET}-ldd || die
+		if ! just_headers ; then
+			newbin utils/ldconfig.host ${CTARGET}-ldconfig || die
+			newbin utils/ldd.host ${CTARGET}-ldd || die
+		fi
 		return 0
 	fi
 
-	if [[ ${CHOST} == *-uclibc ]] ; then
-		make DESTDIR="${D}" install_utils || die "install-utils failed"
+	if [[ ${CHOST} == *-uclibc* ]] ; then
+		emake DESTDIR="${D}" install_utils || die "install-utils failed"
 		dobin extra/scripts/getent
 	fi
 
-	if ! use build ; then
-		dodoc Changelog* README TODO docs/*.txt DEDICATION.mjn3
-		doman docs/man/*.[1-9]
-	fi
+	dodoc Changelog* README TODO docs/*.txt DEDICATION.mjn3
+	doman docs/man/*.[1-9]
 }
 
 pkg_postinst() {
 	[[ ${CTARGET} != ${CHOST} ]] && return 0
-	[[ ${CHOST} != *-uclibc ]] && return 0
+	[[ ${CHOST} != *-uclibc* ]] && return 0
 
 	if [[ ! -e ${ROOT}/etc/TZ ]] ; then
 		ewarn "Please remember to set your timezone in /etc/TZ"
diff --git a/sys-libs/uclibc/uclibc-0.9.28.3-r7.ebuild b/sys-libs/uclibc/uclibc-0.9.28.3-r7.ebuild
index 208abb0fbaa7..90a4422afeab 100644
--- a/sys-libs/uclibc/uclibc-0.9.28.3-r7.ebuild
+++ b/sys-libs/uclibc/uclibc-0.9.28.3-r7.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/uclibc/uclibc-0.9.28.3-r7.ebuild,v 1.2 2008/10/27 06:53:14 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/uclibc/uclibc-0.9.28.3-r7.ebuild,v 1.3 2008/11/01 07:33:09 vapier Exp $
 
 #ESVN_REPO_URI="svn://uclibc.org/trunk/uClibc"
 #inherit subversion
@@ -424,25 +424,25 @@ src_install() {
 	# system headers correctly.  See gcc/doc/gccinstall.info
 	if [[ ${CTARGET} != ${CHOST} ]] ; then
 		dosym usr/include /usr/${CTARGET}/sys-include
-		newbin utils/ldconfig.host ${CTARGET}-ldconfig || die
-		newbin utils/ldd.host ${CTARGET}-ldd || die
+		if ! just_headers ; then
+			newbin utils/ldconfig.host ${CTARGET}-ldconfig || die
+			newbin utils/ldd.host ${CTARGET}-ldd || die
+		fi
 		return 0
 	fi
 
-	if [[ ${CHOST} == *-uclibc ]] ; then
-		make DESTDIR="${D}" install_utils || die "install-utils failed"
+	if [[ ${CHOST} == *-uclibc* ]] ; then
+		emake DESTDIR="${D}" install_utils || die "install-utils failed"
 		dobin extra/scripts/getent
 	fi
 
-	if ! use build ; then
-		dodoc Changelog* README TODO docs/*.txt DEDICATION.mjn3
-		doman docs/man/*.[1-9]
-	fi
+	dodoc Changelog* README TODO docs/*.txt DEDICATION.mjn3
+	doman docs/man/*.[1-9]
 }
 
 pkg_postinst() {
 	[[ ${CTARGET} != ${CHOST} ]] && return 0
-	[[ ${CHOST} != *-uclibc ]] && return 0
+	[[ ${CHOST} != *-uclibc* ]] && return 0
 
 	if [[ ! -e ${ROOT}/etc/TZ ]] ; then
 		ewarn "Please remember to set your timezone in /etc/TZ"
diff --git a/sys-libs/uclibc/uclibc-0.9.28.3.ebuild b/sys-libs/uclibc/uclibc-0.9.28.3.ebuild
index 6ca9cbf182cc..937a306b63f0 100644
--- a/sys-libs/uclibc/uclibc-0.9.28.3.ebuild
+++ b/sys-libs/uclibc/uclibc-0.9.28.3.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/uclibc/uclibc-0.9.28.3.ebuild,v 1.8 2008/10/27 06:53:14 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/uclibc/uclibc-0.9.28.3.ebuild,v 1.9 2008/11/01 07:33:09 vapier Exp $
 
 #ESVN_REPO_URI="svn://uclibc.org/trunk/uClibc"
 #inherit subversion
@@ -424,25 +424,25 @@ src_install() {
 	# system headers correctly.  See gcc/doc/gccinstall.info
 	if [[ ${CTARGET} != ${CHOST} ]] ; then
 		dosym usr/include /usr/${CTARGET}/sys-include
-		newbin utils/ldconfig.host ${CTARGET}-ldconfig || die
-		newbin utils/ldd.host ${CTARGET}-ldd || die
+		if ! just_headers ; then
+			newbin utils/ldconfig.host ${CTARGET}-ldconfig || die
+			newbin utils/ldd.host ${CTARGET}-ldd || die
+		fi
 		return 0
 	fi
 
-	if [[ ${CHOST} == *-uclibc ]] ; then
-		make DESTDIR="${D}" install_utils || die "install-utils failed"
+	if [[ ${CHOST} == *-uclibc* ]] ; then
+		emake DESTDIR="${D}" install_utils || die "install-utils failed"
 		dobin extra/scripts/getent
 	fi
 
-	if ! use build ; then
-		dodoc Changelog* README TODO docs/*.txt DEDICATION.mjn3
-		doman docs/man/*.[1-9]
-	fi
+	dodoc Changelog* README TODO docs/*.txt DEDICATION.mjn3
+	doman docs/man/*.[1-9]
 }
 
 pkg_postinst() {
 	[[ ${CTARGET} != ${CHOST} ]] && return 0
-	[[ ${CHOST} != *-uclibc ]] && return 0
+	[[ ${CHOST} != *-uclibc* ]] && return 0
 
 	if [[ ! -e ${ROOT}/etc/TZ ]] ; then
 		ewarn "Please remember to set your timezone in /etc/TZ"
diff --git a/sys-libs/uclibc/uclibc-0.9.30_rc1.ebuild b/sys-libs/uclibc/uclibc-0.9.30_rc1.ebuild
index 8ff4a96d6a72..22f4d27aaeb8 100644
--- a/sys-libs/uclibc/uclibc-0.9.30_rc1.ebuild
+++ b/sys-libs/uclibc/uclibc-0.9.30_rc1.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/uclibc/uclibc-0.9.30_rc1.ebuild,v 1.2 2008/09/24 14:44:37 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/uclibc/uclibc-0.9.30_rc1.ebuild,v 1.3 2008/11/01 07:33:09 vapier Exp $
 
 #ESVN_REPO_URI="svn://uclibc.org/trunk/uClibc"
 #inherit subversion
@@ -424,8 +424,6 @@ src_install() {
 	just_headers && target="install_headers"
 	emake DESTDIR="${sysroot}" ${target} || die "install failed"
 
-	just_headers && return 0
-
 	save_config .config
 
 	# remove files coming from kernel-headers
@@ -436,20 +434,20 @@ src_install() {
 	# system headers correctly.  See gcc/doc/gccinstall.info
 	if [[ ${CTARGET} != ${CHOST} ]] ; then
 		dosym usr/include /usr/${CTARGET}/sys-include
-		newbin utils/ldconfig.host ${CTARGET}-ldconfig || die
-		newbin utils/ldd.host ${CTARGET}-ldd || die
+		if ! just_headers ; then
+			newbin utils/ldconfig.host ${CTARGET}-ldconfig || die
+			newbin utils/ldd.host ${CTARGET}-ldd || die
+		fi
 		return 0
 	fi
 
 	if [[ ${CHOST} == *-uclibc* ]] ; then
-		make DESTDIR="${D}" install_utils || die "install-utils failed"
+		emake DESTDIR="${D}" install_utils || die "install-utils failed"
 		dobin extra/scripts/getent
 	fi
 
-	if ! use build ; then
-		dodoc Changelog* README TODO docs/*.txt DEDICATION.mjn3
-		doman docs/man/*.[1-9]
-	fi
+	dodoc Changelog* README TODO docs/*.txt DEDICATION.mjn3
+	doman docs/man/*.[1-9]
 }
 
 pkg_postinst() {
diff --git a/sys-libs/uclibc/uclibc-0.9.30_rc3.ebuild b/sys-libs/uclibc/uclibc-0.9.30_rc3.ebuild
index 78b5078bba58..3e242413dca0 100644
--- a/sys-libs/uclibc/uclibc-0.9.30_rc3.ebuild
+++ b/sys-libs/uclibc/uclibc-0.9.30_rc3.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/uclibc/uclibc-0.9.30_rc3.ebuild,v 1.1 2008/10/29 15:35:58 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/uclibc/uclibc-0.9.30_rc3.ebuild,v 1.2 2008/11/01 07:33:09 vapier Exp $
 
 #ESVN_REPO_URI="svn://uclibc.org/trunk/uClibc"
 #inherit subversion
@@ -424,8 +424,6 @@ src_install() {
 	just_headers && target="install_headers"
 	emake DESTDIR="${sysroot}" ${target} || die "install failed"
 
-	just_headers && return 0
-
 	save_config .config
 
 	# remove files coming from kernel-headers
@@ -436,20 +434,20 @@ src_install() {
 	# system headers correctly.  See gcc/doc/gccinstall.info
 	if [[ ${CTARGET} != ${CHOST} ]] ; then
 		dosym usr/include /usr/${CTARGET}/sys-include
-		newbin utils/ldconfig.host ${CTARGET}-ldconfig || die
-		newbin utils/ldd.host ${CTARGET}-ldd || die
+		if ! just_headers ; then
+			newbin utils/ldconfig.host ${CTARGET}-ldconfig || die
+			newbin utils/ldd.host ${CTARGET}-ldd || die
+		fi
 		return 0
 	fi
 
 	if [[ ${CHOST} == *-uclibc* ]] ; then
-		make DESTDIR="${D}" install_utils || die "install-utils failed"
+		emake DESTDIR="${D}" install_utils || die "install-utils failed"
 		dobin extra/scripts/getent
 	fi
 
-	if ! use build ; then
-		dodoc Changelog* README TODO docs/*.txt DEDICATION.mjn3
-		doman docs/man/*.[1-9]
-	fi
+	dodoc Changelog* README TODO docs/*.txt DEDICATION.mjn3
+	doman docs/man/*.[1-9]
 }
 
 pkg_postinst() {