Wrap libavutil/avconfig.h since in some cases it differs per-ABI, bug #513184.

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

6 files changed, 31 insertions, 6 deletions

diff --git a/media-video/libav/ChangeLog b/media-video/libav/ChangeLog
index f08dac986bee..f464c73c970d 100644
--- a/media-video/libav/ChangeLog
+++ b/media-video/libav/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/libav
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/libav/ChangeLog,v 1.190 2014/06/07 21:32:06 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/libav/ChangeLog,v 1.191 2014/06/16 22:03:07 mgorny Exp $
+
+  16 Jun 2014; Michał Górny <mgorny@gentoo.org> libav-10.1-r1.ebuild,
+  libav-10.9999.ebuild, libav-9.13-r1.ebuild, libav-9.9999.ebuild,
+  libav-9999.ebuild:
+  Wrap libavutil/avconfig.h since in some cases it differs per-ABI, bug #513184.
 
 *libav-9.13-r1 (07 Jun 2014)
 *libav-10.1-r1 (07 Jun 2014)
diff --git a/media-video/libav/libav-10.1-r1.ebuild b/media-video/libav/libav-10.1-r1.ebuild
index b5a444e95b40..04a88995f57c 100644
--- a/media-video/libav/libav-10.1-r1.ebuild
+++ b/media-video/libav/libav-10.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-10.1-r1.ebuild,v 1.1 2014/06/07 21:32:06 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-10.1-r1.ebuild,v 1.2 2014/06/16 22:03:07 mgorny Exp $
 
 EAPI=5
 
@@ -130,6 +130,10 @@ REQUIRED_USE="bindist? ( !faac !openssl !fdk )
 	test? ( encode zlib )
 "
 
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/libavutil/avconfig.h
+)
+
 src_prepare() {
 	# if we have snapshot then we need to hardcode the version
 	if [[ ${PV%_p*} != ${PV} ]]; then
diff --git a/media-video/libav/libav-10.9999.ebuild b/media-video/libav/libav-10.9999.ebuild
index 755562a2d988..d2e045161186 100644
--- a/media-video/libav/libav-10.9999.ebuild
+++ b/media-video/libav/libav-10.9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-10.9999.ebuild,v 1.4 2014/06/07 21:32:06 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-10.9999.ebuild,v 1.5 2014/06/16 22:03:07 mgorny Exp $
 
 EAPI=5
 
@@ -133,6 +133,10 @@ REQUIRED_USE="bindist? ( !faac !openssl !fdk )
 # Test on live ebuild are not possible as they require trunk fate
 RESTRICT="test"
 
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/libavutil/avconfig.h
+)
+
 src_prepare() {
 	# if we have snapshot then we need to hardcode the version
 	if [[ ${PV%_p*} != ${PV} ]]; then
diff --git a/media-video/libav/libav-9.13-r1.ebuild b/media-video/libav/libav-9.13-r1.ebuild
index ca734d3ac197..11c584bcf543 100644
--- a/media-video/libav/libav-9.13-r1.ebuild
+++ b/media-video/libav/libav-9.13-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-9.13-r1.ebuild,v 1.1 2014/06/07 21:32:06 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-9.13-r1.ebuild,v 1.2 2014/06/16 22:03:07 mgorny Exp $
 
 EAPI=5
 
@@ -130,6 +130,10 @@ REQUIRED_USE="bindist? ( !faac !openssl !fdk )
 	test? ( encode zlib )
 "
 
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/libavutil/avconfig.h
+)
+
 src_prepare() {
 	# if we have snapshot then we need to hardcode the version
 	if [[ ${PV%_p*} != ${PV} ]]; then
diff --git a/media-video/libav/libav-9.9999.ebuild b/media-video/libav/libav-9.9999.ebuild
index b6e3ecc64571..be53e1aae86b 100644
--- a/media-video/libav/libav-9.9999.ebuild
+++ b/media-video/libav/libav-9.9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-9.9999.ebuild,v 1.12 2014/06/07 21:32:06 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-9.9999.ebuild,v 1.13 2014/06/16 22:03:07 mgorny Exp $
 
 EAPI=5
 
@@ -130,6 +130,10 @@ REQUIRED_USE="bindist? ( !faac !openssl !fdk )
 	test? ( encode zlib )
 "
 
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/libavutil/avconfig.h
+)
+
 src_prepare() {
 	# if we have snapshot then we need to hardcode the version
 	if [[ ${PV%_p*} != ${PV} ]]; then
diff --git a/media-video/libav/libav-9999.ebuild b/media-video/libav/libav-9999.ebuild
index fc6055c16c36..14dee05fd51e 100644
--- a/media-video/libav/libav-9999.ebuild
+++ b/media-video/libav/libav-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-9999.ebuild,v 1.67 2014/06/07 21:32:06 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-9999.ebuild,v 1.68 2014/06/16 22:03:07 mgorny Exp $
 
 EAPI=5
 
@@ -132,6 +132,10 @@ REQUIRED_USE="bindist? ( !faac !openssl !fdk )
 # Test on live ebuild are not possible as they require trunk fate
 RESTRICT="test"
 
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/libavutil/avconfig.h
+)
+
 src_prepare() {
 	# if we have snapshot then we need to hardcode the version
 	if [[ ${PV%_p*} != ${PV} ]]; then