From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 67C0F15808B for ; Mon, 4 Apr 2022 14:49:34 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 313D0E091A; Mon, 4 Apr 2022 14:49:30 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id EED40E091A for ; Mon, 4 Apr 2022 14:49:29 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1ED0D34149A for ; Mon, 4 Apr 2022 14:49:29 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A112C3B0 for ; Mon, 4 Apr 2022 14:49:25 +0000 (UTC) From: "Andrew Ammerlaan" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andrew Ammerlaan" Message-ID: <1649082787.05a27c46b35a00435f2c5bdc8aab4096a36f896e.andrewammerlaan@gentoo> Subject: [gentoo-commits] repo/proj/guru:master commit in: sys-cluster/pcs/ X-VCS-Repository: repo/proj/guru X-VCS-Files: sys-cluster/pcs/pcs-0.11.2.ebuild X-VCS-Directories: sys-cluster/pcs/ X-VCS-Committer: andrewammerlaan X-VCS-Committer-Name: Andrew Ammerlaan X-VCS-Revision: 05a27c46b35a00435f2c5bdc8aab4096a36f896e X-VCS-Branch: master Date: Mon, 4 Apr 2022 14:49:25 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: a37b7637-105f-4953-97f7-422119c76e40 X-Archives-Hash: ce471aed6fbbc59d1610cc663ce7c82a commit: 05a27c46b35a00435f2c5bdc8aab4096a36f896e Author: Andrew Ammerlaan gentoo org> AuthorDate: Mon Apr 4 14:32:58 2022 +0000 Commit: Andrew Ammerlaan gentoo 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 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}] - =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}] + =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 } From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 7D58B15808B for ; Mon, 4 Apr 2022 14:34:09 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EA849E0536; Mon, 4 Apr 2022 14:34:07 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D3758E0536 for ; Mon, 4 Apr 2022 14:34:06 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C35403412E8 for ; Mon, 4 Apr 2022 14:34:05 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2CDEE34F for ; Mon, 4 Apr 2022 14:34:04 +0000 (UTC) From: "Andrew Ammerlaan" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andrew Ammerlaan" Message-ID: <1649082787.05a27c46b35a00435f2c5bdc8aab4096a36f896e.andrewammerlaan@gentoo> Subject: [gentoo-commits] repo/proj/guru:dev commit in: sys-cluster/pcs/ X-VCS-Repository: repo/proj/guru X-VCS-Files: sys-cluster/pcs/pcs-0.11.2.ebuild X-VCS-Directories: sys-cluster/pcs/ X-VCS-Committer: andrewammerlaan X-VCS-Committer-Name: Andrew Ammerlaan X-VCS-Revision: 05a27c46b35a00435f2c5bdc8aab4096a36f896e X-VCS-Branch: dev Date: Mon, 4 Apr 2022 14:34:04 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: d67dd969-6d7f-418b-8ab1-cfd2d2f36fbd X-Archives-Hash: 7625e547673b3b8e4d732e4c99eedfc4 Message-ID: <20220404143404.YL1kNJw_qX9T6gHIyAWHKcXOSSWY5Gppd1y3VE_C5-c@z> commit: 05a27c46b35a00435f2c5bdc8aab4096a36f896e Author: Andrew Ammerlaan gentoo org> AuthorDate: Mon Apr 4 14:32:58 2022 +0000 Commit: Andrew Ammerlaan gentoo 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 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}] - =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}] + =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 }