| 1 |
commit: c78f0d0a67010b4f1e69d6282f2d3020c04ab1f3 |
| 2 |
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Aug 2 18:46:32 2016 +0000 |
| 4 |
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Aug 2 18:46:32 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c78f0d0a |
| 7 |
|
| 8 |
app-admin/diamond: use hprefixify for Prefix |
| 9 |
|
| 10 |
Package-Manager: portage-2.2.28 |
| 11 |
|
| 12 |
app-admin/diamond/diamond-4.0-r1.ebuild | 10 ++++------ |
| 13 |
app-admin/diamond/diamond-9999.ebuild | 8 +++----- |
| 14 |
2 files changed, 7 insertions(+), 11 deletions(-) |
| 15 |
|
| 16 |
diff --git a/app-admin/diamond/diamond-4.0-r1.ebuild b/app-admin/diamond/diamond-4.0-r1.ebuild |
| 17 |
index a9dbda4..e137272 100644 |
| 18 |
--- a/app-admin/diamond/diamond-4.0-r1.ebuild |
| 19 |
+++ b/app-admin/diamond/diamond-4.0-r1.ebuild |
| 20 |
@@ -10,13 +10,13 @@ if [[ ${PV} = 9999* ]]; then |
| 21 |
S=${WORKDIR}/diamond-${PV} |
| 22 |
else |
| 23 |
SRC_URI="https://github.com/python-diamond/Diamond/archive/v${PV}.tar.gz -> python-diamond-${PV}.tar.gz" |
| 24 |
- KEYWORDS="~amd64 ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
| 25 |
+ KEYWORDS="~amd64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
| 26 |
S=${WORKDIR}/Diamond-${PV} |
| 27 |
fi |
| 28 |
|
| 29 |
PYTHON_COMPAT=( python2_7 ) |
| 30 |
|
| 31 |
-inherit distutils-r1 eutils |
| 32 |
+inherit distutils-r1 eutils prefix |
| 33 |
|
| 34 |
DESCRIPTION="Python daemon that collects and publishes system metrics" |
| 35 |
HOMEPAGE="https://github.com/python-diamond/Diamond" |
| 36 |
@@ -37,10 +37,7 @@ DEPEND="${RDEPEND} |
| 37 |
|
| 38 |
src_prepare() { |
| 39 |
# adjust for Prefix |
| 40 |
- sed -i \ |
| 41 |
- -e '/default="\/etc\/diamond\/diamond.conf"/s:=":="'"${EPREFIX}"':' \ |
| 42 |
- bin/diamond* \ |
| 43 |
- || die |
| 44 |
+ hprefixify bin/diamond* |
| 45 |
|
| 46 |
# fix necessary to make handlers honour their config, simple sed |
| 47 |
# doing the same as upstream |
| 48 |
@@ -67,6 +64,7 @@ python_install() { |
| 49 |
sed -i \ |
| 50 |
-e '/pid_file =/s:/var/run:/run:' \ |
| 51 |
"${ED}"/etc/diamond/diamond.conf.example || die |
| 52 |
+ hprefixify "${ED}"/etc/diamond/diamond.conf.example |
| 53 |
} |
| 54 |
|
| 55 |
src_install() { |
| 56 |
|
| 57 |
diff --git a/app-admin/diamond/diamond-9999.ebuild b/app-admin/diamond/diamond-9999.ebuild |
| 58 |
index cb7f078..656013e 100644 |
| 59 |
--- a/app-admin/diamond/diamond-9999.ebuild |
| 60 |
+++ b/app-admin/diamond/diamond-9999.ebuild |
| 61 |
@@ -16,7 +16,7 @@ fi |
| 62 |
|
| 63 |
PYTHON_COMPAT=( python2_7 ) |
| 64 |
|
| 65 |
-inherit distutils-r1 |
| 66 |
+inherit distutils-r1 prefix |
| 67 |
|
| 68 |
DESCRIPTION="Python daemon that collects and publishes system metrics" |
| 69 |
HOMEPAGE="https://github.com/python-diamond/Diamond" |
| 70 |
@@ -37,10 +37,7 @@ DEPEND="${RDEPEND} |
| 71 |
|
| 72 |
src_prepare() { |
| 73 |
# adjust for Prefix |
| 74 |
- sed -i \ |
| 75 |
- -e '/default="\/etc\/diamond\/diamond.conf"/s:=":="'"${EPREFIX}"':' \ |
| 76 |
- bin/diamond* \ |
| 77 |
- || die |
| 78 |
+ hprefixify bin/diamond* |
| 79 |
|
| 80 |
distutils-r1_src_prepare |
| 81 |
} |
| 82 |
@@ -57,6 +54,7 @@ python_install() { |
| 83 |
sed -i \ |
| 84 |
-e '/pid_file =/s:/var/run:/run:' \ |
| 85 |
"${ED}"/etc/diamond/diamond.conf.example || die |
| 86 |
+ hprefixify "${ED}"/etc/diamond/diamond.conf.example |
| 87 |
} |
| 88 |
|
| 89 |
src_install() { |
Archives