public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/proj/guru:dev commit in: sys-cluster/pcs/
@ 2021-03-23  0:52 Alessandro Barbieri
  0 siblings, 0 replies; 27+ messages in thread
From: Alessandro Barbieri @ 2021-03-23  0:52 UTC (permalink / raw
  To: gentoo-commits

commit:     6913ad9b6e3e9be49199eeb97b30cf78be6f2252
Author:     Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
AuthorDate: Tue Mar 23 00:06:01 2021 +0000
Commit:     Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
CommitDate: Tue Mar 23 00:06:01 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=6913ad9b

sys-cluster/pcs: remove useless use

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 | 103 +++++++++++++++++++++++++++++++++++
 1 file changed, 103 insertions(+)

diff --git a/sys-cluster/pcs/pcs-0.10.8-r1.ebuild b/sys-cluster/pcs/pcs-0.10.8-r1.ebuild
new file mode 100644
index 00000000..a83f9773
--- /dev/null
+++ b/sys-cluster/pcs/pcs-0.10.8-r1.ebuild
@@ -0,0 +1,103 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+USE_RUBY="ruby25 ruby26"
+inherit distutils-r1 ruby-ng systemd
+
+DESCRIPTION="Pacemaker/Corosync Configuration System"
+HOMEPAGE="https://github.com/ClusterLabs/pcs"
+SRC_URI="https://github.com/ClusterLabs/pcs/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="systemd"
+
+DEPEND="
+	dev-libs/libffi
+	media-libs/fontconfig
+	sys-apps/coreutils
+"
+RDEPEND="
+	${DEPEND}
+	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 "
+	dev-ruby/backports
+	dev-ruby/bundler
+	dev-ruby/ethon
+	dev-ruby/highline
+	dev-ruby/json
+	dev-ruby/multi_json
+	dev-ruby/open4
+	dev-ruby/rack
+	dev-ruby/rack-protection
+	dev-ruby/rack-test
+	dev-ruby/rubygems
+	dev-ruby/sinatra
+	dev-ruby/thor
+	dev-ruby/tilt
+	www-servers/thin
+"
+
+PATCHES=( "${FILESDIR}/remove-ruby-bundle-path.patch" "${FILESDIR}/openrc-${PV}.patch" )
+
+S="${WORKDIR}/all/${P}"
+
+src_compile() {
+	return
+}
+
+src_install() {
+	# 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 \
+		BUILD_GEMS=false
+
+	# mark log directories to be kept
+	keepdir /var/log/pcsd
+	keepdir /var/lib/pcsd
+
+	# symlink the /usr/lib/pcs/pcs to /usr/sbin/pcs for pcsd
+	dosym ../../sbin/pcs "${EPREFIX}/usr/lib/pcs/pcs"
+
+	# use Debian style systemd unit (with config in /etc/default/pcsd)
+	if use systemd ; then
+		systemd_newunit "${S}/pcsd/pcsd.service.debian" "pcsd.service"
+		systemd_newunit "${S}/pcsd/pcsd-ruby.service" "pcsd-daemon.service"
+	fi
+	# custom service file for openRC
+	newinitd "${FILESDIR}/pcsd.initd" pcsd || die
+	newinitd "${FILESDIR}/pcsd-daemon.initd" pcsd-daemon || die
+
+	# move config files to right places - we use debian-style /etc/default
+	cp -a "${S}/pcs/settings.py.debian" "${D}/usr/lib/pcs/settings.py"
+	cp -a "${S}/pcsd/settings.rb.debian" "${D}/usr/lib/pcsd/settings.rb"
+
+	python_foreach_impl python_optimize
+}


^ permalink raw reply related	[flat|nested] 27+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: sys-cluster/pcs/
@ 2022-04-23 19:07 Andrew Ammerlaan
  2022-04-23 18:57 ` [gentoo-commits] repo/proj/guru:dev " Andrew Ammerlaan
  0 siblings, 1 reply; 27+ messages in thread
From: Andrew Ammerlaan @ 2022-04-23 19:07 UTC (permalink / raw
  To: gentoo-commits

commit:     03d3ca03cb25284d2b8fda22db77dc9aab4b2c91
Author:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 23 18:57:28 2022 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Sat Apr 23 18:57:28 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=03d3ca03

sys-cluster/pcs: remove DoubleEmptyLine

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

 sys-cluster/pcs/pcs-0.11.2.ebuild | 1 -
 1 file changed, 1 deletion(-)

diff --git a/sys-cluster/pcs/pcs-0.11.2.ebuild b/sys-cluster/pcs/pcs-0.11.2.ebuild
index e6e6fa20a..aeeddbed6 100644
--- a/sys-cluster/pcs/pcs-0.11.2.ebuild
+++ b/sys-cluster/pcs/pcs-0.11.2.ebuild
@@ -66,7 +66,6 @@ ruby_add_rdepend "
 		dev-ruby/webrick
 		dev-ruby/json"
 
-
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 PATCHES="${FILESDIR}/pcs-0.11-gentoo-support.patch
 		${FILESDIR}/remove_bashism.patch"


^ permalink raw reply related	[flat|nested] 27+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: sys-cluster/pcs/
@ 2022-04-13 12:29 Andrea Postiglione
  0 siblings, 0 replies; 27+ messages in thread
From: Andrea Postiglione @ 2022-04-13 12:29 UTC (permalink / raw
  To: gentoo-commits

commit:     78a3aed984488c95f8b2246d12ff8e3d5eb307f5
Author:     Andrea Postiglione <andrea.postiglione <AT> gmail <DOT> com>
AuthorDate: Wed Apr 13 12:28:30 2022 +0000
Commit:     Andrea Postiglione <andrea.postiglione <AT> gmail <DOT> com>
CommitDate: Wed Apr 13 12:28:30 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=78a3aed9

sys-cluster/pcs: fix dep

Signed-off-by: Andrea Postiglione <andrea.postiglione <AT> gmail.com>

 sys-cluster/pcs/pcs-0.11.2.ebuild | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/sys-cluster/pcs/pcs-0.11.2.ebuild b/sys-cluster/pcs/pcs-0.11.2.ebuild
index 40733de60..e6e6fa20a 100644
--- a/sys-cluster/pcs/pcs-0.11.2.ebuild
+++ b/sys-cluster/pcs/pcs-0.11.2.ebuild
@@ -62,7 +62,10 @@ ruby_add_rdepend "
 		dev-ruby/rack-protection
 		dev-ruby/rack-test
 		dev-ruby/sinatra
-		www-servers/thin"
+		www-servers/thin
+		dev-ruby/webrick
+		dev-ruby/json"
+
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 PATCHES="${FILESDIR}/pcs-0.11-gentoo-support.patch


^ permalink raw reply related	[flat|nested] 27+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: sys-cluster/pcs/
@ 2022-04-04 14:49 Andrew Ammerlaan
  2022-04-04 14:34 ` [gentoo-commits] repo/proj/guru:dev " Andrew Ammerlaan
  0 siblings, 1 reply; 27+ messages in thread
From: Andrew Ammerlaan @ 2022-04-04 14:49 UTC (permalink / raw
  To: gentoo-commits

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
 }


^ permalink raw reply related	[flat|nested] 27+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: sys-cluster/pcs/
@ 2022-04-03 16:47 Andrea Postiglione
  0 siblings, 0 replies; 27+ messages in thread
From: Andrea Postiglione @ 2022-04-03 16:47 UTC (permalink / raw
  To: gentoo-commits

commit:     fbf6439349ca07dde5759224074bffaee45f5d30
Author:     Andrea Postiglione <andrea.postiglione <AT> gmail <DOT> com>
AuthorDate: Sun Apr  3 16:46:01 2022 +0000
Commit:     Andrea Postiglione <andrea.postiglione <AT> gmail <DOT> com>
CommitDate: Sun Apr  3 16:46:01 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=fbf64393

sys-cluster/pcs-0.11.2 fix pyopenssl dep

Signed-off-by: Andrea Postiglione <andrea.postiglione <AT> gmail.com>

 sys-cluster/pcs/pcs-0.11.2.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sys-cluster/pcs/pcs-0.11.2.ebuild b/sys-cluster/pcs/pcs-0.11.2.ebuild
index 7cdce0605..02567e4e6 100644
--- a/sys-cluster/pcs/pcs-0.11.2.ebuild
+++ b/sys-cluster/pcs/pcs-0.11.2.ebuild
@@ -40,6 +40,7 @@ RDEPEND="
 				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


^ permalink raw reply related	[flat|nested] 27+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: sys-cluster/pcs/
@ 2022-01-21 12:35 Andrea Postiglione
  0 siblings, 0 replies; 27+ messages in thread
From: Andrea Postiglione @ 2022-01-21 12:35 UTC (permalink / raw
  To: gentoo-commits

commit:     240b182d2f05dcf7d46d47a0430eaa70ba24d92c
Author:     Andrea Postiglione <andrea.postiglione <AT> gmail <DOT> com>
AuthorDate: Fri Jan 21 12:34:18 2022 +0000
Commit:     Andrea Postiglione <andrea.postiglione <AT> gmail <DOT> com>
CommitDate: Fri Jan 21 12:34:18 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=240b182d

sys-cluster/pcs-0.10.8-r3: add ruby27

Signed-off-by: Andrea Postiglione <andrea.postiglione <AT> gmail.com>

 sys-cluster/pcs/pcs-0.10.8-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-cluster/pcs/pcs-0.10.8-r3.ebuild b/sys-cluster/pcs/pcs-0.10.8-r3.ebuild
index 68eccd9f1..c415a60fa 100644
--- a/sys-cluster/pcs/pcs-0.10.8-r3.ebuild
+++ b/sys-cluster/pcs/pcs-0.10.8-r3.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=rdepend
 PYTHON_COMPAT=( python3_{8..10} )
-USE_RUBY="ruby26"
+USE_RUBY="ruby26 ruby27"
 
 inherit python-single-r1 ruby-ng systemd
 


^ permalink raw reply related	[flat|nested] 27+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: sys-cluster/pcs/
@ 2022-01-21 12:29 Andrea Postiglione
  0 siblings, 0 replies; 27+ messages in thread
From: Andrea Postiglione @ 2022-01-21 12:29 UTC (permalink / raw
  To: gentoo-commits

commit:     8fd6aebba43a741f588814951e6150d4f1ebb4d5
Author:     Andrea Postiglione <andrea.postiglione <AT> gmail <DOT> com>
AuthorDate: Fri Jan 21 12:28:32 2022 +0000
Commit:     Andrea Postiglione <andrea.postiglione <AT> gmail <DOT> com>
CommitDate: Fri Jan 21 12:28:32 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=8fd6aebb

sys-cluster/pcs-0.10.8-r3: depend on pacemaker <2.1.0

Signed-off-by: Andrea Postiglione <andrea.postiglione <AT> gmail.com>

 sys-cluster/pcs/pcs-0.10.8-r3.ebuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/sys-cluster/pcs/pcs-0.10.8-r3.ebuild b/sys-cluster/pcs/pcs-0.10.8-r3.ebuild
index 4c14ae970..68eccd9f1 100644
--- a/sys-cluster/pcs/pcs-0.10.8-r3.ebuild
+++ b/sys-cluster/pcs/pcs-0.10.8-r3.ebuild
@@ -39,7 +39,8 @@ RDEPEND="
 	')
 	dev-libs/openssl
 	>=sys-cluster/corosync-3.0
-	>=sys-cluster/pacemaker-2.0
+	>=sys-cluster/pacemaker-2.0.0
+	<sys-cluster/pacemaker-2.1.0
 	sys-libs/pam
 	sys-process/psmisc
 "


^ permalink raw reply related	[flat|nested] 27+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: sys-cluster/pcs/
@ 2021-07-11 22:28 Alessandro Barbieri
  0 siblings, 0 replies; 27+ messages in thread
From: Alessandro Barbieri @ 2021-07-11 22:28 UTC (permalink / raw
  To: gentoo-commits

commit:     1155bcdcfb5a4dfa69622a129f9381f666ee4457
Author:     Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
AuthorDate: Sun Jul 11 22:15:07 2021 +0000
Commit:     Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
CommitDate: Sun Jul 11 22:15:07 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=1155bcdc

sys-cluster/pcs: bump python, remove old ruby

Signed-off-by: Alessandro Barbieri <lssndrbarbieri <AT> gmail.com>

 sys-cluster/pcs/pcs-0.10.8-r3.ebuild | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/sys-cluster/pcs/pcs-0.10.8-r3.ebuild b/sys-cluster/pcs/pcs-0.10.8-r3.ebuild
index b348a3848..4c14ae970 100644
--- a/sys-cluster/pcs/pcs-0.10.8-r3.ebuild
+++ b/sys-cluster/pcs/pcs-0.10.8-r3.ebuild
@@ -4,8 +4,8 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{8..9} )
-USE_RUBY="ruby25 ruby26"
+PYTHON_COMPAT=( python3_{8..10} )
+USE_RUBY="ruby26"
 
 inherit python-single-r1 ruby-ng systemd
 
@@ -13,13 +13,12 @@ DESCRIPTION="Pacemaker/Corosync Configuration System"
 HOMEPAGE="https://github.com/ClusterLabs/pcs"
 SRC_URI="https://github.com/ClusterLabs/pcs/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 S="${WORKDIR}/all/${P}"
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE="systemd"
 
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
 DEPEND="
 	dev-libs/libffi
 	media-libs/fontconfig
@@ -45,6 +44,7 @@ RDEPEND="
 	sys-process/psmisc
 "
 
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 PATCHES=(
 	"${FILESDIR}/remove-ruby-bundle-path.patch"
 	"${FILESDIR}/openrc-${PV}.patch"


^ permalink raw reply related	[flat|nested] 27+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: sys-cluster/pcs/
@ 2021-04-11 14:45 Andrea Postiglione
  0 siblings, 0 replies; 27+ messages in thread
From: Andrea Postiglione @ 2021-04-11 14:45 UTC (permalink / raw
  To: gentoo-commits

commit:     f9cbb5a55ea98fd26136ddd8b129d430643b1fc4
Author:     Andrea Postiglione <andrea.postiglione <AT> gmail <DOT> com>
AuthorDate: Sun Apr 11 14:44:29 2021 +0000
Commit:     Andrea Postiglione <andrea.postiglione <AT> gmail <DOT> com>
CommitDate: Sun Apr 11 14:44:29 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=f9cbb5a5

sys-cluster/pcs-0.10.8-r2 remove ruby27

Signed-off-by: Andrea Postiglione <andrea.postiglione <AT> gmail.com>

 sys-cluster/pcs/pcs-0.10.8-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-cluster/pcs/pcs-0.10.8-r2.ebuild b/sys-cluster/pcs/pcs-0.10.8-r2.ebuild
index 4582a8e1e..d212d0c3f 100644
--- a/sys-cluster/pcs/pcs-0.10.8-r2.ebuild
+++ b/sys-cluster/pcs/pcs-0.10.8-r2.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{7..9} )
 DISTUTILS_USE_SETUPTOOLS=rdepend
-USE_RUBY="ruby25 ruby26 ruby27"
+USE_RUBY="ruby25 ruby26"
 inherit python-single-r1 ruby-ng systemd
 
 DESCRIPTION="Pacemaker/Corosync Configuration System"


^ permalink raw reply related	[flat|nested] 27+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: sys-cluster/pcs/
@ 2021-04-11 14:38 Andrea Postiglione
  0 siblings, 0 replies; 27+ messages in thread
From: Andrea Postiglione @ 2021-04-11 14:38 UTC (permalink / raw
  To: gentoo-commits

commit:     a871da89ee98d16ac19adc7b9839838dc3031ca6
Author:     Andrea Postiglione <andrea.postiglione <AT> gmail <DOT> com>
AuthorDate: Sun Apr 11 14:37:46 2021 +0000
Commit:     Andrea Postiglione <andrea.postiglione <AT> gmail <DOT> com>
CommitDate: Sun Apr 11 14:37:46 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=a871da89

sys-cluster/pcs-0.10.8-r2: remove bundled systemd service

Signed-off-by: Andrea Postiglione <andrea.postiglione <AT> gmail.com>

 sys-cluster/pcs/pcs-0.10.8-r2.ebuild | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/sys-cluster/pcs/pcs-0.10.8-r2.ebuild b/sys-cluster/pcs/pcs-0.10.8-r2.ebuild
index 1444be359..4582a8e1e 100644
--- a/sys-cluster/pcs/pcs-0.10.8-r2.ebuild
+++ b/sys-cluster/pcs/pcs-0.10.8-r2.ebuild
@@ -100,9 +100,11 @@ src_install() {
 	if use systemd ; then
 		systemd_newunit "${S}/pcsd/pcsd.service.debian" "pcsd.service"
 		systemd_newunit "${S}/pcsd/pcsd-ruby.service" "pcsd-daemon.service"
-		rm "${D}"/usr/lib/systemd/system/pcsd-ruby.service
-		rm "${D}"/usr/lib/systemd/system/pcsd.service
 	fi
+	# Remove Bundled systemd service
+	rm "${D}"/usr/lib/systemd/system/pcsd-ruby.service || die
+	rm "${D}"/usr/lib/systemd/system/pcsd.service || die
+
 	# custom service file for openRC
 	newinitd "${FILESDIR}/pcsd.initd" pcsd
 	newinitd "${FILESDIR}/pcsd-daemon.initd" pcsd-daemon


^ permalink raw reply related	[flat|nested] 27+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: sys-cluster/pcs/
@ 2021-03-28 11:43 Andrew Ammerlaan
  2021-03-28 10:52 ` [gentoo-commits] repo/proj/guru:dev " Andrew Ammerlaan
  0 siblings, 1 reply; 27+ messages in thread
From: Andrew Ammerlaan @ 2021-03-28 11:43 UTC (permalink / raw
  To: gentoo-commits

commit:     ef6763e05aabe513743638f9dd8f1af0ca7320ba
Author:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
AuthorDate: Sun Mar 28 10:52:41 2021 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
CommitDate: Sun Mar 28 10:52:41 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=ef6763e0

sys-cluster/pcs: drop old

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

 sys-cluster/pcs/metadata.xml         |   2 -
 sys-cluster/pcs/pcs-0.10.8-r1.ebuild | 112 -----------------------------------
 2 files changed, 114 deletions(-)

diff --git a/sys-cluster/pcs/metadata.xml b/sys-cluster/pcs/metadata.xml
index fd9a01801..7c3b8cf85 100644
--- a/sys-cluster/pcs/metadata.xml
+++ b/sys-cluster/pcs/metadata.xml
@@ -10,8 +10,6 @@
 		create Pacemaker based clusters. Pcs contains pcsd, a pcs daemon, which operates as a remote server 
 		for pcs and provides a web UI.
 	</longdescription>
-	<use>
-	</use>
 	<upstream>
 		<remote-id type="github">ClusterLabs/pcs</remote-id>
 	</upstream>

diff --git a/sys-cluster/pcs/pcs-0.10.8-r1.ebuild b/sys-cluster/pcs/pcs-0.10.8-r1.ebuild
deleted file mode 100644
index fcfa0b7b8..000000000
--- a/sys-cluster/pcs/pcs-0.10.8-r1.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-USE_RUBY="ruby25 ruby26"
-inherit python-single-r1 ruby-ng systemd
-
-DESCRIPTION="Pacemaker/Corosync Configuration System"
-HOMEPAGE="https://github.com/ClusterLabs/pcs"
-SRC_URI="https://github.com/ClusterLabs/pcs/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="systemd"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="
-	dev-libs/libffi
-	media-libs/fontconfig
-"
-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
-	>=sys-cluster/corosync-3.0
-	>=sys-cluster/pacemaker-2.0
-	sys-libs/pam
-	sys-process/psmisc
-"
-
-ruby_add_rdepend "
-	dev-ruby/backports
-	dev-ruby/bundler
-	dev-ruby/ethon
-	dev-ruby/highline
-	dev-ruby/json
-	dev-ruby/multi_json
-	dev-ruby/open4
-	dev-ruby/rack
-	dev-ruby/rack-protection
-	dev-ruby/rack-test
-	dev-ruby/rubygems
-	dev-ruby/sinatra
-	dev-ruby/thor
-	dev-ruby/tilt
-	www-servers/thin
-"
-
-PATCHES=( 	"${FILESDIR}/remove-ruby-bundle-path.patch"
-			"${FILESDIR}/openrc-${PV}.patch"
-			"${FILESDIR}/pcsd-daemon.service.patch" )
-
-S="${WORKDIR}/all/${P}"
-
-src_compile() {
-	return
-}
-
-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'
-
-	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
-	keepdir /var/lib/pcsd
-
-	# symlink the /usr/lib/pcs/pcs to /usr/sbin/pcs for pcsd
-	dosym ../../sbin/pcs "${EPREFIX}/usr/lib/pcs/pcs"
-
-	# use Debian style systemd unit (with config in /etc/default/pcsd)
-	if use systemd ; then
-		systemd_newunit "${S}/pcsd/pcsd.service.debian" "pcsd.service"
-		systemd_newunit "${S}/pcsd/pcsd-ruby.service" "pcsd-daemon.service"
-	fi
-	# custom service file for openRC
-	newinitd "${FILESDIR}/pcsd.initd" pcsd
-	newinitd "${FILESDIR}/pcsd-daemon.initd" pcsd-daemon
-
-	# move config files to right places - we use debian-style /etc/default
-	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_optimize
-}


^ permalink raw reply related	[flat|nested] 27+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: sys-cluster/pcs/
@ 2021-03-27 18:35 Alessandro Barbieri
  0 siblings, 0 replies; 27+ messages in thread
From: Alessandro Barbieri @ 2021-03-27 18:35 UTC (permalink / raw
  To: gentoo-commits

commit:     eee1e847ddf8298110f47a63abd0466841033a17
Author:     Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
AuthorDate: Sat Mar 27 17:35:57 2021 +0000
Commit:     Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
CommitDate: Sat Mar 27 17:35:57 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=eee1e847

sys-cluster/pcs: python deps

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-r2.ebuild | 113 +++++++++++++++++++++++++++++++++++
 1 file changed, 113 insertions(+)

diff --git a/sys-cluster/pcs/pcs-0.10.8-r2.ebuild b/sys-cluster/pcs/pcs-0.10.8-r2.ebuild
new file mode 100644
index 000000000..830a07632
--- /dev/null
+++ b/sys-cluster/pcs/pcs-0.10.8-r2.ebuild
@@ -0,0 +1,113 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+USE_RUBY="ruby25 ruby26"
+inherit python-single-r1 ruby-ng systemd
+
+DESCRIPTION="Pacemaker/Corosync Configuration System"
+HOMEPAGE="https://github.com/ClusterLabs/pcs"
+SRC_URI="https://github.com/ClusterLabs/pcs/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="systemd"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="
+	dev-libs/libffi
+	media-libs/fontconfig
+"
+RDEPEND="
+	${DEPEND}
+	${PYTHON_DEPS}
+	$(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
+	>=sys-cluster/corosync-3.0
+	>=sys-cluster/pacemaker-2.0
+	sys-libs/pam
+	sys-process/psmisc
+"
+PATCHES=(
+	"${FILESDIR}/remove-ruby-bundle-path.patch"
+	"${FILESDIR}/openrc-${PV}.patch"
+	"${FILESDIR}/pcsd-daemon.service.patch"
+)
+S="${WORKDIR}/all/${P}"
+
+ruby_add_rdepend "
+	dev-ruby/backports
+	dev-ruby/bundler
+	dev-ruby/ethon
+	dev-ruby/highline
+	dev-ruby/json
+	dev-ruby/multi_json
+	dev-ruby/open4
+	dev-ruby/rack
+	dev-ruby/rack-protection
+	dev-ruby/rack-test
+	dev-ruby/rubygems
+	dev-ruby/sinatra
+	dev-ruby/thor
+	dev-ruby/tilt
+	www-servers/thin
+"
+
+src_compile() {
+	return
+}
+
+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'
+
+	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
+	keepdir /var/lib/pcsd
+
+	# symlink the /usr/lib/pcs/pcs to /usr/sbin/pcs for pcsd
+	dosym ../../sbin/pcs "${EPREFIX}/usr/lib/pcs/pcs"
+
+	# use Debian style systemd unit (with config in /etc/default/pcsd)
+	if use systemd ; then
+		systemd_newunit "${S}/pcsd/pcsd.service.debian" "pcsd.service"
+		systemd_newunit "${S}/pcsd/pcsd-ruby.service" "pcsd-daemon.service"
+	fi
+	# custom service file for openRC
+	newinitd "${FILESDIR}/pcsd.initd" pcsd
+	newinitd "${FILESDIR}/pcsd-daemon.initd" pcsd-daemon
+
+	# move config files to right places - we use debian-style /etc/default
+	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_optimize
+}


^ permalink raw reply related	[flat|nested] 27+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: sys-cluster/pcs/
@ 2021-03-24  9:05 Andrew Ammerlaan
  0 siblings, 0 replies; 27+ messages in thread
From: Andrew Ammerlaan @ 2021-03-24  9:05 UTC (permalink / raw
  To: gentoo-commits

commit:     d4bffb06707d70a6a532009231269d3675d71675
Author:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
AuthorDate: Wed Mar 24 09:04:57 2021 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
CommitDate: Wed Mar 24 09:04:57 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=d4bffb06

sys-cluster/pcs: remove trailing whitespace

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

 sys-cluster/pcs/pcs-0.10.8-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-cluster/pcs/pcs-0.10.8-r1.ebuild b/sys-cluster/pcs/pcs-0.10.8-r1.ebuild
index 1af214e5f..fcfa0b7b8 100644
--- a/sys-cluster/pcs/pcs-0.10.8-r1.ebuild
+++ b/sys-cluster/pcs/pcs-0.10.8-r1.ebuild
@@ -61,8 +61,8 @@ ruby_add_rdepend "
 	www-servers/thin
 "
 
-PATCHES=( 	"${FILESDIR}/remove-ruby-bundle-path.patch" 
-			"${FILESDIR}/openrc-${PV}.patch" 
+PATCHES=( 	"${FILESDIR}/remove-ruby-bundle-path.patch"
+			"${FILESDIR}/openrc-${PV}.patch"
 			"${FILESDIR}/pcsd-daemon.service.patch" )
 
 S="${WORKDIR}/all/${P}"


^ permalink raw reply related	[flat|nested] 27+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: sys-cluster/pcs/
@ 2021-03-23  0:52 Alessandro Barbieri
  0 siblings, 0 replies; 27+ messages in thread
From: Alessandro Barbieri @ 2021-03-23  0:52 UTC (permalink / raw
  To: gentoo-commits

commit:     a53c05a1fe5b3e2216f227429ebcaec1525d441b
Author:     Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
AuthorDate: Tue Mar 23 00:52:02 2021 +0000
Commit:     Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
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 e41199e8..a6acdb47 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
 }


^ permalink raw reply related	[flat|nested] 27+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: sys-cluster/pcs/
@ 2021-03-23  0:52 Alessandro Barbieri
  0 siblings, 0 replies; 27+ messages in thread
From: Alessandro Barbieri @ 2021-03-23  0:52 UTC (permalink / raw
  To: gentoo-commits

commit:     d27729f7c428e3c7e2486eced460e225e9b0b4c7
Author:     Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
AuthorDate: Tue Mar 23 00:08:03 2021 +0000
Commit:     Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
CommitDate: Tue Mar 23 00:08:03 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=d27729f7

sys-cluster/pcs: fix || die

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 | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/sys-cluster/pcs/pcs-0.10.8-r1.ebuild b/sys-cluster/pcs/pcs-0.10.8-r1.ebuild
index a83f9773..e41199e8 100644
--- a/sys-cluster/pcs/pcs-0.10.8-r1.ebuild
+++ b/sys-cluster/pcs/pcs-0.10.8-r1.ebuild
@@ -92,12 +92,12 @@ src_install() {
 		systemd_newunit "${S}/pcsd/pcsd-ruby.service" "pcsd-daemon.service"
 	fi
 	# custom service file for openRC
-	newinitd "${FILESDIR}/pcsd.initd" pcsd || die
-	newinitd "${FILESDIR}/pcsd-daemon.initd" pcsd-daemon || die
+	newinitd "${FILESDIR}/pcsd.initd" pcsd
+	newinitd "${FILESDIR}/pcsd-daemon.initd" pcsd-daemon
 
 	# move config files to right places - we use debian-style /etc/default
-	cp -a "${S}/pcs/settings.py.debian" "${D}/usr/lib/pcs/settings.py"
-	cp -a "${S}/pcsd/settings.rb.debian" "${D}/usr/lib/pcsd/settings.rb"
+	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
 }


^ permalink raw reply related	[flat|nested] 27+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: sys-cluster/pcs/
@ 2021-03-20 17:38 Andrew Ammerlaan
  0 siblings, 0 replies; 27+ messages in thread
From: Andrew Ammerlaan @ 2021-03-20 17:38 UTC (permalink / raw
  To: gentoo-commits

commit:     d73f35925a88ce0f4d1c40672338a3030995fc7d
Author:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
AuthorDate: Sat Mar 20 17:38:27 2021 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
CommitDate: Sat Mar 20 17:38:27 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=d73f3592

sys-cluster/pcs: correct dep

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

 sys-cluster/pcs/pcs-0.10.8.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-cluster/pcs/pcs-0.10.8.ebuild b/sys-cluster/pcs/pcs-0.10.8.ebuild
index 68e1b8e7..3a7f366d 100644
--- a/sys-cluster/pcs/pcs-0.10.8.ebuild
+++ b/sys-cluster/pcs/pcs-0.10.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019-2020 Gentoo Authors
+# Copyright 2019-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -53,9 +53,9 @@ ruby_add_rdepend "
 	dev-ruby/rack-test
 	dev-ruby/rubygems
 	dev-ruby/sinatra
-	dev-ruby/thin
 	dev-ruby/thor
 	dev-ruby/tilt
+	www-servers/thin
 "
 
 PATCHES=( "${FILESDIR}/remove-ruby-bundle-path.patch" "${FILESDIR}/openrc-${PV}.patch" )


^ permalink raw reply related	[flat|nested] 27+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: sys-cluster/pcs/
@ 2021-03-20 12:05 Andrea Postiglione
  0 siblings, 0 replies; 27+ messages in thread
From: Andrea Postiglione @ 2021-03-20 12:05 UTC (permalink / raw
  To: gentoo-commits

commit:     7ea5bec557743a119e41e1a7a547a534abce2361
Author:     Andrea Postiglione <andrea.postiglione <AT> gmail <DOT> com>
AuthorDate: Sat Mar 20 12:05:25 2021 +0000
Commit:     Andrea Postiglione <andrea.postiglione <AT> gmail <DOT> com>
CommitDate: Sat Mar 20 12:05:25 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=7ea5bec5

sys-cluster/pcs-0.10.8: fix env

Signed-off-by: Andrea Postiglione <andrea.postiglione <AT> gmail.com>

 sys-cluster/pcs/pcs-0.10.8.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-cluster/pcs/pcs-0.10.8.ebuild b/sys-cluster/pcs/pcs-0.10.8.ebuild
index 687d1fda..68e1b8e7 100644
--- a/sys-cluster/pcs/pcs-0.10.8.ebuild
+++ b/sys-cluster/pcs/pcs-0.10.8.ebuild
@@ -58,7 +58,7 @@ ruby_add_rdepend "
 	dev-ruby/tilt
 "
 
-PATCHES=( "${FILESDIR}/remove-ruby-bundle-path.patch" "${FILESDIR}/openrc-0.10.8.patch" )
+PATCHES=( "${FILESDIR}/remove-ruby-bundle-path.patch" "${FILESDIR}/openrc-${PV}.patch" )
 
 S="${WORKDIR}/all/${P}"
 


^ permalink raw reply related	[flat|nested] 27+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: sys-cluster/pcs/
@ 2020-12-15 11:16 Andrea Postiglione
  0 siblings, 0 replies; 27+ messages in thread
From: Andrea Postiglione @ 2020-12-15 11:16 UTC (permalink / raw
  To: gentoo-commits

commit:     36ba9beceec6469351ea02b05fb5e9d9a4978d00
Author:     Andrea Postiglione <andrea.postiglione <AT> gmail <DOT> com>
AuthorDate: Tue Dec 15 11:16:05 2020 +0000
Commit:     Andrea Postiglione <andrea.postiglione <AT> gmail <DOT> com>
CommitDate: Tue Dec 15 11:16:05 2020 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=36ba9bec

sys-cluster/pcs-0.10.7: modify thin dependency

Signed-off-by: Andrea Postiglione <andrea.postiglione <AT> gmail.com>

 sys-cluster/pcs/pcs-0.10.7.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-cluster/pcs/pcs-0.10.7.ebuild b/sys-cluster/pcs/pcs-0.10.7.ebuild
index 0c84f9fb..c4cfeedb 100644
--- a/sys-cluster/pcs/pcs-0.10.7.ebuild
+++ b/sys-cluster/pcs/pcs-0.10.7.ebuild
@@ -53,7 +53,7 @@ ruby_add_rdepend "
 	dev-ruby/rack-test
 	dev-ruby/rubygems
 	dev-ruby/sinatra
-	dev-ruby/thin
+	www-servers/thin
 	dev-ruby/thor
 	dev-ruby/tilt
 "


^ permalink raw reply related	[flat|nested] 27+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: sys-cluster/pcs/
@ 2020-12-09  1:08 Alessandro Barbieri
  0 siblings, 0 replies; 27+ messages in thread
From: Alessandro Barbieri @ 2020-12-09  1:08 UTC (permalink / raw
  To: gentoo-commits

commit:     06699789ad16b4728194a57130033230597cdd2b
Author:     Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
AuthorDate: Wed Dec  9 01:08:03 2020 +0000
Commit:     Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
CommitDate: Wed Dec  9 01:08:03 2020 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=06699789

sys-cluster/pcs: fix path

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

 sys-cluster/pcs/pcs-0.10.7.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-cluster/pcs/pcs-0.10.7.ebuild b/sys-cluster/pcs/pcs-0.10.7.ebuild
index 14a497b2..0c84f9fb 100644
--- a/sys-cluster/pcs/pcs-0.10.7.ebuild
+++ b/sys-cluster/pcs/pcs-0.10.7.ebuild
@@ -74,7 +74,7 @@ src_install() {
 		SYSTEMCTL_OVERRIDE=$(use systemd) \
 		DESTDIR="${D}" \
 		CONF_DIR="/etc/default/" \
-		PREFIX="/usr/${EPREFIX}" \
+		PREFIX="${EPREFIX}/usr/" \
 		BUNDLE_INSTALL_PYAGENTX=false \
 		BUNDLE_TO_INSTALL=false \
 		BUILD_GEMS=false


^ permalink raw reply related	[flat|nested] 27+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: sys-cluster/pcs/
@ 2020-12-09  1:08 Alessandro Barbieri
  0 siblings, 0 replies; 27+ messages in thread
From: Alessandro Barbieri @ 2020-12-09  1:08 UTC (permalink / raw
  To: gentoo-commits

commit:     8444fec8b47b947e44373e539528dd6a1a70ba41
Author:     Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
AuthorDate: Tue Dec  8 01:00:20 2020 +0000
Commit:     Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
CommitDate: Wed Dec  9 01:04:42 2020 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=8444fec8

sys-cluster/pcs: sort deps

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

 sys-cluster/pcs/pcs-0.10.7.ebuild | 31 ++++++++++++++++---------------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/sys-cluster/pcs/pcs-0.10.7.ebuild b/sys-cluster/pcs/pcs-0.10.7.ebuild
index e5f578da..14a497b2 100644
--- a/sys-cluster/pcs/pcs-0.10.7.ebuild
+++ b/sys-cluster/pcs/pcs-0.10.7.ebuild
@@ -18,43 +18,44 @@ KEYWORDS="~amd64"
 IUSE="snmp systemd"
 
 DEPEND="
-	media-libs/fontconfig
 	dev-libs/libffi
+	media-libs/fontconfig
 	sys-apps/coreutils
 "
-RDEPEND="${DEPEND}
-	>=www-servers/tornado-6.0
-	<www-servers/tornado-7.0
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
+RDEPEND="
+	${DEPEND}
+	dev-libs/openssl
 	dev-python/distro[${PYTHON_USEDEP}]
 	dev-python/dacite[${PYTHON_USEDEP}]
 	dev-python/lxml[${PYTHON_USEDEP}]
-	dev-python/pyopenssl[${PYTHON_USEDEP}]
 	dev-python/pycurl[${PYTHON_USEDEP}]
+	dev-python/pyopenssl[${PYTHON_USEDEP}]
 	dev-python/pyparsing[${PYTHON_USEDEP}]
-	sys-process/psmisc
-	dev-libs/openssl
-	sys-libs/pam
+	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 "
+	dev-ruby/backports
 	dev-ruby/bundler
-	dev-ruby/rubygems
-	dev-ruby/open4
+	dev-ruby/ethon
 	dev-ruby/highline
 	dev-ruby/json
 	dev-ruby/multi_json
+	dev-ruby/open4
 	dev-ruby/rack
 	dev-ruby/rack-protection
 	dev-ruby/rack-test
-	dev-ruby/thor
-	dev-ruby/ethon
+	dev-ruby/rubygems
+	dev-ruby/sinatra
 	dev-ruby/thin
+	dev-ruby/thor
 	dev-ruby/tilt
-	dev-ruby/sinatra
-	dev-ruby/backports
 "
 
 PATCHES=( "${FILESDIR}/remove-ruby-bundle-path.patch" "${FILESDIR}/openrc-0.10.7.patch" )


^ permalink raw reply related	[flat|nested] 27+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: sys-cluster/pcs/
@ 2020-12-08 16:52 Andrea Postiglione
  0 siblings, 0 replies; 27+ messages in thread
From: Andrea Postiglione @ 2020-12-08 16:52 UTC (permalink / raw
  To: gentoo-commits

commit:     903879cb15485f6e5a09f0b8a03bd42590df26c6
Author:     Andrea Postiglione <andrea.postiglione <AT> gmail <DOT> com>
AuthorDate: Tue Dec  8 16:52:47 2020 +0000
Commit:     Andrea Postiglione <andrea.postiglione <AT> gmail <DOT> com>
CommitDate: Tue Dec  8 16:52:47 2020 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=903879cb

sys-cluster/pcs: fix duplicate dependency

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Andrea Postiglione <andrea.postiglione <AT> gmail.com>

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

diff --git a/sys-cluster/pcs/pcs-0.10.7.ebuild b/sys-cluster/pcs/pcs-0.10.7.ebuild
index 6e2acc6b..e5f578da 100644
--- a/sys-cluster/pcs/pcs-0.10.7.ebuild
+++ b/sys-cluster/pcs/pcs-0.10.7.ebuild
@@ -54,7 +54,6 @@ ruby_add_rdepend "
 	dev-ruby/thin
 	dev-ruby/tilt
 	dev-ruby/sinatra
-	dev-ruby/open4
 	dev-ruby/backports
 "
 


^ permalink raw reply related	[flat|nested] 27+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: sys-cluster/pcs/
@ 2020-12-08 16:51 Andrea Postiglione
  0 siblings, 0 replies; 27+ messages in thread
From: Andrea Postiglione @ 2020-12-08 16:51 UTC (permalink / raw
  To: gentoo-commits

commit:     047edc4a90453a663c71cc93221021e300152efc
Author:     Andrea Postiglione <andrea.postiglione <AT> gmail <DOT> com>
AuthorDate: Tue Dec  8 16:51:44 2020 +0000
Commit:     Andrea Postiglione <andrea.postiglione <AT> gmail <DOT> com>
CommitDate: Tue Dec  8 16:51:44 2020 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=047edc4a

sys-cluster/pcs: fix use systemd useflag

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Andrea Postiglione <andrea.postiglione <AT> gmail.com>

 sys-cluster/pcs/pcs-0.10.7.ebuild | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/sys-cluster/pcs/pcs-0.10.7.ebuild b/sys-cluster/pcs/pcs-0.10.7.ebuild
index 2811b60e..6e2acc6b 100644
--- a/sys-cluster/pcs/pcs-0.10.7.ebuild
+++ b/sys-cluster/pcs/pcs-0.10.7.ebuild
@@ -87,8 +87,10 @@ src_install() {
 	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"
-	systemd_newunit "${S}/pcsd/pcsd-ruby.service" "pcsd-daemon.service"
+	if use systemd ; then
+		systemd_newunit "${S}/pcsd/pcsd.service.debian" "pcsd.service"
+		systemd_newunit "${S}/pcsd/pcsd-ruby.service" "pcsd-daemon.service"
+	fi
 	# custom service file for openRC
 	newinitd "${FILESDIR}/pcsd.initd" pcsd || die
 	newinitd "${FILESDIR}/pcsd-daemon.initd" pcsd-daemon || die


^ permalink raw reply related	[flat|nested] 27+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: sys-cluster/pcs/
@ 2020-12-08  0:35 Alessandro Barbieri
  0 siblings, 0 replies; 27+ messages in thread
From: Alessandro Barbieri @ 2020-12-08  0:35 UTC (permalink / raw
  To: gentoo-commits

commit:     6bdcb298e193f36972a13b639e31b58ecbadec9d
Author:     Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
AuthorDate: Sun Dec  6 23:47:20 2020 +0000
Commit:     Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
CommitDate: Tue Dec  8 00:35:34 2020 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=6bdcb298

sys-cluster/pcs: slash

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

 sys-cluster/pcs/pcs-0.10.7.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-cluster/pcs/pcs-0.10.7.ebuild b/sys-cluster/pcs/pcs-0.10.7.ebuild
index 56339bee..2811b60e 100644
--- a/sys-cluster/pcs/pcs-0.10.7.ebuild
+++ b/sys-cluster/pcs/pcs-0.10.7.ebuild
@@ -74,7 +74,7 @@ src_install() {
 		SYSTEMCTL_OVERRIDE=$(use systemd) \
 		DESTDIR="${D}" \
 		CONF_DIR="/etc/default/" \
-		PREFIX="/usr${EPREFIX}" \
+		PREFIX="/usr/${EPREFIX}" \
 		BUNDLE_INSTALL_PYAGENTX=false \
 		BUNDLE_TO_INSTALL=false \
 		BUILD_GEMS=false


^ permalink raw reply related	[flat|nested] 27+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: sys-cluster/pcs/
@ 2020-12-07 16:16 Andrew Ammerlaan
  2020-12-07 16:16 ` [gentoo-commits] repo/proj/guru:dev " Andrew Ammerlaan
  0 siblings, 1 reply; 27+ messages in thread
From: Andrew Ammerlaan @ 2020-12-07 16:16 UTC (permalink / raw
  To: gentoo-commits

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
 }


^ permalink raw reply related	[flat|nested] 27+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: sys-cluster/pcs/
@ 2020-12-06 19:12 Andrew Ammerlaan
  0 siblings, 0 replies; 27+ messages in thread
From: Andrew Ammerlaan @ 2020-12-06 19:12 UTC (permalink / raw
  To: gentoo-commits

commit:     5105f95191e3e005642c18c3531319861040d281
Author:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
AuthorDate: Sun Dec  6 19:11:59 2020 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
CommitDate: Sun Dec  6 19:11:59 2020 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=5105f951

sys-cluster/pcs: make repoman happy

- correctly depend on python packages
- correctly depend on ruby packages
- make symlink relative

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

 sys-cluster/pcs/pcs-0.10.7.ebuild | 39 ++++++++++++++++++++-------------------
 1 file changed, 20 insertions(+), 19 deletions(-)

diff --git a/sys-cluster/pcs/pcs-0.10.7.ebuild b/sys-cluster/pcs/pcs-0.10.7.ebuild
index 5b455099..a0f3ad18 100644
--- a/sys-cluster/pcs/pcs-0.10.7.ebuild
+++ b/sys-cluster/pcs/pcs-0.10.7.ebuild
@@ -4,8 +4,8 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{7..9} )
-#inherit distutils-r1
-inherit python-utils-r1 systemd
+USE_RUBY="ruby25 ruby26"
+inherit distutils-r1 ruby-ng systemd
 
 DESCRIPTION="Pacemaker/Corosync Configuration System"
 HOMEPAGE="https://github.com/ClusterLabs/pcs"
@@ -16,25 +16,31 @@ SLOT="0"
 KEYWORDS="~amd64"
 IUSE="snmp systemd"
 
-DEPEND="media-libs/fontconfig
-	>=dev-lang/ruby-2.2
-	dev-ruby/rubygems
-	dev-ruby/bundler
+DEPEND="
+	media-libs/fontconfig
 	dev-libs/libffi
 	sys-apps/coreutils
 "
 RDEPEND="${DEPEND}
 	>=www-servers/tornado-6.0
 	<www-servers/tornado-7.0
-	dev-python/python-dateutil
-	dev-python/distro
-	dev-python/dacite
-	dev-python/lxml
-	dev-python/pyopenssl
-	dev-python/pycurl
-	dev-python/pyparsing
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/distro[${PYTHON_USEDEP}]
+	dev-python/dacite[${PYTHON_USEDEP}]
+	dev-python/lxml[${PYTHON_USEDEP}]
+	dev-python/pyopenssl[${PYTHON_USEDEP}]
+	dev-python/pycurl[${PYTHON_USEDEP}]
+	dev-python/pyparsing[${PYTHON_USEDEP}]
 	sys-process/psmisc
 	dev-libs/openssl
+	sys-libs/pam
+	>=sys-cluster/corosync-3.0
+	>=sys-cluster/pacemaker-2.0
+"
+
+ruby_add_rdepend "
+	dev-ruby/bundler
+	dev-ruby/rubygems
 	dev-ruby/open4
 	dev-ruby/highline
 	dev-ruby/json
@@ -49,13 +55,8 @@ RDEPEND="${DEPEND}
 	dev-ruby/sinatra
 	dev-ruby/open4
 	dev-ruby/backports
-	sys-libs/pam
-	>=sys-cluster/corosync-3.0
-	>=sys-cluster/pacemaker-2.0
 "
 
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
 PATCHES=( "${FILESDIR}/remove-ruby-bundle-path.patch" "${FILESDIR}/openrc-0.10.7.patch" )
 
 src_compile() {
@@ -80,7 +81,7 @@ src_install() {
 	keepdir /var/lib/pcsd
 
 	# symlink the /usr/lib/pcs/pcs to /usr/sbin/pcs for pcsd
-	dosym /usr/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"


^ permalink raw reply related	[flat|nested] 27+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: sys-cluster/pcs/
@ 2020-12-06 17:35 Andrea Postiglione
  0 siblings, 0 replies; 27+ messages in thread
From: Andrea Postiglione @ 2020-12-06 17:35 UTC (permalink / raw
  To: gentoo-commits

commit:     e7f5a022281731f4fcdef3406fc6e24b11d934ad
Author:     Andrea Postiglione <andrea.postiglione <AT> gmail <DOT> com>
AuthorDate: Sun Dec  6 17:35:44 2020 +0000
Commit:     Andrea Postiglione <andrea.postiglione <AT> gmail <DOT> com>
CommitDate: Sun Dec  6 17:35:44 2020 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=e7f5a022

sys-cluster/pcs: fix dependency

Package-Manager: Portage-3.0.11, Repoman-3.0.2
Signed-off-by: Andrea Postiglione <andrea.postiglione <AT> gmail.com>

 sys-cluster/pcs/pcs-0.10.7.ebuild | 2 --
 1 file changed, 2 deletions(-)

diff --git a/sys-cluster/pcs/pcs-0.10.7.ebuild b/sys-cluster/pcs/pcs-0.10.7.ebuild
index 76bcbee8..5b455099 100644
--- a/sys-cluster/pcs/pcs-0.10.7.ebuild
+++ b/sys-cluster/pcs/pcs-0.10.7.ebuild
@@ -20,7 +20,6 @@ DEPEND="media-libs/fontconfig
 	>=dev-lang/ruby-2.2
 	dev-ruby/rubygems
 	dev-ruby/bundler
-	sys-devel/gcc
 	dev-libs/libffi
 	sys-apps/coreutils
 "
@@ -99,7 +98,6 @@ src_install() {
 		rm -rf "${D}/usr/share/snmp"
 		rm -rf "${D}/usr/lib64/python*/site-packages/pcs/snmp" #FIXME
 		rm "${D}/usr/share/man/man8/pcs_snmp_agent.8"
-		rm "${D}/usr/lib/systemd/system/pcs_snmp_agent.service"
 		rm "${D}/usr/lib/pcs/pcs_snmp_agent"
 		rm "${D}/etc/default/pcs_snmp_agent"
 	fi


^ permalink raw reply related	[flat|nested] 27+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: sys-cluster/pcs/
@ 2020-12-06  8:52 Andrea Postiglione
  0 siblings, 0 replies; 27+ messages in thread
From: Andrea Postiglione @ 2020-12-06  8:52 UTC (permalink / raw
  To: gentoo-commits

commit:     58baba5b6e3dbecd271134e2fe719e41181b0d74
Author:     Andrea Postiglione <andrea.postiglione <AT> gmail <DOT> com>
AuthorDate: Sun Dec  6 08:44:05 2020 +0000
Commit:     Andrea Postiglione <andrea.postiglione <AT> gmail <DOT> com>
CommitDate: Sun Dec  6 08:44:05 2020 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=58baba5b

sys-cluster/pcs-0.10.7: fix systemd unit service

Package-Manager: Portage-3.0.11, Repoman-3.0.2
Signed-off-by: Andrea Postiglione <andrea.postiglione <AT> gmail.com>

 sys-cluster/pcs/pcs-0.10.7.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-cluster/pcs/pcs-0.10.7.ebuild b/sys-cluster/pcs/pcs-0.10.7.ebuild
index b1a76287..76bcbee8 100644
--- a/sys-cluster/pcs/pcs-0.10.7.ebuild
+++ b/sys-cluster/pcs/pcs-0.10.7.ebuild
@@ -84,8 +84,8 @@ src_install() {
 	dosym /usr/sbin/pcs "${EPREFIX}/usr/lib/pcs/pcs"
 
 	# use Debian style systemd unit (with config in /etc/default/pcsd)
-	cp -a "${S}/pcsd/pcsd.service.debian" "${D}/usr/lib/systemd/system/pcsd.service"
-	#cp -a "${S}/pcsd/pcsd-ruby.service.debian" "${D}/usr/lib/systemd/system/pcsd.service"
+	systemd_newunit "${S}/pcsd/pcsd.service.debian" "pcsd.service"
+	systemd_newunit "${S}/pcsd/pcsd-ruby.service" "pcsd-daemon.service"
 	# custom service file for openRC
 	newinitd "${FILESDIR}/pcsd.initd" pcsd || die
 	newinitd "${FILESDIR}/pcsd-daemon.initd" pcsd-daemon || die


^ permalink raw reply related	[flat|nested] 27+ messages in thread
end of thread, other threads:[~2022-04-23 18:57 UTC | newest]

Thread overview: 27+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-03-23  0:52 [gentoo-commits] repo/proj/guru:dev commit in: sys-cluster/pcs/ Alessandro Barbieri
  -- strict thread matches above, loose matches on Subject: below --
2022-04-23 19:07 [gentoo-commits] repo/proj/guru:master " Andrew Ammerlaan
2022-04-23 18:57 ` [gentoo-commits] repo/proj/guru:dev " Andrew Ammerlaan
2022-04-13 12:29 Andrea Postiglione
2022-04-04 14:49 [gentoo-commits] repo/proj/guru:master " Andrew Ammerlaan
2022-04-04 14:34 ` [gentoo-commits] repo/proj/guru:dev " Andrew Ammerlaan
2022-04-03 16:47 Andrea Postiglione
2022-01-21 12:35 Andrea Postiglione
2022-01-21 12:29 Andrea Postiglione
2021-07-11 22:28 Alessandro Barbieri
2021-04-11 14:45 Andrea Postiglione
2021-04-11 14:38 Andrea Postiglione
2021-03-28 11:43 [gentoo-commits] repo/proj/guru:master " Andrew Ammerlaan
2021-03-28 10:52 ` [gentoo-commits] repo/proj/guru:dev " Andrew Ammerlaan
2021-03-27 18:35 Alessandro Barbieri
2021-03-24  9:05 Andrew Ammerlaan
2021-03-23  0:52 Alessandro Barbieri
2021-03-23  0:52 Alessandro Barbieri
2021-03-20 17:38 Andrew Ammerlaan
2021-03-20 12:05 Andrea Postiglione
2020-12-15 11:16 Andrea Postiglione
2020-12-09  1:08 Alessandro Barbieri
2020-12-09  1:08 Alessandro Barbieri
2020-12-08 16:52 Andrea Postiglione
2020-12-08 16:51 Andrea Postiglione
2020-12-08  0:35 Alessandro Barbieri
2020-12-07 16:16 [gentoo-commits] repo/proj/guru:master " Andrew Ammerlaan
2020-12-07 16:16 ` [gentoo-commits] repo/proj/guru:dev " Andrew Ammerlaan
2020-12-06 19:12 Andrew Ammerlaan
2020-12-06 17:35 Andrea Postiglione
2020-12-06  8:52 Andrea Postiglione

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox