Version bump, fixing --startas (bug 395235, thanks m.cassaniti), fixing gamin (r)dep (bug 395233, thanks m.cassaniti and jer)

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

4 files changed, 95 insertions, 5 deletions

diff --git a/app-admin/bcfg2/ChangeLog b/app-admin/bcfg2/ChangeLog
index bda7b966e68b..983089170ee5 100644
--- a/app-admin/bcfg2/ChangeLog
+++ b/app-admin/bcfg2/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-admin/bcfg2
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/bcfg2/ChangeLog,v 1.18 2011/11/11 00:21:13 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/bcfg2/ChangeLog,v 1.19 2011/12/28 07:56:20 xmw Exp $
+
+*bcfg2-1.2.0 (28 Dec 2011)
+
+  28 Dec 2011; Michael Weber <xmw@gentoo.org> +bcfg2-1.2.0.ebuild,
+  +files/bcfg2-server-1.2.0.rc:
+  Version bump, fixing --startas (bug 395235, thanks m.cassaniti), fixing gamin
+  (r)dep (bug 395233, thanks m.cassaniti and jer)
 
 *bcfg2-1.2.0_rc2 (11 Nov 2011)
 *bcfg2-1.1.3 (11 Nov 2011)
diff --git a/app-admin/bcfg2/Manifest b/app-admin/bcfg2/Manifest
index 1a573b5bda06..4b82ed00dfbb 100644
--- a/app-admin/bcfg2/Manifest
+++ b/app-admin/bcfg2/Manifest
@@ -1,17 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX bcfg2-server-1.2.0.rc 480 RMD160 1aac0a25caa341f8568d490cc2cf0dc9cdf6b16d SHA1 cf3a2f811939fdace11704774a95724264761831 SHA256 e456c271e5781a74b4a41fc7fa54d34307f360876c8db1a44c91c27f804bc262
 AUX bcfg2-server.rc 483 RMD160 bb62e38431cec8cddf275b0c7c05555b7ef90727 SHA1 b883878c6bb8c1787629d8b3288037356e8f239a SHA256 0c73b6c09fbb8cc7f3387e1565f2327d728d41d7875c73df3708f2c94c8d96f0
 DIST bcfg2-1.1.3.tar.gz 1784202 RMD160 b00ce8b7f89142e1bb24cb843697a7a0a854b31d SHA1 d3690cc62e0acc8d4affa43b7b48f3280355f5f6 SHA256 bc345a158896967450ddb0c56ae66a25dd31216eb1a1ea954ded494535fdcb05
+DIST bcfg2-1.2.0.tar.gz 1945551 RMD160 db89ee0b8975bf50ad68bfac122e50253ded1906 SHA1 4fb57f24d2fbce3d6afc0d0b4fbecdd7e05bc5a9 SHA256 138d792423475ae6516a95578a3df191504afaff31007877c7c2b36830d1a260
 DIST bcfg2-1.2.0rc2.tar.gz 1942476 RMD160 a717f46623f4251c2cee1b4cf143d380e50ffe14 SHA1 d11d09269200d3d866e4574e052a3102a5d19222 SHA256 d9d9b269fb25b3898b92532bfdb26ab8905a8184824e3576ff5c95d9c08f09ab
 EBUILD bcfg2-1.1.3.ebuild 1536 RMD160 c149179f18acdc5246237f612858b9234af09620 SHA1 fed0ae77f0be6428fb90799daa7fd0b4e23747cd SHA256 f9d74789fb3a833a554772f9489493e22cee59c8823217bea11170835eb1d567
+EBUILD bcfg2-1.2.0.ebuild 1328 RMD160 28f3a5248c0e665baf0a70344bcebdd2d4452768 SHA1 427110920eb9c343e44da9341dac4fdd12f06d2f SHA256 79fa231c20e775c647e8177778954ce69ac6d78c133142b67359a54bbb21294d
 EBUILD bcfg2-1.2.0_rc2.ebuild 1540 RMD160 98c9860bf9efefbbb082258473c75039f35cb758 SHA1 2a98a36480a717e285eaa0ca3011f6cb2745db01 SHA256 5bae4dcbd48865f30866c74ec89c8264969b0b9e8ce2f05428865b31b45f5a3a
