app-emulation/emul-linux-x86-{baselibs,gtklibs}: merge upstream deltas, revbump

Signed-off-by: Gregory M. Tuner <gmt@be-evil.net>

9 files changed, 195 insertions, 77 deletions

diff --git a/app-emulation/emul-linux-x86-baselibs/ChangeLog b/app-emulation/emul-linux-x86-baselibs/ChangeLog
index 91adb98..4f9dd4f 100644
--- a/app-emulation/emul-linux-x86-baselibs/ChangeLog
+++ b/app-emulation/emul-linux-x86-baselibs/ChangeLog
@@ -1,6 +1,82 @@
 # ChangeLog for app-emulation/emul-linux-x86-baselibs
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-baselibs/ChangeLog,v 1.219 2014/05/30 14:37:35 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-baselibs/ChangeLog,v 1.229 2014/06/20 01:01:06 floppym Exp $
+
+  20 Jun 2014; Mike Gilbert <floppym@gentoo.org>
+  files/remove-native-20140508-r13, files/remove-native-20140508-r14:
+  Add libgif.so.4.1.6.
+
+  20 Jun 2014; Mike Gilbert <floppym@gentoo.org>
+  files/remove-native-20140508-r12:
+  Add libgif.so.4.1.6.
+
+*emul-linux-x86-baselibs-20140508-r14 (19 Jun 2014)
+*emul-linux-x86-baselibs-20140508-r13 (19 Jun 2014)
+*emul-linux-x86-baselibs-20140508-r12 (19 Jun 2014)
+
+  19 Jun 2014; Alexandre Rostovtsev <tetromino@gentoo.org>
+  -emul-linux-x86-baselibs-20140508-r10.ebuild,
+  -emul-linux-x86-baselibs-20140508-r11.ebuild,
+  +emul-linux-x86-baselibs-20140508-r12.ebuild,
+  +emul-linux-x86-baselibs-20140508-r13.ebuild,
+  +emul-linux-x86-baselibs-20140508-r14.ebuild,
+  -files/remove-native-20140508-r6, -files/remove-native-20140508-r7,
+  -files/remove-native-20140508-r8, -files/remove-native-20140508-r10,
+  -files/remove-native-20140508-r11, +files/remove-native-20140508-r12,
+  +files/remove-native-20140508-r13, +files/remove-native-20140508-r14:
+  Fix file collision with multilib lcms:0; this requires moving masked -r10 and
+  -r11 to -r13 and -r14 respectively.
+
+  18 Jun 2014; Michał Górny <mgorny@gentoo.org>
+  emul-linux-x86-baselibs-20131008-r6.ebuild,
+  emul-linux-x86-baselibs-20140406-r4.ebuild,
+  emul-linux-x86-baselibs-20140508-r10.ebuild,
+  emul-linux-x86-baselibs-20140508-r11.ebuild,
+  emul-linux-x86-baselibs-20140508-r9.ebuild:
+  Update dependencies to require guaranteed EAPI=5 or multilib ebuilds, bug
+  #513718.
+
+  18 Jun 2014; Michał Górny <mgorny@gentoo.org>
+  emul-linux-x86-baselibs-20131008-r6.ebuild,
+  emul-linux-x86-baselibs-20140406-r4.ebuild,
+  emul-linux-x86-baselibs-20140508-r10.ebuild,
+  emul-linux-x86-baselibs-20140508-r11.ebuild,
+  emul-linux-x86-baselibs-20140508-r9.ebuild:
+  Remove stale ~virtual/udev-204 deps.
+
+  15 Jun 2014; Michał Górny <mgorny@gentoo.org>
+  emul-linux-x86-baselibs-20140508-r10.ebuild,
+  emul-linux-x86-baselibs-20140508-r11.ebuild,
+  emul-linux-x86-baselibs-20140508-r9.ebuild:
+  Enable all USE flags by default to avoid missing deps.
+
+*emul-linux-x86-baselibs-20140508-r11 (15 Jun 2014)
+
+  15 Jun 2014; Michał Górny <mgorny@gentoo.org>
+  +emul-linux-x86-baselibs-20140508-r11.ebuild,
+  +files/remove-native-20140508-r11:
+  Add multilib curl.
+
+  15 Jun 2014; Michał Górny <mgorny@gentoo.org>
+  -emul-linux-x86-baselibs-20140508-r6.ebuild,
+  -emul-linux-x86-baselibs-20140508-r7.ebuild,
+  -emul-linux-x86-baselibs-20140508-r8.ebuild,
+  emul-linux-x86-baselibs-20140508-r10.ebuild,
+  emul-linux-x86-baselibs-20140508-r9.ebuild:
+  Add USE=kerberos,ldap,pam wrt bug #513298. Drop old.
+
+*emul-linux-x86-baselibs-20140508-r10 (14 Jun 2014)
+
+  14 Jun 2014; Michał Górny <mgorny@gentoo.org>
+  +emul-linux-x86-baselibs-20140508-r10.ebuild,
+  +files/remove-native-20140508-r10:
+  Add multilib nspr & nss.
+
+*emul-linux-x86-baselibs-20140508-r9 (08 Jun 2014)
+
+  08 Jun 2014; Michał Górny <mgorny@gentoo.org>
+  +emul-linux-x86-baselibs-20140508-r9.ebuild, +files/remove-native-20140508-r9:
+  Add net-libs/{libsoup,neon}.
 
 *emul-linux-x86-baselibs-20140508-r8 (30 May 2014)
 
diff --git a/app-emulation/emul-linux-x86-baselibs/Manifest b/app-emulation/emul-linux-x86-baselibs/Manifest
index dbf5847..35f15a0 100644
--- a/app-emulation/emul-linux-x86-baselibs/Manifest
+++ b/app-emulation/emul-linux-x86-baselibs/Manifest
@@ -1,5 +1,5 @@
-AUX remove-native-20140508-r10 19888 SHA256 536809627a6981160808d203fe5caeb9f1b8213ee6dee9ee49bee795058f821d SHA512 01ec319ce887b5dcd07c0d0d48c3a78748949c08181c7d0ac4524b6876e97bd1c8f5ce52799c6cff2c6e2165484c7a05b6f60f31dea5c91f333b0675eb83f1e4 WHIRLPOOL 60a48e88eebb557552dfd961815ca04cb7e14fee850ee5376bbe6d9e8b7618ee0ca9703e0da58ca8a7e7054826a572d5a615b7667097dec031d38b42f4024d3b
+AUX remove-native-20140508-r15 20252 SHA256 3e33ae2012572cb9455f0544fe0147ff1f32c6d9f3209f49ae419ed8637aae2f SHA512 43994f4c1608f81251784cea3e5917369dbc649ef43075da00e3375cd74ebb70d6b368eeb63479f9d08fc332a2d7a1c6f6986f1c234471cdba69e5e0ef6ce1b4 WHIRLPOOL 1d5a2b4b9539adac979554c06d47c2580c0b8866951e6a37d2350833df97ccdb947196fc3b526c67e67a52fb32777e6f3b6811bbe2f92f0349e85ec51c79f4ac
 DIST emul-linux-x86-baselibs-20140508.tar.xz 40339976 SHA256 754b9460609d24b89dfb6875aa76a422b53ed3bb2f2e10bad82ad118e2592357 SHA512 2491cf64e2ad91cc19ae84b02887a262cd349f6a44eb3c62adee4a63ccbaff14214e838cb4bd151abc16c62e03e7d18d84e331e4adf2100569331d86211b289f WHIRLPOOL 3af547d12b12f925ac6232de412323a893dc6ae3200c61a08b78ee3c62c7f98acbd2224036d4e265bdf816edc1e7de212fefea6326d7c4275ba3c45377f3edfc
-EBUILD emul-linux-x86-baselibs-20140508-r10.ebuild 5190 SHA256 48bfcb79befe449e67e2e1455cd7f66aff01e55e1cecc8d5efba3de8d040a467 SHA512 9f3363048f21e80a3af437e8412bcf426aca984066f0cad3cf538876c728ef4fb9fce009c4fe9f771904551b27ab2383c708c46521f002a9aa805167655d2fd8 WHIRLPOOL 1c2c4f3f31e89131fc43959d1407f3be4833fb62d657bc294b8765cbe7b69f3ba32af5ff738e02f13d67298cb4b1c89fe8eb0d5900ec2314af6259b5f87bd1de
-MISC ChangeLog 44616 SHA256 eb37c67a5a324d93376537fac343ddd577367421c2b85db2e4a8063e99e9db8c SHA512 f6e1d4cc193e82b21ed8ead78b26d2ad87942722fcc276167b04299cc00f97818459c1add8b721fc424ece0dd1f33ba09119ed5fb1f39c7c8e8dfeea650fc3be WHIRLPOOL a69395f40fdaedcb00088611f4916da5b564296438a502d50feacdf55c927fc2a89db840128e1ab3503b8ee000950389c6d4cb2633f5e6d6bbaccbf937aa1c20
+EBUILD emul-linux-x86-baselibs-20140508-r15.ebuild 5172 SHA256 1516e4d0b8137d3dfbdb16a39d7f9eb95e93bb068d7c0d02ccb1bd8b8fd1276f SHA512 0e74fc26a524906cc7763d94ec4d78a9d1e5500491d34711657e51295bb7120bd786954aed1e8f4fb1994b7b603f815c8fa3bf2b58b8cacfa21f0fe363f633c9 WHIRLPOOL 82f3fc47d67cbaaef482939cb2f88b7809cf7298fe1e6f95ca562f572f510d94a1bf2c1d80c973793364b2c331cb73db7380be3f9d0340891d037e0c92b49fb5
+MISC ChangeLog 47650 SHA256 8cf1ca6a48465c5b1d10bdb02c7e2ccd13077ac6197bb51e302b2a27950b82bd SHA512 a2087fd9773e1895cca65582bbef31784311e24f5f7526bc910e0f112243bf632998675e262bb14916cfc7a75af09b758e39f8ed66fb171a976909d144bf9d4c WHIRLPOOL d1b87650a905491d2274a0a02601847c657e3c88ec0944f3a6b0f8060da1db2d53aa9f9b2e3995ce0f13a745ae8608e7412cf23d0aaa0a5b8b3f31eba543934e
 MISC metadata.xml 312 SHA256 9d3f082956c89c24d50eacf1a35e6d3f7e7605a2b290b3ca01123c357595b680 SHA512 21f9fbd2145e18c319f089f1cb2f99cec289daac7e35c944335d979fca8ae595ac2ab81a025c55d56dde80ed7db88fdcd0b644bf2070b6eee7c26bf643fc4e19 WHIRLPOOL 5cfe4fa3453b53f0d056331b905da9584e13a48af3671f248b7ede707b587338b145613a77cf655af74734ae1e9d0dfe50f13d34a2cb069a73c76abc3a753262
