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

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

4 files changed, 33 insertions, 25 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/Manifest b/media-libs/libpostproc/Manifest
index 087a229d36ef..fa0b5c303dc5 100644
--- a/media-libs/libpostproc/Manifest
+++ b/media-libs/libpostproc/Manifest
@@ -1,5 +1,25 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST libpostproc-0.8.0.20120217.tar.xz 65040 RMD160 030d713f5be9f425dfd063782523f5b73f3527f3 SHA1 a5463ef61c73a6edd05f41c201698cadaa8ad96e SHA256 5dd529d19a4c54f987c32dde39fce3c50a9c4bc6657d4f3589a2a85fffc847b4
-EBUILD libpostproc-0.8.0.20120217.ebuild 2466 RMD160 410d89849cd2fbb5a32abfbb316995a069eef120 SHA1 aa5743367536b6d29777759af935713f0ece34ee SHA256 68632a4c11e1479695b404d44871c1a04be3b3933afaed48c4483add88c8d911
-EBUILD libpostproc-9999.ebuild 2456 RMD160 2fed4047125396f52359cafc93314ac5098375f7 SHA1 3899f4b2310a2c78571e8261ddcab149ccb3f4ba SHA256 6959780f791ef5605201508c61735970835191ec17cde54d466d5c2a0799dfe0
-MISC ChangeLog 439 RMD160 05a571e6f599039a29ed91620cc5628392d08e0b SHA1 93fa4d5cfa74812b6ce9281c862e0bf4274855c3 SHA256 ca954ebf4ce822acde9b2677cb3faf9c379789ef365cff2b00a743bd662465ec
+EBUILD libpostproc-0.8.0.20120217.ebuild 2397 RMD160 57aa164fb6648d6c8d5ac8cbd9fa56882db55160 SHA1 d368c764e2b5cbf992a18092268e3dad06f6f4cb SHA256 aabf1d8a1be4490d7e8e528eb8638538f40fc85441ae53e57d5bb21731057ae1
+EBUILD libpostproc-9999.ebuild 2388 RMD160 1396fd8b6cc1fe3d7807a82970a9a82212fa673c SHA1 5745edf13bc64699ce1edb9d40289bcde0f60bbe SHA256 3b51977241838ec0ea410b03e99417821884b5526860c2711fa84a2ed2a05fce
+MISC ChangeLog 663 RMD160 9772c31e42b1f5e5f6f130103d35b0c4be6594b4 SHA1 0e93d57f787f6fa4ea9b726eca8d1e91119a449a SHA256 9dbf0725dc23f127faac8af00657abf20e6a92bfddb55696b403f11aec462eaf
 MISC metadata.xml 635 RMD160 9e0954a1a905599b1861e3364f0aa2525355fe4e SHA1 05d3cc257ee7cdf62565535724258abd9f9c6fb0 SHA256 dd102669700c50c5574a3efc57a91dde17e9a47ff178fe5233dc714f47e3ab78
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iQIcBAEBAgAGBQJPshbVAAoJEOSiRoyO7jvoszEP/06bXfUxzZ4Abqw66T/ohKXU
+phoUelBrmdweUuZd5LuuUZ1gEFFxidbwq3VBtSTyrUikolesgvekl1MNgSxdcl+Q
+2o1F1z8cikHCuIHqFtTYsCaBTujjrK/FXXAzsJemvPMQ1saavFpT4hIqWg6rd8F0
+rh7dXdmUnq1GO5sLvrGKkbZbkGLs/bnSKg9snDSETJZnmy3PONGfY5gLhbVzDeJC
+qFh4QhARzUhns+mgSdKS7LAdtHYphtUi1SZI2vNMT8Ap8GlWL4mvfTg0EYCYNnI+
+hsAWxC7wNbSk06UDLoqwQI938oFHWcbogvnbT1iJ8qduavN5zvsIP2mkiDn9J+HB
+wgzrcdwJjNSb0XiNpDmRzr4L9xvVIVqMmsdmtutscnEyCMzbn2bw3fyM36Qn3dJN
+91+DAYicKU9KfJyvuNFil+cD71emr+ysKQEHmdKB7r+qothlrF6/f+OiVe58XI6R
+UOjA5C1ufxSoaSPrGrVxkYub1F+5z/GChmenSmfvxrbj8F5EbABlma4jzO3klpoJ
+QbnjfaJBS+rLxg2kxviHpZkXaLmJUemSxEEwDjaOLM4syYayPlDfo6nu86TnRctp
+x1QwdotIPyMNBwcfZpVNRVyaDmsr8IZQgy8AAJKlY5PceK476Nby8ecljzJMt3Zo
+2GRbV9eiV8m4BK/yEb+F
+=LnAO
+-----END PGP SIGNATURE-----
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
-}