Version bump, remove old.

(Portage version: 2.1.9.35/cvs/Linux x86_64)

4 files changed, 20 insertions, 23 deletions

diff --git a/app-emulation/emul-linux-x86-medialibs/ChangeLog b/app-emulation/emul-linux-x86-medialibs/ChangeLog
index 5b7376cb4530..dd106a3550c2 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.45 2011/01/09 11:03:49 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-medialibs/ChangeLog,v 1.46 2011/01/30 11:28:27 pacho Exp $
+
+*emul-linux-x86-medialibs-20110129 (30 Jan 2011)
+
+  30 Jan 2011; Pacho Ramos <pacho@gentoo.org>
+  -emul-linux-x86-medialibs-20100611.ebuild,
+  -emul-linux-x86-medialibs-20100915.ebuild,
+  +emul-linux-x86-medialibs-20110129.ebuild, metadata.xml:
+  Version bump, remove old.
 
   09 Jan 2011; Pacho Ramos <pacho@gentoo.org>
   emul-linux-x86-medialibs-20100915-r1.ebuild:
diff --git a/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-20100915.ebuild b/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-20100915.ebuild
deleted file mode 100644
index d988ef7e359e..000000000000
--- a/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-20100915.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2010 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-20100915.ebuild,v 1.2 2010/10/04 12:51:35 hwoarang Exp $
-
-inherit emul-linux-x86
-
-LICENSE="GPL-2 LGPL-2.1 BSD"
-KEYWORDS="-* amd64"
-
-IUSE=""
-
-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}"
diff --git a/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-20100611.ebuild b/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-20110129.ebuild
index 8ac8caa90c5d..5c11eedc1aa6 100644
--- a/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-20100611.ebuild
+++ b/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-20110129.ebuild
@@ -1,16 +1,20 @@
-# Copyright 1999-2010 Gentoo Foundation
+# 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-20100611.ebuild,v 1.3 2010/06/27 13:15:37 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-20110129.ebuild,v 1.1 2011/01/30 11:28:27 pacho Exp $
 
 inherit emul-linux-x86
 
-LICENSE="GPL-2 LGPL-2.1 BSD"
-KEYWORDS="-* amd64"
-
-IUSE=""
+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/metadata.xml b/app-emulation/emul-linux-x86-medialibs/metadata.xml
index 96677fad3cfb..3b884cbcf2ee 100644
--- a/app-emulation/emul-linux-x86-medialibs/metadata.xml
+++ b/app-emulation/emul-linux-x86-medialibs/metadata.xml
@@ -2,4 +2,5 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>amd64</herd>
+<use><flag name="development">Install pkgconfig files</flag></use>
 </pkgmetadata>