diff --git a/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20140508-r10.ebuild b/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20140508-r10.ebuild
index f519dab..d192258 100644
--- a/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20140508-r10.ebuild
+++ b/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20140508-r10.ebuild
@@ -11,7 +11,7 @@ LICENSE="Artistic GPL-1 GPL-2 GPL-3 BSD BSD-2 BZIP2 AFL-2.1 LGPL-2.1 BSD-4 MIT
 	openssl tcp_wrappers_license"
 
 KEYWORDS="-* ~amd64"
-IUSE="abi_x86_32 ldap"
+IUSE="abi_x86_32 +kerberos +ldap +pam"
 
 DEPEND=""
 RDEPEND="!<app-emulation/emul-linux-x86-medialibs-10.2
@@ -21,32 +21,30 @@ RDEPEND="!<app-emulation/emul-linux-x86-medialibs-10.2
 	abi_x86_32? (
 		>=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)]
 		>=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)]
-		>=media-libs/libpng-1.5.16-r1:0[abi_x86_32(-)]
+		>=media-libs/libpng-1.6.10:0[abi_x86_32(-)]
 		>=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:62[abi_x86_32(-)]
+		>=sys-devel/llvm-3.3-r3[abi_x86_32(-)]
+		>=media-libs/libpng-1.2.51:1.2[abi_x86_32(-)]
+		>=virtual/jpeg-62:62[abi_x86_32(-)]
 		>=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)]
 		>=sys-libs/libavc1394-0.5.4-r1[abi_x86_32(-)]
 		>=dev-libs/expat-2.1.0-r3[abi_x86_32(-)]
 		>=virtual/libusb-0-r1:0[abi_x86_32(-)]
 		>=virtual/libusb-1-r1:1[abi_x86_32(-)]
-		|| (
-			>=virtual/udev-206-r1[abi_x86_32(-)]
-			~virtual/udev-204[abi_x86_32(-)] )
-		>=media-libs/tiff-4.0.3-r5:0[abi_x86_32(-)]
+		>=virtual/udev-208-r2[abi_x86_32(-)]
+		>=media-libs/tiff-4.0.3-r6:0[abi_x86_32(-)]
 		>=sys-apps/attr-2.4.47-r1[abi_x86_32(-)]
-		>=dev-libs/glib-2.36.3-r2:2[abi_x86_32(-)]
+		>=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)]
+		>=media-libs/lcms-1.19-r2:0[abi_x86_32(-)]
 		>=media-libs/lcms-2.5-r1:2[abi_x86_32(-)]
-		>=media-libs/lcms-1.19-r1:0[abi_x86_32(-)]
 		>=app-text/libpaper-1.1.24-r2[abi_x86_32(-)]
 		>=media-libs/tiff-3.9.7-r1:3[abi_x86_32(-)]
 		|| (
 			>=dev-libs/elfutils-0.155-r1[abi_x86_32(-)]
 			>=dev-libs/libelf-0.8.13-r2[abi_x86_32(-)]
 		)
-		>=sys-libs/e2fsprogs-libs-1.42.7-r1[abi_x86_32(-)]
+		>=sys-libs/e2fsprogs-libs-1.42.9[abi_x86_32(-)]
 		>=sys-libs/ncurses-5.9-r3[abi_x86_32(-)]
 		>=sys-libs/gpm-1.20.7-r2[abi_x86_32(-)]
 		>=dev-libs/gmp-5.1.3-r1[abi_x86_32(-)]
@@ -55,42 +53,37 @@ RDEPEND="!<app-emulation/emul-linux-x86-medialibs-10.2
 		>=sys-apps/tcp-wrappers-7.6.22-r1[abi_x86_32(-)]
 		>=sys-libs/gdbm-1.10-r1[abi_x86_32(-)]
 		>=dev-libs/json-c-0.11-r1[abi_x86_32(-)]
-		>=dev-libs/libxml2-2.9.1-r2[abi_x86_32(-)]
-		>=media-libs/giflib-5.0.5-r1[abi_x86_32(-)]
+		>=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)]
 		>=dev-libs/dbus-glib-0.100.2-r1[abi_x86_32(-)]
 		>=sys-libs/readline-6.2_p5-r1:0[abi_x86_32(-)]
 		>=sys-devel/gettext-0.18.3.2[abi_x86_32(-)]
 		>=dev-libs/libgpg-error-1.12-r1[abi_x86_32(-)]
 		>=dev-db/sqlite-3.8.3:3[abi_x86_32(-)]
 		>=dev-libs/nettle-2.7.1-r1[abi_x86_32(-)]
