From 93ce21b3a569759e662496ba85c8ebe3b94934f0 Mon Sep 17 00:00:00 2001
From: "Anthony G. Basile" <blueness@gentoo.org>
Date: Sat, 21 Mar 2015 16:42:32 +0000
Subject: [PATCH] Version bump.  Add sym link for ldd.

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0xF52D4BBA
---
 sys-libs/musl/ChangeLog         |   7 ++-
 sys-libs/musl/Manifest          |  30 +++++-----
 sys-libs/musl/musl-1.1.7.ebuild | 103 ++++++++++++++++++++++++++++++++
 3 files changed, 125 insertions(+), 15 deletions(-)
 create mode 100644 sys-libs/musl/musl-1.1.7.ebuild

diff --git a/sys-libs/musl/ChangeLog b/sys-libs/musl/ChangeLog
index 5f185d285f4b..e6fa5ae5dd11 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.43 2015/03/07 21:08:24 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/musl/ChangeLog,v 1.44 2015/03/21 16:42:19 blueness Exp $
+
+*musl-1.1.7 (21 Mar 2015)
+
+  21 Mar 2015; Anthony G. Basile <blueness@gentoo.org> +musl-1.1.7.ebuild:
+  Version bump.  Add sym link for ldd.
 
   07 Mar 2015; Anthony G. Basile <blueness@gentoo.org> musl-9999.ebuild:
   Provide a sym link to ld.so for ldd.  Bug #542026.
diff --git a/sys-libs/musl/Manifest b/sys-libs/musl/Manifest
index 7f5f90b3b955..913f7a165b11 100644
--- a/sys-libs/musl/Manifest
+++ b/sys-libs/musl/Manifest
@@ -3,25 +3,27 @@ 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
 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.ebuild 2391 SHA256 079c7cc0eed73846bf636cd89fbcf7859e950495b15e6e39dcfb46431205a0b4 SHA512 f71d9bc62c9b2ff401ebe4043b8401fcbdf11855014b066f1954d8bef2a9a56055613147e7bc285ba89b393f32fbfd7d3646bc39ce2be97900495cd1446e616c WHIRLPOOL 7dc138af9f1845dc47b5eb666d367f9cd5d377d06dea0519c2c5dc258a05755d6376711f76c70854f44ddfde75b918385f96ba8e96abdfe9600a86c4cb18373c
 EBUILD musl-9999.ebuild 2391 SHA256 d54d2bbd9d0238c70fa4d3819e9ea0f0e901b587921c669768718010042912ec SHA512 caf5b2b62e9437195a2ecf597422bed9e062e892d6328c0e057a2ce9430b436702ccb8552cd753f892a612d8fc99aec93123c101b90b2bf0742b2af0162a671c WHIRLPOOL 46efd92b6d8f6220d9f016f1ee76bd4ced3ced36b45ff65a2be398b968c70c1a05bf68b6a8547a348c456c072f32dcd57fb6014982657207c6a0789a93566413
-MISC ChangeLog 6057 SHA256 31a6b93ddb49bc99221e87138bb2caa3622d94d32ae5e5ceba144dd21c1923ca SHA512 9601faa344206f265f83416cdc0f42b6f308e4cbdf2d208becb75aadca334f7d434e4fa9c28d18c7266a5ab33f0f3aa7a8d380e8acb843fb20b067903db56553 WHIRLPOOL ba37fd65b0415992f7c76ca98fb8228db3e6ea19b75f00d1c6d3cae14d8b06ed5b5acbc0e6acf342e820f4038dd9d292331af10f2f59fcb84bd8b60b87645796
+MISC ChangeLog 6199 SHA256 d7fc62bede93376ed3364101721c097c1048e31d6aca0a05c87c38bb5f2ecb78 SHA512 0ba3e66f2057b4b6aa1dfe146de22b9e7ba7364938f0e55c6b407f8e100fcb32211ef96a7e96df3ed6f754fa6c40266f30d4de5cd4149caf367015467f812643 WHIRLPOOL 2753768f583d7e17ff30f79065309aa92e2bfa61ebf73918635b1fbb92aee306cc3572593927e2f8afa209ba88688f3074a0c42f5434d7fee0f513d0d759a940
 MISC metadata.xml 327 SHA256 fd917b3ad115fac11699c82ff087e97c323fe2327f77813c9a2b9cfc27e45042 SHA512 b58ed48ee5332d6e91dfb58faad0a0fecd4b8da27b0edf6c1809a7338764e629eb5c12feb09fae80443b486af27af0d0f2e6ceeb4fc605e6d04b31c1041b3127 WHIRLPOOL 4941c5da58f683ff0a83fdc83017a8fd9a1bbb02fa1b5ea47302ebe7f7d324c0820088acb1eb32263fdb9b4120bc93f24997515bc30515b90055b48d167fd56a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJU+2lUAAoJEJOE+m71LUu6HlQQAI09brRZMcJ7wEFGsA3KMfWz
