update libX11 wrt security bug 143647

(Portage version: 2.1.1_pre5-r2)
 (Signed Manifest commit)

3 files changed, 16 insertions, 123 deletions

diff --git a/app-emulation/emul-linux-x86-xlibs/Manifest b/app-emulation/emul-linux-x86-xlibs/Manifest
index ee07adf04aa5..1ca837473162 100644
--- a/app-emulation/emul-linux-x86-xlibs/Manifest
+++ b/app-emulation/emul-linux-x86-xlibs/Manifest
@@ -2,7 +2,7 @@
 Hash: SHA1
 
 DIST emul-linux-x86-xlibs-2.2.2.tar.bz2 4735717 RMD160 c6b67da6ed6042c34c67703bac2d3088da11dd55 SHA1 549878fb8cc95eb01a6a120f477dc57b6fc6a883 SHA256 477327f1d13aebba57a06406e3fc08b7f1d44d49d6e28b9316de3c933ff15c4d
-DIST emul-linux-x86-xlibs-7.0-r1.tar.bz2 3232719 RMD160 ba99f0ba6e1e24dac60d6f4c12bdd7b4a33fefc5 SHA1 d6621596bdfe1489f6b3d54ff676170408c0a546 SHA256 667ed56f6cd492ac7bc2252e846c5afc78ffa4cc9a573b437bba9a6d36519fb7
+DIST emul-linux-x86-xlibs-7.0-r2.tar.bz2 3232574 RMD160 84a00d0359e05f7e62259871bfd9106bfa25b946 SHA1 92555283cb7cb33e1dd0f49a0ec62131e8171618 SHA256 97a3bf82aa66ed71068dbeac5531dd763eb082b01cad956886b3291e769b6279
 DIST emul-linux-x86-xlibs-ati_dri-7.0.tar.bz2 3743164 RMD160 4bd8ac76725230b4c05ab06bcf194de93e4ab4ca SHA1 3b939e76680efcfda313a0fc7234a944d9951ce4 SHA256 febb86cc07eaee8d449f9e4d994ae29c7f3c4e9067d8f93fd14b4e4c5b5a063d
 DIST emul-linux-x86-xlibs-i810_dri-7.0.tar.bz2 2242803 RMD160 85257df90616c65f9ee28c87c478a07d6bb08dea SHA1 229b45c4b3a4076a2e2356cdfc3057e64b2d792d SHA256 e7b88b4b9a0071d5fccccb9185c4392c6119da84131530aa9194a57997f59d6f
 DIST emul-linux-x86-xlibs-mga_dri-7.0.tar.bz2 749975 RMD160 3b8ccce3aae0ed508fbd8c24d513bdb33b8af23b SHA1 cc9d497684c30602cf754990f53053e06ae20c8a SHA256 159650c0df35b2a1b627a4c5a0f4ffbdd1d8192fac35ef378fd75d11ab7038fe
@@ -20,14 +20,14 @@ EBUILD emul-linux-x86-xlibs-2.2.2.ebuild 1152 RMD160 6537c30b16dc35f463382a491b0
 MD5 954df312f95e787f49dc34965fc4f07a emul-linux-x86-xlibs-2.2.2.ebuild 1152
 RMD160 6537c30b16dc35f463382a491b0744e47321eddc emul-linux-x86-xlibs-2.2.2.ebuild 1152
 SHA256 2355673f0f94183ba8452cdcbaa824549783fb6b4c94ccae9f42444a1d836a27 emul-linux-x86-xlibs-2.2.2.ebuild 1152
