From: "Lars Wendler" <polynomial-c@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: app-admin/gkrellm/, app-admin/gkrellm/files/
Date: Thu, 8 Sep 2016 07:20:28 +0000 (UTC) [thread overview]
Message-ID: <1473319219.a12d6b7e81bc0f27be3bf1a7cc3f913c7f96d9e0.polynomial-c@gentoo> (raw)
commit: a12d6b7e81bc0f27be3bf1a7cc3f913c7f96d9e0
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 8 06:41:33 2016 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Thu Sep 8 07:20:19 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a12d6b7e
app-admin/gkrellm: Removed old.
Package-Manager: portage-2.3.0
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
app-admin/gkrellm/Manifest | 2 -
...krellm-2.3.6_rc1-avoid_possible_busy_loop.patch | 65 ---------
.../gkrellm-2.3.6_rc1-fix_copypaste_error.patch | 24 ----
...llm-2.3.6_rc1-fix_gtk_deprecation_warning.patch | 29 ----
app-admin/gkrellm/gkrellm-2.3.6_rc1-r1.ebuild | 148 ---------------------
app-admin/gkrellm/gkrellm-2.3.6_rc1.ebuild | 143 --------------------
6 files changed, 411 deletions(-)
diff --git a/app-admin/gkrellm/Manifest b/app-admin/gkrellm/Manifest
index 35d7a2a..fc63775 100644
--- a/app-admin/gkrellm/Manifest
+++ b/app-admin/gkrellm/Manifest
@@ -1,5 +1,3 @@
DIST gkrellm-2.3.5.tar.bz2 765011 SHA256 702b5b0e9c040eb3af8e157453f38dd6f53e1dcd8b1272d20266cda3d4372c8b SHA512 9681ec5978b6be9f56a71726df36671829a4427f45caf90c8c3460e8c59004ff4083de1692cad16e3724ed37418bb3e4589d1961c140f3becfa3efd210b7a5dc WHIRLPOOL 3dceb20b9da49fb9b287e1faca88b3fdb7ae7af6dde5e675ee1e5c718467b131e34f740cb38719e5026ce0478146264fa4eaa060120e71f2c442ec5504e6dfb4
-DIST gkrellm-2.3.6-rc1.tar.bz2 784934 SHA256 abeeb0c04a8f911db5f07a95a98e4044326a657f65986013d36a736ba4e47ae8 SHA512 2004c6e57dc5dba9dbbd4c713caa29f5b59e4926b1ce4a3cfb47840096d6d93d66633d15d5588bc22e31df88241248d7910645da75de39278f1fd68255b88517 WHIRLPOOL f3506e88dc19e3eebe313b5f57a5d605d6b011808391036ff5332140c53061f8ee99b942b2b287cb7f645e9f2491e654623759b4a01fa454c785883355141319
-DIST gkrellm-2.3.6_rc1-update_german_translation.patch.xz 18184 SHA256 cb90522c99135736ac3073b7e688fbcb0da31f6594ce3fc851df87c9be10f2df SHA512 c79feb4b740b303e5e6e2ccf84694770bac746b375a0a09918ef1ac67b2700f3a7796251cd4224958ca50a8f81a501bf468dc7a78844218074130758a8248150 WHIRLPOOL ea3d532aa670b7344cc2dd6c5fd4dda6ec27832c039547ace0772b4a3002baaeb598003d81bf2231b2506de1e22d2b83959e4f1bc7ec13b56b2366c43101ace0
DIST gkrellm-2.3.7.tar.bz2 777841 SHA256 f7a4642d2cc6b61242215e58e1bd8fe394e6fd984cd3c3f8964c1c554029735d SHA512 832353d245966a5d64ccbacd619905fe437b347c2654e279ec47b56aa1ef559a166b4791d63e151a5481c55c1d3775906e52213f42e5d7071fd15f00f8cecaa5 WHIRLPOOL 3fd8b51a1be5174308fe1dbbb1c1d83df0685c12e71cf410533f97439fb5cf001553c462e15b9971c55c6ea87b28429136fe0025d39c443cb9d215fcf7620f46
DIST gkrellm-2.3.8.tar.xz 659164 SHA256 8064ec03ac151c22d716e08d09851102e9deeb2156a265d97f5cf7ad547fa9e3 SHA512 da6410e26a3ef3ae8c951a4b608e09748616ef89786590456df183b90133c3c5a94fb99e56fcde5e0b25e09ca1682bffc194c3ccae305da25b88ce131c89fd99 WHIRLPOOL 638d26a20f3839b53d071efc803ab1b67df1114075b57c636bfa31d15d0c864b074f8fe2ea04955f95b854c3501967d7dbdbe93b95bec4975a4c230fdb63ecec
diff --git a/app-admin/gkrellm/files/gkrellm-2.3.6_rc1-avoid_possible_busy_loop.patch b/app-admin/gkrellm/files/gkrellm-2.3.6_rc1-avoid_possible_busy_loop.patch
deleted file mode 100644
index b6843b6..00000000
--- a/app-admin/gkrellm/files/gkrellm-2.3.6_rc1-avoid_possible_busy_loop.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From 285adc8acd22892f86435edd84bf9b22c915b349 Mon Sep 17 00:00:00 2001
-From: Bill Wilson
-Date: Wed, 5 Nov 2014 17:46:37 -0600
-Subject: Avoid possible busy loop in read_server_setup()
-
-A patch from Joe Garcia. A ssh tunnel can be up but possibly not
-connected to anything in which case gkrellm_getline() can return 0.
-This patch prevents a busy loop by limiting the 0 return retries.
-
-diff --git a/src/client.c b/src/client.c
-index e7c5116..0eb2924 100644
---- a/src/client.c
-+++ b/src/client.c
-@@ -1712,8 +1712,10 @@ process_server_line(KeyTable *table, gint table_size, gchar *line)
- static gboolean
- read_server_setup(gint fd)
- {
-- gchar buf[4097]; /* TODO: Use dynamic receive buffer */
-- gint table_size;
-+ gchar buf[4097]; /* TODO: Use dynamic receive buffer */
-+ gint table_size;
-+ gint rs;
-+ gint retries = 10;
-
- gkrellm_debug(DEBUG_CLIENT, "read_server_setup()\n");
-
-@@ -1726,13 +1728,18 @@ read_server_setup(gint fd)
-
- gkrellm_free_glist_and_data(&client_plugin_setup_line_list);
-
-- gint rs;
--
- while (1)
- {
- rs = gkrellm_getline(fd, buf, sizeof(buf));
-- if (rs < 0)
-- return FALSE;
-+ if (rs < 0)
-+ return FALSE;
-+ if (rs == 0)
-+ {
-+ if (--retries)
-+ usleep(10000);
-+ else
-+ return FALSE;
-+ }
- if (!strcmp(buf, "</gkrellmd_setup>"))
- break;
- process_server_line(&setup_table[0], table_size, buf);
-@@ -1751,6 +1758,12 @@ read_server_setup(gint fd)
- rs = gkrellm_getline(fd, buf, sizeof(buf));
- if (rs < 0)
- return FALSE;
-+ if (rs==0){
-+ if(--retries)
-+ usleep(10000);
-+ else
-+ return FALSE;
-+ }
- if (!strcmp(buf, "</initial_update>"))
- break;
- process_server_line(&update_table[0], table_size, buf);
---
-cgit v0.10.2-6-g49f6
-
diff --git a/app-admin/gkrellm/files/gkrellm-2.3.6_rc1-fix_copypaste_error.patch b/app-admin/gkrellm/files/gkrellm-2.3.6_rc1-fix_copypaste_error.patch
deleted file mode 100644
index d5348e2..00000000
--- a/app-admin/gkrellm/files/gkrellm-2.3.6_rc1-fix_copypaste_error.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From f3f67b79195cb9dbb6f7c2401ffe17d3e3b8321b Mon Sep 17 00:00:00 2001
-From: Jindřich Makovička
-Date: Sun, 26 Oct 2014 17:15:49 +0100
-Subject: fix copy/paste error
-
-This regression was introduced by commit
-6365d18ad0ab6f3646e220bfc493bb2422c6f9aa
-
-diff --git a/src/plugins.c b/src/plugins.c
-index 18278fa..55cd157 100644
---- a/src/plugins.c
-+++ b/src/plugins.c
-@@ -1349,7 +1349,7 @@ replace_plugins()
- {
- gtk_box_pack_start(GTK_BOX(gkrellm_monitor_vbox()),
- mon->privat->main_vbox, FALSE, FALSE, 0);
-- g_object_ref(G_OBJECT(mon->privat->main_vbox));
-+ g_object_unref(G_OBJECT(mon->privat->main_vbox));
- }
- }
- }
---
-cgit v0.10.2-6-g49f6
-
diff --git a/app-admin/gkrellm/files/gkrellm-2.3.6_rc1-fix_gtk_deprecation_warning.patch b/app-admin/gkrellm/files/gkrellm-2.3.6_rc1-fix_gtk_deprecation_warning.patch
deleted file mode 100644
index 1f40e2c..00000000
--- a/app-admin/gkrellm/files/gkrellm-2.3.6_rc1-fix_gtk_deprecation_warning.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From e15c0d4a029e14e8fbd03f2773b8504d7e090ced Mon Sep 17 00:00:00 2001
-From: Bill Wilson
-Date: Tue, 21 Oct 2014 18:49:41 -0500
-Subject: Fix deprecated allow-shring & allow-grow warnings
-
-Reported by Troy Engel, avoid recent GTK version deprecated warnings
-by using gtk_window_set_resizable().
-
-diff --git a/src/main.c b/src/main.c
-index 205f462..d130d81 100644
---- a/src/main.c
-+++ b/src/main.c
-@@ -1553,9 +1553,10 @@ create_widget_tree()
-
- gtk_widget_realize(gtree.window);
-
-- /* gtk_window_set_resizable() */
-- g_object_set(G_OBJECT(gtree.window), "allow_shrink", FALSE, NULL);
-- g_object_set(G_OBJECT(gtree.window), "allow_grow", FALSE, NULL);
-+ /* Set the toplevel window size handling to be under program control.
-+ */
-+ gtk_window_set_resizable((GtkWindow *) gtree.window, FALSE);
-+
- if (!decorated)
- gtk_window_set_decorated((GtkWindow *) gtree.window, FALSE);
-
---
-cgit v0.10.2-6-g49f6
-
diff --git a/app-admin/gkrellm/gkrellm-2.3.6_rc1-r1.ebuild b/app-admin/gkrellm/gkrellm-2.3.6_rc1-r1.ebuild
deleted file mode 100644
index 5edd628b..00000000
--- a/app-admin/gkrellm/gkrellm-2.3.6_rc1-r1.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils multilib user systemd toolchain-funcs
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="Single process stack of various system monitors"
-HOMEPAGE="http://www.gkrellm.net/"
-SRC_URI="
- http://gkrellm.srcbox.net/${MY_P}.tar.bz2
- https://dev.gentoo.org/~jlec/distfiles/${P}-update_german_translation.patch.xz
- "
-
-LICENSE="GPL-3"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="gnutls hddtemp libressl lm_sensors nls ntlm ssl kernel_FreeBSD X"
-
-RDEPEND="
- dev-libs/glib:2
- hddtemp? ( app-admin/hddtemp )
- gnutls? ( net-libs/gnutls )
- !gnutls? (
- ssl? (
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:0= )
- )
- )
- lm_sensors? ( sys-apps/lm_sensors )
- nls? ( virtual/libintl )
- ntlm? ( net-libs/libntlm )
- X? (
- x11-libs/gdk-pixbuf
- x11-libs/gtk+:2
- x11-libs/libICE
- x11-libs/libSM
- x11-libs/libX11
- x11-libs/pango
- )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- nls? ( sys-devel/gettext )"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-2.3.5-cifs.patch
- "${FILESDIR}"/${PN}-2.3.5-config.patch
- "${FILESDIR}"/${PN}-2.3.5-width.patch
- "${FILESDIR}"/${PN}-2.3.5-sansfont.patch
- "${FILESDIR}"/${P}-fix_gtk_deprecation_warning.patch
- "${FILESDIR}"/${P}-fix_copypaste_error.patch
- "${FILESDIR}"/${P}-avoid_possible_busy_loop.patch
- "${WORKDIR}"/${P}-update_german_translation.patch
-)
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
- enewgroup gkrellmd
- enewuser gkrellmd -1 -1 -1 gkrellmd
- TARGET=
- use kernel_FreeBSD && TARGET="freebsd"
-}
-
-src_prepare() {
- sed -e 's:-O2 ::' \
- -e 's:override CC:CFLAGS:' \
- -e 's:-L/usr/X11R6/lib::' \
- -i */Makefile || die "sed Makefile(s) failed"
-
- sed -e "s:/usr/lib:${EPREFIX}/usr/$(get_libdir):" \
- -e "s:/usr/local/lib:${EPREFIX}/usr/local/$(get_libdir):" \
- -i src/${PN}.h || die "sed ${PN}.h failed"
-
- epatch ${PATCHES[@]}
-}
-
-src_compile() {
- if use X ; then
- local sslopt=""
- if use gnutls; then
- sslopt="without-ssl=yes"
- elif use ssl; then
- sslopt="without-gnutls=yes"
- else
- sslopt="without-ssl=yes without-gnutls=yes"
- fi
-
- emake \
- ${TARGET} \
- CC="$(tc-getCC)" \
- STRIP="" \
- INSTALLROOT="${EPREFIX}/usr" \
- INCLUDEDIR="${EPREFIX}/usr/include/gkrellm2" \
- LOCALEDIR="${EPREFIX}/usr/share/locale" \
- $(usex nls "" "enable_nls=0") \
- $(usex lm_sensors "" "without-libsensors=yes") \
- $(usex ntlm "" "without-ntlm=yes") \
- ${sslopt}
- else
- cd server || die
- emake \
- ${TARGET} \
- CC="$(tc-getCC)" \
- LINK_FLAGS="$LDFLAGS -Wl,-E" \
- STRIP="" \
- $(usex nls "" "enable_nls=0") \
- $(usex lm_sensors "" "without-libsensors=yes")
- fi
-}
-
-src_install() {
- if use X ; then
- emake \
- install${TARGET:+_}${TARGET} \
- $(usex nls "" "enable_nls=0") \
- STRIP="" \
- INSTALLDIR="${ED}/usr/bin" \
- INCLUDEDIR="${ED}/usr/include" \
- LOCALEDIR="${ED}/usr/share/locale" \
- PKGCONFIGDIR="${ED}/usr/$(get_libdir)/pkgconfig" \
- MANDIR="${ED}/usr/share/man/man1"
-
- dohtml *.html
-
- newicon src/icon.xpm ${PN}.xpm
- make_desktop_entry ${PN} GKrellM ${PN}
- else
- dobin server/gkrellmd
-
- insinto /usr/include/gkrellm2
- doins server/gkrellmd.h
- doins shared/log.h
- fi
-
- newinitd "${FILESDIR}"/gkrellmd.initd gkrellmd
- newconfd "${FILESDIR}"/gkrellmd.conf gkrellmd
-
- systemd_dounit "${FILESDIR}"/gkrellmd.service
-
- insinto /etc
- doins server/gkrellmd.conf
-
- dodoc Changelog CREDITS README
-}
diff --git a/app-admin/gkrellm/gkrellm-2.3.6_rc1.ebuild b/app-admin/gkrellm/gkrellm-2.3.6_rc1.ebuild
deleted file mode 100644
index 8022bd5..00000000
--- a/app-admin/gkrellm/gkrellm-2.3.6_rc1.ebuild
+++ /dev/null
@@ -1,143 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils multilib user systemd toolchain-funcs
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="Single process stack of various system monitors"
-HOMEPAGE="http://www.gkrellm.net/"
-SRC_URI="
- http://gkrellm.srcbox.net/${MY_P}.tar.bz2
- https://dev.gentoo.org/~jlec/distfiles/${P}-update_german_translation.patch.xz
- "
-
-LICENSE="GPL-3"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="gnutls hddtemp lm_sensors nls ntlm ssl kernel_FreeBSD X"
-
-RDEPEND="
- dev-libs/glib:2
- hddtemp? ( app-admin/hddtemp )
- gnutls? ( net-libs/gnutls )
- !gnutls? ( ssl? ( dev-libs/openssl:0= ) )
- lm_sensors? ( sys-apps/lm_sensors )
- nls? ( virtual/libintl )
- ntlm? ( net-libs/libntlm )
- X? (
- x11-libs/gdk-pixbuf
- x11-libs/gtk+:2
- x11-libs/libICE
- x11-libs/libSM
- x11-libs/libX11
- x11-libs/pango
- )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- nls? ( sys-devel/gettext )"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-2.3.5-cifs.patch
- "${FILESDIR}"/${PN}-2.3.5-config.patch
- "${FILESDIR}"/${PN}-2.3.5-width.patch
- "${FILESDIR}"/${PN}-2.3.5-sansfont.patch
- "${FILESDIR}"/${P}-fix_gtk_deprecation_warning.patch
- "${FILESDIR}"/${P}-fix_copypaste_error.patch
- "${FILESDIR}"/${P}-avoid_possible_busy_loop.patch
- "${WORKDIR}"/${P}-update_german_translation.patch
-)
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
- enewgroup gkrellmd
- enewuser gkrellmd -1 -1 -1 gkrellmd
- TARGET=
- use kernel_FreeBSD && TARGET="freebsd"
-}
-
-src_prepare() {
- sed -e 's:-O2 ::' \
- -e 's:override CC:CFLAGS:' \
- -e 's:-L/usr/X11R6/lib::' \
- -i */Makefile || die "sed Makefile(s) failed"
-
- sed -e "s:/usr/lib:${EPREFIX}/usr/$(get_libdir):" \
- -e "s:/usr/local/lib:${EPREFIX}/usr/local/$(get_libdir):" \
- -i src/${PN}.h || die "sed ${PN}.h failed"
-
- epatch ${PATCHES[@]}
-}
-
-src_compile() {
- if use X ; then
- local sslopt=""
- if use gnutls; then
- sslopt="without-ssl=yes"
- elif use ssl; then
- sslopt="without-gnutls=yes"
- else
- sslopt="without-ssl=yes without-gnutls=yes"
- fi
-
- emake \
- ${TARGET} \
- CC="$(tc-getCC)" \
- STRIP="" \
- INSTALLROOT="${EPREFIX}/usr" \
- INCLUDEDIR="${EPREFIX}/usr/include/gkrellm2" \
- LOCALEDIR="${EPREFIX}/usr/share/locale" \
- $(usex nls "" "enable_nls=0") \
- $(usex lm_sensors "" "without-libsensors=yes") \
- $(usex ntlm "" "without-ntlm=yes") \
- ${sslopt}
- else
- cd server || die
- emake \
- ${TARGET} \
- CC="$(tc-getCC)" \
- LINK_FLAGS="$LDFLAGS -Wl,-E" \
- STRIP="" \
- $(usex nls "" "enable_nls=0") \
- $(usex lm_sensors "" "without-libsensors=yes")
- fi
-}
-
-src_install() {
- if use X ; then
- emake \
- install${TARGET:+_}${TARGET} \
- $(usex nls "" "enable_nls=0") \
- STRIP="" \
- INSTALLDIR="${ED}/usr/bin" \
- INCLUDEDIR="${ED}/usr/include" \
- LOCALEDIR="${ED}/usr/share/locale" \
- PKGCONFIGDIR="${ED}/usr/$(get_libdir)/pkgconfig" \
- MANDIR="${ED}/usr/share/man/man1"
-
- dohtml *.html
-
- newicon src/icon.xpm ${PN}.xpm
- make_desktop_entry ${PN} GKrellM ${PN}
- else
- dobin server/gkrellmd
-
- insinto /usr/include/gkrellm2
- doins server/gkrellmd.h
- doins shared/log.h
- fi
-
- newinitd "${FILESDIR}"/gkrellmd.initd gkrellmd
- newconfd "${FILESDIR}"/gkrellmd.conf gkrellmd
-
- systemd_dounit "${FILESDIR}"/gkrellmd.service
-
- insinto /etc
- doins server/gkrellmd.conf
-
- dodoc Changelog CREDITS README
-}
next reply other threads:[~2016-09-08 7:20 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-09-08 7:20 Lars Wendler [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-06-13 15:12 [gentoo-commits] repo/gentoo:master commit in: app-admin/gkrellm/, app-admin/gkrellm/files/ Sam James
2020-09-03 19:31 Lars Wendler
2017-11-07 12:23 Lars Wendler
2017-04-23 15:35 Mike Gilbert
2016-04-25 19:20 Austin English
2016-04-06 17:11 Justin Lecher
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1473319219.a12d6b7e81bc0f27be3bf1a7cc3f913c7f96d9e0.polynomial-c@gentoo \
--to=polynomial-c@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox