From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id C4EC1138206 for ; Mon, 25 Apr 2016 19:20:40 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E898DE083B; Mon, 25 Apr 2016 19:20:36 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 5B3D9E083B for ; Mon, 25 Apr 2016 19:20:36 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 184E4340B35 for ; Mon, 25 Apr 2016 19:20:35 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D249AD6 for ; Mon, 25 Apr 2016 19:20:32 +0000 (UTC) From: "Austin English" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Austin English" Message-ID: <1461611866.2a25f2beaae8b47d63fc7c3bc8c3710b3e9dc5dc.wizardedit@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-admin/gkrellm/, app-admin/gkrellm/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-admin/gkrellm/files/gkrellmd app-admin/gkrellm/gkrellm-2.3.5-r4.ebuild X-VCS-Directories: app-admin/gkrellm/ app-admin/gkrellm/files/ X-VCS-Committer: wizardedit X-VCS-Committer-Name: Austin English X-VCS-Revision: 2a25f2beaae8b47d63fc7c3bc8c3710b3e9dc5dc X-VCS-Branch: master Date: Mon, 25 Apr 2016 19:20:32 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: d4ead6b1-8552-4e26-9daa-0f29c2b27a44 X-Archives-Hash: 71bea56bd69446d86ac9eb73e3fe441f commit: 2a25f2beaae8b47d63fc7c3bc8c3710b3e9dc5dc Author: Austin English gentoo org> AuthorDate: Mon Apr 25 19:16:31 2016 +0000 Commit: Austin English gentoo org> CommitDate: Mon Apr 25 19:17:46 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a25f2be app-admin/gkrellm: use #!/sbin/openrc-run instead of #!/sbin/runscript Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=573846 app-admin/gkrellm/files/gkrellmd | 4 +- app-admin/gkrellm/gkrellm-2.3.5-r4.ebuild | 129 ++++++++++++++++++++++++++++++ 2 files changed, 131 insertions(+), 2 deletions(-) diff --git a/app-admin/gkrellm/files/gkrellmd b/app-admin/gkrellm/files/gkrellmd index 40db4ea..fe1f6db 100644 --- a/app-admin/gkrellm/files/gkrellmd +++ b/app-admin/gkrellm/files/gkrellmd @@ -1,5 +1,5 @@ -#!/sbin/runscript -# Copyright 1999-2006 Gentoo Foundation +#!/sbin/openrc-run +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ diff --git a/app-admin/gkrellm/gkrellm-2.3.5-r4.ebuild b/app-admin/gkrellm/gkrellm-2.3.5-r4.ebuild new file mode 100644 index 0000000..ec86c03 --- /dev/null +++ b/app-admin/gkrellm/gkrellm-2.3.5-r4.ebuild @@ -0,0 +1,129 @@ +# 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 + +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 +}