Update version.

Package-Manager: portage-2.1.1_pre3-r5

4 files changed, 243 insertions, 8 deletions

diff --git a/dev-libs/klibc/ChangeLog b/dev-libs/klibc/ChangeLog
index 1c6bb3960f70..ecf1bba1ebb6 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.32 2006/07/25 14:36:26 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/klibc/ChangeLog,v 1.33 2006/07/27 07:25:32 azarah Exp $
+
+*klibc-1.4.13 (27 Jul 2006)
+
+  27 Jul 2006; Martin Schlemmer <azarah@gentoo.org> +klibc-1.4.13.ebuild:
+  Update version.
 
 *klibc-1.4.12 (25 Jul 2006)
 
diff --git a/dev-libs/klibc/Manifest b/dev-libs/klibc/Manifest
index 0d844eaaacab..74e350706d1d 100644
--- a/dev-libs/klibc/Manifest
+++ b/dev-libs/klibc/Manifest
@@ -41,6 +41,7 @@ DIST klibc-1.1.16.tar.bz2 451284 RMD160 869ed4a53f86bf33b12e5abfa8d343b70da5f8b6
 DIST klibc-1.1.tar.bz2 444770 RMD160 d25df89a8468f05e480ea7348c8cfa25aa4a061e SHA1 167832f15b48f0d7eda160eee4b05b9afa446a69 SHA256 42de47159a382d852750e38fe4877ee2f97f2ff4c47e27f3ce512193d31f63e7
 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
 EBUILD klibc-1.1.16-r1.ebuild 4240 RMD160 6661dd8da518731a420ff98d7dc3f4aabbbeac40 SHA1 fb616105b742112f4f0b9c9db70fec85e0514508 SHA256 7aecfa6e8f3a63fe3c855113c4e535ba93fdc212e9af5818ac1daa35d715858a
 MD5 92a3930943687a2c731a7a6eab4850cd klibc-1.1.16-r1.ebuild 4240
 RMD160 6661dd8da518731a420ff98d7dc3f4aabbbeac40 klibc-1.1.16-r1.ebuild 4240
@@ -61,10 +62,14 @@ EBUILD klibc-1.4.12.ebuild 6117 RMD160 f5732cb2378c8647088e3c78090918c385228820
 MD5 52151bbf0bc764dfd4aa468cbe3c6103 klibc-1.4.12.ebuild 6117
 RMD160 f5732cb2378c8647088e3c78090918c385228820 klibc-1.4.12.ebuild 6117
 SHA256 8d88bb5a7ea5a39ec7919a2853dd1326893a04bae5cf9086b7f23659da5820e6 klibc-1.4.12.ebuild 6117
-MISC ChangeLog 5504 RMD160 75696a7edbbc99f00562401b6bd28d825cc24d7c SHA1 023de0c687ede37c7a0f55cc0ccfd1968eb8c212 SHA256 ba7af02acfb4f18c0a258dc0ddd5f69b548b9f9856d9b565b8cf629a547b5489
-MD5 b2ef76e8c7047e5ca606fd523e2c7664 ChangeLog 5504
-RMD160 75696a7edbbc99f00562401b6bd28d825cc24d7c ChangeLog 5504
-SHA256 ba7af02acfb4f18c0a258dc0ddd5f69b548b9f9856d9b565b8cf629a547b5489 ChangeLog 5504
+EBUILD klibc-1.4.13.ebuild 6117 RMD160 4f62a09344fd373eace221f61e288173cfd9fd0b SHA1 0796246f8dcb2cfe052dc1690dfcd7872aa05daf SHA256 fb8b98cd6dc16858410f4adbe71499913d401f2b45e9046881f2812717c6b688
+MD5 27578866b2384aeb0a4fcbe3a279e41d klibc-1.4.13.ebuild 6117
+RMD160 4f62a09344fd373eace221f61e288173cfd9fd0b klibc-1.4.13.ebuild 6117
+SHA256 fb8b98cd6dc16858410f4adbe71499913d401f2b45e9046881f2812717c6b688 klibc-1.4.13.ebuild 6117
+MISC ChangeLog 5626 RMD160 0dcfb22ac7b8bd25627328743fc0f0a97b50cfa0 SHA1 ea78eae9a157a92db1ecab1ddbf4b6c6e7c0c804 SHA256 e9fddd8b07c7244122f5986cc75d9fd5ec9bbb9509b36cd151ddfa6744d08bf4
+MD5 f1cfdb52e267de16342c47555993d5ab ChangeLog 5626
+RMD160 0dcfb22ac7b8bd25627328743fc0f0a97b50cfa0 ChangeLog 5626
+SHA256 e9fddd8b07c7244122f5986cc75d9fd5ec9bbb9509b36cd151ddfa6744d08bf4 ChangeLog 5626
 MISC metadata.xml 223 RMD160 7af8dd320b92b8c61a58767f5221770cd236c63a SHA1 dc0e52cb5b43de4cfe293e3ad0c06d2ce1e5a83e SHA256 4b7a3ec9381367d73e7d7f56f27fcf2a703d7731c345cc88af4587743936e2f0
 MD5 b612d343db3c54560665171eb7db245c metadata.xml 223
 RMD160 7af8dd320b92b8c61a58767f5221770cd236c63a metadata.xml 223
