Version bump, remove old.

(Portage version: 2.1.10.44/cvs/Linux x86_64, RepoMan options: --force)

3 files changed, 17 insertions, 26 deletions

diff --git a/app-emulation/emul-linux-x86-medialibs/ChangeLog b/app-emulation/emul-linux-x86-medialibs/ChangeLog
index d79a978ea819..a462c0f5a0d2 100644
--- a/app-emulation/emul-linux-x86-medialibs/ChangeLog
+++ b/app-emulation/emul-linux-x86-medialibs/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-emulation/emul-linux-x86-medialibs
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-medialibs/ChangeLog,v 1.54 2011/10/16 12:10:43 ssuominen Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-medialibs/ChangeLog,v 1.55 2012/01/27 18:07:08 pacho Exp $
+
+*emul-linux-x86-medialibs-20120127 (27 Jan 2012)
+
+  27 Jan 2012; Pacho Ramos <pacho@gentoo.org>
+  +emul-linux-x86-medialibs-20120127.ebuild,
+  -emul-linux-x86-medialibs-20110129.ebuild,
+  -emul-linux-x86-medialibs-20110722.ebuild:
+  Version bump, remove old.
 
   16 Oct 2011; Samuli Suominen <ssuominen@gentoo.org>
   emul-linux-x86-medialibs-20110928.ebuild:
diff --git a/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-20110129.ebuild b/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-20110129.ebuild
deleted file mode 100644
index 793e15eb285e..000000000000
--- a/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-20110129.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2011 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-20110129.ebuild,v 1.2 2011/02/12 20:19:41 hwoarang Exp $
-
-inherit emul-linux-x86
-
-LICENSE="GPL-2 GPL-3 LGPL-2 LGPL-2.1 BSD BSD-2 public-domain"
-KEYWORDS="-* amd64"
-
-DEPEND=""
-RDEPEND="~app-emulation/emul-linux-x86-baselibs-${PV}
-	~app-emulation/emul-linux-x86-xlibs-${PV}
-	!<=app-emulation/emul-linux-x86-sdl-20081109"
-PDEPEND="~app-emulation/emul-linux-x86-soundlibs-${PV}"
-
-src_unpack() {
-	# Include all libv4l libs, bug #348277
-	ALLOWED="${S}/usr/lib32/libv4l/"
-	emul-linux-x86_src_unpack
-}
diff --git a/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-20110722.ebuild b/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-20120127.ebuild
index 3d1d96fb7451..6632266d72aa 100644
--- a/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-20110722.ebuild
+++ b/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-20120127.ebuild
@@ -1,19 +1,22 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 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-20110722.ebuild,v 1.2 2011/08/24 10:04:13 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-20120127.ebuild,v 1.1 2012/01/27 18:07:08 pacho Exp $
 
 EAPI="4"
 
 inherit emul-linux-x86
 
 LICENSE="GPL-2 GPL-3 LGPL-2 LGPL-2.1 BSD BSD-2 public-domain"
-KEYWORDS="-* amd64"
+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"
-PDEPEND="~app-emulation/emul-linux-x86-soundlibs-${PV}"
+PDEPEND="~app-emulation/emul-linux-x86-soundlibs-${PV}
+	~app-emulation/emul-linux-x86-sdl-${PV}"
+# sdl pdep should be dropped once bug #299324 is solved
 
 src_prepare() {
 	# Include all libv4l libs, bug #348277