install static libs for non-native ABIs as well wrt #497066

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xE73C35B3

3 files changed, 22 insertions, 28 deletions

diff --git a/dev-libs/angelscript/ChangeLog b/dev-libs/angelscript/ChangeLog
index 7877d5a789fe..56824aa87703 100644
--- a/dev-libs/angelscript/ChangeLog
+++ b/dev-libs/angelscript/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/angelscript
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/angelscript/ChangeLog,v 1.13 2014/01/04 22:49:31 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/angelscript/ChangeLog,v 1.14 2014/01/04 23:21:34 hasufell Exp $
+
+*angelscript-2.28.0-r1 (04 Jan 2014)
+
+  04 Jan 2014; Julian Ospald <hasufell@gentoo.org> -angelscript-2.28.0.ebuild,
+  +angelscript-2.28.0-r1.ebuild:
+  install static libs for non-native ABIs as well wrt #497066
 
   04 Jan 2014; Michał Górny <mgorny@gentoo.org> angelscript-2.26.3.ebuild,
   angelscript-2.27.0.ebuild, angelscript-2.27.1.ebuild,
diff --git a/dev-libs/angelscript/Manifest b/dev-libs/angelscript/Manifest
index f2bc4853aab2..eca61868699f 100644
--- a/dev-libs/angelscript/Manifest
+++ b/dev-libs/angelscript/Manifest
@@ -8,25 +8,17 @@ DIST angelscript_2.28.0.zip 1476511 SHA256 ff6ebce580ece45f1fa2a3dc9cece16540670
 EBUILD angelscript-2.26.3.ebuild 1378 SHA256 60f5461523186cb1a5ddca0b0d76de5f96fcd1b2504b654d5c9a0be105cfcfa0 SHA512 b67f161a4648d94c5773a2f6009c00d1fb656adf6a92d6e094d7f9503ef5059324a8082547346aff80c6d522aab59103531809ed3564ac3cdb453767bf2bd932 WHIRLPOOL c25e2eaf6ae941dd696a6c8669e6a7b0fb7417f997953cd443d9fd37588ad6371599e218f48b7914ddbbbf8abe30d576d0642940ce366b24130dcfd437eafcdb
 EBUILD angelscript-2.27.0.ebuild 1378 SHA256 21bb46f958b7a696918f0d02e56c282b11ec589ec294c75f2bf35c8b3c8cd6ab SHA512 467488bad253716ea6d373ce127b20dabcd6b8ba2e44e6975b1cadd05d03fd0cea126569cec8372c2537019ed3ca272e9c625fc5554988450b3429fa1622ac0f WHIRLPOOL b13c04fc888f38274a2fcd0e0529285695ca6b1df99477d241d282aa1d086bafd5c88b1ec3bbfcdae73a65136ea423f2d538b646583a336a10c9983ade4cd4d1
 EBUILD angelscript-2.27.1.ebuild 1378 SHA256 8948d93f432163a3a431119b2c83db51ab7b2e76821ba9afbe4116bc9a4bc0e8 SHA512 39d1dc2132c65f520ef3c7d55c43920749b254c9cdfe11dc36ee804f31651862b7faed2f6c4105cabcf827327f7994e9a7f88e9d3c62c35b55a7b623da1e5bae WHIRLPOOL e6847a14265c9d2e3f5b17f92bdb862f246726f8441874c7c44e2e95b5aa4853bc5652acadc0128bda55cb2ecd587710003357424c00c489182235a40b5d6429
