Version bump.

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

4 files changed, 125 insertions, 18 deletions

diff --git a/sys-libs/musl/ChangeLog b/sys-libs/musl/ChangeLog
index 9f2fb031e4b8..dfb5c82e32cb 100644
--- a/sys-libs/musl/ChangeLog
+++ b/sys-libs/musl/ChangeLog
@@ -1,6 +1,12 @@
 # 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.48 2015/03/28 16:24:57 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/musl/ChangeLog,v 1.49 2015/03/30 23:31:59 blueness Exp $
+
+*musl-1.1.8 (30 Mar 2015)
+
+  30 Mar 2015; Anthony G. Basile <blueness@gentoo.org> +musl-1.1.8.ebuild,
+  musl-9999.ebuild:
+  Version bump.
 
 *musl-1.1.7-r3 (28 Mar 2015)
 
diff --git a/sys-libs/musl/Manifest b/sys-libs/musl/Manifest
index c2164ede334b..b9dfbc115e57 100644
--- a/sys-libs/musl/Manifest
+++ b/sys-libs/musl/Manifest
@@ -4,27 +4,29 @@ Hash: SHA256
 DIST musl-1.1.5.tar.gz 872924 SHA256 352362b1724cc9740f4c3ce0fe02aae45e4de9809ea4ac961f31aedc11b87393 SHA512 4436887367137cbfc6d34e0f403b8dd36db2a55a5160681fef4de7cc0cb1be38487ea708e6aa6dc1328b61c62868b6cc19f099649c9d12e1ba812dfa8844b772 WHIRLPOOL 4ba2f2e0b5e81faeb55472cef32fd2780bca5b94210bc4608872f7a323d918339e1705384576d89a78c9b620692b3f7cd877eb8fa6c15086430b0f640beee3ba
 DIST musl-1.1.6.tar.gz 876821 SHA256 5a0160c55c540d5b90158617a57647f1b03209f58d9ee70dbce19d1115b4f1b4 SHA512 7ae7901e040990937c9473f98c7921736aa9ba051bf133b0a089c0730949ef83acca396333a5afa08edc2514081ab9f36c14aed343919b0d92e0e574737c8bab WHIRLPOOL 5f2a9b7fc85ef53daa0cfa5a7b06ea4ad02376cc381ae1b6257ea499dfe843062902946a29b2801fb9aa0fcb2809077823010f522728c92303876cafa4d21e58
 DIST musl-1.1.7.tar.gz 904546 SHA256 d8e0aae287ecf8aa6500d3ed4131f33d216a7857dc7649a89125ffca6bf91599 SHA512 7fe002ed5f7fd96c8759f3f85ee382809043e1829e093b88eaaddc197f7d558473ad66b33be41dbb1afe750ccdd62e6dfcc3a591c122e84435142fab890e8edc WHIRLPOOL c9261b4887df25316f7b179cfdf6b25277f69aa512c29ebe53b6fa4742712007d393144cbbf825be4cb63aa250558efbae2dcb43185a4937b99c0e9bd6efc861
