up-ported the smoothhint patch, new version

8 files changed, 148 insertions, 11 deletions

diff --git a/x11-libs/pango/ChangeLog b/x11-libs/pango/ChangeLog
index 42317fc233c4..8fb23b5fcfa4 100644
--- a/x11-libs/pango/ChangeLog
+++ b/x11-libs/pango/ChangeLog
@@ -1,11 +1,20 @@
 # ChangeLog for x11-libs/pango
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/ChangeLog,v 1.28 2003/01/01 18:58:23 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/ChangeLog,v 1.29 2003/02/04 06:01:02 spider Exp $
+
+*pango-1.2.1.ebuild (04 Feb 2003)
+  
+  04 Feb 2003; Spider <spider@gentoo.org> pango-1.2.1.ebuild :
+  versionbumped 
 
-  01 Jan 2003; Aron Griffis <agriffis@gentoo.org> pango-1.2.0.ebuild :
-  Added ~alpha to KEYWORDS
 
 *pango-1.2.0.ebuild (22 Dec 2002)
+  
+  04 Feb 2003; Spider <spider@gentoo.org> 
+  Change DEBUG to DEBUGBUILD
+
+  01 Jan 2003; Aron Griffis <agriffis@gentoo.org> pango-1.2.0.ebuild :
+  Added ~alpha to KEYWORDS
 
   22 Dec 2002; foser <foser@gentoo.org> pango-1.2.0.ebuild :
   New stable version
@@ -30,6 +39,9 @@
 
 *pango-1.1.3 (12 Nov 2002)
 
+  04 Feb 2003; Spider <spider@gentoo.org> 
+  Change DEBUG to DEBUGBUILD
+  
   26 Nov 2002; Jon Nall <nall@gentoo.org> pango-1.1.3.ebuild :
   added ~ppc to KEYWORDS
 
@@ -38,11 +50,17 @@
 
 *pango-1.1.2 (27 Oct 2002)
 
+  04 Feb 2003; Spider <spider@gentoo.org> 
+  Change DEBUG to DEBUGBUILD
+
   27 Oct 2002; foser <foser@gentoo.org> pango-1.1.2.ebuild :
   gnome 2.1
 
 *pango-1.0.5 (14 Oct 2002)
 
