Use longer --docdir form to avoid warnings from sdbinutils subdir.

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

4 files changed, 29 insertions, 20 deletions

diff --git a/dev-embedded/sdcc/ChangeLog b/dev-embedded/sdcc/ChangeLog
index 3d6326443554..2b590d140eeb 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.56 2015/07/13 08:24:46 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/sdcc/ChangeLog,v 1.57 2015/07/13 08:38:32 vapier Exp $
+
+  13 Jul 2015; Mike Frysinger <vapier@gentoo.org> sdcc-3.5.0.ebuild,
+  sdcc-9999.ebuild:
+  Use longer --docdir form to avoid warnings from sdbinutils subdir.
 
   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 4b28105d9e2a..4c9c11aa04e4 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 3352 SHA256 2d11040a41f0a1d9c2013febbfe8d82cdea9b2c534b2b312ab9e56ebf650efd9 SHA512 d34e5c2ceaae475c5bc44de605de63f8f23c7c55a3e5ae0f2066795f93aa90ad38ff7dd322a47773a96be5da2249f96ff14b58d3e56949a4818c275f3646ed22 WHIRLPOOL a68dc0a57eea1739468151587542d11d7e4b244238a687088a41db453a21373d6ee900f7c1325a31ec4819395328cab29c57b6c671ee1e16bf0b4897604c7139
-EBUILD sdcc-9999.ebuild 2381 SHA256 6d6207c3dfeb9a9e1ae29774a1f6a875f6dce0d45f465bf21120cdac974390d8 SHA512 523f513ca4adc54127255030d197aa1b512dfdf5448b2c10c4821787c838d7c29c3c79428a5274d104daabe5479839f92963032b47645f733e9d88970358b18c WHIRLPOOL 7f947999ef1347d09fb052542f008fd4a992e4af69c3169b210677bb7fa3d867cd46a01715737b6fea50991433e71efbe66a0a8f140da1c42538d94fd9d8ac88
-MISC ChangeLog 8934 SHA256 30d6a42f60a075124b927dce5336c3d6651896fc0606a0fb8bf124738710ef18 SHA512 d8b8310479d377113b186981d9ce2cc69d317da7f08284fb3cbcb20833af12d8f3184a1b996c0069b5029c899b8b3dd82dd699e5e7051c20eee415c3c3946b84 WHIRLPOOL 39e915e7a1624be5974d85fc6b3002430ad5ff710f8e1730e7725c85c96499b8e1bb0c021518b6bdb220b2831524cabad67ce7e61691ba96677c990f56801438
+EBUILD sdcc-3.5.0.ebuild 3463 SHA256 224b2044a1cbcbbb225ce2fc3b7a10fa1ec154e842fbe64c104d5656117b7abd SHA512 af3f4de57f99998ae5f1812aecdb171dc82f906758bbe5478acaa93c319493f1ab4a0310b0b23067eec3ff91e13ca6f8b6c65f144df4f7816128cb735dd8a95d WHIRLPOOL 071ebbedc78fe25e16a7c6b418fc9122a9576ce266b05a1b5949cb8403f2d65e13067b24e015a046c0a9e2363507e9a962406b269b85b098aebf0c2a3e6b9b2f
+EBUILD sdcc-9999.ebuild 2532 SHA256 99c03d0a51d79c88b5d0576c3829cce91cbc3be350de4657011d0dd30422bd1a SHA512 147bdbbc589afe2c111d32b16d8f1690ed35ee64a5d2bf66cf7caa01da96612d6a886a06c313be0718d26d0dff706f826a3684074cdb61d311cbef039ebe1249 WHIRLPOOL daf18d12e80f375a82cc2df1cb8383ddece422896ce7f7ac0c33cc8e26cc19663c364d7c0b0c9b29bc249ba3986208b946dae97c07772e3a67a75e52601af841
+MISC ChangeLog 9093 SHA256 7791f6f101ce2bd3d2a2306d57840e2e875102c5fb9133ea5fe3142651b0b748 SHA512 c47a3902446065ace95f6c64fc3f8f5abfa4067525efe51138619227300e0fe6e76dee9767e95e318047cdd9a71b8d3e0a279e78c8ef581464dcdc4be0b7aa6d WHIRLPOOL 561ef5cb768138daa3c5d6c423e3eded1d0e3c22e4f029ce8e71aff294f1ab5f8b0d22e6610fb530d6d366853fe485ca4f3d94cb8a46f7f0ad6938062e2ab576
 MISC metadata.xml 2127 SHA256 feb21b4a44a0d8a54618276763cbfcb418067ae5102f0b8d2575731aff986bde SHA512 71c4eb72abe7a582ce785df9e542e2c83ac1fa9e45a20d0258cea3d625552291032adf0d84287e6f570b3e6f04f6e632d3481665711a603b9a14ae3368ac27e2 WHIRLPOOL a3b74adab58f7c935611033b27d9a2544270219f9ee5592ed4dfd9630c322e6f42369f6d29e413563246d63e0d55f8b069a4092daa00a7061825e1574791ea43
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJVo3XQAAoJEPGu1DbS6WIAemQQAJDfwSh7l0N1rXzypoedy7Gz
-GJIagF3nTz3iSTFl2DNTstHO4OwGUxMHaVdOHHFRnw1e2qnC78KbMF0HySphkKib
-c6nr+4FJ0CONT2dSeS6JulKMm50rH1XCaudK+03UUYALfGMXrQOzzlPKF5hJdgvg
-IXjoorxyt7nBU9Zpw4GNRZJ1UaZTQG29sQzvuKiZFnlXOSLlBxCC6LmkOrKIhO26
-HDx2wypACt3opBViMHj+ewh2EjDMq6XCwE2ho+Iu5lJpMAdTXDx3WiXotdbJA86D
-3nwr2teg3PrgtN+h4qIJgUrs85BECmvHfuuP4HSJZdHN0Ts+nlHGETk8pebaX8Ry
-aYq/skcfR23p1y5W+oxccY/dd0BFusobuAtVNTnvBPpmWQN/U+uTRemTvZcaAcSE
-Tc6UsD4cKBrbHLi3FuvJr2cgW3X0gy5awwuHi5+qtsAmzGbILS1J7/NnDETGkX06
-nHJITCSzJmu6GShtjspBpKRgZr0p0sHu4ZVzdVIBqDrp2DZd7jcoAI300NU3Xejc
-gKgRstXmFsXxoBmpN6lc89gjKUIZI1pDdVypIvTAea+KhN43QBEammbHke639Ijb
-c+dNeIUEbg7qzzvR0YFGwpnfOJVuVPMjPzSrqDf2HEDrRpZbpD97P4gjYkCFXPpS
-rKT3Xjqd5gHiR4hL6sWq
-=s1Ns
+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
 -----END PGP SIGNATURE-----