+DIST musl-1.1.8.tar.gz 904465 SHA256 fa928506415b9c555977daaf874c190eaf7fbbd16028cc5c5f33a00a83227813 SHA512 de2f0b03fd199e2ceb9937686d1092838744dccaddb3916f9baef9cdd2621624fb3c4af2206a3366d12852d84ccc8b0b68350f9d06a9e2bcdbc0309dc05383ff WHIRLPOOL 439059ed2134614cf7ccd3b8b7a8c50c53b7aab4a8114b030a1bd2fdb12c6c57621a7ee139aafcada2500c3b0dea3b1b812d7bae7bca85243867edd520adb891
 EBUILD musl-1.1.5.ebuild 2259 SHA256 edf0f660eb7980df0b4c1548b699ba7b7c4ab42429ca07b46383c76dd912c679 SHA512 9c98edf2e4a49a4fcf1d7bace18f372c89bd56b7fca645cc3855926c9711d936f335ab90b306f59bb858ab63710eee06b4f857f17651bca7312c68e38e6769fd WHIRLPOOL 47b67a5ba0b5ffab81e7ec26afdcb17475af76326046c17c2b0b2d2d71ac90bbedefc1111c932f55012ecc9a03f25429190d7d0f20e521eaf3d5d93f0146c2e7
 EBUILD musl-1.1.6.ebuild 2259 SHA256 a7ec621a99226c0b442fed142355457e3a29724da00fa276f5f7e020416a910b SHA512 7c5d52defba4ab9fe562eb6fc80143082f9826570ea736e59a3779e80a5a4db50f3db6dfb0b6f86431c629e4bb2ee411c75ea04c2bc4d0f65de430f7e7a806a0 WHIRLPOOL 5e6d858783774dd8629fdc46ff166798bb0afb77910fcde05c926164a49bb16411740598bd5b052e41a64d4df6ed7348b1d194f60cef6db9e342415cfd08550b
 EBUILD musl-1.1.7-r3.ebuild 2273 SHA256 4507b1458b7b0d2b25b50ac9c707d1624a405b354619aafa9f61dcd7092065ff SHA512 85bb84ef078c210e5112871c2a03b7d3ff046a2293860615d9ab0d5465d84f91850591d956f7d6ff36b92fe58a3562eb19e84cfc963393bbd7eb142aa1117247 WHIRLPOOL 006c28c6c4d29d7f728b3ca25bab515c95f542f95990fb25cf4390e4448b62cc813d58b18952853f078b0be8fa5a83285b75682ca23dffaf5105cd998a0a4cf5
 EBUILD musl-1.1.7.ebuild 2387 SHA256 61b02e2d18a8569d472a965c3e11056908c76afaf525350b02ee19b52621eb42 SHA512 402e41969d1f7e8904f5b7ae5e7a3ba7a284e49b9ba433a45caa27cf51b2222008787315112adf6d312c35bb03d7976cde4d21e76b38baa4a442944c3ae82918 WHIRLPOOL 56ae3116803f97f3ff4e5ed5c20093b1867519a68530d381022b9047421401f4f0aa41eb2ad4e5db9d5bd9e7e05818a82418c6ce006cf0e2b5d28f6501178d34
