Use tc-is-static-only rather than open coding the mint target.

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

5 files changed, 28 insertions, 30 deletions

diff --git a/dev-libs/apr/ChangeLog b/dev-libs/apr/ChangeLog
index b54953ceca47..f4e0380cf212 100644
--- a/dev-libs/apr/ChangeLog
+++ b/dev-libs/apr/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/apr
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr/ChangeLog,v 1.207 2014/01/22 22:37:09 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr/ChangeLog,v 1.208 2014/01/31 07:56:49 vapier Exp $
+
+  31 Jan 2014; Mike Frysinger <vapier@gentoo.org> apr-1.4.8-r1.ebuild,
+  apr-1.5.0-r1.ebuild, apr-1.5.0.ebuild:
+  Use tc-is-static-only rather than open coding the mint target.
 
   22 Jan 2014; Mike Frysinger <vapier@gentoo.org> apr-1.5.0-r1.ebuild:
   Drop old static-libs hacks now that we use local libtool #374355#16 by Rafał
diff --git a/dev-libs/apr/Manifest b/dev-libs/apr/Manifest
index 958b170c683e..76a44bfce2ed 100644
--- a/dev-libs/apr/Manifest
+++ b/dev-libs/apr/Manifest
@@ -8,25 +8,25 @@ AUX apr-1.5.0-mint.patch 872 SHA256 6ed43adba05db07f061d98f73c19aac0df3d9c0aafd8
 AUX config.layout.patch 818 SHA256 eeacaf654f23084e842bff02b97c083a8da5b5c056fd086166ba2d250edf3181 SHA512 4ff9a98c2a799c714d3b4c2cb42dd9c1cd6aa52b465570939710c0ac5800ea8806a9c38500d83b09a2bf61984d57c53ae934886d9f25e3111d721ef282a7d91e WHIRLPOOL a03f7e889a416ada14c62ca99727e2c8cba403972785c7d2282c1c914abe9c38a94b98489ec840b3c1e2cfc2af87ee08ac724d0434e8198596f7d2b44907d3db
 DIST apr-1.4.8.tar.bz2 772927 SHA256 61b8d2f8d321c6365ee3d71d0bb41f3a89c44da6124cc5b407a3b8319d660421 SHA512 48483647fd958cae6b27672cfe10d3905fd2d4280b686a64deb5e166c239aa7d9838d61a199b5db836c47e63acebee9fa95804d60543cb581fef87bcc150c15b WHIRLPOOL c0e3e17470970734cd36b1b72837b3ed39e0488ef4291eb3a3f9482dffabb72aab85b4d9a8482d9c4cc3a66ce530bd81e8076b98e1fa10b086089266fa9b2f0a
 DIST apr-1.5.0.tar.bz2 813976 SHA256 17287d36a5917e27281e60d47e7b147bd5ddcd1ca832702c2318f5e0724f1221 SHA512 d54d995a67fe13a619d4781cbfcfae07679d15defa49634ee472c6a93f9521f7964e6e3e366188f1817c01a8fdb98b4ff042e56d8bd9bc379683d6c4ccff2a3e WHIRLPOOL 083da7589f85fb2212b4ced33004ee30848a40cf4718de36a21dfcba15b794dc9b57a9324cdd400e2df74564f9ad27899119de55075f1e0285415471b47f90e7
