summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2015-07-13 09:21:51 +0000
committerMike Frysinger <vapier@gentoo.org>2015-07-13 09:21:51 +0000
commit6daa28318cbf359dcc3fb050e6da3763ce5cf78b (patch)
treeedf433a98fdaa80d992341812019aa7e1087d056 /dev-embedded/sdcc
parentRevert invalid CTARGET munging and restore proper stripping logic -- the scan... (diff)
downloadgentoo-2-6daa28318cbf359dcc3fb050e6da3763ce5cf78b.tar.gz
gentoo-2-6daa28318cbf359dcc3fb050e6da3763ce5cf78b.tar.bz2
gentoo-2-6daa28318cbf359dcc3fb050e6da3763ce5cf78b.zip
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.
(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key D2E96200)
Diffstat (limited to 'dev-embedded/sdcc')
-rw-r--r--dev-embedded/sdcc/ChangeLog8
-rw-r--r--dev-embedded/sdcc/sdcc-3.5.0.ebuild13
-rw-r--r--dev-embedded/sdcc/sdcc-9999.ebuild8
3 files changed, 19 insertions, 10 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/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? (