summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Ballier <aballier@gentoo.org>2013-07-31 16:21:35 +0000
committerAlexis Ballier <aballier@gentoo.org>2013-07-31 16:21:35 +0000
commit322af3a4243e1a4880081982d0d3648742c302e6 (patch)
treef5a74a76549abd9ac9d02b9e7f9c4820d5089c30 /app-emulation
parentunmask multilib jpegs and libpng12 (diff)
downloadgentoo-2-322af3a4243e1a4880081982d0d3648742c302e6.tar.gz
gentoo-2-322af3a4243e1a4880081982d0d3648742c302e6.tar.bz2
gentoo-2-322af3a4243e1a4880081982d0d3648742c302e6.zip
New revision featuring libpng12 and libjpegs migration. Also remove libpng15.pc that should not be used.
(Portage version: 2.2.0_alpha191/cvs/Linux x86_64, signed Manifest commit with key 160F534A)
Diffstat (limited to 'app-emulation')
-rw-r--r--app-emulation/emul-linux-x86-baselibs/ChangeLog10
-rw-r--r--app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20130224-r4.ebuild (renamed from app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20130224-r3.ebuild)4
-rw-r--r--app-emulation/emul-linux-x86-baselibs/files/remove-native6
3 files changed, 18 insertions, 2 deletions
diff --git a/app-emulation/emul-linux-x86-baselibs/ChangeLog b/app-emulation/emul-linux-x86-baselibs/ChangeLog
index d8d9b522050c..21c39fee1129 100644
--- a/app-emulation/emul-linux-x86-baselibs/ChangeLog
+++ b/app-emulation/emul-linux-x86-baselibs/ChangeLog
@@ -1,6 +1,14 @@
# ChangeLog for app-emulation/emul-linux-x86-baselibs
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-baselibs/ChangeLog,v 1.143 2013/07/31 15:45:46 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-baselibs/ChangeLog,v 1.144 2013/07/31 16:21:35 aballier Exp $
+
+*emul-linux-x86-baselibs-20130224-r4 (31 Jul 2013)
+
+ 31 Jul 2013; Alexis Ballier <aballier@gentoo.org>
+ -emul-linux-x86-baselibs-20130224-r3.ebuild,
+ +emul-linux-x86-baselibs-20130224-r4.ebuild, files/remove-native:
+ New revision featuring libpng12 and libjpegs migration. Also remove
+ libpng15.pc that should not be used.
*emul-linux-x86-baselibs-20130224-r3 (31 Jul 2013)
diff --git a/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20130224-r3.ebuild b/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20130224-r4.ebuild
index 7decabbc19b7..bcc75d5803f7 100644
--- a/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20130224-r3.ebuild
+++ b/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20130224-r4.ebuild
@@ -1,6 +1,6 @@
# 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-baselibs/emul-linux-x86-baselibs-20130224-r3.ebuild,v 1.1 2013/07/31 15:45:46 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20130224-r4.ebuild,v 1.1 2013/07/31 16:21:35 aballier Exp $
EAPI=5
inherit emul-linux-x86
@@ -22,6 +22,8 @@ RDEPEND="!<app-emulation/emul-linux-x86-medialibs-10.2
>=dev-libs/udis86-1.7-r2[abi_x86_32(-)]
>=virtual/libffi-3.0.13-r1[abi_x86_32(-)]
>=sys-devel/llvm-3.3-r1[abi_x86_32(-)]
+ >=media-libs/libpng-1.2.50-r1:1.2[abi_x86_32(-)]
+ >=virtual/jpeg-0-r1[abi_x86_32(-)]
)
>=sys-libs/glibc-2.15" # bug 340613
diff --git a/app-emulation/emul-linux-x86-baselibs/files/remove-native b/app-emulation/emul-linux-x86-baselibs/files/remove-native
index f178955911cb..f31b972c2cc3 100644
--- a/app-emulation/emul-linux-x86-baselibs/files/remove-native
+++ b/app-emulation/emul-linux-x86-baselibs/files/remove-native
@@ -26,3 +26,9 @@ usr/lib32/llvm/LLVMHello.so
usr/lib32/llvm/libLLVM-3.1.so
usr/lib32/llvm/libLTO.so
usr/lib32/llvm/libprofile_rt.so
+usr/lib32/libpng12.so.0
+usr/lib32/pkgconfig/libpng15.pc
+usr/lib32/libjpeg.so.8
+usr/lib32/libjpeg.so.8.0.2
+usr/lib32/libjpeg.so
+usr/lib32/libturbojpeg.so