Version bump, add IUSE doc (thanks solj, bug 411881), add depends dev-python/genshi and app-admin/gam-server (thanks Alexandr Tiurin, bug 409569).

(Portage version: 2.1.10.49/cvs/Linux x86_64)

2 files changed, 86 insertions, 1 deletions

diff --git a/app-admin/bcfg2/ChangeLog b/app-admin/bcfg2/ChangeLog
index 1b58c7c5b99b..93878485d956 100644
--- a/app-admin/bcfg2/ChangeLog
+++ b/app-admin/bcfg2/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-admin/bcfg2
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/bcfg2/ChangeLog,v 1.20 2012/04/14 09:48:37 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/bcfg2/ChangeLog,v 1.21 2012/04/14 10:21:20 xmw Exp $
+
+*bcfg2-1.2.2 (14 Apr 2012)
+
+  14 Apr 2012; Michael Weber <xmw@gentoo.org> +bcfg2-1.2.2.ebuild:
+  Version bump, add IUSE doc (thanks solj, bug 411881), add depends
+  dev-python/genshi and app-admin/gam-server (thanks Alexandr Tiurin, bug
+  409569).
 
   14 Apr 2012; Michael Weber <xmw@gentoo.org> -files/bcfg2-server.rc,
   -bcfg2-1.1.3.ebuild, -bcfg2-1.2.0_rc2.ebuild, bcfg2-1.2.0.ebuild:
diff --git a/app-admin/bcfg2/bcfg2-1.2.2.ebuild b/app-admin/bcfg2/bcfg2-1.2.2.ebuild
new file mode 100644
index 000000000000..7ba9bdc90fc2
--- /dev/null
+++ b/app-admin/bcfg2/bcfg2-1.2.2.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/bcfg2/bcfg2-1.2.2.ebuild,v 1.1 2012/04/14 10:21:20 xmw Exp $
+
+EAPI="4"
+
+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="doc server"
+
+DEPEND="dev-python/setuptools
+	doc? ( dev-python/sphinx )"
+RDEPEND="app-portage/gentoolkit
+	app-admin/gam-server
+	dev-python/genshi
+	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_compile() {
+	distutils_src_compile
+
+	if use doc; then
+		einfo "Building Bcfg2 documentation"
+		PYTHONPATH="build-$(PYTHON -f --ABI)" \
+			sphinx-build doc doc_output || die
+	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" || die
+		rm -rf "${ED}usr/share/man/man8" || die
+	else
+		newinitd "${FILESDIR}/${PN}-server-1.2.0.rc" bcfg2-server
+	fi
+
+	insinto /etc
+	doins examples/bcfg2.conf
+
+	if use doc; then
+		pushd doc_output > /dev/null
+		insinto /usr/share/doc/${PF}/html
+		doins -r [a-z]* _images _static || die "Failed to install documentation"
+		popd > /dev/null
+	fi
+}
+
+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
+}