From c5c6773f0ae6d7d1b6a2ccfde74ac8de327bb574 Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@gentoo.org>
Date: Sun, 12 Nov 2006 03:27:56 +0000
Subject: [PATCH] arm/sh stable Package-Manager: portage-2.1.2_rc1-r5

---
 x11-libs/gtk+/Manifest               | 14 ++++++-------
 x11-libs/gtk+/gtk+-1.2.10-r12.ebuild | 30 +++++++++++-----------------
 2 files changed, 19 insertions(+), 25 deletions(-)

diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
index 263704788088..240b45dd676c 100644
--- a/x11-libs/gtk+/Manifest
+++ b/x11-libs/gtk+/Manifest
@@ -56,10 +56,10 @@ EBUILD gtk+-1.2.10-r11.ebuild 2033 RMD160 24ec6feebfce673f0a81af1905963741f8e073
 MD5 2f736fc4a5ca2d7d68e746063414ea85 gtk+-1.2.10-r11.ebuild 2033
 RMD160 24ec6feebfce673f0a81af1905963741f8e073de gtk+-1.2.10-r11.ebuild 2033
 SHA256 b581707ebeb94e69954bd080234d2667b8e8c9aa90b933df8c8677d41628b697 gtk+-1.2.10-r11.ebuild 2033
-EBUILD gtk+-1.2.10-r12.ebuild 2364 RMD160 063ba1824b1c536bdd8fa4045e57aabba04e2a4d SHA1 f0daab80d06a205a0b807aad9f6bb4199903bdde SHA256 b7dd199d324b635b581a14e26be9bf1eaed23ce1c936c2aeb7b84057a3602b2f
-MD5 98f0303bfb06fd3967b722257babb09a gtk+-1.2.10-r12.ebuild 2364
-RMD160 063ba1824b1c536bdd8fa4045e57aabba04e2a4d gtk+-1.2.10-r12.ebuild 2364
-SHA256 b7dd199d324b635b581a14e26be9bf1eaed23ce1c936c2aeb7b84057a3602b2f gtk+-1.2.10-r12.ebuild 2364
+EBUILD gtk+-1.2.10-r12.ebuild 2320 RMD160 e969b3b74e831d40799ea1bdfbe08a1eb03882a5 SHA1 bb5e2a4477553301690123a93080534a1f02cd69 SHA256 47548266fb2307527b5c373c75099589b48ee3c8b30cbae394a7246e3d869d03
+MD5 58664054a0d023536e4326c1c52e21b1 gtk+-1.2.10-r12.ebuild 2320
+RMD160 e969b3b74e831d40799ea1bdfbe08a1eb03882a5 gtk+-1.2.10-r12.ebuild 2320
+SHA256 47548266fb2307527b5c373c75099589b48ee3c8b30cbae394a7246e3d869d03 gtk+-1.2.10-r12.ebuild 2320
 EBUILD gtk+-2.10.6.ebuild 4449 RMD160 e635e7f8193ac2db60d610ebe5b0bfc90b5023a5 SHA1 aa520b3905c27886cdf6ee0856285c9858e2f2f2 SHA256 77c4f3963b459a1f50e6a9bcf687b48c599a7964abd1d70b5d07d5817cbdbcba
 MD5 6d29bc13861093c94f008ed05d90bac2 gtk+-2.10.6.ebuild 4449
 RMD160 e635e7f8193ac2db60d610ebe5b0bfc90b5023a5 gtk+-2.10.6.ebuild 4449
@@ -119,7 +119,7 @@ SHA256 e263619d35ad46ec239b36623c4b6768ff50ae9e2cf4ad01d716e17f0608cd74 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFTXqukeYb6olFHJcRAp2xAJ4u7ulXQNL2lCdi49sIib42HZhOegCdE5bq
-Xm+ZMJeTI4+0MFQ1zW3LXro=
-=CjBY
+iD8DBQFFVpTJamhnQswr0vIRAqkEAKCIDztBos/73oA9zyxtrFd9glmwRgCfZX6X
+/tnGYXGGisEiIMvoBfMCgRw=
+=vmG3
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/gtk+/gtk+-1.2.10-r12.ebuild b/x11-libs/gtk+/gtk+-1.2.10-r12.ebuild
index edf5a11bd74d..fdab52cd85de 100644
--- a/x11-libs/gtk+/gtk+-1.2.10-r12.ebuild
+++ b/x11-libs/gtk+/gtk+-1.2.10-r12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-1.2.10-r12.ebuild,v 1.10 2006/11/05 05:46:22 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-1.2.10-r12.ebuild,v 1.11 2006/11/12 03:27:56 vapier Exp $
 
 GNOME_TARBALL_SUFFIX="gz"
 WANT_AUTOMAKE=1.4
@@ -12,7 +12,7 @@ SRC_URI="${SRC_URI} http://www.ibiblio.org/gentoo/distfiles/gtk+-1.2.10-r8-gento
 
 LICENSE="LGPL-2.1"
 SLOT="1"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd"
 IUSE="nls debug"
 
 # Supported languages and translated documentation
@@ -20,23 +20,17 @@ IUSE="nls debug"
 MY_AVAILABLE_LINGUAS=" az ca cs da de el es et eu fi fr ga gl hr hu it ja ko lt nl nn no pl pt_BR pt ro ru sk sl sr sv tr uk vi"
 IUSE="${IUSE} ${MY_AVAILABLE_LINGUAS// / linguas_}"
 
-RDEPEND="||	(
-				(
-					x11-libs/libXi
-					x11-libs/libXt
-				)
-				virtual/x11
-			)
-		 =dev-libs/glib-1.2*"
+RDEPEND="=dev-libs/glib-1.2*
+	||	(
+		( x11-libs/libXi x11-libs/libXt )
+		virtual/x11
+	)"
 DEPEND="${RDEPEND}
-		||	(
-				(
-					x11-proto/inputproto
-					x11-proto/xextproto
-				)
-				virtual/x11
-			)
-		nls? ( sys-devel/gettext dev-util/intltool )"
+	||	(
+		( x11-proto/inputproto x11-proto/xextproto )
+		virtual/x11
+	)
+	nls? ( sys-devel/gettext dev-util/intltool )"
 
 src_unpack() {
 	unpack ${P}.tar.gz
-- 
2.26.2