emul-linux-x86-medialibs: Version bump.

Sync with main tree and remove old ebuilds.

diff --git a/app-emulation/emul-linux-x86-medialibs/Manifest b/app-emulation/emul-linux-x86-medialibs/Manifest
index fa23021f25622bf608d4b40c1eded2e63e2bfab3..0ce5b8a2c4c8427811c8c456843c909a7b5f4447 100644 (file)
--- a/app-emulation/emul-linux-x86-medialibs/Manifest
+++ b/app-emulation/emul-linux-x86-medialibs/Manifest
@@ -1,4 +1,6 @@
-DIST emul-linux-x86-medialibs-20130224.tar.xz 10416488 SHA256 a23696b51754cb838227bf24c81a785b980ad8b492a58b80623004d4634d2ed1 SHA512 56a17ec80c583f10e6754ce0101182d2d6895637b09cb3c3963663b8d3387f86de9d7ba07a7a880c22007ebc42dcfde2f63318a487825b38f4b1d1f1b15041a3 WHIRLPOOL 5d18b4fba7f24ea5fc6b212e2d67b04bfee3a8d80de11c5a53d7c684c94b0227b644e8b3f5ae420fbdd3e0b91fa818be757bb0ddbd7858d0eff1902e23d74f57
 DIST emul-linux-x86-medialibs-20131008.tar.xz 11003172 SHA256 7b888139809e8240ecfb0cbcaf060b83d49152e72392e0819d30004e7c6111b0 SHA512 721f2e4122dc749596618df41542abde1ce798e83cc93cefbaa053f3561238d026af9a0b6e7bd430c18808b443a836682f3e629559aee76a8a57229f66782924 WHIRLPOOL d5fde9322c3fe4b8fd3be95a7db32178945ddf54d579b5862d5f18b09d2d958169857559554d481177592a710621f7e0c1bc91512b54b5be0415e719d644fb50
-EBUILD emul-linux-x86-medialibs-20130224.ebuild 886 SHA256 b3c055fb8e64ac44c10a6bcc1755005b19d875daadac4e0c5603e6140b1da3ee SHA512 0cca511a7738a784dff82f7445dac8135e6e676fb4e16534057c4bd5b0938aa12a877566b0141967facbae02f9c716b5dff0ee39c1510fbaecefdb6534376b84 WHIRLPOOL 82ecef1df4b02bd0cc59a413451f13e7531d7f0b9e8e3bae97b0bf6b6d40348ebe8d889241ad10dc8792c0666e03f480c70c11b030ba95a2ac2021f943f7b35a
-EBUILD emul-linux-x86-medialibs-20131008-r1.ebuild 2557 SHA256 d80a6b3e6362f00f645d58faddba96d58e53ef7d520e35f7aa113f010ea3e334 SHA512 320ca1d04b828b61ad32a9b51bcb105f767ccb0f40903466c3e8aa6715ce99119bd55734b586d798743efbdf6769c70af1a9e5bb5b234b3dcfd7ad665cb0dfa0 WHIRLPOOL c39b8e2c283085d38c0fffc7e7d4e1593a25e7b60fc0860c27ba3fdcdeae47483bfe8e19191b0f6036b5c397d03dddc5bceaa817203348f876bf1e021e017a2b
+DIST emul-linux-x86-medialibs-20140406.tar.xz 11406932 SHA256 b2f4634137492cc6782e1064baf485a24fdc511a5f0658e592fc992e1cf6fa7a SHA512 4f89b9f59d897b10935789ef012b031446d9cc6bc8c35404f9b4c41f12ee278619ec25b1457057cfacca62fa258f20e538c254d79662807e64818290274bb49b WHIRLPOOL 4001a9ebc93083cdfe5cdb594d0f2fa875b6ac3852d948ada9e96a16a099a951c8cdc8e5536570b91791af3c6d41278cbeaf004fc235f2dcd94081bc5f569950
+DIST emul-linux-x86-medialibs-20140508.tar.xz 11322988 SHA256 bb7057b107997ba72d49f93f4284a238121394d3fbb807cc8e48a7191cda8039 SHA512 81e538284a6d821d72d7fef552e24162398109d91306b9a25f4ece0d55064acd6bd3c1b3e83cd22c34a7c55ab2fac149dde60223102627c725d8995f040534f8 WHIRLPOOL 1231d3ae390835f847064a86676cb2c6ae38a6d4961050b1cf2324e8be2ac487f1f33e98111caf3610067d612c7b9076d8965e1dd298dede5955baa505582a39
+EBUILD emul-linux-x86-medialibs-20131008-r1.ebuild 2552 SHA256 dafbab126747f91441b7c2a5c19a72d04576d3430b09c57aaad7205c0d19aa2f SHA512 7ffda8a5e82975916d5a9c3d75bd105938614024fcef73ee6cfde7305e84f1e858aee5eeebba595e85fb3efdbd4bdb043b235a61a984b00f6553aa2ded48363e WHIRLPOOL c55cc328c369d2839f55265570cc0e6570b01c5cf22bb39daeca2948653bf973e8829fa5b40ec0849cf4997a9209d61c89d1efe1b25c2e8956554a4df2d603bf
+EBUILD emul-linux-x86-medialibs-20140406.ebuild 2546 SHA256 3ad4cfa2790e2a520d5a7f18d5ab86d5f0bc8e913491d0aaea48e5df2af7e094 SHA512 247b9038ae83c70bf714021e33606e6f465b5b4fec800ba3404078e47899e0e8e905f5baa085188c51568f13c1c8685221b51538f5bbd66df342180844ce7463 WHIRLPOOL a79cf3ff317734c89f11e3a60f7a2e022a9a4df8bf9019e4baaf04d6007c9bf69189abf76f1a865f4efe90e8e28af6a1b951f5f2278c01c7a1fd9962c6bbbd46
+EBUILD emul-linux-x86-medialibs-20140508-r6.ebuild 3391 SHA256 d5620154506707d10db034ff11cb579c5caf1cdd88f4639a702f5e38b128f1cf SHA512 a8a99aae3d578da69045f6b73e13688ec8dc57e5d791297ef048bf6dbac7696ace2392e60c20048d3cd3daa0b917e94cdbf0bf655bcb13a6e260ce3ba010b151 WHIRLPOOL 206492c61730e564fb96785e90891f77f3eecf5d73d9b58dfa8f4fd617209ea1eab30978d7e519fedc8b06b0ac6a8af83a9fcd1c6194b47b4d695c110b6228bb

