Update multilib support in ustr with many thanks to Arfrever

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x2EDD52403B68AF47

3 files changed, 87 insertions, 15 deletions

diff --git a/dev-libs/ustr/ChangeLog b/dev-libs/ustr/ChangeLog
index 303bb1679edc..add80c4607b8 100644
--- a/dev-libs/ustr/ChangeLog
+++ b/dev-libs/ustr/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/ustr
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/ustr/ChangeLog,v 1.14 2014/05/30 13:59:12 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/ustr/ChangeLog,v 1.15 2014/06/02 19:17:53 swift Exp $
+
+*ustr-1.0.4-r5 (02 Jun 2014)
+
+  02 Jun 2014; Sven Vermeulen <swift@gentoo.org> +ustr-1.0.4-r5.ebuild:
+  Update multilib support in ustr with many thanks to Arfrever
 
 *ustr-1.0.4-r4 (30 May 2014)
 
diff --git a/dev-libs/ustr/Manifest b/dev-libs/ustr/Manifest
index 5246f492cf82..0dcabe88c8d4 100644
--- a/dev-libs/ustr/Manifest
+++ b/dev-libs/ustr/Manifest
@@ -6,22 +6,23 @@ EBUILD ustr-1.0.4-r1.ebuild 841 SHA256 b781ca91349934cf4122f8bee199eeba0101bec3e
 EBUILD ustr-1.0.4-r2.ebuild 929 SHA256 5ecbd4f09c933e92337affcc9718ce455af49ba18ce07ccf669823d676b9fc2d SHA512 9b4f6240845398fb5f3e5fb47c8b9197639d87913e8392433c59871ca1af026ee90325346908ebe69e0a4f9a69b0812d7b2efb1ac686f447b6f8686e2d84a5a3 WHIRLPOOL 1689332965a4e8a57b7d58be3e103f274c568a7a5b91def9ba935a1cfa16f01b46d4d8239298128b611b9e3dcc3e7d33ee080d1673a9f02d5e0d5d68ffdca794
 EBUILD ustr-1.0.4-r3.ebuild 966 SHA256 d7b4dc693c5b8ae07ff8d8ddce8171d419053028fe7acc913f874cd1d5fcb470 SHA512 0ff7062bfbeca7fa2744e460f8973f8efeacd1cb28e55ae5e11979b7c371ef42870abbfc2609b87bca244e91f9003beb74eebe97cbabd318294355965485c1d2 WHIRLPOOL 505d7597bc571894e599d56fe492db2037cf7440802eeec15cfe99ab0e5af22f606b81956e2a62d6d8e5ead2f2df465c81fd8bb1febb7294590ede7b5c22f531
 EBUILD ustr-1.0.4-r4.ebuild 1345 SHA256 2beafc73622b57d6e354e088841cb9e69bc352d26e73c08e21a53e254cb847fa SHA512 8e49949ae41fe52a2d9d8eb5f0c37487a7c324079faafbf88c07bd3686b73b8b750a3df22bf8aeb70251e3ecc30f6ec4d31d563871b5a6191ea093bffdeb6ec3 WHIRLPOOL 02ab3ba3d9c72fc7627cc96c0a111dfbd2b7f34aa0bc471d60f2c3c7018be2284b796733660b8248946081639d2ddcdccd52b4955024e43358381e12dbbb14dd
-MISC ChangeLog 2047 SHA256 d25272c2fa9014a5906e65bf24b225f43f685074ab62a131da8660de423de10f SHA512 cc9324235e7154ffe58a52700c75b753161de0be6e969a1e13aafc45cdd4b6d7b39bada055a9a45038dbe1d83af3aa3e89360e20d2471df2fb05befcf368e76e WHIRLPOOL 7230395c8bd9e98f0e97f1dcf023289f7362644fd5dc0fe34d79d7c2a2104e8ca8f8307a650422ec08831c35888acaf968674b5ce5f26adff7c6a1c0104605ec
+EBUILD ustr-1.0.4-r5.ebuild 1364 SHA256 57824f8974512996b3900fba9a6efd6a5ac539d893de29094a2e2431adf002e7 SHA512 23f46c2c169a22b69318eacc50725123b6756b70e30cc170a072319f4303bcd9cad771e21c1524c240aa3975a3d27942668664a1ebc44ea915092808e3b31cf1 WHIRLPOOL 9480d73f6fcafc3316b72c2a997486bc95331ab0c7fe2c5521b540f252024a635fac617ee091e6da6423146cc5a38910ce913cf1eb36dde510f6c2848b8f1410
+MISC ChangeLog 2213 SHA256 583d0fbb396187b353e75caa33380ea155e2a2df07e7f52cc0896e04c3c71df7 SHA512 95f84e3ab9a8980b1ee8f887be1b69dae5ea80669382293875a22b1eb4f7f400e82ef3aa48ccda3149bbd3ba91c08154565c92b9d07ef90413d7b7c15ab5fc83 WHIRLPOOL 9655c596bb601483a9cc8f679eb41ebecf41c102165c4393f3723b4d11635301306d14e550aada4f9a6993fb31e75838b1e13072419236792f4b13b7a76174c2
 MISC metadata.xml 315 SHA256 9e0543fd808dc0851421c81c0d96fed13d97cfc067448b003355d0c19d847824 SHA512 37bd08e283d18e0483e2591172657995369bcfe1b3d92e3973f67242f14d048ca0b078c9eec940457eda2f70c6cc3bfd4c3f23faa1cc7338eb5734ac7af7e3ca WHIRLPOOL b98db3a4028e05c0f48c216db94efe7794bd28d3d1634f292b2bdf8efef85ccf6dca7df91eef90aea608e3f07f2712355d33ab742af1d8b58ba5821276134fc3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTiI6YAAoJEC7dUkA7aK9HWyUP/R0rtLd7g3Gs0mXCrTAyPnXA
