Fix up depend settings (gperf is only needed at compile time & readline should use the 0 SLOT), and restore min gputils version and sdcc-svn blocker; also sync the live/release ebuilds #553754 by Tiger.

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

4 files changed, 35 insertions, 26 deletions

diff --git a/dev-embedded/sdcc/ChangeLog b/dev-embedded/sdcc/ChangeLog
index 46088e281995..775f3bb59703 100644
--- a/dev-embedded/sdcc/ChangeLog
+++ b/dev-embedded/sdcc/ChangeLog
@@ -1,6 +1,12 @@
 # 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.58 2015/07/13 09:17:29 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/sdcc/ChangeLog,v 1.59 2015/07/13 09:21:51 vapier Exp $
+
+  13 Jul 2015; Mike Frysinger <vapier@gentoo.org> sdcc-3.5.0.ebuild,
+  sdcc-9999.ebuild:
+  Fix up depend settings (gperf is only needed at compile time & readline should
+  use the 0 SLOT), and restore min gputils version and sdcc-svn blocker; also
+  sync the live/release ebuilds #553754 by Tiger.
 
   13 Jul 2015; Mike Frysinger <vapier@gentoo.org> sdcc-3.5.0.ebuild:
   Revert invalid CTARGET munging and restore proper stripping logic -- the
diff --git a/dev-embedded/sdcc/Manifest b/dev-embedded/sdcc/Manifest
index 9857556f3f2b..897958a55f5c 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 3355 SHA256 f899f8c9a8ec7be533a74df765569a25b7720fbab7e30592469ae5572e117972 SHA512 9d106fb7e494b6757e86ab6e695531728b444c2a872f6cb1e6eec5ca0e679556f66124da312cf27f7fbe667a4d36953eb446d59ce8474bbd8d66fd5a64958703 WHIRLPOOL b4101f5aef4966ad93184db782bd1d937b66853741436c39eeda66dd26afb02c55f535c093682b308c18e912f954acce71722952a6d3547b0f3a1edd78983329
-EBUILD sdcc-9999.ebuild 2532 SHA256 99c03d0a51d79c88b5d0576c3829cce91cbc3be350de4657011d0dd30422bd1a SHA512 147bdbbc589afe2c111d32b16d8f1690ed35ee64a5d2bf66cf7caa01da96612d6a886a06c313be0718d26d0dff706f826a3684074cdb61d311cbef039ebe1249 WHIRLPOOL daf18d12e80f375a82cc2df1cb8383ddece422896ce7f7ac0c33cc8e26cc19663c364d7c0b0c9b29bc249ba3986208b946dae97c07772e3a67a75e52601af841
-MISC ChangeLog 9307 SHA256 60647f1a0089c784716b80793f854c52e9e79704f864ba32a4d3d8c65a179e04 SHA512 ea5af9e6519fec0300573b6a7cf374b1e9436eb5890582f2c0bd9b3caf16efa69f80b73e53d1f8e56a046a6bc919e682ebd6622af9a88296aaf1ef6e9f6fad90 WHIRLPOOL 3cfcab4484637a9bbf79010bf0fc326fc804d6b1c9f3da95da7cdc14128b6cd319f5fe255d0f11bec28272209d136e430ab883220d4c84125fd97d2ab1b23ee6
+EBUILD sdcc-3.5.0.ebuild 3389 SHA256 51ddb245f8cffb7734d5b5e193255460b9ed7618b9c904e45df35feed34cdf4a SHA512 9a9b5aaf448bdf8c3d78d1dbf7bb338a1daa605cc1bc4a86d706ef9c9d1b97b6e1542776ec5d8852cfa8ac4b1e7995b8e73ec1c90c63be5e46329ac18048a66a WHIRLPOOL 7b79eb30ee541bc185124f5f7357c3cacc0462fd6720811761b67e624cdb6e4a9dfc3a33768eee468c567d1d9f521f6d56c57397ab265dbdc222889ae049a2a5
+EBUILD sdcc-9999.ebuild 2566 SHA256 6fad07854802fbcd1f7fb8e22024c447d4858da210bf2dfa5d90aeeaefc54eeb SHA512 767513c5fa0a08f7676ab62b55c5cfc2bf8c5e0c3f2ec3f25625801c043751e407f668e39a2923f177ff980c2c3b1ee2c7d3480022d7c0c92c8830a397846844 WHIRLPOOL 783a63a50b4cf369e2f4f895d1e3dec5b6f9da986c0b717513c7c528604b1c0e5ffac4329faca77b2aec5c1706a7aef07b06fea7ccdfa34bc2c658fe11ab9c91
+MISC ChangeLog 9606 SHA256 4b3594f761061ea6589050ae0dbf7e7c965573225fd391d320c8d497b37e032b SHA512 03227b2767941764ea4096b5490078860bf3f76db478e988f4e5e33d670dec103ebb9507b9dfbe303d2a96ed676e4496d798d1d7183c6f78fb5c9ba2ddbbf537 WHIRLPOOL d9951050f23921767d02b132186e5c9a0dff7facaecd42b22b3f9bd39bbf40e56651f8f9c9a42016e1f9accc8a44753354b0f78de1f0fd1d51d8aea51fc70506
 MISC metadata.xml 2127 SHA256 feb21b4a44a0d8a54618276763cbfcb418067ae5102f0b8d2575731aff986bde SHA512 71c4eb72abe7a582ce785df9e542e2c83ac1fa9e45a20d0258cea3d625552291032adf0d84287e6f570b3e6f04f6e632d3481665711a603b9a14ae3368ac27e2 WHIRLPOOL a3b74adab58f7c935611033b27d9a2544270219f9ee5592ed4dfd9630c322e6f42369f6d29e413563246d63e0d55f8b069a4092daa00a7061825e1574791ea43
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-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
+iQIcBAEBCAAGBQJVo4MwAAoJEPGu1DbS6WIAf/wP/iE9vZ7/DlzkHo9ugTk9FO/T
+62y78kZO9UtAPMiCxdw2RpjR8ew0NHPlR6Ao9hmALxobs+X/plQperBOkSnQZj80
+rvwHTwE5Cj/KmhwklcvH7NwMJ6u4upsaPNoKk/bTTRtOTLaU4nKS8yk0vItWENUH
+W1FNQAw1DUoa0ejUm2+khgXIHC2c7jWlES3O8Edy1VYuaiO6arQb706tW2odTdn1
+/nbGcV7Oz0/kXCSEfP748EKl9rVh3C9QD3BkjSWhVb48ca4xlbmaY0O2oU4ANOkn
+k4gTaillyJguTifKtOr2KM20Qc1eizeq7mAnsL4RhjJRCe0YjIzPjXOvH0XdUMj3
+JgHOyWkoIuNppVHfSXpcIVUa8iTNbqv17l+aK5mTPABwxgLyXAONyTykamyB8pS7
+8O4P8A96hk9n7KN0MrcTL5dsv+FnzSll+v5wco70f0cgp5TdJPa/T3JmBpvdNTfN
+47yMGh7IPT6BD/o4hfH9yzi+WzLFOXFa9xMDoC/3SfHoPkyjSPh4cnAPxcqWZoCy
+eXzOT+mtNlwpFpkWlez0xySL7S6m806k2CVP+5Y53jfrGwlGWFSlIspGxGAG6rHY
+LZC2aAOCjEenLsz0hDHMoJ8749rV8a2bI4nkhmsySF/QMtTCKgloXmMhABqIJtu1
+avCMkNQ+R8IQMEhIiYCZ
+=uVWc
 -----END PGP SIGNATURE-----