diff --git a/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-20130224.ebuild b/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-20130224.ebuild
deleted file mode 100644 (file)
index 0592962..0000000
--- a/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-20130224.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-20130224.ebuild,v 1.1 2013/02/25 18:44:44 pacho Exp $
-
-EAPI=5
-inherit emul-linux-x86
-
-LICENSE="APL-1.0 GPL-2 BSD BSD-2 public-domain LGPL-2 MPL-1.1 LGPL-2.1"
-KEYWORDS="-* amd64"
-
-DEPEND=""
-RDEPEND="~app-emulation/emul-linux-x86-baselibs-${PV}
-       ~app-emulation/emul-linux-x86-xlibs-${PV}
-       ~app-emulation/emul-linux-x86-db-${PV}
-       !<=app-emulation/emul-linux-x86-sdl-20081109
-       !<=app-emulation/emul-linux-x86-soundlibs-20110101"
-PDEPEND="~app-emulation/emul-linux-x86-soundlibs-${PV}"
-
-src_prepare() {
-       # Strip out non-free FAAC bits.
-       find "${S}" -name 'libfaac*' -exec rm {} +
-
-       # Include all libv4l libs, bug #348277
-       ALLOWED="${S}/usr/lib32/libv4l/"
-       emul-linux-x86_src_prepare
-}

diff --git a/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-20131008-r1.ebuild b/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-20131008-r1.ebuild
index c548e2cedfcedffe6b854dfeb49035f86d36e3e7..d26e1582c0e117ea4d29aff95484fc771de7e48a 100644 (file)
--- a/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-20131008-r1.ebuild
+++ b/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-20131008-r1.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-20131008-r1.ebuild,v 1.1 2013/10/09 07:14:33 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-20131008-r1.ebuild,v 1.2 2013/11/22 19:32:16 pacho Exp $
 
 EAPI=5
 inherit emul-linux-x86
 
 LICENSE="APL-1.0 GPL-2 BSD BSD-2 public-domain LGPL-2 MPL-1.1 LGPL-2.1"
-KEYWORDS="-* ~amd64"
+KEYWORDS="-* amd64"
 IUSE="abi_x86_32"
 
 DEPEND=""

