commit: c482c2369ca691c735b8b7b3b3d322ed930c6835
Author: Tony Vroon <chainsaw <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 14 14:29:08 2016 +0000
Commit: Tony Vroon <chainsaw <AT> gentoo <DOT> org>
CommitDate: Mon Nov 14 14:29:08 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c482c236
app-admin/graylog2: Drop usage of ${S} in src_prepare as suggested by dwfreed.
Package-Manager: portage-2.3.2
app-admin/graylog2/graylog2-2.1.2.ebuild | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/app-admin/graylog2/graylog2-2.1.2.ebuild
b/app-admin/graylog2/graylog2-2.1.2.ebuild
index 86ac3f8..0e52f74 100644
--- a/app-admin/graylog2/graylog2-2.1.2.ebuild
+++ b/app-admin/graylog2/graylog2-2.1.2.ebuild
@@ -34,24 +34,24 @@ pkg_setup() {
src_prepare() {
default
# graylogctl is replaced by our own initd
- rm -r "${S}/bin"
+ rm -r bin
# Stick to architecture of build host
if ! use amd64; then
- rm -r "${S}"/lib/sigar/libsigar-amd64-*.so || die "Failed in
removing AMD64 support libraries"
+ rm -r lib/sigar/libsigar-amd64-*.so || die "Failed in removing
AMD64 support libraries"
fi
if ! use ppc64; then
- rm -r "${S}"/lib/sigar/libsigar-ppc64-*.so || die "Failed in
removing PPC64 support libraries"
+ rm -r lib/sigar/libsigar-ppc64-*.so || die "Failed in removing
PPC64 support libraries"
fi
if ! use x86; then
- rm -r "${S}"/lib/sigar/libsigar-x86-*.so || die "Failed in
removing X86 support libraries"
+ rm -r lib/sigar/libsigar-x86-*.so || die "Failed in removing
X86 support libraries"
fi
# Currently unsupported platforms
# QA warning galore but testing/patches welcome
- rm -r "${S}"/lib/sigar/libsigar-ia64-*.so || die "Failed in removing
IA64 support libraries"
- rm -r "${S}"/lib/sigar/libsigar-ppc-*.so || die "Failed in removing PPC
support libraries"
- rm -r "${S}"/lib/sigar/libsigar-*-freebsd-*.so || die "Failed in
removing FreeBSD support libraries"
- rm -r "${S}"/lib/sigar/libsigar-pa-*.sl || die "Failed in removing HPPA
support libraries"
- rm -r "${S}"/lib/sigar/libsigar-*-solaris.so || die "Failed in removing
Solaris support libraries"
+ rm -r lib/sigar/libsigar-ia64-*.so || die "Failed in removing IA64
support libraries"
+ rm -r lib/sigar/libsigar-ppc-*.so || die "Failed in removing PPC
support libraries"
+ rm -r lib/sigar/libsigar-*-freebsd-*.so || die "Failed in removing
FreeBSD support libraries"
+ rm -r lib/sigar/libsigar-pa-*.sl || die "Failed in removing HPPA
support libraries"
+ rm -r lib/sigar/libsigar-*-solaris.so || die "Failed in removing
Solaris support libraries"
}
src_compile() {
