force libcdio update to shutup repoman warning

Signed-off-by: aballier@gentoo.org
Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0x160F534A

diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog
index 584d3ce11c10cfe8007edd754077d051874d49ae..807c504688163a47cd3f24b871b1ddc9bc655765 100644 (file)
--- a/media-video/ffmpeg/ChangeLog
+++ b/media-video/ffmpeg/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/ffmpeg
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.840 2015/03/05 13:57:08 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.841 2015/03/05 14:00:41 aballier Exp $
+
+  05 Mar 2015; Alexis Ballier <aballier@gentoo.org> ffmpeg-1.0.10.ebuild,
+  ffmpeg-1.2.12.ebuild, ffmpeg-1.2.6-r1.ebuild, ffmpeg-2.2.13.ebuild:
+  force libcdio update to shutup repoman warning
 
   05 Mar 2015; Alexis Ballier <aballier@gentoo.org> ffmpeg-0.10.15.ebuild,
   ffmpeg-1.0.10.ebuild, ffmpeg-1.2.12.ebuild, ffmpeg-1.2.6-r1.ebuild,

diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index d59f38b1176833fe905162201663cb26bcc66d65..fab4bbbd3689a2474a431ab9e4957f52d98e6ddf 100644 (file)
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -13,19 +13,19 @@ DIST ffmpeg-1.2.6.tar.bz2 5970714 SHA256 29d454de3458cf327df246cc2a2ef0fa09cb88a
 DIST ffmpeg-2.2.13.tar.bz2 7032709 SHA256 80064c03e5fbefba6a5885ea9a090c2d671c17c50978bf087979c4ce9d436aef SHA512 8a09a29b55d8d906e2bf39e9306922d5bf2144f67d86ff8e8a645094a12976657525ac84eacb427a11ef738121ee94ada037629521daf0cc31b4ef9c0fd05cbc WHIRLPOOL da0160efb41e3a597508dd8fcb1ffc4008917a63fd18747e870c546a3fde907cd058219ff82b980d26346fe5dd36fff65e31b87e94351e829a7802897584d22c
 DIST ffmpeg-2.5.4.tar.bz2 7677320 SHA256 cc91c166c2b0ad9aacc533e4d5637912df583b43834c68aeec12ded7e082a286 SHA512 696f9f9b7f8329aaea8fb50ac230edd2f310e185103c190d7fca8940890be9562a8559ebe504d1bf2bc7c0df45020ad80ab6be6d80ddd06747ef76a77287befc WHIRLPOOL 876ecc5aa5499b1d5abd98b37ab309bf101fa975162455cac5a0378e04e424cd288c3cddbae64b2748c4609a2130eee0103cbbb795bd8434ff13739b9c0f4a6a
 EBUILD ffmpeg-0.10.15.ebuild 10077 SHA256 931e079343ebcaa174671ee88901c4af18bdb7ab5c17138cbce0c21e6d174eb5 SHA512 54f8dfef0a0b3b0142073e3a18dd104ea4f1cc2b1edfd82452a580cb16ac5743986279c41cff72b0e4116a13b190e620e61665caf40e94720b6beb5468e24485 WHIRLPOOL 35fffb744c2f30a3208438d54d2528301a2eb51edbee1c65d59e82f981b5eae1ad689b97020300331f0814b7183e400313f6ec9cbbdaf062b64798cd1fb70dd5
-EBUILD ffmpeg-1.0.10.ebuild 9809 SHA256 08dcc5175eb80c4c31ebfb93799f1d66bd05f3d5fd5457b81b3d3dc9b40063e6 SHA512 bc17b10346f7fa64e7d68420638989bb519d2d644f36fe5566ea68eaf4cf154c40ec88604c6078bb81883cd54cc4ed22c4fef09de75ec77f11ee3ad05065a11f WHIRLPOOL 2cc03adae8d8cba69ea0d224035f36a3457e6547dd7258ad335bc1791678b19a894f4ac0e7e759fcceea7f9f151393ce913b561a335b8a911c1bf1e7521c7691
-EBUILD ffmpeg-1.2.12.ebuild 11076 SHA256 f95d0c82b4b2483805d0ee11025ac908ba73206b18c79aa6a72691ebffd3cc89 SHA512 990a4afb780294a0894a3790a7a4de3c0421337e46457ac7988ff8dfdbd8ec4e4fb43929faa4fa968c3859e1b0f37c94c98aabae452982bab5b100af8270ee30 WHIRLPOOL afdd09e9338e5c3385f92b2ad5fa0eb0c1aa8824ee242d36bf90d29442c29ec7d86f04fadc137aa1d3cc0e6d0dde25ade4f1182914826ea0f1a495b728e6bdd4
-EBUILD ffmpeg-1.2.6-r1.ebuild 11119 SHA256 df3be2b558677b0de3bb7bdf6eb214454bde01af34542cb500ddefda9246701f SHA512 86989e2047e0e5d9d958628703aa72b6510cd6d76d3eac078c6df7c5dbe3d6345cd0bb042bd58ffb39b0b27785507727213bbe7feb9e2572370cd3305cda39d6 WHIRLPOOL c31eae12caaddf59c63be3fc6f016fe5a5dd0af04aec9375d2b4bab8cacfbf028fb4d785e1009339ba5654a67b17e069b14a62e144b16172d9ee714d3408862c
-EBUILD ffmpeg-2.2.13.ebuild 12772 SHA256 47d76ff66320c447e15cee587f6d5f865040b3b08fc9992965676252247b6b6e SHA512 1556b8fbc102d27214ee1cea9bdcbe81f3fbdb7e8ac4181ea42d3d2ce4df03e923615f949252e9e48d89b719e665d2705fece4a6cad0170145785126c52a6a57 WHIRLPOOL 3ceff2d0671c09a916449bb055c24968593a6f01b1d18ac3e2be6de98eca718bb7330e5671494f88b781ffd714acd7d440e23618b5c982bb3561a0db50a26da4
+EBUILD ffmpeg-1.0.10.ebuild 9713 SHA256 6d6ae75be2af88b036b9dff32a15ea2ccea74f02404f22c187de5c1cf0bfb400 SHA512 253a4bfba29398cd1fba6ac6e0f8b6fc5416fd9d86116a4f17af36ee7a50aa5767fa917ecf6f300ad01bef8b8bc58e37582cfedfe94820abd093c26a7f405127 WHIRLPOOL aa180cd1b8ee1d5ff373b02cb942c252daaf05fd4f5ad41155014c6752766ac7f3ad98381435b7999596f06249b64f41ad2955bb1856ece1c6cf88fb96c185f7
+EBUILD ffmpeg-1.2.12.ebuild 11006 SHA256 13469cba576174cfb78737018e18444f9b5ffb5ff963a6a84a67856aeda995d2 SHA512 4680ce2f34e946fffd588133eacbf341e08fd6954b249a50488a7b262d66ef87fa4e830ada253a9db731557fbcbc65b6f08b974a2b50b41c459918aa4b2a8e21 WHIRLPOOL 7142e4fe36428f6561b42da91471cd5f11c9978b0c27d59746371d746961280c1739b2840cbf9577f3808d8f6d8a80f4d42c29ca197c506b613624a34a6be318
+EBUILD ffmpeg-1.2.6-r1.ebuild 11049 SHA256 88d7665d4e89c851182da15a4b4345ff2b037fd26dad1b2e8b18795cc2a5dd02 SHA512 81aa531007bc9d981b32337a25db8b76770a415347b42885e88e6c330c089f2de84cc671783542a8d1c2b4cf59f3a4bf4520a7a0b2ed9c96528a5ea36fc80aeb WHIRLPOOL 830702c5a1f586a7cf655a0e804d4b60375a8bd41048a7dd0b05657459c66f5e2711fc1e6c712e16cdf073a4a5026a74776014e17d61fdf4ded7c22d98b5f0e3
+EBUILD ffmpeg-2.2.13.ebuild 12702 SHA256 ddcc876c3795142c8d318b657dfbb8a63d1e75d2ccf65a05bf59b362c3bde890 SHA512 e99cd9c6804a84f8d854bc7936a56aa43ae127837cbdc34f99f3a412512b13e055067704417ddd22a35c031301913fce39f0c1e0b32ccf402fb9194e0f24e697 WHIRLPOOL 1c28ca2a556487b60a25c6d07119c49992dde03dbb3201964cc736249b932c81b5987a1c96f8931e1ecd298484f13ffb00f7b7b54906fcadbef8e667aa9b777b
 EBUILD ffmpeg-2.5.4.ebuild 13199 SHA256 49c1163f77e32b3c525cb7b2952360797c27c2a9749553c181b318a7414e112a SHA512 cb7aa5bb56319ffc8affb672cf4fb4269ce97abaf9be9ff548c5726b7075918bce9de5bf6c5755a8d21e92209c5ba0ba1e4774b5a85e403b3af0e84448fe5e61 WHIRLPOOL c29ada17be4a3c2492bd065e458e38f0b1e4ce6605286016056d31532f8954bdd4829775dda2e0e8efdfa5ab0e7386b64139b7374afceb1e2a1ed8ac68989c87
 EBUILD ffmpeg-9999.ebuild 14658 SHA256 dffb9fc5e822ce58c2bb8f802eb700c8db684d4cccaa29717471acc75cb9286a SHA512 805c788c25a2690c7658b13a9d8c58e180b3c223481b44ca2838b3776bf568cfe9bad72d86a1e3c63b8011a5f29626b1431d6b3a9e06fc9780c06839a83f15c4 WHIRLPOOL c4e374bc75eefc249a570aec137d6fb4b430118286fb2961e43e2c5d607fa6f817e75b594d0f4ca85391e09e7fc9391d1496f2124fffc7184765d2acd3f15647