diff --git a/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-20140406.ebuild b/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-20140406.ebuild
new file mode 100644 (file)
index 0000000..1c26bb3
--- /dev/null
+++ b/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-20140406.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-20140406.ebuild,v 1.3 2014/05/04 12:23:03 pacho Exp $
+
+EAPI=5
+inherit emul-linux-x86
+
+LICENSE="APL-1.0 GPL-2 BSD BSD-2 public-domain LGPL-2 MPL-1.1 LGPL-2.1"
+KEYWORDS="-* amd64"
+IUSE="abi_x86_32"
+
+DEPEND=""
+RDEPEND="~app-emulation/emul-linux-x86-baselibs-${PV}
+       ~app-emulation/emul-linux-x86-xlibs-${PV}
+       ~app-emulation/emul-linux-x86-db-${PV}
+       !<=app-emulation/emul-linux-x86-sdl-20081109
+       !<=app-emulation/emul-linux-x86-soundlibs-20110101
+       abi_x86_32? (
+               >=media-libs/libvpx-1.2.0_pre[abi_x86_32(-)]
+               >=media-libs/xvid-1.3.2-r1[abi_x86_32(-)]
+               >=media-sound/lame-3.99.5-r1[abi_x86_32(-)]
+               >=media-libs/faac-1.28-r4[abi_x86_32(-)]
+               >=media-libs/faad2-2.7-r3[abi_x86_32(-)]
+               >=media-libs/libtheora-1.1.1-r1[abi_x86_32(-)]
+               >=media-libs/libcuefile-477-r1[abi_x86_32(-)]
+               >=media-libs/libreplaygain-477-r1[abi_x86_32(-)]
+               >=media-libs/libmad-0.15.1b-r8[abi_x86_32(-)]
+               >=media-libs/libdca-0.0.5-r3[abi_x86_32(-)]
+               >=media-libs/speex-1.2_rc1-r2[abi_x86_32(-)]
+               >=media-libs/libdvdread-4.2.0-r1[abi_x86_32(-)]
+               >=media-libs/libdvdnav-4.2.0-r1[abi_x86_32(-)]
+               >=media-libs/libv4l-0.9.5-r1[abi_x86_32(-)]
+               >=media-libs/libid3tag-0.15.1b-r4[abi_x86_32(-)]
+               >=media-libs/libshout-2.3.1-r1[abi_x86_32(-)]
+               >=media-libs/libsidplay-2.1.1-r3:2[abi_x86_32(-)]
+               >=media-libs/libsidplay-1.36.59-r1:1[abi_x86_32(-)]
+               >=media-libs/x264-0.0.20130731[abi_x86_32(-)]
+               >=media-libs/libiec61883-1.2.0-r1[abi_x86_32(-)]
+               >=media-libs/a52dec-0.7.4-r7[abi_x86_32(-)]
+               >=media-libs/libmimic-1.0.4-r2[abi_x86_32(-)]
+               >=media-libs/libmms-0.6.2-r1[abi_x86_32(-)]
+               >=media-libs/libvisual-0.4.0-r3:0.4[abi_x86_32(-)]
+               >=media-libs/libmpeg2-0.5.1-r2[abi_x86_32(-)]
+               >=dev-libs/liboil-0.3.17-r2[abi_x86_32(-)]
+               >=sys-libs/libieee1284-0.2.11-r3[abi_x86_32(-)]
+               >=dev-libs/fribidi-0.19.5-r2[abi_x86_32(-)]
+               >=dev-libs/libcdio-0.92[abi_x86_32(-)]
+               >=dev-libs/libcdio-paranoia-0.90_p1-r1[abi_x86_32(-)]
+               >=media-video/ffmpeg-0.10.8:0.10[abi_x86_32(-)]
+               >=media-libs/libdv-1.0.0-r3[abi_x86_32(-)]
+       )
+       "
+PDEPEND="~app-emulation/emul-linux-x86-soundlibs-${PV}"
+
+src_prepare() {
+       # Strip out non-free FAAC bits.
+       find "${S}" -name 'libfaac*' -exec rm {} +
+
+       # Include all libv4l libs, bug #348277
+       ALLOWED="${S}/usr/lib32/libv4l/"
+       emul-linux-x86_src_prepare
+
+       # Remove migrated stuff.
+       use abi_x86_32 && rm -f $(cat "${FILESDIR}/remove-native")
+}

