Version bump, drop old

(Portage version: 2.2.8-r1/cvs/Linux x86_64, RepoMan options: --force, signed Manifest commit with key A188FBD4)

3 files changed, 71 insertions, 26 deletions

diff --git a/app-emulation/emul-linux-x86-medialibs/ChangeLog b/app-emulation/emul-linux-x86-medialibs/ChangeLog
index c249eb315bb6..b93aab07692e 100644
--- a/app-emulation/emul-linux-x86-medialibs/ChangeLog
+++ b/app-emulation/emul-linux-x86-medialibs/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-emulation/emul-linux-x86-medialibs
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-medialibs/ChangeLog,v 1.87 2013/11/22 19:32:16 pacho Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-medialibs/ChangeLog,v 1.88 2014/04/06 09:09:17 pacho Exp $
+
+*emul-linux-x86-medialibs-20140406 (06 Apr 2014)
+
+  06 Apr 2014; Pacho Ramos <pacho@gentoo.org>
+  +emul-linux-x86-medialibs-20140406.ebuild,
+  -emul-linux-x86-medialibs-20130224.ebuild:
+  Version bump, drop old
 
   22 Nov 2013; Pacho Ramos <pacho@gentoo.org>
   emul-linux-x86-medialibs-20131008-r1.ebuild:
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
index 6f6204972bd4..000000000000
--- a/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-20130224.ebuild
+++ /dev/null
@@ -1,24 +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.3 2013/03/16 16:56:48 ssuominen 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 MPEG-4"
-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
-	!>=media-libs/libv4l-0.8.9-r1[abi_x86_32]"
-PDEPEND="~app-emulation/emul-linux-x86-soundlibs-${PV}"
-
-src_prepare() {
-	# 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-20140406.ebuild b/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-20140406.ebuild
new file mode 100644
index 000000000000..304c13c2303c
--- /dev/null
+++ b/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-20140406.ebuild
@@ -0,0 +1,62 @@
+# 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.1 2014/04/06 09:09:17 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 !abi_x86_32? ( MPEG-4 )"
+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.90-r1[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() {
+	# 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")
+}