-MISC ChangeLog 3276 SHA256 ce38077d40e2eb0f9203fa427fac440e2e6ed56d0dbfeae9c1813098d382cd52 SHA512 cb409e09c1940fddfeb1178852f4e266cb8396077d0a5314ae12e2031564b07dfb23ffeb4282bec9b92c2f5f51aa656f0d7550d481642b9552f97605d3c561a2 WHIRLPOOL 2dc14347a51548cf60e0cca8da18897b788b7717919f801575f814fc4b1a806b3b4d098055195fd25cded5609d924978d1bbb76308ad5170eed3c92a38a253b6
+MISC ChangeLog 3470 SHA256 1db4e65725974ec8650128eecbbaf5fc94e53f69f70ad87fac8b5702b694755e SHA512 11187d2b91c695f19e9a9b338f983fc7de5feb975a11e5b902c82d91967b1b681b3823db50a104b5f9f28f986bb207bb7003212105f5f481b7358e1c735f23a9 WHIRLPOOL d7eababd9eca2b7c566b79b2d43ea788c3aa4055cf4b849a0cdebdd3a46f53cb09a4466a6a03249a8230d2ab22c9742386ca80a43e5c3681baaa3e8512ed42de
 MISC ChangeLog-2014 113291 SHA256 4c06c33d7ce130dbe891dac8bbed5394756966a4317815651276b5354aa943ca SHA512 1bd9eb77e715e26a406bf58a543987caf24051dec4f7fd928f6d03af41bf4d952dcdda7c6237cb2ffb9517f04adb9f8fcaac91087fcc758c0836c754050c5ae9 WHIRLPOOL 99024abbc682eee208a9086d0a5450a8855b18a6e20e51e0a19403c0669420e8448b1fd20d5d7558c51c1cc661eb6d3d18623b1dfc42cba9c5fed64f7822b701
 MISC metadata.xml 4332 SHA256 b39edc51a5c5d68aefb52639412045287dbd670ab5b43a45b13c2c99d085f9a4 SHA512 0744c75f388ae01989b62cc34c49a665fc19dd8b0639c846a16c84a8db06a9cc571c2952df63857dac15bffca6975a0c872ea59c4f490639655f4eddd1b04ccb WHIRLPOOL ce3593918d35986256ee057520e69ebde51e4201e1d20e66f0367d7bf45e5a1a7301b5c7fa02ec327273702e426a2876a81e381c4af78251e729b2982abb41ad
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlT4YLYACgkQvFcC4BYPU0pOwQCeKnkQIfazHq7cd9nclzNHlkek
-SLgAoLWViLAUpyOlm9R53qJnplbV6GWz
-=q7p8
+iEYEAREIAAYFAlT4YYwACgkQvFcC4BYPU0qoZgCcCcsxKH5m0Ur+5LC5iDFoPzAx
+GrEAoMKguKXPkxNP11r6vyKO7zbYlVfC
+=0FIu
 -----END PGP SIGNATURE-----