-MISC ChangeLog 2885 RMD160 d8750d26eafce1f2a12d4a3f268bdb1a232bdebc SHA1 f2acaf704030b3478237a54b696efdd170f09c89 SHA256 cc3772cbcb238a68beeb8269fbe2e5c3e8b685db73d0e693a87ca2be52e32a4b
+MISC ChangeLog 3143 RMD160 ad630cca16dcc892a10f3298a127762034f9a07a SHA1 3346f11788694a0c842c4507460fefb89a8ff995 SHA256 354bdc32cdf24d5f8e19d59d34209b260471f562ba73b6d04540158ae2989e3e
 MISC metadata.xml 465 RMD160 f696e6002a526150db68b707a7c14a63dbfdd72b SHA1 83127956475d8e049dfbeb5bb1217ac518073b3c SHA256 c6b36a2dd4e7f6c9329cec158899ad653bb1076e9aeeb67ab303b39166cc9729
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk68an8ACgkQknrdDGLu8JAZgAD+NKo5E2+qoqlz3TDknoqJKods
-QVAnCAvrMjBJjcM/1oUBAJECAePe6XNpTajgX2SUpuaVAfc/3yCkJk/0WMgAdNaT
-=wChM
+iF4EAREIAAYFAk76y6oACgkQknrdDGLu8JC5oAD9Gii5/nDxgqZau5nQ/Hhmzi/s
+lrccRnLFOoA5juwBpSEA/AgYPi3CABzfUe7sgcNDhkd44Rfkvuun5WZjMboLM94g
+=i+K1
 -----END PGP SIGNATURE-----
diff --git a/app-admin/bcfg2/bcfg2-1.2.0.ebuild b/app-admin/bcfg2/bcfg2-1.2.0.ebuild
new file mode 100644
index 000000000000..c93ced670f4d
--- /dev/null
+++ b/app-admin/bcfg2/bcfg2-1.2.0.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/bcfg2/bcfg2-1.2.0.ebuild,v 1.1 2011/12/28 07:56:20 xmw Exp $
+
+EAPI="3"
+PYTHON_DEPEND="2:2.6"
+SUPPORT_PYTHON_ABIS="1"
+# ssl module required.
+RESTRICT_PYTHON_ABIS="2.4 2.5 3.*"
+
+inherit distutils
+
+DESCRIPTION="configuration management tool"
+HOMEPAGE="http://bcfg2.org"
+SRC_URI="ftp://ftp.mcs.anl.gov/pub/bcfg/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
+IUSE="server"
+
+DEPEND=""
+RDEPEND="app-portage/gentoolkit
+	server? (
+		dev-python/lxml
+		dev-libs/libgamin[python] )"
+
+PYTHON_MODNAME="Bcfg2"
+
+distutils_src_install_post_hook() {
+	if ! use server; then
+		rm -f "$(distutils_get_intermediate_installation_image)${EPREFIX}/usr/sbin/bcfg2-"*
+	fi
+}
+
+src_install() {
+	distutils_src_install --record=PY_SERVER_LIBS --install-scripts "${EPREFIX}/usr/sbin"
+
+	if ! use server; then
+		rm -rf "${ED}usr/share/bcfg2"
+		rm -rf "${ED}usr/share/man/man8"
+	else
+		newinitd "${FILESDIR}/bcfg2-server.rc" bcfg2-server
+	fi
+
+	insinto /etc
+	doins examples/bcfg2.conf || die
+}
+
+pkg_postinst () {
+	distutils_pkg_postinst
+
+	if use server; then
+		einfo "If this is a new installation, you probably need to run:"
+		einfo "    bcfg2-admin init"
+	fi
+}
diff --git a/app-admin/bcfg2/files/bcfg2-server-1.2.0.rc b/app-admin/bcfg2/files/bcfg2-server-1.2.0.rc
new file mode 100644
index 000000000000..d3edc5ca949a
--- /dev/null
+++ b/app-admin/bcfg2/files/bcfg2-server-1.2.0.rc
@@ -0,0 +1,23 @@
+#!/sbin/runscript
+#
+# bcfgd - bcfg configuration daemon
+#
+# 
+
+depend () {
+	need net
+}
+
+start () {
+	ebegin "Starting bcfg2-server"
+	start-stop-daemon --start --quiet --pidfile /var/run/bcfg2-server.pid \
+		--exec /usr/sbin/bcfg2-server -- -D /var/run/bcfg2-server.pid
+	eend $? "Failed to start bcfg2-server"
+}
+
+stop () {
+	ebegin "Stopping bcfg2-server"
+	start-stop-daemon --stop --quiet --pidfile /var/run/bcfg2-server.pid \
+		--signal INT
+	eend $? "Failed to stop bcfg2-server"
+}