Fix broken symlink creation.

(Portage version: 2.1_pre3-r1)

4 files changed, 166 insertions, 2 deletions

diff --git a/dev-libs/klibc/ChangeLog b/dev-libs/klibc/ChangeLog
index 732b70a52cf8..ce56ff76c000 100644
--- a/dev-libs/klibc/ChangeLog
+++ b/dev-libs/klibc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/klibc
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/klibc/ChangeLog,v 1.16 2006/01/21 20:59:54 pylon Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/klibc/ChangeLog,v 1.17 2006/01/22 00:14:05 azarah Exp $
+
+*klibc-1.1.16-r1 (22 Jan 2006)
+
+  22 Jan 2006; Martin Schlemmer <azarah@gentoo.org> +klibc-1.1.16-r1.ebuild:
+  Fix broken symlink creation.
 
   21 Jan 2006; Lars Weiler <pylon@gentoo.org> klibc-1.1.16.ebuild:
   Stable on ppc; bug #112742.
diff --git a/dev-libs/klibc/Manifest b/dev-libs/klibc/Manifest
index a389ec9140fb..ddf32bf41e7b 100644
--- a/dev-libs/klibc/Manifest
+++ b/dev-libs/klibc/Manifest
@@ -3,11 +3,12 @@ MD5 5f74818fe6743d6f26cd199480a6d4ea files/digest-klibc-1.0.14-r1 65
 MD5 9f7934fa62dac32c7a1f7fb7f3c1eff6 files/digest-klibc-1.1 62
 MD5 40dd929bc6cde977c4e309596afcd6fe files/digest-klibc-1.1.1 64
 MD5 0e893c37516ea180bbbdcb60081bbec8 files/digest-klibc-1.1.16 65
+MD5 0e893c37516ea180bbbdcb60081bbec8 files/digest-klibc-1.1.16-r1 65
 MD5 4b098438d57b0f7ad9f16d534fb98eb4 files/klibc-1.0.14-nostdlib.patch 460
 MD5 d771e07746a2d5b2bdac366cd992c885 files/klibc-1.1-mips32.patch 670
 MD5 790a9f0a9a74e6eac6c6c1dbde2a94b6 files/klibc.m4 3619
 MD5 87eac36868c96b295f5b4b631a505db9 klibc-1.0.14-r1.ebuild 4123
 MD5 b6ca70e7577c32b484f33e067d12cd94 klibc-1.1.1.ebuild 4174
-MD5 27bd12955ef0d8dca931558bab66708f klibc-1.1.16.ebuild 4088
+MD5 60d927bb94e74a4478b168b84741004f klibc-1.1.16-r1.ebuild 4131
 MD5 8aeec3288335b9aa00b16bf2c0ae45b6 klibc-1.1.ebuild 4165
 MD5 b612d343db3c54560665171eb7db245c metadata.xml 223
