Version bump from upstream

(Portage version: 2.0.53)

5 files changed, 129 insertions, 12 deletions

diff --git a/x11-libs/pango/ChangeLog b/x11-libs/pango/ChangeLog
index 8f156cf6b2d1..99612bd3c0f9 100644
--- a/x11-libs/pango/ChangeLog
+++ b/x11-libs/pango/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-libs/pango
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/ChangeLog,v 1.112 2005/10/30 01:03:22 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/ChangeLog,v 1.113 2005/12/11 07:35:16 compnerd Exp $
+
+*pango-1.10.2 (11 Dec 2005)
+
+  11 Dec 2005; Saleem Abdulrasool <compnerd@gentoo.org>
+  +files/pango-1.10.2-slighthint.patch, +pango-1.10.2.ebuild:
+  Version bump from upstream.
 
   30 Oct 2005; Doug Goldstein <cardoe@gentoo.org> pango-1.10.1.ebuild:
   Forgot to commit modular X deps from ages ago
diff --git a/x11-libs/pango/Manifest b/x11-libs/pango/Manifest
index 43b0547ea336..eb348be5736a 100644
--- a/x11-libs/pango/Manifest
+++ b/x11-libs/pango/Manifest
@@ -1,26 +1,19 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 65f9d4c205767b4eaa06547d9a93bc25 ChangeLog 12616
+MD5 86a0bd42ee87d047868b4d3e0a89d17a ChangeLog 12794
 MD5 d01b8f91979149fb6b036c3d443315eb files/digest-pango-1.10.1 66
+MD5 9fb4dec18e6aa5df32df1ef97b7878ca files/digest-pango-1.10.2 66
 MD5 941770096c4a3927b2acb1b81f90b915 files/digest-pango-1.4.1-r1 64
 MD5 54474022d422b0d0cf4b473cfcf5fffb files/digest-pango-1.8.1 64
 MD5 54474022d422b0d0cf4b473cfcf5fffb files/digest-pango-1.8.1-r1 64
 MD5 64bcab7976f0bf42506cf97f7336e0c1 files/digest-pango-1.8.2 65
 MD5 54a56a572951b08340d08e10e4d93414 files/pango-1.0.99.020606-xfonts.patch 4560
+MD5 40faa11ac45a2600e6b3c7eeec64cc50 files/pango-1.10.2-slighthint.patch 1069
 MD5 ee91ace9933dbdbea591e08b6a82bb44 files/pango-1.2.2-slighthint.patch 1124
 MD5 2c7eef6720e5a5aecb7406200c6ede31 files/pango-1.2.5-lib64.patch 1107
 MD5 8de5114d2f4367487b3d70b712115ec4 files/pango-1.8.1-fontfix.patch 1320
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 MD5 67536000773a531c886202e015e9795d pango-1.10.1.ebuild 2164
+MD5 3fbdd958b8168f9353b6d62c56d94fbf pango-1.10.2.ebuild 2069
 MD5 a4d0ffeb51ccd5e32c1bdecbe004ab3e pango-1.4.1-r1.ebuild 1881
 MD5 da1e20a87deaa737c836f4b9819400db pango-1.8.1-r1.ebuild 1978
 MD5 724ba9499e8fd9e01e37131a0622919e pango-1.8.1.ebuild 1908
 MD5 10c01fe6f38e0f3412b79c3beef2f3ed pango-1.8.2.ebuild 1853
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDZBv5BtvusYtCZMsRAms2AJ9nUw6b+aYs3FWCdS7Khe8MuHbOugCfZTKt
-BRw0yFsCCx2i1V1mMwybr2Q=
-=F2C8
------END PGP SIGNATURE-----
diff --git a/x11-libs/pango/files/digest-pango-1.10.2 b/x11-libs/pango/files/digest-pango-1.10.2
new file mode 100644
index 000000000000..7e6b5b454ace
--- /dev/null
+++ b/x11-libs/pango/files/digest-pango-1.10.2
@@ -0,0 +1 @@
+MD5 7302220d93ac17d2c44f356d852e81dc pango-1.10.2.tar.bz2 1168421
diff --git a/x11-libs/pango/files/pango-1.10.2-slighthint.patch b/x11-libs/pango/files/pango-1.10.2-slighthint.patch
new file mode 100644
index 000000000000..337ecb08c731
--- /dev/null
+++ b/x11-libs/pango/files/pango-1.10.2-slighthint.patch
@@ -0,0 +1,34 @@
+--- 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/pango-1.10.2.ebuild b/x11-libs/pango/pango-1.10.2.ebuild
new file mode 100644
index 000000000000..443604ed8cd9
--- /dev/null
+++ b/x11-libs/pango/pango-1.10.2.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/pango-1.10.2.ebuild,v 1.1 2005/12/11 07:35:16 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 ~sparc ~x86"
+IUSE="doc"
+
+RDEPEND="|| ( (
+		x11-libs/libXrender
+		x11-libs/libX11
+		x11-libs/libXt
+		)
+	virtual/x11 )
+	virtual/xft
+	>=dev-libs/glib-2.5.7
+	>=media-libs/fontconfig-1.0.1
+	>=media-libs/freetype-2
+	>x11-libs/cairo-0.5.2"
+
+DEPEND="${RDEPEND}
+	>=dev-util/pkgconfig-0.9
+	|| ( x11-proto/xproto virtual/x11 )
+	doc? (
+		>=dev-util/gtk-doc-1
+		~app-text/docbook-xml-dtd-4.1.2 )"
+
+DOCS="AUTHORS ChangeLog* NEWS README TODO*"
+USE_DESTDIR="1"
+
+
+pkg_setup() {
+	if ! built_with_use -a x11-libs/cairo png X; then
+		einfo "Please re-emerge x11-libs/cairo with the png and X USE flags set"
+		die "cairo needs png and X flags set"
+	fi
+}
+
+src_unpack() {
+	unpack "${A}"
+	cd "${S}"
+
+	# Some enhancements from Redhat
+	epatch ${FILESDIR}/pango-1.0.99.020606-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
+	use amd64 && mkdir ${D}/etc/pango/${CHOST}
+	use x86 && [ "${CONF_LIBDIR}" == "lib32" ] && mkdir ${D}/etc/pango/${CHOST}
+
+}
+
+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}
+		pango-querymodules > ${PANGO_CONFDIR}/pango.modules
+	fi
+
+}