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

(Portage version: 2.1.10.41/cvs/Linux x86_64)

3 files changed, 88 insertions, 1 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/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"
+}