-EBUILD apr-1.4.8-r1.ebuild 3438 SHA256 b62a9787c5108fbbd88e2e76ca6e746bfff3ef51b8bf31c788ea609ebbe02ba9 SHA512 51f19448bd1fecbefea598536a96c1c21324de4c3d05420e19529e05f2a3e503ed12fc9253d04407ff3fe2bc5bffcfb5f545bc28b2353e48dae598d67f7e166b WHIRLPOOL 1ba0a1888e213ffc16c0fcae49e20e72bed70a3c1ec3e3028676f5dd214532ea05ab6ef018ca55b2ad75249943ddcf01d236012cf5ce70886136c893cc1935db
-EBUILD apr-1.5.0-r1.ebuild 3426 SHA256 b72ffb43b67703ceded8fe24bf36f4fce025f1c8df96b4ecbdb56b569580e94e SHA512 8af69b30de6d6496277b8ed80bd536792190fa7c2504643160bf6cf7fce52ce84a03b1370cd98c90af943d525f18be967e58798f82304b2006467db3328d7dd4 WHIRLPOOL 09aa22ef7356468556ff062f2845defd2e24f7456a628705d78edb3fed4820e30bebf273631365c0bd09beb682336985b319a0eb2d698b7804597105c66ea557
-EBUILD apr-1.5.0.ebuild 3445 SHA256 871d4eab5eb371f8991fc99176599967186bcaf6f15a3d0ef0b341632de704ff SHA512 bf47a226f449cc4b74de3ad59b20adfa2e5823ff70497cef0ce73f0a643b377acdc8ac57b29c766b24d3b0a8ac0b29c78f50387dd80b02659e604b6ac3952ea5 WHIRLPOOL cf063dc0e06b3718641b7df718b6e52836cfac542ed490831ca0b841bcc2be9b75f1f2ba873d94ed4e9e24e873c74538c49e81166b983f2246b1e1d0dea06367
-MISC ChangeLog 24992 SHA256 7b449fcbc0879378867fbe62b4b4574d1de10c66f55c7caf8f8023faaaee19c6 SHA512 c08701862121744f8dbb583bfaf9b2314004d3cec37022877caf6d7a528f1de40e73958ad287fde9cc03870ab336a3c526823e8dea1093ad9c8612e5df6872fc WHIRLPOOL ba30774bf2016957712bf530e45a923b68768fae3531a1b9421d982ccce16e533d585b7e6571133411b928f32cc6654f1032fd1e547a0d92e97993b53396effa
+EBUILD apr-1.4.8-r1.ebuild 3417 SHA256 06afd8295f29d7a0285576aad9687ca45d01b5478899725e30f8ef9609540f28 SHA512 7ea40b63b8d60f7c96aa544fa47fe3f15e2cd5570f033b08bda6cd7641432e7d0358732b4c5b59377ce8b57605bb6baeb58df2bd245ccf419427fc9cccf1cd69 WHIRLPOOL 53b22aef7dcb750a2f22d93e19861ffe4231def201e86f415ff41311263178c9523fb0b044344c628f4234bd1a6f4d4fada4b92861e1bf02cd2310a5f8aa366f
+EBUILD apr-1.5.0-r1.ebuild 3405 SHA256 232a106b2f2c28c6a7f2df15fc47eb7baecccfa31c9ecdb8ad747c50f303f3a8 SHA512 bc62e7dd4eb8b178e7f2c02ce25057d049d28ab8a9eb99a66efb393bfc5fb1bc0c2f3d6a575747e13f4190ee266f3c6418c9eb074e2288bd4146625d170b55c2 WHIRLPOOL 067fca4921bf8dac76ac1ebbf079cfd8fe234421ecab0c1ba84e4f7406f1945cc5df5c19dc3ddbfb312f091a75168141fef09eae0ea0b0d13f2fd6e92a6ba2e3
+EBUILD apr-1.5.0.ebuild 3424 SHA256 c1674b0d3cb6e63e4f5722b7d0bfab44d6417077ea52a6927a522b77bbcff5c5 SHA512 c189bd56a038ee363214645db7714bd4f2814698b42570990515fb2bcd54d631d60b71f9deeebf72cc7a718421fb19e2d51eebf101c528033c95b420f074b215 WHIRLPOOL 69584d129b35e95ee09c18ab65d23cb57bea856fb5f03cd226b09adfa803ebe922751639bccdd8face272cbec69a010c44eed24a77e3f8e13b802eed5f415a0e
+MISC ChangeLog 25170 SHA256 a4ad61ea56a1fcb04dea10cd8c203e55de4a5e767e8ce8d70d09da4189c8d574 SHA512 650efcdc4963c4ee161bcfa493a8a3396c3ed763a1daa3ba6a4c0537ec1853ea1c71ff113f55529fc073675dcb02d9f2e99b721351f68c3e5196c9d9770429cf WHIRLPOOL 86868e6b3b4b3241b58292eb694ad927219abd88c5ac79672e5d37f23efa4647fe86b873090938b7a7ad720f062140cae3b11770725a0cb6a8a3d3b47b0c595f
 MISC metadata.xml 419 SHA256 803186ba5a9a84cf3fdf02db9c8922c4e63d75608268b352da2d68ba0249d5ec SHA512 85d64dc3256516cb3a46e01861d684384a108035744cc34615b7de23aa09847f8eafeec198b6135a6df100be5d6de02f0cea65815c617af1e252e87f95002274 WHIRLPOOL 532f9e3d27dcbc0b521bab043487f13b2bf7daa9a49b11760b1aa0610d30c1d62d39c940f545a8a3754e8f08ec041d428b4b98b6ebea45579073d6c12a43c30b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJS4EgbAAoJEPGu1DbS6WIAUwQP/RdkbXfiZJcXpyNTPKZ51MgH
