Drop useless USE=doc, it only regenerated documentation; fixes bug #357205, thanks to Theo Chatzimichos et al. Remove test USE flag since it only served to pull in dependencies for testing regenerated docs. Make mktemp call more portable, thanks to Mart Raudsepp. Update license. Drop old.

(Portage version: 2.2.0_alpha137/cvs/Linux x86_64)

8 files changed, 20 insertions, 471 deletions

diff --git a/x11-libs/pango/ChangeLog b/x11-libs/pango/ChangeLog
index ddcdd4a16ecf..59a1654ac5fe 100644
--- a/x11-libs/pango/ChangeLog
+++ b/x11-libs/pango/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for x11-libs/pango
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/ChangeLog,v 1.356 2012/10/06 21:19:21 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/ChangeLog,v 1.357 2012/10/17 11:18:22 tetromino Exp $
+
+  17 Oct 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  -pango-1.28.3-r1.ebuild, -files/pango-1.28.3-heap-corruption.patch,
+  -files/pango-1.28.3-malloc-failure.patch, pango-1.28.4.ebuild,
+  pango-1.29.4.ebuild, -pango-1.30.0.ebuild, pango-1.30.1.ebuild:
+  Drop useless USE=doc, it only regenerated documentation; fixes bug #357205,
+  thanks to Theo Chatzimichos et al. Remove test USE flag since it only served
+  to pull in dependencies for testing regenerated docs. Make mktemp call more
+  portable, thanks to Mart Raudsepp. Update license. Drop old.
 
   06 Oct 2012; Anthony G. Basile <blueness@gentoo.org> pango-1.30.1.ebuild:
   stable ppc ppc64, bug #427544
diff --git a/x11-libs/pango/files/pango-1.28.3-heap-corruption.patch b/x11-libs/pango/files/pango-1.28.3-heap-corruption.patch
deleted file mode 100644
index 692f69867eda..000000000000
--- a/x11-libs/pango/files/pango-1.28.3-heap-corruption.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 4e6248d76f55c6184f28afe614d7d76b6fa3d455 Mon Sep 17 00:00:00 2001
-From: Behdad Esfahbod <behdad@behdad.org>
-Date: Thu, 17 Feb 2011 16:19:48 +0000
-Subject: Bug 639882 - Heap corruption in font parsing with FreeType2 backend
-
----
-diff --git a/pango/pangoft2-render.c b/pango/pangoft2-render.c
-index bd3b7d4..42923f4 100644
---- a/pango/pangoft2-render.c
-+++ b/pango/pangoft2-render.c
-@@ -121,9 +121,14 @@ pango_ft2_font_render_box_glyph (int      width,
- 
-   box->bitmap.width = width;
-   box->bitmap.rows = height;
--  box->bitmap.pitch = height;
-+  box->bitmap.pitch = width;
- 
--  box->bitmap.buffer = g_malloc0 (box->bitmap.rows * box->bitmap.pitch);
-+  box->bitmap.buffer = g_malloc0_n (box->bitmap.rows, box->bitmap.pitch);
-+
-+  if (G_UNLIKELY (!box->bitmap.buffer)) {
-+    g_slice_free (PangoFT2RenderedGlyph, box);
-+    return NULL;
-+  }
- 
-   /* draw the box */
-   for (j = 0; j < line_width; j++)
-@@ -226,6 +231,11 @@ pango_ft2_font_render_glyph (PangoFont *font,
-       rendered->bitmap_left = face->glyph->bitmap_left;
-       rendered->bitmap_top = face->glyph->bitmap_top;
- 
-+      if (G_UNLIKELY (!rendered->bitmap.buffer)) {
-+        g_slice_free (PangoFT2RenderedGlyph, rendered);
-+	return NULL;
-+      }
-+
-       return rendered;
-     }
-   else
-@@ -276,6 +286,8 @@ pango_ft2_renderer_draw_glyph (PangoRenderer *renderer,
-   if (rendered_glyph == NULL)
-     {
-       rendered_glyph = pango_ft2_font_render_glyph (font, glyph);
-+      if (rendered_glyph == NULL)
-+        return;
-       add_glyph_to_cache = TRUE;
-     }
- 
---
-cgit v0.8.3.4
diff --git a/x11-libs/pango/files/pango-1.28.3-malloc-failure.patch b/x11-libs/pango/files/pango-1.28.3-malloc-failure.patch
deleted file mode 100644
index e82f8e6a4c7f..000000000000
--- a/x11-libs/pango/files/pango-1.28.3-malloc-failure.patch
+++ /dev/null
@@ -1,186 +0,0 @@
-From 3104961bc0ffaf847d2a1e116e6de4fdc1cd8ada Mon Sep 17 00:00:00 2001
-From: Behdad Esfahbod <behdad@behdad.org>
-Date: Thu, 2 Dec 2010 16:00:46 +1300
-Subject: [PATCH] Handle realloc failure in the buffer
-
-Ported from http://cgit.freedesktop.org/harfbuzz/commit/?id=a6a79df5fe2e
-by Karl Tomlinson <karlt+@karlt.net>
----
- pango/opentype/hb-buffer-private.h |    1 +
- pango/opentype/hb-buffer.c         |   70 +++++++++++++++++++++---------------
- pango/opentype/hb-buffer.h         |    2 +-
- 3 files changed, 43 insertions(+), 30 deletions(-)
-
-diff --git a/pango/opentype/hb-buffer-private.h b/pango/opentype/hb-buffer-private.h
-index 45cdc4d..f194786 100644
---- a/pango/opentype/hb-buffer-private.h
-+++ b/pango/opentype/hb-buffer-private.h
-@@ -72,6 +72,7 @@ struct _hb_buffer_t {
-   unsigned int allocated;
- 
-   hb_bool_t    have_output; /* weather we have an output buffer going on */
-+  hb_bool_t    in_error; /* Allocation failed */
-   unsigned int in_length;
-   unsigned int out_length;
-   unsigned int in_pos;
-diff --git a/pango/opentype/hb-buffer.c b/pango/opentype/hb-buffer.c
-index 93b51e5..e9788ad 100644
---- a/pango/opentype/hb-buffer.c
-+++ b/pango/opentype/hb-buffer.c
-@@ -52,23 +52,21 @@ static hb_buffer_t _hb_buffer_nil = {
-  * in_string and out_string.
-  */
- 
--/* XXX err handling */
--
- /* Internal API */
- 
--static void
-+static hb_bool_t
- hb_buffer_ensure_separate (hb_buffer_t *buffer, unsigned int size)
- {
--  hb_buffer_ensure (buffer, size);
-+  if (HB_UNLIKELY (!hb_buffer_ensure (buffer, size))) return FALSE;
-   if (buffer->out_string == buffer->in_string)
-   {
-     assert (buffer->have_output);
--    if (!buffer->positions)
--      buffer->positions = calloc (buffer->allocated, sizeof (buffer->positions[0]));
- 
-     buffer->out_string = (hb_internal_glyph_info_t *) buffer->positions;
-     memcpy (buffer->out_string, buffer->in_string, buffer->out_length * sizeof (buffer->out_string[0]));
-   }
-+
-+  return TRUE;
- }
- 
- /* Public API */
-@@ -114,6 +112,7 @@ void
- hb_buffer_clear (hb_buffer_t *buffer)
- {
-   buffer->have_output = FALSE;
-+  buffer->in_error = FALSE;
-   buffer->in_length = 0;
-   buffer->out_length = 0;
-   buffer->in_pos = 0;
-@@ -122,32 +121,42 @@ hb_buffer_clear (hb_buffer_t *buffer)
-   buffer->max_lig_id = 0;
- }
- 
--void
-+hb_bool_t
- hb_buffer_ensure (hb_buffer_t *buffer, unsigned int size)
- {
--  unsigned int new_allocated = buffer->allocated;
--
--  if (size > new_allocated)
-+  if (HB_UNLIKELY (size > buffer->allocated))
-   {
-+    unsigned int new_allocated = buffer->allocated;
-+    hb_internal_glyph_position_t *new_pos;
-+    hb_internal_glyph_info_t *new_info;
-+    hb_bool_t separate_out;
-+
-+    if (HB_UNLIKELY (buffer->in_error))
-+      return FALSE;
-+
-+    separate_out = buffer->out_string != buffer->in_string;
-+
-     while (size > new_allocated)
-       new_allocated += (new_allocated >> 1) + 8;
- 
--    if (buffer->positions)
--      buffer->positions = realloc (buffer->positions, new_allocated * sizeof (buffer->positions[0]));
-+    new_pos = (hb_internal_glyph_position_t *) realloc (buffer->positions, new_allocated * sizeof (buffer->positions[0]));
-+    new_info = (hb_internal_glyph_info_t *) realloc (buffer->in_string, new_allocated * sizeof (buffer->in_string[0]));
- 
--    if (buffer->out_string != buffer->in_string)
--    {
--      buffer->in_string = realloc (buffer->in_string, new_allocated * sizeof (buffer->in_string[0]));
--      buffer->out_string = (hb_internal_glyph_info_t *) buffer->positions;
--    }
--    else
--    {
--      buffer->in_string = realloc (buffer->in_string, new_allocated * sizeof (buffer->in_string[0]));
--      buffer->out_string = buffer->in_string;
--    }
-+    if (HB_UNLIKELY (!new_pos || !new_info))
-+      buffer->in_error = TRUE;
-+
-+    if (HB_LIKELY (new_pos))
-+      buffer->positions = new_pos;
- 
--    buffer->allocated = new_allocated;
-+    if (HB_LIKELY (new_info))
-+      buffer->in_string = new_info;
-+
-+    buffer->out_string = separate_out ? (hb_internal_glyph_info_t *) buffer->positions : buffer->in_string;
-+    if (HB_LIKELY (!buffer->in_error))
-+      buffer->allocated = new_allocated;
-   }
-+
-+  return HB_LIKELY (!buffer->in_error);
- }
- 
- void
-@@ -158,7 +167,7 @@ hb_buffer_add_glyph (hb_buffer_t    *buffer,
- {
-   hb_internal_glyph_info_t *glyph;
- 
--  hb_buffer_ensure (buffer, buffer->in_length + 1);
-+  if (HB_UNLIKELY (!hb_buffer_ensure (buffer, buffer->in_length + 1))) return;
- 
-   glyph = &buffer->in_string[buffer->in_length];
-   glyph->codepoint = codepoint;
-@@ -213,6 +222,8 @@ _hb_buffer_swap (hb_buffer_t *buffer)
- 
-   assert (buffer->have_output);
- 
-+  if (HB_UNLIKELY (buffer->in_error)) return;
-+
-   if (buffer->out_string != buffer->in_string)
-   {
-     hb_internal_glyph_info_t *tmp_string;
-@@ -265,7 +276,8 @@ _hb_buffer_add_output_glyphs (hb_buffer_t *buffer,
-   if (buffer->out_string != buffer->in_string ||
-       buffer->out_pos + num_out > buffer->in_pos + num_in)
-   {
--    hb_buffer_ensure_separate (buffer, buffer->out_pos + num_out);
-+    if (HB_UNLIKELY (!hb_buffer_ensure_separate (buffer, buffer->out_pos + num_out)))
-+        return;
-   }
- 
-   mask = buffer->in_string[buffer->in_pos].mask;
-@@ -302,7 +314,7 @@ _hb_buffer_add_output_glyph (hb_buffer_t *buffer,
- 
-   if (buffer->out_string != buffer->in_string)
-   {
--    hb_buffer_ensure (buffer, buffer->out_pos + 1);
-+    if (HB_UNLIKELY (!hb_buffer_ensure (buffer, buffer->out_pos + 1))) return;
-     buffer->out_string[buffer->out_pos] = buffer->in_string[buffer->in_pos];
-   }
-   else if (buffer->out_pos != buffer->in_pos)
-@@ -332,7 +344,7 @@ _hb_buffer_next_glyph (hb_buffer_t *buffer)
- 
-   if (buffer->out_string != buffer->in_string)
-   {
--    hb_buffer_ensure (buffer, buffer->out_pos + 1);
-+    if (HB_UNLIKELY (!hb_buffer_ensure (buffer, buffer->out_pos + 1))) return;
-     buffer->out_string[buffer->out_pos] = buffer->in_string[buffer->in_pos];
-   }
-   else if (buffer->out_pos != buffer->in_pos)
-diff --git a/pango/opentype/hb-buffer.h b/pango/opentype/hb-buffer.h
-index b030ba9..aaf6694 100644
---- a/pango/opentype/hb-buffer.h
-+++ b/pango/opentype/hb-buffer.h
-@@ -94,7 +94,7 @@ hb_buffer_clear (hb_buffer_t *buffer);
- void
- hb_buffer_clear_positions (hb_buffer_t *buffer);
- 
--void
-+hb_bool_t
- hb_buffer_ensure (hb_buffer_t  *buffer,
- 		  unsigned int  size);
- 
--- 
-1.7.2.2
diff --git a/x11-libs/pango/pango-1.28.3-r1.ebuild b/x11-libs/pango/pango-1.28.3-r1.ebuild
deleted file mode 100644
index 67db9df89968..000000000000
--- a/x11-libs/pango/pango-1.28.3-r1.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/pango-1.28.3-r1.ebuild,v 1.15 2012/05/05 03:52:23 jdhore Exp $
-
-EAPI="3"
-GCONF_DEBUG="yes"
-
-inherit autotools eutils gnome2 multilib toolchain-funcs
-
-DESCRIPTION="Internationalized text layout and rendering 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 ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="X doc +introspection test"
-
-RDEPEND=">=dev-libs/glib-2.24:2
-	>=media-libs/fontconfig-2.5.0:1.0
-	media-libs/freetype:2
-	>=x11-libs/cairo-1.7.6[X?]
-	X? (
-		x11-libs/libXrender
-		x11-libs/libX11
-		x11-libs/libXft )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	>=dev-util/gtk-doc-am-1.13
-	doc? (
-		>=dev-util/gtk-doc-1.13
-		~app-text/docbook-xml-dtd-4.1.2
-		x11-libs/libXft )
-	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
-	test? (
-		>=dev-util/gtk-doc-1.13
-		~app-text/docbook-xml-dtd-4.1.2
-		x11-libs/libXft )
-	X? ( x11-proto/xproto )"
-
-function multilib_enabled() {
-	has_multilib_profile || ( use x86 && [ "$(get_libdir)" = "lib32" ] )
-}
-
-pkg_setup() {
-	tc-export CXX
-	G2CONF="${G2CONF}
-		$(use_enable introspection)
-		$(use_with X x)
-		$(use X && echo --x-includes=${EPREFIX}/usr/include)
-		$(use X && echo --x-libraries=${EPREFIX}/usr/$(get_libdir))"
-	DOCS="AUTHORS ChangeLog* NEWS README THANKS"
-}
-
-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.26.0-lib64.patch"
-	fi
-
-	# Fix heap corruption in font parsing with FreeType2 backend, upstream bug #639882
-	epatch "${FILESDIR}/${PN}-1.28.3-heap-corruption.patch"
-
-	# Handle malloc failure in the buffer, upstream #644577
-	epatch "${FILESDIR}/${PN}-1.28.3-malloc-failure.patch"
-
-	eautoreconf
-	gnome2_src_prepare
-}
-
-src_install() {
-	gnome2_src_install
-	find "${ED}/usr/$(get_libdir)/pango/1.6.0/modules" -name "*.la" -delete || die
-}
-
-pkg_postinst() {
-	if [ "${ROOT}" = "/" ] ; then
-		einfo "Generating modules listing..."
-
-		local PANGO_CONFDIR=
-
-		if multilib_enabled ; then
-			PANGO_CONFDIR="${EPREFIX}/etc/pango/${CHOST}"
-		else
-			PANGO_CONFDIR="${EPREFIX}/etc/pango"
-		fi
-
-		mkdir -p "${PANGO_CONFDIR}"
-		local pango_conf="${PANGO_CONFDIR}/pango.modules"
-		local tmp_file=$(mktemp -t tmp.XXXXXXXXXXgdk_pixbuf_ebuild)
-
-		if pango-querymodules > "${tmp_file}"; then
-			cat "${tmp_file}" > "${pango_conf}" || {
-				rm "${tmp_file}"; die; }
-		else
-			ewarn "Cannot update pango.modules, file generation failed"
-		fi
-		rm "${tmp_file}"
-
-	fi
-}
diff --git a/x11-libs/pango/pango-1.28.4.ebuild b/x11-libs/pango/pango-1.28.4.ebuild
index 09bf96582109..dcc61ef9bc54 100644
--- a/x11-libs/pango/pango-1.28.4.ebuild
+++ b/x11-libs/pango/pango-1.28.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/pango-1.28.4.ebuild,v 1.21 2012/05/05 03:52:23 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/pango-1.28.4.ebuild,v 1.22 2012/10/17 11:18:22 tetromino Exp $
 
 EAPI="3"
 GCONF_DEBUG="yes"
@@ -14,7 +14,7 @@ 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 ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="X doc +introspection test"
+IUSE="X +introspection"
 
 RDEPEND=">=dev-libs/glib-2.24:2
 	>=media-libs/fontconfig-2.5.0:1.0
@@ -27,15 +27,7 @@ RDEPEND=">=dev-libs/glib-2.24:2
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	>=dev-util/gtk-doc-am-1.13
-	doc? (
-		>=dev-util/gtk-doc-1.13
-		~app-text/docbook-xml-dtd-4.1.2
-		x11-libs/libXft )
 	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
-	test? (
-		>=dev-util/gtk-doc-1.13
-		~app-text/docbook-xml-dtd-4.1.2
-		x11-libs/libXft )
 	X? ( x11-proto/xproto )
 	!<=sys-devel/autoconf-2.63:2.5"
 
@@ -79,7 +71,7 @@ pkg_postinst() {
 
 		mkdir -p "${PANGO_CONFDIR}"
 		local pango_conf="${PANGO_CONFDIR}/pango.modules"
-		local tmp_file=$(mktemp -t tmp.XXXXXXXXXXgdk_pixbuf_ebuild)
+		local tmp_file=$(mktemp -t tmp_pango_ebuild.XXXXXXXXXX)
 
 		# be atomic!
 		if pango-querymodules > "${tmp_file}"; then
diff --git a/x11-libs/pango/pango-1.29.4.ebuild b/x11-libs/pango/pango-1.29.4.ebuild
index 7c860acbd649..02a1e6e72c9e 100644
--- a/x11-libs/pango/pango-1.29.4.ebuild
+++ b/x11-libs/pango/pango-1.29.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/pango-1.29.4.ebuild,v 1.16 2012/05/20 19:31:39 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/pango-1.29.4.ebuild,v 1.17 2012/10/17 11:18:22 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="yes"
@@ -15,10 +15,7 @@ LICENSE="LGPL-2 FTL"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 
-IUSE="X doc +introspection test"
-
-# Upstream bug #643802
-REQUIRED_USE="doc? ( X )"
+IUSE="X +introspection"
 
 # Use glib-2.29.5 for g_atomic_int_add
 RDEPEND=">=dev-libs/glib-2.29.5:2
@@ -32,15 +29,7 @@ RDEPEND=">=dev-libs/glib-2.29.5:2
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	>=dev-util/gtk-doc-am-1.13
-	doc? (
-		>=dev-util/gtk-doc-1.13
-		~app-text/docbook-xml-dtd-4.1.2
-		x11-libs/libXft )
 	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
-	test? (
-		>=dev-util/gtk-doc-1.13
-		~app-text/docbook-xml-dtd-4.1.2
-		x11-libs/libXft )
 	X? ( x11-proto/xproto )
 	!<=sys-devel/autoconf-2.63:2.5"
 
@@ -78,7 +67,7 @@ pkg_postinst() {
 
 	mkdir -p "${PANGO_CONFDIR}"
 	local pango_conf="${PANGO_CONFDIR}/pango.modules"
-	local tmp_file=$(mktemp -t tmp.XXXXXXXXXXgdk_pixbuf_ebuild)
+	local tmp_file=$(mktemp -t tmp_pango_ebuild.XXXXXXXXXX)
 
 	# be atomic!
 	if pango-querymodules \
diff --git a/x11-libs/pango/pango-1.30.0.ebuild b/x11-libs/pango/pango-1.30.0.ebuild
deleted file mode 100644
index eedde30fde9a..000000000000
--- a/x11-libs/pango/pango-1.30.0.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/pango-1.30.0.ebuild,v 1.7 2012/05/05 03:52:23 jdhore Exp $
-
-EAPI="4"
-GCONF_DEBUG="yes"
-GNOME2_LA_PUNT="yes"
-
-inherit autotools eutils gnome2 multilib toolchain-funcs
-
-DESCRIPTION="Internationalized text layout and rendering 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 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-
-IUSE="X doc +introspection test"
-
-# Upstream bug #643802
-REQUIRED_USE="doc? ( X )"
-
-RDEPEND=">=dev-libs/glib-2.31.0:2
-	>=media-libs/fontconfig-2.5.0:1.0
-	media-libs/freetype:2
-	>=x11-libs/cairo-1.7.6[X?]
-	X? (
-		x11-libs/libXrender
-		x11-libs/libX11
-		>=x11-libs/libXft-2.0.0 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	>=dev-util/gtk-doc-am-1.13
-	doc? (
-		>=dev-util/gtk-doc-1.13
-		~app-text/docbook-xml-dtd-4.1.2
-		x11-libs/libXft )
-	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
-	test? (
-		>=dev-util/gtk-doc-1.13
-		~app-text/docbook-xml-dtd-4.1.2
-		x11-libs/libXft )
-	X? ( x11-proto/xproto )
-	!<=sys-devel/autoconf-2.63:2.5"
-
-function multilib_enabled() {
-	has_multilib_profile || ( use x86 && [ "$(get_libdir)" = "lib32" ] )
-}
-
-pkg_setup() {
-	tc-export CXX
-	G2CONF="${G2CONF}
-		$(use_enable introspection)
-		$(use_with X x)
-		$(use X && echo --x-includes=${EPREFIX}/usr/include)
-		$(use X && echo --x-libraries=${EPREFIX}/usr/$(get_libdir))"
-	DOCS="AUTHORS ChangeLog* NEWS README THANKS"
-}
-
-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.26.0-lib64.patch"
-		eautoreconf
-	fi
-
-	gnome2_src_prepare
-}
-
-pkg_postinst() {
-	einfo "Generating modules listing..."
-
-	local PANGO_CONFDIR="${EROOT}/etc/pango"
-	multilib_enabled && PANGO_CONFDIR+="/${CHOST}"
-
-	mkdir -p "${PANGO_CONFDIR}"
-	local pango_conf="${PANGO_CONFDIR}/pango.modules"
-	local tmp_file=$(mktemp -t tmp.XXXXXXXXXXgdk_pixbuf_ebuild)
-
-	# be atomic!
-	if pango-querymodules \
-		"${EROOT}"usr/$(get_libdir)/pango/1.6.0/modules/*.so \
-			> "${tmp_file}"; then
-		cat "${tmp_file}" > "${pango_conf}" || {
-			rm "${tmp_file}"; die; }
-	else
-		ewarn "Cannot update pango.modules, file generation failed"
-	fi
-	rm "${tmp_file}"
-}
diff --git a/x11-libs/pango/pango-1.30.1.ebuild b/x11-libs/pango/pango-1.30.1.ebuild
index 010d4d120369..79e058625dc4 100644
--- a/x11-libs/pango/pango-1.30.1.ebuild
+++ b/x11-libs/pango/pango-1.30.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/pango-1.30.1.ebuild,v 1.9 2012/10/06 21:19:21 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/pango-1.30.1.ebuild,v 1.10 2012/10/17 11:18:22 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="yes"
@@ -11,14 +11,11 @@ inherit autotools eutils gnome2 multilib toolchain-funcs
 DESCRIPTION="Internationalized text layout and rendering library"
 HOMEPAGE="http://www.pango.org/"
 
-LICENSE="LGPL-2 FTL"
+LICENSE="LGPL-2+ FTL"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 
-IUSE="X doc +introspection test"
-
-# Upstream bug #643802
-REQUIRED_USE="doc? ( X )"
+IUSE="X +introspection"
 
 RDEPEND=">=dev-libs/glib-2.31.0:2
 	>=media-libs/fontconfig-2.5.0:1.0
@@ -31,15 +28,7 @@ RDEPEND=">=dev-libs/glib-2.31.0:2
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	>=dev-util/gtk-doc-am-1.13
-	doc? (
-		>=dev-util/gtk-doc-1.13
-		~app-text/docbook-xml-dtd-4.1.2
-		x11-libs/libXft )
 	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
-	test? (
-		>=dev-util/gtk-doc-1.13
-		~app-text/docbook-xml-dtd-4.1.2
-		x11-libs/libXft )
 	X? ( x11-proto/xproto )
 	!<=sys-devel/autoconf-2.63:2.5"
 
@@ -84,7 +73,7 @@ pkg_postinst() {
 
 	mkdir -p "${PANGO_CONFDIR}"
 	local pango_conf="${PANGO_CONFDIR}/pango.modules"
-	local tmp_file=$(mktemp -t tmp.XXXXXXXXXXgdk_pixbuf_ebuild)
+	local tmp_file=$(mktemp -t tmp_pango_ebuild.XXXXXXXXXX)
 
 	# be atomic!
 	if pango-querymodules --system \