* bump to 1.18.4

 * clean up old release
(Portage version: 2.1.4)

7 files changed, 84 insertions, 207 deletions

diff --git a/x11-libs/pango/ChangeLog b/x11-libs/pango/ChangeLog
index 2eaa7982c679..84829a7eed59 100644
--- a/x11-libs/pango/ChangeLog
+++ b/x11-libs/pango/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for x11-libs/pango
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/ChangeLog,v 1.205 2008/01/04 07:31:21 compnerd Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/ChangeLog,v 1.206 2008/01/19 20:56:37 eva Exp $
+
+  19 Jan 2008; Gilles Dartiguelongue <eva@gentoo.org>
+  -files/pango-1.10.2-slighthint.patch, -files/pango-1.11.3-xfonts.patch,
+  -pango-1.12.3.ebuild:
+  clean up old release
+
+*pango-1.18.4 (19 Jan 2008)
+
+  19 Jan 2008; Gilles Dartiguelongue <eva@gentoo.org> +pango-1.18.4.ebuild:
+  bump to 1.18.4
 
   04 Jan 2008; Saleem Abdulrasool <compnerd@gentoo.org>
   +files/pango-1.10.2-slighthint.patch, +files/pango-1.11.3-xfonts.patch,
diff --git a/x11-libs/pango/files/digest-pango-1.12.3 b/x11-libs/pango/files/digest-pango-1.12.3
deleted file mode 100644
index 0c9460cba8db..000000000000
--- a/x11-libs/pango/files/digest-pango-1.12.3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 c8178e11a895166d86990bb2c38d831b pango-1.12.3.tar.bz2 1226579
-RMD160 7692828276e9b5a54b0b8c32fa07d7db6ac45bed pango-1.12.3.tar.bz2 1226579
-SHA256 73ac1b956ff16df41c41355231aae3f757500c83ab912108370ea7b70c43fd18 pango-1.12.3.tar.bz2 1226579
diff --git a/x11-libs/pango/files/digest-pango-1.18.4 b/x11-libs/pango/files/digest-pango-1.18.4
new file mode 100644
index 000000000000..084cbd7d9eec
--- /dev/null
+++ b/x11-libs/pango/files/digest-pango-1.18.4
@@ -0,0 +1,3 @@
+MD5 5f4a24eb03789746a13e41beb7044776 pango-1.18.4.tar.bz2 1406821
+RMD160 73213249d86f9344572d27ce0720ee574b8cdecd pango-1.18.4.tar.bz2 1406821
+SHA256 6fd3c82eb7aa1fd410cde21189b005095e882d8ab381a5b85bb7483ab7e7efdd pango-1.18.4.tar.bz2 1406821
diff --git a/x11-libs/pango/files/pango-1.10.2-slighthint.patch b/x11-libs/pango/files/pango-1.10.2-slighthint.patch
deleted file mode 100644
index 337ecb08c731..000000000000
--- a/x11-libs/pango/files/pango-1.10.2-slighthint.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- pango/pangoft2.c.orig	2005-12-09 23:37:11.000000000 -0600
-+++ pango/pangoft2.c	2005-12-09 23:40:17.000000000 -0600
-@@ -171,6 +171,7 @@
-   FcPattern *pattern;
-   FcChar8 *filename;
-   FcBool antialias, hinting, autohint;
-+  int hintstyle;
-   int id;
- 
-   pattern = fcfont->font_pattern;
-@@ -194,8 +195,21 @@
-                             FC_HINTING, 0, &hinting) != FcResultMatch)
- 	hinting = FcTrue;
- 
--      if (!hinting)
--        ft2font->load_flags |= FT_LOAD_NO_HINTING;
-+      if (FcPatternGetInteger (pattern, FC_HINT_STYLE, 0, &hintstyle) != FcResultMatch)
-+         hintstyle = FC_HINT_FULL;
-+
-+      if (!hinting || hintstyle == FC_HINT_NONE)
-+         ft2font->load_flags |= FT_LOAD_NO_HINTING;
-+
-+      switch (hintstyle) {
-+         case FC_HINT_SLIGHT:
-+         case FC_HINT_MEDIUM:
-+            ft2font->load_flags |= FT_LOAD_TARGET_LIGHT;
-+            break;
-+         default:
-+            ft2font->load_flags |= FT_LOAD_TARGET_NORMAL;
-+            break;
-+      }
- 
-       /* force autohinting if requested */
-       if (FcPatternGetBool (pattern,
diff --git a/x11-libs/pango/files/pango-1.11.3-xfonts.patch b/x11-libs/pango/files/pango-1.11.3-xfonts.patch
deleted file mode 100644
index 0e29cb9cd49a..000000000000
--- a/x11-libs/pango/files/pango-1.11.3-xfonts.patch
+++ /dev/null
@@ -1,98 +0,0 @@
---- pango-1.1.13/pango/pangox.aliases.xfonts	Mon Jun 24 20:19:34 2002
-+++ pango-1.1.13/pango/pangox.aliases	Mon Jun 24 20:26:34 2002
-@@ -4,6 +4,7 @@
- 
- sans normal normal normal normal \
-   "-*-helvetica-medium-r-normal--*-*-*-*-*-*-*-*,\
-+   -*-gulimbdf-medium-r-normal--*-*-*-*-*-*-ksc5601.1987-0,\
-    -*-gulim-medium-r-normal--*-*-*-*-*-*-ksc5601.1987-0,\
-    -*-clearlyu-medium-r-normal--*-*-*-*-*-*-iso10646-1,\
-    -*-fixed-medium-r-normal--*-*-*-*-*-*-*-*,\
-@@ -22,6 +23,7 @@
- 
- sans italic normal normal normal \
-   "-*-helvetica-medium-o-normal--*-*-*-*-*-*-*-*,\
-+   -*-gulimbdf-medium-r-normal--*-*-*-*-*-*-ksc5601.1987-0,\
-    -*-gulim-medium-o-normal--*-*-*-*-*-*-ksc5601.1987-0,\
-    -*-clearlyu-medium-r-normal--*-*-*-*-*-*-iso10646-1,\
-    -*-fixed-medium-r-normal--*-*-*-*-*-*-*-*,\
-@@ -40,6 +42,7 @@
- 
- sans normal normal bold normal \
-   "-*-helvetica-bold-r-normal--*-*-*-*-*-*-*-*,\
-+   -*-gulimbdf-medium-r-normal--*-*-*-*-*-*-ksc5601.1987-0,\
-    -*-gulim-bold-r-normal--*-*-*-*-*-*-ksc5601.1987-0,\
-    -*-clearlyu-medium-r-normal--*-*-*-*-*-*-iso10646-1,\
-    -*-fixed-medium-r-normal--*-*-*-*-*-*-*-*,\
-@@ -58,6 +61,7 @@
- 
- sans italic normal bold normal \
-   "-*-helvetica-bold-o-normal--*-*-*-*-*-*-*-*,\
-+   -*-gulimbdf-medium-r-normal--*-*-*-*-*-*-ksc5601.1987-0,\
-    -*-gulim-bold-o-normal--*-*-*-*-*-*-ksc5601.1987-0,\
-    -*-clearlyu-medium-r-normal--*-*-*-*-*-*-iso10646-1,\
-    -*-fixed-medium-r-normal--*-*-*-*-*-*-*-*,\
-@@ -78,6 +82,7 @@
- serif normal normal normal normal \
-   "-*-times-medium-r-normal--*-*-*-*-*-*-*-*,\
-    -*-batang-medium-r-normal--*-*-*-*-*-*-ksc5601.1987-0,\
-+   -*-gulimbdf-medium-r-normal--*-*-*-*-*-*-ksc5601.1987-0,\
-    -*-clearlyu-medium-r-normal--*-*-*-*-*-*-iso10646-1,\
-    -*-fixed-medium-r-normal--*-*-*-*-*-*-*-*,\
-    -kaist-iyagi-bold-r-normal--*-*-*-*-*-*-johab-1,\
-@@ -96,6 +101,7 @@
- serif italic normal normal normal \
-   "-*-times-medium-i-normal--*-*-*-*-*-*-*-*,\
-    -*-batang-medium-r-normal--*-*-*-*-*-*-ksc5601.1987-0,\
-+   -*-gulimbdf-medium-r-normal--*-*-*-*-*-*-ksc5601.1987-0,\
-    -*-clearlyu-medium-r-normal--*-*-*-*-*-*-iso10646-1,\
-    -*-fixed-medium-r-normal--*-*-*-*-*-*-*-*,\
-    -kaist-iyagi-bold-r-normal--*-*-*-*-*-*-johab-1,\
-@@ -114,6 +120,7 @@
- serif normal normal bold normal \
-   "-*-times-bold-r-normal--*-*-*-*-*-*-*-*,\
-    -*-batang-bold-r-normal--*-*-*-*-*-*-ksc5601.1987-0,\
-+   -*-gulimbdf-medium-r-normal--*-*-*-*-*-*-ksc5601.1987-0,\
-    -*-clearlyu-medium-r-normal--*-*-*-*-*-*-iso10646-1,\
-    -*-fixed-medium-r-normal--*-*-*-*-*-*-*-*,\
-    -kaist-iyagi-bold-r-normal--*-*-*-*-*-*-johab-1,\
-@@ -132,6 +139,7 @@
- serif italic normal bold normal \
-   "-*-times-bold-i-normal--*-*-*-*-*-*-*-*,\
-    -*-batang-bold-r-normal--*-*-*-*-*-*-ksc5601.1987-0,\
-+   -*-gulimbdf-medium-r-normal--*-*-*-*-*-*-ksc5601.1987-0,\
-    -*-clearlyu-medium-r-normal--*-*-*-*-*-*-iso10646-1,\
-    -*-fixed-medium-r-normal--*-*-*-*-*-*-*-*,\
-    -kaist-iyagi-bold-r-normal--*-*-*-*-*-*-johab-1,\
-@@ -150,6 +158,7 @@
- monospace normal normal normal normal \
-   "-*-fixed-medium-r-normal--*-*-*-*-*-*-*-*,\
-    -*-dotum-medium-r-normal--*-*-*-*-*-*-ksc5601.1987-0,\
-+   -*-gulimbdf-medium-r-normal--*-*-*-*-*-*-ksc5601.1987-0,\
-    -*-clearlyu-medium-r-normal--*-*-*-*-*-*-iso10646-1,\
-    -*-fixed-medium-r-normal--*-*-*-*-*-*-*-*,\
-    -kaist-iyagi-bold-r-normal--*-*-*-*-*-*-johab-1,\
-@@ -168,6 +177,7 @@
- monospace italic normal normal normal \
-   "-*-fixed-medium-i-normal--*-*-*-*-*-*-*-*,\
-    -*-dotum-medium-r-normal--*-*-*-*-*-*-ksc5601.1987-0,\
-+   -*-gulimbdf-medium-r-normal--*-*-*-*-*-*-ksc5601.1987-0,\
-    -*-clearlyu-medium-r-normal--*-*-*-*-*-*-iso10646-1,\
-    -*-fixed-medium-r-normal--*-*-*-*-*-*-*-*,\
-    -kaist-iyagi-bold-r-normal--*-*-*-*-*-*-johab-1,\
-@@ -186,6 +196,7 @@
- monospace normal normal bold normal \
-   "-*-fixed-bold-r-normal--*-*-*-*-*-*-*-*,\
-    -*-dotum-bold-r-normal--*-*-*-*-*-*-ksc5601.1987-0,\
-+   -*-gulimbdf-medium-r-normal--*-*-*-*-*-*-ksc5601.1987-0,\
-    -*-clearlyu-medium-r-normal--*-*-*-*-*-*-iso10646-1,\
-    -*-fixed-medium-r-normal--*-*-*-*-*-*-*-*,\
-    -kaist-iyagi-bold-r-normal--*-*-*-*-*-*-johab-1,\
-@@ -204,6 +215,7 @@
- monospace italic normal bold normal \
-   "-*-fixed-bold-i-normal--*-*-*-*-*-*-*-*,\
-    -*-dotum-bold-r-normal--*-*-*-*-*-*-ksc5601.1987-0,\
-+   -*-gulimbdf-medium-r-normal--*-*-*-*-*-*-ksc5601.1987-0,\
-    -*-clearlyu-medium-r-normal--*-*-*-*-*-*-iso10646-1,\
-    -*-fixed-medium-r-normal--*-*-*-*-*-*-*-*,\
-    -kaist-iyagi-bold-r-normal--*-*-*-*-*-*-johab-1,\
diff --git a/x11-libs/pango/pango-1.12.3.ebuild b/x11-libs/pango/pango-1.12.3.ebuild
deleted file mode 100644
index a8b693fb386a..000000000000
--- a/x11-libs/pango/pango-1.12.3.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/pango-1.12.3.ebuild,v 1.15 2008/01/04 07:31:21 compnerd Exp $
-
-inherit eutils gnome2
-
-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 sh sparc x86 ~x86-fbsd"
-IUSE="doc"
-
-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.0.0"
-
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.9
-	x11-proto/xproto
-	doc? (
-		>=dev-util/gtk-doc-1
-		~app-text/docbook-xml-dtd-4.1.2 )"
-
-DOCS="AUTHORS ChangeLog* NEWS README TODO*"
-
-src_unpack() {
-
-	unpack "${A}"
-	cd "${S}"
-
-	# Some enhancements from Redhat
-	# These NEED to go upstream.
-	epatch "${FILESDIR}/pango-1.11.3-xfonts.patch"
-	epatch "${FILESDIR}/${PN}-1.10.2-slighthint.patch"
-
-	# make config file location host specific so that a 32bit and 64bit pango
-	# wont fight with each other on a multilib system
-	use amd64 && epatch "${FILESDIR}/pango-1.2.5-lib64.patch"
-	# and this line is just here to make building emul-linux-x86-gtklibs a bit
-	# easier, so even this should be amd64 specific.
-	use x86 && [ "${CONF_LIBDIR}" == "lib32" ] && epatch "${FILESDIR}/pango-1.2.5-lib64.patch"
-
-	epunt_cxx
-}
-
-src_install() {
-
-	gnome2_src_install
-
-	rm "${D}/etc/pango/pango.modules"
-}
-
-pkg_postinst() {
-
-	if [ "${ROOT}" == "/" ] ; then
-		einfo "Generating modules listing..."
-		use amd64 && PANGO_CONFDIR="/etc/pango/${CHOST}"
-		use x86 && [ "${CONF_LIBDIR}" == "lib32" ] && PANGO_CONFDIR="/etc/pango/${CHOST}"
-		PANGO_CONFDIR=${PANGO_CONFDIR:=/etc/pango}
-		mkdir -p ${PANGO_CONFDIR}
-		pango-querymodules > ${PANGO_CONFDIR}/pango.modules
-	fi
-
-}
diff --git a/x11-libs/pango/pango-1.18.4.ebuild b/x11-libs/pango/pango-1.18.4.ebuild
new file mode 100644
index 000000000000..3a7d7aeb85f9
--- /dev/null
+++ b/x11-libs/pango/pango-1.18.4.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/pango-1.18.4.ebuild,v 1.1 2008/01/19 20:56:37 eva Exp $
+
+inherit eutils gnome2 multilib
+
+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 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="doc"
+
+RDEPEND="x11-libs/libXrender
+	x11-libs/libX11
+	x11-libs/libXft
+	>=dev-libs/glib-2.14
+	>=media-libs/fontconfig-1.0.1
+	>=media-libs/freetype-2
+	>=x11-libs/cairo-1.2.6"
+DEPEND="${RDEPEND}
+	>=dev-util/pkgconfig-0.9
+	x11-proto/xproto
+	doc? (
+			>=dev-util/gtk-doc-1
+			~app-text/docbook-xml-dtd-4.1.2
+		 )"
+
+DOCS="AUTHORS ChangeLog* HACKING NEWS README"
+
+function multilib_enabled() {
+	has_multilib_profile || ( use x86 && [ "$(get_libdir)" == "lib32" ] )
+}
+
+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
+
+	epunt_cxx
+}
+
+src_install() {
+	gnome2_src_install
+	rm "${D}/etc/pango/pango.modules"
+}
+
+pkg_postinst() {
+	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}
+
+		pango-querymodules > ${PANGO_CONFDIR}/pango.modules
+	fi
+}