Version bump

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xF52D4BBA

3 files changed, 148 insertions, 15 deletions

diff --git a/sys-libs/musl/ChangeLog b/sys-libs/musl/ChangeLog
index 338c6a69d6f4..bab79d172c37 100644
--- a/sys-libs/musl/ChangeLog
+++ b/sys-libs/musl/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-libs/musl
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/musl/ChangeLog,v 1.59 2015/05/17 11:36:33 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/musl/ChangeLog,v 1.60 2015/06/05 08:11:12 blueness Exp $
+
+*musl-1.1.10 (05 Jun 2015)
+
+  05 Jun 2015; Anthony G. Basile <blueness@gentoo.org> +musl-1.1.10.ebuild:
+  Version bump
 
   17 May 2015; Anthony G. Basile <blueness@gentoo.org> musl-1.1.9.ebuild:
   Drop ~ppc since its broken like mips.
diff --git a/sys-libs/musl/Manifest b/sys-libs/musl/Manifest
index db81e7625fec..af5d47edc1db 100644
--- a/sys-libs/musl/Manifest
+++ b/sys-libs/musl/Manifest
@@ -4,27 +4,29 @@ Hash: SHA256
 AUX getent 1168 SHA256 391f5e2bf876d1a5d0ebc4bd80f15e297049cf3296252dfee6549d32e9b43f6a SHA512 60e10b9ac073e5b648b2c22c8e75a3f2c8a26e28f6d50059e4b921f17adbd0f6d7aa65d8441ebab19f07b21592425962b736071c55d0c274855bc1dbb2567382 WHIRLPOOL 4c0422d73eb5f4cfe91c49e95364778cf3453409c3948b375dc5e021be1e0186c110b9d0f674722db211f772cb4da1414ea06aaaed75cd853d31cb13bb70b5c0
 AUX ldconfig 2542 SHA256 e58f98ddd14206a43439bf3431abee786f800867b3e53ac50d43cc8528304621 SHA512 384213cec3842bf9305c9093d7f52c11f8b448c3dcfd78c34e90c28a0ce3848046724f196b1146238ee8fa5f7e337289305efa82cb1f6948f3e171566f71d9b6 WHIRLPOOL 73fcd097ad68b6ae5f33099e45d129fd89ee74c23760fc1eca6b4612fd1a8030df85a8fe019c2bf4e6ed4b0b3a969d2f3678ddd2f6955685037eaff9503cab93
 AUX ldconfig.in 2558 SHA256 d0b0d5d4c955c0a0385ebb4f897afceeb64349089b97f41300cd088eb84d7d3a SHA512 dd18cb4f9910f338a840ceb192525159dd199263bd7d63cb98bc27cc0d876956756881da6ce589e2db13874bfe1b9ce23e7ab2a9ca6aafe360ab6797f580f84f WHIRLPOOL 1fb87b774e8ea06d33f1a502408342847893b4259e83ca6e817f1592a3b6ba3ce3d10cebe5c30c6761e93c7fa3b970011ae5bcdcd01815e3b4ce8451fabc22a0
+DIST musl-1.1.10.tar.gz 907181 SHA256 45bbe9b1c7f7a0f743477af1e103b6889bfe4dd9815e16f6c89f6c90831c8b7c SHA512 183a66a8cc9cd056a8387a1602dd44b502d8976642a21dd0dcef51165fa0dec8a4a124fda6c1918f402b20ad2d6037fcc188a8b174b07a0cbedf11fc2e011141 WHIRLPOOL b69737c22a77da0ff59886d8233b9b1d43228e75bfdf857a5a74ab26f4699564c5b54390bcf171a4f4d9c8fc211f4c6e9c6d4dd6802cc01a5dfe5369bbdd8158
 DIST musl-1.1.8.tar.gz 904465 SHA256 fa928506415b9c555977daaf874c190eaf7fbbd16028cc5c5f33a00a83227813 SHA512 de2f0b03fd199e2ceb9937686d1092838744dccaddb3916f9baef9cdd2621624fb3c4af2206a3366d12852d84ccc8b0b68350f9d06a9e2bcdbc0309dc05383ff WHIRLPOOL 439059ed2134614cf7ccd3b8b7a8c50c53b7aab4a8114b030a1bd2fdb12c6c57621a7ee139aafcada2500c3b0dea3b1b812d7bae7bca85243867edd520adb891
 DIST musl-1.1.9.tar.gz 905914 SHA256 00bf7173caf972c88cd07cb0d420c082a2f35efcccc1a81f8909bec2d030283e SHA512 a6f899814b728113d3ad1b9d03dfde4991af1d9cb85cf596583d6c98cfd596dc2523453ff9bd6e40daef9a63682bf39a66d88ddaa5b51bac72f52c9ff43b9590 WHIRLPOOL b86ed0bbbbecc24b4ea3efd9682f2a6bbe81453e9f801a55f9cd8ffab0cc61ff4f4fa5c2ac956afd7e0685e04060fd8622426dba7284ef3d55348860a9603fba