-EBUILD musl-9999.ebuild 2260 SHA256 1c2098cd11180e2ac871aceed334a57fac3eb4999d56c2f3f2be9e19c8a0f9d5 SHA512 a5ccc79eca1601b7d42e4b657b2283cd42ed40ea42d14118e1a27f6a1657427c4571cb7c20598a3be8973ea4cfe5525ccb0c472cfcea10244f781651c95839eb WHIRLPOOL 9955ad2d9824c2e66c4a9384c42c01f9d9931574ac1536da809ac7ec36740a05deecfd7a1d5de09d9004f71f394ade3146ff10a4ac433c1ad9f8b2d2f612a55f
-MISC ChangeLog 6859 SHA256 b63e1d35622cefb0f411542c51393d54694f028e8ac0f1791ee5b57a526bda0e SHA512 b7993a3202a12f0fd25ee2793925ecff97235e22f7147bdb92dc6d7fdae1a11cf1345ea0c008aa73ef20dabd96c90874bfd728272b786ca393cf59231b88a37a WHIRLPOOL 7f942fcc50eede66241b25cfaef5887996c6388513011e4485f411a82547f7106b82c679fd0467738d317b1eeb34d2e0514c47c73a0b0e8120e49550c8c8ba2d
+EBUILD musl-1.1.8.ebuild 2270 SHA256 fb53032a023a8b7afebf4ca7c8e4967bed5d1b175c132b61220d8d8465425f76 SHA512 180a2c79cab733e1e147a5e839c9ff4698e506e5a4fff559ad1c2cddadcbb65b57334b20ebb134dfe3a8c0717a9878d7bbd1bf870462ec85e6d9203677889ced WHIRLPOOL a15b0e4e2b134fb0a0f18f9e30d06519f812487525f4bdc33ba04f55a177780dcecb5fc5c741f49b9fb680bd1dbe3e679a2cc0fd0608376f656b5f5d384c195f
+EBUILD musl-9999.ebuild 2270 SHA256 b26fd702b21eabc19a188743c370bd796f18dea13f704754ec221887be54ce5f SHA512 9d33ced3740b4babbdc47c9e0954eb07e45586d8308fe053ef6188dfa552b3c1c369f6474cd9dbc9c6665a026b83e840350c43d8ad9583a878cdcef766b1fe5b WHIRLPOOL 774f5393cd7c339a865dc46bed655396d2af6a4a61b39fa1ee6520a47053ac1bf18da6e0d3323d16b87415082893af9b7e6d4ed4bd104d2190b1fd3601e46254
+MISC ChangeLog 6998 SHA256 faab3ff0c5f40551f554085265466f3461709a07683d37a017d88b7f3f900125 SHA512 0b3331152370ef2443adb674740744e9dc5878ea05f8f65ae46be0f8c4113cce5c4ca805000c35fe77bc9e990dc435b6d5a10fbbd0dd0edcb6236686ddeee91f WHIRLPOOL cd6124552bcb4188028de47478a37855696684916c85754ea2ea7e2ddabf302fde027795cc43fbfe0005744a133721832de2ffc7f7a538e23093ee2c93f3e7d7
 MISC metadata.xml 327 SHA256 fd917b3ad115fac11699c82ff087e97c323fe2327f77813c9a2b9cfc27e45042 SHA512 b58ed48ee5332d6e91dfb58faad0a0fecd4b8da27b0edf6c1809a7338764e629eb5c12feb09fae80443b486af27af0d0f2e6ceeb4fc605e6d04b31c1041b3127 WHIRLPOOL 4941c5da58f683ff0a83fdc83017a8fd9a1bbb02fa1b5ea47302ebe7f7d324c0820088acb1eb32263fdb9b4120bc93f24997515bc30515b90055b48d167fd56a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJVFtY9AAoJEJOE+m71LUu6Xf4QALRvLyCeuv0/v5r5bgKzQ2Xa