diff --git a/dev-embedded/sdcc/sdcc-3.5.0.ebuild b/dev-embedded/sdcc/sdcc-3.5.0.ebuild
index 3c4c9fbc754a..d786f3645e18 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.8 2015/07/13 08:24:46 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/sdcc/sdcc-3.5.0.ebuild,v 1.9 2015/07/13 08:38:32 vapier Exp $
 
 EAPI="5"
 
@@ -72,10 +72,12 @@ src_prepare() {
 }
 
 src_configure() {
+	# sdbinutils subdir doesn't pass down --docdir properly, so need to
+	# expand $(datarootdir) ourselves.
 	econf \
 		ac_cv_prog_AS="$(tc-getAS)" \
 		ac_cv_prog_AR="$(tc-getAR)" \
-		--docdir='$(datarootdir)'/doc/${PF} \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
 		--without-ccache \
 		$(use_enable mcs51 mcs51-port) \
 		$(use_enable z80 z80-port) \
diff --git a/dev-embedded/sdcc/sdcc-9999.ebuild b/dev-embedded/sdcc/sdcc-9999.ebuild
index 8e724857ef91..e95804e1df0c 100644
--- a/dev-embedded/sdcc/sdcc-9999.ebuild
+++ b/dev-embedded/sdcc/sdcc-9999.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-9999.ebuild,v 1.7 2015/07/13 08:24:46 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/sdcc/sdcc-9999.ebuild,v 1.8 2015/07/13 08:38:32 vapier Exp $
 
 EAPI="5"
 
@@ -67,10 +67,13 @@ src_prepare() {
 }
 
 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}" \
 		--without-ccache \
 		$(use_enable boehm-gc libgc) \
 		$(docs_compile && use_enable doc || echo --disable-doc)