From 44ced7fbb5916662cdbd7d17aa3206343fd3fe06 Mon Sep 17 00:00:00 2001 From: Lars Wendler Date: Sat, 5 Jan 2019 22:13:40 +0100 Subject: app-admin/gkrellm: Revbump to get rid of superfluous patch. Also bumped to EAPI-7 Package-Manager: Portage-2.3.54, Repoman-2.3.12 Signed-off-by: Lars Wendler --- app-admin/gkrellm/files/gkrellm-2.3.5-cifs.patch | 24 ---- app-admin/gkrellm/gkrellm-2.3.10-r1.ebuild | 142 ---------------------- app-admin/gkrellm/gkrellm-2.3.10-r2.ebuild | 146 +++++++++++++++++++++++ 3 files changed, 146 insertions(+), 166 deletions(-) delete mode 100644 app-admin/gkrellm/files/gkrellm-2.3.5-cifs.patch delete mode 100644 app-admin/gkrellm/gkrellm-2.3.10-r1.ebuild create mode 100644 app-admin/gkrellm/gkrellm-2.3.10-r2.ebuild (limited to 'app-admin') diff --git a/app-admin/gkrellm/files/gkrellm-2.3.5-cifs.patch b/app-admin/gkrellm/files/gkrellm-2.3.5-cifs.patch deleted file mode 100644 index fa35ef672798..000000000000 --- a/app-admin/gkrellm/files/gkrellm-2.3.5-cifs.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- gkrellm-2.3.5.old/server/monitor.c 2010-10-06 03:46:59.000000000 +1100 -+++ gkrellm-2.3.5/server/monitor.c 2011-11-24 02:01:30.871402778 +1100 -@@ -1329,7 +1329,8 @@ - static gchar *remote_fs_types[] = - { - "nfs", -- "smbfs" -+ "smbfs", -+ "cifs" - }; - - void ---- gkrellm-2.3.5.old/src/fs.c 2010-09-15 02:25:51.000000000 +1000 -+++ gkrellm-2.3.5/src/fs.c 2011-11-24 02:00:17.347088370 +1100 -@@ -163,7 +163,8 @@ - static gchar *remote_fs_types[] = - { - "nfs", -- "smbfs" -+ "smbfs", -+ "cifs" - }; - - diff --git a/app-admin/gkrellm/gkrellm-2.3.10-r1.ebuild b/app-admin/gkrellm/gkrellm-2.3.10-r1.ebuild deleted file mode 100644 index b921679f6f1b..000000000000 --- a/app-admin/gkrellm/gkrellm-2.3.10-r1.ebuild +++ /dev/null @@ -1,142 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# 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/" -# Upstream named their xz compressed tarball tar.bz2 (*sigh*) -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 ) - ssl? ( - gnutls? ( net-libs/gnutls ) - !gnutls? ( - !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 -) - -S="${WORKDIR}/${MY_P}" - -DOCS=( Changelog CREDITS README ) - -pkg_pretend() { - if use gnutls && ! use ssl ; then - ewarn "You have enabled the \"gnutls\" USE flag but not the \"ssl\" USE flag." - ewarn "No ssl backend will be built!" - fi -} - -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 - 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") \ - $(usex ssl $(usex gnutls 'without-ssl=yes' 'without-gnutls=yes') 'without-ssl=yes without-gnutls=yes') - 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 -} diff --git a/app-admin/gkrellm/gkrellm-2.3.10-r2.ebuild b/app-admin/gkrellm/gkrellm-2.3.10-r2.ebuild new file mode 100644 index 000000000000..472c7e81c4b3 --- /dev/null +++ b/app-admin/gkrellm/gkrellm-2.3.10-r2.ebuild @@ -0,0 +1,146 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit desktop 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 ) + ssl? ( + gnutls? ( net-libs/gnutls ) + !gnutls? ( + !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} + nls? ( sys-devel/gettext )" + +BDEPEND=" + virtual/pkgconfig +" + +PATCHES=( + "${FILESDIR}"/${PN}-2.3.5-config.patch + "${FILESDIR}"/${PN}-2.3.5-width.patch + "${FILESDIR}"/${PN}-2.3.5-sansfont.patch +) + +S="${WORKDIR}/${MY_P}" + +DOCS=( Changelog CREDITS README ) + +pkg_pretend() { + if use gnutls && ! use ssl ; then + ewarn "You have enabled the \"gnutls\" USE flag but not the \"ssl\" USE flag." + ewarn "No ssl backend will be built!" + fi +} + +pkg_setup() { + 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 + 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") \ + $(usex ssl $(usex gnutls 'without-ssl=yes' 'without-gnutls=yes') 'without-ssl=yes without-gnutls=yes') + 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 +} + +pkg_preinst() { + enewgroup gkrellmd + enewuser gkrellmd -1 -1 -1 gkrellmd +} -- cgit v1.2.3