summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTony Vroon <chainsaw@gentoo.org>2016-11-14 14:29:08 +0000
committerTony Vroon <chainsaw@gentoo.org>2016-11-14 14:29:08 +0000
commitc482c2369ca691c735b8b7b3b3d322ed930c6835 (patch)
treeaccc7cdd57d069f5582512588c736a4e8a97c074 /app-admin/graylog2
parentapp-admin/graylog2: New addition. Original ebuild by Guillaume Ceccarelli wit... (diff)
downloadgentoo-c482c2369ca691c735b8b7b3b3d322ed930c6835.tar.gz
gentoo-c482c2369ca691c735b8b7b3b3d322ed930c6835.tar.bz2
gentoo-c482c2369ca691c735b8b7b3b3d322ed930c6835.zip
app-admin/graylog2: Drop usage of ${S} in src_prepare as suggested by dwfreed.
Package-Manager: portage-2.3.2
Diffstat (limited to 'app-admin/graylog2')
-rw-r--r--app-admin/graylog2/graylog2-2.1.2.ebuild18
1 files 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 86ac3f8f19ef..0e52f74cd083 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() {