[gentoo-commits] repo/proj/guru:master commit in: sys-cluster/pcs/

["Andrew Ammerlaan" <andrewammerlaan@riseup.net>]

commit:     a53c05a1fe5b3e2216f227429ebcaec1525d441b
Author:     Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
AuthorDate: Tue Mar 23 00:52:02 2021 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
CommitDate: Tue Mar 23 00:52:02 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=a53c05a1

sys-cluster/pcs: python single

still has that git discover issue

Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Alessandro Barbieri <lssndrbarbieri <AT> gmail.com>

 sys-cluster/pcs/pcs-0.10.8-r1.ebuild | 45 +++++++++++++++++++++---------------
 1 file changed, 26 insertions(+), 19 deletions(-)

diff --git a/sys-cluster/pcs/pcs-0.10.8-r1.ebuild b/sys-cluster/pcs/pcs-0.10.8-r1.ebuild
index e41199e88..a6acdb475 100644
--- a/sys-cluster/pcs/pcs-0.10.8-r1.ebuild
+++ b/sys-cluster/pcs/pcs-0.10.8-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 PYTHON_COMPAT=( python3_{7..9} )
 DISTUTILS_USE_SETUPTOOLS=rdepend
 USE_RUBY="ruby25 ruby26"
-inherit distutils-r1 ruby-ng systemd
+inherit python-single-r1 ruby-ng systemd
 
 DESCRIPTION="Pacemaker/Corosync Configuration System"
 HOMEPAGE="https://github.com/ClusterLabs/pcs"
@@ -17,27 +17,30 @@ SLOT="0"
 KEYWORDS="~amd64"
 IUSE="systemd"
 
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
 DEPEND="
 	dev-libs/libffi
 	media-libs/fontconfig
-	sys-apps/coreutils
 "
 RDEPEND="
 	${DEPEND}
+	$(python_gen_cond_dep '
+		dev-python/distro[${PYTHON_USEDEP}]
+		dev-python/dacite[${PYTHON_USEDEP}]
+		dev-python/lxml[${PYTHON_USEDEP}]
+		dev-python/pycurl[${PYTHON_USEDEP}]
+		dev-python/pyopenssl[${PYTHON_USEDEP}]
+		dev-python/pyparsing[${PYTHON_USEDEP}]
+		dev-python/python-dateutil[${PYTHON_USEDEP}]
+		>=www-servers/tornado-6.0[${PYTHON_USEDEP}]
+		<www-servers/tornado-7.0[${PYTHON_USEDEP}]
+	')
 	dev-libs/openssl
-	dev-python/distro[${PYTHON_USEDEP}]
-	dev-python/dacite[${PYTHON_USEDEP}]
-	dev-python/lxml[${PYTHON_USEDEP}]
-	dev-python/pycurl[${PYTHON_USEDEP}]
-	dev-python/pyopenssl[${PYTHON_USEDEP}]
-	dev-python/pyparsing[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
 	>=sys-cluster/corosync-3.0
 	>=sys-cluster/pacemaker-2.0
 	sys-libs/pam
 	sys-process/psmisc
-	>=www-servers/tornado-6.0[${PYTHON_USEDEP}]
-	<www-servers/tornado-7.0[${PYTHON_USEDEP}]
 "
 
 ruby_add_rdepend "
@@ -67,17 +70,21 @@ src_compile() {
 }
 
 src_install() {
+	python-single-r1_pkg_setup
 	# pre-create directory that is needed by 'make install'
 	dodir "/usr/lib/pcs"
 	# install files using 'make install'
-	emake install \
-		SYSTEMCTL_OVERRIDE=$(use systemd) \
-		DESTDIR="${D}" \
-		CONF_DIR="/etc/default/" \
-		PREFIX="${EPREFIX}/usr/" \
-		BUNDLE_INSTALL_PYAGENTX=false \
-		BUNDLE_TO_INSTALL=false \
+
+	local makeopts=(
+		SYSTEMCTL_OVERRIDE=$(use systemd)
+		DESTDIR="${D}"
+		CONF_DIR="/etc/default/"
+		PREFIX="${EPREFIX}/usr/"
 		BUILD_GEMS=false
+		BUNDLE_INSTALL_PYAGENTX=false
+		BUNDLE_TO_INSTALL=false
+	)
+	emake install "${makeopts[@]}"
 
 	# mark log directories to be kept
 	keepdir /var/log/pcsd
@@ -99,5 +106,5 @@ src_install() {
 	cp -a "${S}/pcs/settings.py.debian" "${D}/usr/lib/pcs/settings.py" || die
 	cp -a "${S}/pcsd/settings.rb.debian" "${D}/usr/lib/pcsd/settings.rb" || die
 
-	python_foreach_impl python_optimize
+	python_optimize
 }