x11-libs/pango: wrong commit, revert

(Portage version: 2.2_rc52/cvs/Linux i686)

3 files changed, 17 insertions, 13 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/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() {