Ensure libmp4v2 headers are present by forcing correct SLOT wrt #415935 by Robert Cabrera

Package-Manager: portage-2.2.0_alpha107/cvs/Linux x86_64

4 files changed, 20 insertions, 11 deletions

diff --git a/media-libs/faac/ChangeLog b/media-libs/faac/ChangeLog
index 61fa488cc09e..cb8431628214 100644
--- a/media-libs/faac/ChangeLog
+++ b/media-libs/faac/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/faac
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/faac/ChangeLog,v 1.88 2012/05/15 13:04:52 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/faac/ChangeLog,v 1.89 2012/05/19 08:57:01 ssuominen Exp $
+
+  19 May 2012; Samuli Suominen <ssuominen@gentoo.org> faac-1.28-r1.ebuild,
+  faac-1.28-r3.ebuild:
+  Ensure libmp4v2 headers are present by forcing correct SLOT wrt #415935 by
+  Robert Cabrera
 
   15 May 2012; Alexis Ballier <aballier@gentoo.org> faac-1.28-r3.ebuild:
   keyword ~amd64-fbsd
diff --git a/media-libs/faac/Manifest b/media-libs/faac/Manifest
index 68352648e817..009d418a2663 100644
--- a/media-libs/faac/Manifest
+++ b/media-libs/faac/Manifest
@@ -6,14 +6,18 @@ AUX faac-1.28-external-libmp4v2.patch 1766 RMD160 fcb3567d6a3752e10a0180b9d0937b
 AUX faac-1.28-inttypes.patch 1392 RMD160 c76a29d0a560536ddf174d3035ec3322a96af50d SHA1 541bd60ba824d3ac9887b65e0b73104595940f83 SHA256 b135e8441673727a3dbfa8b5237896f985f550594406ddf71d5ad2e85437c69b
 AUX faac-1.28-libmp4v2_r479_compat.patch 4740 RMD160 c9b1b265ddc18e16dd1e0696dcfc798de7c740ce SHA1 8fb6992e5b29bbfa291f8d1a32296b163b76a26d SHA256 30033c5427b0d8f77c57eb22261a69e764399e9b67802245ca555f46bdcfff79
 DIST faac-1.28.tar.gz 678891 RMD160 03902393488f04223aabdc804bfe77bb32a61c94 SHA1 d00b023a3642f81bb1fb13d962a65079121396ee SHA256 c5141199f4cfb17d749c36ba8cfe4b25f838da67c22f0fec40228b6b9c3d19df
-EBUILD faac-1.28-r1.ebuild 1040 RMD160 9bc2d4563500265b414568e03063e40b13e48273 SHA1 f750c4092a0faa1c5ca78bc5a086dddaf21d3f8f SHA256 33117a42da62ada6a2e089416f691a9e44e56471ebf3e873eee0cf96ac8ab900
-EBUILD faac-1.28-r3.ebuild 1185 RMD160 83af6e30835b57680bc7f9125fe2a3cb96edea98 SHA1 10b8728417f9661c1a72ecda6c99131deccb692f SHA256 959a31ffdad404bc67a49d78e33b4a99c302d7b5314d723dc549a6c18cf1f26d
-MISC ChangeLog 11194 RMD160 285379c192a0a311f2ce0ea714762b722efcc893 SHA1 ff6f1b3bfbe53bef8515bfc156c4830ce21a4a6c SHA256 eda606cc0bdb4844fb882452bb6f02b813e1e539cdad8d5f10c2192831617be1
+EBUILD faac-1.28-r1.ebuild 1042 RMD160 500e77b6fa92656a1a63b19bb6ba94254e1c7db9 SHA1 3a7198793512e1f50b0589025cbd88b03227011b SHA256 5a8c1a57c9feb8d1350c781d0746248e25ad7c3fb091f323235580747d1f1c9f
+EBUILD faac-1.28-r3.ebuild 1188 RMD160 233fe9be0367bd02ea8d50a71cb86a63d12f33f3 SHA1 4dfdd8a94acd584c8ad87e71a474974b11061bab SHA256 0364ce9b76f283feafeb202a868faaaa3cf861f3f52501386fd573cc161828f0
+MISC ChangeLog 11388 RMD160 eb8d663bbeaa7a114a9c71df26cd09b6e4b646e4 SHA1 0c6b9f18c790277ccae7f016b0244461f90a4b85 SHA256 ee25e75f03a64e3641ad183cc9b510b474e29f1d96f56608f55acd14bfcca25b
 MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk+yVHYACgkQvFcC4BYPU0ovEQCfXxgNV9qhAFeMRG4jKzINu+4T
-ZwwAoLNQvGGRvrDo5roHH32OBL/N3Zyd
-=wypv
+iQEcBAEBAgAGBQJPt2BTAAoJEEdUh39IaPFNCcsH/1FDx11BcrfCx7uFko3wIGO9
+qWw5npP9M1ADV4RetwNVInj6UXpO2suRQjwQiOmQquESu9rPMo48LBceL3whXBOU
+YHgNw9Xg9VHLsn5TXoWagDtzyGn+E3fCbnHOCljwyBIPQtVkDOOaB1dafLyyhtHw
+Lyk6mEaPgvMp/NtVXK7KFS8CHoIZPygcbxO1gJuwX1OrKGUvPXoouT74NNdev7Yh
+nDbrUg1CGHkKVXwEaIOf1epTc3uTF+L9koaT9zMflXGI94xEsMHiCKafjl+NURza
+KIT5JkvDtDnyLO0Ce8h0jCsvIwqArdyUZFvRM68hfaZz8IfrEZh7cFFha5YDg7U=
+=4iTw
 -----END PGP SIGNATURE-----
diff --git a/media-libs/faac/faac-1.28-r1.ebuild b/media-libs/faac/faac-1.28-r1.ebuild
index 101f31349030..9c128962bb3d 100644
--- a/media-libs/faac/faac-1.28-r1.ebuild
+++ b/media-libs/faac/faac-1.28-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/faac/faac-1.28-r1.ebuild,v 1.13 2012/03/21 09:03:36 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/faac/faac-1.28-r1.ebuild,v 1.14 2012/05/19 08:57:01 ssuominen Exp $
 
 EAPI=2
 inherit autotools eutils
@@ -14,7 +14,7 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd"
 IUSE="static-libs"
 
-RDEPEND="~media-libs/libmp4v2-1.9.1"
+RDEPEND="~media-libs/libmp4v2-1.9.1:0"
 DEPEND="${RDEPEND}"
 
 src_prepare() {
diff --git a/media-libs/faac/faac-1.28-r3.ebuild b/media-libs/faac/faac-1.28-r3.ebuild
index eee84ca2d6b6..2d17b5430301 100644
--- a/media-libs/faac/faac-1.28-r3.ebuild
+++ b/media-libs/faac/faac-1.28-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/faac/faac-1.28-r3.ebuild,v 1.3 2012/05/15 13:04:52 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/faac/faac-1.28-r3.ebuild,v 1.4 2012/05/19 08:57:01 ssuominen Exp $
 
 EAPI=4
 inherit autotools eutils
@@ -14,7 +14,7 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="static-libs"
 
-RDEPEND="media-libs/libmp4v2"
+RDEPEND="media-libs/libmp4v2:0"
 DEPEND="${RDEPEND}"
 
 src_prepare() {