Revert invalid CTARGET munging and restore proper stripping logic -- the scanelf ar warning is fixed with newer pax-utils #553754 by Tiger.

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

3 files changed, 26 insertions, 23 deletions

diff --git a/dev-embedded/sdcc/ChangeLog b/dev-embedded/sdcc/ChangeLog
index 2b590d140eeb..46088e281995 100644
--- a/dev-embedded/sdcc/ChangeLog
+++ b/dev-embedded/sdcc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-embedded/sdcc
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/sdcc/ChangeLog,v 1.57 2015/07/13 08:38:32 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/sdcc/ChangeLog,v 1.58 2015/07/13 09:17:29 vapier Exp $
+
+  13 Jul 2015; Mike Frysinger <vapier@gentoo.org> sdcc-3.5.0.ebuild:
+  Revert invalid CTARGET munging and restore proper stripping logic -- the
+  scanelf ar warning is fixed with newer pax-utils #553754 by Tiger.
 
   13 Jul 2015; Mike Frysinger <vapier@gentoo.org> sdcc-3.5.0.ebuild,
   sdcc-9999.ebuild:
diff --git a/dev-embedded/sdcc/Manifest b/dev-embedded/sdcc/Manifest
index 4c9c11aa04e4..9857556f3f2b 100644
--- a/dev-embedded/sdcc/Manifest
+++ b/dev-embedded/sdcc/Manifest
@@ -24,24 +24,24 @@ EBUILD sdcc-2.6.0.ebuild 1575 SHA256 f25810c3129b36ff265da9e857e27d49a542a9fa5e0
 EBUILD sdcc-2.7.0.ebuild 1577 SHA256 b5bd996bd02e31e297e366a000babd5f56ba8fd3ee046d721f6af3fc0ec114de SHA512 6f33044f78499df541374ec8ef3ad2a80d61bf302c84e5d02cdab5d868d09be7027ea5e89b7b5c79aff9dfb00cd3cc547093fd7a82c877e2f457ae16c4fcdff0 WHIRLPOOL 0eae202fa9e91c128b373440442b3696c0475910e63b0f4e3e6fb6c6475aab041ba0aab33f2df9b63b504cdf64a67c7d7488a2a656594319363d0d0a74893c4a
 EBUILD sdcc-2.8.0.ebuild 2087 SHA256 400e3c7ec3b0325549033435b8d320a1677e118f7fc92c0e458bf2f63057788e SHA512 eb999c838d372eee0e9d62a9a48b9f6caf133aa2aa4c8a5aca5e8f229b4e50d80a1c77a8328e700b4f980321b24a90a690b0e991d5c5d5fc33e2cb1de3f2aa4f WHIRLPOOL e9fd0b3121ac1fde0769edae008e4beab2e45d805fe330e4458d323fe5f39edf499b6cc3037b3270e0072576d4e7e06ddb3b348c5b4efe1cb621498048040f72
 EBUILD sdcc-2.9.0.ebuild 2396 SHA256 326504d5b4f77aa03bdd100a811f6fdc0c9fc054b2794c09367a33a19f7b2c4a SHA512 ad39aa59b2138db840c5f83c3d4c5dba593ee36b1fb477082b5e3e2e1b7f1bc3648c859166b2cd76c110ab46e8967247ea48a108aa6ef70d5ae07366ecd69ef6 WHIRLPOOL ae49d98ec4de563aa48620bd61941d10faf4a60b140a6f5717d5955b80ce974284ed5734b3aa0e253dcff84181905446c070792fab26548ee1cc0cc4bf875dce
