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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id A4BCD1382C5 for ; Sun, 6 Dec 2020 19:12:18 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D1EEBE09BC; Sun, 6 Dec 2020 19:12:17 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A9D7EE09BC for ; Sun, 6 Dec 2020 19:12:17 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8329E340EB7 for ; Sun, 6 Dec 2020 19:12:16 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2505838A for ; Sun, 6 Dec 2020 19:12:15 +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: <1607281919.5105f95191e3e005642c18c3531319861040d281.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.10.7.ebuild X-VCS-Directories: sys-cluster/pcs/ X-VCS-Committer: andrewammerlaan X-VCS-Committer-Name: Andrew Ammerlaan X-VCS-Revision: 5105f95191e3e005642c18c3531319861040d281 X-VCS-Branch: master Date: Sun, 6 Dec 2020 19:12:15 +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: 3d29b9b2-6742-4294-898d-95c119140e35 X-Archives-Hash: aa89f7af2f762b1145116134e3dd5068 Message-ID: <20201206191215.kySM0WPVMZOW1GMUTSsnVPYqSu5BFmpKECmkq6q6LKE@z> commit: 5105f95191e3e005642c18c3531319861040d281 Author: Andrew Ammerlaan riseup net> AuthorDate: Sun Dec 6 19:11:59 2020 +0000 Commit: Andrew Ammerlaan riseup 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 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 =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"