synced x11-libs/pango with portage tree

14 files changed, 27 insertions, 468 deletions

diff --git a/doc/prep_ml_binaries b/doc/prep_ml_binaries
index a9291891d..607ef1ff5 100644
--- a/doc/prep_ml_binaries
+++ b/doc/prep_ml_binaries
@@ -34,3 +34,5 @@ net-print/cups prep_ml_binaries /usr/bin/cups-config
 sys-libs/ncurses prep_ml_binaries /usr/bin/ncurses5-config /usr/bin/ncursesw5-config 
 x11-libs/gtk+ prep_ml_binaries /usr/bin/gtk-config 
 x11-libs/libXft prep_ml_binaries /usr/bin/xft-config 
+x11-libs/pango /usr/bin/pango-querymodules
+
diff --git a/metadata/cache/x11-libs/pango-1.22.4 b/metadata/cache/x11-libs/pango-1.22.4
deleted file mode 100644
index d03226875..000000000
--- a/metadata/cache/x11-libs/pango-1.22.4
+++ /dev/null
@@ -1,22 +0,0 @@
->=dev-libs/glib-2.17.3[lib32?] >=media-libs/fontconfig-1.0.1[lib32?] >=media-libs/freetype-2[lib32?] >=x11-libs/cairo-1.7.6[lib32?] X? ( x11-libs/libXrender[lib32?] x11-libs/libX11[lib32?] x11-libs/libXft[lib32?] ) >=dev-util/pkgconfig-0.9 doc? ( >=dev-util/gtk-doc-1 ~app-text/docbook-xml-dtd-4.1.2 ) X? ( x11-proto/xproto ) >=sys-apps/sed-4 sys-apps/abi-wrapper
->=dev-libs/glib-2.17.3[lib32?] >=media-libs/fontconfig-1.0.1[lib32?] >=media-libs/freetype-2[lib32?] >=x11-libs/cairo-1.7.6[lib32?] X? ( x11-libs/libXrender[lib32?] x11-libs/libX11[lib32?] x11-libs/libXft[lib32?] ) sys-apps/abi-wrapper
-0
-mirror://gnome/sources/pango/1.22/pango-1.22.4.tar.bz2
-
-http://www.pango.org/
-LGPL-2 FTL
-Text rendering and layout library
-alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd
-base eutils fdo-mime gnome.org gnome2 gnome2-utils libtool multilib multilib-native portability toolchain-funcs
-X debug doc debug lib32
-
-
-
-2
-
-compile configure install postinst postrm preinst prepare setup unpack
-
-
-
-
-
diff --git a/metadata/cache/x11-libs/pango-1.22.4-r1 b/metadata/cache/x11-libs/pango-1.22.4-r1
deleted file mode 100644
index 9da4e0332..000000000
--- a/metadata/cache/x11-libs/pango-1.22.4-r1
+++ /dev/null
@@ -1,22 +0,0 @@
->=dev-libs/glib-2.17.3[lib32?] >=media-libs/fontconfig-1.0.1[lib32?] >=media-libs/freetype-2[lib32?] >=x11-libs/cairo-1.7.6[lib32?] X? ( x11-libs/libXrender[lib32?] x11-libs/libX11[lib32?] x11-libs/libXft[lib32?] ) >=dev-util/pkgconfig-0.9 doc? ( >=dev-util/gtk-doc-1 ~app-text/docbook-xml-dtd-4.1.2 ) X? ( x11-proto/xproto ) >=sys-apps/sed-4 sys-apps/abi-wrapper
->=dev-libs/glib-2.17.3[lib32?] >=media-libs/fontconfig-1.0.1[lib32?] >=media-libs/freetype-2[lib32?] >=x11-libs/cairo-1.7.6[lib32?] X? ( x11-libs/libXrender[lib32?] x11-libs/libX11[lib32?] x11-libs/libXft[lib32?] ) sys-apps/abi-wrapper
-0
-mirror://gnome/sources/pango/1.22/pango-1.22.4.tar.bz2
-
-http://www.pango.org/
-LGPL-2 FTL
-Text rendering and layout library
-~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
-base eutils fdo-mime gnome.org gnome2 gnome2-utils libtool multilib multilib-native portability toolchain-funcs
-X debug doc debug lib32
-
-
-
-2
-
-compile configure install postinst postrm preinst prepare setup unpack
-
-
-
-
-
diff --git a/metadata/cache/x11-libs/pango-1.24.1 b/metadata/cache/x11-libs/pango-1.24.1
deleted file mode 100644
index 0e9daeacd..000000000
--- a/metadata/cache/x11-libs/pango-1.24.1
+++ /dev/null
@@ -1,22 +0,0 @@
->=dev-libs/glib-2.17.3[lib32?] >=media-libs/fontconfig-2.5.0[lib32?] >=media-libs/freetype-2[lib32?] >=x11-libs/cairo-1.7.6[lib32?] X? ( x11-libs/libXrender[lib32?] x11-libs/libX11[lib32?] x11-libs/libXft[lib32?] ) >=dev-util/pkgconfig-0.9 doc? ( >=dev-util/gtk-doc-1 ~app-text/docbook-xml-dtd-4.1.2 ) X? ( x11-proto/xproto ) =sys-devel/automake-1.10* >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-apps/sed-4 sys-apps/abi-wrapper
->=dev-libs/glib-2.17.3[lib32?] >=media-libs/fontconfig-2.5.0[lib32?] >=media-libs/freetype-2[lib32?] >=x11-libs/cairo-1.7.6[lib32?] X? ( x11-libs/libXrender[lib32?] x11-libs/libX11[lib32?] x11-libs/libXft[lib32?] ) sys-apps/abi-wrapper
-0
-mirror://gnome/sources/pango/1.24/pango-1.24.1.tar.bz2
-
-http://www.pango.org/
-LGPL-2 FTL
-Text rendering and layout library
-~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
-autotools base eutils fdo-mime gnome.org gnome2 gnome2-utils libtool multilib multilib-native portability toolchain-funcs
-X debug doc debug lib32
-
-
-
-2
-
-compile configure install postinst postrm preinst prepare setup unpack
-
-
-
-
-
diff --git a/metadata/cache/x11-libs/pango-1.24.2 b/metadata/cache/x11-libs/pango-1.24.2
index f5acd926b..5a173b20a 100644
--- a/metadata/cache/x11-libs/pango-1.24.2
+++ b/metadata/cache/x11-libs/pango-1.24.2
@@ -1,4 +1,4 @@
->=dev-libs/glib-2.17.3[lib32?] >=media-libs/fontconfig-2.5.0[lib32?] >=media-libs/freetype-2[lib32?] >=x11-libs/cairo-1.7.6[lib32?] X? ( x11-libs/libXrender[lib32?] x11-libs/libX11[lib32?] x11-libs/libXft[lib32?] ) >=dev-util/pkgconfig-0.9 doc? ( >=dev-util/gtk-doc-1 ~app-text/docbook-xml-dtd-4.1.2 ) X? ( x11-proto/xproto ) =sys-devel/automake-1.10* >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-apps/sed-4 sys-apps/abi-wrapper
+>=dev-libs/glib-2.17.3[lib32?] >=media-libs/fontconfig-2.5.0[lib32?] >=media-libs/freetype-2[lib32?] >=x11-libs/cairo-1.7.6[lib32?] X? ( x11-libs/libXrender[lib32?] x11-libs/libX11[lib32?] x11-libs/libXft[lib32?] ) >=dev-util/pkgconfig-0.9 doc? ( >=dev-util/gtk-doc-1 ~app-text/docbook-xml-dtd-4.1.2 ) X? ( x11-proto/xproto ) >=sys-apps/sed-4 sys-apps/abi-wrapper
 >=dev-libs/glib-2.17.3[lib32?] >=media-libs/fontconfig-2.5.0[lib32?] >=media-libs/freetype-2[lib32?] >=x11-libs/cairo-1.7.6[lib32?] X? ( x11-libs/libXrender[lib32?] x11-libs/libX11[lib32?] x11-libs/libXft[lib32?] ) sys-apps/abi-wrapper
 0
 mirror://gnome/sources/pango/1.24/pango-1.24.2.tar.bz2