-kZZxiZeK2SDiMBUM77QLUlaFwESYEHKhIecsaBg+6/R4x/nY0GgoPbNbVj0I6umG
-VpWYRNSjyuWYMZGXkmIHMIVZhLpvwrpKirRsXxztliX1Le9JS5YaRnL56aoeQF22
-2DMz0BCgTGyaA1s/3oNRDC14JGJlfFgfv11DqLNOjz6DyxESvWDYZwDnCkq5qQGO
-yn/ZRE73IAXxnmB0uJq3Rvv8ZXUvf5vzN4NK/kFU+aJojXHcZqasCKAnL9enna6y
-3f+TbTvUjjBJqjzlDaWTD65/uye+UQRL4Z+HbtZkiSuUl17l5lPtOrfdTcp3VBjs
-iZiAng0M22+FvLQu+arbTqt2pRPTyjC/HHHaY+3+Z7AkBnX2uFL5O3mjVJV6DwOp
-BCnHjbALNOv4C0fQntw8KKnjzBd3jpCD0gwRc+NSB8UeO7mvriAQgllM+gi2iEBS
-5EIuCel17ivRdUdbg3sqnQKhpsUf6MyaE/PuMj2etqS1nwBmF600VWsWpTerEw+M
-mgR+eztUIUoA7vcYl3f9X6uEzafPxap+I6G+7IrFpK+yPhyWVgHBHPYv+nSJB+Vy
-SkqUc/cMWcxwfhdW2+KbVIIeN3KB1wv6ngYNtL+trwE9SSwVO8eAjzz4KNdPzUeg
-eFYGD4wtBAyASBcgbbK4
-=zAc3
+iQIcBAEBCAAGBQJS61dJAAoJEPGu1DbS6WIAH6sQAJa2bfyRml5D6wes+lpuVFt0
+901p1HFZ1DO3dxgRPkn3XvbQyRZuUQBADIl1HH2NM2ZWjNvbSU34aj2U+Kv/x/F8
+JdSkpY7CsQlvG5EqdhZ3hoDQZtqm/xqhL0qkiMrMgGENNRmDbrAxUljIAE8S4LHo
+MRW8EoaTxK7WFqGPsjoUfUy5HiNNYTcpEwdXRJpEXdhB3UBucXGdbZvqwuUV5HnS
+QVGJNJLCXU12ry5bk3lUEt0mvhaRavtcTFbotks+AIzJ0VfeXOYo9iFSicDdYUcf
+3gjvxfQ+NNKWwVcj1OJ8DRz/Cgd1mS7LfTjvPW8/sblad5zOnehC8Ew16Jk9QD2/
+ZWjxkUG9bjbyoNmSmqnTGb4Jw2rnvRgOPgn0iNV2rGwl3v3K3O8pi2VI0cx1gxkL
+X6SvSpcDGs6e32sN/ukodjD4DBthUKLWb8btsBVPy6LPmesJol8BSizEL6XcpRxa
+JahVGAcKbTvyu6BwzfJG+sM2QzwOrdKlCZQZMvEQGfmqqT90g/B/QogMKx6P1ajD
+0pg3zRV4Wu5n3efXXaSCEv/vxrI+Kh656cr4XUoa5AeWFqBAevMIvMJQ/b+g5Kez
+/1sWssRjmcvgunmAxzeMu8zkPeQROqdALV4j3TgxmuTw+ccVVTr61R3tn2pVfBwO
+kAxNSpl7kaDqaN+El4dc
+=kKTE
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/apr/apr-1.4.8-r1.ebuild b/dev-libs/apr/apr-1.4.8-r1.ebuild
index 3245bd62b7e9..53d60815d8bc 100644
--- a/dev-libs/apr/apr-1.4.8-r1.ebuild
+++ b/dev-libs/apr/apr-1.4.8-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/apr/apr-1.4.8-r1.ebuild,v 1.12 2014/01/21 00:12:07 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr/apr-1.4.8-r1.ebuild,v 1.13 2014/01/31 07:56:48 vapier Exp $
 
 EAPI="4"
 
