added prefix support (bug #447414) and fix for dso linking (bug #428532)

Package-Manager: portage-2.2.0_alpha149/cvs/Linux x86_64
Manifest-Sign-Key: 0xC2000586

4 files changed, 177 insertions, 2 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/Manifest b/app-admin/gkrellm/Manifest
index d4aec895415d..e8ec3741ccfc 100644
--- a/app-admin/gkrellm/Manifest
+++ b/app-admin/gkrellm/Manifest
@@ -1,10 +1,26 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX gkrellm-2.3.2-getline-fix.patch 736 SHA256 056c4e04d58a70304c1ba05a4382b29cab8e77d951162049fe922f3c242002ed SHA512 2ce28f4f3c6d31d4caef20dcc4259101baee1d1d272146d52ce601a30effd41a295d92b6b0164dbe0fb204f49f4dfb26eb31b92ba89758cfd855dd42a39ee526 WHIRLPOOL c7da40349d00830a7a8cb5e039c5dee95c5a38868d0e7ff56a69974facffcaa2ee62beaa6d6b74a4bb7b166c42a5629a51799f3802f68cd6d3633a75ee7557c2
 AUX gkrellm-2.3.5-autofs.patch 363 SHA256 9d655df4251bf58f2c160949e00d89c1b95be6b472c3c110e4a39a30e817fb1e SHA512 a7684223bd02c9bc0c77f33c618b1b58f639e83935b2e728234af5e364a1573d7a3d8448ace541eeaaaf3236384dd2f042cacb295eb8fdcb850cc2eac3bd614a WHIRLPOOL 1720705d6f174a77b4ffa18eae0bfc3102b4f24b4bc60f24e02fc15004874909704b784081a7eba526321599edea5cb141d1a5a9be4e0a6ec6e46a1d77641804
 AUX gkrellm-2.3.5-cifs.patch 496 SHA256 3b669243b900753f0b913cd8764b0f4389c684680ade75c60eaca2820b8caedc SHA512 feffaf5a561bbc47d42061ae3b2acc9d6cb6fc93d43448a2ac9ede89051c34bbec4b1ff0d77e1a2dd634fa78742a105ba66131a1cdb7a59ceb21abaa32f558d5 WHIRLPOOL 3436e2a9b2494059e68b008d426fd284ea0bf9c097149cc48bc92638a38ab6564c40204260b7e648b1e7d153f2ee396a060f2d1f21483d96d6bccb65c0e12372
+AUX gkrellm-2.3.5-dso.patch 1113 SHA256 b33527bc3c4c27167d8259892e82f08ab99b21790e2884b5e33b1dc110560e74 SHA512 b186140e7fefcf3aee38c51e55c2d7c8cc39e2fa65f724e237e92f686aa8106f03bb195409090b355bb5b3af08e6be6f2317a63c00a54e0f89ff7218ee3629bf WHIRLPOOL 50f3695f67515f94608c4a9333c5505be87ba5c00b632982a75344f19309ccf30f517ded93dd90dae9d25c774f2e525cf32f734390f447c370c188931d20d357
 AUX gkrellmd 640 SHA256 68eafd11f1c1ff7080a2117facd62d8a3124993fc513c050387f6f32b02dd9f1 SHA512 12cbd14414580291a1d85d2e645ab20bce833acc59ce756d9da208c02e0561e441c2442867d50c44723944bf6d91d072d0ec2c1632cd1674b8c1a66d9178cb50 WHIRLPOOL 1453af832ee0937395302ef4bb058b136711a6823d8bdf88ead8e1eba981b5559a130b28db1e625b7629f46336432a5b0c4736dc00c269aa8d56b26a1351fd16
 AUX gkrellmd.conf 250 SHA256 66ba64c7a3ce2d97ba2feebf3c38e75b278bbbe152c71472e363d720b198b935 SHA512 257e13405bc5ce7b61b7a18e7456d1ae22d6fc2052e0e65e3b53c352a43aad2bedb4660dfd7cb95709b51f54b8949f6ff114de310be1ce49d70b074b3b8f8ef5 WHIRLPOOL 2662e208c7919cbe2e5a162ddcd3966149e59bf4c2172cb519349a983bac914fc2469ff0176043ecf5c43babf6a08ec2cdcb831dcc67ba503f231477cb183e06
 DIST gkrellm-2.3.5.tar.bz2 765011 SHA256 702b5b0e9c040eb3af8e157453f38dd6f53e1dcd8b1272d20266cda3d4372c8b SHA512 9681ec5978b6be9f56a71726df36671829a4427f45caf90c8c3460e8c59004ff4083de1692cad16e3724ed37418bb3e4589d1961c140f3becfa3efd210b7a5dc WHIRLPOOL 3dceb20b9da49fb9b287e1faca88b3fdb7ae7af6dde5e675ee1e5c718467b131e34f740cb38719e5026ce0478146264fa4eaa060120e71f2c442ec5504e6dfb4
 EBUILD gkrellm-2.3.5-r1.ebuild 3156 SHA256 d200b9ecb2f3e5c6a374bacd7ca0e9c4f2d8db8b5dd4f2571bb0fb2becc041d8 SHA512 51f6f1560c487066a7fb4866bab5a274e7ff6554dd61bc26cb6ee699fcefbb80e66320cc6e4601ee215f2d828fe43e196a82e388a3da15ae849cc6f9fbd64938 WHIRLPOOL 196128179f5986d8dd296e1982e5c3dd36a428a57fc31edcbfc193898d44fdb15c24d57862c0f7fe5297c46b3d90a1dc298814d2c6a3edfd662bf367ded92c23
+EBUILD gkrellm-2.3.5-r2.ebuild 3304 SHA256 dfb55f6c1cffce6b2a7a7efc844367403b9759e23dd05d20d173e7778087a898 SHA512 f4bd49fa4d369e8bee785a75a9e6860912cbb4804b1a16ed6da639e1c6fdf640ca9881db3ad26a7e9f6af92e886afafb805caeb870ad3b3d959703929e3afc95 WHIRLPOOL 4b4f9b975edcd58536052835d334495466c9609ff61253b403625d7b216ed12bec5248c8fe2fa28ab5389abaa2853752119d6ffd543e296f39c16131eba481f9
 EBUILD gkrellm-2.3.5.ebuild 3206 SHA256 c8c7cf7593dc4f15370ef25e0095fc173ddb31a9fda5eeb8592a61c19a11909a SHA512 20057e64c6a6a2a41f4eec2661a7f1e0907d69719bf8a7baf79970c94365c259f22814c8710e5a2b07c7c045241ee54b3bed0bf9f0baa642ed1ef0c1898bf27d WHIRLPOOL 66a9b25b7820fb227e7d9518148e5d87a28b115668a77193b5534c6d72c2727e5c87ee13102623534b4dedc01fa6e32ca1eaff4f0e14c610f4e912eb66f4bb7b
-MISC ChangeLog 26342 SHA256 42831a1c1b42db30ad4ae7fa03a0e8b65de869f78e42e087558e1ecb1f1bb6fb SHA512 ebebdaee4050ad45ff3e88e2fc464d8cfcb9670ee3134156a990804cd95beecbbe4fad4ccf48eec82fa226352b0aed19561a3cbc53ba5de1490e591d0591457d WHIRLPOOL 217d7a592b655c920c4f6716eaf72f1b0bba0c25ba76b616f689a1da307d204735c81a00e965f680c2e85f687e1afea00a61f114363b631ecb919d3dafc73116
+MISC ChangeLog 26567 SHA256 cc2d58bf94acaf7c1ba7b26e72c321ecaa88b70c36746fc8049a6b59b735de25 SHA512 86924aa2218f2f234ba0eac61214b0c63a2d00abff44e3b297a16e1cfd56185e507fd7154b85171b2412c7c5acf16c322e1773688ca4e337078285b807798ce7 WHIRLPOOL d9b36bba90ea93f8bb9cb7dcd8638d5915935099404db28899d6662175d622e865b966ce4b615e2075b835b4096242464af3af397b8c510e129bbf237d89369c
 MISC metadata.xml 940 SHA256 000169e157ad6f8af0d7506f288212f54640b849a4229467bccad41e924c6324 SHA512 0acbb48ce642513de9ad8a887260190fe08b68c3b74e44444bbfad9fd7e06170b9f52418d027b18aeab18f09a805806c3b73b9c1aa5f2f4b62b9d5978cb4b34c WHIRLPOOL 010a8824e76748bdff575e89f9b50dda0a6f017a3652078e7f2c9b23b2bdc819662acdb556abe890acb6afa7824228a9a484ecd3385a0517965098885c748e42
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBCAAGBQJQ1fzWAAoJEOeBhlrCAAWG0yMH/11r62BTDcEo1E9fWLqh4/mN
+cV4AIPfP4ozGmpTfP4zNIamHGymJdGBKEnJHubtHqfV7Ttd0eTe0PhLTtFHmeljQ
+u5aFRJTXeJmwV340+FAm5bwZJOI8i9Ls2ndsIdPr/DaZbxQlde3IYLZsZtKc5Qtk
+TUltKXFWd9tc8r0WMS2hMvvGN51tteou6dRPGJoS0gvH5Ax7xM6rVjM5hkf2QYYV
+tpv2WspIB8nHMLAXa5vxRmbR6Fok08TiiZ9PmNgNn7db7gOsJHebcwjY5GbGGZZ5
+Zz+Du4KfvujRhbXcBelL0PAEEo0P/Fkz1ci5fbnv3gcUHde9qVuAOyJYBLt+ZGk=
+=CM+G
+-----END PGP SIGNATURE-----
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
+}