-EBUILD emul-linux-x86-xlibs-7.0-r1.ebuild 2342 RMD160 8c5509a765af7a74753536487a05943e58c0004b SHA1 8e74cbf8e809a102c90167f9efdf7281cd4d377b SHA256 965540bcd4b48b377d969a08a2b537265f7b80ca755ef926dfa97a9a77432acf
-MD5 4261d37170499e0adda1d483424a28c9 emul-linux-x86-xlibs-7.0-r1.ebuild 2342
-RMD160 8c5509a765af7a74753536487a05943e58c0004b emul-linux-x86-xlibs-7.0-r1.ebuild 2342
-SHA256 965540bcd4b48b377d969a08a2b537265f7b80ca755ef926dfa97a9a77432acf emul-linux-x86-xlibs-7.0-r1.ebuild 2342
-MISC ChangeLog 8516 RMD160 1e6e9ae574d311c171c63b0fd84f0bce0da4577c SHA1 4aabefba8d9e3250f14b81e2d645a958156dcf55 SHA256 f49f8c50741c540dcb826a509297f6cda9c6d07d392215d548c73a1bc0f8b01c
-MD5 7bf015b2f630b437744a194b8196a08f ChangeLog 8516
-RMD160 1e6e9ae574d311c171c63b0fd84f0bce0da4577c ChangeLog 8516
-SHA256 f49f8c50741c540dcb826a509297f6cda9c6d07d392215d548c73a1bc0f8b01c ChangeLog 8516
+EBUILD emul-linux-x86-xlibs-7.0-r2.ebuild 2342 RMD160 2d58fc0d708ae5cfd39c82d60746c68a6bb8f1a4 SHA1 fa05bcb32cb6445b42956fef82bf479061d0a2aa SHA256 2c94a23513e0d275620489a4dc27bd2776474eb39ad016e95f1b1711af2d3cca
+MD5 3e540fdb48fd9dafa5c51c21957290f3 emul-linux-x86-xlibs-7.0-r2.ebuild 2342
+RMD160 2d58fc0d708ae5cfd39c82d60746c68a6bb8f1a4 emul-linux-x86-xlibs-7.0-r2.ebuild 2342
+SHA256 2c94a23513e0d275620489a4dc27bd2776474eb39ad016e95f1b1711af2d3cca emul-linux-x86-xlibs-7.0-r2.ebuild 2342
+MISC ChangeLog 8722 RMD160 dc405b0c104c43354dec1343c31ad41686964fe0 SHA1 59bf94b6f9293593e40f4d6b09be17862d6f6dc0 SHA256 d2ab73649536bab50c3e874c9588a17486be8fefefb834be727eeeacfacc985a
+MD5 4f521ecba825ff9c7ed2392ec28fd458 ChangeLog 8722
+RMD160 dc405b0c104c43354dec1343c31ad41686964fe0 ChangeLog 8722
+SHA256 d2ab73649536bab50c3e874c9588a17486be8fefefb834be727eeeacfacc985a ChangeLog 8722
 MISC metadata.xml 290 RMD160 29c2eafcf00e4b115ba5ae455218ee6eebda67ae SHA1 281918720fd1d692578d6419193b1027a1014b6a SHA256 8f04703141bc8cd55a0e56bf7593f657a891ed4796e71e3d6e8770c7ea098c30
 MD5 5e8c61d551dad88488a66992865ba737 metadata.xml 290
 RMD160 29c2eafcf00e4b115ba5ae455218ee6eebda67ae metadata.xml 290
@@ -38,13 +38,13 @@ SHA256 b9fb15ae79bdd68fd6f24d9eb3134946b3185ea4ea22d2a9849ab718c31b90ea files/di
 MD5 db234ca6317b37de497f2d1433116e6c files/digest-emul-linux-x86-xlibs-2.2.2-r1 286
 RMD160 45c0a9982e1d94b4a07b1e66193705e118d8fb41 files/digest-emul-linux-x86-xlibs-2.2.2-r1 286
 SHA256 b9fb15ae79bdd68fd6f24d9eb3134946b3185ea4ea22d2a9849ab718c31b90ea files/digest-emul-linux-x86-xlibs-2.2.2-r1 286
