Introduce USE=libav to control the preferred implementation. Add subslot op to force...

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

diff --git a/media-video/ffmpeg2theora/ChangeLog b/media-video/ffmpeg2theora/ChangeLog
index c51810ab665772e0b9a96e54cf651f292fbb6299..c95fbdaffed41e0fc37e881a8b52966075849e81 100644 (file)
--- a/media-video/ffmpeg2theora/ChangeLog
+++ b/media-video/ffmpeg2theora/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/ffmpeg2theora
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg2theora/ChangeLog,v 1.69 2014/08/10 20:59:06 slyfox Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg2theora/ChangeLog,v 1.70 2015/02/01 23:02:10 mgorny Exp $
+
+*ffmpeg2theora-0.29-r2 (01 Feb 2015)
+
+  01 Feb 2015; Michał Górny <mgorny@gentoo.org> +ffmpeg2theora-0.29-r2.ebuild:
+  Introduce USE=libav to control the preferred implementation. Add subslot op to
+  force rebuilds on ABI change.
 
   10 Aug 2014; Sergei Trofimovich <slyfox@gentoo.org>
   ffmpeg2theora-0.29-r1.ebuild:

diff --git a/media-video/ffmpeg2theora/Manifest b/media-video/ffmpeg2theora/Manifest
index a8fa4af725c2baccef8616b38de16ac0299fedcf..3bdffdd070534665d1507317bae28b36ac7b9b85 100644 (file)
--- a/media-video/ffmpeg2theora/Manifest
+++ b/media-video/ffmpeg2theora/Manifest
@@ -6,12 +6,25 @@ AUX ffmpeg2theora-0.29-swr.patch 778 SHA256 f0e9faa4770ff965eb5a95318a3f9b52f8e6
 AUX ffmpeg2theora-0.29-underlinking.patch 503 SHA256 3b937c7e3a5afe327ee75e246ef606a747b8fb5880b43a864b3b9db4a245ef7f SHA512 a9c16e115d72400cd29c60e9893b89e37a1c4800edebc23ebd576c47b49c37ec69e31fe2de4bef50a32c1f60a1be5df5dae2b62000e8f558b30c440938652632 WHIRLPOOL e7e6d9a91e904c818514d02d12eff877d74d2960ccb201aefaff4f56de3588c7d481a8daa07da3928424d7c506561fbebd004a92b8d4a8ce873d2b8596112ec8
 DIST ffmpeg2theora-0.29.tar.bz2 90143 SHA256 214110e2a5afdd8ff8e0be18152e893dbff5dabc1ae1d1124e64d9f93eae946d SHA512 5e5cf1dbc6807a15b3a3e8526955ef341357b6a3106a6449a54b5dc09c652a9df34b5e93c9cbf05e1efad87542364cb8335e173a59a184aa2ff38ec4b536a725 WHIRLPOOL d093a0b0a5d90f6b9a3d959ff662e5e8c9f8ca36d51122f0c293d2189493bdf6daa710fa94be0fdca0d63166c3102dba82da1e533e1876e62f3ed4ec47b65bea
 EBUILD ffmpeg2theora-0.29-r1.ebuild 1260 SHA256 abd70b2b2ce16ae55a0ac29585a91651faef7a05eb4a56e996d2fa253a08517a SHA512 17f7e86dc57affdd4486f52fabd3fdc734027ead1904a69ae144d88ece82c1e7f9bccab5e9d7d631da7443d38e6b3982858086f22549ee5549677a9050dd0250 WHIRLPOOL 38eeb5342c65eb0dfad30231efc35623f9d8e70c273b9a9c25bfed888f84f432d796ddd80fce5a3b603ed785f18e12f0e4cb2bb4cae9e6106f9f756b980a1777
-MISC ChangeLog 10634 SHA256 9a14eb28b305a667225ffb3375d3e95b761218b27222dcfeaadbe07ecb44920e SHA512 7922fcf3875c358eb0cf6228415dc08b786c4217ad8ec3038453a55398e411a8baec8b299b85ca5f9b1c38fecb016c5840ae9fcd65a55c0e9cf0adf3310f26b9 WHIRLPOOL 836776003df032799121323c3a6aded44a333931b023c7c315652c09bfd6691bee703fab52ebb9ccad40735e32b397d91f8a8da07807fb793948cdffd7ae8368
+EBUILD ffmpeg2theora-0.29-r2.ebuild 1261 SHA256 b5a5df41a746fe896a47c2bf58c257c06991ad01e3a91d15dc4edc92810e3275 SHA512 fc7be3bfbb1810edb68da0bfee7d28be985b39f866bfce54f842938ec56ba2d0501b383d511bd488f3093b56715257e7917b58aac1d50d768460bbfdd34053c9 WHIRLPOOL 9188804dd8f39d4cb6c684b3c0185c18a55e6005e2463d98180772a45aa0e43e66738015f4296c9a46ffaad979e925371877053050b37ca20af53964c1d566bd
+MISC ChangeLog 10867 SHA256 c9bd9300553cca9d9388ff8a618f92eeabf6941b4992a27aae6ec5510bc9f2e2 SHA512 4383d13c2a66b99b967d0b16e933c700b82c473c6e25c7438fd76ef50bd170590f94b8e1cf934c3076811cba715dfc98c4b7529bf6f2be139e18f0d33c1f3e41 WHIRLPOOL c62f9552b90747151cbffe50123c1551691244efc58c91b73de70e717b80846bf297343c7e2ea294a910e73822d5b760dfc09700bdd4d766d02c33a71b0fa026
 MISC metadata.xml 319 SHA256 0baf3db1e97a58c0210e91be4f08d6ecd30270f6875c0b63a77deab3aa85e530 SHA512 32c75672f9052ca9341ca231961d98777d7629027da1221c042a23834ccb4bea444bc8571e6157464f53c038064e68a5c0bfcfd0c0f459cac1df67297230e403 WHIRLPOOL 41c55a833e2d927d416c3948b2ee961a116e3d68375ba07b0c459c0dc98c9a8df5dc3fb104fd6670045a52ff744d2fcf3acfc4cb64db1ebb660eddde760c551a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlPn3RsACgkQcaHudmEf86owvQCgiEP7VnRyyj394DxBf9OoGiOY