+  04 Feb 2003; Spider <spider@gentoo.org> 
+  Change DEBUG to DEBUGBUILD
+  
   02 Nov 2002; foser <foser@gentoo.org> pango-1.0.5.ebuild :
   Added sgmltools-lite as doc dep (bug #9564)
 
@@ -50,6 +68,10 @@
   New version
 
 *pango-1.0.4-r1 (4 Aug 2002)
+  
+  04 Feb 2003; Spider <spider@gentoo.org> 
+  Change DEBUG to DEBUGBUILD
+  
   12 aug 2002; Spider <spider@gentoo.org> pango-1.0.4-r1.ebuild :
   change freetype version to force update
   
@@ -57,6 +79,7 @@
   Remove debugging, libtoolize
   
 *pango-1.0.4 (4 Aug 2002)
+  
   4 Aug 2002; Gabriele Giorgetti <stroke@gentoo.org> pango-1.0.4:
   New version.
 
diff --git a/x11-libs/pango/files/digest-pango-1.2.1 b/x11-libs/pango/files/digest-pango-1.2.1
new file mode 100644
index 000000000000..3dc84e5144cb
--- /dev/null
+++ b/x11-libs/pango/files/digest-pango-1.2.1
@@ -0,0 +1 @@
+MD5 6b354ef14e75739a92b5b78f4ca3165a pango-1.2.1.tar.bz2 776687
diff --git a/x11-libs/pango/files/pango-1.2.1-slighthint-gentoo.patch b/x11-libs/pango/files/pango-1.2.1-slighthint-gentoo.patch
new file mode 100644
index 000000000000..693f3467045f
--- /dev/null
+++ b/x11-libs/pango/files/pango-1.2.1-slighthint-gentoo.patch
@@ -0,0 +1,54 @@
+--- pango-1.2.1/pango/pangoft2.c	2002-12-07 07:05:48.000000000 +0100
++++ pango-1.2.1.slighthint/pango/pangoft2.c	2002-12-23 02:37:38.000000000 +0100
+@@ -204,6 +204,8 @@
+   FcPattern *pattern;
+   FcChar8 *filename;
+   FcBool hinting, autohint;
++  FT_ULong hint_flags;
++  int hintstyle;
+   int id;
+ 
+   pattern = ft2font->font_pattern;
+@@ -219,8 +221,22 @@
+       if (FcPatternGetBool (pattern, 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:
++			  hint_flags = FT_HINT_NO_INTEGER_STEM | FT_HINT_NO_VSTEM_ALIGN;
++			  break;
++		  case FC_HINT_MEDIUM:
++			  hint_flags = FT_HINT_NO_INTEGER_STEM;
++			  break;
++		  default:
++			  hint_flags = 0;
++      }
+ 
+       /* force autohinting if requested */
+       if (FcPatternGetBool (pattern, FC_AUTOHINT, 0, &autohint) != FcResultMatch)
+@@ -244,7 +260,7 @@
+ 	}
+ 
+       g_assert (ft2font->face);
+-      
++
+       if (!set_unicode_charmap (ft2font->face))
+ 	{
+ 	  g_warning ("Unable to load unicode charmap from font file %s", filename);
+@@ -261,6 +277,8 @@
+ 				0, 0);
+       if (error)
+ 	g_warning ("Error in FT_Set_Char_Size: %d", error);
++
++      FT_Set_Hint_Flags (ft2font->face, hint_flags);
+     }
+   
+   return ft2font->face;
diff --git a/x11-libs/pango/pango-1.0.4-r1.ebuild b/x11-libs/pango/pango-1.0.4-r1.ebuild
index 7c5c37d30f02..f23c82ce2e6f 100644
--- a/x11-libs/pango/pango-1.0.4-r1.ebuild
+++ b/x11-libs/pango/pango-1.0.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/pango-1.0.4-r1.ebuild,v 1.9 2002/12/15 10:44:24 bjb Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/pango-1.0.4-r1.ebuild,v 1.10 2003/02/04 06:01:02 spider Exp $
 
 IUSE="doc"
 