+EBUILD musl-1.1.10.ebuild 2994 SHA256 b81fe167726b1a8b7174ab1cf054f8b6e75762b8e0d697235f91fc539a9bfdff SHA512 2167a15d7d20c8899e2fe93c0dde3eddf14cbb8deddae662c14abdbdb10dc167393e0abb07f3e3234c820b0cc452c09f8fdb700e56c25a4e0619368096b56334 WHIRLPOOL 5616bbbcecddf4b7bf8081fa3e2fc84a35fb1d90e5702ea41e6a6611e6de971bb6fac87b3a89078eb3f9268e831483d03ef41a2aa5a9a445db3ce69e8a265147
 EBUILD musl-1.1.8-r2.ebuild 2339 SHA256 cc55dbc85aa91d33b4094e0b77028b370ab8cb48987468dda8c4d0a7a48f027c SHA512 84d3ff99993afb056d2e477d57cb3a5d9d28f1cc558f81fac3058c7226991104c58d438d84a24082c08db2a507eebb73fc9df22fb1afecc463fed9d32f054567 WHIRLPOOL 64aba73f221f0f2deb56037bcdcb222f261d57521a349a566071b769091179306ab6108dfbf3b1b35b3587f834e5899cb4df47efcc3e8f60d7e2c19da3de117d
 EBUILD musl-1.1.9.ebuild 2982 SHA256 41088a984431fee5d940a5013116e8961906b1d3ed214aea07a9a9f23646b953 SHA512 b5d9cae0bf50d23126f1bd989e07e0d078c62b6baa6d75b7fd260ff64029fea87d4d07c1abfe91f249625f10082a28686d1ce1887cdede332ece91dfaf159eea WHIRLPOOL d50c40996431f40242ed115f5f20d3b8d476c8c67463c82a775bf9b06c643528354dbef59af40a484a913390eccf22e434aef1a8d38483ddcbf5e9ce5ceac9e7
 EBUILD musl-9999.ebuild 2988 SHA256 102ef6f2a9949832d4d47da560ebeaa7dd5682e3aad4d4f1229106514eee727d SHA512 aface8cf4181dd5675b81f09115db6e24c386e385d6b25a875c2cc32ebc1708998005bbe4528fed1c8a1fc26da2d56b2dd53d9d425636cb3f6040de4092244ca WHIRLPOOL 6c7731b53c7fccad2472e6f02d98979ca3a19c3106c27e9c1a2df4fbda72738fa92b15b38ed75a38e9f5b29d817291a04188ff8b80a0396c38af9677a8d41e70
-MISC ChangeLog 8442 SHA256 67499000c2128c839b18cdf9e469e098b2d0d147bedc6e4bffcf71246daec885 SHA512 b1997585bba436e8de0b65adb8db21b12a2a868a0b927ab9b1a363f290c549d126016153de99966560eb876732b887f6a6ee74e0bab15fa8345754b4067b583f WHIRLPOOL 14734e74770252394cc4fddb3a6beabd86afed939eb9c733741557195c98c4c1ca07418d49270b06d4304ae4d583ae4a9c6ba27aacc17f4a8ff7a9c3eb7368ce
+MISC ChangeLog 8562 SHA256 eaad80d624411780890c91f127a08bcab1fa89d2dc5ef9548c7aa89e7721589d SHA512 042d2e03e5e8efc7525cf73c8bf5408b49a5ea4769a8b79d89d7688a5fe9d56e0deb30b5f01e7d204ac7e1c2135799d78050ba5c1e01eb855b91a5002a007ecd WHIRLPOOL 10d23143f8462214729e97347a99fbfa9561fc2c9b5f142522b9747992d34d4c6fe82cabf7b4361bbc9d89d6d706171a3cfd3fa3f02ca84e0f507da631aa06fa
 MISC metadata.xml 327 SHA256 fd917b3ad115fac11699c82ff087e97c323fe2327f77813c9a2b9cfc27e45042 SHA512 b58ed48ee5332d6e91dfb58faad0a0fecd4b8da27b0edf6c1809a7338764e629eb5c12feb09fae80443b486af27af0d0f2e6ceeb4fc605e6d04b31c1041b3127 WHIRLPOOL 4941c5da58f683ff0a83fdc83017a8fd9a1bbb02fa1b5ea47302ebe7f7d324c0820088acb1eb32263fdb9b4120bc93f24997515bc30515b90055b48d167fd56a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJVWH1kAAoJEJOE+m71LUu6DngQAIvq1A8MLVVUTWF3rF8iIqI7
