[patch] add python 3 support and build documentation

bcfg2-1.3.2.ebuild.patch (text/plain), 3.24 KB, created by solj on 2013-07-09 17:08:42 UTC

--- /usr/portage/app-admin/bcfg2/bcfg2-1.2.4.ebuild	2013-04-21 02:56:34.000000000 -0500
+++ gentoo/bcfg2-1.3.2.ebuild	2013-07-09 12:01:45.115325216 -0500
@@ -1,15 +1,11 @@
 # 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 $
+# $Header: $
 
-EAPI="4"
+EAPI=5
+PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} )
 
-PYTHON_DEPEND="2:2.6"
-SUPPORT_PYTHON_ABIS="1"
-# ssl module required.
-RESTRICT_PYTHON_ABIS="2.4 2.5 3.*"
-
-inherit distutils
+inherit distutils-r1
 
 DESCRIPTION="configuration management tool"
 HOMEPAGE="http://bcfg2.org"
@@ -21,60 +17,65 @@
 IUSE="doc cheetah genshi server"
 
 DEPEND="dev-python/setuptools
-	doc? ( dev-python/sphinx )"
+	doc? ( dev-libs/libgamin[python]
+		   dev-python/cherrypy
+		   dev-python/genshi
+		   dev-python/lxml
+		   dev-python/m2crypto
+		   dev-python/mock
+           dev-python/pyinotify
+		   dev-python/python-daemon
+		   dev-python/sphinx )"
 RDEPEND="app-portage/gentoolkit
 	cheetah? ( dev-python/cheetah )
 	genshi? ( dev-python/genshi )
 	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
-}
-
-src_compile() {
-	distutils_src_compile
+		dev-python/python-daemon
+		|| ( dev-python/pyinotify dev-libs/libgamin[python] ) )"
 
+python_compile_all() {
 	if use doc; then
-		einfo "Building Bcfg2 documentation"
-		PYTHONPATH="build-$(PYTHON -f --ABI)" \
-			sphinx-build doc doc_output || die
+	    "${PYTHON}" setup.py build_sphinx || die
 	fi
 }
 
 src_install() {
-	distutils_src_install --record=PY_SERVER_LIBS --install-scripts "${EPREFIX}/usr/sbin"
+	distutils-r1_src_install
 
 	if ! use server; then
+		# Remove files only necessary for a server installation
 		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
 	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
-	fi
+	    rm -rf build/sphinx/html/_sources
+		local HTML_DOCS=( build/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"
+		elog "If this is a new installation, you probably need to run:"
+		elog "    bcfg2-admin init"
 	fi
 }