Switch to USE=libav. https://github.com/gentoo/gentoo-portage-rsync-mirror/pull/60 by Nikoli.

Package-Manager: portage-2.2.17/cvs/Linux x86_64
Manifest-Sign-Key: 0xEFB4464E!

4 files changed, 36 insertions, 25 deletions

diff --git a/media-libs/gegl/ChangeLog b/media-libs/gegl/ChangeLog
index 488d63629a97..80ef692bf4be 100644
--- a/media-libs/gegl/ChangeLog
+++ b/media-libs/gegl/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/gegl
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/gegl/ChangeLog,v 1.107 2015/01/29 17:33:00 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/gegl/ChangeLog,v 1.108 2015/02/26 18:25:41 mgorny Exp $
+
+  26 Feb 2015; Michał Górny <mgorny@gentoo.org> gegl-0.2.0-r2.ebuild,
+  gegl-9999.ebuild:
+  Switch to USE=libav. https://github.com/gentoo/gentoo-portage-rsync-
+  mirror/pull/60 by Nikoli.
 
   29 Jan 2015; Michał Górny <mgorny@gentoo.org> gegl-0.2.0-r2.ebuild,
   gegl-9999.ebuild:
diff --git a/media-libs/gegl/Manifest b/media-libs/gegl/Manifest
index 3603da81508c..6f49db802961 100644
--- a/media-libs/gegl/Manifest
+++ b/media-libs/gegl/Manifest
@@ -12,26 +12,26 @@ AUX gegl-0.2.0-introspection-version.patch 1233 SHA256 7238b314bcefedb0cc6e9d655
 AUX gegl-doubledestdir.diff 438 SHA256 a39da1569b510092ba345f52f33486fc246165ffd0f84d0129d29e77a26ccc2b SHA512 dcfd999de171ebc80a4016d380793ea5bf39bfb4839715acd01a26edd28dea0a81cc31e92343934a6940f5aece8b2fc476f3328ba45343a3995e79040560b131 WHIRLPOOL da248cfb52a39157d0ef010121182151a00ad684e354c8d3fd2110d64344ca80f77acea5cf0c22ee6467a63ca43d6c2efc846d74137d1a9262d56baa042bad1f
 AUX replace-imgconvert-by-swsscale.patch 2154 SHA256 d0470dd22814afffbbb2fffa7fc9488129b9cae715f26c8330eea913550885dc SHA512 e988ea43516b5664ed8e359e1d964875916540f617b810e958f0644efc98f41abaed6c6cac41c049524dd85decf8819382fb49a5ddd3df42c12747a16fed79e1 WHIRLPOOL 0f28afaf5b9bedb18b178f5df9eddbfc6219899a189e16e15bbeed5da1d1417c55988cf1b6ee5da643fe7494c53f54c2d531cf2d543c94f03869279947b73ef0
 DIST gegl-0.2.0.tar.bz2 7502040 SHA256 df2e6a0d9499afcbc4f9029c18d9d1e0dd5e8710a75e17c9b1d9a6480dd8d426 SHA512 16ef3f6852fd8efef2b6468a754342a2d003f2c2bef468d9465a448e6c89dedb8e791570f073a9faed05218a7c94c6c418eaa0f3abeadfb3e6b88d766ab792c8 WHIRLPOOL 74e9c18b095526b1d053f0700b3c3776197a5c1066cb77adb7c83f154aae9087319f7b7f0379fb9e895a5ef3ac62ebf05e2158c1d18180bafcef41dff096c01d
-EBUILD gegl-0.2.0-r2.ebuild 4670 SHA256 3293913e057641ffdf159f4baff1171cd3ce69879c6081fbdcd87c6556000d4e SHA512 3dbe1297e34926c2b4bc5497e6ce726fe99abba1df891e78ea6f24e96d59e06e455e4d0e7cbf3084209c679266ee2bea38babdf322cea65ab86fc9b87951f34e WHIRLPOOL 532d59bce62391d10cb35cfbc97357abc9d677b678d1690f147fda1fd449a659e5443e4d88f2bf1d87925b899c567dee6875dca7fc1c0af2d115e169385e5dda
-EBUILD gegl-9999.ebuild 3829 SHA256 eeac42373cbd48aa9c33198825f7da86819ab87741161a2694cb69361a053da1 SHA512 db55435eb2b598df6815c43033b6a98dd5c31b976f36ae15165733f61afca58484281e494771393ea1777a0f416dc8a167bbeffa5d1819c6a574ec27f9662ed1 WHIRLPOOL 4491c9ee967d04e4d37bfa90d059adb464a494a4598ce0ed8c2dc9134dbb88091a0991c47c3f7afec4b102bcaf642ba8e7fd875190b4ebb51d45b92f965e6993
-MISC ChangeLog 14664 SHA256 c91078ffb8ed1c63b88c7b5137b7bd9c105230ce03242f42a6e19a72cdc5b84b SHA512 ad1d5f54ccb946028664f24546cc7880d4befa28dcdbc3629f7e469bc0478ee799504691b4978a4e563b8fa94f8d6033f65e93fbc7e699f3344632533df51f56 WHIRLPOOL 77fae863f952895b0d41d4b6226eca20329fe40c2295221546a8c7dfe2607cfce77e0207ccbb3179ce045a104aeb99d899b0db567f2c0ae67bcd1a142be032ff
+EBUILD gegl-0.2.0-r2.ebuild 4732 SHA256 90e2e1c3d47d3ff056b432142790b1c48628503afa7c18df7d472ab59c5ff885 SHA512 d6e96fa077be5f297eed6f6631a91f7a942e80b54ad22671bf7eaa80d877e1e5071ab457864f705e85cd8718ccde3afd1f288963052c1a2798131e0cc147dd95 WHIRLPOOL 89be2738c59544f8da7ce7ba2418a9a7f24e04386d41c5500673db3fd174c6c3378f35e1c8dc5830b053ebcd5b1d878f06503c4cc9df970709f70a57a577643b
+EBUILD gegl-9999.ebuild 3891 SHA256 1f72fde74d720ff3a35cd6963f90256f7a7e3995ed6ee0027518972606d3583b SHA512 859339965936e8ec5f7914ea562208d0604b0ab63a83b4d6606eceda25730db7e82e32ff03a4577a06051b9d93185b60073092a29976ae32957c961f0bf40a4b WHIRLPOOL 16675f0cb4fbc94f71a0234caa3b68f3a5d74fc2633b2915b416445325dc5af129583e96e4b7048a655403d524a727f69bf45f64a9ae9a077a78835504cdf666
+MISC ChangeLog 14856 SHA256 fa11aa2c9c0a0770626173ae027e6574918f112e35d337337f99fb84b624759b SHA512 a7bfdf0ec4b972a71c186b5e949868fff3057f129fad6f084dd21a40d490defbcc8d0647d536901124d77256112a0080ea915a1dd431fd72bd99d4eed558c446 WHIRLPOOL a2182fda4ada93b87d14a7fba3e05d5c0e2dd4b400faadd3ef54400ef08a695df32e594b072c03f7b4cde34d45b0bd975814d720edfafda17cc53e8957247e09
 MISC metadata.xml 546 SHA256 76148af87ef72e06a1daae6476a80a97058f4f9e5d115c0603e156aeb3fd492d SHA512 0aab6757fb995142f0407c2b9aa35fdd7d18566541ca2dd06134451482287d0fb9b3fabf3b744644edba43d7d5b5838558c622792c041144d1b160f44cf48fb4 WHIRLPOOL a073c9fe5d73789ed6ba380b1c0337948300765d1e509f0097be34f1bdbbdebf8863608dbdfa63b0430695d9f22ae0c3b2a2513cba1520a6fc4178419854bee5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQJ8BAEBCABmBQJUym7OXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJU72UvXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOIRYQANPtaYP4HMsj7Uv+A1Du0fbk
-vhyh5wmnOkSTD/J9fOBcp10n/GPLWHJ92wlKPnLAiz435prZj5MNVkH3LBEEM0gZ
-5Nni0RV/bvvCAh5KjA5+xOsf2J9ndyC366HEJrrSFIp9zVhohHSJUHigYtuuBVGR
-OA5cYOnHFvINpk0CCEeefhukD3C/q7jTDk9OkUTJ414QDPFm/QDWVqM7/jtbfVg5
-0Atw7YFKIUCQo4FZFsc9zqvoYvPxCJtoIG5V4prxyIj2Fj7sqQZyAN0gj6+n74Qd
-LBqPZ6RwQ4WoCrFfvFUScGBhzdevn63c5unedq+vWo/lHx4WSsAKYC+Mx4iCgZJZ
-IkHnd/AW0txB2p6tbTECP5m4CF3NPEmvnyNvQRwLp7/lYlN4tMo+X384+EtNJbgE
-sKtAQz3ZLkCZ1fA8eFRyZMztaPasyUk3SLnvd3zIj+9QxQdDG6dQZnzL5kVX/66S
-YfTlq1RAlYK2QnhIat6vIXSc7AlX/89z9oYofClS2eMKNbY2M9AqxWus6uqmG1R8
-8MKCIF3DB13fTpED8Iu7utrXe864B6Qk0qFtN2+k6w2I32GkxGhIzsezDXPQG7ow
-C5egBu0IwyQRojYIBB/WLv98Z1zzgZjkxYEDTOCsbjvHBTTghFJBu5sFyHrZpkj9
-TunRKLCG0rFroHhyDaUi
-=FxN3
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZO9/AQAI/r6hqvQJf/bYXaKqJFHLrs
+ZWd7vp0es+qMNNHXVyWKSv4auqvkejh/5vvPDVqKfLj/JMzeUi6aRVlQMGWL5ryt
+fnNEj5NCZGOYkidHYAn935cRivf6/mTo9TtzPjNhmGZNqgJuY6rriXoqEdFPuHR+
+ZDEIOm27Xnm0LRiuWLpNb2UT+wlShMFv2dvIDH+ACo37g2PLq4WAAO7kPxD+ji0g
+IsOygpSarh7uB+JN2OgwJ3eX5Beb0KpwIAk2aP9EMZ/nAvtNTirxt10u+12tN+iH
+5dXV3NL0gK5fL81l7ydjEv76piuWwRbLA4JyH8w1Y28kw0zHr9Fs1aFaTc174Uyc
+OAs5PGJWf3ThhKfSTYpghfjfjZiia8+vUXb6yC/39bAU0Yy7ECblkOYthpd4vPBP
+SJkkdwF/V/3vh7ZVt8o5YzMOfunCsOApal5NIcTPDZ1USPj3P19r8OvxE31ccpzw
+gzk/kK+aMiKE/d9nFXePwrM1Y+67W6sFIChWJOrBPrTFd27vtX++xFpZi5iGtzDk
+RlYiEB/E2Jj7U9IVd1qurjFEyORX/OHIzPWtSrIitnvXYLhBkqbiD6xczN4N1vuQ
+BnFqLgm4wb+DGxKmt4np+5cm/BFD+3nH/mTJjZGQhHSrrxbdGTXzYg5hW3rZwVBg
+RWU/eB4YrlX3Fa7zcIcw
+=fq/9
 -----END PGP SIGNATURE-----
