From: Daniel Campbell <zlg@gentoo.org>
Date: Sun, 30 Aug 2015 09:47:37 +0000 (-0700)
Subject: media-sound/apulse: Rearrange script editing to better fit phases.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=b252629653a11bdca61279c5de260d66e6ff8fbd;p=gentoo.git

media-sound/apulse: Rearrange script editing to better fit phases.

Gentoo-Bug: 547524

Package-Manager: portage-2.2.20.1
---

diff --git a/media-sound/apulse/apulse-0.1.6-r1.ebuild b/media-sound/apulse/apulse-0.1.6-r1.ebuild
index 8324b9054619..dde232ef3894 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
 }