[gentoo-commits] repo/proj/guru:dev commit in: sys-cluster/pcs/

[Andrew Ammerlaan]

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"