public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Andrew Ammerlaan" <andrewammerlaan@riseup.net>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/proj/guru:master commit in: sys-cluster/pcs/
Date: Mon,  7 Dec 2020 16:16:31 +0000 (UTC)	[thread overview]
Message-ID: <1607357777.24883715f6fab5df1a2d8cf7c7ca5830c5d588a2.andrewammerlaan@gentoo> (raw)

commit:     24883715f6fab5df1a2d8cf7c7ca5830c5d588a2
Author:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
AuthorDate: Mon Dec  7 16:16:17 2020 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
CommitDate: Mon Dec  7 16:16:17 2020 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=24883715

sys-cluster/pcs: fix install

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> riseup.net>

 sys-cluster/pcs/pcs-0.10.7.ebuild | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/sys-cluster/pcs/pcs-0.10.7.ebuild b/sys-cluster/pcs/pcs-0.10.7.ebuild
index a0f3ad18..56339bee 100644
--- a/sys-cluster/pcs/pcs-0.10.7.ebuild
+++ b/sys-cluster/pcs/pcs-0.10.7.ebuild
@@ -4,6 +4,7 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{7..9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
 USE_RUBY="ruby25 ruby26"
 inherit distutils-r1 ruby-ng systemd
 
@@ -59,6 +60,8 @@ ruby_add_rdepend "
 
 PATCHES=( "${FILESDIR}/remove-ruby-bundle-path.patch" "${FILESDIR}/openrc-0.10.7.patch" )
 
+S="${WORKDIR}/all/${P}"
+
 src_compile() {
 	return
 }
@@ -81,7 +84,7 @@ src_install() {
 	keepdir /var/lib/pcsd
 
 	# symlink the /usr/lib/pcs/pcs to /usr/sbin/pcs for pcsd
-	dosym ../../../sbin/pcs "${EPREFIX}/usr/lib/pcs/pcs"
+	dosym ../../sbin/pcs "${EPREFIX}/usr/lib/pcs/pcs"
 
 	# use Debian style systemd unit (with config in /etc/default/pcsd)
 	systemd_newunit "${S}/pcsd/pcsd.service.debian" "pcsd.service"
@@ -102,4 +105,6 @@ src_install() {
 		rm "${D}/usr/lib/pcs/pcs_snmp_agent"
 		rm "${D}/etc/default/pcs_snmp_agent"
 	fi
+
+	python_foreach_impl python_optimize
 }


WARNING: multiple messages have this Message-ID (diff)
From: "Andrew Ammerlaan" <andrewammerlaan@riseup.net>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/proj/guru:dev commit in: sys-cluster/pcs/
Date: Mon,  7 Dec 2020 16:16:25 +0000 (UTC)	[thread overview]
Message-ID: <1607357777.24883715f6fab5df1a2d8cf7c7ca5830c5d588a2.andrewammerlaan@gentoo> (raw)
Message-ID: <20201207161625.1uVwuxRnBLTBGLL-h3ym6VfbyHsgfSXBIvTpghfOg2M@z> (raw)

commit:     24883715f6fab5df1a2d8cf7c7ca5830c5d588a2
Author:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
AuthorDate: Mon Dec  7 16:16:17 2020 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
CommitDate: Mon Dec  7 16:16:17 2020 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=24883715

sys-cluster/pcs: fix install

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> riseup.net>

 sys-cluster/pcs/pcs-0.10.7.ebuild | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/sys-cluster/pcs/pcs-0.10.7.ebuild b/sys-cluster/pcs/pcs-0.10.7.ebuild
index a0f3ad18..56339bee 100644
--- a/sys-cluster/pcs/pcs-0.10.7.ebuild
+++ b/sys-cluster/pcs/pcs-0.10.7.ebuild
@@ -4,6 +4,7 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{7..9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
 USE_RUBY="ruby25 ruby26"
 inherit distutils-r1 ruby-ng systemd
 
@@ -59,6 +60,8 @@ ruby_add_rdepend "
 
 PATCHES=( "${FILESDIR}/remove-ruby-bundle-path.patch" "${FILESDIR}/openrc-0.10.7.patch" )
 
+S="${WORKDIR}/all/${P}"
+
 src_compile() {
 	return
 }
@@ -81,7 +84,7 @@ src_install() {
 	keepdir /var/lib/pcsd
 
 	# symlink the /usr/lib/pcs/pcs to /usr/sbin/pcs for pcsd
-	dosym ../../../sbin/pcs "${EPREFIX}/usr/lib/pcs/pcs"
+	dosym ../../sbin/pcs "${EPREFIX}/usr/lib/pcs/pcs"
 
 	# use Debian style systemd unit (with config in /etc/default/pcsd)
 	systemd_newunit "${S}/pcsd/pcsd.service.debian" "pcsd.service"
@@ -102,4 +105,6 @@ src_install() {
 		rm "${D}/usr/lib/pcs/pcs_snmp_agent"
 		rm "${D}/etc/default/pcs_snmp_agent"
 	fi
+
+	python_foreach_impl python_optimize
 }


             reply	other threads:[~2020-12-07 16:16 UTC|newest]

Thread overview: 26+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-12-07 16:16 Andrew Ammerlaan [this message]
2020-12-07 16:16 ` [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-04-04 14:49 Andrew Ammerlaan
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-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=1607357777.24883715f6fab5df1a2d8cf7c7ca5830c5d588a2.andrewammerlaan@gentoo \
    --to=andrewammerlaan@riseup.net \
    --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