mirrors/guru
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/guru.git synced 2026-07-21 21:13:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

sys-cluster/pcs: multiple QA fixes

Browse Source 
- disable >ruby27 so deps can resolve
- add some missing quotes
- fix indentation

Signed-off-by: Andrew Ammerlaan <andrewammerlaan@gentoo.org>
This commit is contained in:
Andrew Ammerlaan
2022-04-04 16:32:58 +02:00
parent f00afa15fb
commit 05a27c46b3
1 changed files with 47 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

94
sys-cluster/pcs/pcs-0.11.2.ebuild
View File

@@ -5,7 +5,7 @@ EAPI=8
DISTUTILS_USE_SETUPTOOLS=rdepend DISTUTILS_USE_SETUPTOOLS=rdepend
PYTHON_COMPAT=( python3_{9..10} ) PYTHON_COMPAT=( python3_{9..10} )
USE_RUBY="ruby27 ruby30 ruby31" USE_RUBY="ruby27"
inherit autotools systemd python-single-r1 ruby-ng inherit autotools systemd python-single-r1 ruby-ng
@@ -24,28 +24,28 @@ DEPEND="
sys-apps/coreutils sys-apps/coreutils
" "
RDEPEND=" RDEPEND="
${DEPEND} ${DEPEND}
${PYTHON_DEPS} ${PYTHON_DEPS}
$(python_gen_cond_dep ' $(python_gen_cond_dep '
dev-python/dacite[${PYTHON_USEDEP}] dev-python/dacite[${PYTHON_USEDEP}]
dev-python/lxml[${PYTHON_USEDEP}] dev-python/lxml[${PYTHON_USEDEP}]
dev-python/pycurl[${PYTHON_USEDEP}] dev-python/pycurl[${PYTHON_USEDEP}]
dev-python/pyparsing[${PYTHON_USEDEP}] dev-python/pyparsing[${PYTHON_USEDEP}]
dev-python/python-dateutil[${PYTHON_USEDEP}] dev-python/python-dateutil[${PYTHON_USEDEP}]
>=www-servers/tornado-6.0[${PYTHON_USEDEP}] >=www-servers/tornado-6.0[${PYTHON_USEDEP}]
<www-servers/tornado-7.0[${PYTHON_USEDEP}] <www-servers/tornado-7.0[${PYTHON_USEDEP}]
dev-python/pyagentx[${PYTHON_USEDEP}] dev-python/pyagentx[${PYTHON_USEDEP}]
dev-python/cryptography[${PYTHON_USEDEP}] dev-python/cryptography[${PYTHON_USEDEP}]
dev-python/setuptools[${PYTHON_USEDEP}] dev-python/setuptools[${PYTHON_USEDEP}]
dev-python/setuptools_scm[${PYTHON_USEDEP}] dev-python/setuptools_scm[${PYTHON_USEDEP}]
dev-python/pip[${PYTHON_USEDEP}] dev-python/pip[${PYTHON_USEDEP}]
dev-python/python-dateutil[${PYTHON_USEDEP}] dev-python/python-dateutil[${PYTHON_USEDEP}]
dev-python/pyopenssl[${PYTHON_USEDEP}] dev-python/pyopenssl[${PYTHON_USEDEP}]
') ')
>=sys-cluster/corosync-3.0 >=sys-cluster/corosync-3.0
>=sys-cluster/pacemaker-2.1.0 >=sys-cluster/pacemaker-2.1.0
sys-libs/pam sys-libs/pam
sys-process/psmisc sys-process/psmisc
" "
ruby_add_rdepend " ruby_add_rdepend "
@@ -68,44 +68,44 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
PATCHES="${FILESDIR}/pcs-0.11-gentoo-support.patch" PATCHES="${FILESDIR}/pcs-0.11-gentoo-support.patch"
src_prepare() { src_prepare() {
default default
eautoreconf eautoreconf
} }
src_configure() { src_configure() {
econf econf
} }
src_compile() { src_compile() {
return return
} }
src_install() { src_install() {
python-single-r1_pkg_setup python-single-r1_pkg_setup
local makeopts=( local makeopts=(
DESTDIR="${D}" DESTDIR="${ED}"
) )
emake install "${makeopts[@]}" emake install "${makeopts[@]}"
# mark log directories to be kept # mark log directories to be kept
keepdir /var/log/pcsd keepdir /var/log/pcsd
keepdir /var/lib/pcsd keepdir /var/lib/pcsd
#fix statedir #fix statedir
sed -i ${D}/usr/share/pcsd/pcsd -e 's/\/var\/lib\/lib\//\/var\/lib\//g' sed -i "${D}/usr/share/pcsd/pcsd" -e 's/\/var\/lib\/lib\//\/var\/lib\//g'
# custom service file for openRC # custom service file for openRC
if ! use systemd ; then if ! use systemd ; then
newinitd "${FILESDIR}/pcs-0.11.initd" pcs newinitd "${FILESDIR}/pcs-0.11.initd" pcs
newinitd "${FILESDIR}/pcsd-0.11.initd" pcsd newinitd "${FILESDIR}/pcsd-0.11.initd" pcsd
fi fi
if use systemd ; then if use systemd ; then
systemd_newunit "${S}/pcsd/pcsd.service.in" "pcs.service" systemd_newunit "${S}/pcsd/pcsd.service.in" "pcs.service"
systemd_newunit "${S}/pcsd/pcsd-ruby.service.in" "pcsd.service" systemd_newunit "${S}/pcsd/pcsd-ruby.service.in" "pcsd.service"
fi fi
python_optimize python_optimize
} }