diff options
| author |   Fabian Groffen <grobian@gentoo.org> | 2016-08-02 20:46:32 +0200 |
|---|---|---|
| committer | Fabian Groffen <grobian@gentoo.org> | 2016-08-02 20:46:32 +0200 |
| commit | c78f0d0a67010b4f1e69d6282f2d3020c04ab1f3 (patch) | |
| tree | faff89d4ee13e16d602ed17c7ffeee202122dd1f | |
| parent | games-board/pysolfc: add missing die() (diff) | |
| download | gentoo-c78f0d0a67010b4f1e69d6282f2d3020c04ab1f3.tar.gz gentoo-c78f0d0a67010b4f1e69d6282f2d3020c04ab1f3.tar.bz2 gentoo-c78f0d0a67010b4f1e69d6282f2d3020c04ab1f3.zip | |
app-admin/diamond: use hprefixify for Prefix
Package-Manager: portage-2.2.28
| -rw-r--r-- | app-admin/diamond/diamond-4.0-r1.ebuild | 10 | ||||
| -rw-r--r-- | 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 a9dbda4d2cff..e1372729e0d8 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 cb7f0784091c..656013e519d8 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() { |