-		|| (
-			>=dev-libs/libtasn1-3.4-r1[abi_x86_32(-)]
-			=dev-libs/libtasn1-2.14-r1[abi_x86_32(-)]
-		)
-		dev-libs/libgcrypt:11[abi_x86_32(-)]
+		>=dev-libs/libtasn1-3.4-r1[abi_x86_32(-)]
+		>=dev-libs/libgcrypt-1.5.3-r100:11[abi_x86_32(-)]
 		>=dev-libs/libgcrypt-1.6.1-r1:0[abi_x86_32(-)]
 		>=dev-libs/lzo-2.06-r1[abi_x86_32(-)]
 		>=dev-libs/libxslt-1.1.28-r2[abi_x86_32(-)]
 		>=sys-apps/file-5.18-r1[abi_x86_32(-)]
 		>=app-arch/xz-utils-5.0.5-r1[abi_x86_32(-)]
+		>=media-libs/giflib-4.2.3-r1[abi_x86_32(-)]
 		>=sys-libs/slang-2.2.4-r1[abi_x86_32(-)]
 		>=media-libs/libmng-1.0.10-r2[abi_x86_32(-)]
 		>=sys-libs/pam-1.1.7-r1[abi_x86_32(-)]
-		>=dev-libs/nspr-4.10.2-r1[abi_x86_32(-)]
 		>=sys-apps/acl-2.2.52-r1[abi_x86_32(-)]
-		>=sys-apps/util-linux-2.24-r3[abi_x86_32(-)]
+		>=sys-apps/util-linux-2.24.1-r3[abi_x86_32(-)]
 		>=sys-devel/libtool-2.4.2-r1[abi_x86_32(-)]
 		>=virtual/acl-0-r2[abi_x86_32(-)]
 		>=dev-lang/python-2.7.6-r1:2.7[abi_x86_32(-)]
 		>=net-dns/libidn-1.28-r1[abi_x86_32(-)]
-		>=net-misc/curl-7.34.0-r2[abi_x86_32(-)]
-		>=dev-libs/openssl-1.0.1g-r1:0[abi_x86_32(-)]
-		>=dev-libs/openssl-0.9.8y-r1:0.9.8[abi_x86_32(-)]
-		>=net-libs/gnutls-3.3.1-r1[abi_x86_32(-)]
+		>=dev-libs/openssl-1.0.1h-r2:0[abi_x86_32(-)]
+		>=dev-libs/openssl-0.9.8z_p1-r2:0.9.8[abi_x86_32(-)]
+		>=net-libs/gnutls-3.3.4[abi_x86_32(-)]
 		>=net-print/cups-1.7.1-r2[abi_x86_32(-)]
 		>=sys-libs/talloc-2.1.0-r1[abi_x86_32(-)]
 		>=sys-apps/keyutils-1.5.9-r1[abi_x86_32(-)]
-		>=virtual/krb5-0-r1[abi_x86_32(-)]
+		kerberos? ( >=virtual/krb5-0-r1[abi_x86_32(-)] )
 		>=sys-libs/db-4.8.30-r1:4.8[abi_x86_32(-)]
 		ldap? ( >=net-nds/openldap-2.4.38-r2[abi_x86_32(-)] )
 		>=net-dns/libidn-1.28-r1[abi_x86_32(-)]
@@ -98,9 +91,12 @@ RDEPEND="!<app-emulation/emul-linux-x86-medialibs-10.2
 		>=media-libs/libart_lgpl-2.3.21-r2[abi_x86_32(-)]
 		>=sys-libs/cracklib-2.9.1-r1[abi_x86_32(-)]
 		>=net-libs/libtirpc-0.2.4-r2[abi_x86_32(-)]
-		>=sys-libs/pam-1.1.8-r2[abi_x86_32(-)]
+		pam? ( >=virtual/pam-0-r1[abi_x86_32(-)] )
 		>=net-libs/libsoup-2.46.0-r1[abi_x86_32(-)]
 		>=net-libs/neon-0.30.0-r1[abi_x86_32(-)]
+		>=dev-libs/nspr-4.10.6-r1[abi_x86_32(-)]
+		>=dev-libs/nss-3.16-r1[abi_x86_32(-)]
+		>=net-misc/curl-7.37.0-r1[abi_x86_32(-)]
 	)
 	>=sys-libs/glibc-2.16" # bug 340613
 
diff --git a/app-emulation/emul-linux-x86-baselibs/files/remove-native-20140508-r10 b/app-emulation/emul-linux-x86-baselibs/files/remove-native-20140508-r10
index b55a23f..51f0b56 100644
--- a/app-emulation/emul-linux-x86-baselibs/files/remove-native-20140508-r10
+++ b/app-emulation/emul-linux-x86-baselibs/files/remove-native-20140508-r10
@@ -109,6 +109,10 @@ usr/lib32/pkgconfig/gthread-2.0.pc
 usr/lib32/pkgconfig/gio-unix-2.0.pc
 usr/lib32/pkgconfig/gmodule-export-2.0.pc
 usr/lib32/pkgconfig/gmodule-no-export-2.0.pc