-EBUILD sdcc-3.5.0.ebuild 3463 SHA256 224b2044a1cbcbbb225ce2fc3b7a10fa1ec154e842fbe64c104d5656117b7abd SHA512 af3f4de57f99998ae5f1812aecdb171dc82f906758bbe5478acaa93c319493f1ab4a0310b0b23067eec3ff91e13ca6f8b6c65f144df4f7816128cb735dd8a95d WHIRLPOOL 071ebbedc78fe25e16a7c6b418fc9122a9576ce266b05a1b5949cb8403f2d65e13067b24e015a046c0a9e2363507e9a962406b269b85b098aebf0c2a3e6b9b2f
+EBUILD sdcc-3.5.0.ebuild 3355 SHA256 f899f8c9a8ec7be533a74df765569a25b7720fbab7e30592469ae5572e117972 SHA512 9d106fb7e494b6757e86ab6e695531728b444c2a872f6cb1e6eec5ca0e679556f66124da312cf27f7fbe667a4d36953eb446d59ce8474bbd8d66fd5a64958703 WHIRLPOOL b4101f5aef4966ad93184db782bd1d937b66853741436c39eeda66dd26afb02c55f535c093682b308c18e912f954acce71722952a6d3547b0f3a1edd78983329
 EBUILD sdcc-9999.ebuild 2532 SHA256 99c03d0a51d79c88b5d0576c3829cce91cbc3be350de4657011d0dd30422bd1a SHA512 147bdbbc589afe2c111d32b16d8f1690ed35ee64a5d2bf66cf7caa01da96612d6a886a06c313be0718d26d0dff706f826a3684074cdb61d311cbef039ebe1249 WHIRLPOOL daf18d12e80f375a82cc2df1cb8383ddece422896ce7f7ac0c33cc8e26cc19663c364d7c0b0c9b29bc249ba3986208b946dae97c07772e3a67a75e52601af841
-MISC ChangeLog 9093 SHA256 7791f6f101ce2bd3d2a2306d57840e2e875102c5fb9133ea5fe3142651b0b748 SHA512 c47a3902446065ace95f6c64fc3f8f5abfa4067525efe51138619227300e0fe6e76dee9767e95e318047cdd9a71b8d3e0a279e78c8ef581464dcdc4be0b7aa6d WHIRLPOOL 561ef5cb768138daa3c5d6c423e3eded1d0e3c22e4f029ce8e71aff294f1ab5f8b0d22e6610fb530d6d366853fe485ca4f3d94cb8a46f7f0ad6938062e2ab576
+MISC ChangeLog 9307 SHA256 60647f1a0089c784716b80793f854c52e9e79704f864ba32a4d3d8c65a179e04 SHA512 ea5af9e6519fec0300573b6a7cf374b1e9436eb5890582f2c0bd9b3caf16efa69f80b73e53d1f8e56a046a6bc919e682ebd6622af9a88296aaf1ef6e9f6fad90 WHIRLPOOL 3cfcab4484637a9bbf79010bf0fc326fc804d6b1c9f3da95da7cdc14128b6cd319f5fe255d0f11bec28272209d136e430ab883220d4c84125fd97d2ab1b23ee6
 MISC metadata.xml 2127 SHA256 feb21b4a44a0d8a54618276763cbfcb418067ae5102f0b8d2575731aff986bde SHA512 71c4eb72abe7a582ce785df9e542e2c83ac1fa9e45a20d0258cea3d625552291032adf0d84287e6f570b3e6f04f6e632d3481665711a603b9a14ae3368ac27e2 WHIRLPOOL a3b74adab58f7c935611033b27d9a2544270219f9ee5592ed4dfd9630c322e6f42369f6d29e413563246d63e0d55f8b069a4092daa00a7061825e1574791ea43
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJVo3kJAAoJEPGu1DbS6WIAY1AP/1OmpiV0UYloINX0y3D5TV6o
-MTxd0oVShVlDC62RtQZzZR160+T3KcpUZvHLnP7SRL9eG02cWNA+ZZVYaS3OPhyw
-eSOBmrdohpqTluY8BDPosqkbO+WLRgbwk71zdUTDSZlkWjtiyjs8Mz/hHRRtJkq9
-qrFR3vfnH/h9DcAJcz0J6OIgBgYoB52Isx90UMUVTFAKZWR4RjwbCvcgTzhlhwMK
-ubGoYpzBCP8L/kuojb13dmT64BW3OjIY1MUf5s1eKPXz4lz/NYYnuYZp0A5DwRko
-FDRll6z6JLy0pFELXdRf4ivOjY59m28lXrMxtvMCio2/1iyRInjUhCIoaVyinkGX
-WW/s0KYjJx5VZYSoOwl++1E9BcxnQs+xg5Y9ngDMYUE7vu6ayuJ/N/zKNYZEBelH
-/YAodVk0zZuinexvOz9TaUQ887biRzAbS4gNNX1GDLiJBrmdy1jIGxUdTpjDd+aK
-S4pKHztn7ywGYEkNbu/WrKefw9gUiLigK39kq9SgmkVY+jjmYN1+i6kxf34Q8cCg
-NG5y9cacq8wlhG90UjdIN/YQMCt1QJT5aZrS8YZQh5VOD02ACjQrF4kkG4K6BHaD
-wp46E4usH7/HrObAq3uYMDaJJjZs2E6kbbGJII+qvGuUDJz0dnwmXriKW2xDd/qg
-NSWiRPWxb05ee6y3OWBo
-=9bq3
+iQIcBAEBCAAGBQJVo4IqAAoJEPGu1DbS6WIAN6UP/jfGs04y9SfLbGFbQjNjmPZB
+ARiH8scGYtgmw9pPB3T8A1bV/voTD5TdyxU30Ol64Q1MHa3zG+sp3ki07a8bMBq/
+nNz2vLqzvkCgMgiVdtsdtewodCkMk9mA2D+8B5KXPMVftdTmvvwW0LBWTVEKcGIt
+sGVc9dkaKPTp2LGDquyRhWQK8kTfO2Dd+USZwcIyHaJQ+suupHQ4czFluUxtT9DJ
+8HYPiPhMWBeAM3AlNqvb66Ns/GNLr0FuExEIdwz/ZBeQog+1pPBCKBeAKJQVWEqZ
+Bec8V+Dt7qUCTHy9mgaoYDHYpUC1XR7fQVjQgkIebOyF6vLHSZY5iReW1J36kHwj
+cOOmhKkw21/rmowfrriYCkfQnrglLcw3avV0J6rnN7ffRMxhP7Dw1hAqN6HLHH0S
+Ovrbo6wV3jHPc6cOBypczpFaiF1WUWU904cQk/FiXlrFIzS83vTg0UZUcBKSzRnH
+jZulSnjv2oqrRtw6ELYqqJLW0KywQm4nKUgY9pKmPNG6cDHQtDW23M0U8GEBsVbE
+cKALYhzhmy4YGLIUykHvnUGsFxLDOu8Gc0/41x3SwwYzOtOOViNbS2UNXrjzMuDl
+lkAtohSsdSga59o92Qf5role2p+dVBumkko/kLu0nt9vD3HeTBKfKowQsjWEI3Iy
+1M8NgPywsHjIfX3vFziw
+=sPYX
 -----END PGP SIGNATURE-----
