Pull xft, as it's only used with <=xfree-4.3.0-r1. Newer versions have it built in.

5 files changed, 0 insertions, 394 deletions

diff --git a/x11-libs/xft/ChangeLog b/x11-libs/xft/ChangeLog
deleted file mode 100644
index 380d060da4b5..000000000000
--- a/x11-libs/xft/ChangeLog
+++ /dev/null
@@ -1,88 +0,0 @@
-# ChangeLog for x11-libs/xft
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/xft/ChangeLog,v 1.24 2004/06/24 22:09:38 agriffis Exp $
-
-  02 Jun 2004; Donnie Berkholz <spyderous@gentoo.org>; xft-2.0.1-r2.ebuild:
-  Add blocker on x11-base/xorg-x11. (#52409).
-
-  17 Apr 2004; Daniel Ahlberg <aliz@gentoo.org> xft-2.0.1-r2.ebuild:
-  Added IUSE.
-
-*xft-2.0.1-r2 (08 Apr 2003)
-
-  12 Jun 2003; foser <foser@gentoo.org> xft-2.0.1-r2.ebuild :
-  Correct xfree blocking dep (#21698)
-
-  18 Apr 2003; foser <foser@gentoo.org> xft-2.0.1-r2.ebuild :
-  Added xfree-4.3-r2 blocking depend because it contains its own xft2 lib
-
-  08 Apr 2003; Martin Schlemmer <azarah@gentoo.org> xft-2.0.1-r1.ebuild :
-  Fix headers to install to /usr/X11R6/include/X11, and not symlinked dir
-  /usr/include/X11, closing bug #18688.  Mark stable for x86, as all other
-  archs are, and its been a while.
-
-  11 Mar 2003; Guy Martin <gmsoft@gentoo.org> xft-2.0.1-r1.ebuild :
-  Added hppa to keywords.
-
-  08 Feb 2003; Jason Wever <weeve@gentoo.org> xft-2.0.1-r1.ebuild :
-  Changed ~sparc keyword to sparc.
-
-  04 Feb 2003; Olivier Reisch <doctomoe@gentoo.org> xft-2.0.1-r1.ebuild :
-  Marked back ~ppc.
-
-  03 Feb 2003; Aron Griffis <agriffis@gentoo.org> xft-2.0.1-r1.ebuild :
-  Mark stable on alpha so that gnome can build
- 
-  27 Jan 2003; Olivier Reisch <doctomoe@gentoo.org> xft-2.0.1-r1.ebuild :
-  Masked -ppc as we had to mask fontconfig dependency.
-
-  15 Jan 2003; Jason Wever <weeve@gentoo.org> xft-2.0.1-r1.ebuild :
-  Added ~sparc to KEYWORDS.
-
-  01 Jan 2003; Aron Griffis <agriffis@gentoo.org> xft-2.0.1-r1.ebuild :
-  Add ~alpha to KEYWORDS
-
-*xft-2.0.1-r1 (23 Dec 2002)
-
-  15 Mar 2003; Mark Guertin <gerk@gentoo.org> xft-2.0.1-r1.ebuild:
-  set ppc in keywords
-
-  12 Mar 2003; Zach Welch <zwelch@gentoo.org> xft-2.0.1-r1.ebuild:
-  add arm keyword
-
-  23 Dec 2002; Martin Schlemmer <azarah@gentoo.org> xft-2.0.1-r1.ebuild :
-  Update from XFree86 cvs tree.  Only backup the Xft headers if XftFreetype.h
-  are present.
-
-*xft-2.0.1 (11 Dec 2002)
-
-  11 Dec 2002; Martin Schlemmer <azarah@gentoo.org> xft-2.0.1.ebuild :
-  New version.
-
-  04 Dec 2002; Olivier Reisch <doctomoe@gentoo.org> xft-2.0-r1.ebuild :
-  Added ppc keyword
-
-  02 Dec 2002; Martin Schlemmer <azarah@gentoo.org> xft-2.0-r1.ebuild :
-  Do not backup /usr/X11R6/include/X11/Xft if /root/.Xft already exist.
-  Make /usr/X11R6/lib/libXft.so a relative symlink.
-
-*xft-2.0-r1 (19 Nov 2002)
-
-  21 Nov 2002; foser <foser@gentoo.org> xft-2.0-r1.ebuild :
-  Added passing X dirs to fix possible problems with config paths
-
-  19 Nov 2002; foser <foser@gentoo.org> xft-2.0-r1.ebuild :
-  Fixed deps
-  Made a symlink from /usr/X11R6/lib/libXft.so to xft2
-  Backup old Xft includes, which in most cases will ease reverting back
-
-*xft-2.0 (27 Oct 2002)
-
-  28 Oct 2002; foser <foser@gentoo.org> xft-2.0.ebuild :
-  Now properly detects fontconfig.h, which allows for runtime
-  fontaddition/removal. Thanks to Azarah for noticing and fixing.
-
-  27 Oct 2002; foser <foser@gentoo.org> xft-2.0.ebuild, ChangeLog :
-  Gnome 2.1 commit
-  This package provides xft2 support, as used by the pango devel series
-  Usage will probably break a lot of other things
diff --git a/x11-libs/xft/Manifest b/x11-libs/xft/Manifest
deleted file mode 100644
index 31c89ad62086..000000000000
--- a/x11-libs/xft/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 893bd8e820169c5c0c00438c4821d2b2 ChangeLog 3223
-MD5 3ced7f5b3354f4e19b07fd0d6229077a xft-2.0.1-r2.ebuild 1580
-MD5 9d8a6b53e0aa951959a3026fb4d8deef files/digest-xft-2.0.1-r2 65
-MD5 bdbcdd7f9f71d975bec7ca0c235d8677 files/xft-2.0.1-cvs-update-20021221.patch 6560
diff --git a/x11-libs/xft/files/digest-xft-2.0.1-r2 b/x11-libs/xft/files/digest-xft-2.0.1-r2
deleted file mode 100644
index 1952672e6a0d..000000000000
--- a/x11-libs/xft/files/digest-xft-2.0.1-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 2f2852c80924a9b5356c3037a471c1a1 fcpackage.2_1.tar.gz 544661
diff --git a/x11-libs/xft/files/xft-2.0.1-cvs-update-20021221.patch b/x11-libs/xft/files/xft-2.0.1-cvs-update-20021221.patch
deleted file mode 100644
index 532ca125954a..000000000000
--- a/x11-libs/xft/files/xft-2.0.1-cvs-update-20021221.patch
+++ /dev/null
@@ -1,235 +0,0 @@
-diff -urN Xft.orig/Xft.h Xft/Xft.h
---- Xft.orig/Xft.h	2002-10-11 19:53:02.000000000 +0200
-+++ Xft/Xft.h	2002-12-16 11:16:28.000000000 +0200
-@@ -1,5 +1,5 @@
- /*
-- * $XFree86: xc/lib/Xft/Xft.h,v 1.30 2002/10/11 17:53:02 keithp Exp $
-+ * $XFree86: xc/lib/Xft/Xft.h,v 1.31 2002/12/14 01:59:38 dawes Exp $
-  *
-  * Copyright © 2000 Keith Packard, member of The XFree86 Project, Inc.
-  *
-@@ -325,11 +325,12 @@
- 		    XGlyphInfo	    *extents);
- 
- void
--XftTextExtentsUtf16 (XftFont		*pub,
-+XftTextExtentsUtf16 (Display		*dpy,
-+		     XftFont		*pub,
- 		     _Xconst FcChar8	*string, 
- 		     FcEndian		endian,
--		    int			len,
--		    XGlyphInfo		*extents);
-+		     int		len,
-+		     XGlyphInfo		*extents);
- 
- /* xftfont.c */
- FcPattern *
-@@ -606,6 +607,20 @@
- 		   _Xconst FcChar8  *string,
- 		   int		    len);
- 
-+void
-+XftTextRenderUtf16 (Display	    *dpy,
-+		    int		    op,
-+		    Picture	    src,
-+		    XftFont	    *pub,
-+		    Picture	    dst,
-+		    int		    srcx,
-+		    int		    srcy,
-+		    int		    x,
-+		    int		    y,
-+		    _Xconst FcChar8 *string,
-+		    FcEndian	    endian,
-+		    int		    len);
-+
- /* xftstr.c */
- 
- /* xftxlfd.c */
-diff -urN Xft.orig/xftextent.c Xft/xftextent.c
---- Xft.orig/xftextent.c	2002-10-11 19:53:02.000000000 +0200
-+++ Xft/xftextent.c	2002-12-16 11:16:28.000000000 +0200
-@@ -1,5 +1,5 @@
- /*
-- * $XFree86: xc/lib/Xft/xftextent.c,v 1.9 2002/10/11 17:53:02 keithp Exp $
-+ * $XFree86: xc/lib/Xft/xftextent.c,v 1.10 2002/12/14 01:59:38 dawes Exp $
-  *
-  * Copyright © 2000 Keith Packard, member of The XFree86 Project, Inc.
-  *
-@@ -245,3 +245,47 @@
-     if (glyphs != glyphs_local)
- 	free (glyphs);
- }
-+
-+void
-+XftTextExtentsUtf16 (Display		*dpy,
-+		     XftFont		*pub,
-+		     _Xconst FcChar8	*string, 
-+		     FcEndian		endian,
-+		     int		len,
-+		     XGlyphInfo		*extents)
-+{
-+    FT_UInt	    *glyphs, *glyphs_new, glyphs_local[NUM_LOCAL];
-+    FcChar32	    ucs4;
-+    int		    i;
-+    int		    l;
-+    int		    size;
-+
-+    i = 0;
-+    glyphs = glyphs_local;
-+    size = NUM_LOCAL;
-+    while (len && (l = FcUtf16ToUcs4 (string, endian, &ucs4, len)) > 0)
-+    {
-+	if (i == size)
-+	{
-+	    glyphs_new = malloc (size * 2 * sizeof (FT_UInt));
-+	    if (!glyphs_new)
-+	    {
-+		if (glyphs != glyphs_local)
-+		    free (glyphs);
-+		memset (extents, '\0', sizeof (XGlyphInfo));
-+		return;
-+	    }
-+	    memcpy (glyphs_new, glyphs, size * sizeof (FT_UInt));
-+	    size *= 2;
-+	    if (glyphs != glyphs_local)
-+		free (glyphs);
-+	    glyphs = glyphs_new;
-+	}
-+	glyphs[i++] = XftCharIndex (dpy, pub, ucs4);
-+	string += l;
-+	len -= l;
-+    }
-+    XftGlyphExtents (dpy, pub, glyphs, i, extents);
-+    if (glyphs != glyphs_local)
-+	free (glyphs);
-+}
-diff -urN Xft.orig/xftrender.c Xft/xftrender.c
---- Xft.orig/xftrender.c	2002-10-11 19:53:02.000000000 +0200
-+++ Xft/xftrender.c	2002-12-16 11:16:28.000000000 +0200
-@@ -1,5 +1,5 @@
- /*
-- * $XFree86: xc/lib/Xft/xftrender.c,v 1.14 2002/10/11 17:53:02 keithp Exp $
-+ * $XFree86: xc/lib/Xft/xftrender.c,v 1.15 2002/12/14 01:59:38 dawes Exp $
-  *
-  * Copyright © 2000 Keith Packard, member of The XFree86 Project, Inc.
-  *
-@@ -673,7 +673,7 @@
-     }
-     for (i = 0; i < len; i++)
- 	glyphs[i] = XftCharIndex (dpy, pub, string[i]);
--    XftGlyphRender (dpy, PictOpOver, src, pub, dst, 
-+    XftGlyphRender (dpy, op, src, pub, dst, 
- 		     srcx, srcy, x, y, glyphs, len);
-     if (glyphs != glyphs_local)
- 	free (glyphs);
-@@ -705,7 +705,7 @@
-     }
-     for (i = 0; i < len; i++)
- 	glyphs[i] = XftCharIndex (dpy, pub, string[i]);
--    XftGlyphRender (dpy, PictOpOver, src, pub, dst, 
-+    XftGlyphRender (dpy, op, src, pub, dst, 
- 		     srcx, srcy, x, y, glyphs, len);
-     if (glyphs != glyphs_local)
- 	free (glyphs);
-@@ -738,7 +738,7 @@
-     for (i = 0; i < len; i++)
- 	glyphs[i] = XftCharIndex (dpy, pub, 
- 				  (string[i*2]<<8) | string[i*2+1]);
--    XftGlyphRender (dpy, PictOpOver, src, pub, dst, 
-+    XftGlyphRender (dpy, op, src, pub, dst, 
- 		     srcx, srcy, x, y, glyphs, len);
-     if (glyphs != glyphs_local)
- 	free (glyphs);
-@@ -771,7 +771,7 @@
-     for (i = 0; i < len; i++)
- 	glyphs[i] = XftCharIndex (dpy, pub, 
- 				  string[i*2] | (string[i*2+1]<<8));
--    XftGlyphRender (dpy, PictOpOver, src, pub, dst, 
-+    XftGlyphRender (dpy, op, src, pub, dst, 
- 		     srcx, srcy, x, y, glyphs, len);
-     if (glyphs != glyphs_local)
- 	free (glyphs);
-@@ -803,7 +803,7 @@
-     }
-     for (i = 0; i < len; i++)
- 	glyphs[i] = XftCharIndex (dpy, pub, string[i]);
--    XftGlyphRender (dpy, PictOpOver, src, pub, dst, 
-+    XftGlyphRender (dpy, op, src, pub, dst, 
- 		     srcx, srcy, x, y, glyphs, len);
-     if (glyphs != glyphs_local)
- 	free (glyphs);
-@@ -839,7 +839,7 @@
- 				  (string[i*4+1] << 16) |
- 				  (string[i*4+2] << 8) |
- 				  (string[i*4+3]));
--    XftGlyphRender (dpy, PictOpOver, src, pub, dst, 
-+    XftGlyphRender (dpy, op, src, pub, dst, 
- 		     srcx, srcy, x, y, glyphs, len);
-     if (glyphs != glyphs_local)
- 	free (glyphs);
-@@ -875,7 +875,7 @@
- 				  (string[i*4+1] << 8) |
- 				  (string[i*4+2] << 16) |
- 				  (string[i*4+3] << 24));
--    XftGlyphRender (dpy, PictOpOver, src, pub, dst, 
-+    XftGlyphRender (dpy, op, src, pub, dst, 
- 		     srcx, srcy, x, y, glyphs, len);
-     if (glyphs != glyphs_local)
- 	free (glyphs);
-@@ -924,6 +924,56 @@
- 	string += l;
- 	len -= l;
-     }
-+    XftGlyphRender (dpy, op, src, pub, dst,
-+		     srcx, srcy, x, y, glyphs, i);
-+    if (glyphs != glyphs_local)
-+	free (glyphs);
-+}
-+
-+void
-+XftTextRenderUtf16 (Display	    *dpy,
-+		    int		    op,
-+		    Picture	    src,
-+		    XftFont	    *pub,
-+		    Picture	    dst,
-+		    int		    srcx,
-+		    int		    srcy,
-+		    int		    x,
-+		    int		    y,
-+		    _Xconst FcChar8 *string,
-+		    FcEndian	    endian,
-+		    int		    len)
-+{
-+    FT_UInt	    *glyphs, *glyphs_new, glyphs_local[NUM_LOCAL];
-+    FcChar32	    ucs4;
-+    int		    i;
-+    int		    l;
-+    int		    size;
-+
-+    i = 0;
-+    glyphs = glyphs_local;
-+    size = NUM_LOCAL;
-+    while (len && (l = FcUtf16ToUcs4 (string, endian, &ucs4, len)) > 0)
-+    {
-+	if (i == size)
-+	{
-+	    glyphs_new = malloc (size * 2 * sizeof (FT_UInt));
-+	    if (!glyphs_new)
-+	    {
-+		if (glyphs != glyphs_local)
-+		    free (glyphs);
-+		return;
-+	    }
-+	    memcpy (glyphs_new, glyphs, size * sizeof (FT_UInt));
-+	    size *= 2;
-+	    if (glyphs != glyphs_local)
-+		free (glyphs);
-+	    glyphs = glyphs_new;
-+	}
-+	glyphs[i++] = XftCharIndex (dpy, pub, ucs4);
-+	string += l;
-+	len -= l;
-+    }
-     XftGlyphRender (dpy, PictOpOver, src, pub, dst,
- 		     srcx, srcy, x, y, glyphs, i);
-     if (glyphs != glyphs_local)
diff --git a/x11-libs/xft/xft-2.0.1-r2.ebuild b/x11-libs/xft/xft-2.0.1-r2.ebuild
deleted file mode 100644
index 6414c7231dae..000000000000
--- a/x11-libs/xft/xft-2.0.1-r2.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/xft/xft-2.0.1-r2.ebuild,v 1.12 2004/06/24 22:09:38 agriffis Exp $
-
-inherit eutils
-
-DESCRIPTION="X FreeType library, also known as Xft2.0"
-HOMEPAGE="http://fontconfig.org/"
-SRC_URI="http://fontconfig.org/release/fcpackage.${PV/\.0\./_}.tar.gz"
-IUSE=""
-LICENSE="fontconfig"
-SLOT="0"
-KEYWORDS="x86 ppc alpha sparc hppa ~amd64"
-
-RDEPEND="x11-base/xfree
-	>=media-libs/fontconfig-2.1-r1"
-DEPEND="${RDEPEND}
-	>=sys-devel/autoconf-2.58
-	!>=x11-base/xfree-4.3.0-r2
-	!x11-base/xorg-x11"
-PROVIDE="virtual/xft"
-
-S="${WORKDIR}/fcpackage.${PV/\.0\./_}/Xft"
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-
-	# Update from XFree86 cvs tree
-	epatch ${FILESDIR}/${P}-cvs-update-20021221.patch
-
-	einfo "Running autoconf..."
-	export WANT_AUTOCONF=2.5
-	autoconf --force
-}
-
-src_compile() {
-	econf --x-includes=/usr/X11R6/include \
-		--x-libraries=/usr/X11R6/lib \
-		--includedir=/usr/X11R6/include \
-		|| die "Xft2 config failed"
-	emake || die "Xft2 make failed"
-}
-
-src_install() {
-	einstall confdir=${D}/etc/fonts \
-		datadir=${D}/usr/share \
-		includedir=${D}/usr/X11R6/include || die
-
-	dodir /usr/X11R6/lib
-	dosym ../../lib/libXft.so.2.0 /usr/X11R6/lib/libXft.so
-}
-
-pkg_preinst() {
-	if [ "${ROOT}" = "/" -a ! -d /root/.Xft -a \
-	     -f /usr/X11R6/include/X11/Xft/XftFreetype.h ]
-	then
-		mv -f /usr/X11R6/include/X11/Xft /root/.Xft
-	fi
-}
-
-pkg_postinst() {
-	einfo "Your old Xft1.1 includes have been saved to /root/.Xft,"
-	einfo "if they were present ..."
-}