Fix detection of mp4.h as reported by Johannes Weißl via email

Package-Manager: portage-2.1.9.42/cvs/Linux i686

4 files changed, 55 insertions, 9 deletions

diff --git a/media-sound/cmus/ChangeLog b/media-sound/cmus/ChangeLog
index f300da1c6367..8a92ea8acbdf 100644
--- a/media-sound/cmus/ChangeLog
+++ b/media-sound/cmus/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/cmus
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/cmus/ChangeLog,v 1.43 2011/04/23 22:09:02 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/cmus/ChangeLog,v 1.44 2011/04/23 22:22:48 fauli Exp $
+
+  23 Apr 2011; Christian Faulhammer <fauli@gentoo.org> cmus-2.3.4.ebuild,
+  +files/cmus-2.3.4-detect_mp4.h.patch:
+  Fix detection of mp4.h as reported by Johannes Weißl via email
 
   23 Apr 2011; Christian Faulhammer <fauli@gentoo.org> cmus-2.3.4.ebuild:
   Fix configure handling of variables as pointed out by Johannes Weißl via
diff --git a/media-sound/cmus/Manifest b/media-sound/cmus/Manifest
index 94a904b5988f..0cf3f64c4be5 100644
--- a/media-sound/cmus/Manifest
+++ b/media-sound/cmus/Manifest
@@ -1,16 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX cmus-2.3.4-detect_mp4.h.patch 883 RMD160 501845ed81350bd6b99872b38289d573e335d146 SHA1 90863c07b35d157304b6f5a4b6e03f03256c8407 SHA256 41dad941beef8f6e8e0b86c42523d4caecb0935296a9a39037667b9ac4941f0b
 DIST cmus-v2.3.2.tar.bz2 167078 RMD160 bef8227ce02cb3c2c09e6014246a784ae4b3f5fc SHA1 fdfb96f0c53373475ecd05139ebfcb3fd4613a18 SHA256 27d7d17e00945e70c14e33f9d46608e0ba7fee0513b2714feec157e46f90ca46
 DIST cmus-v2.3.4.tar.bz2 167963 RMD160 0e1e873ecc3dc20ffb102f3b9786e526d1c08e0d SHA1 d980781c47937da6c3faf910043967e28b9450d6 SHA256 608e598ad2b100c1bc950ee0b29c584d52905ff12ddb73cc479311da62a29d3c
 EBUILD cmus-2.3.2.ebuild 2334 RMD160 55277d3736e82f0b78bf4d1fcbc9ef9fa412133c SHA1 9b9a112287d5594a1b5a9779ee04ab4b4c47aa7b SHA256 bb2e894dcd1bd36c4261f8cb5b0728f62fb6cd2e60fcfc20a48cd357da6dc075
-EBUILD cmus-2.3.4.ebuild 2336 RMD160 1247ddb1be1363e964aae6c27f869639640c9b6c SHA1 79e81ba61890e9f208fc2dd08dbc121967f79350 SHA256 e4576976a44a535ff457a67e821217e368428ec2b61197a6b47c1675f1c2dfe3
-MISC ChangeLog 6636 RMD160 2883ea33b16d49c829ddcbd0c1d348ebefbc4b1f SHA1 362cab35db3fad93ef371c0b9750a882dbc12479 SHA256 9469efd0179a5ff0cef041c59d05b37dc6ddb155e771c5bda096c14d1fa19f2e
+EBUILD cmus-2.3.4.ebuild 2429 RMD160 e99ceff0b54ea2d36fe71dd0bae92426eddc2f75 SHA1 5cb9461cc7f7eb70cbded0d84afe29d376e260c3 SHA256 aa48b3b6424a46ec7cf938a650f317886caf5d95baedc9646f49a14130f4a5c4
+MISC ChangeLog 6817 RMD160 da3574bacdca71af917116b47ef8d77059785023 SHA1 60a11f47a6be13b964a67a9f8bcd664f32180672 SHA256 76378eba05b08042fadf38420fde2799e6e266f491204765bb33ae4d9e372650
 MISC metadata.xml 429 RMD160 b012d0b87dd5b8301c599ad13a0f9b41032f970d SHA1 4239c00ab77d094867e9430c7e31e335d24669ed SHA256 4433bda20d42a74320957493f0f7cf2ddfc70e6f06875f136fe1d70c64c2e28b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk2zThEACgkQNQqtfCuFneOITACZAYUi5uqGUru8RM5qJpsiWM7K
-TSAAn15I8Zby57rFPZCY7ULOGlqp7Lqs
-=Epvx
+iEYEARECAAYFAk2zUUAACgkQNQqtfCuFneOuuwCggqgoa1OZNyA6rieswy0Gj/CP
+MVIAoIX5EjLwAGUNiCTo/Ke64XzqPUqK
+=hlzf
 -----END PGP SIGNATURE-----
diff --git a/media-sound/cmus/cmus-2.3.4.ebuild b/media-sound/cmus/cmus-2.3.4.ebuild
index db9ac5b20aa5..af6c5651bcea 100644
--- a/media-sound/cmus/cmus-2.3.4.ebuild
+++ b/media-sound/cmus/cmus-2.3.4.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/cmus/cmus-2.3.4.ebuild,v 1.3 2011/04/23 22:09:02 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/cmus/cmus-2.3.4.ebuild,v 1.4 2011/04/23 22:22:48 fauli Exp $
 
-EAPI=2
-inherit multilib
+EAPI=4
+inherit eutils multilib
 
 MY_P=${PN}-v${PV}
 
@@ -44,6 +44,11 @@ my_config() {
 	myconf="${myconf} ${2}=${value}"
 }
 
+src_prepare() {
+	# reported upstream
+	epatch "${FILESDIR}"/${P}-detect_mp4.h.patch
+}
+
 src_configure() {
 	local debuglevel=1 myconf="CONFIG_ARTS=n CONFIG_SUN=n"
 
diff --git a/media-sound/cmus/files/cmus-2.3.4-detect_mp4.h.patch b/media-sound/cmus/files/cmus-2.3.4-detect_mp4.h.patch
new file mode 100644
index 000000000000..6d0d7228ef89
--- /dev/null
+++ b/media-sound/cmus/files/cmus-2.3.4-detect_mp4.h.patch
@@ -0,0 +1,36 @@
+From b397bbb328adf55a39ba0991d8d8dc8cab268c21 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Johannes=20Wei=C3=9Fl?= <jargon@molb.org>
+Date: Mon, 18 Apr 2011 02:26:37 +0200
+Subject: [PATCH] configure: fix detection of mp4.h
+
+mp4.h is just assumed to be there if mp4v2/mp4v2.h could not be found.
+This could be a fix for Gentoo Bug 323975 [1].
+
+[1] http://bugs.gentoo.org/show_bug.cgi?id=323975
+---
+ configure |    9 +++++++--
+ 1 files changed, 7 insertions(+), 2 deletions(-)
+
+diff --git a/configure b/configure
+index dee8b01..1ecad56 100755
+--- a/configure
++++ b/configure
+@@ -284,8 +284,13 @@ check_roar()
+ 
+ check_mp4()
+ {
+-	check_header mp4v2/mp4v2.h
+-	USE_MPEG4IP=$?
++	USE_MPEG4IP=1
++	if check_header mp4v2/mp4v2.h
++	then
++		USE_MPEG4IP=0
++	else
++		check_header mp4.h || return $?
++	fi
+ 	check_header neaacdec.h &&
+ 	check_library MP4 "" "-lmp4v2 -lfaad -lm"
+ 	return $?
+-- 
+1.7.4.4
+