+usr/lib32/liblcms.so
+usr/lib32/liblcms.so.1
+usr/lib32/liblcms.so.1.0.19
+usr/lib32/pkgconfig/lcms.pc
 usr/lib32/liblcms2.so
 usr/lib32/liblcms2.so.2
 usr/lib32/liblcms2.so.2.0.5
@@ -218,7 +222,6 @@ usr/lib32/libpcreposix.so.0.0.2
 usr/lib32/pkgconfig/libpcre.pc
 usr/lib32/pkgconfig/libpcrecpp.pc
 usr/lib32/pkgconfig/libpcreposix.pc
-usr/lib32/libgif.so.4.1.6
 usr/lib32/dbus-1.0/include/dbus/dbus-arch-deps.h
 usr/lib32/libdbus-1.so
 usr/lib32/libdbus-1.so.3
@@ -295,6 +298,7 @@ usr/lib32/liblzma.so
 usr/lib32/pkgconfig/liblzma.pc
 usr/lib32/libgif.so
 usr/lib32/libgif.so.4
+usr/lib32/libgif.so.4.1.6
 usr/lib32/libslang.so
 usr/lib32/libslang.so.2
 usr/lib32/libslang.so.2.2.4
@@ -377,10 +381,6 @@ usr/lib32/libgssrpc.so.4*
 usr/lib32/liblcms.so
 usr/lib32/liblcms.so.1*
 usr/lib32/pkgconfig/lcms.pc
-usr/lib32/libnspr4.so
-usr/lib32/libplds4.so
-usr/lib32/libplc4.so
-usr/lib32/pkgconfig/nspr.pc
 lib32/libuuid.so.1
 lib32/libmount.so.1
 lib32/libacl.so.1
@@ -470,10 +470,6 @@ usr/lib32/python2.7/lib-dynload/_codecs_iso2022.so
 usr/lib32/python2.7/lib-dynload/binascii.so
 usr/lib32/python2.7/lib-dynload/ossaudiodev.so
 usr/lib32/python2.7/lib-dynload/_codecs_hk.so
-usr/lib32/libcurl.so.4
-usr/lib32/libcurl.so.4.3.0
-usr/lib32/pkgconfig/libcurl.pc
-usr/lib32/libcurl.so
 usr/lib32/libcups.so
 usr/lib32/libcups.so.2
 usr/lib32/libcupscgi.so
@@ -676,3 +672,22 @@ usr/lib32/libneon.so
 usr/lib32/libneon.so.27
 usr/lib32/libneon.so.27.3.0
 usr/lib32/pkgconfig/neon.pc
+usr/lib32/libfreebl3.so
+usr/lib32/libnss3.so
+usr/lib32/libnssckbi.so
+usr/lib32/libnssdbm3.so
+usr/lib32/libnsspem.so
+usr/lib32/libnsssysinit.so
+usr/lib32/libnssutil3.so
+usr/lib32/libsmime3.so
+usr/lib32/libsoftokn3.so
+usr/lib32/libssl3.so
+usr/lib32/pkgconfig/nss.pc
+usr/lib32/libnspr4.so
+usr/lib32/libplc4.so
+usr/lib32/libplds4.so
+usr/lib32/pkgconfig/nspr.pc
+usr/lib32/libcurl.so
+usr/lib32/libcurl.so.4
+usr/lib32/libcurl.so.4.3.0
+usr/lib32/pkgconfig/libcurl.pc
diff --git a/app-emulation/emul-linux-x86-gtklibs/ChangeLog b/app-emulation/emul-linux-x86-gtklibs/ChangeLog
index 9402e75..46ea208 100644
--- a/app-emulation/emul-linux-x86-gtklibs/ChangeLog
+++ b/app-emulation/emul-linux-x86-gtklibs/ChangeLog
@@ -1,6 +1,39 @@
 # ChangeLog for app-emulation/emul-linux-x86-gtklibs
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-gtklibs/ChangeLog,v 1.127 2014/05/14 13:37:33 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-gtklibs/ChangeLog,v 1.133 2014/06/18 19:01:21 mgorny Exp $
+
+  18 Jun 2014; Michał Górny <mgorny@gentoo.org>
+  emul-linux-x86-gtklibs-20140406-r1.ebuild,
+  emul-linux-x86-gtklibs-20140508-r3.ebuild:
+  Update dependencies to require guaranteed EAPI=5 or multilib ebuilds, bug
+  #513718.
+
+*emul-linux-x86-gtklibs-20140508-r3 (17 Jun 2014)
+
+  17 Jun 2014; Michał Górny <mgorny@gentoo.org>
+  +emul-linux-x86-gtklibs-20140508-r3.ebuild, +files/remove-native-20140508-r3,
+  -emul-linux-x86-gtklibs-20140508-r2.ebuild, -files/remove-native-20140508-r2:
+  Add multilib libglade.
+
+  15 Jun 2014; Michał Górny <mgorny@gentoo.org>
+  -emul-linux-x86-gtklibs-20140508-r1.ebuild:
+  Drop old.
+
+*emul-linux-x86-gtklibs-20140508-r2 (11 Jun 2014)
+
+  11 Jun 2014; Michał Górny <mgorny@gentoo.org>
+  +emul-linux-x86-gtklibs-20140508-r2.ebuild, +files/remove-native-20140508-r2:
+  Add multilib gconf & gnome-vfs.
+
+  29 May 2014; Michał Górny <mgorny@gentoo.org>
+  emul-linux-x86-gtklibs-20140406-r1.ebuild:
+  Restore stable keyword from 20140406.
+
+  29 May 2014; Michał Górny <mgorny@gentoo.org>
+  -emul-linux-x86-gtklibs-20140406.ebuild,
+  -emul-linux-x86-gtklibs-20140508.ebuild, -files/remove-native,
+  -files/remove-native-20140406, -files/remove-native-20140508:
+  Remove the old revisions.
 
 *emul-linux-x86-gtklibs-20140508-r1 (14 May 2014)
 