@@ -28,7 +28,7 @@ src_compile() {
 	elibtoolize
 	local myconf
 	use doc && myconf="--enable-gtk-doc" || myconf="--disable-gtk-doc"
-	if [ -n "$DEBUG" ]; then
+	if [ -n "$DEBUGBUILD" ]; then
 		myconf="${myconf}  --enable-debug"
 	fi
 				
diff --git a/x11-libs/pango/pango-1.0.5.ebuild b/x11-libs/pango/pango-1.0.5.ebuild
index 9e72d90557a5..b182cbfa6b47 100644
--- a/x11-libs/pango/pango-1.0.5.ebuild
+++ b/x11-libs/pango/pango-1.0.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/pango-1.0.5.ebuild,v 1.5 2002/12/15 10:44:24 bjb Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/pango-1.0.5.ebuild,v 1.6 2003/02/04 06:01:02 spider Exp $
 
 IUSE="doc"
 
@@ -28,7 +28,7 @@ src_compile() {
 	elibtoolize
 	local myconf
 	use doc && myconf="--enable-gtk-doc" || myconf="--disable-gtk-doc"
-	if [ -n "$DEBUG" ]; then
+	if [ -n "$DEBUGBUILD" ]; then
 		myconf="${myconf}  --enable-debug"
 	fi
 				
diff --git a/x11-libs/pango/pango-1.1.3.ebuild b/x11-libs/pango/pango-1.1.3.ebuild
index 869e8aa99b56..9182d03bcae2 100644
--- a/x11-libs/pango/pango-1.1.3.ebuild
+++ b/x11-libs/pango/pango-1.1.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/pango-1.1.3.ebuild,v 1.10 2002/12/15 02:14:03 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/pango-1.1.3.ebuild,v 1.11 2003/02/04 06:01:02 spider Exp $
 
 IUSE="doc"
 
@@ -39,7 +39,7 @@ src_compile() {
 	elibtoolize
 	local myconf=""
 	use doc && myconf="--enable-gtk-doc" || myconf="--disable-gtk-doc"
-	if [ -n "$DEBUG" ]; then
+	if [ -n "$DEBUGBUILD" ]; then
 		myconf="${myconf}  --enable-debug"
 	fi
 	
diff --git a/x11-libs/pango/pango-1.2.0.ebuild b/x11-libs/pango/pango-1.2.0.ebuild
index 918749c45964..e3ddad01f147 100644
--- a/x11-libs/pango/pango-1.2.0.ebuild
+++ b/x11-libs/pango/pango-1.2.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/pango-1.2.0.ebuild,v 1.5 2003/01/18 12:39:40 bjb Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/pango-1.2.0.ebuild,v 1.6 2003/02/04 06:01:02 spider Exp $
 
 inherit eutils libtool
 
@@ -39,7 +39,7 @@ src_compile() {
 	elibtoolize
 	local myconf=""
 	use doc && myconf="--enable-gtk-doc" || myconf="--disable-gtk-doc"
-	if [ -n "$DEBUG" ]; then
+	if [ -n "$DEBUGBUILD" ]; then
 		myconf="${myconf}  --enable-debug"
 	fi
 	
diff --git a/x11-libs/pango/pango-1.2.1.ebuild b/x11-libs/pango/pango-1.2.1.ebuild
new file mode 100644
index 000000000000..6320ba2a839d
--- /dev/null
+++ b/x11-libs/pango/pango-1.2.1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/pango-1.2.1.ebuild,v 1.1 2003/02/04 06:01:02 spider Exp $
+
+inherit eutils libtool
+
+IUSE="doc"
+SLOT="1"
+KEYWORDS="~x86 ~ppc ~alpha"
+
+S="${WORKDIR}/${P}"
+DESCRIPTION="Text rendering and Layout library"
+SRC_URI="ftp://ftp.gtk.org/pub/gtk/v2.2/${P}.tar.bz2"
+HOMEPAGE="http://www.pango.org/"
+LICENSE="LGPL-2.1"
+
+RDEPEND="virtual/x11
+	virtual/xft
+	>=dev-libs/glib-2.1.3
+	>=media-libs/fontconfig-2
+	>=media-libs/freetype-2.1.2-r2"
+	
+DEPEND="${RDEPEND}
+	>=dev-util/pkgconfig-0.12.0
+	doc? ( >=dev-util/gtk-doc-0.9
+		app-text/sgmltools-lite )"
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+	# Some enhancements from Redhat
+	epatch ${FILESDIR}/pango-1.0.99.020606-xfonts.patch
+	# patch adapted from RH initial patch by <foser@gentoo.org>
+	epatch ${FILESDIR}/${P}-slighthint-gentoo.patch
+}
+
+src_compile() {
+	elibtoolize
+	local myconf=""
+	use doc && myconf="--enable-gtk-doc" || myconf="--disable-gtk-doc"
+	if [ -n "$DEBUGBUILD" ]; then
+		myconf="${myconf}  --enable-debug"
+	fi
+	
+	econf ${myconf} --without-qt  || die
+	make || die "serial make failed" 
+}
+
+src_install() {
+	einstall
+	rm ${D}/etc/pango/pango.modules
+
+ 	dodoc AUTHORS ChangeLog COPYING README INSTALL NEWS TODO*
+}
+
+pkg_postinst() {
+	pango-querymodules >/etc/pango/pango.modules
+}