From: Mike Frysinger <vapier@gentoo.org>
Date: Sun, 3 Dec 2006 03:25:28 +0000 (+0000)
Subject: arm/sh stable
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=466e8c9dd93d0c2a169fb3bfa44cd23091012f7b;p=gentoo.git

arm/sh stable
Package-Manager: portage-2.1.2_rc2-r3
---

diff --git a/x11-libs/pango/Manifest b/x11-libs/pango/Manifest
index e677aa436009..021db324c619 100644
--- a/x11-libs/pango/Manifest
+++ b/x11-libs/pango/Manifest
@@ -47,10 +47,10 @@ EBUILD pango-1.14.5.ebuild 1914 RMD160 7cdbd013b115fd5d0a877376743f01340701ef85
 MD5 8d7a7874b030f7c9bdecf83237667cab pango-1.14.5.ebuild 1914
 RMD160 7cdbd013b115fd5d0a877376743f01340701ef85 pango-1.14.5.ebuild 1914
 SHA256 56843f3329601477ec74e0ac1ab26c6731818682040b3288dd7833b0aa8636c8 pango-1.14.5.ebuild 1914
-EBUILD pango-1.14.7.ebuild 1912 RMD160 8e65e05cd4825f7e3095ca537b39b3519b0e61e8 SHA1 f7fc317d3a5c7bccc9549c4094485bd15b652730 SHA256 26694dc08bc2da74497988534723dcc93c0334f126b082296a1338cf20b949f2
-MD5 f06dfaefec3f508d16e0086abb1dec95 pango-1.14.7.ebuild 1912
-RMD160 8e65e05cd4825f7e3095ca537b39b3519b0e61e8 pango-1.14.7.ebuild 1912
-SHA256 26694dc08bc2da74497988534723dcc93c0334f126b082296a1338cf20b949f2 pango-1.14.7.ebuild 1912
+EBUILD pango-1.14.7.ebuild 1830 RMD160 8034d5984c1c4e52bf031623ca5d30f1536ebcde SHA1 d62acb0c717ade1b62f7e6921964a7e7e49abb58 SHA256 f309905e49232f31d6010a3d9d481d863dc6e184123e9efec64ed0b2f828dac1
+MD5 cf1fe2fdee7fc952d61ce8516e21ef8e pango-1.14.7.ebuild 1830
+RMD160 8034d5984c1c4e52bf031623ca5d30f1536ebcde pango-1.14.7.ebuild 1830
+SHA256 f309905e49232f31d6010a3d9d481d863dc6e184123e9efec64ed0b2f828dac1 pango-1.14.7.ebuild 1830
 EBUILD pango-1.8.1-r1.ebuild 1961 RMD160 8bf66abc39d42c39210cdb43702156081b8235c9 SHA1 cd8290cb18d51b74fff0ea3e83e9e6569af0bddb SHA256 0c4d5c74beb1dd95894589a10723b36b283a550151cbfee162968d709cf8799c
 MD5 abcee4362d0b307dba2da9c28ee7c6d6 pango-1.8.1-r1.ebuild 1961
 RMD160 8bf66abc39d42c39210cdb43702156081b8235c9 pango-1.8.1-r1.ebuild 1961
@@ -82,9 +82,9 @@ MD5 37c46502c273a766b78fe061986399f2 files/digest-pango-1.8.1-r1 238
 RMD160 e98af1354b37ef4e32924db03d58d55d67bdc9fb files/digest-pango-1.8.1-r1 238
 SHA256 76a89f7604e3097c63f867f839404ce677ede29010d2957e52ee6f9e06a06741 files/digest-pango-1.8.1-r1 238
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5-ecc0.1.6 (GNU/Linux)
+Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFcILpKRy60XGEcJIRAoyeAKCM7t+vm5iMBDVpbbvhnOyh+RBuigCdG0Sx
-iXiJDAPtGNfp3wD2Ul5DgcU=
-=gWCs
+iD8DBQFFckOwamhnQswr0vIRAsf6AJwJA+d1A0MqSaqqTkhN3xl/oZyDQwCfdWyD
+KnlFThW14Z0oFyEv8YPs1Tw=
+=OHcl
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/pango/pango-1.14.7.ebuild b/x11-libs/pango/pango-1.14.7.ebuild
index f039079480b9..37531b4bce45 100644
--- a/x11-libs/pango/pango-1.14.7.ebuild
+++ b/x11-libs/pango/pango-1.14.7.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/pango/pango-1.14.7.ebuild,v 1.7 2006/12/01 19:30:30 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/pango-1.14.7.ebuild,v 1.8 2006/12/03 03:25:28 vapier Exp $
 
 inherit eutils gnome2
 
@@ -9,29 +9,23 @@ HOMEPAGE="http://www.pango.org/"
 
 LICENSE="LGPL-2 FTL"
 SLOT="0"
-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="doc"
 
-RDEPEND="|| (
-				(
-					x11-libs/libXrender
-					x11-libs/libX11
-					x11-libs/libXft
-				)
-				virtual/x11
-			)
+RDEPEND="x11-libs/libXrender
+	x11-libs/libX11
+	x11-libs/libXft
 	>=dev-libs/glib-2.10.0
 	>=media-libs/fontconfig-1.0.1
 	>=media-libs/freetype-2
 	>=x11-libs/cairo-1.2.2"
-
 DEPEND="${RDEPEND}
 	>=dev-util/pkgconfig-0.9
-	|| ( x11-proto/xproto virtual/x11 )
-	doc?	(
-				>=dev-util/gtk-doc-1
-				~app-text/docbook-xml-dtd-4.1.2
-			)"
+	x11-proto/xproto
+	doc? (
+		>=dev-util/gtk-doc-1
+		~app-text/docbook-xml-dtd-4.1.2
+	)"
 
 DOCS="AUTHORS ChangeLog* NEWS README TODO*"