diff --git a/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-20140508-r6.ebuild b/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-20140508-r6.ebuild
new file mode 100644 (file)
index 0000000..3f47348
--- /dev/null
+++ b/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-20140508-r6.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-20140508-r6.ebuild,v 1.5 2014/06/19 09:03:03 mgorny Exp $
+
+EAPI=5
+inherit emul-linux-x86
+
+LICENSE="APL-1.0 GPL-2 BSD BSD-2 public-domain LGPL-2 MPL-1.1 LGPL-2.1"
+KEYWORDS="-* amd64"
+IUSE="abi_x86_32"
+
+DEPEND=""
+# required libs
+RDEPEND="
+       !abi_x86_32? (
+               ~app-emulation/emul-linux-x86-baselibs-${PV}
+               ~app-emulation/emul-linux-x86-xlibs-${PV}
+               ~app-emulation/emul-linux-x86-db-${PV}
+       )
+       abi_x86_32? (
+               >=media-libs/freetype-2.5.0.1[abi_x86_32(-)]
+               >=media-libs/libpng-1.2.51[abi_x86_32(-)]
+               >=virtual/jpeg-62:62[abi_x86_32(-)]
+               >=x11-libs/libX11-1.6.2[abi_x86_32(-)]
+               >=x11-libs/libXext-1.3.2[abi_x86_32(-)]
+       )
+       !<=app-emulation/emul-linux-x86-sdl-20081109
+       !<=app-emulation/emul-linux-x86-soundlibs-20110101"
+
+# supplied libs
+RDEPEND="${RDEPEND}
+       abi_x86_32? (
+               >=media-libs/libvpx-1.2.0_pre20130625[abi_x86_32(-)]
+               >=media-libs/xvid-1.3.2-r1[abi_x86_32(-)]
+               >=media-sound/lame-3.99.5-r1[abi_x86_32(-)]
+               >=media-libs/faac-1.28-r4[abi_x86_32(-)]
+               >=media-libs/faad2-2.7-r3[abi_x86_32(-)]
+               >=media-libs/libtheora-1.1.1-r1[abi_x86_32(-)]
+               >=media-libs/libcuefile-477-r1[abi_x86_32(-)]
+               >=media-libs/libreplaygain-477-r1[abi_x86_32(-)]
+               >=media-libs/libmad-0.15.1b-r8[abi_x86_32(-)]
+               >=media-libs/libdca-0.0.5-r3[abi_x86_32(-)]
+               >=media-libs/speex-1.2_rc1-r2[abi_x86_32(-)]
+               >=media-libs/libdvdread-4.2.0-r1[abi_x86_32(-)]
+               >=media-libs/libdvdnav-4.2.0-r1[abi_x86_32(-)]
+               >=media-libs/libv4l-0.9.5-r1[abi_x86_32(-)]
+               >=media-libs/libid3tag-0.15.1b-r4[abi_x86_32(-)]
+               >=media-libs/libshout-2.3.1-r1[abi_x86_32(-)]
+               >=media-libs/libsidplay-2.1.1-r4:2[abi_x86_32(-)]
+               >=media-libs/libsidplay-1.36.59-r1:1[abi_x86_32(-)]
+               >=media-libs/x264-0.0.20130731[abi_x86_32(-)]
+               >=media-libs/libiec61883-1.2.0-r1[abi_x86_32(-)]
+               >=media-libs/a52dec-0.7.4-r7[abi_x86_32(-)]
+               >=media-libs/libmimic-1.0.4-r2[abi_x86_32(-)]
+               >=media-libs/libmms-0.6.2-r1[abi_x86_32(-)]
+               >=media-libs/libvisual-0.4.0-r3:0.4[abi_x86_32(-)]
+               >=media-libs/libmpeg2-0.5.1-r2[abi_x86_32(-)]
+               >=dev-libs/liboil-0.3.17-r2[abi_x86_32(-)]
+               >=sys-libs/libieee1284-0.2.11-r3[abi_x86_32(-)]
+               >=dev-libs/fribidi-0.19.5-r2[abi_x86_32(-)]
+               >=dev-libs/libcdio-0.92[abi_x86_32(-)]
+               >=dev-libs/libcdio-paranoia-0.90_p1-r1[abi_x86_32(-)]
+               >=media-libs/libdv-1.0.0-r3[abi_x86_32(-)]
+               >=media-libs/libgphoto2-2.5.4-r1[abi_x86_32(-)]
+               >=media-gfx/sane-backends-1.0.24-r5[abi_x86_32(-)]
+               >=media-libs/taglib-1.9.1-r1[abi_x86_32(-)]
+               >=media-libs/libofa-0.9.3-r1[abi_x86_32(-)]
+               || (
+                       (
+                               >=media-video/libav-9.13-r1[abi_x86_32(-)]
+                               >=media-libs/libpostproc-10.20140517-r1[abi_x86_32(-)]
+                       )
+                       >=media-video/ffmpeg-1.2.6-r1[abi_x86_32(-)]
+               )
+               >=media-video/mjpegtools-2.1.0-r2[abi_x86_32(-)]
+               >=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)]
+               >=media-libs/gst-plugins-base-0.10.36-r1:0.10[abi_x86_32(-)]
+       )
+       "
+PDEPEND="!abi_x86_32? ( ~app-emulation/emul-linux-x86-soundlibs-${PV} )"
+
+src_prepare() {
+       # Strip out non-free FAAC bits.
+       find "${S}" -name 'libfaac*' -exec rm {} +
+
+       # Include all libv4l libs, bug #348277
+       ALLOWED="${S}/usr/lib32/libv4l/"
+       emul-linux-x86_src_prepare
+
+       # Remove migrated stuff.
+       use abi_x86_32 && rm -f $(sed "${FILESDIR}/remove-native-${PVR}" -e '/^#/d')
+}