Version bump: 2.3.4 is released (Bug #298052)

Package-Manager: portage-2.1.7.11/cvs/Linux x86_64

3 files changed, 133 insertions, 2 deletions

diff --git a/app-admin/gkrellm/ChangeLog b/app-admin/gkrellm/ChangeLog
index f28ccc0ba8cf..0b7ec93f288c 100644
--- a/app-admin/gkrellm/ChangeLog
+++ b/app-admin/gkrellm/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-admin/gkrellm
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/gkrellm/ChangeLog,v 1.177 2010/01/12 14:40:36 lack Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/gkrellm/ChangeLog,v 1.178 2010/01/12 14:58:37 lack Exp $
+
+*gkrellm-2.3.4 (12 Jan 2010)
+
+  12 Jan 2010; Jim Ramsay <lack@gentoo.org> +gkrellm-2.3.4.ebuild:
+  Version bump: 2.3.4 is released (Bug #298052)
 
   12 Jan 2010; Jim Ramsay <lack@gentoo.org> files/gkrellmd:
   Applying patch from bug #284077
diff --git a/app-admin/gkrellm/Manifest b/app-admin/gkrellm/Manifest
index eb1ebd59f743..247f128a063b 100644
--- a/app-admin/gkrellm/Manifest
+++ b/app-admin/gkrellm/Manifest
@@ -2,7 +2,9 @@ AUX gkrellm-2.3.2-getline-fix.patch 736 RMD160 2c98c1c9dc427d30d28a06bc29c8da45c
 AUX gkrellmd 640 RMD160 13a345a246e9f7b7895a169829e78633498a0985 SHA1 96187e80c4c04ba19cb3cbba4fc321c4bdf007cc SHA256 68eafd11f1c1ff7080a2117facd62d8a3124993fc513c050387f6f32b02dd9f1
 AUX gkrellmd.conf 250 RMD160 4bef31a2562432515dfeb0c05acbba66863aa3b9 SHA1 e7374680680bc587c3bd8a8dba57fa619f20db45 SHA256 66ba64c7a3ce2d97ba2feebf3c38e75b278bbbe152c71472e363d720b198b935
 DIST gkrellm-2.3.2.tar.bz2 747697 RMD160 0aacc0d0783cff5bb2fd8c6736553a3ce8874ad9 SHA1 fe94996c4fe084c28bf7a7fbc3f8d4fd64724ac0 SHA256 a102e681cbcc45f8cb225ca0a321b62772106d6f0bb372eaa026b5a2da840873
+DIST gkrellm-2.3.4.tar.bz2 757875 RMD160 db60d996c732a18d55b7f9489594ca040beca535 SHA1 f02c7a3093df3b5c52123a79a3ddbe573da36a49 SHA256 3447b169134d220f30a42cef2e2f9c8a0141d4ddfdf7dd4c3bbae278fb154f56
 EBUILD gkrellm-2.3.2-r1.ebuild 3214 RMD160 dbbb230f32a6aedf32639478fdfba83e7552b7ef SHA1 2253dbf26025e935ab69443962ce3eef257c0356 SHA256 9fcba2fadc754a84ad4771a99d07cb94db2fe10f9f56623bd76a4df8b463a9bf
 EBUILD gkrellm-2.3.2.ebuild 3170 RMD160 d0ed9960f7db6cf513dc514082423796a7ff9919 SHA1 f0d2ff25f642580ad51ea7769b689accff06be00 SHA256 59b8010e056c8a2d7fa60c9426759df5464352306af82811e52cb37c057c9b98
-MISC ChangeLog 24282 RMD160 2b337504ee168f5c962eee39c4a37ee600051e8a SHA1 ae0de7fa360d3260504d0bb2c685e95093579e64 SHA256 6ad5fc8ec9733e53ecdeb9108d9d372c2b8fe7e28c3a38507698f2af9b83baf4
+EBUILD gkrellm-2.3.4.ebuild 3245 RMD160 3a3ed3d447884bf28ed620a31990c205cb9f11b5 SHA1 16823f17c44443cc6637340b9fd5ed6367ec7bbe SHA256 9e5f99724ea14c994ab3bad9368281f74be16045da36d89fc6cbb0f4291976f6
+MISC ChangeLog 24428 RMD160 af9186f69cb145a8399323669e5a27b30b42b5be SHA1 c5c931f57d6a0050055a0d868a811e0266bcef7e SHA256 6e77c180b6b9abba030666de9ee488b65950f16552f0eb3e28f51f2d29a8474b
 MISC metadata.xml 940 RMD160 e85c2b39ba9e3d4fcdf2b314e9357b17e9b2aad2 SHA1 989f5eaebb57c3d432c9b1a9ae8cdee0f0729f5a SHA256 000169e157ad6f8af0d7506f288212f54640b849a4229467bccad41e924c6324
diff --git a/app-admin/gkrellm/gkrellm-2.3.4.ebuild b/app-admin/gkrellm/gkrellm-2.3.4.ebuild
new file mode 100644
index 000000000000..52c79bc5adde
--- /dev/null
+++ b/app-admin/gkrellm/gkrellm-2.3.4.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/gkrellm/gkrellm-2.3.4.ebuild,v 1.1 2010/01/12 14:58:37 lack Exp $
+
+EAPI=2
+
+inherit eutils multilib 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"
+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}
+	dev-util/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:' \
+		-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:/usr/$(get_libdir):" \
+		-e "s:/usr/local/lib:/usr/local/$(get_libdir):" \
+		-i src/${PN}.h || die "sed ${PN}.h failed"
+}
+
+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)" \
+			LINK_FLAGS="$LDFLAGS -Wl,-E" \
+			STRIP="" \
+			INSTALLROOT="/usr" \
+			INCLUDEDIR="/usr/include/gkrellm2" \
+			LOCALEDIR="/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="${D}/usr/bin" \
+			INCLUDEDIR="${D}/usr/include" \
+			LOCALEDIR="${D}/usr/share/locale" \
+			PKGCONFIGDIR="${D}/usr/$(get_libdir)/pkgconfig" \
+			MANDIR="${D}/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
+}
+
+pkg_postinst() {
+	if use X ; then
+		ewarn "The old executable name 'gkrellm2' has been removed."
+		ewarn "Run 'gkrellm' instead."
+	fi
+}