-MD5 b12d5bae30d1388241b12d14c145e8c2 files/digest-emul-linux-x86-xlibs-7.0-r1 3043
-RMD160 a6fc192a15ba95ab0e7f6b454a549e0217ab8e40 files/digest-emul-linux-x86-xlibs-7.0-r1 3043
-SHA256 3970c2daf7d10cce816df8db8b58b088210720e9fb6a9ecead4dabe16bf10066 files/digest-emul-linux-x86-xlibs-7.0-r1 3043
+MD5 32ce84c97c4c0e0a5cb46a1ecb29fcec files/digest-emul-linux-x86-xlibs-7.0-r2 3043
+RMD160 1fe891de294994877310ce2ad6a6b83570a4024e files/digest-emul-linux-x86-xlibs-7.0-r2 3043
+SHA256 0c91f0332d41b16c6ee45f4a9c07872c8a5ddf123024c6d71fd17037b7857a78 files/digest-emul-linux-x86-xlibs-7.0-r2 3043
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.4 (GNU/Linux)
+Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFEzHO22G5bA0cA/ScRAmr3AKDoMePRZ7gm++aSYlw00GBr+Cv+awCeNKbe
-phrd0JJ8PDrUgF1p5eekGY0=
-=jtWm
+iD8DBQFE506F2G5bA0cA/ScRAgyYAJ9yix5tVhkCfvpQqpnjzAYOti0MEACfZw05
+i5XVv5gGQxaxcKDVQ5r1uSo=
+=yzF9
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-7.0-r1.ebuild b/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-7.0-r1.ebuild
deleted file mode 100644
index 7208c3db6ff9..000000000000
--- a/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-7.0-r1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-7.0-r1.ebuild,v 1.5 2006/07/30 08:54:04 herbs Exp $
-
-inherit multilib
-
-DESCRIPTION="X11R6 libraries for emulation of 32bit x86 on amd64"
-HOMEPAGE="http://www.gentoo.org/"
-SRC_URI="mirror://gentoo/emul-linux-x86-xlibs-${PVR}.tar.bz2
-		video_cards_i810? ( mirror://gentoo/emul-linux-x86-xlibs-i810_dri-${PV}.tar.bz2 )
-		video_cards_mach64? ( mirror://gentoo/emul-linux-x86-xlibs-ati_dri-${PV}.tar.bz2 )
-		video_cards_mga? ( mirror://gentoo/emul-linux-x86-xlibs-mga_dri-${PV}.tar.bz2 )
-		video_cards_r128? ( mirror://gentoo/emul-linux-x86-xlibs-ati_dri-${PV}.tar.bz2 )
-		video_cards_radeon? ( mirror://gentoo/emul-linux-x86-xlibs-ati_dri-${PV}.tar.bz2 )
-		video_cards_s3virge? ( mirror://gentoo/emul-linux-x86-xlibs-s3virge_dri-${PV}.tar.bz2 )
-		video_cards_savage? ( mirror://gentoo/emul-linux-x86-xlibs-savage_dri-${PV}.tar.bz2 )
-		video_cards_sis? ( mirror://gentoo/emul-linux-x86-xlibs-sis_dri-${PV}.tar.bz2 )
-		video_cards_tdfx? ( mirror://gentoo/emul-linux-x86-xlibs-tdfx_dri-${PV}.tar.bz2 )
-		video_cards_trident? ( mirror://gentoo/emul-linux-x86-xlibs-trident_dri-${PV}.tar.bz2 )
-		video_cards_via? ( mirror://gentoo/emul-linux-x86-xlibs-via_dri-${PV}.tar.bz2 )"
-
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* amd64"
-
-IUSE_VIDEO_CARDS="
-	video_cards_i810
-	video_cards_mach64
-	video_cards_mga
-	video_cards_r128
-	video_cards_radeon
-	video_cards_s3virge
-	video_cards_savage
-	video_cards_sis
-	video_cards_tdfx
-	video_cards_trident
-	video_cards_via"
-
-IUSE="opengl ${IUSE_VIDEO_CARDS}"
-
-DEPEND=""
-
-RDEPEND="opengl? ( app-admin/eselect-opengl )
-	 virtual/libc
-	 >=app-emulation/emul-linux-x86-baselibs-2.5"
-
-S=${WORKDIR}
-
-RESTRICT="nostrip"
-
-pkg_preinst() {
-	# Check for bad symlink before installing, bug 84441.
-	if [ -L /emul/linux/x86/usr/lib/X11 ]; then
-		rm -f /emul/linux/x86/usr/lib/X11
-	fi
-}
-
-src_install() {
-	cp -RPvf ${WORKDIR}/* ${D}/
-
-	local libdir="lib32"
-	if has_multilib_profile; then
-		libdir=$(get_abi_LIBDIR x86)
-	fi
-
-	dodir /usr/${libdir}/opengl
-	dosym /emul/linux/x86/usr/lib/opengl/xorg-x11 /usr/${libdir}/opengl/xorg-x11
-}
-
-pkg_postinst() {
-	#update GL symlinks
-	if use opengl ; then
-		/usr/bin/eselect opengl set --use-old
-	fi
-}
-
diff --git a/app-emulation/emul-linux-x86-xlibs/files/digest-emul-linux-x86-xlibs-7.0-r1 b/app-emulation/emul-linux-x86-xlibs/files/digest-emul-linux-x86-xlibs-7.0-r1
deleted file mode 100644
index a1ad3cd88fdb..000000000000
--- a/app-emulation/emul-linux-x86-xlibs/files/digest-emul-linux-x86-xlibs-7.0-r1
+++ /dev/null
@@ -1,30 +0,0 @@
-RMD160 ba99f0ba6e1e24dac60d6f4c12bdd7b4a33fefc5 emul-linux-x86-xlibs-7.0-r1.tar.bz2 3232719
-SHA256 667ed56f6cd492ac7bc2252e846c5afc78ffa4cc9a573b437bba9a6d36519fb7 emul-linux-x86-xlibs-7.0-r1.tar.bz2 3232719
-RMD160 4bd8ac76725230b4c05ab06bcf194de93e4ab4ca emul-linux-x86-xlibs-ati_dri-7.0.tar.bz2 3743164
-SHA256 febb86cc07eaee8d449f9e4d994ae29c7f3c4e9067d8f93fd14b4e4c5b5a063d emul-linux-x86-xlibs-ati_dri-7.0.tar.bz2 3743164
-RMD160 85257df90616c65f9ee28c87c478a07d6bb08dea emul-linux-x86-xlibs-i810_dri-7.0.tar.bz2 2242803
-SHA256 e7b88b4b9a0071d5fccccb9185c4392c6119da84131530aa9194a57997f59d6f emul-linux-x86-xlibs-i810_dri-7.0.tar.bz2 2242803
-RMD160 3b8ccce3aae0ed508fbd8c24d513bdb33b8af23b emul-linux-x86-xlibs-mga_dri-7.0.tar.bz2 749975
-SHA256 159650c0df35b2a1b627a4c5a0f4ffbdd1d8192fac35ef378fd75d11ab7038fe emul-linux-x86-xlibs-mga_dri-7.0.tar.bz2 749975
-RMD160 3df360b409e0432234f37c7662d8fca7fe74c5cd emul-linux-x86-xlibs-s3virge_dri-7.0.tar.bz2 716284
-SHA256 18fc5da1288a623ff2c0cd6ee5b177d90d3e634209c96675d244f8b435cdae93 emul-linux-x86-xlibs-s3virge_dri-7.0.tar.bz2 716284
-RMD160 9545cadecc0dfa9dec1a801850fed63cb92b9a37 emul-linux-x86-xlibs-savage_dri-7.0.tar.bz2 740433
-SHA256 33e82602e7c57e42e86ebcd29fc3fd568a06ada9091ba8484d3cbfda9d2a6230 emul-linux-x86-xlibs-savage_dri-7.0.tar.bz2 740433
-RMD160 c980124403a183435ef7328c36decb857d4e344c emul-linux-x86-xlibs-sis_dri-7.0.tar.bz2 727198
-SHA256 b93c61db78c67de7188ac6e20edd8f39db5af9df58283c613e94d147742dac84 emul-linux-x86-xlibs-sis_dri-7.0.tar.bz2 727198
-RMD160 6d70e3d16c903a8383a1168687363d7626318c8a emul-linux-x86-xlibs-tdfx_dri-7.0.tar.bz2 741194
-SHA256 e07cdf5f4d682c1856b83c5b06765b24ca51fb8f29f0d5c7ce7992ea499a0ca4 emul-linux-x86-xlibs-tdfx_dri-7.0.tar.bz2 741194
-RMD160 8460f56d6829d41c042c040bab830084dd1b9958 emul-linux-x86-xlibs-trident_dri-7.0.tar.bz2 699399
-SHA256 d393ba2e1ba8cddd9b3861afdd7f19520b258400f76df8cd5c8fc056671256e5 emul-linux-x86-xlibs-trident_dri-7.0.tar.bz2 699399
-RMD160 201d284ab22ac501ec7b20b2ca419696326f1532 emul-linux-x86-xlibs-via_dri-7.0.tar.bz2 755605
-SHA256 5a64d00eb39684e32f6b1aa045437fb6883e4a090303a70c8e6a7fc3f4e6a995 emul-linux-x86-xlibs-via_dri-7.0.tar.bz2 755605
-MD5 0b4050967f6e0d50dfafe00c8d3bb3e3 emul-linux-x86-xlibs-7.0-r1.tar.bz2 3232719
-MD5 bf2fa2e8b937b767bcf16a2be8afff74 emul-linux-x86-xlibs-ati_dri-7.0.tar.bz2 3743164
-MD5 e36bba25dd4955e761c9099695aae319 emul-linux-x86-xlibs-i810_dri-7.0.tar.bz2 2242803
-MD5 21a1f60641146ca5d3331ea982f97c7f emul-linux-x86-xlibs-mga_dri-7.0.tar.bz2 749975
-MD5 fe34e55e1dd5bc73904bbc4e96a3a134 emul-linux-x86-xlibs-s3virge_dri-7.0.tar.bz2 716284
-MD5 ada4398fc3e8845683fc5d1fbd2d16b2 emul-linux-x86-xlibs-savage_dri-7.0.tar.bz2 740433
-MD5 b0c2ebaea9b235b7c98287871ee3294f emul-linux-x86-xlibs-sis_dri-7.0.tar.bz2 727198
-MD5 57cf19d69012a5e682516ee214605cc4 emul-linux-x86-xlibs-tdfx_dri-7.0.tar.bz2 741194
-MD5 cb538216fe6a7e5de5214a7715d3a6ef emul-linux-x86-xlibs-trident_dri-7.0.tar.bz2 699399
-MD5 b91b5b76579259e59f7593c4733fa772 emul-linux-x86-xlibs-via_dri-7.0.tar.bz2 755605