Version bump

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

3 files changed, 119 insertions, 15 deletions

diff --git a/sys-libs/musl/ChangeLog b/sys-libs/musl/ChangeLog
index cb5a048ffc68..253cf4665ffa 100644
--- a/sys-libs/musl/ChangeLog
+++ b/sys-libs/musl/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-libs/musl
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/musl/ChangeLog,v 1.33 2014/10/12 17:19:54 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/musl/ChangeLog,v 1.34 2014/10/17 00:19:04 blueness Exp $
+
+*musl-1.1.5 (17 Oct 2014)
+
+  17 Oct 2014; Anthony G. Basile <blueness@gentoo.org> +musl-1.1.5.ebuild:
+  Version bump
 
 *musl-1.1.4-r1 (12 Oct 2014)
 
diff --git a/sys-libs/musl/Manifest b/sys-libs/musl/Manifest
index 3941d2780be4..622c0c4b1265 100644
--- a/sys-libs/musl/Manifest
+++ b/sys-libs/musl/Manifest
@@ -2,25 +2,27 @@
 Hash: SHA256
 
 DIST musl-1.1.4.tar.gz 866376 SHA256 658c65ad3c3a9b281a96c5281e75720c758d91fcaae35ab987f2fdfb4f88f5cd SHA512 a46fb1db23f518beaa959e9bebcb3bf0574e583c197792d30dcd52b3974e3c285594984207043d317859fc5552f1d303a5686e9fbe3b8825df6346de7f917f9f WHIRLPOOL d8744a7e10c905c5100f754a1905f06ea6fdae2745156c14bfa782339c153086839bc937545d828a5ed9d3284565c030440550a2a2b3c7bc3bb71b2eee15ec47
+DIST musl-1.1.5.tar.gz 872924 SHA256 352362b1724cc9740f4c3ce0fe02aae45e4de9809ea4ac961f31aedc11b87393 SHA512 4436887367137cbfc6d34e0f403b8dd36db2a55a5160681fef4de7cc0cb1be38487ea708e6aa6dc1328b61c62868b6cc19f099649c9d12e1ba812dfa8844b772 WHIRLPOOL 4ba2f2e0b5e81faeb55472cef32fd2780bca5b94210bc4608872f7a323d918339e1705384576d89a78c9b620692b3f7cd877eb8fa6c15086430b0f640beee3ba
 EBUILD musl-1.1.4-r1.ebuild 2260 SHA256 0b87092fff66c9a71540b5d26a0be6f8740e72bf07ad92ace8324408d37597c6 SHA512 8bc672b2199645904130b1c19282a3735d4a1f1376d22991eb8e51e9b459ec8d9fee886799dd07c851c3d3f63dc9daeebb776518d6aae16b733ade4011c11194 WHIRLPOOL 08a4ca91089d786ab169039ad69b0f6c0bbd5294f7be4c2c28ed7f7d11a433196b8847c6e19fe6db006a48c79a49e7750474b0d4318195d2f9473b039a868cca
 EBUILD musl-1.1.4.ebuild 2443 SHA256 708d503a4f91d5ab015441412ef776973ae994cd456f21aa658be8ba7d4576f3 SHA512 08b8308f50db6b022f143b8c83035d24009481b83eb4c98c18fd7a4be6a28721b9a494c20d0e148cd5a206f726d4fca7de6f0035b1ad0e08074a4e19522eaaba WHIRLPOOL d31d0e304e1ff6397b571f8ccdd62f55c965f7f5c25c0de97cecaa39e74e2435a145880f11713bbb6a5a3d1b568575a011d4a74f98c12f526b116d7e18957db1