-Vg0An319KCqgGubn+S7dmsdcNYa6Ek7K
-=B2jw
+iQJ8BAEBCABmBQJUzrBzXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZO3AsP/3wa8/Cqo3Gc+/nBkynxdL3h
+IUeWoVUOJ6WCqP9RjDZ7+fV7uDGBPvcYZhMabGb14tRPmkTZD4l0pHA/De5Nz7kG
+ICLlNtD4Rv1K1bCak2CJr18z+T82ARIv2iEkzoctOrvYMLMqfRxthed4O58+z/5t
+tksSd9n0cFUvxBgrsRsnfQfdtbaRwr9dAQg7tEZ/JtRlgXWG2/FaElhFoJFI1x1z
+UcMOgDBoUbBAMFDSByYSJUFyoIPpPmcsUp6TLf1lq/J+dp+zUwDyIxWwGnFQvIJE
+UO2MHL8ri+CrZ0ZlsaUQuaPUpL+kJ2g9ply5oSm6bFFZLXr5587pU3sL1GlumJy6
+xfacj5U+WyTvPclrCcLsTQVQMI+pryuQqAWziB4kJLMa2Rcmgg12O8p859y+U8Wq
+2977cLw7eYv5Yok38X82fDxPaMom8HUNKeqdf96PR4xAmJ/aVivcdJ+3mHxLhzuz
+2L9qP/VqPxyRuIW80KgA0x2r2KxcwDTo1nrBhxubHgmL/KsPZKoNLYcvk8Tvzrdj
+0joZHGWTsZAAV6pH/9lAm5+4HhnXCte0mv/KIOTczhM//trabSK8AJh6ot3jTMvf
+gPk+j66KxTKe19RFKVI3PfuALY0qnQqs4RDZaZQZtluhHoeFEuIWVJBMEj7DcVIa
+6vN2PKhMDj4UeSfVLHy0
+=e5IE
 -----END PGP SIGNATURE-----

diff --git a/media-video/ffmpeg2theora/ffmpeg2theora-0.29-r2.ebuild b/media-video/ffmpeg2theora/ffmpeg2theora-0.29-r2.ebuild
new file mode 100644 (file)
index 0000000..ef62175
--- /dev/null
+++ b/media-video/ffmpeg2theora/ffmpeg2theora-0.29-r2.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg2theora/ffmpeg2theora-0.29-r2.ebuild,v 1.1 2015/02/01 23:02:10 mgorny Exp $
+
+EAPI=5
+inherit eutils toolchain-funcs scons-utils
+
+DESCRIPTION="A simple converter to create Ogg Theora files"
+HOMEPAGE="http://www.v2v.cc/~j/ffmpeg2theora/"
+SRC_URI="http://www.v2v.cc/~j/${PN}/downloads/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="kate libav"
+
+RDEPEND="
+       !libav? ( media-video/ffmpeg:0= )
+       libav? ( media-libs/libpostproc:0=
+               media-video/libav:0= )
+       >=media-libs/libvorbis-1.1
+       >=media-libs/libogg-1.1
+       >=media-libs/libtheora-1.1[encode]
+       kate? ( >=media-libs/libkate-0.3.7 )"
+DEPEND="${RDEPEND}
+       virtual/pkgconfig"
+
+src_prepare() {
+       epatch \
+               "${FILESDIR}"/${P}-swr.patch \
+               "${FILESDIR}"/${P}-ffmpeg2.patch \
+               "${FILESDIR}"/${P}-underlinking.patch
+}
+
+src_configure() {
+       myesconsargs=(
+               APPEND_CCFLAGS="${CFLAGS}"
+               APPEND_LINKFLAGS="${LDFLAGS}"
+               prefix=/usr
+               mandir=PREFIX/share/man
+               libkate=$(usex kate 1 0)
+               )
+}
+
+src_compile() {
+       escons
+}
+
+src_install() {
+       escons destdir="${D}" install
+       dodoc AUTHORS ChangeLog README subtitles.txt TODO
+}