Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: Justin Lecher <jlec@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/spu-tools/, sys-apps/spu-tools/files/
Date: Sat, 26 Sep 2015 07:56:29
Message-Id: 1443254180.8f09d6f5c9a821e7e5bcf3bdc746624997ad32c8.jlec@gentoo
1 commit: 8f09d6f5c9a821e7e5bcf3bdc746624997ad32c8
2 Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
3 AuthorDate: Sat Sep 26 07:56:13 2015 +0000
4 Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
5 CommitDate: Sat Sep 26 07:56:20 2015 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f09d6f5
7
8 sys-apps/spu-tools: Version Bump
9
10 Bumpt EPAI=5
11 Respect CC
12 fix build for ncurses[tinfo]
13 fix compilation problems with format-security
14
15 Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=435086
16 Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=466790
17
18 Package-Manager: portage-2.2.22
19 Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>
20
21 sys-apps/spu-tools/Manifest | 2 +-
22 .../files/spu-tools-2.3.0.136-buildsystem.patch | 32 ++++++++++++++++++++
23 .../spu-tools-2.3.0.136-format-security.patch | 16 ++++++++++
24 sys-apps/spu-tools/spu-tools-2.2.80_p95.ebuild | 4 +--
25 sys-apps/spu-tools/spu-tools-2.3.0.135.ebuild | 28 ------------------
26 sys-apps/spu-tools/spu-tools-2.3.0.136.ebuild | 34 ++++++++++++++++++++++
27 6 files changed, 85 insertions(+), 31 deletions(-)
28
29 diff --git a/sys-apps/spu-tools/Manifest b/sys-apps/spu-tools/Manifest
30 index f794fc0..9e2361c 100644
31 --- a/sys-apps/spu-tools/Manifest
32 +++ b/sys-apps/spu-tools/Manifest
33 @@ -1,2 +1,2 @@
34 DIST spu-tools-2.2.80-95.tar.gz 19917 SHA256 bfa467ddf036b1148978d251fdd5a1dd89dece3cf3895c7875f1ae61482fffc2 SHA512 34071e52dd5a4e1a426452ac4a279b4cdaa65f14dc38cfea106ea06410b8771d94eb12e77743dc8464d79ad43998b11f3a0da3efd3bbdbdab81d61cb696be1cc WHIRLPOOL e7deaeab02a1c83b83e9cd40ac2ddec3f0674e54876a9fe48dd3b5c82f17cfb899f13d504d7a907d74cbbed8d4cc7e6f7d2a57ff6e6509ec56bef44b12fdb67f
35 -DIST spu-tools-2.3.0.135.tar.gz 21580 SHA256 358ab3ee3511530ce330331f3e9d60dd93333616ef003ecad443500d60c11494 SHA512 eac24a25b8ee609e26cd60e359eb7a3188a9a9e5a2a1840d6fadc2f747dc0b3a3d7a402bf9915aa52e992b40dfaf3e57bc450c594ff373e2af0e458589942273 WHIRLPOOL c642cc3f596c283f0f4c2715e648f2c6cbfbd20ac74886e99b3e9b3575a998b784c1b21efb4dc40a5058a62bb1e6244c97d844152a0ed9f43aa209efd72e7fd8
36 +DIST spu-tools-2.3.0.136.tar.gz 21981 SHA256 3b20bb66d42e77757390c62fe13ba6e57397f64c6c8688ae0dcfc901805642c4 SHA512 d25ef8fda067ee98eb698859c21f497ae1a09a6d791c0c2063957beb022b2f2946f9df7e78907b4d3b2f71021fa3c2f76012db7154faaee5be3285a0224c7612 WHIRLPOOL 6cd2b674d6c5e4c8ae9f1af75cdb46be2688bf8a5b441c93a3e66e4e0500746799a910eef396bec17fefd9453dd6961d23607f84017c7d25e5113ee13dd486c1
37
38 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
39 new file mode 100644
40 index 0000000..0d1e25e
41 --- /dev/null
42 +++ b/sys-apps/spu-tools/files/spu-tools-2.3.0.136-buildsystem.patch
43 @@ -0,0 +1,32 @@
44 + Makefile | 9 +++++----
45 + 1 file changed, 5 insertions(+), 4 deletions(-)
46 +
47 +diff --git a/Makefile b/Makefile
48 +index 9c4b69b..cf8958d 100644
49 +--- a/Makefile
50 ++++ b/Makefile
51 +@@ -1,8 +1,9 @@
52 + ARCHIV := spu-tools.tar.gz
53 +
54 +-CC = gcc
55 +-CFLAGS = -g -Wall
56 ++CC ?= gcc
57 ++CFLAGS ?= -g -Wall
58 + PREFIX = $(DESTDIR)/usr
59 ++LIBS ?= -lncurses
60 +
61 + objs = ctx-info.o spu-info.o proc-info.o general-info.o spu-top.o spu-ps.o
62 + target = spu-top spu-ps
63 +@@ -16,10 +17,10 @@ spu-top.o: spu-top.c spu-tools.h
64 + spu-ps.o: spu-ps.c spu-tools.h
65 +
66 + spu-top: ctx-info.o spu-info.o proc-info.o general-info.o spu-top.o
67 +- $(CC) $(CFLAGS) -lncurses ctx-info.o spu-info.o proc-info.o general-info.o spu-top.o -o spu-top
68 ++ $(CC) $(CFLAGS) $(LDFLAGS) ctx-info.o spu-info.o proc-info.o general-info.o spu-top.o -o spu-top $(LIBS)
69 +
70 + spu-ps: ctx-info.o spu-ps.o
71 +- $(CC) $(CFLAGS) ctx-info.o spu-ps.o -o spu-ps
72 ++ $(CC) $(CFLAGS) $(LDFLAGS) ctx-info.o spu-ps.o -o spu-ps
73 +
74 + clean:
75 + @rm -Rf *.o *~ $(objs) $(target) spu-top.1 spu-ps.1
76
77 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
78 new file mode 100644
79 index 0000000..c039e26
80 --- /dev/null
81 +++ b/sys-apps/spu-tools/files/spu-tools-2.3.0.136-format-security.patch
82 @@ -0,0 +1,16 @@
83 + spu-ps.c | 2 +-
84 + 1 file changed, 1 insertion(+), 1 deletion(-)
85 +
86 +diff --git a/spu-ps.c b/spu-ps.c
87 +index 8e0d667..e4e6ac0 100644
88 +--- a/spu-ps.c
89 ++++ b/spu-ps.c
90 +@@ -59,7 +59,7 @@ static void dump_ctxs_or_spus(void **ctxs_or_spus, struct field *fields)
91 + chars += print_ctx_field((struct ctx *)ctxs_or_spus[i],
92 + buf+chars, fields[j].id, fields[j].format);
93 + }
94 +- printf(buf);
95 ++ printf("%s", buf);
96 + printf("\n");
97 + i++;
98 + }
99
100 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
101 index 30095ed..940b330 100644
102 --- a/sys-apps/spu-tools/spu-tools-2.2.80_p95.ebuild
103 +++ b/sys-apps/spu-tools/spu-tools-2.2.80_p95.ebuild
104 @@ -1,11 +1,11 @@
105 -# Copyright 1999-2008 Gentoo Foundation
106 +# Copyright 1999-2015 Gentoo Foundation
107 # Distributed under the terms of the GNU General Public License v2
108 # $Id$
109
110 MY_P=${P/_p/-}
111
112 DESCRIPTION="CELL spu ps and top alike utilities"
113 -HOMEPAGE="http://sourceforge/projects/libspe"
114 +HOMEPAGE="https://sourceforge.net/projects/libspe"
115 SRC_URI="mirror://sourceforge/libspe/${MY_P}.tar.gz"
116
117 LICENSE="GPL-2"
118
119 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
120 deleted file mode 100644
121 index 1e49645..0000000
122 --- a/sys-apps/spu-tools/spu-tools-2.3.0.135.ebuild
123 +++ /dev/null
124 @@ -1,28 +0,0 @@
125 -# Copyright 1999-2008 Gentoo Foundation
126 -# Distributed under the terms of the GNU General Public License v2
127 -# $Id$
128 -
129 -MY_P=${P/_p/-}
130 -
131 -DESCRIPTION="CELL spu ps and top alike utilities"
132 -HOMEPAGE="http://sourceforge/projects/libspe"
133 -SRC_URI="mirror://sourceforge/libspe/${MY_P}.tar.gz"
134 -
135 -LICENSE="GPL-2"
136 -SLOT="0"
137 -KEYWORDS="~ppc ~ppc64"
138 -IUSE=""
139 -
140 -DEPEND="sys-libs/ncurses
141 - sys-apps/help2man"
142 -RDEPEND="sys-libs/ncurses"
143 -
144 -S="${WORKDIR}/${PN}/src"
145 -
146 -src_compile() {
147 - emake all || die "emake failed"
148 -}
149 -
150 -src_install() {
151 - make DESTDIR="$D" install || die
152 -}
153
154 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
155 new file mode 100644
156 index 0000000..403c515
157 --- /dev/null
158 +++ b/sys-apps/spu-tools/spu-tools-2.3.0.136.ebuild
159 @@ -0,0 +1,34 @@
160 +# Copyright 1999-2015 Gentoo Foundation
161 +# Distributed under the terms of the GNU General Public License v2
162 +# $Id$
163 +
164 +EAPI=5
165 +
166 +inherit eutils toolchain-funcs
167 +
168 +MY_P=${P/_p/-}
169 +
170 +DESCRIPTION="CELL spu ps and top alike utilities"
171 +HOMEPAGE="http://sourceforge.net/projects/libspe"
172 +SRC_URI="mirror://sourceforge/libspe/${MY_P}.tar.gz"
173 +
174 +LICENSE="GPL-2"
175 +SLOT="0"
176 +KEYWORDS="~ppc ~ppc64"
177 +IUSE=""
178 +
179 +RDEPEND="sys-libs/ncurses:0="
180 +DEPEND="${RDEPEND}
181 + sys-apps/help2man"
182 +
183 +S="${WORKDIR}/${PN}/src"
184 +
185 +src_prepare() {
186 + epatch \
187 + "${FILESDIR}"/${P}-buildsystem.patch \
188 + "${FILESDIR}"/${P}-format-security.patch
189 + tc-export CC
190 + export CFLAGS="${CFLAGS}"
191 + export LDFLAGS="${LDFLAGS}"
192 + export LIBS="$($(tc-getPKG_CONFIG) --libs ncurses)"
193 +}
Report Message
Find on MARC Find on Google Groups