diff options
author | Christoph Junghans <ottxor@gentoo.org> | 2012-12-22 18:32:52 +0000 |
---|---|---|
committer | Christoph Junghans <ottxor@gentoo.org> | 2012-12-22 18:32:52 +0000 |
commit | 3c14bcf3aa16b9b9f59bd11a3c383c3977cd780a (patch) | |
tree | 80686ebf267695408fa7738a9a6505e5b43d6901 /app-admin/gkrellm | |
parent | New package. (diff) | |
download | gentoo-2-3c14bcf3aa16b9b9f59bd11a3c383c3977cd780a.tar.gz gentoo-2-3c14bcf3aa16b9b9f59bd11a3c383c3977cd780a.tar.bz2 gentoo-2-3c14bcf3aa16b9b9f59bd11a3c383c3977cd780a.zip |
added prefix support (bug #447414) and fix for dso linking (bug #428532)
(Portage version: 2.2.0_alpha149/cvs/Linux x86_64, signed Manifest commit with key C2000586)
Diffstat (limited to 'app-admin/gkrellm')
-rw-r--r-- | app-admin/gkrellm/ChangeLog | 8 | ||||
-rw-r--r-- | app-admin/gkrellm/files/gkrellm-2.3.5-dso.patch | 32 | ||||
-rw-r--r-- | app-admin/gkrellm/gkrellm-2.3.5-r2.ebuild | 121 |
3 files changed, 160 insertions, 1 deletions
diff --git a/app-admin/gkrellm/ChangeLog b/app-admin/gkrellm/ChangeLog index fda3e8d51984..e36f17f35a36 100644 --- a/app-admin/gkrellm/ChangeLog +++ b/app-admin/gkrellm/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for app-admin/gkrellm # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/gkrellm/ChangeLog,v 1.191 2012/06/27 17:54:53 lack Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/gkrellm/ChangeLog,v 1.192 2012/12/22 18:32:52 ottxor Exp $ + +*gkrellm-2.3.5-r2 (22 Dec 2012) + + 22 Dec 2012; Christoph Junghans <ottxor@gentoo.org> + +files/gkrellm-2.3.5-dso.patch, +gkrellm-2.3.5-r2.ebuild: + added prefix support (bug #447414) and fix for dso linking (bug #428532) 27 Jun 2012; Jim Ramsay <jim_ramsay@gentoo.org> -gkrellm-2.3.2-r1.ebuild, -gkrellm-2.3.2.ebuild, -gkrellm-2.3.4.ebuild, gkrellm-2.3.5.ebuild: diff --git a/app-admin/gkrellm/files/gkrellm-2.3.5-dso.patch b/app-admin/gkrellm/files/gkrellm-2.3.5-dso.patch new file mode 100644 index 000000000000..3a24baafe7df --- /dev/null +++ b/app-admin/gkrellm/files/gkrellm-2.3.5-dso.patch @@ -0,0 +1,32 @@ +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/gkrellm-2.3.5-r2.ebuild b/app-admin/gkrellm/gkrellm-2.3.5-r2.ebuild new file mode 100644 index 000000000000..42c8eb8e90f6 --- /dev/null +++ b/app-admin/gkrellm/gkrellm-2.3.5-r2.ebuild @@ -0,0 +1,121 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-admin/gkrellm/gkrellm-2.3.5-r2.ebuild,v 1.1 2012/12/22 18:32:52 ottxor Exp $ + +EAPI=4 + +inherit eutils multilib toolchain-funcs user + +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="hddtemp gnutls lm_sensors nls ssl ntlm X kernel_FreeBSD" + +RDEPEND="dev-libs/glib:2 + hddtemp? ( app-admin/hddtemp ) + gnutls? ( net-libs/gnutls ) + !gnutls? ( ssl? ( dev-libs/openssl ) ) + lm_sensors? ( sys-apps/lm_sensors ) + nls? ( virtual/libintl ) + ntlm? ( net-libs/libntlm ) + X? ( x11-libs/gtk+:2 )" +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:#user\tnobody:user\tgkrellmd:' \ + -e 's:#group\tproc:group\tgkrellmd:' \ + -i server/gkrellmd.conf || die "sed gkrellmd.conf 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" + epatch "${FILESDIR}/${P}-cifs.patch" + epatch "${FILESDIR}/${P}-dso.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" \ + $(use nls || echo enable_nls=0) \ + $(use lm_sensors || echo without-libsensors=yes) \ + $(use ntlm || echo without-ntlm=yes) \ + ${sslopt} \ + || die "emake failed" + else + cd server + emake ${TARGET} \ + CC="$(tc-getCC)" \ + LINK_FLAGS="$LDFLAGS -Wl,-E" \ + STRIP="" \ + $(use nls || echo enable_nls=0) \ + $(use lm_sensors || echo without-libsensors=yes) \ + || die "emake failed" + fi +} + +src_install() { + if use X ; then + emake install${TARGET:+_}${TARGET} \ + $(use nls || echo 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" \ + || die "emake install failed" + + dohtml *.html + + newicon src/icon.xpm ${PN}.xpm + make_desktop_entry ${PN} GKrellM ${PN} + else + dobin server/gkrellmd || die "dobin failed" + + insinto /usr/include/gkrellm2 + doins server/gkrellmd.h || die "doins failed" + doins shared/log.h || die "doins failed" + fi + + doinitd "${FILESDIR}"/gkrellmd || die "doinitd failed" + newconfd "${FILESDIR}"/gkrellmd.conf gkrellmd || die "newconfd failed" + + insinto /etc + doins server/gkrellmd.conf || die "doins failed" + + dodoc Changelog CREDITS README +} |