-z4rHt+e03fTP4Ez3UXkmQOeuuBW+aIOuGL6S1iLjf/fxDMD5ScxkkUzPTk4ZBAIe
-GanA+V4PCgEgV1QaNoFAEEa5RSqTt6wfeO4E7otR6b8BC5ha3KUzpBBWG5XVkrR9
-SCcWijytJmPuB8G767AUks49S3IUvE4rjgmYwm/3v57Z4zd78ZxiH2LJX9iqWGWx
-QJaNCsmeQrh1ghX6IgEgtJV6oPjpCB2nU9vkZMzfG13fC/3duFZP5K/RjQQapSOP
-4t12Pz3zNracBRQGo7T8Ynn/ER1Jh+N9DYuc0ZqMP/SyqA/PWO49iaEYH8AEYNLs
-cG3y8B+Ohz00MeMhiTvk7WFQ/qD7BMx4qyYl4aeVIlOWm5OgAXvHPk7J56NU2zU4
-yA9rnDJ3QXreUFkQJfmmKUifHp/p0nmp5UXqAgcN3uq845qisAwUKxGBAid6yul1
-LXKi/0C7us8JeD5lzkHD2D/fZKV77jZL2tJ5Tn/cRTYrCZ6j+j/mZ9tdimGlrHGx
-4trlBQyJABB/LlUFhAo9b2pLr1i4GDVfyc2xKc6MTZQw3VGHmW64ZwlMm6rz2Xcs
-P/euZ/7NFIz31ZdOem6GHLbANJlzFh5hl0URj7ZRSKU4UZ48WErJ4FHoK8tfLz/Z
-5zpFhJNCVA3bEpdOra3P
-=yGMB
+iQIcBAEBCAAGBQJVGd1ZAAoJEJOE+m71LUu6dnwP/AjGt3cx9XKArIGCfXMySIf4
++hNbiO2acXVUZaD3/408hpM6Y8SP58Qy3YLkuHXo6AnqfUSCvQwUKvO1Fo0AQalr
+JEwDA4++oCGJgxcvHeFoarbv15q9lxg2Su3SUYclLAcn9Sy0M+Mg4iTB6V/nYV9B
+SByzeIQ+zpTB8m4nVLxV2p7VdYntuU5BGLW0Qr/47bsDV6TdEfLXWvcWAkYM7Kys
+pWw51V4C6HlXKpI2cVTFnHFBDQTgWWo5RYYZBt1e7hSZXEZ1z5G+EjkuDFPv/8e7
+PmwVtO+sE8kqw/RKoWU9X3BXuRWyuhAFWI3g54SRl4VLgNGcv3tPq7sAvwTPNm23
+o6RBk6pTJDSBnsDXVaeD3JZB/gxS/tu4hXsMkzqASlHjxxdsUm35/B2BrTTtEOGw
+LE/19XQakNRqszsCKeEdvdkP5VTag++Ol79eUhpFjbrgOX0wNerx1k1isgrXuzpT
+Dc/Sf8VLGEhrpHNoID/hLF17kRKo35TGZCKVA2d+Wp1ouzd1yzDdsmEhEebedIz1
+mnYkGxOvhFVLqVpgGEoyMTOG6ocuhK+KwAWTJakq2YkaRMoGrjoYCe/rSpmT9aBI
+2ZLGSce6gLDkJzcZ8NgtrNxybVeSq9zhph3p1O1bUzfFszHBMdbVgGCmWOGwCvsp
+GyziJSN1fQM7BTBNXrP8
+=zCkU
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/musl/musl-1.1.8.ebuild b/sys-libs/musl/musl-1.1.8.ebuild
new file mode 100644
index 000000000000..42eba5a945fc
--- /dev/null
+++ b/sys-libs/musl/musl-1.1.8.ebuild
@@ -0,0 +1,99 @@
+# 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.8.ebuild,v 1.1 2015/03/30 23:31:59 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"
+SLOT="0"
+IUSE="crosscompile_opts_headers-only"
+
+if [[ ${CATEGORY} != cross-* ]] ; then
+	RDEPEND+=" sys-apps/getent"
+fi
+
+is_crosscompile() {
+	[[ ${CHOST} != ${CTARGET} ]]
+}
+
+just_headers() {
+	use crosscompile_opts_headers-only && is_crosscompile
+}
+
+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
+}
+
+pkg_postinst() {
+	is_crosscompile && return 0
+
+	[ "${ROOT}" != "/" ] && return 0
+
+	# TODO: musl doesn't use ldconfig, instead here we can
+	# create sym links to libraries outside of /lib and /usr/lib
+	ldconfig
+	# reload init ...
+	/sbin/telinit U 2>/dev/null
+}
diff --git a/sys-libs/musl/musl-9999.ebuild b/sys-libs/musl/musl-9999.ebuild
index 0b965a6ef8cf..4b274eacf79e 100644
--- a/sys-libs/musl/musl-9999.ebuild
+++ b/sys-libs/musl/musl-9999.ebuild
@@ -1,6 +1,6 @@
 # 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-9999.ebuild,v 1.16 2015/03/28 12:28:53 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/musl/musl-9999.ebuild,v 1.17 2015/03/30 23:31:59 blueness Exp $
 
 EAPI=5
 
@@ -83,7 +83,7 @@ src_install() {
 	local sysroot
 	is_crosscompile && sysroot=/usr/${CTARGET}
 	local ldso=$(basename "${D}"${sysroot}/lib/ld-musl-*)
-	dosym /lib/${ldso} ${sysroot}/usr/bin/ldd
+	dosym ${sysroot}/lib/${ldso} ${sysroot}/usr/bin/ldd
 }
 
 pkg_postinst() {