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

(Portage version: 2.2_rc12/cvs/Linux 2.6.26.2 x86_64)

8 files changed, 70 insertions, 69 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/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() {