Replace the explicit ABI==DEFAULT_ABI check with multilib_build_binaries eclass function. Remove unnecessary Python hackery (python-config is wrapped by the eclass).

(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)

3 files changed, 18 insertions, 15 deletions

diff --git a/media-libs/alsa-lib/ChangeLog b/media-libs/alsa-lib/ChangeLog
index 61fddcb11706..9dcdb2fc7ff6 100644
--- a/media-libs/alsa-lib/ChangeLog
+++ b/media-libs/alsa-lib/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/alsa-lib
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/alsa-lib/ChangeLog,v 1.379 2013/09/01 18:36:03 ago Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/alsa-lib/ChangeLog,v 1.380 2014/01/04 23:06:59 mgorny Exp $
+
+  04 Jan 2014; Michał Górny <mgorny@gentoo.org> alsa-lib-1.0.27.1-r1.ebuild,
+  alsa-lib-1.0.27.2.ebuild:
+  Replace the explicit ABI==DEFAULT_ABI check with multilib_build_binaries
+  eclass function. Remove unnecessary Python hackery (python-config is wrapped
+  by the eclass).
 
   01 Sep 2013; Agostino Sarubbo <ago@gentoo.org> alsa-lib-1.0.27.1.ebuild:
   Stable for alpha, wrt bug #473404
diff --git a/media-libs/alsa-lib/alsa-lib-1.0.27.1-r1.ebuild b/media-libs/alsa-lib/alsa-lib-1.0.27.1-r1.ebuild
index 3b0ed4e17a72..a42a0d3ead55 100644
--- a/media-libs/alsa-lib/alsa-lib-1.0.27.1-r1.ebuild
+++ b/media-libs/alsa-lib/alsa-lib-1.0.27.1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/alsa-lib/alsa-lib-1.0.27.1-r1.ebuild,v 1.2 2013/07/19 16:41:41 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/alsa-lib/alsa-lib-1.0.27.1-r1.ebuild,v 1.3 2014/01/04 23:06:59 mgorny Exp $
 
 EAPI=5
 
@@ -38,7 +38,7 @@ src_prepare() {
 multilib_src_configure() {
 	local myconf
 	# enable Python only on final ABI
-	if [[ ${ABI} == ${DEFAULT_ABI} ]]; then
+	if multilib_build_binaries; then
 		myconf="$(use_enable python)"
 	else
 		myconf="--disable-python"
@@ -61,7 +61,7 @@ multilib_src_configure() {
 multilib_src_compile() {
 	emake
 
-	if [[ ${ABI} == ${DEFAULT_ABI} ]] && use doc; then
+	if multilib_build_binaries && use doc; then
 		emake doc
 		fgrep -Zrl "${S}" doc/doxygen/html | \
 			xargs -0 sed -i -e "s:${S}::"
@@ -70,7 +70,7 @@ multilib_src_compile() {
 
 multilib_src_install() {
 	emake DESTDIR="${D}" install
-	if [[ ${ABI} == ${DEFAULT_ABI} ]] && use doc; then
+	if multilib_build_binaries && use doc; then
 		dohtml -r doc/doxygen/html/.
 	fi
 }
diff --git a/media-libs/alsa-lib/alsa-lib-1.0.27.2.ebuild b/media-libs/alsa-lib/alsa-lib-1.0.27.2.ebuild
index 7ded3e1cec55..3b1a5e666ea8 100644
--- a/media-libs/alsa-lib/alsa-lib-1.0.27.2.ebuild
+++ b/media-libs/alsa-lib/alsa-lib-1.0.27.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/alsa-lib/alsa-lib-1.0.27.2.ebuild,v 1.2 2013/07/30 13:05:57 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/alsa-lib/alsa-lib-1.0.27.2.ebuild,v 1.3 2014/01/04 23:06:59 mgorny Exp $
 
 EAPI=5
 
@@ -32,9 +32,6 @@ pkg_setup() {
 
 src_prepare() {
 	find . -name Makefile.am -exec sed -i -e '/CFLAGS/s:-g -O2::' {} + || die
-	if [[ ${ABI} == ${DEFAULT_ABI} ]]; then
-		use python && { sed -i -e "s:python-config:$EPYTHON-config:" configure.in || die; }
-	fi
 	epatch_user
 	eautoreconf
 }
@@ -42,7 +39,7 @@ src_prepare() {
 multilib_src_configure() {
 	local myconf
 	# enable Python only on final ABI
-	if [[ ${ABI} == ${DEFAULT_ABI} ]]; then
+	if multilib_build_binaries; then
 		myconf="$(use_enable python)"
 	else
 		myconf="--disable-python"
@@ -65,7 +62,7 @@ multilib_src_configure() {
 multilib_src_compile() {
 	emake
 
-	if [[ ${ABI} == ${DEFAULT_ABI} ]] && use doc; then
+	if multilib_build_binaries && use doc; then
 		emake doc
 		fgrep -Zrl "${S}" doc/doxygen/html | \
 			xargs -0 sed -i -e "s:${S}::"
@@ -74,7 +71,7 @@ multilib_src_compile() {
 
 multilib_src_install() {
 	emake DESTDIR="${D}" install
-	if [[ ${ABI} == ${DEFAULT_ABI} ]] && use doc; then
+	if multilib_build_binaries && use doc; then
 		dohtml -r doc/doxygen/html/.
 	fi
 }