[patch] bcfg2-1.3.3.ebuild new revision

bcfg2diff.deleteme (text/plain), 4.03 KB, created by Alexandr Tiurin on 2013-11-22 11:26:04 UTC

--- /usr/portage/app-admin/bcfg2/bcfg2-1.2.4.ebuild	2013-04-21 11:56:34.000000000 +0400
+++ bcfg2-1.3.3.ebuild	2013-11-22 15:18:50.126746401 +0400
@@ -1,80 +1,86 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/bcfg2/bcfg2-1.2.4.ebuild,v 1.1 2013/04/21 07:56:34 xmw Exp $
-
-EAPI="4"
+# $Header: 
 
-PYTHON_DEPEND="2:2.6"
-SUPPORT_PYTHON_ABIS="1"
-# ssl module required.
-RESTRICT_PYTHON_ABIS="2.4 2.5 3.*"
+EAPI=5
+PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} )
 
-inherit distutils
+inherit distutils-r1 readme.gentoo
 
-DESCRIPTION="configuration management tool"
+DESCRIPTION="Configuration management tool"
 HOMEPAGE="http://bcfg2.org"
 SRC_URI="ftp://ftp.mcs.anl.gov/pub/bcfg/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x64-solaris"
 IUSE="doc cheetah genshi server"
 
 DEPEND="dev-python/setuptools
-	doc? ( dev-python/sphinx )"
+	dev-python/sphinx[${PYTHON_USEDEP}]
+	doc? ( dev-libs/libgamin[python]
+			dev-python/cherrypy[${PYTHON_USEDEP}]
+			dev-python/genshi[${PYTHON_USEDEP}]
+			dev-python/lxml[${PYTHON_USEDEP}]
+			dev-python/mock[${PYTHON_USEDEP}]
+			dev-python/pyinotify[${PYTHON_USEDEP}]
+			dev-python/python-daemon[${PYTHON_USEDEP}] )"
 RDEPEND="app-portage/gentoolkit
-	cheetah? ( dev-python/cheetah )
-	genshi? ( dev-python/genshi )
+	cheetah? ( dev-python/cheetah[${PYTHON_USEDEP}] )
+	genshi? ( dev-python/genshi[${PYTHON_USEDEP}] )
+	dev-python/m2crypto[${PYTHON_USEDEP}]
 	server? (
-		dev-libs/libgamin[python]
-		dev-python/lxml
-		dev-python/nose
-		virtual/fam )"
-
-PYTHON_MODNAME="Bcfg2"
-
-distutils_src_install_post_hook() {
-	if ! use server; then
-		rm -f "$(distutils_get_intermediate_installation_image)${EPREFIX}/usr/sbin/bcfg2-"*
-	fi
-}
+		dev-python/django[${PYTHON_USEDEP},sqlite]
+		dev-python/lxml[${PYTHON_USEDEP}]
+		dev-python/python-daemon[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/south[${PYTHON_USEDEP}]
+		media-gfx/graphviz
+		|| ( dev-python/pyinotify[${PYTHON_USEDEP}]
+		     dev-libs/libgamin[python,${PYTHON_USEDEP}] ) )"
 
-src_compile() {
-	distutils_src_compile
+DOC_CONTENTS="For new installs, you need to run:\n bcfg2-admin init"
 
-	if use doc; then
-		einfo "Building Bcfg2 documentation"
-		PYTHONPATH="build-$(PYTHON -f --ABI)" \
-			sphinx-build doc doc_output || die
-	fi
+python_compile_all() {
+	"${PYTHON}" setup.py build_sphinx || die
 }
 
 src_install() {
-	distutils_src_install --record=PY_SERVER_LIBS --install-scripts "${EPREFIX}/usr/sbin"
+	distutils-r1_src_install
 
 	if ! use server; then
 		rm -rf "${ED}usr/share/bcfg2" || die
 		rm -rf "${ED}usr/share/man/man8" || die
+		rm -f "${ED}/usr/bin/bcfg2-"[a-oq-z]*  # don't remove implementations
+		remove-server-libs() {
+			local sitedir=$(python_get_sitedir)
+		    rm -rf "${ED}/${sitedir#${EPREFIX}}/Bcfg2/Reporting"
+		    rm -rf "${ED}/${sitedir#${EPREFIX}}/Bcfg2/Server"
+		    rm -rf "${ED}/${sitedir#${EPREFIX}}/Bcfg2/SSLServer"*
+		    rm -rf "${ED}/${sitedir#${EPREFIX}}/Bcfg2/Statistics"*
+		    rm -rf "${ED}/${sitedir#${EPREFIX}}/Bcfg2/settings"*
+		}
+		python_foreach_impl remove-server-libs
 	else
-		newinitd "${FILESDIR}/${PN}-server-1.2.0.rc" bcfg2-server
+		newinitd "${FILESDIR}/${PN}-server-1.3.rc" bcfg2-server
+		newinitd "${FILESDIR}/${PN}-report-collector-1.3.rc" bcfg2-report-collector
+		readme.gentoo_create_doc
 	fi
 
 	insinto /etc
 	doins examples/bcfg2.conf
+}
 
+python_install_all() {
 	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
+        rm -rf ../${P}-*/sphinx/html/_sources
+        local HTML_DOCS=( ../${P}-*/sphinx/html/. )
 	fi
+	distutils-r1_python_install_all
 }
 
 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"
+		readme.gentoo_print_elog
 	fi
 }