@@ -84,10 +89,13 @@ SHA256 382c935239962cf639e051b35213a499e7a8762baee40721d5d33fe5d0edfe32 files/di
 MD5 973d90be82ca36897f675b3d968e8679 files/digest-klibc-1.4.12 241
 RMD160 fdc29ccbed7abccc934f99ca8adec88f7e47a652 files/digest-klibc-1.4.12 241
 SHA256 f7f48c53b5630392ad4dcdd6603ff14bf4922f30a918dcde8836dda59f54ea27 files/digest-klibc-1.4.12 241
+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
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.4 (GNU/Linux)
 
-iD8DBQFExi701ZcsMnZjRyIRAuaIAKCJqLN9Qhs0P96Lj5etnGD5N+qEKACfazkk
-fKwgmSPE9OsNJGlmPYNtxQk=
-=NW4V
+iD8DBQFEyGsh1ZcsMnZjRyIRAuOLAJoDKVlg+tBfuPRf6pz0YpHnW76E0ACglaUX
+bFke2HF8Dbr/DwQfwQl0X3g=
+=w4vI
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/klibc/files/digest-klibc-1.4.13 b/dev-libs/klibc/files/digest-klibc-1.4.13
new file mode 100644
index 000000000000..a84389f399bf
--- /dev/null
+++ b/dev-libs/klibc/files/digest-klibc-1.4.13
@@ -0,0 +1,3 @@
+MD5 0785892f650e0beb18932e4b28464362 klibc-1.4.13.tar.bz2 473178
+RMD160 659f2b0f443547587f7eca46a01ce3b7a264f14c klibc-1.4.13.tar.bz2 473178
+SHA256 54d45fa13cf50cc0dfd7f960046e152e74cb80f150f816d4587cc7a140ea1d72 klibc-1.4.13.tar.bz2 473178
diff --git a/dev-libs/klibc/klibc-1.4.13.ebuild b/dev-libs/klibc/klibc-1.4.13.ebuild
new file mode 100644
index 000000000000..367c7eccb441
--- /dev/null
+++ b/dev-libs/klibc/klibc-1.4.13.ebuild
@@ -0,0 +1,219 @@
+# 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.4.13.ebuild,v 1.1 2006/07/27 07:25:32 azarah Exp $
+
+inherit eutils linux-info multilib
+
+# Klibc has no PT_GNU_STACK support, so scanning for execstacks is moot
+QA_EXECSTACK="*"
+
+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 )"
+# Mips patches needs updating ...
+KEYWORDS="~amd64 -mips ~ppc ~x86"
+IUSE="debug n32"
+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}/usr/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
+
+	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}
+
+	# Add our linux source tree symlink
+	ln -snf ${KV_DIR} linux
+
+	# Some reason .config has outdated mtime
+	touch ${S}/.config
+
+	# 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
+
+	# Export the NOSTDINC_FLAGS to ensure -nostdlib is passed, bug #120678
+	# NOTE: Disabling this for now, as klibc have -fno-stack-protector.  Will
+	#       enable it again if there is still issues.
+	#epatch "${FILESDIR}/${PN}"-1.4.7-nostdinc-flags.patch
+	# 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 n32; then
+		epatch "${FILESDIR}/${PN}"-1.4.9-mips32.patch
+	fi
+
+	# Linker path is awry
+	# NB: Still needed ???
+	#epatch "${FILESDIR}/${PN}"-1.1.16-mips-ldpaths.patch
+}
+
+src_compile() {
+	local myargs
+
+	[[ ${KV_DIR} != "${KV_OUT_DIR}" ]] && \
+		myargs="KLIBCKERNELOBJ='${KV_OUT_DIR}/' KBUILD_SRC='1'"
+
+	use debug && myargs="${myargs} V=1"
+
+	if is_cross ; 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 is_cross ; 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
+
+	# Hardlinks becoming copies
+	for x in gunzip zcat ; do
+		rm -f "${D}/${klibc_prefix}/bin/${x}"
+		dosym gzip "${klibc_prefix}/bin/${x}"
+	done
+
+	if ! is_cross ; then
+		insinto /usr/share/aclocal
+		doins ${FILESDIR}/klibc.m4
+
+		doenvd ${S}/70klibc
+
+		dodoc ${S}/README ${S}/usr/klibc/{LICENSE,CAVEATS}
+		newdoc ${S}/usr/klibc/README README.klibc
+		newdoc ${S}/usr/klibc/arch/README README.klibc.arch
+		docinto dash; newdoc ${S}/usr/dash/README.klibc README
+		docinto gzip; dodoc ${S}/usr/gzip/{COPYING,README}
+	fi
+}
+
+pkg_postinst() {
+	# Override for linux-mod eclass
+	return 0
+}