+EBUILD musl-1.1.5.ebuild 2257 SHA256 04bac27df6c15facd4ecbaf9eb22eac13a98fb16da0bf56fd36f385d8c0b25f0 SHA512 35d7b55cc4fdb73889d20e3964e3d1b6d2944129cb8beed1fde27d5eb68855bafc2d3c436902b83e017978b126248fef14472e716c4bb683013d47574aaef898 WHIRLPOOL 61fbe603f60be6e12f95bbda228aaa21d3dff78baa625e8505572494850aaeeb2ecf50ec168802a88eaa1b122d7deeb1e80754d08ed418753b5bbe9b5b2ebe41
 EBUILD musl-9999.ebuild 2257 SHA256 6d188da7de7dc2faf614c37ce702ffae0b5a7f6f053844aeeed5281ba216cf0f SHA512 f12ca18f1dc75bbe54430cb75973b3cbe4737d41db166cc06fa8e58264ee74d3dfe2407379d5e1dea4d5f3f8f2b13c907dcfbe39c1d1dd9e1a8f0ece533aaf1c WHIRLPOOL 4d48be2a0e311699156d8cb68862132c319b400b812d31b51ca2be392c5d62242e60563ca03d10e1fe58f8995b2c62bd2ec766dac66ac585b4ab11f4b7fc0717
-MISC ChangeLog 4855 SHA256 eb217287d0e22ae2f138ea7c56becf19bcef7f78e3c3527507ae2542d160a332 SHA512 31dcd51ff9c985d5d0c0853a433dc22c06609e9dc964892efd0e52b0a2c10fb8c855d488a0e0e60bb32afd0a0d9cf9792b5b0e50400148e345437215d5a9449f WHIRLPOOL d4be25f2ad81d072a8c0a650167d1f0ce350bce93d871dff8ca20c0097aaec3a0fadd311c5043e7b5ad13a694dea249228b32dc057f04e97a4519454cc07721d
+MISC ChangeLog 4973 SHA256 eb3867d45b75d8d47d38534dac08d623b73408da008eae3f6d0c4c1e21715683 SHA512 d77aba4cde08e8b392cdb88e564af0ee187a5e18c91ecad60bf0e3db5a2d977fde21dd59ef7451109c5270eb3025270b0db40332a6d588add76fa34687ef2b54 WHIRLPOOL fc5123fa7a57eeb823e483fae9d1501a1e70e0201d5c6981c850b0aef61aaa38fee3d885fb5db1f7756f5a464dd895a3b9abb561ab4783a8e3c75131dd90cd47
 MISC metadata.xml 327 SHA256 fd917b3ad115fac11699c82ff087e97c323fe2327f77813c9a2b9cfc27e45042 SHA512 b58ed48ee5332d6e91dfb58faad0a0fecd4b8da27b0edf6c1809a7338764e629eb5c12feb09fae80443b486af27af0d0f2e6ceeb4fc605e6d04b31c1041b3127 WHIRLPOOL 4941c5da58f683ff0a83fdc83017a8fd9a1bbb02fa1b5ea47302ebe7f7d324c0820088acb1eb32263fdb9b4120bc93f24997515bc30515b90055b48d167fd56a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUOrh2AAoJEJOE+m71LUu6v8AP/RvzRh+Qoe9xVqv3cq0Drvpt