diff --git a/app-emulation/emul-linux-x86-gtklibs/Manifest b/app-emulation/emul-linux-x86-gtklibs/Manifest
index 7a54804..ad93ffb 100644
--- a/app-emulation/emul-linux-x86-gtklibs/Manifest
+++ b/app-emulation/emul-linux-x86-gtklibs/Manifest
@@ -1,5 +1,5 @@
-AUX remove-native-20140508-r2 9659 SHA256 96c3d35b5864f1bf75c96d8b29003bdacaf6e515a7dd69e29a5df0e65fb215ba SHA512 00d536c03b3b58cdf447dd191a63c005d58468cd2221a58483de841c508aff4b16aad1bca8fda966c9a46ad8ace10ce6af96122f845f72cadf5e4c045a6afe53 WHIRLPOOL 9df3a18eea717378d814bbd707576fbe8783523a5133072fd19b58b15a32a8cc3ce905e8f5b8953e78083bafeee66cab541512f1b4ab8897d0d06917f400f5c2
+AUX remove-native-20140508-r4 9659 SHA256 4c1affb5a2f60f682f1cc476db78d55c240e05b5fa10943198edf169dd6a1141 SHA512 75d2679e232f2cae9c8c2ea4aa8899d875f79ef92a43b8b8312b8baa5fd4dde9b3eb6a68dfbfe7d7a2b74644b9627b7fd6c9f0870c955dbf1edc095b63f8e4b9 WHIRLPOOL 1b93789bee0feefbd59f557bcff3204b4fb24619350d68e679e2a71e95ccc72fd88dc4ec7865810665af802f308d41a0f009ebeda00955ce809d6ade90d9b8be
 DIST emul-linux-x86-gtklibs-20140508.tar.xz 7618292 SHA256 15e70b6e80d2d900e1e117c5c9141f1f7eee28dee7bff717bbb5e89f9a8b9a81 SHA512 68fc9ed94b1d0355bdab23ac44da4bb80630900375161f295474d24d63969a6789696e6f7c53e352401808bf3c95fdbf97ce81aecf2a261010248ee8dc82a1fb WHIRLPOOL 8977acb417694237e9ce05de61dd2ae8b72dd81aed91d4023a6964e7a8c2b5e86f0c19482f020170b793dbc8f7c434dc4a713730ae776c49aa9261c049dbb256
-EBUILD emul-linux-x86-gtklibs-20140508-r2.ebuild 4381 SHA256 126e42d208d4dbf68f72366b74fe88005036b148cc7eeb86715fca5822c85cde SHA512 006bdcf6ac0c0775d79a76cb650f8192b133393489c6749888d8b12ee090cb86c15526a54d73ddc52f4730aafcf6479b44d820a75903abe53655f125e81480a0 WHIRLPOOL b27a02c9546bede111a34fd7a2e4575a1fd05b25c286abab73c835f45ab6e30a05ff366f3ae9d187621226ba4c2be0121e154c95ba247a1a59345629f9711eac
-MISC ChangeLog 22921 SHA256 450834f3f046fa61bcb8ab2e4a4ccac5928b1cff517fc29bdb45d91c82c2d04b SHA512 1f5448e1fe91b6067c93c62aebee079327814f48e8bfa2b63ff2d4afd04136eecbfba414d01b996f64454ee51032fa8205d231fca1f0bbe3e81655c5d5238716 WHIRLPOOL a251e3913d9f271e952277f37fe9852ae3ddce8800cd501f34e83b133260871e1f99037e812db89543ab8eb367c31fd5a4f6726420ae58a91c945e3b78bbc667
+EBUILD emul-linux-x86-gtklibs-20140508-r4.ebuild 4260 SHA256 9138d448ac95cd8627adf97d1d2d7c79d93ddb6ce86fb99f7ca36b179f317585 SHA512 5029eade56e17be2ec1d82c8fdce81be62ed27db358edab5e7a1dea16bd4160f664d45193f031424cedad1b1fa8ba0f108dd7a34366c3ab226b493c4130c3097 WHIRLPOOL 2112d0efb420a24945b061f5f69a40f0a41d32b29e5c3360ab3319239b0fe7b16141bf83780ff3e8831724bd97c577c449ebd6b27ca1ae06175cef587ef5a7f0
+MISC ChangeLog 24148 SHA256 210e69fe4bbe97ca7c895d3a5d86cab882cada6e08ca19d61d85bf93df8e6e66 SHA512 ad30302f6e705fe7651eb3016b6cf85e288968732361a481fdae49d53ef2e3b2cb21f8675be82d743574c2f3312201cf6bbc5c2b4b5dd6e837215391b46baf01 WHIRLPOOL 3a6cb5c702b90f3b3e97618184765c0a1473f0a47ff787ea2d343fca92ce79ff5a161c40a38f41414df5e430a8c374860d01fbd4051a44e6a522a226ec4946e7
 MISC metadata.xml 312 SHA256 9d3f082956c89c24d50eacf1a35e6d3f7e7605a2b290b3ca01123c357595b680 SHA512 21f9fbd2145e18c319f089f1cb2f99cec289daac7e35c944335d979fca8ae595ac2ab81a025c55d56dde80ed7db88fdcd0b644bf2070b6eee7c26bf643fc4e19 WHIRLPOOL 5cfe4fa3453b53f0d056331b905da9584e13a48af3671f248b7ede707b587338b145613a77cf655af74734ae1e9d0dfe50f13d34a2cb069a73c76abc3a753262
