Version bump - 2.3.1 is released (Bug #209937)

Package-Manager: portage-2.1.4.1

9 files changed, 142 insertions, 15 deletions

diff --git a/app-admin/gkrellm/ChangeLog b/app-admin/gkrellm/ChangeLog
index f3816e8a15b0..be6ffab5b97f 100644
--- a/app-admin/gkrellm/ChangeLog
+++ b/app-admin/gkrellm/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for app-admin/gkrellm
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/gkrellm/ChangeLog,v 1.151 2007/10/19 20:05:54 armin76 Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/gkrellm/ChangeLog,v 1.152 2008/02/28 15:17:03 lack Exp $
+
+*gkrellm-2.3.1 (28 Feb 2008)
+
+  28 Feb 2008; Jim Ramsay <lack@gentoo.org>
+  -files/gkrellm-2.3.0-Makefile.patch, -files/gkrellm-2.3.0-build.patch,
+  -files/gkrellm-2.3.0-gnutls.patch, +files/gkrellm-2.3-Makefile.patch,
+  +files/gkrellm-2.3-build.patch, +files/gkrellm-2.3-gnutls.patch,
+  files/gkrellmd, +files/gkrellmd.conf, gkrellm-2.3.0.ebuild,
+  +gkrellm-2.3.1.ebuild:
+  Version bump - 2.3.1 is released (Bug #209937)
 
   19 Oct 2007; Raúl Porcel <armin76@gentoo.org> gkrellm-2.3.0.ebuild:
   alpha/ia64/sparc stable wrt #195522
diff --git a/app-admin/gkrellm/Manifest b/app-admin/gkrellm/Manifest
index 4036ba39e5c4..d109c614da9b 100644
--- a/app-admin/gkrellm/Manifest
+++ b/app-admin/gkrellm/Manifest
@@ -3,18 +3,21 @@ AUX gkrellm-2.2.10-build.patch 2419 RMD160 aa913fe57e7f5841a6f56e59dfc311b331792
 AUX gkrellm-2.2.10-gnutls.patch 415 RMD160 0804d5db018c259930c6abcbe4d78c9908687268 SHA1 03065e5dcf5a9a01f9790652b9a11910456fd589 SHA256 a35810288c9ca46bd3f2e44936a5e73d726ccb28a36cdb330b1352d805a984e8
 AUX gkrellm-2.2.9-build.patch 2803 RMD160 8a13f1484577949f767e26b88667d7fd57903f34 SHA1 9ad0a7db14ffff6b42331a2316f09c6f3eddbcfa SHA256 77c3f36dbc705f89d5e96b737227c58212ba87fd6863e9fdd00d252111f0b5f3
 AUX gkrellm-2.2.9-gnutls.patch 415 RMD160 0804d5db018c259930c6abcbe4d78c9908687268 SHA1 03065e5dcf5a9a01f9790652b9a11910456fd589 SHA256 a35810288c9ca46bd3f2e44936a5e73d726ccb28a36cdb330b1352d805a984e8
-AUX gkrellm-2.3.0-Makefile.patch 424 RMD160 dc1ebf789dcc3942c1e39d6167d532d2e2506cb3 SHA1 6b42bfa24540433f5cc16d3e1b36d9be33c7b056 SHA256 4c87410cb2ef50b3b490a97fef525d4138446e02d8c60d0f4f7a13b58a575085
-AUX gkrellm-2.3.0-build.patch 1191 RMD160 05550436111e308152889b7c21d66215a40e0bf1 SHA1 1052f00ea6ea44960445edeb8861d1cf6bfa96ac SHA256 e69131b0cc82def1c055baf0d6c075f6894dd7eb91cec62a85ab112acca4d74a
-AUX gkrellm-2.3.0-gnutls.patch 415 RMD160 0804d5db018c259930c6abcbe4d78c9908687268 SHA1 03065e5dcf5a9a01f9790652b9a11910456fd589 SHA256 a35810288c9ca46bd3f2e44936a5e73d726ccb28a36cdb330b1352d805a984e8
+AUX gkrellm-2.3-Makefile.patch 424 RMD160 dc1ebf789dcc3942c1e39d6167d532d2e2506cb3 SHA1 6b42bfa24540433f5cc16d3e1b36d9be33c7b056 SHA256 4c87410cb2ef50b3b490a97fef525d4138446e02d8c60d0f4f7a13b58a575085
+AUX gkrellm-2.3-build.patch 1191 RMD160 05550436111e308152889b7c21d66215a40e0bf1 SHA1 1052f00ea6ea44960445edeb8861d1cf6bfa96ac SHA256 e69131b0cc82def1c055baf0d6c075f6894dd7eb91cec62a85ab112acca4d74a
+AUX gkrellm-2.3-gnutls.patch 415 RMD160 0804d5db018c259930c6abcbe4d78c9908687268 SHA1 03065e5dcf5a9a01f9790652b9a11910456fd589 SHA256 a35810288c9ca46bd3f2e44936a5e73d726ccb28a36cdb330b1352d805a984e8
 AUX gkrellm-mbmon-amd64.patch 357 RMD160 540d9628ab6354fb0b1f6445dd6ad53ec27545a0 SHA1 b2da04a505da8e88ff49d474372ef9c4e1d6418e SHA256 6767c2f78ee8c8363777383b60fa9b7083a0d0f95b8e4c23bf909c2638664f6d
-AUX gkrellmd 620 RMD160 8afb791f8a373c97cc7b28a5368e88025eebead2 SHA1 1a7c8d0dfe85a82395f5a24f18d46c3e99f781ec SHA256 5aaa81d4f1ac5a8560339fd7e364b85652309fd11447378aaf0f2363e2152a54
+AUX gkrellmd 636 RMD160 7b2f43f8dc826f3da487d779c47220df9019a530 SHA1 38dfc92a6f7f6eada6d7bf52e70e7b6b70eac3a8 SHA256 f830ab66d71490572f206ce36beefcef29f937a6a2808e2618f672d0a2c65305
+AUX gkrellmd.conf 166 RMD160 dfd23d203baab2ff89dbe157b5615aeecc7e188b SHA1 baeccfb3f398d7dfc28fcf1582c9855d9067937a SHA256 14d1b3f11b30fd83976825d1af2c2923fd552b2073a2c0c1c228b2ca2348fcbe
 DIST gkrellm-2.2.10.tar.bz2 718894 RMD160 6694838015716c09291887ae598daceb4f4b440f SHA1 329d0ba5600998f21b75491937c3c2924ab6ed40 SHA256 d7676d7734d4821454a840a1ef05020c9c4f4797ab96ec54f2351e26d437c88c
 DIST gkrellm-2.2.5.tar.bz2 668581 RMD160 7755fa7bbf88dfd53185e76604981b2a5c81d74d SHA1 4cbdf75828b3d8b216694c2e6978c29a4920595a SHA256 03be5a470eb13f29e53ae18515f7291ef4f1c94b1f362a168cb8ed2bde754c55
 DIST gkrellm-2.2.9.tar.bz2 691133 RMD160 e6de12774ec85c51dce18e3208340d1a080a6398 SHA1 114c09c78ae27bbb1b2f4c2edb346800831f2cef SHA256 5f243958342fe0e27432c1d4b01900c5e593b49f00a8bdd29200433b17059de9
 DIST gkrellm-2.3.0.tar.bz2 742468 RMD160 6db53085008fca36bafa1085f1362e79c65b3203 SHA1 b955aa38304d97bfedaa2167220f1d62407345d9 SHA256 eae0a6862fe6131c67c2f8bca451b0410e69229a5a16463dd1f2266b3ff13dcb
+DIST gkrellm-2.3.1.tar.bz2 744132 RMD160 40f4aa5349be42d01a1f8ff7b4f2e83986be0e62 SHA1 f5e8206aeee93f5b3a6afff9cc55c58e9d511f56 SHA256 1a2a7e3ee9d1f2d7305da0d33d9be71ffe5d1903ed6a9c69cf77ffe10fc95b4d
 EBUILD gkrellm-2.2.10.ebuild 2683 RMD160 b8ee36037c06a7cf25503e14d34cde2ff7ae30a9 SHA1 400a91f606ab26fa96d43912ceef4a24711d6f5b SHA256 fe6d7ff1ee3e2b7358cb996adece48ad68dff454515cdd47339f322dabf46e08
 EBUILD gkrellm-2.2.5.ebuild 1981 RMD160 d6a8c5e202a04790893c5c1e367ae33c8a8b7bdb SHA1 b1ab6d967ea45e12494d8464e5d6099c8e1a1e32 SHA256 11e45fb3b0d5f99fa28b76356c3d460f869b1c7ad84d185734d4fecc5050757a
 EBUILD gkrellm-2.2.9-r1.ebuild 2305 RMD160 2e35f06970d0d79de8f3d333622b43e85b41abb1 SHA1 abfbffd3670986506b23d206c27a2db41f8af4b6 SHA256 5630f1976bd74eb7319b728f21f8fb95a41251ae71d90552c146adde8dc145ea
-EBUILD gkrellm-2.3.0.ebuild 2970 RMD160 65d8296cef2566747f66398c4a93d288e75fe9b1 SHA1 b5c3ae6fc8429fb170a61b7b0284cf0b500661cb SHA256 b5e1ed4a298c332bc9e99cc5d8d585adaebdb7703ced991e8bd6b2cae3a6bcd1
-MISC ChangeLog 20448 RMD160 7d82e65d132fb87718db1b681a222c59da72cd9e SHA1 903c1cc89103583dd54fbb66d8b12fe70b0ba694 SHA256 eee5a9dd05c7f7eb48345fd4e99abfcd42157a4d423cf06f912cb9ab1059e112
+EBUILD gkrellm-2.3.0.ebuild 2983 RMD160 52a1388e90e1898d21fee3b5d9e0291da8e630b5 SHA1 bf381f33a14facd5bd556b8ddab98d7be85b8383 SHA256 17f52538323f1d7c96eba0666bc64f0cc01f7cd54303cbfb2ad56de843dcb898
+EBUILD gkrellm-2.3.1.ebuild 3059 RMD160 fd59661506629bc363075ad7ae8d2c2b1cddec05 SHA1 60333137545e5a402f4c6e83b72a8416097431df SHA256 8e6f28b890068cc20e97ff58bf4f423dfdf86e6b67b77fe8003b1ee508ac63f0
+MISC ChangeLog 20868 RMD160 7e787e517c8b52907bd2d50ac4811fb79ba84731 SHA1 1294f6c72106d068e9c5aa635e94f1e64232f8cc SHA256 ecd2eede6b727f60075d8a942ff60e7bd6aa739ad424213907f61886e2a990ac
 MISC metadata.xml 254 RMD160 415926d9875e8fe9b0d03e74435ad2521fac159c SHA1 172a4c3880766b1bb7e75f4f2b4ed0b62c1d2d6c SHA256 dafc7e6c5cb681b9d6ecbe2ff4280bb987d3533c30bb334b4845faee02aa7279
diff --git a/app-admin/gkrellm/files/gkrellm-2.3.0-Makefile.patch b/app-admin/gkrellm/files/gkrellm-2.3-Makefile.patch
index 0648d3d0bc5e..0648d3d0bc5e 100644
--- a/app-admin/gkrellm/files/gkrellm-2.3.0-Makefile.patch
+++ b/app-admin/gkrellm/files/gkrellm-2.3-Makefile.patch
diff --git a/app-admin/gkrellm/files/gkrellm-2.3.0-build.patch b/app-admin/gkrellm/files/gkrellm-2.3-build.patch
index 38de713aa64b..38de713aa64b 100644
--- a/app-admin/gkrellm/files/gkrellm-2.3.0-build.patch
+++ b/app-admin/gkrellm/files/gkrellm-2.3-build.patch
diff --git a/app-admin/gkrellm/files/gkrellm-2.3.0-gnutls.patch b/app-admin/gkrellm/files/gkrellm-2.3-gnutls.patch
index 54d86000ca37..54d86000ca37 100644
--- a/app-admin/gkrellm/files/gkrellm-2.3.0-gnutls.patch
+++ b/app-admin/gkrellm/files/gkrellm-2.3-gnutls.patch
diff --git a/app-admin/gkrellm/files/gkrellmd b/app-admin/gkrellm/files/gkrellmd
index 3f9075a2d805..f7f90a24ab1c 100644
--- a/app-admin/gkrellm/files/gkrellmd
+++ b/app-admin/gkrellm/files/gkrellmd
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/gkrellm/files/gkrellmd,v 1.6 2006/11/02 10:44:06 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/gkrellm/files/gkrellmd,v 1.7 2008/02/28 15:17:04 lack Exp $
 
 depend() {
 	need net
@@ -11,7 +11,7 @@ depend() {
 
 start() {
 	ebegin "Starting GNU Krell Monitor daemon"
-	start-stop-daemon --start --quiet --background --pidfile /var/run/gkrellmd.pid --make-pidfile --exec /usr/bin/gkrellmd
+	start-stop-daemon --start --quiet --background --pidfile /var/run/gkrellmd.pid --make-pidfile --exec /usr/bin/gkrellmd ${GKRELLM_OPTS}
 	eend $?
 }
 
diff --git a/app-admin/gkrellm/files/gkrellmd.conf b/app-admin/gkrellm/files/gkrellmd.conf
new file mode 100644
index 000000000000..1388801ccbd8
--- /dev/null
+++ b/app-admin/gkrellm/files/gkrellmd.conf
@@ -0,0 +1,5 @@
+# Config file for gkrellmd
+
+# If you need to pass extra options to gkrellmd, you may set them here.
+# See 'gkrellmd --help' for a list of options.
+# GKRELLMD_OPTS=""
diff --git a/app-admin/gkrellm/gkrellm-2.3.0.ebuild b/app-admin/gkrellm/gkrellm-2.3.0.ebuild
index 934601148e03..c6b3ce17a9e6 100644
--- a/app-admin/gkrellm/gkrellm-2.3.0.ebuild
+++ b/app-admin/gkrellm/gkrellm-2.3.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/gkrellm/gkrellm-2.3.0.ebuild,v 1.8 2007/12/11 08:56:16 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/gkrellm/gkrellm-2.3.0.ebuild,v 1.9 2008/02/28 15:17:03 lack Exp $
 
 inherit eutils multilib toolchain-funcs
 
@@ -35,9 +35,9 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
-	epatch "${FILESDIR}"/${P}-build.patch
-	epatch "${FILESDIR}"/${P}-Makefile.patch
-	use gnutls && epatch "${FILESDIR}"/${P}-gnutls.patch
+	epatch "${FILESDIR}"/${PN}-2.3-build.patch
+	epatch "${FILESDIR}"/${PN}-2.3-Makefile.patch
+	use gnutls && epatch "${FILESDIR}"/${PN}-2.3-gnutls.patch
 
 	sed -e 's:#user\tnobody:user\tgkrellmd:' \
 		-e 's:#group\tproc:group\tgkrellmd:' \
diff --git a/app-admin/gkrellm/gkrellm-2.3.1.ebuild b/app-admin/gkrellm/gkrellm-2.3.1.ebuild
new file mode 100644
index 000000000000..d307d0785cff
--- /dev/null
+++ b/app-admin/gkrellm/gkrellm-2.3.1.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/gkrellm/gkrellm-2.3.1.ebuild,v 1.1 2008/02/28 15:17:03 lack Exp $
+
+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 X kernel_FreeBSD"
+
+RDEPEND=">=dev-libs/glib-2
+	hddtemp? ( app-admin/hddtemp )
+	gnutls? ( net-libs/gnutls )
+	lm_sensors? ( sys-apps/lm_sensors )
+	nls? ( virtual/libintl )
+	ssl? ( dev-libs/openssl )
+	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_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/${PN}-2.3-build.patch
+	epatch "${FILESDIR}"/${PN}-2.3-Makefile.patch
+	use gnutls && epatch "${FILESDIR}"/${PN}-2.3-gnutls.patch
+
+	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
+		emake ${TARGET} \
+			CC="$(tc-getCC)" \
+			INSTALLROOT=/usr \
+			INCLUDEDIR=/usr/include/gkrellm2 \
+			LOCALEDIR=/usr/share/locale \
+			$(use nls || echo enable_nls=0) \
+			$(use gnutls || echo without-gnutls=yes) \
+			$(use lm_sensors || echo without-libsensors=yes) \
+			$(use ssl || echo without-ssl=yes) \
+			|| die "emake failed"
+	else
+		cd server
+			emake ${TARGET} \
+			CC="$(tc-getCC)" \
+			$(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) \
+			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"
+			dosym gkrellm /usr/bin/gkrellm2
+
+			dohtml *.html
+
+			newicon src/icon.xpm ${PN}.xpm
+		make_desktop_entry ${PN} GKrellM ${PN}.xpm
+	else
+		dobin server/gkrellmd || die "dobin failed"
+
+		insinto /usr/include/gkrellm2
+		doins server/gkrellmd.h || die "doins failed"
+	fi
+
+	doinitd "${FILESDIR}"/gkrellmd || die "doinitd failed"
+	doconfd "${FILESDIR}"/gkrellmd.conf || die "doconfd failed"
+
+	insinto /etc
+	doins server/gkrellmd.conf || die "doins failed"
+
+	dodoc Changelog CREDITS README
+}
+
+pkg_postinst() {
+	ewarn "The old executable name 'gkrellm2' is deprecated."
+	ewarn "We have provided a compatible symlink for your convenience,"
+	ewarn "but this is only temporary.  You should run this as just 'gkrellm'"
+	ewarn "instead."
+}