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: Tue, 7 Nov 2017 12:23:36 +0000 (UTC) [thread overview]
Message-ID: <1510057382.8cc9f7e1a61de2eceb207737734a4c16897a3721.polynomial-c@gentoo> (raw)
commit: 8cc9f7e1a61de2eceb207737734a4c16897a3721
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 7 12:23:02 2017 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Tue Nov 7 12:23:02 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8cc9f7e1
app-admin/gkrellm: Removed old.
Package-Manager: Portage-2.3.13, Repoman-2.3.4
app-admin/gkrellm/Manifest | 2 -
app-admin/gkrellm/files/gkrellm-2.3.5-autofs.patch | 10 --
.../gkrellm/files/gkrellm-2.3.5-binding.patch | 30 -----
app-admin/gkrellm/files/gkrellm-2.3.5-dso.patch | 32 -----
.../files/gkrellm-2.3.5-format-security.patch | 12 --
.../gkrellm-2.3.7-pkgconfig_fix_newlines.patch | 11 --
app-admin/gkrellm/gkrellm-2.3.5-r4.ebuild | 128 ------------------
app-admin/gkrellm/gkrellm-2.3.7.ebuild | 144 ---------------------
8 files changed, 369 deletions(-)
diff --git a/app-admin/gkrellm/Manifest b/app-admin/gkrellm/Manifest
index 15a553314f5..dd019145e3d 100644
--- a/app-admin/gkrellm/Manifest
+++ b/app-admin/gkrellm/Manifest
@@ -1,3 +1 @@
DIST gkrellm-2.3.10.tar.bz2 782794 SHA256 8b9ec8baadcd5830c6aff04ba86dc9ed317a15c1c3787440bd1e680fb2fcd766 SHA512 3ae0baa0d51729e1bac7b8f10e008bd7ed9d93d48cd894630e3a027565266e6458df0dcb3171fb271ca7766f4030149e3e6aa234ec191e8e223ae4dee1feb295 WHIRLPOOL 5c8461d9675f1b6d7ed7e94910c15cb3a660fd143274de94a0bed559fc145e369328c345c43433384dea53214bdb3ea99cbd2953b80af95cb0031d8d3f1fb5c8
-DIST gkrellm-2.3.5.tar.bz2 765011 SHA256 702b5b0e9c040eb3af8e157453f38dd6f53e1dcd8b1272d20266cda3d4372c8b SHA512 9681ec5978b6be9f56a71726df36671829a4427f45caf90c8c3460e8c59004ff4083de1692cad16e3724ed37418bb3e4589d1961c140f3becfa3efd210b7a5dc WHIRLPOOL 3dceb20b9da49fb9b287e1faca88b3fdb7ae7af6dde5e675ee1e5c718467b131e34f740cb38719e5026ce0478146264fa4eaa060120e71f2c442ec5504e6dfb4
-DIST gkrellm-2.3.7.tar.bz2 777841 SHA256 f7a4642d2cc6b61242215e58e1bd8fe394e6fd984cd3c3f8964c1c554029735d SHA512 832353d245966a5d64ccbacd619905fe437b347c2654e279ec47b56aa1ef559a166b4791d63e151a5481c55c1d3775906e52213f42e5d7071fd15f00f8cecaa5 WHIRLPOOL 3fd8b51a1be5174308fe1dbbb1c1d83df0685c12e71cf410533f97439fb5cf001553c462e15b9971c55c6ea87b28429136fe0025d39c443cb9d215fcf7620f46
diff --git a/app-admin/gkrellm/files/gkrellm-2.3.5-autofs.patch b/app-admin/gkrellm/files/gkrellm-2.3.5-autofs.patch
deleted file mode 100644
index cf36a981711..00000000000
--- a/app-admin/gkrellm/files/gkrellm-2.3.5-autofs.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- gkrellm-2.3.5.old/src/sysdeps/linux.c 2010-10-06 03:27:33.000000000 +1100
-+++ gkrellm-2.3.5/src/sysdeps/linux.c 2011-11-24 02:07:30.926450485 +1100
-@@ -1439,6 +1439,7 @@
- || !strcmp(type, "usbdevfs")
- || !strcmp(type, "usbfs")
- || !strcmp(type, "sysfs")
-+ || !strcmp(type, "autofs")
- )
- continue;
- /* Strip trailing / from the directory.
diff --git a/app-admin/gkrellm/files/gkrellm-2.3.5-binding.patch b/app-admin/gkrellm/files/gkrellm-2.3.5-binding.patch
deleted file mode 100644
index 83bf0b0d7d2..00000000000
--- a/app-admin/gkrellm/files/gkrellm-2.3.5-binding.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From a6983649c997dffd71d365792fa665cc135e696a Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
-Date: Fri, 10 Jan 2014 09:34:59 +0200
-Subject: [PATCH] Allow binding to a listen address that doesn't exist yet
-
----
- server/main.c | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/server/main.c b/server/main.c
-index a5a9e4e..b2f460b 100644
---- a/server/main.c
-+++ b/server/main.c
-@@ -1003,6 +1003,13 @@ socksetup(int af)
- #endif
- continue;
- }
-+
-+#ifdef IP_FREEBIND
-+ if (setsockopt(*s, SOL_IP, IP_FREEBIND, &on, sizeof(on)) < 0)
-+ {
-+ g_warning("gkrellmd: setsockopt (IP_FREEBIND) failed\n");
-+ }
-+#endif
- }
-
- #ifdef IPV6_V6ONLY
---
-1.8.3.1
-
diff --git a/app-admin/gkrellm/files/gkrellm-2.3.5-dso.patch b/app-admin/gkrellm/files/gkrellm-2.3.5-dso.patch
deleted file mode 100644
index 3a24baafe7d..00000000000
--- a/app-admin/gkrellm/files/gkrellm-2.3.5-dso.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 2c839bf2703e99c3851b58695545fed90b6226fc Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-Date: Wed, 29 Aug 2012 22:28:47 -0400
-Subject: [PATCH] Explicitly link to libgmodule-2.0
-
-With >=gdk-pixbuf-2.24 and >=pango-1.30, libgmodule-2.0 is no longer
-provided by "pkg-config --libs gtk+-2.0 gthread-2.0", so link to it
-explicitly (as is already done in server/).
-
-Fixes build failure with gnu ld.gold in gkrellm-2.3.5.
-
-https://bugs.gentoo.org/show_bug.cgi?id=428532
----
- src/Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/Makefile b/src/Makefile
-index 6d482a7..19b0c29 100644
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -69,7 +69,7 @@ STRIP ?= -s
- GKRELLM_INCLUDES = gkrellm.h gkrellm-public-proto.h $(SHARED_PATH)/log.h
-
- PKG_INCLUDE = `$(PKG_CONFIG) --cflags gtk+-2.0 gthread-2.0`
--PKG_LIB = `$(PKG_CONFIG) --libs gtk+-2.0 gthread-2.0`
-+PKG_LIB = `$(PKG_CONFIG) --libs gtk+-2.0 gmodule-2.0 gthread-2.0`
-
- FLAGS = -O2 -I.. -I$(SHARED_PATH) $(PKG_INCLUDE) $(GTOP_INCLUDE) $(PTHREAD_INC)\
- ${SSL_INCLUDE} ${NTLM_INCLUDE} -DGKRELLM_CLIENT
---
-1.7.12
-
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
deleted file mode 100644
index 3e0265af482..00000000000
--- a/app-admin/gkrellm/files/gkrellm-2.3.5-format-security.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up gkrellm-2.3.5/server/main.c~ gkrellm-2.3.5/server/main.c
---- gkrellm-2.3.5/server/main.c~ 2010-10-02 19:13:29.000000000 +0300
-+++ gkrellm-2.3.5/server/main.c 2013-12-06 22:56:38.690534043 +0200
-@@ -187,7 +187,7 @@ static void gkrellmd_syslog_log(GLogLeve
- if (log_level & G_LOG_LEVEL_CRITICAL)
- facility_priority = LOG_MAKEPRI(LOG_DAEMON, LOG_CRIT);
-
-- syslog(facility_priority, message);
-+ syslog(facility_priority, "%s", message);
- #endif // defined(WIN32)
- } // gkrellmd_syslog_log()
-
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
deleted file mode 100644
index a699b80e5b2..00000000000
--- a/app-admin/gkrellm/files/gkrellm-2.3.7-pkgconfig_fix_newlines.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- gkrellm-2.3.7/Makefile
-+++ gkrellm-2.3.7/Makefile
-@@ -131,7 +131,7 @@
- (cd server && ${MAKE} gkrellmd)
-
- gkrellm.pc: Makefile
-- echo 'prefix=$(INSTALLROOT)\n'\
-+ printf 'prefix=$(INSTALLROOT)\n'\
- 'Name: GKrellM\n'\
- 'Description: Extensible GTK system monitoring application\n'\
- 'Version: $(VERSION)\n'\
diff --git a/app-admin/gkrellm/gkrellm-2.3.5-r4.ebuild b/app-admin/gkrellm/gkrellm-2.3.5-r4.ebuild
deleted file mode 100644
index 270ad03b149..00000000000
--- a/app-admin/gkrellm/gkrellm-2.3.5-r4.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils multilib user systemd toolchain-funcs
-
-DESCRIPTION="Single process stack of various system monitors"
-HOMEPAGE="http://www.gkrellm.net/"
-SRC_URI="http://members.dslextreme.com/users/billw/${PN}/${P}.tar.bz2"
-
-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/gtk+:2
- x11-libs/pango
- )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- nls? ( sys-devel/gettext )"
-
-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 \
- "${FILESDIR}"/${P}-autofs.patch \
- "${FILESDIR}"/${P}-cifs.patch \
- "${FILESDIR}"/${P}-dso.patch \
- "${FILESDIR}"/${P}-format-security.patch \
- "${FILESDIR}"/${P}-config.patch \
- "${FILESDIR}"/${P}-width.patch \
- "${FILESDIR}"/${P}-binding.patch \
- "${FILESDIR}"/${P}-sansfont.patch
-}
-
-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
-
- doinitd "${FILESDIR}"/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.7.ebuild b/app-admin/gkrellm/gkrellm-2.3.7.ebuild
deleted file mode 100644
index 50b713c9657..00000000000
--- a/app-admin/gkrellm/gkrellm-2.3.7.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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"
-
-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}-pkgconfig_fix_newlines.patch
-)
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=( Changelog CREDITS README )
-
-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"
-
- default
-}
-
-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"
-
- docinto html
- dodoc *.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
-
- einstalldocs
-}
next reply other threads:[~2017-11-07 12:23 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-11-07 12:23 Lars Wendler [this message]
-- strict thread matches above, loose matches on Subject: below --
2020-09-03 19:31 [gentoo-commits] repo/gentoo:master commit in: app-admin/gkrellm/, app-admin/gkrellm/files/ Lars Wendler
2017-04-23 15:35 Mike Gilbert
2016-09-08 7:20 Lars Wendler
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=1510057382.8cc9f7e1a61de2eceb207737734a4c16897a3721.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