-+UgaTJEL2gVdzCGdWqlB7Q/Prf2kGzO4pQzRrcGT9wJg0aZszFE2RIbToPrIPDtH
-5r7aqBWqhrKgqDyvHiwFQW+IjEmNJvacgEhvXMUeQ5RCAmX9f0Yut/uFQdMrC20U
-Qc71ZMPYtITIJl7c6M9koG6VLepkzAHok8VuTLBtS626hNlcDLarjDS6s9YIRJoL
-SIQj2Z9KKPRNqiFE+61wtNIUVUd8h044rbPxjDD8U0LHi7iaLnyQoRq2nLNG2DxM
-xLcogU9HmLaMzExe/mv+vsbSZnGjeYfLwHHdiIegpF4KRc+bfLfnRmp7zAyb5D78
-5icKM3Wob62q/Lyp+O/PIcHLDVZ2ydUoOGweFlHz7+5RkDqbssqEptAn/LEvhYs1
-uceWtih0TxsjHOKMml3+HBk/BABvUoI2ecvzHQNGSHZyHX+ibRjqqu64oqtQBZkd
-unC+kxPrZ8LHRvcRjoI59TqikK38RXSeFD1XXZIuVSAfVsDjhoNkvRUZX5BKVoX9
-26ZNLEKfnQ6jCRGe1GxFxT7ddqJcRj+of/nDyHV6DUjn/UwJBau8ZJBuGxShc+uD
-qZwORT2JuYTEe7gbEElVz5+GdHXnF95TPwayz1BX0TrcLxvCPyadkWXiFXVY4123
-urx+m3UeAIRvtlNsFPp4
-=ywqb
+iQIcBAEBCAAGBQJTjM3GAAoJEC7dUkA7aK9H1uwP/RnpVv3K5Tl1ANHZzxLTzjsh
+uyN82SMi6DZSM/0gXXtZ3514OqkO0wWthugFoqh9eE7EGxuu0pUiUyxCgLCENtq9
+VD+fXbFMYok4lpIDmPvylcVg/aoBHnb1AD1LdnxhcFLFR/3ylL3HqX81ag7EtGGP
+d/QkuLUYokdJUBKPeNelBarPsnxJCkO4BN57qwwfQethaiIHlYLdF4/TLAP2y8DB
+2RoeOCSYq9EYSpXv1cVJmd5ULRVxk9hTMnQZZb457Sb9D7rEKPqa8wBi23OIVYIj
+VNwPWYmh7xd3UAkY++JMaNeGplUhbZPINX4xgNRMcZfCGsmihZBz+TQVVCSSCJlb
+IP1XumrxFhp1/OC9t13zLmxFnMw7vTXUM1MwtccjkaABWVaep7kd7sx4UDvYJs+t
+/NN6SRnw/lrWHcQobA10WLUUMns3OeursxtZxV06WS7h3UZxZlWLoTiCeF85GkLE
+EmqppNjSNDr1/aMNiLp9giG4o88N8bFysxV8/sgwA19NY5eebhNihubOH5O/ugpS
+75gjz0pcrLz2N12jw0ytBJxrtH+xm6FDxfnDT1S1YkMC3LunE4E9qhTab7MCTIqy
+bePoBwcDrWPdCkWYv56fnpT1PEcKEVNGBwq6oAW/J3yNcL5Rb71ROYg39NAhbOiM
+Sbety6YcDl6/OUY7IGcq
+=8PsK
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/ustr/ustr-1.0.4-r5.ebuild b/dev-libs/ustr/ustr-1.0.4-r5.ebuild
new file mode 100644
index 000000000000..ced3fed40aa0
--- /dev/null
+++ b/dev-libs/ustr/ustr-1.0.4-r5.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/ustr/ustr-1.0.4-r5.ebuild,v 1.1 2014/06/02 19:17:53 swift Exp $
+
+EAPI=5
+
+inherit toolchain-funcs multilib-minimal
+
+DESCRIPTION="Low-overhead managed string library for C"
+HOMEPAGE="http://www.and.org/ustr"
+SRC_URI="ftp://ftp.and.org/pub/james/ustr/${PV}/${P}.tar.bz2"
+
+LICENSE="|| ( BSD-2 MIT LGPL-2 )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~mips ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+DOCS=(ChangeLog README README-DEVELOPERS AUTHORS NEWS TODO)
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/ustr-conf.h
+	/usr/include/ustr-conf-debug.h
+)
+
+src_prepare() {
+	multilib_copy_sources
+}
+
+multilib_src_compile() {
+	emake \
+		AR="$(tc-getAR)" \
+		CC="$(tc-getCC)" \
+		CFLAGS="${CFLAGS}" \
+		LDFLAGS="${LDFLAGS}" \
+		prefix="${EPREFIX}/usr" \
+		SHRDIR="/usr/share/${P}" \
+		HIDE= \
+		all-shared
+}
+
+multilib_src_install() {
+	emake \
+		DESTDIR="${D}" \
+		prefix="${EPREFIX}/usr" \
+		libdir="${EPREFIX}/usr/$(get_libdir)" \
+		mandir="/usr/share/man" \
+		SHRDIR="/usr/share/${P}" \
+		DOCSHRDIR="/usr/share/doc/${PF}" \
+		HIDE= \
+		install
+}
+
+multilib_src_test() {
+	emake \
+		AR="$(tc-getAR)" \
+		CC="$(tc-getCC)" \
+		CFLAGS="${CFLAGS}" \
+		LDFLAGS="${LDFLAGS}" \
+		prefix="${EPREFIX}/usr" \
+		SHRDIR="/usr/share/${P}" \
+		HIDE= \
+		check
+}