@@ -7,7 +7,7 @@ http://www.pango.org/
 LGPL-2 FTL
 Text rendering and layout library
 alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd
-autotools base eutils fdo-mime gnome.org gnome2 gnome2-utils libtool multilib multilib-native portability toolchain-funcs
+base eutils fdo-mime gnome.org gnome2 gnome2-utils libtool multilib multilib-native portability toolchain-funcs
 X debug doc debug lib32
 
 
diff --git a/metadata/cache/x11-libs/pango-1.24.3 b/metadata/cache/x11-libs/pango-1.24.3
index 911f10d47..94dcae4e4 100644
--- a/metadata/cache/x11-libs/pango-1.24.3
+++ b/metadata/cache/x11-libs/pango-1.24.3
@@ -1,4 +1,4 @@
->=dev-libs/glib-2.17.3[lib32?] >=media-libs/fontconfig-2.5.0[lib32?] >=media-libs/freetype-2[lib32?] >=x11-libs/cairo-1.7.6[lib32?] X? ( x11-libs/libXrender[lib32?] x11-libs/libX11[lib32?] x11-libs/libXft[lib32?] ) >=dev-util/pkgconfig-0.9 doc? ( >=dev-util/gtk-doc-1 ~app-text/docbook-xml-dtd-4.1.2 ) X? ( x11-proto/xproto ) =sys-devel/automake-1.10* >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-apps/sed-4 sys-apps/abi-wrapper
+>=dev-libs/glib-2.17.3[lib32?] >=media-libs/fontconfig-2.5.0[lib32?] >=media-libs/freetype-2[lib32?] >=x11-libs/cairo-1.7.6[lib32?] X? ( x11-libs/libXrender[lib32?] x11-libs/libX11[lib32?] x11-libs/libXft[lib32?] ) >=dev-util/pkgconfig-0.9 doc? ( >=dev-util/gtk-doc-1 ~app-text/docbook-xml-dtd-4.1.2 ) X? ( x11-proto/xproto ) >=sys-apps/sed-4 sys-apps/abi-wrapper
 >=dev-libs/glib-2.17.3[lib32?] >=media-libs/fontconfig-2.5.0[lib32?] >=media-libs/freetype-2[lib32?] >=x11-libs/cairo-1.7.6[lib32?] X? ( x11-libs/libXrender[lib32?] x11-libs/libX11[lib32?] x11-libs/libXft[lib32?] ) sys-apps/abi-wrapper
 0
 mirror://gnome/sources/pango/1.24/pango-1.24.3.tar.bz2
@@ -7,7 +7,7 @@ http://www.pango.org/
 LGPL-2 FTL
 Text rendering and layout library
 ~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
-autotools base eutils fdo-mime gnome.org gnome2 gnome2-utils libtool multilib multilib-native portability toolchain-funcs
+base eutils fdo-mime gnome.org gnome2 gnome2-utils libtool multilib multilib-native portability toolchain-funcs
 X debug doc debug lib32
 
 
diff --git a/x11-libs/pango/Manifest b/x11-libs/pango/Manifest
index 4fbae3eea..8703bbdf1 100644
--- a/x11-libs/pango/Manifest
+++ b/x11-libs/pango/Manifest
@@ -1,11 +1,5 @@
-AUX pango-1.2.5-lib64.patch 1107 RMD160 1a0ceb7f6b0cbf7c1a62ad9920fa91713a767809 SHA1 1df21274d31a5281aafc236312415f4cca02e578 SHA256 010aa771c0662b056e1668d0607397f670cb030da252d7d95a9eea270fbc9ec9
-AUX pango-1.22.4-special-chars-crash.patch 1893 RMD160 57dec485892a5924122e3319b654b6907e4fc6a6 SHA1 0ca6982bb8623327fe6b306b5560a52d353c5aa9 SHA256 03030a0cf5a0871cc7ecb7c583a7104efe308be3e8b0606b8405469a6a79bf24
-DIST pango-1.22.4.tar.bz2 1496168 RMD160 118986ea419d22937dd5e2b033f46f34a45f24e3 SHA1 d39a8ce9ed7dd57407a04ad3996b9cc1106cfd7d SHA256 ff47d7ed8360ebef5fa4b8d3ccf45e014bc8793743bca2a96635a3c34eeaa534
-DIST pango-1.24.1.tar.bz2 1526008 RMD160 8924a2ef039c2bf71e185cad96e87e8c973a59c0 SHA1 917ad4559cceaf27adbfddee11a833c3e536d4a9 SHA256 e00c343dd14c23b89a6767f87d31d4246c14739c57c0174008a86b33174b9ab2
+AUX pango-1.2.5-lib64.patch 1117 RMD160 3bab94ba930665dd8d4159f77ac8409d16340f02 SHA1 c7e9b0dc73110910dd75d6afbaa0df8cdbfb44be SHA256 a6a58d965fef42e5d4820d8292a4c7cde4aff3cfddaf184499d3bdae78a3f3db
 DIST pango-1.24.2.tar.bz2 1528238 RMD160 948bee4fa9725330e3f041758ef321d618bbdb9e SHA1 dbc418be727d522720cd280e4368ff5ba3133852 SHA256 f3617f8f32c45c57f19c0aa1d7334e1dc979b9b54e5bb4e78fba8ec80193c23c
 DIST pango-1.24.3.tar.bz2 1505848 RMD160 1fe1837e9f8b080260ae3766682d9e4692654ae1 SHA1 9ae5c85d66a1aae75642414a24b258b29adf1b3a SHA256 f7729e7c133d1ba24e28d63da71c1902f17f4563ca31555d99d8e5a25aaa9309
-EBUILD pango-1.22.4-r1.ebuild 2481 RMD160 a893a399803308c90f2ff3c8584a1808d9620b49 SHA1 0bfd4e8f9573af71c229837e139c83b3c035260a SHA256 3923270cdb9a4bd03bfcfc2c9d7c5b6e30733fc37466d62623174a7ee5a669b0
-EBUILD pango-1.22.4.ebuild 2343 RMD160 b39a2796bfb1ee181ad4684e54d207dbd8460fd4 SHA1 dc840037382d43ee5c03b8d792d32452fe4df22c SHA256 da50d89c8861af1e056d1b61e6ea9cda06d7c06395a2c086e001a36b6db85853
-EBUILD pango-1.24.1.ebuild 2718 RMD160 928106d9f3684effaaf002e6fbeb57681f8582ef SHA1 c6e2505bbb1bed8d1c9f86b7ab768dba98514929 SHA256 dc7b991c8f2b56dafd28a8d978ed70fbb65c0720f868d276c79b0bdb1a60219d
-EBUILD pango-1.24.2.ebuild 2605 RMD160 52e22f57c234391f2fcae0e7624fca2832788b21 SHA1 acf8f1dee8d1ee5c278802b4bd3ff03c60706f00 SHA256 b4ae72f388be0cf04b46c2fd4dbc9c3afa2560fdb29de55c35790b374bbe50c8
-EBUILD pango-1.24.3.ebuild 2612 RMD160 3ad18733b183c8e5e246c59320b9756c9e8a3c54 SHA1 a38026af25b550941ffebcca4db9096d55d01225 SHA256 1a493b5f6a61447b2b912ce8783bb029d9b52849ed0827d7c7c648cdaf28afe3
+EBUILD pango-1.24.2.ebuild 2356 RMD160 a544781d2bd6210fb2a37d02d83408986585e611 SHA1 f3fec19804218acf1f5db20994e181ecfc9a8e11 SHA256 74b75967a7582ac493df1da5a7128868c546c4b6e211b9b07b49c908ae415bbf
+EBUILD pango-1.24.3.ebuild 2363 RMD160 96679c01419e5a95dd736b0a8dd535118bc0b57d SHA1 9144db25eb1ce79039cdcc1e2d94d5280baf4139 SHA256 65097093f3c812b234655f284a6a65ae75b6404ae76f0fc0166a837baeb20f91
diff --git a/x11-libs/pango/files/pango-1.2.5-lib64.patch b/x11-libs/pango/files/pango-1.2.5-lib64.patch
index 7d0ae17bb..c709c270e 100644
--- a/x11-libs/pango/files/pango-1.2.5-lib64.patch
+++ b/x11-libs/pango/files/pango-1.2.5-lib64.patch
@@ -1,13 +1,13 @@
---- pango-1.2.5/pango/Makefile.am.lib64	2003-08-25 10:12:45.000000000 -0400
-+++ pango-1.2.5/pango/Makefile.am	2003-12-08 18:43:51.000000000 -0500
-@@ -16,6 +16,7 @@
- 	-DPANGO_ENABLE_BACKEND				\
- 	-DPANGO_ENABLE_ENGINE				\
- 	-DSYSCONFDIR=\"$(sysconfdir)\"			\
-+	-DHOST=\"$(host_triplet)\"			\
- 	-DLIBDIR=\"$(libdir)\"				\
- 	-DMODULE_VERSION=\"$(PANGO_MODULE_VERSION)\"	\
- 	-DG_DISABLE_DEPRECATED				\
+#--- pango-1.2.5/pango/Makefile.am.lib64	2003-08-25 10:12:45.000000000 -0400
+#+++ pango-1.2.5/pango/Makefile.am	2003-12-08 18:43:51.000000000 -0500
+#@@ -16,6 +16,7 @@
+# 	-DPANGO_ENABLE_BACKEND				\
+# 	-DPANGO_ENABLE_ENGINE				\
+# 	-DSYSCONFDIR=\"$(sysconfdir)\"			\
+#+	-DHOST=\"$(host_triplet)\"			\
+# 	-DLIBDIR=\"$(libdir)\"				\
+# 	-DMODULE_VERSION=\"$(PANGO_MODULE_VERSION)\"	\
+# 	-DG_DISABLE_DEPRECATED				\
 --- pango-1.2.5/pango/modules.c.lib64	2002-12-06 19:54:27.000000000 -0500
 +++ pango-1.2.5/pango/modules.c	2003-12-08 18:43:51.000000000 -0500
 @@ -353,6 +353,7 @@
diff --git a/x11-libs/pango/files/pango-1.22.4-special-chars-crash.patch b/x11-libs/pango/files/pango-1.22.4-special-chars-crash.patch
deleted file mode 100644
index 71e07a860..000000000
--- a/x11-libs/pango/files/pango-1.22.4-special-chars-crash.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From dd6ce709db5872132335fef9f75aa16a33d6e5aa Mon Sep 17 00:00:00 2001
-From: Behdad Esfahbod <behdad@behdad.org>
-Date: Mon, 06 Apr 2009 23:49:02 +0000
-Subject: [layout] Truncate final whitespace in the line before ellipsizing
-
-Bug 556132 – gnome-panel crashed with SIGSEGV in
-g_cclosure_marshal_VOID__BOXED()
-
-Not after.  Also fixes invalid memory access in case line was both
-wrapped and ellipsized.
----
-diff --git a/pango/pango-layout.c b/pango/pango-layout.c
-index b1b75a4..4326eb4 100644
---- a/pango/pango-layout.c
-+++ b/pango/pango-layout.c
-@@ -5166,18 +5166,21 @@ pango_layout_line_postprocess (PangoLayoutLine *line,
- 			       ParaBreakState  *state,
- 			       gboolean         wrapped)
- {
--  PangoLayoutRun *last_run = line->runs->data;
-   gboolean ellipsized = FALSE;
-   
--  /* NB: the runs are in reverse order at this point, since we prepended them to the list
-+  DEBUG ("postprocessing", line, state);
-+
-+  /* Truncate the logical-final whitespace in the line if we broke the line at it
-    */
-+  if (wrapped)
-+    /* The runs are in reverse order at this point, since we prepended them to the list.
-+     * So, the first run is the last logical run. */
-+    zero_line_final_space (line, state, line->runs->data);
- 
-   /* Reverse the runs
-    */
-   line->runs = g_slist_reverse (line->runs);
- 
--  DEBUG ("postprocessing", line, state);
--
-   /* Ellipsize the line if necessary
-    */
-   if (G_UNLIKELY (state->line_width >= 0 &&
-@@ -5186,11 +5189,6 @@ pango_layout_line_postprocess (PangoLayoutLine *line,
-       ellipsized = _pango_layout_line_ellipsize (line, state->attrs, state->line_width);
-     }
- 
--  /* Truncate the logical-final whitespace in the line if we broke the line at it
--   */
--  if (wrapped)
--    zero_line_final_space (line, state, last_run);
--
-   DEBUG ("after removing final space", line, state);
- 
-   /* Now convert logical to visual order
---
-cgit v0.8.2
diff --git a/x11-libs/pango/pango-1.22.4-r1.ebuild b/x11-libs/pango/pango-1.22.4-r1.ebuild
deleted file mode 100644
index df12e2df0..000000000
--- a/x11-libs/pango/pango-1.22.4-r1.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# 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.22.4-r1.ebuild,v 1.1 2009/04/27 19:11:30 ford_prefect Exp $
-
-EAPI="2"
-
-inherit eutils gnome2 multilib-native
-
-DESCRIPTION="Text rendering and layout library"
-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="X debug doc"
-
-RDEPEND=">=dev-libs/glib-2.17.3[lib32?]
-	 >=media-libs/fontconfig-1.0.1[lib32?]
-	 >=media-libs/freetype-2[lib32?]
-	 >=x11-libs/cairo-1.7.6[lib32?]
-	 X? (
-			x11-libs/libXrender[lib32?]
-			x11-libs/libX11[lib32?]
-			x11-libs/libXft[lib32?]
-		)"
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.9
-	doc? (
-			>=dev-util/gtk-doc-1
-			~app-text/docbook-xml-dtd-4.1.2
-		 )
-	X? ( x11-proto/xproto )"
-
-DOCS="AUTHORS ChangeLog* NEWS README THANKS"
-
-function multilib_enabled() {
-	has_multilib_profile || ( use x86 && [ "$(get_libdir)" == "lib32" ] )
-}
-
-pkg_setup() {
-	# Do NOT build with --disable-debug/--enable-debug=no
-	if use debug ; then
-		G2CONF="${G2CONF} --enable-debug=yes"
-	fi
-
-	G2CONF="${G2CONF} $(use_with X x)"
-}
-
-src_unpack() {
-	gnome2_src_unpack
-
-	# fix crash while handling special characters (bug #267560)
-	epatch "${FILESDIR}/${P}-special-chars-crash.patch"
-
-	# make config file location host specific so that a 32bit and 64bit pango
-	# wont fight with each other on a multilib system.  Fix building for
-	# emul-linux-x86-gtklibs
-	if multilib_enabled ; then
-		epatch "${FILESDIR}/${PN}-1.2.5-lib64.patch"
-	fi
-}
-
-multilib-native_src_configure_internal() {
-	local myconf
-	
-	if use debug ; then
-		myconf="--enable-debug=yes"
-	fi
-
-	if use lib32 && ([[ "${ABI}" == "x86" ]] || [[ "${ABI}" == "ppc" ]]); then
-		myconf="${myconf} --program-suffix=32"
-	fi
-
-	econf $(use_with X x) ${myconf} || die
-}
-
-multilib-native_src_install_internal() {
-	gnome2_src_install
-	rm "${D}/etc/pango/pango.modules"
-}
-
-multilib-native_pkg_postinst_internal() {
-	if [[ "${ROOT}" == "/" ]] ; then
-		einfo "Generating modules listing..."
-
-		local PANGO_CONFDIR=
-
-		if multilib_enabled ; then
-			PANGO_CONFDIR="/etc/pango/${CHOST}"
-		else
-			PANGO_CONFDIR="/etc/pango"
-		fi
-
-		mkdir -p ${PANGO_CONFDIR}
-
-		if use lib32 && ([[ "${ABI}" == "x86" ]] || [[ "${ABI}" == "ppc" ]]); then
-			pango-querymodules32 > ${PANGO_CONFDIR}/pango.modules
-		else
-			pango-querymodules > ${PANGO_CONFDIR}/pango.modules
-		fi
-	fi
-}
diff --git a/x11-libs/pango/pango-1.22.4.ebuild b/x11-libs/pango/pango-1.22.4.ebuild
deleted file mode 100644
index cc5bd72d3..000000000
--- a/x11-libs/pango/pango-1.22.4.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# 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.22.4.ebuild,v 1.9 2009/04/27 13:48:00 jer Exp $
-
-EAPI="2"
-
-inherit eutils gnome2 multilib-native
-
-DESCRIPTION="Text rendering and layout library"
-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="X debug doc"
-
-RDEPEND=">=dev-libs/glib-2.17.3[lib32?]
-	 >=media-libs/fontconfig-1.0.1[lib32?]
-	 >=media-libs/freetype-2[lib32?]
-	 >=x11-libs/cairo-1.7.6[lib32?]
-	 X? (
-			x11-libs/libXrender[lib32?]
-			x11-libs/libX11[lib32?]
-			x11-libs/libXft[lib32?]
-		)"
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.9
-	doc? (
-			>=dev-util/gtk-doc-1
-			~app-text/docbook-xml-dtd-4.1.2
-		 )
-	X? ( x11-proto/xproto )"
-
-DOCS="AUTHORS ChangeLog* NEWS README THANKS"
-
-function multilib_enabled() {
-	has_multilib_profile || ( use x86 && [ "$(get_libdir)" == "lib32" ] )
-}
-
-pkg_setup() {
-	# Do NOT build with --disable-debug/--enable-debug=no
-	if use debug ; then
-		G2CONF="${G2CONF} --enable-debug=yes"
-	fi
-
-	G2CONF="${G2CONF} $(use_with X x)"
-}
-
-src_unpack() {
-	gnome2_src_unpack
-
-	# make config file location host specific so that a 32bit and 64bit pango
-	# wont fight with each other on a multilib system.  Fix building for
-	# emul-linux-x86-gtklibs
-	if multilib_enabled ; then
-		epatch "${FILESDIR}/${PN}-1.2.5-lib64.patch"
-	fi
-}
-
-multilib-native_src_configure_internal() {
-	local myconf
-	
-	if use debug ; then
-		myconf="--enable-debug=yes"
-	fi
-
-	if use lib32 && ([[ "${ABI}" == "x86" ]] || [[ "${ABI}" == "ppc" ]]); then
-		myconf="${myconf} --program-suffix=32"
-	fi
-
-	econf $(use_with X x) ${myconf} || die
-}
-
-multilib-native_src_install_internal() {
-	gnome2_src_install
-	rm "${D}/etc/pango/pango.modules"
-}
-
-multilib-native_pkg_postinst_internal() {
-	if [[ "${ROOT}" == "/" ]] ; then
-		einfo "Generating modules listing..."
-
-		local PANGO_CONFDIR=
-
-		if multilib_enabled ; then
-			PANGO_CONFDIR="/etc/pango/${CHOST}"
-		else
-			PANGO_CONFDIR="/etc/pango"
-		fi
-
-		mkdir -p ${PANGO_CONFDIR}
-
-		if use lib32 && ([[ "${ABI}" == "x86" ]] || [[ "${ABI}" == "ppc" ]]); then
-			pango-querymodules32 > ${PANGO_CONFDIR}/pango.modules
-		else
-			pango-querymodules > ${PANGO_CONFDIR}/pango.modules
-		fi
-	fi
-}
diff --git a/x11-libs/pango/pango-1.24.1.ebuild b/x11-libs/pango/pango-1.24.1.ebuild
deleted file mode 100644
index 21480f740..000000000
--- a/x11-libs/pango/pango-1.24.1.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# 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.1.ebuild,v 1.4 2009/05/13 14:17:42 nirbheek Exp $
-
-EAPI="2"
-
-inherit autotools eutils gnome2 multilib multilib-native
-
-DESCRIPTION="Text rendering and layout library"
-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="X debug doc"
-
-# FIXME: add gobject-introspection dependency when it is available
-RDEPEND=">=dev-libs/glib-2.17.3[lib32?]
-	>=media-libs/fontconfig-2.5.0[lib32?]
-	>=media-libs/freetype-2[lib32?]
-	>=x11-libs/cairo-1.7.6[lib32?]
-	X? (
-		x11-libs/libXrender[lib32?]
-		x11-libs/libX11[lib32?]
-		x11-libs/libXft[lib32?] )"
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.9
-	doc? (
-		>=dev-util/gtk-doc-1
-		~app-text/docbook-xml-dtd-4.1.2 )
-	X? ( x11-proto/xproto )"
-
-DOCS="AUTHORS ChangeLog* NEWS README THANKS"
-
-function multilib_enabled() {
-	has_multilib_profile || ( use x86 && [ "$(get_libdir)" = "lib32" ] )
-}
-
-pkg_setup() {
-	# Do NOT build with --disable-debug/--enable-debug=no
-	if use debug ; then
-		G2CONF="${G2CONF} --enable-debug=yes"
-	fi
-
-	G2CONF="${G2CONF} $(use_with X x)"
-}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# make config file location host specific so that a 32bit and 64bit pango
-	# wont fight with each other on a multilib system.  Fix building for
-	# emul-linux-x86-gtklibs
-	if multilib_enabled ; then
-		epatch "${FILESDIR}/${PN}-1.2.5-lib64.patch"
-	fi
-
-	# gtk-doc checks do not pass, upstream bug #578944
-	sed 's:TESTS = check.docs: TESTS = :g'\
-		-i docs/Makefile.am docs/Makefile.in || die "sed failed"
-	sed -e '/@cd "$(DESTDIR)$(man1dir)" && gzip -c pango-view.1 > preload.1.gz && $(RM) preload.1/d' -i pango-view/Makefile.{in,am} || die 
-}
-
-multilib-native_src_configure_internal() {
-	local myconf
-
-	if use debug ; then
-		myconf="--enable-debug=yes"
-	fi
-
-	if use lib32 && ([[ "${ABI}" == "x86" ]] || [[ "${ABI}" == "ppc" ]]); then
-		myconf="${myconf} --program-suffix=32"
-	fi
-
-	econf $(use_with X x) ${myconf} || die
-}
-
-multilib-native_src_install_internal() {
-	gnome2_src_install
-	rm "${D}/etc/pango/pango.modules"
-}
-
-multilib-native_pkg_postinst_internal() {
-	if [ "${ROOT}" = "/" ] ; then
-		einfo "Generating modules listing..."
-
-		local PANGO_CONFDIR=
-
-		if multilib_enabled ; then
-			PANGO_CONFDIR="/etc/pango/${CHOST}"
-		else
-			PANGO_CONFDIR="/etc/pango"
-		fi
-
-		mkdir -p ${PANGO_CONFDIR}
-
-		if use lib32 && ([[ "${ABI}" == "x86" ]] || [[ "${ABI}" == "ppc" ]]); then
-			pango-querymodules32 > ${PANGO_CONFDIR}/pango.modules
-		else
-			pango-querymodules > ${PANGO_CONFDIR}/pango.modules
-		fi
-	fi
-}
diff --git a/x11-libs/pango/pango-1.24.2.ebuild b/x11-libs/pango/pango-1.24.2.ebuild
index 7cc19728c..8520d0617 100644
--- a/x11-libs/pango/pango-1.24.2.ebuild
+++ b/x11-libs/pango/pango-1.24.2.ebuild
@@ -4,7 +4,7 @@
 
 EAPI="2"
 
-inherit autotools eutils gnome2 multilib multilib-native
+inherit eutils gnome2 multilib multilib-native
 
 DESCRIPTION="Text rendering and layout library"
 HOMEPAGE="http://www.pango.org/"
@@ -63,16 +63,14 @@ multilib-native_src_configure_internal() {
 		myconf="--enable-debug=yes"
 	fi
 
-	if use lib32 && ([[ "${ABI}" == "x86" ]] || [[ "${ABI}" == "ppc" ]]); then
-		myconf="${myconf} --program-suffix=32"
-	fi
-
 	econf $(use_with X x) ${myconf} || die
 }
 
 multilib-native_src_install_internal() {
 	gnome2_src_install
 	rm "${D}/etc/pango/pango.modules"
+
+	/usr/bin/pango-querymodules
 }
 
 multilib-native_pkg_postinst_internal() {
@@ -89,10 +87,6 @@ multilib-native_pkg_postinst_internal() {
 
 		mkdir -p ${PANGO_CONFDIR}
 
-		if use lib32 && ([[ "${ABI}" == "x86" ]] || [[ "${ABI}" == "ppc" ]]); then
-			pango-querymodules32 > ${PANGO_CONFDIR}/pango.modules
-		else
-			pango-querymodules > ${PANGO_CONFDIR}/pango.modules
-		fi
+		pango-querymodules > ${PANGO_CONFDIR}/pango.modules
 	fi
 }
diff --git a/x11-libs/pango/pango-1.24.3.ebuild b/x11-libs/pango/pango-1.24.3.ebuild
index 48da79d7a..2d6963b12 100644
--- a/x11-libs/pango/pango-1.24.3.ebuild
+++ b/x11-libs/pango/pango-1.24.3.ebuild
@@ -4,7 +4,7 @@
 
 EAPI="2"
 
-inherit autotools eutils gnome2 multilib multilib-native
+inherit eutils gnome2 multilib multilib-native
 
 DESCRIPTION="Text rendering and layout library"
 HOMEPAGE="http://www.pango.org/"
@@ -63,16 +63,14 @@ multilib-native_src_configure_internal() {
 		myconf="--enable-debug=yes"
 	fi
 
-	if use lib32 && ([[ "${ABI}" == "x86" ]] || [[ "${ABI}" == "ppc" ]]); then
-		myconf="${myconf} --program-suffix=32"
-	fi
-
 	econf $(use_with X x) ${myconf} || die
 }
 
 multilib-native_src_install_internal() {
 	gnome2_src_install
 	rm "${D}/etc/pango/pango.modules"
+
+	/usr/bin/pango-querymodules
 }
 
 multilib-native_pkg_postinst_internal() {
@@ -89,10 +87,6 @@ multilib-native_pkg_postinst_internal() {
 
 		mkdir -p ${PANGO_CONFDIR}
 
-		if use lib32 && ([[ "${ABI}" == "x86" ]] || [[ "${ABI}" == "ppc" ]]); then
-			pango-querymodules32 > ${PANGO_CONFDIR}/pango.modules
-		else
-			pango-querymodules > ${PANGO_CONFDIR}/pango.modules
-		fi
+		pango-querymodules > ${PANGO_CONFDIR}/pango.modules
 	fi
 }