sys-apps/spu-tools: Version Bump

Bumpt EPAI=5
Respect CC
fix build for ncurses[tinfo]
fix compilation problems with format-security

Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=435086
Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=466790

Package-Manager: portage-2.2.22
Signed-off-by: Justin Lecher <jlec@gentoo.org>

6 files changed, 85 insertions, 31 deletions

diff --git a/sys-apps/spu-tools/Manifest b/sys-apps/spu-tools/Manifest
index f794fc0142f2..9e2361caa98a 100644
--- a/sys-apps/spu-tools/Manifest
+++ b/sys-apps/spu-tools/Manifest
@@ -1,2 +1,2 @@
 DIST spu-tools-2.2.80-95.tar.gz 19917 SHA256 bfa467ddf036b1148978d251fdd5a1dd89dece3cf3895c7875f1ae61482fffc2 SHA512 34071e52dd5a4e1a426452ac4a279b4cdaa65f14dc38cfea106ea06410b8771d94eb12e77743dc8464d79ad43998b11f3a0da3efd3bbdbdab81d61cb696be1cc WHIRLPOOL e7deaeab02a1c83b83e9cd40ac2ddec3f0674e54876a9fe48dd3b5c82f17cfb899f13d504d7a907d74cbbed8d4cc7e6f7d2a57ff6e6509ec56bef44b12fdb67f
-DIST spu-tools-2.3.0.135.tar.gz 21580 SHA256 358ab3ee3511530ce330331f3e9d60dd93333616ef003ecad443500d60c11494 SHA512 eac24a25b8ee609e26cd60e359eb7a3188a9a9e5a2a1840d6fadc2f747dc0b3a3d7a402bf9915aa52e992b40dfaf3e57bc450c594ff373e2af0e458589942273 WHIRLPOOL c642cc3f596c283f0f4c2715e648f2c6cbfbd20ac74886e99b3e9b3575a998b784c1b21efb4dc40a5058a62bb1e6244c97d844152a0ed9f43aa209efd72e7fd8
+DIST spu-tools-2.3.0.136.tar.gz 21981 SHA256 3b20bb66d42e77757390c62fe13ba6e57397f64c6c8688ae0dcfc901805642c4 SHA512 d25ef8fda067ee98eb698859c21f497ae1a09a6d791c0c2063957beb022b2f2946f9df7e78907b4d3b2f71021fa3c2f76012db7154faaee5be3285a0224c7612 WHIRLPOOL 6cd2b674d6c5e4c8ae9f1af75cdb46be2688bf8a5b441c93a3e66e4e0500746799a910eef396bec17fefd9453dd6961d23607f84017c7d25e5113ee13dd486c1
diff --git a/sys-apps/spu-tools/files/spu-tools-2.3.0.136-buildsystem.patch b/sys-apps/spu-tools/files/spu-tools-2.3.0.136-buildsystem.patch
new file mode 100644
index 000000000000..0d1e25ec9659
--- /dev/null
+++ b/sys-apps/spu-tools/files/spu-tools-2.3.0.136-buildsystem.patch
@@ -0,0 +1,32 @@
+ Makefile | 9 +++++----
+ 1 file changed, 5 insertions(+), 4 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 9c4b69b..cf8958d 100644
+--- a/Makefile
++++ b/Makefile
+@@ -1,8 +1,9 @@
+ ARCHIV := spu-tools.tar.gz
+ 
+-CC = gcc
+-CFLAGS = -g -Wall
++CC ?= gcc
++CFLAGS ?= -g -Wall
+ PREFIX = $(DESTDIR)/usr
++LIBS ?= -lncurses
+ 
+ objs = ctx-info.o spu-info.o proc-info.o general-info.o spu-top.o spu-ps.o
+ target = spu-top spu-ps
+@@ -16,10 +17,10 @@ spu-top.o: spu-top.c spu-tools.h
+ spu-ps.o: spu-ps.c spu-tools.h
+ 
+ spu-top: ctx-info.o spu-info.o proc-info.o general-info.o spu-top.o
+-	$(CC) $(CFLAGS) -lncurses ctx-info.o spu-info.o proc-info.o general-info.o spu-top.o -o spu-top
++	$(CC) $(CFLAGS) $(LDFLAGS) ctx-info.o spu-info.o proc-info.o general-info.o spu-top.o -o spu-top $(LIBS)
+ 
+ spu-ps: ctx-info.o spu-ps.o
+-	$(CC) $(CFLAGS) ctx-info.o spu-ps.o -o spu-ps
++	$(CC) $(CFLAGS) $(LDFLAGS) ctx-info.o spu-ps.o -o spu-ps
+ 
+ clean:
+ 	@rm -Rf *.o *~ $(objs) $(target) spu-top.1 spu-ps.1
diff --git a/sys-apps/spu-tools/files/spu-tools-2.3.0.136-format-security.patch b/sys-apps/spu-tools/files/spu-tools-2.3.0.136-format-security.patch
new file mode 100644
index 000000000000..c039e2674e78
--- /dev/null
+++ b/sys-apps/spu-tools/files/spu-tools-2.3.0.136-format-security.patch
@@ -0,0 +1,16 @@
+ spu-ps.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/spu-ps.c b/spu-ps.c
+index 8e0d667..e4e6ac0 100644
+--- a/spu-ps.c
++++ b/spu-ps.c
+@@ -59,7 +59,7 @@ static void dump_ctxs_or_spus(void **ctxs_or_spus, struct field *fields)
+ 			chars += print_ctx_field((struct ctx *)ctxs_or_spus[i],
+ 					buf+chars, fields[j].id, fields[j].format);
+ 		}
+-		printf(buf);
++		printf("%s", buf);
+ 		printf("\n");
+ 		i++;
+ 	}
diff --git a/sys-apps/spu-tools/spu-tools-2.2.80_p95.ebuild b/sys-apps/spu-tools/spu-tools-2.2.80_p95.ebuild
index 30095ed4cb85..940b3308bfb7 100644
--- a/sys-apps/spu-tools/spu-tools-2.2.80_p95.ebuild
+++ b/sys-apps/spu-tools/spu-tools-2.2.80_p95.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 MY_P=${P/_p/-}
 
 DESCRIPTION="CELL spu ps and top alike utilities"
