Version bump, finally at klibc-1.5.

Package-Manager: portage-2.1.2.7

4 files changed, 222 insertions, 9 deletions

diff --git a/dev-libs/klibc/ChangeLog b/dev-libs/klibc/ChangeLog
index 8d47281626b2..fba3a1aedd44 100644
--- a/dev-libs/klibc/ChangeLog
+++ b/dev-libs/klibc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/klibc
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/klibc/ChangeLog,v 1.41 2007/05/13 11:21:33 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/klibc/ChangeLog,v 1.42 2007/05/17 11:31:44 phreak Exp $
+
+*klibc-1.5 (17 May 2007)
+
+  17 May 2007; Christian Heim <phreak@gentoo.org> +klibc-1.5.ebuild:
+  Version bump, finally at klibc-1.5.
 
   13 May 2007; Christian Heim <phreak@gentoo.org> klibc-1.4.13.ebuild:
   Really fix the permission problem (#178053) and also fix the sandbox
diff --git a/dev-libs/klibc/Manifest b/dev-libs/klibc/Manifest
index 7d995fdca6cd..252de204c6d2 100644
--- a/dev-libs/klibc/Manifest
+++ b/dev-libs/klibc/Manifest
@@ -41,6 +41,7 @@ DIST klibc-1.1.tar.bz2 444770 RMD160 d25df89a8468f05e480ea7348c8cfa25aa4a061e SH
 DIST klibc-1.2.1.tar.bz2 451620 RMD160 d0ea3418622c008884c0efb6dee693aa03eca90d SHA1 ff09e5c083326299083846cced052058a291c5bd SHA256 c413b565ea6bd33d4f0af5ee3319d9bc1d804e5cb859b9f3284cad2c449d7c5c
 DIST klibc-1.4.12.tar.bz2 473002 RMD160 f10be3132faf99b2e75287c05aa5d1d12c58ebcf SHA1 e61fc2bc3ebebcb60e1e24096f8496d46d977049 SHA256 78f7330e156080809c82dce6d3461ed1f8a547db58bc99c162253c71f3865e89
 DIST klibc-1.4.13.tar.bz2 473178 RMD160 659f2b0f443547587f7eca46a01ce3b7a264f14c SHA1 36bf42f6225c522c4a930d217550ccf1b9178f60 SHA256 54d45fa13cf50cc0dfd7f960046e152e74cb80f150f816d4587cc7a140ea1d72
+DIST klibc-1.5.tar.bz2 487483 RMD160 9329426693c39eca2c357987bfa37656570b9d35 SHA1 254444bcc3f42855ec69b3a2497d5e6162e2fe2f SHA256 27000ba4bc73a5977502b27d7036df24dd6ab94a1c33b8f5d6d54ba62772f0c7
 EBUILD klibc-1.1.ebuild 4165 RMD160 322fb2a8bab3b1240ed44831507691be457677d0 SHA1 a193b334cdb3a86d6214ac877027116ce3898077 SHA256 94ef3179da75c07c197c830e644520b0032b0493601d8c3ee217f81d6f124230
 MD5 8aeec3288335b9aa00b16bf2c0ae45b6 klibc-1.1.ebuild 4165
 RMD160 322fb2a8bab3b1240ed44831507691be457677d0 klibc-1.1.ebuild 4165
@@ -61,10 +62,14 @@ EBUILD klibc-1.4.13.ebuild 6737 RMD160 12ef4d7a1495d7d1948aed2378f63e24f859d1be
 MD5 e44fcb22c8447b12ebd2c33e5bf3ec8c klibc-1.4.13.ebuild 6737
 RMD160 12ef4d7a1495d7d1948aed2378f63e24f859d1be klibc-1.4.13.ebuild 6737
 SHA256 c132ba4b06a04c274ded8ef852ca1849adc538a2f1dc28f38037d7c0f0201f52 klibc-1.4.13.ebuild 6737
-MISC ChangeLog 7289 RMD160 f762eac15d0b643c69ac5fc0559315ca80c52d5c SHA1 75b9f492888aee38366493072231bc2d076241de SHA256 40a843d02175b7562f5a8b70d3ea37c938fdb5ece4da5f8269ae60796d90fc2a
-MD5 e7a9915e9da90191b983392ab9fc9755 ChangeLog 7289
-RMD160 f762eac15d0b643c69ac5fc0559315ca80c52d5c ChangeLog 7289
-SHA256 40a843d02175b7562f5a8b70d3ea37c938fdb5ece4da5f8269ae60796d90fc2a ChangeLog 7289
+EBUILD klibc-1.5.ebuild 5526 RMD160 8c03bc45ca2c0b53191419e8342d331bef4cfde3 SHA1 ce4b05907003cf63de00b1e69ff9c031a0b11c33 SHA256 ebdbe0d8990ccfbd88ee6fd2b4c7a071bf1ae30b1eecc06ea908f56fcf96ffa6
+MD5 5b2e73bd6ab8f52ff599fc5a6ca16d13 klibc-1.5.ebuild 5526
+RMD160 8c03bc45ca2c0b53191419e8342d331bef4cfde3 klibc-1.5.ebuild 5526
+SHA256 ebdbe0d8990ccfbd88ee6fd2b4c7a071bf1ae30b1eecc06ea908f56fcf96ffa6 klibc-1.5.ebuild 5526
+MISC ChangeLog 7423 RMD160 62b855a2a9cd454262d5329ddc5159e53d14586b SHA1 aa6eed2684e74c40a59342cf886e3d4bc2587ff6 SHA256 c05c1b80cb415cad101629a6bbd6fa2710d1bbb9b9f80989d77bfdf528e4cda6
+MD5 05ceeeb44fe884caa4d9926043488664 ChangeLog 7423
+RMD160 62b855a2a9cd454262d5329ddc5159e53d14586b ChangeLog 7423
+SHA256 c05c1b80cb415cad101629a6bbd6fa2710d1bbb9b9f80989d77bfdf528e4cda6 ChangeLog 7423
 MISC metadata.xml 260 RMD160 1a28bdfe0ee053b3731843b95e9c497694b0e27e SHA1 58d6f3c018844f1ad6421c707edca422c38a3c6b SHA256 9b114205b75428b6ab0dbf2406fe98c9ae63b02601a294bd5a96d5d6bc6071bd
 MD5 d36bf99d488919e367a6a944ed5f520a metadata.xml 260
 RMD160 1a28bdfe0ee053b3731843b95e9c497694b0e27e metadata.xml 260
@@ -84,10 +89,13 @@ SHA256 f7f48c53b5630392ad4dcdd6603ff14bf4922f30a918dcde8836dda59f54ea27 files/di
 MD5 37cd7042545680010abe83dd5e52d6d0 files/digest-klibc-1.4.13 241
 RMD160 510d482cc1079a0026727837e952a6b15e6ea74f files/digest-klibc-1.4.13 241
 SHA256 ed62a4a37224c36d34369c3903a144f73e3c78b985f3457afb876e98059cdb3a files/digest-klibc-1.4.13 241
+MD5 b79c6ebc2ec3079964fc074dfe80e380 files/digest-klibc-1.5 232
+RMD160 759a89e619b883990d30497b55d5042ca172a108 files/digest-klibc-1.5 232
+SHA256 9b784615ed975d744c25afbf8716126d2e2446a20b4a9146d0ced31cda10e26e files/digest-klibc-1.5 232
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.3 (GNU/Linux)
+Version: GnuPG v2.0.4 (GNU/Linux)
 
-iD8DBQFGRvTDyuNVb5qfaOYRAjmnAJ96ewn6LwfW6TRgC4TB/fpTgKPT6ACfX2VV
-FnA25PPnPZsfzkgeDpBex6w=
-=La78
+iD8DBQFGTD0ryuNVb5qfaOYRAt6xAKC2AUqtBMEa2cmjpZmny85af/JLQgCdF5W/
+LmBizlLZwbPbgB5PwbtUyU4=
+=Zduu
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/klibc/files/digest-klibc-1.5 b/dev-libs/klibc/files/digest-klibc-1.5
new file mode 100644
index 000000000000..aa7eb0c91838
--- /dev/null
+++ b/dev-libs/klibc/files/digest-klibc-1.5
@@ -0,0 +1,3 @@
+MD5 481dfdef7273f2cc776c2637f481f017 klibc-1.5.tar.bz2 487483
+RMD160 9329426693c39eca2c357987bfa37656570b9d35 klibc-1.5.tar.bz2 487483
+SHA256 27000ba4bc73a5977502b27d7036df24dd6ab94a1c33b8f5d6d54ba62772f0c7 klibc-1.5.tar.bz2 487483
diff --git a/dev-libs/klibc/klibc-1.5.ebuild b/dev-libs/klibc/klibc-1.5.ebuild
new file mode 100644
index 000000000000..355725a00004
--- /dev/null
+++ b/dev-libs/klibc/klibc-1.5.ebuild
@@ -0,0 +1,197 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/klibc/klibc-1.5.ebuild,v 1.1 2007/05/17 11:31:44 phreak Exp $
+
+inherit eutils linux-info multilib toolchain-funcs
+
+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/Testing/${P}.tar.bz2"
+
+LICENSE="|| ( GPL-2 LGPL-2 )"
+KEYWORDS="~amd64 -mips ~ppc ~x86"
+IUSE="debug n32"
+
+DEPEND="dev-lang/perl
+	virtual/linux-sources"
+RDEPEND="dev-lang/perl"
+
+if [[ ${CTARGET} != ${CHOST} ]] ; then
+	SLOT="${CTARGET}"
+else
+	SLOT="0"
+fi
+
+# Klibc has no PT_GNU_STACK support, so scanning for execstacks is moot
+QA_EXECSTACK="*"
+
+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}/usr/include/arch/" | sort -r) ; do
+		if [[ ${host} == "${x}" ]] ; then
+			echo "${x}"
+			return 0
+		fi
+	done
+
+	return 1
+}
+
+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
+
+	einfo "CTARGET = $CTARGET"
+	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-::' | \
+	              sed -e 's/powerpc/ppc/')
+	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}"
+
+	# Symlink /usr/src/linux to ${S}/linux
+	ln -snf ${KV_DIR} linux
+
+	# Build interp.o with EXTRA_KLIBCAFLAGS (.S source)
+	epatch "${FILESDIR}"/${PN}-1.4.11-interp-flags.patch
+
+	# klibc detects mips64 systems as having 64bit userland
+	# Force them to 32bit userlands instead
+	if use mips ; then
+		! use n32 && epatch "${FILESDIR}"/${PN}-1.4.9-mips32.patch
+	fi
+}
+
+src_compile() {
+	local myargs
+
+	[[ ${KV_DIR} != "${KV_OUT_DIR}" ]] && \
+		myargs="KLIBCKERNELOBJ='${KV_OUT_DIR}/' KBUILD_SRC='1'"
+
+	use debug && myargs="${myargs} V=1"
+
+	if tc-is-cross-compiler ; then
+		einfo "ARCH = \"$(guess_arch)\""
+		einfo "CROSS = \"${CTARGET}-\""
+		emake ARCH=$(guess_arch) \
+			CROSS="${CTARGET}-" \
+			EXTRA_KLIBCAFLAGS="-Wa,--noexecstack" \
+			EXTRA_KLIBCLDFLAGS="-z,noexecstack" \
+			libdir="/usr/$(get_libdir)" \
+			SHLIBDIR="/$(get_libdir)" \
+			mandir="/usr/share/man" \
+			INSTALLDIR="/usr/$(get_libdir)/klibc" \
+			${myargs} || die "Compile failed!"
+	else
+		env -u ARCH \
+		emake \
+			EXTRA_KLIBCAFLAGS="-Wa,--noexecstack" \
+			EXTRA_KLIBCLDFLAGS="-z,noexecstack" \
+			libdir="/usr/$(get_libdir)" \
+			SHLIBDIR="/$(get_libdir)" \
+			mandir="/usr/share/man" \
+			INSTALLDIR="/usr/$(get_libdir)/klibc" \
+			${myargs} || die "Compile failed!"
+	fi
+}
+
+src_install() {
+	local myargs klibc_prefix
+
+	[[ ${KV_DIR} != "${KV_OUT_DIR}" ]] && \
+		myargs="KLIBCKERNELOBJ='${KV_OUT_DIR}/' KBUILD_SRC='1'"
+
+	use debug && myargs="${myargs} V=1"
+
+	if tc-is-cross-compiler ; then
+		klibc_prefix=$("${S}/klcc/${CTARGET}-klcc" -print-klibc-prefix)
+
+		make \
+			EXTRA_KLIBCAFLAGS="-Wa,--noexecstack" \
+			EXTRA_KLIBCLDFLAGS="-z,noexecstack" \
+			INSTALLROOT="${D}" \
+			ARCH=$(guess_arch) \
+			CROSS="${CTARGET}-" \
+			libdir="/usr/$(get_libdir)" \
+			SHLIBDIR="/$(get_libdir)" \
+			mandir="/usr/share/man" \
+			INSTALLDIR="/usr/$(get_libdir)/klibc" \
+			${myargs} \
+			install || die "Install failed!"
+	else
+		klibc_prefix=$("${S}/klcc/klcc" -print-klibc-prefix)
+
+		env -u ARCH \
+		make \
+			EXTRA_KLIBCAFLAGS="-Wa,--noexecstack" \
+			EXTRA_KLIBCLDFLAGS="-z,noexecstack" \
+			INSTALLROOT="${D}" \
+			libdir="/usr/$(get_libdir)" \
+			SHLIBDIR="/$(get_libdir)" \
+			mandir="/usr/share/man" \
+			INSTALLDIR="/usr/$(get_libdir)/klibc" \
+			${myargs} \
+			install || die "Install failed!"
+	fi
+
+	# klibc doesn't support prelinking, so we need to mask it
+	cat > "${T}/70klibc" <<-EOF
+		PRELINK_PATH_MASK="/usr/$(get_libdir)/klibc"
+	EOF
+
+	doenvd "${T}"/70klibc
+
+	# Fix the permissions (bug #178053) on /usr/$(get_libdir)/klibc/include
+	# Actually I have no idea, why the includes have those weird-ass permissions
+	# on a particular system, might be due to inherited permissions from parent
+	# directory
+
+	find "${D}"/usr/$(get_libdir)/klibc/include | xargs chmod o+rX
+
+	# Hardlinks becoming copies
+	for x in gunzip zcat ; do
+		rm -f "${D}/${klibc_prefix}/bin/${x}"
+		dosym gzip "${klibc_prefix}/bin/${x}"
+	done
+
+	if ! tc-is-cross-compiler ; then
+		cd "${S}"
+		insinto /usr/share/aclocal
+		doins contrib/klibc.m4
+
+		dodoc README usr/klibc/CAVEATS usr/klibc/README
+		newdoc usr/klibc/arch/README README.klibc.arch
+		docinto dash; newdoc usr/dash/README.klibc README
+		docinto gzip; dodoc usr/gzip/README
+	fi
+}