diff --git a/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-20140508-r4.ebuild b/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-20140508-r4.ebuild
index 172c248..2855fd4 100644
--- a/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-20140508-r4.ebuild
+++ b/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-20140508-r4.ebuild
@@ -18,33 +18,28 @@ RDEPEND="~app-emulation/emul-linux-x86-baselibs-${PV}
 		!>=media-libs/harfbuzz-0.9.26-r1[abi_x86_32(-)]
 	)
 	abi_x86_32? (
-		>=x11-libs/pixman-0.30.2-r1[abi_x86_32(-)]
-		>=x11-libs/cairo-1.12.16-r1[abi_x86_32(-)]
-		>=x11-libs/gdk-pixbuf-2.30.5-r1[abi_x86_32(-)]
+		>=x11-libs/pixman-0.32.4[abi_x86_32(-)]
+		>=x11-libs/cairo-1.12.16-r2[abi_x86_32(-)]
+		>=x11-libs/gdk-pixbuf-2.30.7[abi_x86_32(-)]
 		>=media-gfx/graphite2-1.2.4-r1[abi_x86_32(-)]
 		>=media-libs/harfbuzz-0.9.26-r1[abi_x86_32(-)]
-		|| (
-			=x11-libs/pango-1.34.1-r1[abi_x86_32(-)]
-			>=x11-libs/pango-1.36.2-r1[abi_x86_32(-)]
-		)
+		>=x11-libs/pango-1.36.3[abi_x86_32(-)]
 		>=x11-libs/pangox-compat-0.0.2-r1[abi_x86_32(-)]
 		>=media-libs/imlib-1.9.15-r4[abi_x86_32(-)]
 		|| (
 			=dev-libs/atk-2.8.0-r1[abi_x86_32(-)]
 			>=dev-libs/atk-2.10.0-r1[abi_x86_32(-)]
 		)
-		>=x11-libs/gtk+-2.24.23-r1:2[abi_x86_32(-)]
 		>=x11-libs/gtk+-3.8.7-r1:3[abi_x86_32(-)]
 		>=dev-libs/libIDL-0.8.14-r1[abi_x86_32(-)]
-		>=gnome-base/gconf-3.2.6-r2[abi_x86_32(-)]
-		gnome-base/gnome-vfs[abi_x86_32(-)]
-		gnome-base/libglade[abi_x86_32(-)]
 		>=gnome-base/orbit-2.14.19-r4[abi_x86_32(-)]
-		x11-libs/libnotify[abi_x86_32(-)]
-		x11-themes/gtk-engines[abi_x86_32(-)]
+		>=x11-libs/libnotify-0.7.6-r1[abi_x86_32(-)]
+		>=x11-libs/gtk+-2.24.23-r2:2[abi_x86_32(-)]
+		>=gnome-base/gconf-3.2.6-r3[abi_x86_32(-)]
 		>=gnome-base/gnome-vfs-2.24.4-r2[abi_x86_32(-)]
 		=x11-themes/gtk-engines-xfce-3.0.1-r201[abi_x86_32(-)]
 		>=x11-themes/gtk-engines-xfce-3.0.1-r301[abi_x86_32(-)]
+		>=gnome-base/libglade-2.6.4-r2[abi_x86_32(-)]
 	)"
 # RDEPEND on opengl stuff needed due cairo, bug #410213
 
diff --git a/app-emulation/emul-linux-x86-gtklibs/files/remove-native-20140508-r4 b/app-emulation/emul-linux-x86-gtklibs/files/remove-native-20140508-r4
index 7ac5914..f7954fd 100644
--- a/app-emulation/emul-linux-x86-gtklibs/files/remove-native-20140508-r4
+++ b/app-emulation/emul-linux-x86-gtklibs/files/remove-native-20140508-r4
@@ -148,34 +148,26 @@ usr/lib32/gtk-2.0/2.10.0/engines/libindustrial.so
 usr/lib32/gtk-2.0/2.10.0/engines/libredmond95.so
 usr/lib32/gtk-2.0/2.10.0/engines/libcrux-engine.so
 usr/lib32/pkgconfig/gtk-engines-2.pc