-/6ylqgvZKz6aKExEkuejuoyPA72MHbwpYAReRsYgBSrcsn1Ty5MFRZnQRV897Cjw
-edWv7eCLw23NhIBcoeMsDvk+kkxTHqGyLe0R8mR771UdUh+Llv8AhcSvmfwUlHJ/
-Zsr1XPNKyMVm5tml+0DQa0Zn5wR/WYuoblHPqpDKHBObi0d/Npia0ddN5aonC0tb
-U6WGeqPtW1WHVpOn6IpxvRi2GGiktQt45OIoZzd5GaQdRdXP8hnWARPlxts+zXKU
-0kaQmZPW4VSsGJko/BTuH/AzNDWWPy4G4QMYh3jU58LgKns68hLVlOkjrNY+ajpl
-qpjqwMh7o4ZpyVMRcefEJMFBFWPVcNcu2Qe0S3tAthioTsZDlayoAucvkOJTJHQQ
-Pv5gl0iNAlNNTCM8EdgNXc1ajOmqwwifZgqeIH7FPm/ZePKYxYuqBr1IGO65iwNH
-sqh1OxR0Gx7S/ieslYTaMfbMeXayqLaFatHJVMLX7gTSep+v3a18H5X6UYk0gz0o
-cFTFIxf5xDny83P8cqCfC21NfSiI5M0sa7vqCMwILATDJSzSkX4/rT17pm7ZyTYP
-gqBuK3jQlhiS5TRVqqCMCw67HQ39jdA9Mh78HUftc6ArlWcZwdLsoWQWb7xKep+5
-f3nIpQHQ7SNeSKJzeTQZ
-=aOuo
+iQIcBAEBCAAGBQJVDZ/KAAoJEJOE+m71LUu6R/oP/3Rp0bFQUH0zgOcAgrbmIGh+
+2EAFaA8WP0rCspKheN3G4jf1BjMSzxMWPXmP+3uMnL/Qwa8Sb/q7fQD2dtHNuWgv
+AoipKjA0fKcp52kCHJkrsmcufRb46eYqVIcNOaGMmZlqlthnZ0YTkcLhlDcAKfxB
+g9/UDT0fF8Z+uJSbCgQ5ELCCJ1f6fiBB29eq0TewXFmiMGxE9db7Jh8oGVL+PXsn
+uqp4WDlUiCOEd3Mn4K+PUspoR0RDKkMx4jaVAI2wZsuxQ2EcsEe48qkw3rZS5pQ3
+Hz5Pwhm23g9psc3K3ztqWewG6qY+6ScTz3BG8fqFTViIhICmZtY/mYZdj6GSn5/d
+AHWNrc5jOVpjzW5CUoMuw/SJV1SHtjpmeFQ1p0D0mklXpw+igs3A1Oj2nbgmgAWX
+a0CAsAwkWljdxGXm3+AxV5h53v7KjnVPLWZk3wcVAQWgP63v0Qoe3nrssIUF4Tr1
+FQUfg6VQ340ELyH0nucGv1/Mx7PUQqero/lWZXEViLyegc7MAkSlPmmNXAJofVcw
+VYWv/xXEbhXujFjf8CYcw28Wh+HNUBbqEvJ7ahin3YZq5Ir/zdVgaudzXM2KInmU
+YiiWXnXMS3UYA8NyTk8e3f0EMeSb8VyjlNTzdcY1dT0AHocwpzAk+T5ICFaSIZgh
+EUmfHZbNR0M32bHcZzVv
+=bKn5
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/musl/musl-1.1.7.ebuild b/sys-libs/musl/musl-1.1.7.ebuild
new file mode 100644
index 000000000000..cbfa7dc37229
--- /dev/null
+++ b/sys-libs/musl/musl-1.1.7.ebuild
@@ -0,0 +1,103 @@
+# 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.7.ebuild,v 1.1 2015/03/21 16:42:19 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
+
+	./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
+
+	# musl provides ldd via a sym link to its ld.so
+	local ldso=$(basename ${D}/lib/ld-musl-*)
+	dosym /lib/${ldso} /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
+}
-- 
2.26.2