-SvZYepmF9GXje0Ai+sgbw0nsNdbiKdU8KrnDG5PUEGIYDLvvANO8iEfkHVGB6ze6
-ULDR2xgEtnOV+PlozAsNPvj4R1iPwQf6tBsD939NLoScl07gABR/rUfM/rzXwmB3
-CKOXQR4NOd+P8j9HCNtrhrjgtgW41ifvYJmao1xwggpIUb8UwbID/nakGEZd4G8l
-P9NBCfhBARq0Ry8FGwBstA8tKUqhFrTqnWxMccfuz0c81iZbxtYSurmhgQFib+8T
-8LiDSrtbmsIF1bpj9GPZtYV7qb4MtsFVhMaJFPihtqfiKIQzASO/dkz+gDiscUp6
-0c2thh8s/4h+ZiIius3D03T6Gaz8ipwDSOQ+E5qd5e4VgdKcLXVJNBovY1qazge8
-+AwnNVn5nOwR0A6lF+OdWZ9Pg7xjQs4Q3F6shfkqxau/DUpbzl4eYUYXIa4DnI3p
-sAJe/DvJAA+Szv/rtWAaWOPGjWpwxitCuQZtrDjV4sQweCfuHYAYfGRDllvLyuef
-J+9wFfsOqrSmzrzM6lbJOx8fRQVIJbrvAW8xZc993J7X1oWtqEBPHNNLrhRQBG4N
-96XtrvTjG2d1mAfrvPCMo+tcODMU0dsyVY2rTuwLyNGcOg9q65rqdcrF4VxSvFX7
-yWsB6AlkNl/VaI7fGijR
-=/qvY
+iQIcBAEBCAAGBQJVcVn0AAoJEJOE+m71LUu6tkgQAKewlO1kAexwslvaNJbPpHIA
+tkLQyqR/JF3meeou/CzISu/zXfzGtqMigRAQ0+KdMSPXWkETI+1EFIXLu8m3gqla
+TbHTNK1SEONH7nPs6K6p7PHKePHFucs0jmT3/vQCkYMPSlVr1BdpuxBDjBtWqSU6
+Zff1RIEnvBNTk0ct3kuVPYvEyCWFtIRIVNIx7vpd4KGtPA1//TB8DZhKGmaS9mC+
+ZHOCSqm0aMKJhWoFl4WhniTh65+z4djxm7yPup83qI17yyET4METiImxZt6ZWnYD
+4UdkVw/jkywDAfKGn53e/lHo94Wpt5r528a1rz2H6aIzH5v9gvBdIywGxBs/5aAk
+3j+/RhJ+4vHngbJETmfkzQQJlymiRR/L64EXEYnRhGM1rbgYYk6rI0oVnbY4cSp+
+G8Hi3y9Xc/yx8DujBvMFUjMv4r/NOB1BXXadwDNqHgX8Vu1TBOs6eRylcB8QMRV+
+0jdq50IxS3LOvBXCbvK6RWHQmf30Ak0Hs/t2irtqvKF51lOmZFTKG+12Zbg+eABY
+koCKKPpMKoKft1pv5jxqP9pLbb9nVUbpRD32J0D7umnVkT7CyfyR/mKghP9D7v3L
+F2sMpapnmL8DHoDxz02VyyzViS2G9WWLKVOlxoLl9+ZiilU16nRbfIruAHj/KdEJ
+ujdSGL0b0tfvynsZSPvP
+=ZpMS
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/musl/musl-1.1.10.ebuild b/sys-libs/musl/musl-1.1.10.ebuild
new file mode 100644
index 000000000000..f8dd35f65dbd
--- /dev/null
+++ b/sys-libs/musl/musl-1.1.10.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/musl/musl-1.1.10.ebuild,v 1.1 2015/06/05 08:11:12 blueness Exp $
+
+EAPI=5
+
+inherit eutils flag-o-matic multilib toolchain-funcs
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="git://git.musl-libc.org/musl"
+	inherit git-2
+fi
+
+export CBUILD=${CBUILD:-${CHOST}}
+export CTARGET=${CTARGET:-${CHOST}}
+if [[ ${CTARGET} == ${CHOST} ]] ; then
+	if [[ ${CATEGORY} == cross-* ]] ; then
+		export CTARGET=${CATEGORY#cross-}
+	fi
+fi
+
+DESCRIPTION="Lightweight, fast and simple C library focused on standards-conformance and safety"
+HOMEPAGE="http://www.musl-libc.org/"
+if [[ ${PV} != "9999" ]] ; then
+	PATCH_VER=""
+	SRC_URI="http://www.musl-libc.org/releases/${P}.tar.gz"
+	KEYWORDS="-* ~amd64 ~arm ~mips ~ppc ~x86"
+fi
+
+LICENSE="MIT LGPL-2 GPL-2"
+SLOT="0"
+IUSE="crosscompile_opts_headers-only"
+
+RDEPEND="!sys-apps/getent"
+
+is_crosscompile() {
+	[[ ${CHOST} != ${CTARGET} ]]
+}
+
+just_headers() {
+	use crosscompile_opts_headers-only && is_crosscompile
+}
+
+musl_endian() {
+	# XXX: this wont work for bi-endian, but we dont have any
+	touch "${T}"/endian.s
+	$(tc-getAS ${CTARGET}) "${T}"/endian.s -o "${T}"/endian.o
+	case $(file "${T}"/endian.o) in
+		*" MSB "*) echo "";;
+		*" LSB "*) echo "el";;
+		*)         echo "nfc";; # We shouldn't be here
+	esac
+}
+
+pkg_setup() {
+	if [ ${CTARGET} == ${CHOST} ] ; then
+		case ${CHOST} in
+		*-musl*) ;;
+		*) die "Use sys-devel/crossdev to build a musl toolchain" ;;
+		esac
+	fi
+
+	epatch_user
+}
+
+src_configure() {
+	tc-getCC ${CTARGET}
+	just_headers && export CC=true
+
+	local sysroot
+	is_crosscompile && sysroot=/usr/${CTARGET}
+	./configure \
+		--target=${CTARGET} \
+		--prefix=${sysroot}/usr \
+		--syslibdir=${sysroot}/lib \
+		--disable-gcc-wrapper
+}
+
+src_compile() {
+	emake include/bits/alltypes.h || die
+	just_headers && return 0
+
+	emake || die
+}
+
+src_install() {
+	local target="install"
+	just_headers && target="install-headers"
+	emake DESTDIR="${D}" ${target} || die
+	just_headers && return 0
+
+	# musl provides ldd via a sym link to its ld.so
+	local sysroot
+	is_crosscompile && sysroot=/usr/${CTARGET}
+	local ldso=$(basename "${D}"${sysroot}/lib/ld-musl-*)
+	dosym ${sysroot}/lib/${ldso} ${sysroot}/usr/bin/ldd
+
+	if [[ ${CATEGORY} != cross-* ]] ; then
+		local target=$(tc-arch) arch
+		local endian=$(musl_endian)
+		case ${target} in
+			amd64) arch="x86_64";;
+			arm)   arch="armhf";; # We only have hardfloat right now
+			mips)  arch="mips${endian}";;
+			ppc)   arch="powerpc";;
+			x86)   arch="i386";;
+		esac
+		cp "${FILESDIR}"/ldconfig.in "${T}"
+		sed -e "s|@@ARCH@@|${arch}|" "${T}"/ldconfig.in > "${T}"/ldconfig
+		into /
+		dosbin "${T}"/ldconfig
+		into /usr
+		dobin "${FILESDIR}"/getent
+		echo 'LDPATH="include ld.so.conf.d/*.conf"' > "${T}"/00musl
+		doenvd "${T}"/00musl || die
+	fi
+}
+
+pkg_postinst() {
+	is_crosscompile && return 0
+
+	[ "${ROOT}" != "/" ] && return 0
+
+	ldconfig
+	# reload init ...
+	/sbin/telinit U 2>/dev/null
+}