diff --git a/dev-libs/klibc/files/digest-klibc-1.1.16-r1 b/dev-libs/klibc/files/digest-klibc-1.1.16-r1
new file mode 100644
index 000000000000..da1d43b9af24
--- /dev/null
+++ b/dev-libs/klibc/files/digest-klibc-1.1.16-r1
@@ -0,0 +1 @@
+MD5 80b85e84306695ed61049720008dd409 klibc-1.1.16.tar.bz2 451284
diff --git a/dev-libs/klibc/klibc-1.1.16-r1.ebuild b/dev-libs/klibc/klibc-1.1.16-r1.ebuild
new file mode 100644
index 000000000000..504a2acde2dd
--- /dev/null
+++ b/dev-libs/klibc/klibc-1.1.16-r1.ebuild
@@ -0,0 +1,157 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/klibc/klibc-1.1.16-r1.ebuild,v 1.1 2006/01/22 00:14:05 azarah Exp $
+
+inherit eutils linux-mod
+
+export CTARGET=${CTARGET:-${CHOST}}
+if [[ ${CTARGET} == ${CHOST} ]] ; then
+	if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then
+		export CTARGET=${CATEGORY/cross-}
+	fi
+fi
+
+DESCRIPTION="A minimal libc subset for use with initramfs."
+HOMEPAGE="http://www.zytor.com/mailman/listinfo/klibc"
+SRC_URI="ftp://ftp.kernel.org/pub/linux/libs/klibc/${P}.tar.bz2
+	ftp://ftp.kernel.org/pub/linux/libs/klibc/Stable/${P}.tar.bz2
+	ftp://ftp.kernel.org/pub/linux/libs/klibc/Testing/${P}.tar.bz2"
+LICENSE="|| ( GPL-2 LGPL-2 )"
+KEYWORDS="~amd64 ~mips ppc ~x86"
+IUSE=""
+RESTRICT="nostrip"
+
+DEPEND="dev-lang/perl
+	virtual/linux-sources"
+RDEPEND="dev-lang/perl"
+
+if [[ ${CTARGET} != ${CHOST} ]] ; then
+	SLOT="${CTARGET}"
+else
+	SLOT="0"
+fi
+
+is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
+
+guess_arch() {
+	local x
+	local host=$(echo "${CTARGET%%-*}" | sed -e 's/i.86/i386/' \
+	                                         -e 's/sun4u/sparc64/' \
+	                                         -e 's/arm.*/arm/' \
+	                                         -e 's/sa110/arm/' \
+	                                         -e 's/powerpc/ppc/')
+
+	# Sort reverse so that we will get ppc64 before ppc, etc
+	for x in $(ls -1 "${S}/include/arch/" | sort -r) ; do
+		if [[ ${host} == "${x}" ]] ; then
+			echo "${x}"
+			return 0
+		fi
+	done
+
+	return 1
+}
+
+pkg_setup() {
+	# Make sure kernel sources are OK
+	# (Override for linux-mod eclass)
+	check_kernel_built
+}
+
+src_unpack() {
+	unpack ${A}
+
+	if [[ ! -d /usr/${CTARGET} ]] ; then
+		echo
+		eerror "It does not look like your cross-compiler is setup properly!"
+		die "It does not look like your cross-compiler is setup properly!"
+	fi
+
+	if ! guess_arch &>/dev/null ; then
+		echo
+		eerror "Could not guess klibc's ARCH from your CTARGET!"
+		die "Could not guess klibc's ARCH from your CTARGET!"
+	fi
+
+	kernel_arch=$(readlink "${KV_OUT_DIR}/include/asm" | sed -e 's:asm-::')
+	if [[ ${kernel_arch} != $(guess_arch) ]] ; then
+		echo
+		eerror "Your kernel sources are not configured for your chosen arch!"
+		eerror "(KERNEL_ARCH=\"${kernel_arch}\", ARCH=\"$(guess_arch)\")"
+		die "Your kernel sources are not configured for your chosen arch!"
+	fi
+
+	cd ${S}
+
+	# Add our linux source tree symlink
+	ln -snf ${KV_DIR} linux
+
+	# set the build directory
+	echo "KRNLOBJ = ${KV_OUT_DIR}" >> MCONFIG
+
+	# We do not want all the nice prelink warnings
+	# NOTE: for amd64, we might change below to '/usr/$(get_libdir)/klibc',
+	#       but I do not do it right now, as the build system do not support
+	#       the lib64 yet ....
+	cat > "${S}/70klibc" <<-EOF
+		PRELINK_PATH_MASK="/usr/lib/klibc"
+	EOF
+
+	# klibc detects mips64 systems as having 64bit userland
+	# Force them to 32bit userlands instead
+	#epatch ${FILESDIR}/${PN}-1.1-mips32.patch
+}
+
+src_compile() {
+	if is_cross ; then
+		einfo "ARCH = \"$(guess_arch)\""
+		einfo "CROSS = \"${CTARGET}-\""
+		emake ARCH=$(guess_arch) \
+			CROSS="${CTARGET}-" || die "Compile failed!"
+	else
+		env -u ARCH \
+		emake || die "Compile failed!"
+	fi
+}
+
+src_install() {
+	local klibc_prefix
+
+	if is_cross ; then
+		make INSTALLROOT=${D} \
+			ARCH=$(guess_arch) \
+			CROSS="${CTARGET}-" \
+			install || die "Install failed!"
+
+		klibc_prefix=$("${S}/klcc/${CTARGET}-klcc" -print-klibc-bindir)
+	else
+		env -u ARCH \
+		make INSTALLROOT=${D} install || die "Install failed!"
+
+		klibc_prefix=$("${S}/klcc/klcc" -print-klibc-bindir)
+	fi
+
+	# Hardlinks becoming copies
+	for x in gunzip zcat ; do
+		rm -f "${D}/${klibc_prefix}/${x}"
+		dosym gzip "${klibc_prefix}/${x}"
+	done
+
+	if ! is_cross ; then
+		insinto /usr/share/aclocal
+		doins ${FILESDIR}/klibc.m4
+
+		doenvd ${S}/70klibc
+
+		dodoc ${S}/README ${S}/klibc/{LICENSE,CAVEATS}
+		newdoc ${S}/klibc/README README.klibc
+		newdoc ${S}/klibc/arch/README README.klibc.arch
+		docinto dash; newdoc ${S}/dash/README.klibc README
+		docinto gzip; dodoc ${S}/gzip/{COPYING,README}
+	fi
+}
+
+pkg_postinst() {
+	# Override for linux-mod eclass
+	return 0
+}