-HOMEPAGE="http://sourceforge/projects/libspe"
+HOMEPAGE="https://sourceforge.net/projects/libspe"
 SRC_URI="mirror://sourceforge/libspe/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/sys-apps/spu-tools/spu-tools-2.3.0.135.ebuild b/sys-apps/spu-tools/spu-tools-2.3.0.135.ebuild
deleted file mode 100644
index 1e496454942c..000000000000
--- a/sys-apps/spu-tools/spu-tools-2.3.0.135.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-MY_P=${P/_p/-}
-
-DESCRIPTION="CELL spu ps and top alike utilities"
-HOMEPAGE="http://sourceforge/projects/libspe"
-SRC_URI="mirror://sourceforge/libspe/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~ppc ~ppc64"
-IUSE=""
-
-DEPEND="sys-libs/ncurses
-		sys-apps/help2man"
-RDEPEND="sys-libs/ncurses"
-
-S="${WORKDIR}/${PN}/src"
-
-src_compile() {
-	emake all || die "emake failed"
-}
-
-src_install() {
-	make DESTDIR="$D" install || die
-}
diff --git a/sys-apps/spu-tools/spu-tools-2.3.0.136.ebuild b/sys-apps/spu-tools/spu-tools-2.3.0.136.ebuild
new file mode 100644
index 000000000000..403c5158753a
--- /dev/null
+++ b/sys-apps/spu-tools/spu-tools-2.3.0.136.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils toolchain-funcs
+
+MY_P=${P/_p/-}
+
+DESCRIPTION="CELL spu ps and top alike utilities"
+HOMEPAGE="http://sourceforge.net/projects/libspe"
+SRC_URI="mirror://sourceforge/libspe/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~ppc ~ppc64"
+IUSE=""
+
+RDEPEND="sys-libs/ncurses:0="
+DEPEND="${RDEPEND}
+	sys-apps/help2man"
+
+S="${WORKDIR}/${PN}/src"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-buildsystem.patch \
+		"${FILESDIR}"/${P}-format-security.patch
+	tc-export CC
+	export CFLAGS="${CFLAGS}"
+	export LDFLAGS="${LDFLAGS}"
+	export LIBS="$($(tc-getPKG_CONFIG) --libs ncurses)"
+}