From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-831273-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
by finch.gentoo.org (Postfix) with ESMTP id 7DF9E1384C0
for <garchives@archives.gentoo.org>; Sun, 30 Aug 2015 09:47:58 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id E810DE0875;
Sun, 30 Aug 2015 09:47:57 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 984C6E0875
for <gentoo-commits@lists.gentoo.org>; Sun, 30 Aug 2015 09:47:57 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 6858F340768
for <gentoo-commits@lists.gentoo.org>; Sun, 30 Aug 2015 09:47:56 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 542EE155
for <gentoo-commits@lists.gentoo.org>; Sun, 30 Aug 2015 09:47:49 +0000 (UTC)
From: "Daniel Campbell" <zlg@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Daniel Campbell" <zlg@gentoo.org>
Message-ID: <1440928057.b252629653a11bdca61279c5de260d66e6ff8fbd.zlg@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: media-sound/apulse/
X-VCS-Repository: repo/gentoo
X-VCS-Files: media-sound/apulse/apulse-0.1.6-r1.ebuild
X-VCS-Directories: media-sound/apulse/
X-VCS-Committer: zlg
X-VCS-Committer-Name: Daniel Campbell
X-VCS-Revision: b252629653a11bdca61279c5de260d66e6ff8fbd
X-VCS-Branch: master
Date: Sun, 30 Aug 2015 09:47:49 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: 711a023c-cf13-47b5-9c24-e79bdc359fb3
X-Archives-Hash: 8d98700b6cb4a04edaf9d89d9923090a
commit: b252629653a11bdca61279c5de260d66e6ff8fbd
Author: Daniel Campbell <zlg <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 30 09:47:37 2015 +0000
Commit: Daniel Campbell <zlg <AT> gentoo <DOT> org>
CommitDate: Sun Aug 30 09:47:37 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b2526296
media-sound/apulse: Rearrange script editing to better fit phases.
Gentoo-Bug: 547524
Package-Manager: portage-2.2.20.1
media-sound/apulse/apulse-0.1.6-r1.ebuild | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
diff --git a/media-sound/apulse/apulse-0.1.6-r1.ebuild b/media-sound/apulse/apulse-0.1.6-r1.ebuild
index 8324b90..dde232e 100644
--- a/media-sound/apulse/apulse-0.1.6-r1.ebuild
+++ b/media-sound/apulse/apulse-0.1.6-r1.ebuild
@@ -21,19 +21,21 @@ RDEPEND="${DEPEND}
MULTILIB_CHOST_TOOLS=( /usr/bin/apulse )
-multilib_src_configure() {
- local mycmakeargs="-DAPULSEPATH=${EPREFIX}/usr/$(get_libdir)/apulse"
-
- cmake-utils_src_configure
-
- # Ensure all relevant libdirs are added
+src_prepare() {
+ # Ensure all relevant libdirs are added, to support all ABIs
DIRS=
_add_dir() { DIRS="${EPREFIX}/usr/$(get_libdir)/apulse${DIRS:+:${DIRS}}"; }
multilib_foreach_abi _add_dir
sed -e "s#@@DIRS@@#${DIRS}#g" "${FILESDIR}"/apulse > "${T}"/apulse
}
-multilib_src_install() {
+multilib_src_configure() {
+ local mycmakeargs="-DAPULSEPATH=${EPREFIX}/usr/$(get_libdir)/apulse"
+ cmake-utils_src_configure
+}
+
+multilib_src_install_all() {
cmake-utils_src_install
+ einstalldocs
dobin "${T}"/apulse
}