diff --git a/dev-embedded/sdcc/sdcc-3.5.0.ebuild b/dev-embedded/sdcc/sdcc-3.5.0.ebuild
index 3bb3b8b32bb4..b82514cc10b2 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.10 2015/07/13 09:17:29 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/sdcc/sdcc-3.5.0.ebuild,v 1.11 2015/07/13 09:21:51 vapier Exp $
 
 EAPI="5"
 
@@ -37,12 +37,13 @@ REQUIRED_USE="
 RESTRICT="strip"
 
 RDEPEND="dev-libs/boost:=
-	dev-util/gperf
 	sys-libs/ncurses:=
-	sys-libs/readline:=
-	dev-embedded/gputils
-	boehm-gc? ( dev-libs/boehm-gc:= )"
-DEPEND="${RDEPEND}"
+	sys-libs/readline:0=
+	>=dev-embedded/gputils-0.13.7
+	boehm-gc? ( dev-libs/boehm-gc:= )
+	!dev-embedded/sdcc-svn"
+DEPEND="${RDEPEND}
+	dev-util/gperf"
 if docs_compile ; then
 	DEPEND+="
 		doc? (
diff --git a/dev-embedded/sdcc/sdcc-9999.ebuild b/dev-embedded/sdcc/sdcc-9999.ebuild
index e95804e1df0c..227fcf049c5e 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.8 2015/07/13 08:38:32 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/sdcc/sdcc-9999.ebuild,v 1.9 2015/07/13 09:21:51 vapier Exp $
 
 EAPI="5"
 
@@ -25,12 +25,14 @@ SLOT="0"
 IUSE="+boehm-gc doc"
 RESTRICT="strip"
 
-RDEPEND="sys-libs/ncurses:=
+RDEPEND="dev-libs/boost:=
+	sys-libs/ncurses:=
 	sys-libs/readline:0=
 	>=dev-embedded/gputils-0.13.7
 	boehm-gc? ( dev-libs/boehm-gc:= )
 	!dev-embedded/sdcc-svn"
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+	dev-util/gperf"
 if docs_compile ; then
 	DEPEND+="
 		doc? (