public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Andrew Ammerlaan" <andrewammerlaan@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/proj/guru:dev commit in: sys-cluster/pcs/
Date: Mon,  4 Apr 2022 14:34:04 +0000 (UTC)	[thread overview]
Message-ID: <1649082787.05a27c46b35a00435f2c5bdc8aab4096a36f896e.andrewammerlaan@gentoo> (raw)
Message-ID: <20220404143404.YL1kNJw_qX9T6gHIyAWHKcXOSSWY5Gppd1y3VE_C5-c@z> (raw)

commit:     05a27c46b35a00435f2c5bdc8aab4096a36f896e
Author:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Mon Apr  4 14:32:58 2022 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Mon Apr  4 14:33:07 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=05a27c46

sys-cluster/pcs: multiple QA fixes

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

Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>

 sys-cluster/pcs/pcs-0.11.2.ebuild | 94 +++++++++++++++++++--------------------
 1 file changed, 47 insertions(+), 47 deletions(-)

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


             reply	other threads:[~2022-04-04 14:34 UTC|newest]

Thread overview: 26+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-04-04 14:49 Andrew Ammerlaan [this message]
2022-04-04 14:34 ` [gentoo-commits] repo/proj/guru:dev commit in: sys-cluster/pcs/ Andrew Ammerlaan
  -- strict thread matches above, loose matches on Subject: below --
2022-04-23 19:07 [gentoo-commits] repo/proj/guru:master " Andrew Ammerlaan
2022-04-13 14:37 Florian Schmaus
2022-01-21 13:25 Andrew Ammerlaan
2022-01-21 13:25 Andrew Ammerlaan
2021-07-13  9:09 Andrew Ammerlaan
2021-04-12  5:38 Theo Anderson
2021-04-12  5:38 Theo Anderson
2021-03-28 11:43 Andrew Ammerlaan
2021-03-24  9:05 [gentoo-commits] repo/proj/guru:dev " Andrew Ammerlaan
2021-03-24  9:05 ` [gentoo-commits] repo/proj/guru:master " Andrew Ammerlaan
2021-03-23 14:45 Andrew Ammerlaan
2021-03-23 14:45 Andrew Ammerlaan
2021-03-23 14:45 Andrew Ammerlaan
2021-03-20 17:38 Andrew Ammerlaan
2021-03-20 17:38 [gentoo-commits] repo/proj/guru:dev " Andrew Ammerlaan
2021-03-20 17:38 ` [gentoo-commits] repo/proj/guru:master " Andrew Ammerlaan
2020-12-15 22:35 Haelwenn Monnier
2020-12-09 14:14 Andrew Ammerlaan
2020-12-09 14:14 Andrew Ammerlaan
2020-12-09 14:14 Andrew Ammerlaan
2020-12-09 14:14 Andrew Ammerlaan
2020-12-08 14:25 Andrew Ammerlaan
2020-12-07 16:16 Andrew Ammerlaan
2020-12-06 19:12 [gentoo-commits] repo/proj/guru:dev " Andrew Ammerlaan
2020-12-06 19:12 ` [gentoo-commits] repo/proj/guru:master " Andrew Ammerlaan
2020-12-06 18:44 Andrew Ammerlaan
2020-12-06 10:49 Andrew Ammerlaan

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1649082787.05a27c46b35a00435f2c5bdc8aab4096a36f896e.andrewammerlaan@gentoo \
    --to=andrewammerlaan@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox