x11-libs/pango: wrong commit, revert

Package-Manager: portage-2.2_rc52/cvs/Linux i686

4 files changed, 20 insertions, 16 deletions

diff --git a/x11-libs/pango/ChangeLog b/x11-libs/pango/ChangeLog
index cd4a70055624..cbd3dcbe0cd9 100644
--- a/x11-libs/pango/ChangeLog
+++ b/x11-libs/pango/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/pango
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/ChangeLog,v 1.278 2009/11/21 09:35:37 mrpouet Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/ChangeLog,v 1.279 2009/11/28 17:39:38 remi Exp $
+
+  28 Nov 2009; Rémi Cardona <remi@gentoo.org> pango-1.24.5-r1.ebuild,
+  pango-1.26.0.ebuild:
+  wrong commit, revert
 
 *pango-1.26.1 (21 Nov 2009)
 
diff --git a/x11-libs/pango/Manifest b/x11-libs/pango/Manifest
index 4e61059ab7e2..d4667a46fddb 100644
--- a/x11-libs/pango/Manifest
+++ b/x11-libs/pango/Manifest
@@ -5,8 +5,8 @@ AUX pango-1.26.0-lib64.patch 499 RMD160 0056b738ff517c2b1eb1a6b8e8173d91af0ebeaf
 DIST pango-1.24.5.tar.bz2 1519944 RMD160 7e436752734c55950ad5feced7c7d5c3f040a1b4 SHA1 a5aa40b78546a7ee59f21804b172e5d47ef776ad SHA256 0f733d1ec3e8dafcae152d7ac58f1090bee1fd856176c8fee0e81b0e42392f4e
 DIST pango-1.26.0.tar.bz2 1535736 RMD160 b3b64d6af1eb9cc27d23a7e58d118df8fed25502 SHA1 567f9ace5a8384b3a59dbf95304dc8b1a271d5b6 SHA256 e1bfaefd2614ff86d531152f31fbf4a61aea723eef19b132733ccd3eb8d9a6c3
 DIST pango-1.26.1.tar.bz2 1538050 RMD160 cc9e3bd5d4cdfcb9c2298b75c4b02fee31816184 SHA1 d4891a34a46ddc9a6e37bcdf0fef4cbab7391b7b SHA256 e0254e979bf0fac305de596997cabda83e26c713b666bc582aa9e4b70cb0920d
-EBUILD pango-1.24.5-r1.ebuild 1806 RMD160 f6b2472f8d5b3d4c62c0043cfd4f09344ec7cb73 SHA1 3bde582ad1278b0ae98c5dd550e2323941055d86 SHA256 e67c56a243302ab456446726ee310c22db2316751e2b9f88668a3c4fed6f3342
-EBUILD pango-1.26.0.ebuild 2282 RMD160 f2359276b445a700ff2979e6934645cc0bbbbb1c SHA1 dc5ea5dc3756e335fcf37fca847dcb6bab5e3218 SHA256 d0eca495d936cfe9599ea3e91475810eb5fbdbdd5184316de1bf79ea085d0786
+EBUILD pango-1.24.5-r1.ebuild 1803 RMD160 c7465bb78db73e8b12e8cd38a030add0d944da8d SHA1 9e5c0b1e9113d45c00a604604c57cda4fd50828a SHA256 188431199fc5dac7f0a2384b945259fd765c49bd7edd144034721585f2e7eb9a
+EBUILD pango-1.26.0.ebuild 2283 RMD160 4d1531ef2ece5a20fa1614f67a0ff47ff480386c SHA1 4006e3b35853d5d8c3882dee5929190f2c2e1b94 SHA256 9e619259ce69794a8500dd499e90274876250b8416d7f373b17eb72aa1ef09ed
 EBUILD pango-1.26.1.ebuild 2191 RMD160 29a594c7729ec8ff0e808d04f5d6ba0754646894 SHA1 1e00641c2824af8188ef13e81079f637a77607e0 SHA256 0e402c88ffbc76864afdd237ede51e270ad3b09d080c08b237695fc388a7d41d
-MISC ChangeLog 34679 RMD160 99d6d5e1af789ece079db00ade44e7d98a708a9c SHA1 884a6a5c636add84fe661be1b7f900e2e8a48469 SHA256 5878dadbd046655ba510ca82d5950687026735daf904f5f7a48652d4dcd06069
+MISC ChangeLog 34794 RMD160 47c36509a248fe9acaa0f5ec3333543fd14d8c64 SHA1 a21d41293bd3e95e2f9d69ce693d7f7d31135d85 SHA256 88d055b00a6d0b6432bf8a60053f8101ce9b74178853d976cf84ce029342a7bc
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
diff --git a/x11-libs/pango/pango-1.24.5-r1.ebuild b/x11-libs/pango/pango-1.24.5-r1.ebuild
index 04c605046227..58117a2e7d62 100644
--- a/x11-libs/pango/pango-1.24.5-r1.ebuild
+++ b/x11-libs/pango/pango-1.24.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/pango-1.24.5-r1.ebuild,v 1.11 2009/11/28 14:48:11 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/pango-1.24.5-r1.ebuild,v 1.12 2009/11/28 17:39:38 remi Exp $
 
 EAPI="2"
 GCONF_DEBUG="yes"
@@ -13,14 +13,14 @@ HOMEPAGE="http://www.pango.org/"
 LICENSE="LGPL-2 FTL"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE="deprecated doc test"
+IUSE="X doc test"
 
 # FIXME: add gobject-introspection dependency when it is available
 RDEPEND=">=dev-libs/glib-2.17.3
 	>=media-libs/fontconfig-2.5.0
 	media-libs/freetype:2
-	>=x11-libs/cairo-1.7.6
-	deprecated? (
+	>=x11-libs/cairo-1.7.6[X?]
+	X? (
 		x11-libs/libXrender
 		x11-libs/libX11
 		x11-libs/libXft )"
@@ -32,7 +32,7 @@ DEPEND="${RDEPEND}
 	test? (  >=dev-util/gtk-doc-1
 		~app-text/docbook-xml-dtd-4.1.2
 		x11-libs/libXft )
-	deprecated? ( x11-proto/xproto )"
+	X? ( x11-proto/xproto )"
 
 DOCS="AUTHORS ChangeLog* NEWS README THANKS"
 
@@ -41,7 +41,7 @@ function multilib_enabled() {
 }
 
 pkg_setup() {
-	G2CONF="${G2CONF} $(use_with deprecated x)"
+	G2CONF="${G2CONF} $(use_with X x)"
 }
 
 src_prepare() {
diff --git a/x11-libs/pango/pango-1.26.0.ebuild b/x11-libs/pango/pango-1.26.0.ebuild
index 6b3ac804a860..8b3846585dbc 100644
--- a/x11-libs/pango/pango-1.26.0.ebuild
+++ b/x11-libs/pango/pango-1.26.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/pango-1.26.0.ebuild,v 1.4 2009/11/28 14:48:11 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/pango-1.26.0.ebuild,v 1.5 2009/11/28 17:39:38 remi Exp $
 
 EAPI="2"
 GCONF_DEBUG="yes"
@@ -13,13 +13,13 @@ HOMEPAGE="http://www.pango.org/"
 LICENSE="LGPL-2 FTL"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="deprecated doc test"
+IUSE="X doc test"
 
 RDEPEND=">=dev-libs/glib-2.17.3
 	>=media-libs/fontconfig-2.5.0
 	media-libs/freetype:2
-	>=x11-libs/cairo-1.7.6
-	deprecated? (
+	>=x11-libs/cairo-1.7.6[X?]
+	X? (
 		x11-libs/libXrender
 		x11-libs/libX11
 		x11-libs/libXft )"
@@ -34,7 +34,7 @@ DEPEND="${RDEPEND}
 		>=dev-util/gtk-doc-1
 		~app-text/docbook-xml-dtd-4.1.2
 		x11-libs/libXft )
-	deprecated? ( x11-proto/xproto )"
+	X? ( x11-proto/xproto )"
 
 DOCS="AUTHORS ChangeLog* NEWS README THANKS"
 
@@ -46,7 +46,7 @@ pkg_setup() {
 	# XXX: DO NOT add introspection support, collides with gir-repository[pango]
 	G2CONF="${G2CONF}
 		--disable-introspection
-		$(use_with deprecated x)"
+		$(use_with X x)"
 }
 
 src_prepare() {