-EBUILD angelscript-2.28.0.ebuild 1378 SHA256 de367638a17ff8c1caff9fcb89318e231959ccdaf5b499a86cd7437b856bee8f SHA512 6b8b6e8472c89fecf0069d1703edcc9f2bb8080ee816c037b9676f1f36146b9ebfc2ed79065fab2a65c6414c1110d74c5c729379029266b815c1ae9d8a0b4737 WHIRLPOOL 404a639e514562ad38657a704998021fc38bb52729152874514a6c7213b929fa1b8c35fc2b50d5be14fb64d39481ec99925daac51365a25482fbea49c245af2e
-MISC ChangeLog 2523 SHA256 699a800a2f657f681710c7cb7ecf6487c47484389e57cde69b41fabecd2079a9 SHA512 e10eaea96ce9de8070d59100e05e4df2238ad8d3e3b5e76d636937b6268fa393ebae002c7797db2e074dfd7c7167289a542e5d190d1593d51154c24138fa9e21 WHIRLPOOL 000f254a5bbecf44bf276cc3caa51518610c5a7c6154a75f93daecc98a4adb59fd675ceda2d378ea664ac0fcc4627b8856f95f38345c9d9bfd1c0c9b5054e7d6
+EBUILD angelscript-2.28.0-r1.ebuild 1282 SHA256 a433b2df2c11cdf214632b0a3356619e2b0b351e243843e54acc26d1b3a3ed1e SHA512 511dd5392266897f58f2e1b51d2566b398e0cea9e9e5147b4bff0268dc2099df02b296f033e752f461ab4b9fc8e6e5fdde8f5e0bca823c03dc8d03706a2a0add WHIRLPOOL 1f6930ba065fa220eed74b659b879302798b7bc698752b421378f451a5ac23a374830a98b4500d21c1e257b047869b68eba3c35a96ea3c644d38d05454a216ae
+MISC ChangeLog 2738 SHA256 85413d2680d1a4905cda67d685d6197a8ed38e7a586c51437208d79acd2ec121 SHA512 fe89b34660829554374a9185c63acb5d9bff216c748d1979153f430f032c1dc78a5413398c701432b40cdbe2ce7f2c2030082b7d08b94a7e13e542dcb0f5ab8a WHIRLPOOL ccc1e63a93ca6424f73e0eb8bc1e6642c262e2618f1350bbe835f535d94d25ac78bfef775db779b99fe79431da9fba7ed3f0f17b0e605d7509ae4abd72d4ab82
 MISC metadata.xml 235 SHA256 11ffaf6c7e9d3f8dbb48fb60cd443d87b61015bc3197206ca230f5c2b0c1e013 SHA512 8ff2114c96567a53f83cd07149d1530286182f54b3d1286b9ceccea41e85734be19d0f60876c73880d76baac48e698de91114bfda459e2ee6ade9c3237847133 WHIRLPOOL bd4bb26791fe245f1c2407aa690887524eef3e76de87b4f2b7049f436661ee78a669e4fe4415e227aa50ee404bbfbaf1822fa648792919f93cb3674fa0f55858
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQJ8BAEBCABmBQJSyI/9XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOtOkP/ilCmCjixctvsnhkEqe00GAc
-t8eNQNebFqzJpoCFzy5jT9Qs0BLtC9q52OfeAOHKTJ66JA+9VKaMftZ0WCxS55iX
-DSKEgv2OT4t19+ITako5HN/Qh24TNIoSCcO4w591FaOYNE49qV+WBxw0953dE5Lv
-TeXJTc//1NwbvGQ8ZpLqejvzwwWHhg02xcW71qOYyrVSnEdxSlY5a4AJvqs+irYH
-mvS9BEgThpXsr58fX3r6ehYsmi3PUh9HQEOd4PIIdKtsQ8XXBFF1ERzpHJc6t7rX
-sXtstGGe+XsJ/ESn5s9oxaTKEv9qxd7Zpk5eYvRmHy+q6wOwiLOyPaHxNv/zOlT9
-8c1Cgovibwqbf1jqqE4N6x/tKI/GOIfCJrXbdTS1CBRAOkA0TT4/G0+W61HKLjcX
-z6zoVAdy+tPaRiA+xWPNwFpVE1Mof6bOqfZC+tpysADRbeJvy7xGHdJHDyfGkgMk
-toytdFlqBNZzKBpg0ZFJi03Qaps3DPgtndB8/QDnBq22lWIBv8x8YBS57m0QkuYQ
-4BugAw5Wzon6Wy+apeWfOoTS53RccqlKrpURynr4xbB5+Hcb6DesARwJK/R1HmpL
-OwZ04qTZ4vMpb0T90Q/iVNSkIiTMO5JsZNB4kWelpDV0jcjqorURPKMXE5JRaKpo
-VtcR4SJSPnlO2bTzlbDz
-=0HkB
+iQEcBAEBCAAGBQJSyJeBAAoJEFpvPKfnPDWzTRoIAKJrRId0GTETupkr+wCDwiRp
+pBgQvQmDhcLYlOB0E5ozzYJNNFbtlQVGOovlsEUcPDbJbgfxLX8a4c/kt0SiPq96
+DIyfu2Xr9DLw7zroB/AqecEYBXY4Ksxm+bxCs1vMvxyr1eYcPPb0lbuiyaVtRVYw
+ECu8DwKlR8vJZ0elOJJLmJBloXKFU/txibUvfQRGphDC0nDTZTU1ksTGbkPgR4BI
+gfnKqqJgtiMNHzWy3u3DvnOieuA0PL6yYVYPPKvSiy8tZgjE1D8Vg5+x87jQ6w8+
+WGVBUUZKdm+0MmOYX0c7xJsCgzIEizjZ+wKckMONQhB7hVesPXf6i7cQHuyi/jM=
+=tVwh
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/angelscript/angelscript-2.28.0.ebuild b/dev-libs/angelscript/angelscript-2.28.0-r1.ebuild
index 18a25de69634..5aced660b900 100644
--- a/dev-libs/angelscript/angelscript-2.28.0.ebuild
+++ b/dev-libs/angelscript/angelscript-2.28.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/angelscript/angelscript-2.28.0.ebuild,v 1.3 2014/01/04 22:49:31 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/angelscript/angelscript-2.28.0-r1.ebuild,v 1.1 2014/01/04 23:21:34 hasufell Exp $
 
 EAPI=5
 
@@ -35,11 +35,9 @@ multilib_src_compile() {
 	einfo "Shared build"
 	emake -C ${PN}/projects/gnuc SHARED=1 VERSION=${PV}
 
-	if multilib_build_binaries ; then
-		if use static-libs ; then
-			einfo "Static build"
-			emake -C "${S2}"/${PN}/projects/gnuc
-		fi
+	if use static-libs ; then
+		einfo "Static build"
+		emake -C ${PN}/projects/gnuc
 	fi
 }
 
@@ -48,10 +46,8 @@ multilib_src_install() {
 	dolib.so ${PN}/lib/libangelscript-${PV}.so
 	dosym libangelscript-${PV}.so /usr/$(get_libdir)/libangelscript.so
 
-	if multilib_build_binaries ; then
-		if use static-libs ; then
-			 dolib.a "${S2}"/${PN}/lib/libangelscript.a
-		fi
+	if use static-libs ; then
+		 dolib.a ${PN}/lib/libangelscript.a
 	fi
 }