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 C87081395E2 for ; Mon, 14 Nov 2016 14:29:23 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E6C30E08C5; Mon, 14 Nov 2016 14:29:20 +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 CB864E08C5 for ; Mon, 14 Nov 2016 14:29:20 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 C921F34161D for ; Mon, 14 Nov 2016 14:29:19 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6AB3A24AA for ; Mon, 14 Nov 2016 14:29:18 +0000 (UTC) From: "Tony Vroon" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Tony Vroon" Message-ID: <1479133748.c482c2369ca691c735b8b7b3b3d322ed930c6835.chainsaw@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-admin/graylog2/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-admin/graylog2/graylog2-2.1.2.ebuild X-VCS-Directories: app-admin/graylog2/ X-VCS-Committer: chainsaw X-VCS-Committer-Name: Tony Vroon X-VCS-Revision: c482c2369ca691c735b8b7b3b3d322ed930c6835 X-VCS-Branch: master Date: Mon, 14 Nov 2016 14:29:18 +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: 0cb9333c-7d4a-4880-823c-74b29d392597 X-Archives-Hash: 51350e1b7e01dd7ea85320160d0dec99 commit: c482c2369ca691c735b8b7b3b3d322ed930c6835 Author: Tony Vroon gentoo org> AuthorDate: Mon Nov 14 14:29:08 2016 +0000 Commit: Tony Vroon gentoo 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() {