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 C0E6813832E for ; Tue, 2 Aug 2016 18:47:09 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 30DE6E0B4F; Tue, 2 Aug 2016 18:47:06 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id AF0BDE0B4F for ; Tue, 2 Aug 2016 18:47:05 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0A07A340AC0 for ; Tue, 2 Aug 2016 18:47:04 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7B26F7D3 for ; Tue, 2 Aug 2016 18:47:00 +0000 (UTC) From: "Fabian Groffen" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Fabian Groffen" Message-ID: <1470163592.c78f0d0a67010b4f1e69d6282f2d3020c04ab1f3.grobian@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-admin/diamond/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-admin/diamond/diamond-4.0-r1.ebuild app-admin/diamond/diamond-9999.ebuild X-VCS-Directories: app-admin/diamond/ X-VCS-Committer: grobian X-VCS-Committer-Name: Fabian Groffen X-VCS-Revision: c78f0d0a67010b4f1e69d6282f2d3020c04ab1f3 X-VCS-Branch: master Date: Tue, 2 Aug 2016 18:47:00 +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-Archives-Salt: 9d926a80-4976-4359-8632-74f97452d428 X-Archives-Hash: fc9875dc2216c48f66f469589249c587 commit: c78f0d0a67010b4f1e69d6282f2d3020c04ab1f3 Author: Fabian Groffen gentoo org> AuthorDate: Tue Aug 2 18:46:32 2016 +0000 Commit: Fabian Groffen gentoo org> CommitDate: Tue Aug 2 18:46:32 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c78f0d0a app-admin/diamond: use hprefixify for Prefix Package-Manager: portage-2.2.28 app-admin/diamond/diamond-4.0-r1.ebuild | 10 ++++------ app-admin/diamond/diamond-9999.ebuild | 8 +++----- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/app-admin/diamond/diamond-4.0-r1.ebuild b/app-admin/diamond/diamond-4.0-r1.ebuild index a9dbda4..e137272 100644 --- a/app-admin/diamond/diamond-4.0-r1.ebuild +++ b/app-admin/diamond/diamond-4.0-r1.ebuild @@ -10,13 +10,13 @@ if [[ ${PV} = 9999* ]]; then S=${WORKDIR}/diamond-${PV} else SRC_URI="https://github.com/python-diamond/Diamond/archive/v${PV}.tar.gz -> python-diamond-${PV}.tar.gz" - KEYWORDS="~amd64 ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + KEYWORDS="~amd64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" S=${WORKDIR}/Diamond-${PV} fi PYTHON_COMPAT=( python2_7 ) -inherit distutils-r1 eutils +inherit distutils-r1 eutils prefix DESCRIPTION="Python daemon that collects and publishes system metrics" HOMEPAGE="https://github.com/python-diamond/Diamond" @@ -37,10 +37,7 @@ DEPEND="${RDEPEND} src_prepare() { # adjust for Prefix - sed -i \ - -e '/default="\/etc\/diamond\/diamond.conf"/s:=":="'"${EPREFIX}"':' \ - bin/diamond* \ - || die + hprefixify bin/diamond* # fix necessary to make handlers honour their config, simple sed # doing the same as upstream @@ -67,6 +64,7 @@ python_install() { sed -i \ -e '/pid_file =/s:/var/run:/run:' \ "${ED}"/etc/diamond/diamond.conf.example || die + hprefixify "${ED}"/etc/diamond/diamond.conf.example } src_install() { diff --git a/app-admin/diamond/diamond-9999.ebuild b/app-admin/diamond/diamond-9999.ebuild index cb7f078..656013e 100644 --- a/app-admin/diamond/diamond-9999.ebuild +++ b/app-admin/diamond/diamond-9999.ebuild @@ -16,7 +16,7 @@ fi PYTHON_COMPAT=( python2_7 ) -inherit distutils-r1 +inherit distutils-r1 prefix DESCRIPTION="Python daemon that collects and publishes system metrics" HOMEPAGE="https://github.com/python-diamond/Diamond" @@ -37,10 +37,7 @@ DEPEND="${RDEPEND} src_prepare() { # adjust for Prefix - sed -i \ - -e '/default="\/etc\/diamond\/diamond.conf"/s:=":="'"${EPREFIX}"':' \ - bin/diamond* \ - || die + hprefixify bin/diamond* distutils-r1_src_prepare } @@ -57,6 +54,7 @@ python_install() { sed -i \ -e '/pid_file =/s:/var/run:/run:' \ "${ED}"/etc/diamond/diamond.conf.example || die + hprefixify "${ED}"/etc/diamond/diamond.conf.example } src_install() {