Gentoo Archives: gentoo-commits

From: Lars Wendler <polynomial-c@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-admin/gkrellm/, app-admin/gkrellm/files/
Date: Tue, 07 Nov 2017 12:23:40
Message-Id: 1510057382.8cc9f7e1a61de2eceb207737734a4c16897a3721.polynomial-c@gentoo
1 commit: 8cc9f7e1a61de2eceb207737734a4c16897a3721
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Tue Nov 7 12:23:02 2017 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Tue Nov 7 12:23:02 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8cc9f7e1
7
8 app-admin/gkrellm: Removed old.
9
10 Package-Manager: Portage-2.3.13, Repoman-2.3.4
11
12 app-admin/gkrellm/Manifest | 2 -
13 app-admin/gkrellm/files/gkrellm-2.3.5-autofs.patch | 10 --
14 .../gkrellm/files/gkrellm-2.3.5-binding.patch | 30 -----
15 app-admin/gkrellm/files/gkrellm-2.3.5-dso.patch | 32 -----
16 .../files/gkrellm-2.3.5-format-security.patch | 12 --
17 .../gkrellm-2.3.7-pkgconfig_fix_newlines.patch | 11 --
18 app-admin/gkrellm/gkrellm-2.3.5-r4.ebuild | 128 ------------------
19 app-admin/gkrellm/gkrellm-2.3.7.ebuild | 144 ---------------------
20 8 files changed, 369 deletions(-)
21
22 diff --git a/app-admin/gkrellm/Manifest b/app-admin/gkrellm/Manifest
23 index 15a553314f5..dd019145e3d 100644
24 --- a/app-admin/gkrellm/Manifest
25 +++ b/app-admin/gkrellm/Manifest
26 @@ -1,3 +1 @@
27 DIST gkrellm-2.3.10.tar.bz2 782794 SHA256 8b9ec8baadcd5830c6aff04ba86dc9ed317a15c1c3787440bd1e680fb2fcd766 SHA512 3ae0baa0d51729e1bac7b8f10e008bd7ed9d93d48cd894630e3a027565266e6458df0dcb3171fb271ca7766f4030149e3e6aa234ec191e8e223ae4dee1feb295 WHIRLPOOL 5c8461d9675f1b6d7ed7e94910c15cb3a660fd143274de94a0bed559fc145e369328c345c43433384dea53214bdb3ea99cbd2953b80af95cb0031d8d3f1fb5c8
28 -DIST gkrellm-2.3.5.tar.bz2 765011 SHA256 702b5b0e9c040eb3af8e157453f38dd6f53e1dcd8b1272d20266cda3d4372c8b SHA512 9681ec5978b6be9f56a71726df36671829a4427f45caf90c8c3460e8c59004ff4083de1692cad16e3724ed37418bb3e4589d1961c140f3becfa3efd210b7a5dc WHIRLPOOL 3dceb20b9da49fb9b287e1faca88b3fdb7ae7af6dde5e675ee1e5c718467b131e34f740cb38719e5026ce0478146264fa4eaa060120e71f2c442ec5504e6dfb4
29 -DIST gkrellm-2.3.7.tar.bz2 777841 SHA256 f7a4642d2cc6b61242215e58e1bd8fe394e6fd984cd3c3f8964c1c554029735d SHA512 832353d245966a5d64ccbacd619905fe437b347c2654e279ec47b56aa1ef559a166b4791d63e151a5481c55c1d3775906e52213f42e5d7071fd15f00f8cecaa5 WHIRLPOOL 3fd8b51a1be5174308fe1dbbb1c1d83df0685c12e71cf410533f97439fb5cf001553c462e15b9971c55c6ea87b28429136fe0025d39c443cb9d215fcf7620f46
30
31 diff --git a/app-admin/gkrellm/files/gkrellm-2.3.5-autofs.patch b/app-admin/gkrellm/files/gkrellm-2.3.5-autofs.patch
32 deleted file mode 100644
33 index cf36a981711..00000000000
34 --- a/app-admin/gkrellm/files/gkrellm-2.3.5-autofs.patch
35 +++ /dev/null
36 @@ -1,10 +0,0 @@
37 ---- gkrellm-2.3.5.old/src/sysdeps/linux.c 2010-10-06 03:27:33.000000000 +1100
38 -+++ gkrellm-2.3.5/src/sysdeps/linux.c 2011-11-24 02:07:30.926450485 +1100
39 -@@ -1439,6 +1439,7 @@
40 - || !strcmp(type, "usbdevfs")
41 - || !strcmp(type, "usbfs")
42 - || !strcmp(type, "sysfs")
43 -+ || !strcmp(type, "autofs")
44 - )
45 - continue;
46 - /* Strip trailing / from the directory.
47
48 diff --git a/app-admin/gkrellm/files/gkrellm-2.3.5-binding.patch b/app-admin/gkrellm/files/gkrellm-2.3.5-binding.patch
49 deleted file mode 100644
50 index 83bf0b0d7d2..00000000000
51 --- a/app-admin/gkrellm/files/gkrellm-2.3.5-binding.patch
52 +++ /dev/null
53 @@ -1,30 +0,0 @@
54 -From a6983649c997dffd71d365792fa665cc135e696a Mon Sep 17 00:00:00 2001
55 -From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@×××.fi>
56 -Date: Fri, 10 Jan 2014 09:34:59 +0200
57 -Subject: [PATCH] Allow binding to a listen address that doesn't exist yet
58 -
59 ----
60 - server/main.c | 7 +++++++
61 - 1 file changed, 7 insertions(+)
62 -
63 -diff --git a/server/main.c b/server/main.c
64 -index a5a9e4e..b2f460b 100644
65 ---- a/server/main.c
66 -+++ b/server/main.c
67 -@@ -1003,6 +1003,13 @@ socksetup(int af)
68 - #endif
69 - continue;
70 - }
71 -+
72 -+#ifdef IP_FREEBIND
73 -+ if (setsockopt(*s, SOL_IP, IP_FREEBIND, &on, sizeof(on)) < 0)
74 -+ {
75 -+ g_warning("gkrellmd: setsockopt (IP_FREEBIND) failed\n");
76 -+ }
77 -+#endif
78 - }
79 -
80 - #ifdef IPV6_V6ONLY
81 ---
82 -1.8.3.1
83 -
84
85 diff --git a/app-admin/gkrellm/files/gkrellm-2.3.5-dso.patch b/app-admin/gkrellm/files/gkrellm-2.3.5-dso.patch
86 deleted file mode 100644
87 index 3a24baafe7d..00000000000
88 --- a/app-admin/gkrellm/files/gkrellm-2.3.5-dso.patch
89 +++ /dev/null
90 @@ -1,32 +0,0 @@
91 -From 2c839bf2703e99c3851b58695545fed90b6226fc Mon Sep 17 00:00:00 2001
92 -From: Alexandre Rostovtsev <tetromino@g.o>
93 -Date: Wed, 29 Aug 2012 22:28:47 -0400
94 -Subject: [PATCH] Explicitly link to libgmodule-2.0
95 -
96 -With >=gdk-pixbuf-2.24 and >=pango-1.30, libgmodule-2.0 is no longer
97 -provided by "pkg-config --libs gtk+-2.0 gthread-2.0", so link to it
98 -explicitly (as is already done in server/).
99 -
100 -Fixes build failure with gnu ld.gold in gkrellm-2.3.5.
101 -
102 -https://bugs.gentoo.org/show_bug.cgi?id=428532
103 ----
104 - src/Makefile | 2 +-
105 - 1 file changed, 1 insertion(+), 1 deletion(-)
106 -
107 -diff --git a/src/Makefile b/src/Makefile
108 -index 6d482a7..19b0c29 100644
109 ---- a/src/Makefile
110 -+++ b/src/Makefile
111 -@@ -69,7 +69,7 @@ STRIP ?= -s
112 - GKRELLM_INCLUDES = gkrellm.h gkrellm-public-proto.h $(SHARED_PATH)/log.h
113 -
114 - PKG_INCLUDE = `$(PKG_CONFIG) --cflags gtk+-2.0 gthread-2.0`
115 --PKG_LIB = `$(PKG_CONFIG) --libs gtk+-2.0 gthread-2.0`
116 -+PKG_LIB = `$(PKG_CONFIG) --libs gtk+-2.0 gmodule-2.0 gthread-2.0`
117 -
118 - FLAGS = -O2 -I.. -I$(SHARED_PATH) $(PKG_INCLUDE) $(GTOP_INCLUDE) $(PTHREAD_INC)\
119 - ${SSL_INCLUDE} ${NTLM_INCLUDE} -DGKRELLM_CLIENT
120 ---
121 -1.7.12
122 -
123
124 diff --git a/app-admin/gkrellm/files/gkrellm-2.3.5-format-security.patch b/app-admin/gkrellm/files/gkrellm-2.3.5-format-security.patch
125 deleted file mode 100644
126 index 3e0265af482..00000000000
127 --- a/app-admin/gkrellm/files/gkrellm-2.3.5-format-security.patch
128 +++ /dev/null
129 @@ -1,12 +0,0 @@
130 -diff -up gkrellm-2.3.5/server/main.c~ gkrellm-2.3.5/server/main.c
131 ---- gkrellm-2.3.5/server/main.c~ 2010-10-02 19:13:29.000000000 +0300
132 -+++ gkrellm-2.3.5/server/main.c 2013-12-06 22:56:38.690534043 +0200
133 -@@ -187,7 +187,7 @@ static void gkrellmd_syslog_log(GLogLeve
134 - if (log_level & G_LOG_LEVEL_CRITICAL)
135 - facility_priority = LOG_MAKEPRI(LOG_DAEMON, LOG_CRIT);
136 -
137 -- syslog(facility_priority, message);
138 -+ syslog(facility_priority, "%s", message);
139 - #endif // defined(WIN32)
140 - } // gkrellmd_syslog_log()
141 -
142
143 diff --git a/app-admin/gkrellm/files/gkrellm-2.3.7-pkgconfig_fix_newlines.patch b/app-admin/gkrellm/files/gkrellm-2.3.7-pkgconfig_fix_newlines.patch
144 deleted file mode 100644
145 index a699b80e5b2..00000000000
146 --- a/app-admin/gkrellm/files/gkrellm-2.3.7-pkgconfig_fix_newlines.patch
147 +++ /dev/null
148 @@ -1,11 +0,0 @@
149 ---- gkrellm-2.3.7/Makefile
150 -+++ gkrellm-2.3.7/Makefile
151 -@@ -131,7 +131,7 @@
152 - (cd server && ${MAKE} gkrellmd)
153 -
154 - gkrellm.pc: Makefile
155 -- echo 'prefix=$(INSTALLROOT)\n'\
156 -+ printf 'prefix=$(INSTALLROOT)\n'\
157 - 'Name: GKrellM\n'\
158 - 'Description: Extensible GTK system monitoring application\n'\
159 - 'Version: $(VERSION)\n'\
160
161 diff --git a/app-admin/gkrellm/gkrellm-2.3.5-r4.ebuild b/app-admin/gkrellm/gkrellm-2.3.5-r4.ebuild
162 deleted file mode 100644
163 index 270ad03b149..00000000000
164 --- a/app-admin/gkrellm/gkrellm-2.3.5-r4.ebuild
165 +++ /dev/null
166 @@ -1,128 +0,0 @@
167 -# Copyright 1999-2016 Gentoo Foundation
168 -# Distributed under the terms of the GNU General Public License v2
169 -
170 -EAPI=5
171 -
172 -inherit eutils multilib user systemd toolchain-funcs
173 -
174 -DESCRIPTION="Single process stack of various system monitors"
175 -HOMEPAGE="http://www.gkrellm.net/"
176 -SRC_URI="http://members.dslextreme.com/users/billw/${PN}/${P}.tar.bz2"
177 -
178 -LICENSE="GPL-3"
179 -SLOT="2"
180 -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
181 -IUSE="gnutls hddtemp lm_sensors nls ntlm ssl kernel_FreeBSD X"
182 -
183 -RDEPEND="
184 - dev-libs/glib:2
185 - hddtemp? ( app-admin/hddtemp )
186 - gnutls? ( net-libs/gnutls )
187 - !gnutls? ( ssl? ( dev-libs/openssl:0= ) )
188 - lm_sensors? ( sys-apps/lm_sensors )
189 - nls? ( virtual/libintl )
190 - ntlm? ( net-libs/libntlm )
191 - X? (
192 - x11-libs/gtk+:2
193 - x11-libs/pango
194 - )"
195 -DEPEND="${RDEPEND}
196 - virtual/pkgconfig
197 - nls? ( sys-devel/gettext )"
198 -
199 -pkg_setup() {
200 - enewgroup gkrellmd
201 - enewuser gkrellmd -1 -1 -1 gkrellmd
202 - TARGET=
203 - use kernel_FreeBSD && TARGET="freebsd"
204 -}
205 -
206 -src_prepare() {
207 - sed -e 's:-O2 ::' \
208 - -e 's:override CC:CFLAGS:' \
209 - -e 's:-L/usr/X11R6/lib::' \
210 - -i */Makefile || die "sed Makefile(s) failed"
211 -
212 - sed -e "s:/usr/lib:${EPREFIX}/usr/$(get_libdir):" \
213 - -e "s:/usr/local/lib:${EPREFIX}/usr/local/$(get_libdir):" \
214 - -i src/${PN}.h || die "sed ${PN}.h failed"
215 -
216 - epatch \
217 - "${FILESDIR}"/${P}-autofs.patch \
218 - "${FILESDIR}"/${P}-cifs.patch \
219 - "${FILESDIR}"/${P}-dso.patch \
220 - "${FILESDIR}"/${P}-format-security.patch \
221 - "${FILESDIR}"/${P}-config.patch \
222 - "${FILESDIR}"/${P}-width.patch \
223 - "${FILESDIR}"/${P}-binding.patch \
224 - "${FILESDIR}"/${P}-sansfont.patch
225 -}
226 -
227 -src_compile() {
228 - if use X ; then
229 - local sslopt=""
230 - if use gnutls; then
231 - sslopt="without-ssl=yes"
232 - elif use ssl; then
233 - sslopt="without-gnutls=yes"
234 - else
235 - sslopt="without-ssl=yes without-gnutls=yes"
236 - fi
237 -
238 - emake \
239 - ${TARGET} \
240 - CC="$(tc-getCC)" \
241 - STRIP="" \
242 - INSTALLROOT="${EPREFIX}/usr" \
243 - INCLUDEDIR="${EPREFIX}/usr/include/gkrellm2" \
244 - LOCALEDIR="${EPREFIX}/usr/share/locale" \
245 - $(usex nls "" "enable_nls=0") \
246 - $(usex lm_sensors "" "without-libsensors=yes") \
247 - $(usex ntlm "" "without-ntlm=yes") \
248 - ${sslopt}
249 - else
250 - cd server || die
251 - emake \
252 - ${TARGET} \
253 - CC="$(tc-getCC)" \
254 - LINK_FLAGS="$LDFLAGS -Wl,-E" \
255 - STRIP="" \
256 - $(usex nls "" "enable_nls=0") \
257 - $(usex lm_sensors "" "without-libsensors=yes")
258 - fi
259 -}
260 -
261 -src_install() {
262 - if use X ; then
263 - emake \
264 - install${TARGET:+_}${TARGET} \
265 - $(usex nls "" "enable_nls=0") \
266 - STRIP="" \
267 - INSTALLDIR="${ED}/usr/bin" \
268 - INCLUDEDIR="${ED}/usr/include" \
269 - LOCALEDIR="${ED}/usr/share/locale" \
270 - PKGCONFIGDIR="${ED}/usr/$(get_libdir)/pkgconfig" \
271 - MANDIR="${ED}/usr/share/man/man1"
272 -
273 - dohtml *.html
274 -
275 - newicon src/icon.xpm ${PN}.xpm
276 - make_desktop_entry ${PN} GKrellM ${PN}
277 - else
278 - dobin server/gkrellmd
279 -
280 - insinto /usr/include/gkrellm2
281 - doins server/gkrellmd.h
282 - doins shared/log.h
283 - fi
284 -
285 - doinitd "${FILESDIR}"/gkrellmd
286 - newconfd "${FILESDIR}"/gkrellmd.conf gkrellmd
287 -
288 - systemd_dounit "${FILESDIR}"/gkrellmd.service
289 -
290 - insinto /etc
291 - doins server/gkrellmd.conf
292 -
293 - dodoc Changelog CREDITS README
294 -}
295
296 diff --git a/app-admin/gkrellm/gkrellm-2.3.7.ebuild b/app-admin/gkrellm/gkrellm-2.3.7.ebuild
297 deleted file mode 100644
298 index 50b713c9657..00000000000
299 --- a/app-admin/gkrellm/gkrellm-2.3.7.ebuild
300 +++ /dev/null
301 @@ -1,144 +0,0 @@
302 -# Copyright 1999-2016 Gentoo Foundation
303 -# Distributed under the terms of the GNU General Public License v2
304 -
305 -EAPI=6
306 -
307 -inherit eutils multilib user systemd toolchain-funcs
308 -
309 -MY_P="${P/_/-}"
310 -
311 -DESCRIPTION="Single process stack of various system monitors"
312 -HOMEPAGE="http://www.gkrellm.net/"
313 -SRC_URI="http://gkrellm.srcbox.net/${MY_P}.tar.bz2"
314 -
315 -LICENSE="GPL-3"
316 -SLOT="2"
317 -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
318 -IUSE="gnutls hddtemp libressl lm_sensors nls ntlm ssl kernel_FreeBSD X"
319 -
320 -RDEPEND="
321 - dev-libs/glib:2
322 - hddtemp? ( app-admin/hddtemp )
323 - gnutls? ( net-libs/gnutls )
324 - !gnutls? (
325 - ssl? (
326 - !libressl? ( dev-libs/openssl:0= )
327 - libressl? ( dev-libs/libressl:0= )
328 - )
329 - )
330 - lm_sensors? ( sys-apps/lm_sensors )
331 - nls? ( virtual/libintl )
332 - ntlm? ( net-libs/libntlm )
333 - X? (
334 - x11-libs/gdk-pixbuf
335 - x11-libs/gtk+:2
336 - x11-libs/libICE
337 - x11-libs/libSM
338 - x11-libs/libX11
339 - x11-libs/pango
340 - )"
341 -DEPEND="${RDEPEND}
342 - virtual/pkgconfig
343 - nls? ( sys-devel/gettext )"
344 -
345 -PATCHES=(
346 - "${FILESDIR}"/${PN}-2.3.5-cifs.patch
347 - "${FILESDIR}"/${PN}-2.3.5-config.patch
348 - "${FILESDIR}"/${PN}-2.3.5-width.patch
349 - "${FILESDIR}"/${PN}-2.3.5-sansfont.patch
350 - "${FILESDIR}"/${P}-pkgconfig_fix_newlines.patch
351 -)
352 -
353 -S="${WORKDIR}/${MY_P}"
354 -
355 -DOCS=( Changelog CREDITS README )
356 -
357 -pkg_setup() {
358 - enewgroup gkrellmd
359 - enewuser gkrellmd -1 -1 -1 gkrellmd
360 - TARGET=
361 - use kernel_FreeBSD && TARGET="freebsd"
362 -}
363 -
364 -src_prepare() {
365 - sed -e 's:-O2 ::' \
366 - -e 's:override CC:CFLAGS:' \
367 - -e 's:-L/usr/X11R6/lib::' \
368 - -i */Makefile || die "sed Makefile(s) failed"
369 -
370 - sed -e "s:/usr/lib:${EPREFIX}/usr/$(get_libdir):" \
371 - -e "s:/usr/local/lib:${EPREFIX}/usr/local/$(get_libdir):" \
372 - -i src/${PN}.h || die "sed ${PN}.h failed"
373 -
374 - default
375 -}
376 -
377 -src_compile() {
378 - if use X ; then
379 - local sslopt=""
380 - if use gnutls; then
381 - sslopt="without-ssl=yes"
382 - elif use ssl; then
383 - sslopt="without-gnutls=yes"
384 - else
385 - sslopt="without-ssl=yes without-gnutls=yes"
386 - fi
387 -
388 - emake \
389 - ${TARGET} \
390 - CC="$(tc-getCC)" \
391 - STRIP="" \
392 - INSTALLROOT="${EPREFIX}/usr" \
393 - INCLUDEDIR="${EPREFIX}/usr/include/gkrellm2" \
394 - LOCALEDIR="${EPREFIX}/usr/share/locale" \
395 - $(usex nls "" "enable_nls=0") \
396 - $(usex lm_sensors "" "without-libsensors=yes") \
397 - $(usex ntlm "" "without-ntlm=yes") \
398 - ${sslopt}
399 - else
400 - cd server || die
401 - emake \
402 - ${TARGET} \
403 - CC="$(tc-getCC)" \
404 - LINK_FLAGS="$LDFLAGS -Wl,-E" \
405 - STRIP="" \
406 - $(usex nls "" "enable_nls=0") \
407 - $(usex lm_sensors "" "without-libsensors=yes")
408 - fi
409 -}
410 -
411 -src_install() {
412 - if use X ; then
413 - emake \
414 - install${TARGET:+_}${TARGET} \
415 - $(usex nls "" "enable_nls=0") \
416 - STRIP="" \
417 - INSTALLDIR="${ED}/usr/bin" \
418 - INCLUDEDIR="${ED}/usr/include" \
419 - LOCALEDIR="${ED}/usr/share/locale" \
420 - PKGCONFIGDIR="${ED}/usr/$(get_libdir)/pkgconfig" \
421 - MANDIR="${ED}/usr/share/man/man1"
422 -
423 - docinto html
424 - dodoc *.html
425 -
426 - newicon src/icon.xpm ${PN}.xpm
427 - make_desktop_entry ${PN} GKrellM ${PN}
428 - else
429 - dobin server/gkrellmd
430 -
431 - insinto /usr/include/gkrellm2
432 - doins server/gkrellmd.h
433 - doins shared/log.h
434 - fi
435 -
436 - newinitd "${FILESDIR}"/gkrellmd.initd gkrellmd
437 - newconfd "${FILESDIR}"/gkrellmd.conf gkrellmd
438 -
439 - systemd_dounit "${FILESDIR}"/gkrellmd.service
440 -
441 - insinto /etc
442 - doins server/gkrellmd.conf
443 -
444 - einstalldocs
445 -}