-rHWVvFtzT50J/lkiBRkCjy9fNQzNGE/t0voy8PxTW761bfX6srbg12szEHRJ6a3P
-2DQdRdGWp28JNgTYV21ha+JRHEU94eg+hvJP59WXB1kIu9DZaADo/5I7ths1SeSC
-zFL0iMX7c3Ixn5AWFGgfsntC70W1UpsW9N7+s2tJuoiwgWvXEkCTKKdjRfYCodtI
-U2PWrqgMGFHTHW1fOVKycLd5iTfysoWw5wvNfaaBe4xLmHBkLdGy1RdSownS4SN3
-QXwoGuit/AqmTg0dQwU186PNhOSUre4yyFkrlSi4amd5SLhU2tP3Mw4gm6aTQ++o
-tLbJl2Wpz311ObaFyuGY4xp6EBnvrJD7jbibOCTjvDLLu4QLirzrTP0WuP4+SCjE
-NX6ODC/HT1GUlXqtVAI6hkSQ5mOufdZKtdAspkKA42XBVECwtLhAsjh4oZCltMaY
-QOlQXsPjprGyHCINB2P6+e3AeQZ3wI8Ynog5tPSL22X+bL/1avCVTZdIz7TAB+bj
-uhqYe+bo4xtl4K0drUodr6YXOiEPYGGnjcsFmd4Tpj0l+X05kol2w7KLw9uKPAxL
-6aRn1H8m/ot+2EzAUrfP7JvmZyfbun4BShA/7mYWEhtuCZN6jI2+kcwSuT+2aCG2
-3+cd6o9Y5Ig9BWksSZzb
-=xHNx
+iQIcBAEBCAAGBQJUQGDAAAoJEJOE+m71LUu6MM8QAJ2fxNMrFk3G6ClNbrs8bUlc
+3XCyvOnkSEmscXRICgXuUyUtpdjK5KlPYJzOnIbi5xmbcjK+FRq/KKXKbRA8dhzI
+L1D7KwNQOxfTQbVzgESsHqIRSJzUJu+1MN9XYhpErJ5Cnjj/W2FicoLJOU7vXSlJ
+fwBIuQwThN0gAon+5jUOAYZhTu+w7s+BotGZX8locpm+CkZCPRjQgKNbLrDKoHKi
+oqrn/ta2K/KPVxs7JaRwe9z3DaZa70DJNaBzzJ7ue3TRSMmZ/K8YVNNyctJ0tER/
+OiMbisxZiNi1J3F8zS6zpzLvdr99l5R/bbLVp/v336kLVw9mAIy4HV8ZOW1zF381
+Qn2+RUmRjCflhzspijH5k5nA/HrTJqZnM11UBMOrC7KdFgLUBHaEPj4iu14s/F3g
+nprYe1KO0MTNd8hL/crCYWaQHe8XIZoagxuENf55jGsfRgQwlV3MsrV1lSP6I40x
+rbWU8KoG3jUSIrQ7Df2F9AiRPeFZLxuvV1rf+7C1SPbypHq5S3YEpXn3lBWmF219
+oywZqZUC2juDJ/Hz1IBd7Zp6CHQBb6e37J2GUHmTw85agJ+vcFmb6+9gjquZJjl/
+KZkcYbQjO7nsrYMLDq4v4CYaK1cmDddPDGd8YwU721KOwIj6DcT2gRA4xFEZQJmd
+4y0GJp+L7X23HZZnHEc5
+=Yr7F
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/musl/musl-1.1.5.ebuild b/sys-libs/musl/musl-1.1.5.ebuild
new file mode 100644
index 000000000000..8db5a2826646
--- /dev/null
+++ b/sys-libs/musl/musl-1.1.5.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/musl/musl-1.1.5.ebuild,v 1.1 2014/10/17 00:19:04 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-} != ${CATEGORY} ]] ; 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 ~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
+}
+
+src_configure() {
+	tc-getCC ${CTARGET}
+	just_headers && export CC=true
+
+	./configure \
+		--target="${CTARGET}" \
+		--prefix="/usr" \
+		--disable-gcc-wrapper
+}
+
+src_compile() {
+	emake include/bits/alltypes.h || die
+	just_headers && return 0
+
+	emake || die
+}
+
+src_install() {
+	local sysroot=${D}
+	is_crosscompile && sysroot+="/usr/${CTARGET}"
+
+	local target="install"
+	just_headers && target="install-headers"
+	emake DESTDIR="${sysroot}" ${target} || die
+
+	# Make sure we install the sys-include symlink so that when
+	# we build a 2nd stage cross-compiler, gcc finds the target
+	# system headers correctly.  See gcc/doc/gccinstall.info
+	if is_crosscompile ; then
+		dosym usr/include /usr/${CTARGET}/sys-include
+	fi
+}
+
+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
+}