ppc64 stable wrt #331277

Package-Manager: portage-2.2_rc99/cvs/Linux x86_64

4 files changed, 8 insertions, 33 deletions

diff --git a/x11-libs/libXi/ChangeLog b/x11-libs/libXi/ChangeLog
index 784213e9cff7..a13587eec357 100644
--- a/x11-libs/libXi/ChangeLog
+++ b/x11-libs/libXi/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-libs/libXi
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXi/ChangeLog,v 1.92 2010/10/22 18:56:27 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXi/ChangeLog,v 1.93 2010/10/22 20:30:47 ssuominen Exp $
+
+  22 Oct 2010; Samuli Suominen <ssuominen@gentoo.org> libXi-1.3.1.ebuild:
+  ppc64 stable wrt #331277
 
   22 Oct 2010; Brent Baude <ranger@gentoo.org> libXi-1.3.1.ebuild:
   stable ppc, bug 331277
diff --git a/x11-libs/libXi/Manifest b/x11-libs/libXi/Manifest
index e1ec29290c2e..43e2f1e06125 100644
--- a/x11-libs/libXi/Manifest
+++ b/x11-libs/libXi/Manifest
@@ -1,7 +1,5 @@
 AUX 1.3.1-0001-Add-configure-switch-for-manpages-regenerating.patch 2370 RMD160 28723892b5d6f5b23ff2c0f418395e291338e0b5 SHA1 165fc656a87f5d9381482ad05a6addd9331e65b5 SHA256 0019af772621bb9b926317b1d24db70ebf80f3fae74674de0f3250e3e544155d
 DIST libXi-1.3.1.tar.bz2 359359 RMD160 3a80ba00bb68119d49517c8c1e8a844b905f587f SHA1 1a772a9c6e16c1bf26bb987d0be77a1f24f4ec91 SHA256 c38e88783f0f4dd2bd547f182060e83b5a963c973a6b0bb4e16be4c5e1776111
-DIST libXi-1.3.tar.bz2 350827 RMD160 d7848e8dc9a6a3882bf722eccf75f21b5f99fecd SHA1 7685f2881ce40b13028d9409eedbb9cf1ed0d8ef SHA256 362b8c0c60386841063bd7e01afa72e37eb87ada6e64e539d960f88c780a944b
-EBUILD libXi-1.3.1.ebuild 1063 RMD160 0bc848b89a25c4d01deb5af1b7dfd78f946c5e27 SHA1 240fb5a71c455dd515464e06610af912039c1e23 SHA256 cfc64661d189474cdca21570df5666b043e8cb22feadf7f16633bd92c0951a37
-EBUILD libXi-1.3.ebuild 801 RMD160 0385f0efb6a16d563ec1bed65a6f93fc1e71f5cb SHA1 82d9277825fc9f8b7092a302f4462f4a89de9f13 SHA256 5d31bd55ba5d9a6b08f1715d2ab418dcb34aa191d17104fe096d4701420d6efe
-MISC ChangeLog 11242 RMD160 6f05e1b83a297185d70460d9d77e1cecb0339fb4 SHA1 cf4e157624bce3e007c5458a1c6255a41203f35e SHA256 88d3ed0f33d5320078f6fe8a12b141d41f6fdbc4f328fab50f5ef23d09107f76
+EBUILD libXi-1.3.1.ebuild 1065 RMD160 c60e0c889320e4b3cf971e1a3343df1abd10b311 SHA1 442317e943840c87bac178b12962e5ec396f9f06 SHA256 4c613550b6dcc73d54c4c1e2ae104e0ccc478779ed086e2f8846037a7e7243ac
+MISC ChangeLog 11347 RMD160 4292c9c2822747183f0d12a15db85c9667367227 SHA1 bbfddc12ae32b9a815572c2e2eed213866d50964 SHA256 073af1596a71594b5d4737a4b79ccbafd62e04ef97845d69c0a9e6712b45a7ea
 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
diff --git a/x11-libs/libXi/libXi-1.3.1.ebuild b/x11-libs/libXi/libXi-1.3.1.ebuild
index f1925f4ccb29..fe4abdba7b54 100644
--- a/x11-libs/libXi/libXi-1.3.1.ebuild
+++ b/x11-libs/libXi/libXi-1.3.1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXi/libXi-1.3.1.ebuild,v 1.10 2010/10/22 18:56:27 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXi/libXi-1.3.1.ebuild,v 1.11 2010/10/22 20:30:47 ssuominen Exp $
 
 EAPI=3
 XORG_EAUTORECONF="yes"
 inherit xorg-2
 
 DESCRIPTION="X.Org Xi library"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ~ppc64 s390 sh sparc x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="doc"
 
 RDEPEND="
diff --git a/x11-libs/libXi/libXi-1.3.ebuild b/x11-libs/libXi/libXi-1.3.ebuild
deleted file mode 100644
index cbbff81da7e8..000000000000
--- a/x11-libs/libXi/libXi-1.3.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXi/libXi-1.3.ebuild,v 1.9 2010/08/02 18:24:09 armin76 Exp $
-
-inherit x-modular
-
-DESCRIPTION="X.Org Xi library"
-
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE=""
-
-RDEPEND="
-	>=x11-libs/libX11-1.3
-	>=x11-libs/libXext-1.1
-	>=x11-proto/inputproto-2.0
-"
-DEPEND="${RDEPEND}
-	>=x11-proto/xproto-7.0.16
-"
-
-pkg_postinst() {
-	x-modular_pkg_postinst
-
-	ewarn "Some special keys and keyboard layouts may stop working."
-	ewarn "To fix them, recompile xorg-server."
-}