diff --git a/media-video/ffmpeg/ffmpeg-1.0.10.ebuild b/media-video/ffmpeg/ffmpeg-1.0.10.ebuild
index 3df45279941bbe46382a8ba641684565b706ed3d..5369f2803180cdd2dcabe0d986836ea994315a4d 100644 (file)
--- a/media-video/ffmpeg/ffmpeg-1.0.10.ebuild
+++ b/media-video/ffmpeg/ffmpeg-1.0.10.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-video/ffmpeg/ffmpeg-1.0.10.ebuild,v 1.4 2015/03/05 13:57:08 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-1.0.10.ebuild,v 1.5 2015/03/05 14:00:41 aballier Exp $
 
 EAPI="4"
 
@@ -56,7 +56,7 @@ RDEPEND="
        amr? ( media-libs/opencore-amr )
        bluray? ( media-libs/libbluray )
        bzip2? ( app-arch/bzip2 )
-       cdio? ( || ( dev-libs/libcdio-paranoia <dev-libs/libcdio-0.90[-minimal] ) )
+       cdio? ( dev-libs/libcdio-paranoia )
        celt? ( >=media-libs/celt-0.11.1 )
        encode? (
                aac? ( media-libs/vo-aacenc )
@@ -130,12 +130,10 @@ src_prepare() {
                export revision=git-N-${FFMPEG_REVISION}
        fi
 
-       if has_version dev-libs/libcdio-paranoia; then
-               sed -i \
-                       -e 's:cdio/cdda.h:cdio/paranoia/cdda.h:' \
-                       -e 's:cdio/paranoia.h:cdio/paranoia/paranoia.h:' \
-                       configure libavdevice/libcdio.c || die
-       fi
+       sed -i \
+               -e 's:cdio/cdda.h:cdio/paranoia/cdda.h:' \
+               -e 's:cdio/paranoia.h:cdio/paranoia/paranoia.h:' \
+               configure libavdevice/libcdio.c || die
 
        epatch "${FILESDIR}"/${PN}-1.0.8-freetype251.patch
 }

diff --git a/media-video/ffmpeg/ffmpeg-1.2.12.ebuild b/media-video/ffmpeg/ffmpeg-1.2.12.ebuild
index 51edfd43a632a916da13c93bcf78baabceb5ef31..3267e703107ab47c5a78beb7cb458e105ceab77b 100644 (file)
--- a/media-video/ffmpeg/ffmpeg-1.2.12.ebuild
+++ b/media-video/ffmpeg/ffmpeg-1.2.12.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-video/ffmpeg/ffmpeg-1.2.12.ebuild,v 1.2 2015/03/05 13:57:08 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-1.2.12.ebuild,v 1.3 2015/03/05 14:00:41 aballier Exp $
 
 EAPI="4"
 
@@ -56,12 +56,7 @@ RDEPEND="
        amr? ( >=media-libs/opencore-amr-0.1.3-r1[${MULTILIB_USEDEP}] )
        bluray? ( >=media-libs/libbluray-0.3.0-r1[${MULTILIB_USEDEP}] )
        bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
-       cdio? (
-               || (
-                       >=dev-libs/libcdio-paranoia-0.90_p1-r1[${MULTILIB_USEDEP}]
-                       <dev-libs/libcdio-0.90[-minimal,${MULTILIB_USEDEP}]
-               )
-       )
+       cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[${MULTILIB_USEDEP}] )
        celt? ( >=media-libs/celt-0.11.1-r1[${MULTILIB_USEDEP}] )
        encode? (
                aac? ( >=media-libs/vo-aacenc-0.1.3[${MULTILIB_USEDEP}] )

diff --git a/media-video/ffmpeg/ffmpeg-1.2.6-r1.ebuild b/media-video/ffmpeg/ffmpeg-1.2.6-r1.ebuild
index c86ad60210bdb78d186967be4f0004f5aed06ae6..eede16e6085c11459ce7d6b351cd4be8c5d7ac36 100644 (file)
--- a/media-video/ffmpeg/ffmpeg-1.2.6-r1.ebuild
+++ b/media-video/ffmpeg/ffmpeg-1.2.6-r1.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-video/ffmpeg/ffmpeg-1.2.6-r1.ebuild,v 1.16 2015/03/05 13:57:08 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-1.2.6-r1.ebuild,v 1.17 2015/03/05 14:00:41 aballier Exp $
 
 EAPI="4"
 
@@ -56,12 +56,7 @@ RDEPEND="
        amr? ( >=media-libs/opencore-amr-0.1.3-r1[${MULTILIB_USEDEP}] )
        bluray? ( >=media-libs/libbluray-0.3.0-r1[${MULTILIB_USEDEP}] )
        bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
-       cdio? (
-               || (
-                       >=dev-libs/libcdio-paranoia-0.90_p1-r1[${MULTILIB_USEDEP}]
-                       <dev-libs/libcdio-0.90[-minimal,${MULTILIB_USEDEP}]
-               )
-       )
+       cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[${MULTILIB_USEDEP}] )
        celt? ( >=media-libs/celt-0.11.1-r1[${MULTILIB_USEDEP}] )
        encode? (
                aac? ( >=media-libs/vo-aacenc-0.1.3[${MULTILIB_USEDEP}] )

diff --git a/media-video/ffmpeg/ffmpeg-2.2.13.ebuild b/media-video/ffmpeg/ffmpeg-2.2.13.ebuild
index bab77faa341b1c6bc458cd7252756f79d8a28301..e964be5673e916292b1860db52e42da50a89f824 100644 (file)
--- a/media-video/ffmpeg/ffmpeg-2.2.13.ebuild
+++ b/media-video/ffmpeg/ffmpeg-2.2.13.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-video/ffmpeg/ffmpeg-2.2.13.ebuild,v 1.2 2015/03/05 13:57:08 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-2.2.13.ebuild,v 1.3 2015/03/05 14:00:41 aballier Exp $
 
 EAPI="5"
 
@@ -78,12 +78,7 @@ RDEPEND="
        amr? ( >=media-libs/opencore-amr-0.1.3-r1[${MULTILIB_USEDEP}] )
        bluray? ( >=media-libs/libbluray-0.3.0-r1[${MULTILIB_USEDEP}] )
        bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
-       cdio? (
-               || (
-                       >=dev-libs/libcdio-paranoia-0.90_p1-r1[${MULTILIB_USEDEP}]
-                       <dev-libs/libcdio-0.90[-minimal,${MULTILIB_USEDEP}]
-               )
-       )
+       cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[${MULTILIB_USEDEP}] )
        celt? ( >=media-libs/celt-0.11.1-r1[${MULTILIB_USEDEP}] )
        encode? (
                aac? ( >=media-libs/vo-aacenc-0.1.3[${MULTILIB_USEDEP}] )