+usr/lib32/GConf/2/libgconfbackend-evoldap.so
+usr/lib32/GConf/2/libgconfbackend-oldxml.so
+usr/lib32/GConf/2/libgconfbackend-xml.so
 usr/lib32/gio/modules/libgsettingsgconfbackend.so
-usr/lib32/pkgconfig/gconf-2.0.pc
 usr/lib32/libgconf-2.so
 usr/lib32/libgconf-2.so.4
 usr/lib32/libgconf-2.so.4.1.5
-usr/lib32/GConf/2/libgconfbackend-evoldap.so
-usr/lib32/GConf/2/libgconfbackend-oldxml.so
-usr/lib32/GConf/2/libgconfbackend-xml.so
-usr/lib32/pkgconfig/gnome-vfs-2.0.pc
+usr/lib32/pkgconfig/gconf-2.0.pc
 usr/lib32/gnome-vfs-2.0/include/gnome-vfs-file-size.h
-usr/lib32/libgnomevfs-2.la
-usr/lib32/libgnomevfs-2.so
-usr/lib32/libgnomevfs-2.so.0
-usr/lib32/libgnomevfs-2.so.0.2400.4
-usr/libexec/gnome-vfs-daemon
-usr/lib32/pkgconfig/gnome-vfs-module-2.0.pc
+usr/lib32/gnome-vfs-2.0/modules/libbzip2.so
 usr/lib32/gnome-vfs-2.0/modules/libcomputer.so
 usr/lib32/gnome-vfs-2.0/modules/libdns-sd.so
-usr/lib32/gnome-vfs-2.0/modules/libtar.so
+usr/lib32/gnome-vfs-2.0/modules/libfile.so
 usr/lib32/gnome-vfs-2.0/modules/libftp.so
-usr/lib32/gnome-vfs-2.0/modules/libbzip2.so
 usr/lib32/gnome-vfs-2.0/modules/libgzip.so
-usr/lib32/gnome-vfs-2.0/modules/libnetwork.so
-usr/lib32/gnome-vfs-2.0/modules/libsftp.so
 usr/lib32/gnome-vfs-2.0/modules/libhttp.so
+usr/lib32/gnome-vfs-2.0/modules/libnetwork.so
 usr/lib32/gnome-vfs-2.0/modules/libnntp.so
-usr/lib32/gnome-vfs-2.0/modules/libvfs-test.so
-usr/lib32/gnome-vfs-2.0/modules/libfile.so
+usr/lib32/gnome-vfs-2.0/modules/libsftp.so
+usr/lib32/gnome-vfs-2.0/modules/libtar.so
 usr/lib32/libgtk.la
 usr/lib32/libgtk.a
 usr/lib32/pkgconfig/gail-3.0.pc
@@ -235,7 +227,14 @@ usr/lib32/pkgconfig/libnotify.pc
 usr/lib32/libnotify.so
 usr/lib32/libnotify.so.4
 usr/lib32/libnotify.so.4.0.0
-usr/lib32/pkgconfig/libglade-2.0.pc
+usr/lib32/libgnomevfs-2.la
+usr/lib32/gnome-vfs-2.0/modules/libvfs-test.so
+usr/lib32/libgnomevfs-2.so
+usr/lib32/libgnomevfs-2.so.0
+usr/lib32/libgnomevfs-2.so.0.2400.4
+usr/libexec/gnome-vfs-daemon
+usr/lib32/pkgconfig/gnome-vfs-2.0.pc
+usr/lib32/pkgconfig/gnome-vfs-module-2.0.pc
 usr/lib32/libglade-2.0.so
 usr/lib32/libglade-2.0.so.0
 usr/lib32/libglade-2.0.so.0.0.7
@@ -255,3 +254,4 @@ usr/lib32/libgtk-1.2.so
 usr/lib32/libgtk-1.2.so.0
 usr/lib32/libgtk-1.2.so.0.9.1
 usr/lib32/pkgconfig/gtk+.pc
+usr/lib32/pkgconfig/libglade-2.0.pc
diff --git a/profiles/multilibpython-base/package.unmask b/profiles/multilibpython-base/package.unmask
index 9fc5156..fb73f67 100644
--- a/profiles/multilibpython-base/package.unmask
+++ b/profiles/multilibpython-base/package.unmask
@@ -1,4 +1,5 @@
-=app-emulation/emul-linux-x86-baselibs-20140508-r10
+=app-emulation/emul-linux-x86-baselibs-20140508-r15
+=app-emulation/emul-linux-x86-gtklibs-20140508-r4
 =media-libs/libart_lgpl-2.3.21-r2
 =sys-libs/cracklib-2.9.1-r1
 =net-libs/libtirpc-0.2.4-r2
@@ -151,4 +152,6 @@
 =net-libs/gssdp-0.14.8-r1
 =sys-libs/tdb-1.3.0-r1
 =net-libs/gupnp-0.20.12-r1
-
+=dev-libs/nspr-4.10.6-r1
+=net-misc/curl-7.37.0-r1
+=dev-libs/nss-3.16-r1