Depend on newer libav as older has postrproc in itself -> collisions. Drop predefined eapi4 phases.

(Portage version: 2.2.0_alpha105/cvs/Linux x86_64)

3 files changed, 10 insertions, 22 deletions

diff --git a/media-libs/libpostproc/ChangeLog b/media-libs/libpostproc/ChangeLog
index 508f90240d1a..f99a3b5c4db5 100644
--- a/media-libs/libpostproc/ChangeLog
+++ b/media-libs/libpostproc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/libpostproc
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libpostproc/ChangeLog,v 1.1 2012/05/14 19:12:12 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libpostproc/ChangeLog,v 1.2 2012/05/15 08:41:37 scarabeus Exp $
+
+  15 May 2012; Tomáš Chvátal <scarabeus@gentoo.org>
+  libpostproc-0.8.0.20120217.ebuild, libpostproc-9999.ebuild:
+  Depend on newer libav as older has postrproc in itself -> collisions. Drop
+  predefined eapi4 phases.
 
 *libpostproc-9999 (14 May 2012)
 *libpostproc-0.8.0.20120217 (14 May 2012)
diff --git a/media-libs/libpostproc/libpostproc-0.8.0.20120217.ebuild b/media-libs/libpostproc/libpostproc-0.8.0.20120217.ebuild
index 8cf5efd556f8..f46116d28fff 100644
--- a/media-libs/libpostproc/libpostproc-0.8.0.20120217.ebuild
+++ b/media-libs/libpostproc/libpostproc-0.8.0.20120217.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/libpostproc/libpostproc-0.8.0.20120217.ebuild,v 1.1 2012/05/14 19:12:12 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libpostproc/libpostproc-0.8.0.20120217.ebuild,v 1.2 2012/05/15 08:41:37 scarabeus Exp $
 
 EAPI="4"
 
@@ -32,12 +32,11 @@ IUSE="pic static-libs"
 # String for CPU features in the useflag[:configure_option] form
 # if :configure_option isn't set, it will use 'useflag' as configure option
 CPU_FEATURES="3dnow:amd3dnow 3dnowext:amd3dnowext altivec mmx vis"
-
 for i in ${CPU_FEATURES}; do
 	IUSE="${IUSE} ${i%:*}"
 done
 
-DEPEND=">=media-video/libav-0.8"
+DEPEND=">=media-video/libav-0.8.2-r2"
 RDEPEND="${DEPEND}"
 
 src_configure() {
@@ -84,11 +83,3 @@ src_configure() {
 		$(use_enable static-libs static) \
 		${myconf} || die
 }
-
-src_compile() {
-	emake
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-}
diff --git a/media-libs/libpostproc/libpostproc-9999.ebuild b/media-libs/libpostproc/libpostproc-9999.ebuild
index 39294180dfe9..3e56ffdf615e 100644
--- a/media-libs/libpostproc/libpostproc-9999.ebuild
+++ b/media-libs/libpostproc/libpostproc-9999.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/libpostproc/libpostproc-9999.ebuild,v 1.1 2012/05/14 19:12:12 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libpostproc/libpostproc-9999.ebuild,v 1.2 2012/05/15 08:41:37 scarabeus Exp $
 
 EAPI="4"
 
@@ -37,7 +37,7 @@ for i in ${CPU_FEATURES}; do
 	IUSE="${IUSE} ${i%:*}"
 done
 
-DEPEND=">=media-video/libav-0.8"
+DEPEND=">=media-video/libav-0.8.2-r2"
 RDEPEND="${DEPEND}"
 
 src_configure() {
@@ -84,11 +84,3 @@ src_configure() {
 		$(use_enable static-libs static) \
 		${myconf} || die
 }
-
-src_compile() {
-	emake
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-}