mark 2.2.0 x86 and cleanup

21 files changed, 4 insertions, 899 deletions

diff --git a/media-libs/fontconfig/files/digest-fontconfig-2.0-r2 b/media-libs/fontconfig/files/digest-fontconfig-2.0-r2
deleted file mode 100644
index 05efa21a9a47..000000000000
--- a/media-libs/fontconfig/files/digest-fontconfig-2.0-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 5ef5c58e501b0cb873ee2b2a04ed74e3 fcpackage.2_0.tar.gz 538159
diff --git a/media-libs/fontconfig/files/digest-fontconfig-2.0-r3 b/media-libs/fontconfig/files/digest-fontconfig-2.0-r3
deleted file mode 100644
index 05efa21a9a47..000000000000
--- a/media-libs/fontconfig/files/digest-fontconfig-2.0-r3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 5ef5c58e501b0cb873ee2b2a04ed74e3 fcpackage.2_0.tar.gz 538159
diff --git a/media-libs/fontconfig/files/digest-fontconfig-2.0-r4 b/media-libs/fontconfig/files/digest-fontconfig-2.0-r4
deleted file mode 100644
index 05efa21a9a47..000000000000
--- a/media-libs/fontconfig/files/digest-fontconfig-2.0-r4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 5ef5c58e501b0cb873ee2b2a04ed74e3 fcpackage.2_0.tar.gz 538159
diff --git a/media-libs/fontconfig/files/digest-fontconfig-2.1 b/media-libs/fontconfig/files/digest-fontconfig-2.1
deleted file mode 100644
index 1952672e6a0d..000000000000
--- a/media-libs/fontconfig/files/digest-fontconfig-2.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 2f2852c80924a9b5356c3037a471c1a1 fcpackage.2_1.tar.gz 544661
diff --git a/media-libs/fontconfig/files/digest-fontconfig-2.1.94-r1 b/media-libs/fontconfig/files/digest-fontconfig-2.1.94-r1
deleted file mode 100644
index 8fba4752ac4c..000000000000
--- a/media-libs/fontconfig/files/digest-fontconfig-2.1.94-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f8941aa333e418aa99a6fa4813f333d3 fontconfig-2.1.94.tar.gz 603590
diff --git a/media-libs/fontconfig/files/digest-fontconfig-2.2.0 b/media-libs/fontconfig/files/digest-fontconfig-2.2.0
deleted file mode 100644
index 8660f2779997..000000000000
--- a/media-libs/fontconfig/files/digest-fontconfig-2.2.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 cf0ce6c87e5d6362e9ebc8d94a45fdc4 fontconfig-2.2.0.tar.gz 612758
diff --git a/media-libs/fontconfig/files/digest-fontconfig-2.2.0-r1 b/media-libs/fontconfig/files/digest-fontconfig-2.2.0-r1
deleted file mode 100644
index 8660f2779997..000000000000
--- a/media-libs/fontconfig/files/digest-fontconfig-2.2.0-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 cf0ce6c87e5d6362e9ebc8d94a45fdc4 fontconfig-2.2.0.tar.gz 612758
diff --git a/media-libs/fontconfig/files/patch/fontconfig-0.0.1.020811.1151-slighthint.patch b/media-libs/fontconfig/files/patch/fontconfig-0.0.1.020811.1151-slighthint.patch
deleted file mode 100644
index fb2527a3f151..000000000000
--- a/media-libs/fontconfig/files/patch/fontconfig-0.0.1.020811.1151-slighthint.patch
+++ /dev/null
@@ -1,57 +0,0 @@
---- fontconfig/fontconfig/fontconfig.h.slighthint	Sun Aug 11 14:10:41 2002
-+++ fontconfig/fontconfig/fontconfig.h	Mon Aug 12 16:23:51 2002
-@@ -55,6 +55,7 @@
- #define FC_FOUNDRY	    "foundry"		/* String */
- #define FC_ANTIALIAS	    "antialias"		/* Bool (depends) */
- #define FC_HINTING	    "hinting"		/* Bool (true) */
-+#define FC_HINT_STYLE	    "hintstyle"		/* Int */
- #define FC_VERTICAL_LAYOUT  "verticallayout"	/* Bool (false) */
- #define FC_AUTOHINT	    "autohint"		/* Bool (false) */
- #define FC_GLOBAL_ADVANCE   "globaladvance"	/* Bool (true) */
-@@ -102,6 +103,12 @@
- #define FC_RGBA_VRGB	    3
- #define FC_RGBA_VBGR	    4
- 
-+/* hinting style */
-+#define FC_HINT_NONE        0
-+#define FC_HINT_SLIGHT      1
-+#define FC_HINT_MEDIUM      2
-+#define FC_HINT_FULL        3
-+ 
- typedef enum _FcType {
-     FcTypeVoid, 
-     FcTypeInteger, 
---- fontconfig/src/fcdefault.c.slighthint	Tue Jul  9 18:08:14 2002
-+++ fontconfig/src/fcdefault.c	Mon Aug 12 16:22:01 2002
-@@ -137,4 +137,9 @@
- 		FcPatternAddString (pattern, FC_LANG, (FcChar8 *) lang);
- 	}
-     }
-+
-+    if (FcPatternGet (pattern, FC_HINT_STYLE, 0, &v) == FcResultNoMatch)
-+    {
-+	FcPatternAddInteger (pattern, FC_HINT_STYLE, FC_HINT_FULL);
-+    }
- }
---- fontconfig/src/fcname.c.slighthint	Sun Aug 11 14:10:42 2002
-+++ fontconfig/src/fcname.c	Mon Aug 12 16:24:28 2002
-@@ -40,6 +40,7 @@
-     { FC_FOUNDRY,	FcTypeString, },
- /*    { FC_CORE,		FcTypeBool, }, */
-     { FC_ANTIALIAS,	FcTypeBool, },
-+    { FC_HINT_STYLE,    FcTypeInteger, },
-     { FC_HINTING,	FcTypeBool, },
-     { FC_VERTICAL_LAYOUT,   FcTypeBool, },
-     { FC_AUTOHINT,	FcTypeBool, },
-@@ -153,6 +154,11 @@
-     { (FcChar8 *) "bgr",	    "rgba",	    FC_RGBA_BGR, },
-     { (FcChar8 *) "vrgb",	    "rgba",	    FC_RGBA_VRGB },
-     { (FcChar8 *) "vbgr",	    "rgba",	    FC_RGBA_VBGR },
-+
-+    { (FcChar8 *) "hintnone",	    "hintstyle",   FC_HINT_NONE },
-+    { (FcChar8 *) "hintslight",	    "hintstyle",   FC_HINT_SLIGHT },
-+    { (FcChar8 *) "hintmedium",	    "hintstyle",   FC_HINT_MEDIUM },
-+    { (FcChar8 *) "hintfull",	    "hintstyle",   FC_HINT_FULL },
- };
- 
- #define NUM_FC_CONSTANTS   (sizeof _FcBaseConstants/sizeof _FcBaseConstants[0])
diff --git a/media-libs/fontconfig/files/patch/fontconfig-2.0-font-matrix.patch b/media-libs/fontconfig/files/patch/fontconfig-2.0-font-matrix.patch
deleted file mode 100644
index 45d00dd069e0..000000000000
--- a/media-libs/fontconfig/files/patch/fontconfig-2.0-font-matrix.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -ur fcpackage.2_0/fontconfig/fonts.conf.in fcpackage.2_0-new/fontconfig/fonts.conf.in
---- fcpackage.2_0/fontconfig/fonts.conf.in	2002-10-31 15:08:28.000000000 -0500
-+++ fcpackage.2_0-new/fontconfig/fonts.conf.in	2002-10-31 15:06:46.000000000 -0500
-@@ -225,8 +225,8 @@
- 		<edit name="matrix" mode="assign">
- 			<times>
- 				<name>matrix</name>
--				<matrix><double>1</double><double>.2</double>
--					<double>0</double><double>1</double>
-+				<matrix><double>1</double><double>0</double>
-+					<double>.2</double><double>1</double>
- 				</matrix>
- 			</times>
- 		</edit>
diff --git a/media-libs/fontconfig/files/patch/fontconfig-2.0-remove-stupid-date.patch b/media-libs/fontconfig/files/patch/fontconfig-2.0-remove-stupid-date.patch
deleted file mode 100644
index 3983cd5c02c8..000000000000
--- a/media-libs/fontconfig/files/patch/fontconfig-2.0-remove-stupid-date.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- fcpackage.2_0/fontconfig/setfontdirs.orig	2002-10-29 22:58:41.000000000 +0200
-+++ fcpackage.2_0/fontconfig/setfontdirs	2002-10-29 23:00:10.000000000 +0200
-@@ -11,7 +11,7 @@
- chmod +w fonts.conf
- ed fonts.conf << EOF
- /FONTPATH_END/a
--<!-- Font directory list configured on `date` -->
-+<!-- Font directory list configured for Gentoo -->
- .
- +r $FONTDIRS
- a
diff --git a/media-libs/fontconfig/files/patch/fontconfig-2.0-subdir.patch b/media-libs/fontconfig/files/patch/fontconfig-2.0-subdir.patch
deleted file mode 100644
index f79c0585985c..000000000000
--- a/media-libs/fontconfig/files/patch/fontconfig-2.0-subdir.patch
+++ /dev/null
@@ -1,84 +0,0 @@
---- fontconfig/src/fcint.h.subdir	Sat Aug 31 18:17:32 2002
-+++ fontconfig/src/fcint.h	Mon Sep  9 15:09:41 2002
-@@ -238,18 +238,20 @@
-     FcChar8			*name;
- } FcGlobalCacheFile;
- 
-+typedef struct _FcGlobalCacheDir FcGlobalCacheDir;
-+
- typedef struct _FcGlobalCacheSubdir {
-     struct _FcGlobalCacheSubdir	*next;
--    FcChar8			*file;
-+    FcGlobalCacheDir		*ent;
- } FcGlobalCacheSubdir;
- 
--typedef struct _FcGlobalCacheDir {
-+struct _FcGlobalCacheDir {
-     struct _FcGlobalCacheDir	*next;
-     FcGlobalCacheInfo    	info;
-     int				len;
-     FcGlobalCacheFile		*ents[FC_GLOBAL_CACHE_FILE_HASH_SIZE];
-     FcGlobalCacheSubdir		*subdirs;
--} FcGlobalCacheDir;
-+};
- 
- typedef struct _FcGlobalCache {
-     FcGlobalCacheDir		*ents[FC_GLOBAL_CACHE_DIR_HASH_SIZE];
---- fontconfig/src/fcdir.c.subdir	Mon Sep  9 13:04:09 2002
-+++ fontconfig/src/fcdir.c	Mon Sep  9 15:09:41 2002
-@@ -117,6 +117,8 @@
- 	    {
- 		isDir = FcTrue;
- 		ret = FcStrSetAdd (dirs, file);
-+		if (cache && ret)
-+		    FcGlobalCacheUpdate (cache, file, 0, FC_FONT_FILE_DIR);
- 	    }
- 	    /*
- 	     * Update the cache
---- fontconfig/src/fccache.c.subdir	Sat Aug 31 18:17:31 2002
-+++ fontconfig/src/fccache.c	Mon Sep  9 15:09:41 2002
-@@ -448,14 +448,11 @@
-     parent = FcGlobalCacheDirGet (cache, i.dir, i.dir_len, FcTrue);
-     if (!parent)
- 	return 0;
--    subdir = malloc (sizeof (FcGlobalCacheSubdir) + 
--		     strlen ((const char *) i.base) + 1);
-+    subdir = malloc (sizeof (FcGlobalCacheSubdir));
-     if (!subdir)
- 	return 0;
--    FcMemAlloc (FC_MEM_CACHE, sizeof (FcGlobalCacheSubdir) +
--		strlen ((const char *) i.base) + 1);
--    subdir->file = (FcChar8 *) (subdir + 1);
--    strcpy ((char *) subdir->file, (const char *) i.base);
-+    FcMemAlloc (FC_MEM_CACHE, sizeof (FcGlobalCacheSubdir));
-+    subdir->ent = d;
-     subdir->next = parent->subdirs;
-     parent->subdirs = subdir;
-     return &d->info;
-@@ -480,8 +477,7 @@
-     for (s = d->subdirs; s; s = nexts)
-     {
- 	nexts = s->next;
--	FcMemFree (FC_MEM_CACHE, sizeof (FcGlobalCacheSubdir) +
--		   strlen ((char *) s->file) + 1);
-+	FcMemFree (FC_MEM_CACHE, sizeof (FcGlobalCacheSubdir));
- 	free (s);
-     }
-     FcMemFree (FC_MEM_CACHE, sizeof (FcGlobalCacheDir) + d->len + 1);
-@@ -535,12 +531,15 @@
- 	}
-     for (subdir = d->subdirs; subdir; subdir = subdir->next)
-     {
-+	FcFilePathInfo	info = FcFilePathInfoGet (subdir->ent->info.file);
-+	
- 	if (!FcCacheFontSetAdd (set, dirs, dir, dir_len,
--				subdir->file, FC_FONT_FILE_DIR))
-+				info.base, FC_FONT_FILE_DIR))
- 	{
- 	    cache->broken = FcTrue;
- 	    return FcFalse;
- 	}
-+	FcGlobalCacheReferenced (cache, &subdir->ent->info);
-     }
-     
-     FcGlobalCacheReferenced (cache, &d->info);
diff --git a/media-libs/fontconfig/files/patch/fontconfig-2.2-defaultconfig.patch b/media-libs/fontconfig/files/patch/fontconfig-2.2-defaultconfig.patch
deleted file mode 100644
index 7c00840edfe2..000000000000
--- a/media-libs/fontconfig/files/patch/fontconfig-2.2-defaultconfig.patch
+++ /dev/null
@@ -1,110 +0,0 @@
---- fontconfig-2.1.94/fonts.conf.in.defaultconfig	2003-04-17 18:34:08.000000000 +0200
-+++ fontconfig-2.1.94/fonts.conf.in	2003-04-17 18:43:12.000000000 +0200
-@@ -265,41 +265,99 @@
- 		<family>serif</family>
- 		<prefer>
- 			<family>Bitstream Vera Serif</family>
--			<family>Times New Roman</family>
- 			<family>Nimbus Roman No9 L</family>
- 			<family>Luxi Serif</family>
--			<family>Times</family>
-+ 			<family>Tomas</family>
-+ 			<family>Artsounk</family>
-+ 			<family>BPG UTF8 M</family>
-+ 			<family>Phaisarn</family>
-+ 			<family>Phaisarn98</family>
-+ 			<family>Norasi</family>
-+ 			<family>Times-Hebrew</family>
-+ 			<family>Dror</family>
-+ 			<family>JG LaoTimes</family>
-+ 			<family>Saysettha Unicode</family>
-+ 			<family>Pigiarniq</family>
-+ 			<family>KacstBook</family>
-+ 			<family>Urdu Naqsh Nastalique</family>
-+ 			<family>Raghindi</family>
-+ 			<family>malayalam</family>
-+ 			<family>MS Mincho</family>
- 			<family>Kochi Mincho</family>
-+ 			<family>ZYSong18030</family>
-+ 			<family>MS Song</family>
- 			<family>AR PL SungtiL GB</family>
- 			<family>AR PL Mingti2L Big5</family>
--			<family>Baekmuk Batang</family>			
-+			<family>Baekmuk Batang</family>
-+			<family>TSCu_Times</family>
-+			<family>Times New Roman</family>
-+			<family>Times</family>
- 		</prefer>
- 	</alias>
- 	<alias>
- 		<family>sans-serif</family>
- 		<prefer>
- 			<family>Bitstream Vera Sans</family>
--			<family>Verdana</family>
--			<family>Nimbus Sans L</family>
--			<family>Luxi Sans</family>
-+ 			<family>Luxi Sans</family>
-+ 			<family>Nimbus Sans L</family>
- 			<family>Arial</family>
- 			<family>Helvetica</family>
-+ 			<family>Arija</family>
-+ 			<family>Verdana</family>
-+ 			<family>Lucida Sans Unicode</family>
-+ 			<family>Tahoma</family>
-+ 			<family>Yudit Unicode</family>
-+ 			<family>Kerkis</family>
-+ 			<family>ArmNet Helvetica</family>
-+ 			<family>Artsounk</family>
-+ 			<family>BPG UTF8 M</family>
-+ 			<family>Norasi</family>
-+ 			<family>Nachlieli</family>
-+ 			<family>Saysettha Unicode</family>
-+ 			<family>JG Lao Old Arial</family>
-+ 			<family>GF Zemen Unicode</family>
-+ 			<family>Pigiarniq</family>
-+ 			<family>KacstBook</family>
-+ 			<family>Urdu Naqsh Nastalique</family>
-+ 			<family>Raghindi</family>
-+ 			<family>malayalam</family>
-+ 			<family>Teams</family>
-+ 			<family>MS Gothic</family>
- 			<family>Kochi Gothic</family>
-+ 			<family>ZYSong18030</family>
-+ 			<family>AR PL SungtiL GB</family>
-+ 			<family>AR PL Mingti2L Big5</family>
-+ 			<family>Baekmuk Gulim</family>
- 			<family>AR PL KaitiM GB</family>
- 			<family>AR PL KaitiM Big5</family>
- 			<family>Baekmuk Dotum</family>
- 			<family>SimSun</family>
-+ 			<family>TSCu_Paranar</family>
-+ 			<family>Arial Unicode</family>
-+ 			<family>Code2000</family>
- 		</prefer>
- 	</alias>
- 	<alias>
- 		<family>monospace</family>
- 		<prefer>
- 			<family>Bitstream Vera Sans Mono</family>
--			<family>Andale Mono</family>
--			<family>Courier New</family>
- 			<family>Luxi Mono</family>
- 			<family>Nimbus Mono L</family>
-+ 			<family>Courier</family>
-+ 			<family>Kurjeris</family>
-+ 			<family>Courier MonoThai</family>
-+ 			<family>Courier-Hebrew</family>
-+ 			<family>Hasida</family>
-+ 			<family>GF Zemen Unicode</family>
- 			<family>Kochi Gothic</family>
-+ 			<family>MS Gothic</family>
-+ 			<family>ZYSong18030</family>
-+ 			<family>AR PL SungtiL GB</family>
-+ 			<family>AR PL Mingti2L Big5</family>
-+ 			<family>Baekmuk Gulim</family>
-+ 			<family>Andale Mono</family>
-+ 			<family>Courier New</family>
-+ 			<family>TSC_AvarangalFxd</family>
- 			<family>AR PL KaitiM GB</family>
- 			<family>Baekmuk Dotum</family>
- 		</prefer>
diff --git a/media-libs/fontconfig/files/patch/fontconfig-2.2-local_fontdir.patch b/media-libs/fontconfig/files/patch/fontconfig-2.2-local_fontdir.patch
deleted file mode 100644
index 9fdee98cb84f..000000000000
--- a/media-libs/fontconfig/files/patch/fontconfig-2.2-local_fontdir.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -ur fontconfig-2.1.94/fonts.conf.in fontconfig-2.1.94.patched/fonts.conf.in
---- fontconfig-2.1.94/fonts.conf.in	2003-04-16 23:57:38.000000000 +0200
-+++ fontconfig-2.1.94.patched/fonts.conf.in	2003-04-18 02:59:54.000000000 +0200
-@@ -25,6 +25,7 @@
- 
- 	<dir>@FC_DEFAULT_FONTS@</dir>
- 	@FC_FONTPATH@
-+	<dir>/usr/share/fonts</dir>
- 	<dir>~/.fonts</dir>
- 
- <!--
diff --git a/media-libs/fontconfig/fontconfig-2.0-r2.ebuild b/media-libs/fontconfig/fontconfig-2.0-r2.ebuild
deleted file mode 100644
index 6d8c275c980b..000000000000
--- a/media-libs/fontconfig/fontconfig-2.0-r2.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/fontconfig/fontconfig-2.0-r2.ebuild,v 1.3 2003/02/13 12:42:49 vapier Exp $
-
-S="${WORKDIR}/fcpackage.${PV/\./_}/fontconfig"
-DESCRIPTION="A library for configuring and customizing font access."
-SRC_URI="http://fontconfig.org/release/fcpackage.${PV/\./_}.tar.gz"
-HOMEPAGE="http://fontconfig.org/"
-
-LICENSE="fontconfig"
-SLOT="1.0"
-KEYWORDS="x86 alpha ppc sparc "
-
-DEPEND=">=media-libs/freetype-2.0.9
-	>=dev-libs/expat-1.95.3
-	>=sys-apps/ed-0.2"
-
-
-src_unpack() {
-	unpack ${A}
-	
-	cd ${S}
-	local PPREFIX="${FILESDIR}/patch/${PN}"
-	einfo "Applying patches..."
-	# Some patches from Redhat
-	patch -p1 < ${PPREFIX}-2.0-defaultconfig.patch &> /dev/null || die
-	patch -p1 < ${PPREFIX}-0.0.1.020811.1151-slighthint.patch &> /dev/null || die
-	# Blacklist certain fonts that freetype can't handle
-	patch -p1 < ${PPREFIX}-0.0.1.020826.1330-blacklist.patch &> /dev/null || die
-	# Patch from Keith Packard to fix problem where 
-	# subdirectories could get lost from ~/.fonts.cache
-	patch -p1 < ${PPREFIX}-2.0-subdir.patch &> /dev/null || die
-	# Remove stupid date, as a lot of users do not seem to know
-	# how to use 'zic' ...
-	patch -p2 < ${PPREFIX}-2.0-remove-stupid-date.patch &> /dev/null || die
-}
-
-src_compile() {
-	econf || die
-	
-	emake || die
-}
-
-src_install() {
-	einstall confdir=${D}/etc/fonts \
-		datadir=${D}/usr/share || die
-
-	insinto /etc/fonts
-	doins ${S}/fonts.conf
-
-	cd ${S}
-	
-	mv fc-cache/fc-cache.man fc-cache/fc-cache.1
-	mv fc-list/fc-list.man fc-list/fc-list.1
-	mv src/fontconfig.man src/fontconfig.3
-	for x in fc-cache/fc-cache.1 fc-list/fc-list.1 src/fontconfig.3
-	do
-		doman ${x}
-	done
-
-	dodoc AUTHORS COPYING ChangeLog NEWS README
-}
-
-pkg_postinst() {
-	if [ "${ROOT}" = "/" ]
-	then
-		einfo "Creating font cache..."
-		/usr/bin/fc-cache
-	fi
-}
-
diff --git a/media-libs/fontconfig/fontconfig-2.0-r3.ebuild b/media-libs/fontconfig/fontconfig-2.0-r3.ebuild
deleted file mode 100644
index 5f4224d2f621..000000000000
--- a/media-libs/fontconfig/fontconfig-2.0-r3.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/fontconfig/fontconfig-2.0-r3.ebuild,v 1.4 2003/02/13 12:42:54 vapier Exp $
-
-inherit debug
-
-S="${WORKDIR}/fcpackage.${PV/\./_}/fontconfig"
-DESCRIPTION="A library for configuring and customizing font access."
-SRC_URI="http://fontconfig.org/release/fcpackage.${PV/\./_}.tar.gz"
-HOMEPAGE="http://fontconfig.org/"
-
-LICENSE="fontconfig"
-SLOT="1.0"
-KEYWORDS="x86 alpha ppc sparc "
-
-DEPEND=">=media-libs/freetype-2.0.9
-	>=dev-libs/expat-1.95.3
-	>=sys-apps/ed-0.2"
-
-
-src_unpack() {
-	unpack ${A}
-	
-	cd ${S}
-	local PPREFIX="${FILESDIR}/patch/${PN}"
-	einfo "Applying patches..."
-	# Some patches from Redhat
-	patch -p1 < ${PPREFIX}-2.0-defaultconfig.patch &> /dev/null || die
-	patch -p1 < ${PPREFIX}-0.0.1.020811.1151-slighthint.patch &> /dev/null || die
-	# Blacklist certain fonts that freetype can't handle
-	patch -p1 < ${PPREFIX}-0.0.1.020826.1330-blacklist.patch &> /dev/null || die
-	# Patch from Keith Packard to fix problem where 
-	# subdirectories could get lost from ~/.fonts.cache
-	patch -p1 < ${PPREFIX}-2.0-subdir.patch &> /dev/null || die
-	# Remove stupid date, as a lot of users do not seem to know
-	# how to use 'zic' ...
-	patch -p2 < ${PPREFIX}-2.0-remove-stupid-date.patch &> /dev/null || die
-	# Fix problem with italic fonts if no map file present
-	patch -p2 < ${PPREFIX}-2.0-font-matrix.patch &> /dev/null || die
-}
-
-src_compile() {
-	econf \
-		--x-includes=/usr/X11R6/include \
-		--x-libraries=/usr/X11R6/lib || die
-	
-	emake || die
-}
-
-src_install() {
-	einstall confdir=${D}/etc/fonts \
-		datadir=${D}/usr/share || die
-
-	insinto /etc/fonts
-	doins ${S}/fonts.conf
-
-	cd ${S}
-	
-	mv fc-cache/fc-cache.man fc-cache/fc-cache.1
-	mv fc-list/fc-list.man fc-list/fc-list.1
-	mv src/fontconfig.man src/fontconfig.3
-	for x in fc-cache/fc-cache.1 fc-list/fc-list.1 src/fontconfig.3
-	do
-		doman ${x}
-	done
-
-	dodoc AUTHORS COPYING ChangeLog NEWS README
-}
-
-pkg_postinst() {
-	if [ "${ROOT}" = "/" ]
-	then
-		einfo "Creating font cache..."
-		/usr/bin/fc-cache
-	fi
-}
-
diff --git a/media-libs/fontconfig/fontconfig-2.0-r4.ebuild b/media-libs/fontconfig/fontconfig-2.0-r4.ebuild
deleted file mode 100644
index 655baddef1de..000000000000
--- a/media-libs/fontconfig/fontconfig-2.0-r4.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/fontconfig/fontconfig-2.0-r4.ebuild,v 1.6 2003/02/13 12:43:00 vapier Exp $
-
-inherit debug eutils
-
-S="${WORKDIR}/fcpackage.${PV/\./_}/fontconfig"
-DESCRIPTION="A library for configuring and customizing font access."
-SRC_URI="http://fontconfig.org/release/fcpackage.${PV/\./_}.tar.gz"
-HOMEPAGE="http://fontconfig.org/"
-
-LICENSE="fontconfig"
-SLOT="1.0"
-KEYWORDS="x86 alpha ppc sparc "
-
-# Seems like patches in freetype-2.1.2-r2 fixes bug #10028
-DEPEND=">=media-libs/freetype-2.1.2-r2
-	>=dev-libs/expat-1.95.3
-	>=sys-apps/ed-0.2"
-
-
-pkg_setup() {
-	# Do not use 'cc' to compile
-	[ ! -n "${CC}" ] && export CC="gcc" || :
-}
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-	local PPREFIX="${FILESDIR}/patch/${PN}"
-	#einfo "Applying patches..."
-	# Some patches from Redhat
-	epatch ${PPREFIX}-2.0-defaultconfig.patch
-	epatch ${PPREFIX}-0.0.1.020811.1151-slighthint.patch
-	# Blacklist certain fonts that freetype can't handle
-	epatch ${PPREFIX}-0.0.1.020826.1330-blacklist.patch
-	# Patch from Keith Packard to fix problem where 
-	# subdirectories could get lost from ~/.fonts.cache
-	epatch ${PPREFIX}-2.0-subdir.patch
-	# Fix problem with italic fonts if no map file present,
-	# bug #10028.
-#	epatch ${PPREFIX}-2.0-font-matrix.patch
-	# Fix config script to alway include X11 fontpath and remove date
-	epatch ${PPREFIX}-2.0-x11fontpath-date-configure.patch 
-}
-
-src_compile() {
-	econf \
-		--x-includes=/usr/X11R6/include \
-		--x-libraries=/usr/X11R6/lib || die
-	
-	emake || die
-}
-
-src_install() {
-	einstall confdir=${D}/etc/fonts \
-		datadir=${D}/usr/share || die
-
-	insinto /etc/fonts
-	doins ${S}/fonts.conf
-
-	cd ${S}
-	
-	mv fc-cache/fc-cache.man fc-cache/fc-cache.1
-	mv fc-list/fc-list.man fc-list/fc-list.1
-	mv src/fontconfig.man src/fontconfig.3
-	for x in fc-cache/fc-cache.1 fc-list/fc-list.1 src/fontconfig.3
-	do
-		doman ${x}
-	done
-
-	dodoc AUTHORS COPYING ChangeLog NEWS README
-}
-
-pkg_postinst() {
-	if [ "${ROOT}" = "/" ]
-	then
-		einfo "Creating font cache..."
-		HOME="/root" /usr/bin/fc-cache -f
-	fi
-}
-
diff --git a/media-libs/fontconfig/fontconfig-2.1.94-r1.ebuild b/media-libs/fontconfig/fontconfig-2.1.94-r1.ebuild
deleted file mode 100644
index 46e692df063a..000000000000
--- a/media-libs/fontconfig/fontconfig-2.1.94-r1.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/fontconfig/fontconfig-2.1.94-r1.ebuild,v 1.2 2003/04/19 14:03:22 foser Exp $
-
-inherit debug eutils
-
-DESCRIPTION="A library for configuring and customizing font access."
-SRC_URI="http://fontconfig.org/release/${P}.tar.gz"
-HOMEPAGE="http://fontconfig.org/"
-
-LICENSE="fontconfig"
-SLOT="1.0"
-KEYWORDS="~x86 ~alpha ~ppc ~sparc ~mips ~hppa ~arm"
-
-# Seems like patches in freetype-2.1.2-r2 fixes bug #10028
-DEPEND=">=media-libs/freetype-2.1.4
-	>=dev-libs/expat-1.95.3
-	>=sys-apps/ed-0.2"
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-	local PPREFIX="${FILESDIR}/patch/${PN}"
-
-	# Some patches from Redhat
-	epatch ${PPREFIX}-2.1-slighthint.patch
-	# and add our local fontpath (duh dont forget!)
-	epatch ${PPREFIX}-2.2-local_fontdir.patch
-
-	# The date can be troublesome 
-	mv configure configure.old
-	sed -e "s:\`date\`::" configure.old > configure
-	chmod +x configure
-}
-
-src_compile() {
-	# FIXME : docs do not work
-	econf --disable-docs \
-		--x-includes=/usr/X11R6/include \
-		--x-libraries=/usr/X11R6/lib \
-		--with-default-fonts=/usr/X11R6/lib/X11/fonts/Type1 || die
-
-	# this triggers sandbox, we do this ourselves 
-	mv Makefile Makefile.old
-	sed -e "s:fc-cache/fc-cache -f -v:sleep 0:" Makefile.old > Makefile
-	
-	emake || die
-
-	# remove Luxi TTF fonts from the list, the Type1 are much better
-	mv fonts.conf fonts.conf.old 
-	sed -e "s:<dir>/usr/X11R6/lib/X11/fonts/TTF</dir>::" fonts.conf.old > fonts.conf
-}
-
-src_install() {
-	einstall confdir=${D}/etc/fonts \
-		datadir=${D}/usr/share || die
-	
-	insinto /etc/fonts
-	doins ${S}/fonts.conf
-	newins ${S}/fonts.conf fonts.conf.new
-
-	cd ${S}
-	
-	mv fc-cache/fc-cache.man fc-cache/fc-cache.1
-	mv fc-list/fc-list.man fc-list/fc-list.1
-	mv src/fontconfig.man src/fontconfig.3
-	for x in fc-cache/fc-cache.1 fc-list/fc-list.1 src/fontconfig.3
-	do
-		doman ${x}
-	done
-
-	dodoc AUTHORS COPYING ChangeLog NEWS README
-}
-
-pkg_postinst() {
-	# Changes should be made to /etc/fonts/local.conf, and as we had
-	# too much problems with broken fonts.conf, we force update it ...
-	# <azarah@gentoo.org> (11 Dec 2002)
-	ewarn "Please make fontconfig related changes to /etc/fonts/local.conf,"
-	ewarn "and NOT to /etc/fonts/fonts.conf, as it will be replaced!"
-	mv -f ${ROOT}/etc/fonts/fonts.conf.new ${ROOT}/etc/fonts/fonts.conf
-	rm -f ${ROOT}/etc/fonts/._cfg????_fonts.conf
-
-	if [ "${ROOT}" = "/" ]
-	then
-		echo
-		einfo "Creating font cache..."
-		HOME="/root" /usr/bin/fc-cache -f
-	fi
-}
-
diff --git a/media-libs/fontconfig/fontconfig-2.1.ebuild b/media-libs/fontconfig/fontconfig-2.1.ebuild
deleted file mode 100644
index c61799ab7f7f..000000000000
--- a/media-libs/fontconfig/fontconfig-2.1.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/fontconfig/fontconfig-2.1.ebuild,v 1.3 2003/02/13 12:43:11 vapier Exp $
-
-inherit debug eutils
-
-S="${WORKDIR}/fcpackage.${PV/\./_}/fontconfig"
-DESCRIPTION="A library for configuring and customizing font access."
-SRC_URI="http://fontconfig.org/release/fcpackage.${PV/\./_}.tar.gz"
-HOMEPAGE="http://fontconfig.org/"
-
-LICENSE="fontconfig"
-SLOT="1.0"
-KEYWORDS="x86 alpha ppc sparc"
-
-# Seems like patches in freetype-2.1.2-r2 fixes bug #10028
-DEPEND=">=media-libs/freetype-2.1.2-r2
-	>=dev-libs/expat-1.95.3
-	>=sys-apps/ed-0.2"
-
-
-fc_setup() {
-	# Do not use 'cc' to compile
-	[ ! -n "${CC}" ] && export CC="gcc" || :
-}
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-	local PPREFIX="${FILESDIR}/patch/${PN}"
-	#einfo "Applying patches..."
-	# Some patches from Redhat
-	epatch ${PPREFIX}-2.0-defaultconfig.patch
-	epatch ${PPREFIX}-2.1-slighthint.patch
-	# Blacklist certain fonts that freetype can't handle
-	epatch ${PPREFIX}-0.0.1.020826.1330-blacklist.patch
-	# Fix config script to alway include X11 fontpath and remove date
-	epatch ${PPREFIX}-2.1-x11fontpath-date-configure.patch 
-}
-
-src_compile() {
-	fc_setup
-	
-	econf \
-		--x-includes=/usr/X11R6/include \
-		--x-libraries=/usr/X11R6/lib || die
-	
-	emake || die
-}
-
-src_install() {
-	fc_setup
-	
-	einstall confdir=${D}/etc/fonts \
-		datadir=${D}/usr/share || die
-
-	insinto /etc/fonts
-	doins ${S}/fonts.conf
-	newins ${S}/fonts.conf fonts.conf.new
-
-	cd ${S}
-	
-	mv fc-cache/fc-cache.man fc-cache/fc-cache.1
-	mv fc-list/fc-list.man fc-list/fc-list.1
-	mv src/fontconfig.man src/fontconfig.3
-	for x in fc-cache/fc-cache.1 fc-list/fc-list.1 src/fontconfig.3
-	do
-		doman ${x}
-	done
-
-	dodoc AUTHORS COPYING ChangeLog NEWS README
-}
-
-pkg_postinst() {
-	# Changes should be made to /etc/fonts/local.conf, and as we had
-	# too much problems with broken fonts.conf, we force update it ...
-	# <azarah@gentoo.org> (11 Dec 2002)
-	ewarn "Please make fontconfig related changes to /etc/fonts/local.conf,"
-	ewarn "and NOT to /etc/fonts/fonts.conf, as it will be replaced!"
-	mv -f ${ROOT}/etc/fonts/fonts.conf.new ${ROOT}/etc/fonts/fonts.conf
-	rm -f ${ROOT}/etc/fonts/._cfg????_fonts.conf
-
-	if [ "${ROOT}" = "/" ]
-	then
-		echo
-		einfo "Creating font cache..."
-		HOME="/root" /usr/bin/fc-cache -f
-	fi
-}
-
diff --git a/media-libs/fontconfig/fontconfig-2.2.0-r1.ebuild b/media-libs/fontconfig/fontconfig-2.2.0-r1.ebuild
deleted file mode 100644
index bd439029a806..000000000000
--- a/media-libs/fontconfig/fontconfig-2.2.0-r1.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/fontconfig/fontconfig-2.2.0-r1.ebuild,v 1.1 2003/04/27 11:53:28 azarah Exp $
-
-inherit eutils
-
-DESCRIPTION="A library for configuring and customizing font access."
-SRC_URI="http://fontconfig.org/release/${P}.tar.gz"
-HOMEPAGE="http://fontconfig.org/"
-
-LICENSE="fontconfig"
-SLOT="1.0"
-KEYWORDS="~x86 ~alpha ~ppc ~sparc ~mips ~hppa ~arm"
-
-# Seems like patches in freetype-2.1.2-r2 fixes bug #10028
-DEPEND=">=media-libs/freetype-2.1.4
-	>=dev-libs/expat-1.95.3
-	>=sys-apps/ed-0.2"
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-	local PPREFIX="${FILESDIR}/patch/${PN}"
-
-	# Some patches from Redhat
-	epatch ${PPREFIX}-2.1-slighthint.patch
-	# Add our local fontpath (duh dont forget!)
-	epatch ${PPREFIX}-2.2-local_fontdir-r1.patch
-	# Blacklist some fonts taht breaks fontconfig
-	epatch ${PPREFIX}-2.2-blacklist.patch
-	# Add more font family's
-	epatch ${PPREFIX}-2.2-defaultconfig.patch
-
-	# The date can be troublesome 
-	mv configure configure.old
-	sed -e "s:\`date\`::" configure.old > configure
-	chmod +x configure
-}
-
-src_compile() {
-	# FIXME : docs do not work
-	econf --disable-docs \
-		--x-includes=/usr/X11R6/include \
-		--x-libraries=/usr/X11R6/lib \
-		--with-default-fonts=/usr/X11R6/lib/X11/fonts/Type1 || die
-
-	# this triggers sandbox, we do this ourselves 
-	mv Makefile Makefile.old
-	sed -e "s:fc-cache/fc-cache -f -v:sleep 0:" Makefile.old > Makefile
-	
-	emake || die
-
-	# remove Luxi TTF fonts from the list, the Type1 are much better
-	mv fonts.conf fonts.conf.old 
-	sed -e "s:<dir>/usr/X11R6/lib/X11/fonts/TTF</dir>::" fonts.conf.old > fonts.conf
-}
-
-src_install() {
-	einstall confdir=${D}/etc/fonts \
-		datadir=${D}/usr/share || die
-	
-	insinto /etc/fonts
-	doins ${S}/fonts.conf
-	newins ${S}/fonts.conf fonts.conf.new
-
-	cd ${S}
-	
-	mv fc-cache/fc-cache.man fc-cache/fc-cache.1
-	mv fc-list/fc-list.man fc-list/fc-list.1
-	mv src/fontconfig.man src/fontconfig.3
-	for x in fc-cache/fc-cache.1 fc-list/fc-list.1 src/fontconfig.3
-	do
-		doman ${x}
-	done
-
-	dodoc AUTHORS COPYING ChangeLog NEWS README
-}
-
-pkg_postinst() {
-	# Changes should be made to /etc/fonts/local.conf, and as we had
-	# too much problems with broken fonts.conf, we force update it ...
-	# <azarah@gentoo.org> (11 Dec 2002)
-	ewarn "Please make fontconfig related changes to /etc/fonts/local.conf,"
-	ewarn "and NOT to /etc/fonts/fonts.conf, as it will be replaced!"
-	mv -f ${ROOT}/etc/fonts/fonts.conf.new ${ROOT}/etc/fonts/fonts.conf
-	rm -f ${ROOT}/etc/fonts/._cfg????_fonts.conf
-
-	if [ "${ROOT}" = "/" ]
-	then
-		echo
-		einfo "Creating font cache..."
-		HOME="/root" /usr/bin/fc-cache -f
-	fi
-}
-
diff --git a/media-libs/fontconfig/fontconfig-2.2.0-r2.ebuild b/media-libs/fontconfig/fontconfig-2.2.0-r2.ebuild
index 5338b6580001..b7ae5ac98df2 100644
--- a/media-libs/fontconfig/fontconfig-2.2.0-r2.ebuild
+++ b/media-libs/fontconfig/fontconfig-2.2.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/fontconfig/fontconfig-2.2.0-r2.ebuild,v 1.2 2003/05/16 12:06:54 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/fontconfig/fontconfig-2.2.0-r2.ebuild,v 1.3 2003/05/17 15:49:08 foser Exp $
 
 inherit eutils
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://fontconfig.org/"
 IUSE="doc"
 LICENSE="fontconfig"
 SLOT="1.0"
-KEYWORDS="~x86 ~alpha ~ppc ~sparc ~mips ~hppa ~arm"
+KEYWORDS="x86 ~alpha ~ppc ~sparc ~mips ~hppa ~arm"
 
 DEPEND=">=media-libs/freetype-2.1.4
 	>=dev-libs/expat-1.95.3
@@ -62,7 +62,8 @@ src_compile() {
 
 src_install() {
 	einstall confdir=${D}/etc/fonts \
-		datadir=${D}/usr/share || die
+		datadir=${D}/usr/share \
+		docdir=${D}/usr/share/doc/${P} || die
 	
 	insinto /etc/fonts
 	doins ${S}/fonts.conf
diff --git a/media-libs/fontconfig/fontconfig-2.2.0.ebuild b/media-libs/fontconfig/fontconfig-2.2.0.ebuild
deleted file mode 100644
index ce8552d65cdd..000000000000
--- a/media-libs/fontconfig/fontconfig-2.2.0.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/fontconfig/fontconfig-2.2.0.ebuild,v 1.1 2003/04/23 12:34:33 foser Exp $
-
-inherit eutils
-
-DESCRIPTION="A library for configuring and customizing font access."
-SRC_URI="http://fontconfig.org/release/${P}.tar.gz"
-HOMEPAGE="http://fontconfig.org/"
-
-LICENSE="fontconfig"
-SLOT="1.0"
-KEYWORDS="~x86 ~alpha ~ppc ~sparc ~mips ~hppa ~arm"
-
-# Seems like patches in freetype-2.1.2-r2 fixes bug #10028
-DEPEND=">=media-libs/freetype-2.1.4
-	>=dev-libs/expat-1.95.3
-	>=sys-apps/ed-0.2"
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-	local PPREFIX="${FILESDIR}/patch/${PN}"
-
-	# Some patches from Redhat
-	epatch ${PPREFIX}-2.1-slighthint.patch
-	# and add our local fontpath (duh dont forget!)
-	epatch ${PPREFIX}-2.2-local_fontdir-r1.patch
-
-	# The date can be troublesome 
-	mv configure configure.old
-	sed -e "s:\`date\`::" configure.old > configure
-	chmod +x configure
-}
-
-src_compile() {
-	# FIXME : docs do not work
-	econf --disable-docs \
-		--x-includes=/usr/X11R6/include \
-		--x-libraries=/usr/X11R6/lib \
-		--with-default-fonts=/usr/X11R6/lib/X11/fonts/Type1 || die
-
-	# this triggers sandbox, we do this ourselves 
-	mv Makefile Makefile.old
-	sed -e "s:fc-cache/fc-cache -f -v:sleep 0:" Makefile.old > Makefile
-	
-	emake || die
-
-	# remove Luxi TTF fonts from the list, the Type1 are much better
-	mv fonts.conf fonts.conf.old 
-	sed -e "s:<dir>/usr/X11R6/lib/X11/fonts/TTF</dir>::" fonts.conf.old > fonts.conf
-}
-
-src_install() {
-	einstall confdir=${D}/etc/fonts \
-		datadir=${D}/usr/share || die
-	
-	insinto /etc/fonts
-	doins ${S}/fonts.conf
-	newins ${S}/fonts.conf fonts.conf.new
-
-	cd ${S}
-	
-	mv fc-cache/fc-cache.man fc-cache/fc-cache.1
-	mv fc-list/fc-list.man fc-list/fc-list.1
-	mv src/fontconfig.man src/fontconfig.3
-	for x in fc-cache/fc-cache.1 fc-list/fc-list.1 src/fontconfig.3
-	do
-		doman ${x}
-	done
-
-	dodoc AUTHORS COPYING ChangeLog NEWS README
-}
-
-pkg_postinst() {
-	# Changes should be made to /etc/fonts/local.conf, and as we had
-	# too much problems with broken fonts.conf, we force update it ...
-	# <azarah@gentoo.org> (11 Dec 2002)
-	ewarn "Please make fontconfig related changes to /etc/fonts/local.conf,"
-	ewarn "and NOT to /etc/fonts/fonts.conf, as it will be replaced!"
-	mv -f ${ROOT}/etc/fonts/fonts.conf.new ${ROOT}/etc/fonts/fonts.conf
-	rm -f ${ROOT}/etc/fonts/._cfg????_fonts.conf
-
-	if [ "${ROOT}" = "/" ]
-	then
-		echo
-		einfo "Creating font cache..."
-		HOME="/root" /usr/bin/fc-cache -f
-	fi
-}
-