@@ -64,9 +64,7 @@ src_configure() {
 		myconf+=" --with-devrandom=/dev/random"
 	fi
 
-	if [[ ${CHOST} == *-mint* ]] ; then
-		myconf+=" --disable-dso"
-	fi
+	tc-is-static-only && myconf+=" --disable-dso"
 
 	# shl_load does not search runpath, but hpux11 supports dlopen
 	[[ ${CHOST} == *-hpux11* ]] && myconf="${myconf} --enable-dso=dlfcn"
diff --git a/dev-libs/apr/apr-1.5.0-r1.ebuild b/dev-libs/apr/apr-1.5.0-r1.ebuild
index 92dd0f579095..b7259c00ff09 100644
--- a/dev-libs/apr/apr-1.5.0-r1.ebuild
+++ b/dev-libs/apr/apr-1.5.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/apr/apr-1.5.0-r1.ebuild,v 1.4 2014/01/22 22:37:09 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr/apr-1.5.0-r1.ebuild,v 1.5 2014/01/31 07:56:48 vapier Exp $
 
 EAPI="4"
 
@@ -60,9 +60,7 @@ src_configure() {
 		myconf+=" --with-devrandom=/dev/random"
 	fi
 
-	if [[ ${CHOST} == *-mint* ]] ; then
-		myconf+=" --disable-dso"
-	fi
+	tc-is-static-only && myconf+=" --disable-dso"
 
 	# shl_load does not search runpath, but hpux11 supports dlopen
 	[[ ${CHOST} == *-hpux11* ]] && myconf="${myconf} --enable-dso=dlfcn"
diff --git a/dev-libs/apr/apr-1.5.0.ebuild b/dev-libs/apr/apr-1.5.0.ebuild
index 4d4cff03c4c4..c7e50f744469 100644
--- a/dev-libs/apr/apr-1.5.0.ebuild
+++ b/dev-libs/apr/apr-1.5.0.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/apr/apr-1.5.0.ebuild,v 1.2 2014/01/21 00:12:07 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr/apr-1.5.0.ebuild,v 1.3 2014/01/31 07:56:48 vapier Exp $
 
 EAPI="4"
 
@@ -64,9 +64,7 @@ src_configure() {
 		myconf+=" --with-devrandom=/dev/random"
 	fi
 
-	if [[ ${CHOST} == *-mint* ]] ; then
-		myconf+=" --disable-dso"
-	fi
+	tc-is-static-only && myconf+=" --disable-dso"
 
 	# shl_load does not search runpath, but hpux11 supports dlopen
 	[[ ${CHOST} == *-hpux11* ]] && myconf="${myconf} --enable-dso=dlfcn"