Minor adjustments on deps to avoid post-unmasking breakage

(Portage version: 2.2_rc33/cvs/Linux x86_64)

4 files changed, 13 insertions, 14 deletions

diff --git a/media-libs/faac/faac-1.24-r4.ebuild b/media-libs/faac/faac-1.24-r4.ebuild
index ad10a26e3ec7..ff1c2f0d9465 100644
--- a/media-libs/faac/faac-1.24-r4.ebuild
+++ b/media-libs/faac/faac-1.24-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/faac/faac-1.24-r4.ebuild,v 1.2 2008/11/30 11:08:27 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/faac/faac-1.24-r4.ebuild,v 1.3 2009/07/10 19:42:29 ssuominen Exp $
 
 inherit libtool eutils autotools
 
@@ -14,7 +14,7 @@ KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86 ~x86-fbsd"
 IUSE=""
 
 RDEPEND=">=media-libs/libsndfile-1.0.0
-	media-libs/libmp4v2"
+	<media-libs/libmp4v2-1.9.0"
 DEPEND="${RDEPEND}
 	!<media-libs/faad2-2.0-r3"
 
diff --git a/media-libs/faac/faac-1.25.ebuild b/media-libs/faac/faac-1.25.ebuild
index 31b693d5c985..83163269066e 100644
--- a/media-libs/faac/faac-1.25.ebuild
+++ b/media-libs/faac/faac-1.25.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/faac/faac-1.25.ebuild,v 1.8 2008/11/30 11:08:27 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/faac/faac-1.25.ebuild,v 1.9 2009/07/10 19:42:29 ssuominen Exp $
 
 inherit libtool eutils autotools flag-o-matic
 
@@ -12,7 +12,7 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86 ~x86-fbsd"
 IUSE=""
 RDEPEND=">=media-libs/libsndfile-1.0.0
-	media-libs/libmp4v2"
+	<media-libs/libmp4v2-1.9.0"
 DEPEND="${RDEPEND}
 	!<media-libs/faad2-2.0-r3"
 
diff --git a/media-libs/faac/faac-1.26-r1.ebuild b/media-libs/faac/faac-1.26-r1.ebuild
index d38d1286c7d5..a62f280186a1 100644
--- a/media-libs/faac/faac-1.26-r1.ebuild
+++ b/media-libs/faac/faac-1.26-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/faac/faac-1.26-r1.ebuild,v 1.9 2008/12/18 06:32:53 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/faac/faac-1.26-r1.ebuild,v 1.10 2009/07/10 19:42:29 ssuominen Exp $
 
 inherit libtool eutils autotools flag-o-matic
 
@@ -11,7 +11,7 @@ LICENSE="LGPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd"
 IUSE=""
-RDEPEND="media-libs/libmp4v2"
+RDEPEND="<media-libs/libmp4v2-1.9.0"
 DEPEND="${RDEPEND}
 	!<media-libs/faad2-2.0-r3"
 
diff --git a/media-libs/faac/faac-1.28.ebuild b/media-libs/faac/faac-1.28.ebuild
index 6e080d9b647b..87c1e38ab072 100644
--- a/media-libs/faac/faac-1.28.ebuild
+++ b/media-libs/faac/faac-1.28.ebuild
@@ -1,33 +1,32 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/faac/faac-1.28.ebuild,v 1.1 2009/02/19 23:13:34 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/faac/faac-1.28.ebuild,v 1.2 2009/07/10 19:42:29 ssuominen Exp $
 
-inherit libtool eutils autotools flag-o-matic
+inherit autotools eutils
 
 DESCRIPTION="Free MPEG-4 audio codecs by AudioCoding.com"
 HOMEPAGE="http://www.audiocoding.com/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
 LICENSE="LGPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE=""
-RDEPEND="media-libs/libmp4v2"
+
+RDEPEND="<media-libs/libmp4v2-1.9.0"
 DEPEND="${RDEPEND}
 	!<media-libs/faad2-2.0-r3"
 
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-
-	epatch "${FILESDIR}/${PN}-1.26-external-libmp4v2.patch"
-
+	epatch "${FILESDIR}"/${PN}-1.26-external-libmp4v2.patch
 	eautoreconf
-	elibtoolize
 	epunt_cxx
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed."
+	emake DESTDIR="${D}" install || die "emake install failed"
 	dodoc AUTHORS ChangeLog NEWS README TODO docs/libfaac.pdf
 	dohtml docs/*
 }