diff --git a/media-libs/gegl/gegl-0.2.0-r2.ebuild b/media-libs/gegl/gegl-0.2.0-r2.ebuild
index ed95276c762d..f60a328a89e5 100644
--- a/media-libs/gegl/gegl-0.2.0-r2.ebuild
+++ b/media-libs/gegl/gegl-0.2.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/gegl/gegl-0.2.0-r2.ebuild,v 1.14 2015/01/29 17:33:00 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/gegl/gegl-0.2.0-r2.ebuild,v 1.15 2015/02/26 18:25:41 mgorny Exp $
 
 EAPI=5
 
@@ -19,7 +19,7 @@ LICENSE="|| ( GPL-3 LGPL-3 )"
 SLOT="0"
 KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 
-IUSE="cairo debug ffmpeg jpeg jpeg2k lensfun cpu_flags_x86_mmx openexr png raw sdl cpu_flags_x86_sse svg umfpack" # +introspection vala
+IUSE="cairo debug ffmpeg jpeg jpeg2k lensfun libav cpu_flags_x86_mmx openexr png raw sdl cpu_flags_x86_sse svg umfpack" # +introspection vala
 
 RDEPEND="
 	>=media-libs/babl-0.1.10
@@ -28,7 +28,10 @@ RDEPEND="
 	x11-libs/pango
 	sys-libs/zlib
 	cairo? ( x11-libs/cairo )
-	ffmpeg? ( virtual/ffmpeg )
+	ffmpeg? (
+		libav? ( media-video/libav:0= )
+		!libav? ( media-video/ffmpeg:0= )
+	)
 	jpeg? ( virtual/jpeg )
 	jpeg2k? ( >=media-libs/jasper-1.900.1 )
 	openexr? ( media-libs/openexr )
diff --git a/media-libs/gegl/gegl-9999.ebuild b/media-libs/gegl/gegl-9999.ebuild
index d353c8360d67..3c3225b256de 100644
--- a/media-libs/gegl/gegl-9999.ebuild
+++ b/media-libs/gegl/gegl-9999.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/gegl/gegl-9999.ebuild,v 1.8 2015/01/29 17:33:00 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/gegl/gegl-9999.ebuild,v 1.9 2015/02/26 18:25:41 mgorny Exp $
 
-EAPI=4
+EAPI=5
 
 VALA_MIN_API_VERSION=0.14
 VALA_USE_DEPEND=vapigen
@@ -17,7 +17,7 @@ LICENSE="|| ( GPL-3 LGPL-3 )"
 SLOT="0"
 KEYWORDS=""
 
-IUSE="cairo debug ffmpeg introspection jpeg jpeg2k lensfun cpu_flags_x86_mmx openexr png raw sdl cpu_flags_x86_sse svg umfpack vala"
+IUSE="cairo debug ffmpeg introspection jpeg jpeg2k lensfun libav cpu_flags_x86_mmx openexr png raw sdl cpu_flags_x86_sse svg umfpack vala"
 
 RDEPEND=">=media-libs/babl-0.1.10[introspection?]
 	>=dev-libs/glib-2.28:2
@@ -25,7 +25,10 @@ RDEPEND=">=media-libs/babl-0.1.10[introspection?]
 	x11-libs/pango
 	sys-libs/zlib
 	cairo? ( x11-libs/cairo )
-	ffmpeg? ( virtual/ffmpeg )
+	ffmpeg? (
+		libav? ( media-video/libav:0= )
+		!libav? ( media-video/ffmpeg:0= )
+	)
 	jpeg? ( virtual/jpeg )
 	jpeg2k? ( >=media-libs/jasper-1.900.1 )
 	openexr? ( media-libs/openexr )