summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'app-emulation')
-rw-r--r--app-emulation/emul-linux-x86-medialibs/ChangeLog8
-rw-r--r--app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-20130224-r1.ebuild34
-rw-r--r--app-emulation/emul-linux-x86-medialibs/files/remove-native9
3 files changed, 50 insertions, 1 deletions
diff --git a/app-emulation/emul-linux-x86-medialibs/ChangeLog b/app-emulation/emul-linux-x86-medialibs/ChangeLog
index 159f0565414e..7bbecfffe8c7 100644
--- a/app-emulation/emul-linux-x86-medialibs/ChangeLog
+++ b/app-emulation/emul-linux-x86-medialibs/ChangeLog
@@ -1,6 +1,12 @@
# 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.66 2013/03/16 16:56:48 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-medialibs/ChangeLog,v 1.67 2013/06/26 17:24:26 aballier Exp $
+
+*emul-linux-x86-medialibs-20130224-r1 (26 Jun 2013)
+
+ 26 Jun 2013; Alexis Ballier <aballier@gentoo.org>
+ +emul-linux-x86-medialibs-20130224-r1.ebuild, +files/remove-native:
+ remove lame, libvpx and xvid files with abi_x86_32 enabled, ref bug #473838
16 Mar 2013; Samuli Suominen <ssuominen@gentoo.org>
emul-linux-x86-medialibs-20130224.ebuild:
diff --git a/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-20130224-r1.ebuild b/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-20130224-r1.ebuild
new file mode 100644
index 000000000000..c85fbaea3576
--- /dev/null
+++ b/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-20130224-r1.ebuild
@@ -0,0 +1,34 @@
+# 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-r1.ebuild,v 1.1 2013/06/26 17:24:26 aballier 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"
+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
+ !>=media-libs/libv4l-0.8.9-r1[abi_x86_32]
+ 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(-)]
+ )
+ "
+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")
+}
diff --git a/app-emulation/emul-linux-x86-medialibs/files/remove-native b/app-emulation/emul-linux-x86-medialibs/files/remove-native
new file mode 100644
index 000000000000..ff3739b5db38
--- /dev/null
+++ b/app-emulation/emul-linux-x86-medialibs/files/remove-native
@@ -0,0 +1,9 @@
+usr/lib32/libxvidcore.so
+usr/lib32/libxvidcore.so.4
+usr/lib32/libxvidcore.so.4.3
+usr/lib32/libmp3lame.so
+usr/lib32/libmp3lame.so.0
+usr/lib32/libmp3lame.so.0.0.0
+usr/lib32/libvpx.so
+usr/lib32/libvpx.so.1
+usr/lib32/pkgconfig/vpx.pc