diff --git a/dev-embedded/sdcc/sdcc-3.5.0.ebuild b/dev-embedded/sdcc/sdcc-3.5.0.ebuild
index d786f3645e18..3bb3b8b32bb4 100644
--- a/dev-embedded/sdcc/sdcc-3.5.0.ebuild
+++ b/dev-embedded/sdcc/sdcc-3.5.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/sdcc/sdcc-3.5.0.ebuild,v 1.9 2015/07/13 08:38:32 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/sdcc/sdcc-3.5.0.ebuild,v 1.10 2015/07/13 09:17:29 vapier Exp $
 
 EAPI="5"
 
@@ -34,8 +34,6 @@ REQUIRED_USE="
 	hc08?  ( sdbinutils )
 	s08?   ( sdbinutils )"
 
-# ADD "binchecks" to fix the "scanelf: Invalid 'ar' entry" messages
-# OR leave the overwrite of CTARGET in src_install()
 RESTRICT="strip"
 
 RDEPEND="dev-libs/boost:=
@@ -75,6 +73,7 @@ src_configure() {
 	# sdbinutils subdir doesn't pass down --docdir properly, so need to
 	# expand $(datarootdir) ourselves.
 	econf \
+		ac_cv_prog_STRIP=true \
 		ac_cv_prog_AS="$(tc-getAS)" \
 		ac_cv_prog_AR="$(tc-getAR)" \
 		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
@@ -114,8 +113,8 @@ src_install() {
 		dohtml -r *
 	fi
 
-	# See /usr/lib/portage/python${version}/install-qa-check.d/10executable-issues
-	# Installed libs are not for our CHOST but for microcontrollers
-	# This disable QA_EXECSTACK, QA_WX_LOAD and scanelf -qyRAF '%e %p'
-	CTARGET="undefined"
+	# a bunch of archives (*.a) are built & installed by gputils
+	# for PIC processors, but they do not work with standard `ar`
+	# & `scanelf` utils and they're not for the host.
+	env RESTRICT="" prepstrip "${D%/}"/usr/bin
 }