bugfixes & cleanup of old stuff

16 files changed, 21 insertions, 1027 deletions

diff --git a/media-libs/fontconfig/ChangeLog b/media-libs/fontconfig/ChangeLog
index dc6fee3e4157..d53cc3e87cf2 100644
--- a/media-libs/fontconfig/ChangeLog
+++ b/media-libs/fontconfig/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/fontconfig
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/fontconfig/ChangeLog,v 1.46 2004/04/17 07:16:52 lv Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/fontconfig/ChangeLog,v 1.47 2004/06/02 12:44:03 foser Exp $
+
+  02 Jun 2004; foser <foser@gentoo.org> fontconfig-2.2* :
+  Don't force fc-cache update, it breaks portage removal of fonts (#13808)
+  2.2.2 : remove ed dep (#42805)
 
   17 Apr 2004; Travis Tilley <lv@gentoo.org> fontconfig-2.2.1.ebuild,
   fontconfig-2.2.2.ebuild:
diff --git a/media-libs/fontconfig/Manifest b/media-libs/fontconfig/Manifest
index 7e003e2f9d26..19f55b3d4855 100644
--- a/media-libs/fontconfig/Manifest
+++ b/media-libs/fontconfig/Manifest
@@ -1,22 +1,10 @@
-MD5 b38e62e98fd1b99871a5929893cc5902 files/patch/fontconfig-0.0.1.020826.1330-blacklist.patch 1202
-MD5 02faf1cd55aa11892ede7560867d6ae4 files/patch/fontconfig-2.0-defaultconfig.patch 2491
-MD5 24a80846e464bda0f30e574bd5eaa502 files/patch/fontconfig-2.0-x11fontpath-date-configure.patch 865
-MD5 a56fb55c5b144375a684c1626fe5c5db files/patch/fontconfig-2.1-cvs-update-20021221.patch 7727
-MD5 4cf5fc54b6e6229ed6526ebc607d8379 files/patch/fontconfig-2.1-fixedwidth.patch 1681
-MD5 37e60cdff43bf3f04e9db8931e0d1f47 files/patch/fontconfig-2.1-slighthint.patch 2171
-MD5 603a8531876d27be276f7325c12b71e8 files/patch/fontconfig-2.1-x11fontpath-date-configure-v2.patch 624
-MD5 8791cc317d1e601f2cff7218460fb5fc files/patch/fontconfig-2.1-x11fontpath-date-configure.patch 585
-MD5 1636083efd15746d8f194aff41aa6e02 files/patch/fontconfig-2.2-blacklist.patch 1216
-MD5 4b5453071b61ecef4bb530b0bca695e1 files/patch/fontconfig-2.2-local_fontdir-r1.patch 487
-MD5 4d77167b56a7dff0d7c7b5b8168b85ba files/patch/fontconfig-2.2-remove_subpixel_test.patch 441
-MD5 1ff8388d005bbd929c1ea3865a30007e files/patch/fontconfig-2.2.0-cvs_bugfixes.patch 11504
-MD5 fd11506a1969709b4d447084344006ba files/digest-fontconfig-2.1-r1 140
-MD5 82f9bbcca9f5c665c6610cbaace58579 files/digest-fontconfig-2.2.0-r2 145
+MD5 a5bc6c13889cf4a457ed383aaafff079 fontconfig-2.2.1.ebuild 3150
+MD5 afcf95c21fe7458612bf6e2d0f5b35b6 fontconfig-2.2.2.ebuild 2868
+MD5 641f3e8f800344d8624cfc511ecb5415 ChangeLog 7673
+MD5 ae7171ca850597a2455b8b10c72a8de1 metadata.xml 419
 MD5 88bdeed6518b90c6230b5ea155936c8f files/digest-fontconfig-2.2.1 68
 MD5 d2b7ff87a89e51efb73ac1aaaa9a4957 files/digest-fontconfig-2.2.2 68
-MD5 c784fdb480936fe3759818e6cd3505fc ChangeLog 7503
-MD5 7519203ddf93d1d0a517a1f32c311a37 fontconfig-2.1-r1.ebuild 2675
-MD5 31c86adf23a65b100a9eab151ef88db5 fontconfig-2.2.0-r2.ebuild 3312
-MD5 be8dd6b1c3f4955306f01cb53dffa029 fontconfig-2.2.1.ebuild 3150
-MD5 028c13c6b3161a210317d315b7ab3eaf fontconfig-2.2.2.ebuild 2892
-MD5 ae7171ca850597a2455b8b10c72a8de1 metadata.xml 419
+MD5 4b5453071b61ecef4bb530b0bca695e1 files/patch/fontconfig-2.2-local_fontdir-r1.patch 487
+MD5 37e60cdff43bf3f04e9db8931e0d1f47 files/patch/fontconfig-2.1-slighthint.patch 2171
+MD5 4d77167b56a7dff0d7c7b5b8168b85ba files/patch/fontconfig-2.2-remove_subpixel_test.patch 441
+MD5 1636083efd15746d8f194aff41aa6e02 files/patch/fontconfig-2.2-blacklist.patch 1216
diff --git a/media-libs/fontconfig/files/digest-fontconfig-2.1-r1 b/media-libs/fontconfig/files/digest-fontconfig-2.1-r1
deleted file mode 100644
index dd8149a1c181..000000000000
--- a/media-libs/fontconfig/files/digest-fontconfig-2.1-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 2f2852c80924a9b5356c3037a471c1a1 fcpackage.2_1.tar.gz 544661
-MD5 447ec2f65da7aa027aab7c23f3eaa358 fontconfig-2.1-r1-gentoo.tar.bz2 5464
diff --git a/media-libs/fontconfig/files/digest-fontconfig-2.2.0-r2 b/media-libs/fontconfig/files/digest-fontconfig-2.2.0-r2
deleted file mode 100644
index 78e3da1f01f7..000000000000
--- a/media-libs/fontconfig/files/digest-fontconfig-2.2.0-r2
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 cf0ce6c87e5d6362e9ebc8d94a45fdc4 fontconfig-2.2.0.tar.gz 612758
-MD5 76caf9c991ca614a513afcd87151b9c5 fontconfig-2.2.0-r2-gentoo.tar.bz2 4202
diff --git a/media-libs/fontconfig/files/patch/fontconfig-0.0.1.020826.1330-blacklist.patch b/media-libs/fontconfig/files/patch/fontconfig-0.0.1.020826.1330-blacklist.patch
deleted file mode 100644
index 43eb110a7df9..000000000000
--- a/media-libs/fontconfig/files/patch/fontconfig-0.0.1.020826.1330-blacklist.patch
+++ /dev/null
@@ -1,53 +0,0 @@
---- fontconfig/src/fcdir.c.blacklist	Mon Aug 26 15:57:40 2002
-+++ fontconfig/src/fcdir.c	Fri Aug 30 14:59:05 2002
-@@ -150,6 +150,40 @@
-     return ret;
- }
- 
-+static FcBool
-+FcBlackListed (const char *name)
-+{
-+    static const char * const black_listed_names[] = {
-+	"hrger.pfa",
-+	"hrgrr.pfa",
-+	"hritr.pfa",
-+	"hrpld.pfa",
-+	"hrpldi.pfa",
-+	"hrplt.pfa",
-+	"hrplti.pfa",
-+	"hrscc.pfa",
-+	"hrscs.pfa",
-+	"u003043t.gsf",
-+	"u004006t.gsf"
-+    };
-+
-+    int low = 0;
-+    int high = sizeof(black_listed_names) / sizeof(black_listed_names[0]) - 1;
-+
-+    while (low <= high) {
-+	int mid = (low + high) / 2;
-+	int res = strcmp (name, black_listed_names[mid]);
-+	if (res == 0)
-+	    return FcTrue;
-+	else if (res < 0)
-+	    high = mid - 1;
-+	else
-+	    low = mid + 1;
-+    }
-+
-+    return FcFalse;
-+}
-+
- #define FC_MAX_FILE_LEN	    4096
- 
- FcBool
-@@ -201,7 +235,8 @@
-     }
-     while (ret && (e = readdir (d)))
-     {
--	if (e->d_name[0] != '.' && strlen (e->d_name) < FC_MAX_FILE_LEN)
-+	if (e->d_name[0] != '.' && strlen (e->d_name) < FC_MAX_FILE_LEN &&
-+	    !FcBlackListed (e->d_name))
- 	{
- 	    strcpy ((char *) base, (char *) e->d_name);
- 	    ret = FcFileScan (set, dirs, cache, blanks, file, force);
diff --git a/media-libs/fontconfig/files/patch/fontconfig-2.0-defaultconfig.patch b/media-libs/fontconfig/files/patch/fontconfig-2.0-defaultconfig.patch
deleted file mode 100644
index d4c39806a75d..000000000000
--- a/media-libs/fontconfig/files/patch/fontconfig-2.0-defaultconfig.patch
+++ /dev/null
@@ -1,93 +0,0 @@
---- fontconfig/fonts.conf.in.defaultconfig	Mon Aug 19 15:31:59 2002
-+++ fontconfig/fonts.conf.in	Mon Sep  2 23:32:37 2002
-@@ -170,45 +170,78 @@
- 	<alias>
- 		<family>serif</family>
- 		<prefer>
--			<family>Times New Roman</family>
- 			<family>Nimbus Roman No9 L</family>
- 			<family>Luxi Serif</family>
--			<family>Times</family>
- 			<family>Kochi Mincho</family>
-+			<family>ZYSong18030</family>
- 			<family>AR PL SungtiL GB</family>
- 			<family>AR PL Mingti2L Big5</family>
- 			<family>Baekmuk Batang</family>			
-+			<family>Times New Roman</family>
-+			<family>Times</family>
- 		</prefer>
- 	</alias>
- 	<alias>
- 		<family>sans-serif</family>
- 		<prefer>
--			<family>Verdana</family>
--			<family>Nimbus Sans L</family>
- 			<family>Luxi Sans</family>
--			<family>Arial</family>
-+			<family>Nimbus Sans L</family>
- 			<family>Helvetica</family>
- 			<family>Kochi Gothic</family>
--			<family>AR PL KaitiM GB</family>
--			<family>AR PL KaitiM Big5</family>
--			<family>Baekmuk Dotum</family>
-+			<family>ZYSong18030</family>
-+			<family>AR PL SungtiL GB</family>
-+			<family>AR PL Mingti2L Big5</family>
-+			<family>Baekmuk Gulim</family>
-+			<family>Verdana</family>
-+			<family>Arial</family>
- 			<family>SimSun</family>
- 		</prefer>
- 	</alias>
- 	<alias>
- 		<family>monospace</family>
- 		<prefer>
--			<family>Andale Mono</family>
--			<family>Courier New</family>
- 			<family>Luxi Mono</family>
- 			<family>Nimbus Mono L</family>
- 			<family>Kochi Gothic</family>
--			<family>AR PL KaitiM GB</family>
--			<family>Baekmuk Dotum</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>
- 		</prefer>
- 	</alias>
- 
- <!-- 
-+ We can't hint CJK fonts well, so turn off hinting for CJK fonts.
-+ -->
-+
-+	<match target="font">
-+		<test name="lang" compare="contains">
-+			<string>ja</string>
-+		</test>
-+		<edit name="hinting" mode="assign">
-+			<bool>false</bool>
-+		</edit>
-+	</match>
-+	<match target="font">
-+		<test name="lang" compare="contains">
-+			<string>ko</string>
-+		</test>
-+		<edit name="hinting" mode="assign">
-+			<bool>false</bool>
-+		</edit>
-+	</match>
-+	<match target="font">
-+		<test name="lang" compare="contains">
-+			<string>zh</string>
-+		</test>
-+		<edit name="hinting" mode="assign">
-+			<bool>false</bool>
-+		</edit>
-+	</match>
-+
-+<!-- 
-  Artificial oblique for fonts without an italic or oblique version
-  -->
-  
diff --git a/media-libs/fontconfig/files/patch/fontconfig-2.0-x11fontpath-date-configure.patch b/media-libs/fontconfig/files/patch/fontconfig-2.0-x11fontpath-date-configure.patch
deleted file mode 100644
index 3684418231e6..000000000000
--- a/media-libs/fontconfig/files/patch/fontconfig-2.0-x11fontpath-date-configure.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -ur fcpackage.2_0.old/fontconfig/fonts.conf.in fcpackage.2_0/fontconfig/fonts.conf.in
---- fcpackage.2_0.old/fontconfig/fonts.conf.in	2002-11-26 00:53:47.000000000 +0100
-+++ fcpackage.2_0/fontconfig/fonts.conf.in	2002-11-26 01:06:26.000000000 +0100
-@@ -20,7 +20,6 @@
-   Common X11R6 font directories
- -->
- 
--	<dir>/usr/X11R6/lib/X11/fonts</dir>
-  	<dir>/usr/share/fonts</dir>
- 	<dir>~/.fonts</dir>
- 
-diff -ur fcpackage.2_0.old/fontconfig/setfontdirs fcpackage.2_0/fontconfig/setfontdirs
---- fcpackage.2_0.old/fontconfig/setfontdirs	2002-11-26 00:53:47.000000000 +0100
-+++ fcpackage.2_0/fontconfig/setfontdirs	2002-11-26 00:55:00.000000000 +0100
-@@ -11,10 +11,10 @@
- chmod +w fonts.conf
- ed fonts.conf << EOF
- /FONTPATH_END/a
--<!-- Font directory list configured on `date` -->
- .
- +r $FONTDIRS
- a
-+	<dir>/usr/X11R6/lib/X11/fonts</dir>
- 	<dir>~/.fonts</dir>
- 
- .
diff --git a/media-libs/fontconfig/files/patch/fontconfig-2.1-cvs-update-20021221.patch b/media-libs/fontconfig/files/patch/fontconfig-2.1-cvs-update-20021221.patch
deleted file mode 100644
index 08e3756b215f..000000000000
--- a/media-libs/fontconfig/files/patch/fontconfig-2.1-cvs-update-20021221.patch
+++ /dev/null
@@ -1,253 +0,0 @@
-diff -urN fontconfig.orig/fc-lang/fc-lang.c fontconfig/fc-lang/fc-lang.c
---- fontconfig.orig/fc-lang/fc-lang.c	2002-08-22 09:36:43.000000000 +0200
-+++ fontconfig/fc-lang/fc-lang.c	2002-12-16 11:16:29.000000000 +0200
-@@ -1,5 +1,5 @@
- /*
-- * $XFree86: xc/lib/fontconfig/fc-lang/fc-lang.c,v 1.3 2002/08/22 07:36:43 keithp Exp $
-+ * $XFree86: xc/lib/fontconfig/fc-lang/fc-lang.c,v 1.4 2002/12/14 02:03:58 dawes Exp $
-  *
-  * Copyright © 2002 Keith Packard, member of The XFree86 Project, Inc.
-  *
-@@ -165,22 +165,38 @@
-     return FcStrCmpIgnoreCase (*as, *bs);
- }
- 
-+#define MAX_LANG	    1024
-+#define MAX_LANG_SET_MAP    ((MAX_LANG + 31) / 32)
-+
-+#define BitSet(map, id)   ((map)[(id)>>5] |= ((FcChar32) 1 << ((id) & 0x1f)))
-+#define BitGet(map, id)   ((map)[(id)>>5] >> ((id) & 0x1f)) & 1)
-+
- int
- main (int argc, char **argv)
- {
--    char	*files[1024];
--    FcCharSet	*sets[1024];
--    int		duplicate[1024];
--    char	*names[1024];
-+    char	*files[MAX_LANG];
-+    FcCharSet	*sets[MAX_LANG];
-+    int		duplicate[MAX_LANG];
-+    int		country[MAX_LANG];
-+    char	*names[MAX_LANG];
-+    char	*langs[MAX_LANG];
-     FILE	*f;
-+    int		ncountry = 0;
-     int		i = 0;
-     FcCharLeaf	**leaves, **sleaves;
-     int		total_leaves = 0;
-     int		l, sl, tl;
-+    int		c;
-     char	line[1024];
-+    FcChar32	map[MAX_LANG_SET_MAP];
-+    int		num_lang_set_map;
-     
-     while (*++argv)
-+    {
-+	if (i == MAX_LANG)
-+	    fatal (*argv, 0, "Too many languages");
- 	files[i++] = *argv;
-+    }
-     files[i] = 0;
-     qsort (files, i, sizeof (char *), compare);
-     i = 0;
-@@ -191,6 +207,10 @@
- 	    fatal (files[i], 0, strerror (errno));
- 	sets[i] = scan (f, files[i]);
- 	names[i] = get_name (files[i]);
-+	langs[i] = get_lang(names[i]);
-+	if (strchr (langs[i], '-'))
-+	    country[ncountry++] = i;
-+
- 	total_leaves += sets[i]->num;
- 	i++;
- 	fclose (f);
-@@ -319,10 +339,54 @@
- 		"      { FC_REF_CONSTANT, %d, "
- 		"(FcCharLeaf **) leaves_%s, "
- 		"(FcChar16 *) numbers_%s } },\n",
--		get_lang(names[i]),
-+		langs[i],
- 		sets[j]->num, names[j], names[j]);
-     }
-     printf ("};\n\n");
-+    printf ("#define NUM_LANG_CHAR_SET	%d\n", i);
-+    num_lang_set_map = (i + 31) / 32;
-+    printf ("#define NUM_LANG_SET_MAP	%d\n", num_lang_set_map);
-+    /*
-+     * Dump indices with country codes
-+     */
-+    if (ncountry)
-+    {
-+	int	ncountry_ent = 0;
-+	printf ("\n");
-+	printf ("static const FcChar32 fcLangCountrySets[][NUM_LANG_SET_MAP] = {\n");
-+	for (c = 0; c < ncountry; c++)
-+	{
-+	    i = country[c];
-+	    if (i >= 0)
-+	    {
-+		int l = strchr (langs[i], '-') - langs[i];
-+		int d, k;
-+
-+		for (k = 0; k < num_lang_set_map; k++)
-+		    map[k] = 0;
-+
-+		BitSet (map, i);
-+		for (d = c + 1; d < ncountry; d++)
-+		{
-+		    int j = country[d];
-+		    if (j >= 0 && !strncmp (langs[j], langs[i], l))
-+		    {
-+			BitSet(map, j);
-+			country[d] = -1;
-+		    }
-+		}
-+		printf ("    {");
-+		for (k = 0; k < num_lang_set_map; k++)
-+		    printf (" 0x%08x,", map[k]);
-+		printf (" }, /* %*.*s */\n",
-+			l, l, langs[i]);
-+		++ncountry_ent;
-+	    }
-+	}
-+	printf ("};\n\n");
-+	printf ("#define NUM_COUNTRY_SET %d\n", ncountry_ent);
-+    }
-+    
-     while (fgets (line, sizeof (line), stdin))
- 	fputs (line, stdout);
-     
-diff -urN fontconfig.orig/fc-lang/fclang.h fontconfig/fc-lang/fclang.h
---- fontconfig.orig/fc-lang/fclang.h	2002-10-21 19:03:47.000000000 +0200
-+++ fontconfig/fc-lang/fclang.h	2002-12-16 11:16:29.000000000 +0200
-@@ -1,5 +1,5 @@
- /*
-- * $XFree86: xc/lib/fontconfig/fc-lang/fclang.h,v 1.20 2002/10/21 17:03:47 keithp Exp $
-+ * $XFree86: xc/lib/fontconfig/fc-lang/fclang.h,v 1.21 2002/12/14 02:03:58 dawes Exp $
-  *
-  * Copyright © 2002 Keith Packard, member of The XFree86 Project, Inc.
-  *
-@@ -3996,3 +3996,11 @@
-       { FC_REF_CONSTANT, 1, (FcCharLeaf **) leaves_fj, (FcChar16 *) numbers_fj } },
- };
- 
-+#define NUM_LANG_CHAR_SET	175
-+#define NUM_LANG_SET_MAP	6
-+
-+static const FcChar32 fcLangCountrySets[][NUM_LANG_SET_MAP] = {
-+    { 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00003e00, }, /* zh */
-+};
-+
-+#define NUM_COUNTRY_SET 1
-diff -urN fontconfig.orig/fontconfig/fcprivate.h fontconfig/fontconfig/fcprivate.h
---- fontconfig.orig/fontconfig/fcprivate.h	2002-08-22 09:36:44.000000000 +0200
-+++ fontconfig/fontconfig/fcprivate.h	2002-12-05 00:45:28.000000000 +0200
-@@ -1,5 +1,5 @@
- /*
-- * $XFree86: xc/lib/fontconfig/fontconfig/fcprivate.h,v 1.6 2002/08/22 07:36:44 keithp Exp $
-+ * $XFree86: xc/lib/fontconfig/fontconfig/fcprivate.h,v 1.7 2002/12/04 10:28:03 eich Exp $
-  *
-  * Copyright © 2001 Keith Packard, member of The XFree86 Project, Inc.
-  *
-@@ -87,7 +87,7 @@
-     if (!orig)							    \
- 	FcPatternDestroy (__p__);				    \
- _FcPatternVapBuild_bail0:					    \
--    result = 0;							    \
-+    result = (void*)0;						    \
- 								    \
- _FcPatternVapBuild_return:					    \
-     ;								    \
-diff -urN fontconfig.orig/setfontdirs fontconfig/setfontdirs
---- fontconfig.orig/setfontdirs	2002-08-01 18:17:33.000000000 +0200
-+++ fontconfig/setfontdirs	2002-12-20 08:29:39.000000000 +0200
-@@ -1,6 +1,6 @@
- #!/bin/sh
- #
--# $XFree86: xc/lib/fontconfig/setfontdirs,v 1.4 2002/08/01 16:17:33 keithp Exp $
-+# $XFree86: xc/lib/fontconfig/setfontdirs,v 1.5 2002/12/17 03:26:36 dawes Exp $
- #
- LANG=C
- export LANG
-@@ -9,7 +9,17 @@
- sh ./findfonts ${1+"$@"} > $FONTDIRS
- cp fonts.conf.in fonts.conf
- chmod +w fonts.conf
--ed fonts.conf << EOF
-+EDITOR=ed
-+(echo q | ed) > /dev/null 2>&1
-+if [ $? -ne 0 ]; then
-+	EDITOR=ex
-+	(echo q | ex) > /dev/null 2>&1
-+	if [ $? -ne 0 ]; then
-+		echo "$0: *** Error: Cannot find 'ed' or 'ex' editor"
-+		exit 1
-+	fi
-+fi
-+$EDITOR fonts.conf << EOF
- /FONTPATH_END/a
- <!-- Font directory list configured on `date` -->
- .
-diff -urN fontconfig.orig/src/fclang.c fontconfig/src/fclang.c
---- fontconfig.orig/src/fclang.c	2002-08-27 01:34:31.000000000 +0200
-+++ fontconfig/src/fclang.c	2002-12-16 11:16:29.000000000 +0200
-@@ -1,5 +1,5 @@
- /*
-- * $XFree86: xc/lib/fontconfig/src/fclang.c,v 1.7 2002/08/26 23:34:31 keithp Exp $
-+ * $XFree86: xc/lib/fontconfig/src/fclang.c,v 1.8 2002/12/14 02:03:59 dawes Exp $
-  *
-  * Copyright © 2002 Keith Packard, member of The XFree86 Project, Inc.
-  *
-@@ -31,9 +31,6 @@
- 
- #include "../fc-lang/fclang.h"
- 
--#define NUM_LANG_CHAR_SET   (sizeof (fcLangCharSets) / sizeof (fcLangCharSets[0]))
--#define NUM_LANG_SET_MAP    ((NUM_LANG_CHAR_SET + 31) / 32)
--
- struct _FcLangSet {
-     FcChar32	map[NUM_LANG_SET_MAP];
-     FcStrSet	*extra;
-@@ -339,13 +336,21 @@
- FcLangResult
- FcLangSetCompare (const FcLangSet *lsa, const FcLangSet *lsb)
- {
--    int		    i;
-+    int		    i, j;
-     FcLangResult    best, r;
- 
-     for (i = 0; i < NUM_LANG_SET_MAP; i++)
- 	if (lsa->map[i] & lsb->map[i])
- 	    return FcLangEqual;
-     best = FcLangDifferentLang;
-+    for (j = 0; j < NUM_COUNTRY_SET; j++)
-+	for (i = 0; i < NUM_LANG_SET_MAP; i++)
-+	    if ((lsa->map[i] & fcLangCountrySets[j][i]) &&
-+		(lsb->map[i] & fcLangCountrySets[j][i]))
-+	    {
-+		best = FcLangDifferentCountry;
-+		break;
-+	    }
-     if (lsa->extra)
-     {
- 	r = FcLangSetCompareStrSet (lsb, lsa->extra);
-diff -urN fontconfig.orig/src/fcstr.c fontconfig/src/fcstr.c
---- fontconfig.orig/src/fcstr.c	2002-09-01 00:17:32.000000000 +0200
-+++ fontconfig/src/fcstr.c	2002-12-16 11:16:29.000000000 +0200
-@@ -1,5 +1,5 @@
- /*
-- * $XFree86: xc/lib/fontconfig/src/fcstr.c,v 1.10 2002/08/31 22:17:32 keithp Exp $
-+ * $XFree86: xc/lib/fontconfig/src/fcstr.c,v 1.11 2002/12/14 01:59:38 dawes Exp $
-  *
-  * Copyright © 2000 Keith Packard, member of The XFree86 Project, Inc.
-  *
-@@ -283,7 +283,7 @@
- 	if ((b & 0xfc00) != 0xdc00)
- 	    return 0;
- 	result = ((((FcChar32) a & 0x3ff) << 10) |
--		  ((FcChar32) b & 0x3ff)) | 0x10000;
-+		  ((FcChar32) b & 0x3ff)) + 0x10000;
-     }
-     else
- 	result = a;
diff --git a/media-libs/fontconfig/files/patch/fontconfig-2.1-fixedwidth.patch b/media-libs/fontconfig/files/patch/fontconfig-2.1-fixedwidth.patch
deleted file mode 100644
index 1228d36170c5..000000000000
--- a/media-libs/fontconfig/files/patch/fontconfig-2.1-fixedwidth.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-diff -u -r1.18 -r1.20
---- fontconfig/fonts.conf.in	2003/02/24 17:18:50	1.18
-+++ fontconfig/fonts.conf.in	2003/02/27 08:12:13	1.20
-@@ -140,6 +140,31 @@
- 	</match>
- 	
- <!--
-+  Some Asian fonts misadvertise themselves as monospaced when
-+  in fact they are dual-spaced (half and full).  This makes
-+  FreeType very confused as it forces all widths to match.
-+  Undo this magic by disabling the width forcing code -->
-+	<match target="font">
-+		<test name="family"><string>GulimChe</string></test>
-+		<edit name="globaladvance"><bool>false</bool></edit>
-+	</match>
-+	
-+	<match target="font">
-+		<test name="family"><string>DotumChe</string></test>
-+		<edit name="globaladvance"><bool>false</bool></edit>
-+	</match>
-+
-+	<match target="font">
-+		<test name="family"><string>BatangChe</string></test>
-+		<edit name="globaladvance"><bool>false</bool></edit>
-+	</match>
-+
-+	<match target="font">
-+		<test name="family"><string>GungsuhChe</string></test>
-+		<edit name="globaladvance"><bool>false</bool></edit>
-+	</match>
-+
-+<!--
-   Load per-user customization file
- -->
- 	<include ignore_missing="yes">~/.fonts.conf</include>
-diff -u -r1.13 -r1.14
---- fontconfig/src/fcfreetype.c	2003/02/06 17:46:06	1.13
-+++ fontconfig/src/fcfreetype.c	2003/02/27 07:04:59	1.14
-@@ -467,7 +467,12 @@
-     if (!FcPatternAddString (pat, FC_SOURCE, (FcChar8 *) "FreeType"))
- 	goto bail1;
- 
--#if 1
-+#if 0
-+    /*
-+     * don't even try this -- CJK 'monospace' fonts are really
-+     * dual width, and most other fonts don't bother to set
-+     * the attribute.  Sigh.
-+     */
-     if ((face->face_flags & FT_FACE_FLAG_FIXED_WIDTH) != 0)
- 	if (!FcPatternAddInteger (pat, FC_SPACING, FC_MONO))
- 	    goto bail1;
diff --git a/media-libs/fontconfig/files/patch/fontconfig-2.1-x11fontpath-date-configure-v2.patch b/media-libs/fontconfig/files/patch/fontconfig-2.1-x11fontpath-date-configure-v2.patch
deleted file mode 100644
index 0e8425744a0e..000000000000
--- a/media-libs/fontconfig/files/patch/fontconfig-2.1-x11fontpath-date-configure-v2.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- fcpackage.2_1/fontconfig/setfontdirs.orig	2002-12-23 11:38:24.000000000 +0200
-+++ fcpackage.2_1/fontconfig/setfontdirs	2002-12-23 11:40:02.000000000 +0200
-@@ -6,7 +6,7 @@
- export LANG
- FONTDIRS=fontdirs$$
- trap "rm $FONTDIRS" 0
--sh ./findfonts ${1+"$@"} > $FONTDIRS
-+sh ./findfonts ${1+"$@"} | awk '!/\/usr\/X11R6\/lib\/X11\/fonts/ { print }' > $FONTDIRS
- cp fonts.conf.in fonts.conf
- chmod +w fonts.conf
- EDITOR=ed
-@@ -21,10 +21,10 @@
- fi
- $EDITOR fonts.conf << EOF
- /FONTPATH_END/a
--<!-- Font directory list configured on `date` -->
- .
- +r $FONTDIRS
- a
-+	<dir>/usr/X11R6/lib/X11/fonts</dir>
- 	<dir>~/.fonts</dir>
- 
- .
diff --git a/media-libs/fontconfig/files/patch/fontconfig-2.1-x11fontpath-date-configure.patch b/media-libs/fontconfig/files/patch/fontconfig-2.1-x11fontpath-date-configure.patch
deleted file mode 100644
index 9e15ddd4afa8..000000000000
--- a/media-libs/fontconfig/files/patch/fontconfig-2.1-x11fontpath-date-configure.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- fcpackage.2_1/fontconfig/setfontdirs.orig	2002-08-01 18:17:33.000000000 +0200
-+++ fcpackage.2_1/fontconfig/setfontdirs	2002-12-11 21:31:37.000000000 +0200
-@@ -6,15 +6,15 @@
- export LANG
- FONTDIRS=fontdirs$$
- trap "rm $FONTDIRS" 0
--sh ./findfonts ${1+"$@"} > $FONTDIRS
-+sh ./findfonts ${1+"$@"} |awk '!/\/usr\/X11R6\/lib\/X11\/fonts/ { print }' > $FONTDIRS
- cp fonts.conf.in fonts.conf
- chmod +w fonts.conf
- ed fonts.conf << EOF
- /FONTPATH_END/a
--<!-- Font directory list configured on `date` -->
- .
- +r $FONTDIRS
- a
-+	<dir>/usr/X11R6/lib/X11/fonts</dir>
- 	<dir>~/.fonts</dir>
- 
- .
diff --git a/media-libs/fontconfig/files/patch/fontconfig-2.2.0-cvs_bugfixes.patch b/media-libs/fontconfig/files/patch/fontconfig-2.2.0-cvs_bugfixes.patch
deleted file mode 100644
index b99d26a265c8..000000000000
--- a/media-libs/fontconfig/files/patch/fontconfig-2.2.0-cvs_bugfixes.patch
+++ /dev/null
@@ -1,265 +0,0 @@
-Only in fontconfig: .cvsignore
-Only in fontconfig: CVS
-diff -ur -I '$Id' fontconfig-2.2.0/ChangeLog fontconfig/ChangeLog
---- fontconfig-2.2.0/ChangeLog	2003-04-17 19:43:04.000000000 +0200
-+++ fontconfig/ChangeLog	2003-04-23 06:09:56.000000000 +0200
-@@ -1,3 +1,11 @@
-+2003-04-23  James Henstridge  <james@daa.com.au>
-+
-+	* doc/fontconfig-devel.sgml: close the <para> element.
-+
-+	* doc/fcpattern.fncs: close the <para> element.
-+
-+	* doc/func.sgml: close the <refsynopsisdiv> element.
-+
- 2003-04-17  Colin Walters <walters@debian.org>
- 
- 	+ Remove some unused variables, and initialize some other ones so
-Only in fontconfig-2.2.0: Makefile.in
-Only in fontconfig-2.2.0: aclocal.m4
-Only in fontconfig: autogen.sh
-Only in fontconfig: config
-Only in fontconfig-2.2.0: config.guess
-Only in fontconfig-2.2.0: config.h.in
-Only in fontconfig-2.2.0: config.sub
-Only in fontconfig-2.2.0: configure
-Only in fontconfig: debian
-Only in fontconfig/doc: .cvsignore
-Only in fontconfig/doc: CVS
-Only in fontconfig-2.2.0/doc: FcAtomicCreate.3
-Only in fontconfig-2.2.0/doc: FcAtomicDeleteNew.3
-Only in fontconfig-2.2.0/doc: FcAtomicDestroy.3
-Only in fontconfig-2.2.0/doc: FcAtomicLock.3
-Only in fontconfig-2.2.0/doc: FcAtomicNewFile.3
-Only in fontconfig-2.2.0/doc: FcAtomicOrigFile.3
-Only in fontconfig-2.2.0/doc: FcAtomicReplaceOrig.3
-Only in fontconfig-2.2.0/doc: FcAtomicUnlock.3
-Only in fontconfig-2.2.0/doc: FcBlanksAdd.3
-Only in fontconfig-2.2.0/doc: FcBlanksCreate.3
-Only in fontconfig-2.2.0/doc: FcBlanksDestroy.3
-Only in fontconfig-2.2.0/doc: FcBlanksIsMember.3
-Only in fontconfig-2.2.0/doc: FcCharSetAddChar.3
-Only in fontconfig-2.2.0/doc: FcCharSetCopy.3
-Only in fontconfig-2.2.0/doc: FcCharSetCount.3
-Only in fontconfig-2.2.0/doc: FcCharSetCreate.3
-Only in fontconfig-2.2.0/doc: FcCharSetDestroy.3
-Only in fontconfig-2.2.0/doc: FcCharSetEqual.3
-Only in fontconfig-2.2.0/doc: FcCharSetFirstPage.3
-Only in fontconfig-2.2.0/doc: FcCharSetHasChar.3
-Only in fontconfig-2.2.0/doc: FcCharSetIntersect.3
-Only in fontconfig-2.2.0/doc: FcCharSetIntersectCount.3
-Only in fontconfig-2.2.0/doc: FcCharSetIsSubset.3
-Only in fontconfig-2.2.0/doc: FcCharSetNextPage.3
-Only in fontconfig-2.2.0/doc: FcCharSetSubtract.3
-Only in fontconfig-2.2.0/doc: FcCharSetSubtractCount.3
-Only in fontconfig-2.2.0/doc: FcCharSetUnion.3
-Only in fontconfig-2.2.0/doc: FcConfigAppFontAddDir.3
-Only in fontconfig-2.2.0/doc: FcConfigAppFontAddFile.3
-Only in fontconfig-2.2.0/doc: FcConfigAppFontClear.3
-Only in fontconfig-2.2.0/doc: FcConfigBuildFonts.3
-Only in fontconfig-2.2.0/doc: FcConfigCreate.3
-Only in fontconfig-2.2.0/doc: FcConfigDestroy.3
-Only in fontconfig-2.2.0/doc: FcConfigFilename.3
-Only in fontconfig-2.2.0/doc: FcConfigGetBlanks.3
-Only in fontconfig-2.2.0/doc: FcConfigGetCache.3
-Only in fontconfig-2.2.0/doc: FcConfigGetConfigDirs.3
-Only in fontconfig-2.2.0/doc: FcConfigGetConfigFiles.3
-Only in fontconfig-2.2.0/doc: FcConfigGetCurrent.3
-Only in fontconfig-2.2.0/doc: FcConfigGetFontDirs.3
-Only in fontconfig-2.2.0/doc: FcConfigGetFonts.3
-Only in fontconfig-2.2.0/doc: FcConfigGetRescanInverval.3
-Only in fontconfig-2.2.0/doc: FcConfigParseAndLoad.3
-Only in fontconfig-2.2.0/doc: FcConfigSetCurrent.3
-Only in fontconfig-2.2.0/doc: FcConfigSetRescanInverval.3
-Only in fontconfig-2.2.0/doc: FcConfigSubstitute.3
-Only in fontconfig-2.2.0/doc: FcConfigSubstituteWithPat.3
-Only in fontconfig-2.2.0/doc: FcConfigUptoDate.3
-Only in fontconfig-2.2.0/doc: FcDefaultSubstitute.3
-Only in fontconfig-2.2.0/doc: FcDirCacheValid.3
-Only in fontconfig-2.2.0/doc: FcDirSave.3
-Only in fontconfig-2.2.0/doc: FcDirScan.3
-Only in fontconfig-2.2.0/doc: FcFileScan.3
-Only in fontconfig-2.2.0/doc: FcFontList.3
-Only in fontconfig-2.2.0/doc: FcFontMatch.3
-Only in fontconfig-2.2.0/doc: FcFontRenderPrepare.3
-Only in fontconfig-2.2.0/doc: FcFontSetAdd.3
-Only in fontconfig-2.2.0/doc: FcFontSetCreate.3
-Only in fontconfig-2.2.0/doc: FcFontSetDestroy.3
-Only in fontconfig-2.2.0/doc: FcFontSort.3
-Only in fontconfig-2.2.0/doc: FcFreeTypeCharIndex.3
-Only in fontconfig-2.2.0/doc: FcFreeTypeCharSet.3
-Only in fontconfig-2.2.0/doc: FcFreeTypeQuery.3
-Only in fontconfig-2.2.0/doc: FcGetVersion.3
-Only in fontconfig-2.2.0/doc: FcInit.3
-Only in fontconfig-2.2.0/doc: FcInitBringUptoDate.3
-Only in fontconfig-2.2.0/doc: FcInitLoadConfig.3
-Only in fontconfig-2.2.0/doc: FcInitLoadConfigAndFonts.3
-Only in fontconfig-2.2.0/doc: FcInitReinitialize.3
-Only in fontconfig-2.2.0/doc: FcMatrixCopy.3
-Only in fontconfig-2.2.0/doc: FcMatrixEqual.3
-Only in fontconfig-2.2.0/doc: FcMatrixInit.3
-Only in fontconfig-2.2.0/doc: FcMatrixMultiply.3
-Only in fontconfig-2.2.0/doc: FcMatrixRotate.3
-Only in fontconfig-2.2.0/doc: FcMatrixScale.3
-Only in fontconfig-2.2.0/doc: FcMatrixShear.3
-Only in fontconfig-2.2.0/doc: FcNameConstant.3
-Only in fontconfig-2.2.0/doc: FcNameGetConstant.3
-Only in fontconfig-2.2.0/doc: FcNameGetObjectType.3
-Only in fontconfig-2.2.0/doc: FcNameParse.3
-Only in fontconfig-2.2.0/doc: FcNameRegisterConstants.3
-Only in fontconfig-2.2.0/doc: FcNameRegisterObjectTypes.3
-Only in fontconfig-2.2.0/doc: FcNameUnparse.3
-Only in fontconfig-2.2.0/doc: FcNameUnregisterConstants.3
-Only in fontconfig-2.2.0/doc: FcNameUnregisterObjectTypes.3
-Only in fontconfig-2.2.0/doc: FcObjectSetAdd.3
-Only in fontconfig-2.2.0/doc: FcObjectSetBuild.3
-Only in fontconfig-2.2.0/doc: FcObjectSetCreate.3
-Only in fontconfig-2.2.0/doc: FcObjectSetDestroy.3
-Only in fontconfig-2.2.0/doc: FcPatternAdd-Type.3
-Only in fontconfig-2.2.0/doc: FcPatternAdd.3
-Only in fontconfig-2.2.0/doc: FcPatternAddWeak.3
-Only in fontconfig-2.2.0/doc: FcPatternBuild.3
-Only in fontconfig-2.2.0/doc: FcPatternCreate.3
-Only in fontconfig-2.2.0/doc: FcPatternDel.3
-Only in fontconfig-2.2.0/doc: FcPatternDestroy.3
-Only in fontconfig-2.2.0/doc: FcPatternEqual.3
-Only in fontconfig-2.2.0/doc: FcPatternEqualSubset.3
-Only in fontconfig-2.2.0/doc: FcPatternGet-Type.3
-Only in fontconfig-2.2.0/doc: FcPatternGet.3
-Only in fontconfig-2.2.0/doc: FcPatternHash.3
-Only in fontconfig-2.2.0/doc: FcPatternPrint.3
-Only in fontconfig-2.2.0/doc: FcStrBasename.3
-Only in fontconfig-2.2.0/doc: FcStrCmpIgnoreCase.3
-Only in fontconfig-2.2.0/doc: FcStrCopy.3
-Only in fontconfig-2.2.0/doc: FcStrCopyFilename.3
-Only in fontconfig-2.2.0/doc: FcStrDirname.3
-Only in fontconfig-2.2.0/doc: FcStrListCreate.3
-Only in fontconfig-2.2.0/doc: FcStrListDone.3
-Only in fontconfig-2.2.0/doc: FcStrListNext.3
-Only in fontconfig-2.2.0/doc: FcStrSetAdd.3
-Only in fontconfig-2.2.0/doc: FcStrSetAddFilename.3
-Only in fontconfig-2.2.0/doc: FcStrSetCreate.3
-Only in fontconfig-2.2.0/doc: FcStrSetDel.3
-Only in fontconfig-2.2.0/doc: FcStrSetDestroy.3
-Only in fontconfig-2.2.0/doc: FcStrSetMember.3
-Only in fontconfig-2.2.0/doc: FcUcs4ToUtf8.3
-Only in fontconfig-2.2.0/doc: FcUtf16Len.3
-Only in fontconfig-2.2.0/doc: FcUtf16ToUcs4.3
-Only in fontconfig-2.2.0/doc: FcUtf8Len.3
-Only in fontconfig-2.2.0/doc: FcUtf8ToUcs4.3
-Only in fontconfig-2.2.0/doc: FcValueDestroy.3
-Only in fontconfig-2.2.0/doc: FcValueSave.3
-Only in fontconfig-2.2.0/doc: Makefile.in
-diff -ur -I '$Id' fontconfig-2.2.0/doc/fcpattern.fncs fontconfig/doc/fcpattern.fncs
---- fontconfig-2.2.0/doc/fcpattern.fncs	2003-03-07 09:51:14.000000000 +0100
-+++ fontconfig/doc/fcpattern.fncs	2003-04-23 06:09:56.000000000 +0200
-@@ -226,6 +226,7 @@
- @DESC@
- Builds a pattern using a list of objects, types and values.  Each
- value to be entered in the pattern is specified with three arguments:
-+</para>
- <orderedlist>
- <listitem><para>
- Object name, a string describing the property to be added.
-Only in fontconfig-2.2.0/doc: fontconfig-devel
-diff -ur -I '$Id' fontconfig-2.2.0/doc/fontconfig-devel.sgml fontconfig/doc/fontconfig-devel.sgml
---- fontconfig-2.2.0/doc/fontconfig-devel.sgml	2003-03-07 21:45:31.000000000 +0100
-+++ fontconfig/doc/fontconfig-devel.sgml	2003-04-23 06:09:56.000000000 +0200
-@@ -476,6 +476,7 @@
-     <para>
- These routines work with font files and directories, including font
- directory cache files.
-+    </para>
-     &fcfile;
-   </sect2>
-   <sect2><title>FcStrSet and FcStrList</title>
-Only in fontconfig-2.2.0/doc: fontconfig-devel.txt
-Only in fontconfig-2.2.0/doc: fontconfig-user.html
-Only in fontconfig-2.2.0/doc: fontconfig-user.txt
-Only in fontconfig-2.2.0/doc: fonts-conf.5
-diff -ur -I '$Id' fontconfig-2.2.0/doc/func.sgml fontconfig/doc/func.sgml
---- fontconfig-2.2.0/doc/func.sgml	2003-03-07 21:50:44.000000000 +0100
-+++ fontconfig/doc/func.sgml	2003-04-23 06:09:56.000000000 +0200
-@@ -76,6 +76,7 @@
- 	</funcprototype>
- @}PROTOTYPE@
- 	</funcsynopsis>
-+	</refsynopsisdiv>
- 	<refsect1><title>Description</title>
- 	    <para>
- @DESC@
-Only in fontconfig/fc-cache: .cvsignore
-Only in fontconfig/fc-cache: CVS
-Only in fontconfig-2.2.0/fc-cache: Makefile.in
-Only in fontconfig/fc-lang: .cvsignore
-Only in fontconfig/fc-lang: CVS
-Only in fontconfig-2.2.0/fc-lang: Makefile.in
-Only in fontconfig/fc-lang: fc-lang.man
-Only in fontconfig-2.2.0/fc-lang: fclang.h
-Only in fontconfig/fc-lang: iso639-1
-Only in fontconfig/fc-lang: iso639-2
-Only in fontconfig/fc-list: .cvsignore
-Only in fontconfig/fc-list: CVS
-Only in fontconfig-2.2.0/fc-list: Makefile.in
-Only in fontconfig/fontconfig: .cvsignore
-Only in fontconfig/fontconfig: CVS
-Only in fontconfig-2.2.0/fontconfig: Makefile.in
-Only in fontconfig-2.2.0: fontconfig.spec
-Only in fontconfig-2.2.0: install-sh
-Only in fontconfig-2.2.0: ltmain.sh
-Only in fontconfig-2.2.0: missing
-Only in fontconfig-2.2.0: mkinstalldirs
-Only in fontconfig/src: .cvsignore
-Only in fontconfig/src: CVS
-Only in fontconfig-2.2.0/src: Makefile.in
-diff -ur -I '$Id' fontconfig-2.2.0/src/fccfg.c fontconfig/src/fccfg.c
---- fontconfig-2.2.0/src/fccfg.c	2003-04-17 23:50:24.000000000 +0200
-+++ fontconfig/src/fccfg.c	2003-04-22 08:29:31.000000000 +0200
-@@ -1232,6 +1232,14 @@
- 		    !FcStrCmpIgnoreCase ((FcChar8 *) t->field, 
- 					 (FcChar8 *) e->field))
- 		{
-+		    /* 
-+		     * KLUDGE - the pattern may have been reallocated or
-+		     * things may have been inserted or deleted above
-+		     * this element by other edits.  Go back and find
-+		     * the element again
-+		     */
-+		    if (e != s->edit && st[i].elt)
-+			st[i].elt = FcPatternFindElt (p, t->field);
- 		    if (!st[i].elt)
- 			t = 0;
- 		    break;
-diff -ur -I '$Id' fontconfig-2.2.0/src/fcfreetype.c fontconfig/src/fcfreetype.c
---- fontconfig-2.2.0/src/fcfreetype.c	2003-04-20 05:35:58.000000000 +0200
-+++ fontconfig/src/fcfreetype.c	2003-04-30 17:18:02.000000000 +0200
-@@ -156,7 +156,7 @@
- } FcNoticeFoundries[] = {
-     { (const FcChar8*) "Bigelow",	(const FcChar8 *) "b&h" },
-     { (const FcChar8*) "Adobe",		(const FcChar8 *) "adobe" },
--    { (const FcChar8*) "Bitstream",	(const FcChar8 *) "bitsteam" },
-+    { (const FcChar8*) "Bitstream",	(const FcChar8 *) "bitstream" },
-     { (const FcChar8*) "Monotype",	(const FcChar8 *) "monotype" },
-     { (const FcChar8*) "Linotype",	(const FcChar8 *) "linotype" },
-     { (const FcChar8*) "LINOTYPE-HELL", (const FcChar8 *) "linotype" },
-@@ -769,10 +769,16 @@
- 		}
- 	}
-      
-+#if 0
-+	/* 
-+	 * Don't bother with italic_angle; FreeType already extracts that
-+	 * information for us and sticks it into style_flags
-+	 */
-         if (psfontinfo.italic_angle < 0) 
-             slant = FC_SLANT_ITALIC; 
-         else if (psfontinfo.italic_angle >= 0) 
-             slant = FC_SLANT_ROMAN; 
-+#endif
- 
-         if(!foundry)
-             foundry = FcNoticeFoundry(psfontinfo.notice);
-Only in fontconfig-2.2.0: stamp-h.in
-Only in fontconfig/test: .cvsignore
-Only in fontconfig/test: CVS
-Only in fontconfig-2.2.0/test: Makefile.in
diff --git a/media-libs/fontconfig/fontconfig-2.1-r1.ebuild b/media-libs/fontconfig/fontconfig-2.1-r1.ebuild
deleted file mode 100644
index deee3312bfcc..000000000000
--- a/media-libs/fontconfig/fontconfig-2.1-r1.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2004 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-r1.ebuild,v 1.20 2004/03/19 07:56:03 mr_bones_ Exp $
-
-inherit debug eutils
-
-S="${WORKDIR}/fcpackage.${PV/\./_}/fontconfig"
-DESCRIPTION="A library for configuring and customizing font access."
-HOMEPAGE="http://freedesktop.org/"
-SRC_URI="http://pdx.freedesktop.org/software/fontconfig/releases/fcpackage.${PV/\./_}.tar.gz"
-
-LICENSE="fontconfig"
-SLOT="1.0"
-KEYWORDS="x86 alpha ppc sparc mips hppa amd64"
-
-# 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}"
-
-	# Cvs update from XFree86 tree
-	epatch ${PPREFIX}-${PV}-cvs-update-20021221.patch
-
-	# Some patches from Redhat
-	epatch ${PPREFIX}-2.0-defaultconfig.patch
-	epatch ${PPREFIX}-${PV}-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}-${PV}-x11fontpath-date-configure-v2.patch
-	# fix font width bug with cjk fonts
-	epatch ${PPREFIX}-${PV}-fixedwidth.patch
-}
-
-src_compile() {
-	fc_setup
-
-	[ "${ARCH}" == "alpha" -a "${CC}" == "ccc" ] && \
-		die "Dont compile fontconfig with ccc, it doesnt work very well"
-
-	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-r2.ebuild b/media-libs/fontconfig/fontconfig-2.2.0-r2.ebuild
deleted file mode 100644
index 9c8c8a94247d..000000000000
--- a/media-libs/fontconfig/fontconfig-2.2.0-r2.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2004 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.15 2004/03/19 07:56:03 mr_bones_ Exp $
-
-inherit eutils
-
-DESCRIPTION="A library for configuring and customizing font access."
-HOMEPAGE="http://freedesktop.org/software/fontconfig/"
-SRC_URI="http://pdx.freedesktop.org/software/fontconfig/releases/${P}.tar.gz"
-
-IUSE="doc"
-LICENSE="fontconfig"
-SLOT="1.0"
-
-# Note about keywords here:
-# >=kde-base/kdebase-3.1.2 has a fix needed to work with fontconfig 2.2 and higher,
-# so don't mark this ebuild stable on archs where kde 3.1.2 is only ~.
-# this of course doesn't apply to archs where kde has no keywords at all :-)
-# -- danarmak@gentoo.org
-KEYWORDS="x86 ~alpha ~ppc ~sparc ~mips hppa "
-
-DEPEND=">=media-libs/freetype-2.1.4
-	>=dev-libs/expat-1.95.3
-	>=sys-apps/ed-0.2"
-
-MAKEOPTS="${MAKEOPTS} -j1"
-
-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 that break fontconfig
-	epatch ${PPREFIX}-2.2-blacklist.patch
-	# Remove the subpixel test from local.conf (#12757)
-	epatch ${PPREFIX}-2.2-remove_subpixel_test.patch
-	# Add some fixes from stable cvs <foser@gentoo.org>
-	epatch ${PPREFIX}-2.2.0-cvs_bugfixes.patch
-
-	# The date can be troublesome
-	mv configure configure.old
-	sed -e "s:\`date\`::" configure.old > configure
-	chmod +x configure
-}
-
-src_compile() {
-	[ "${ARCH}" == "alpha" -a "${CC}" == "ccc" ] && \
-		die "Dont compile fontconfig with ccc, it doesnt work very well"
-
-	econf --disable-docs \
-		--with-docdir=${D}/usr/share/doc/${PF} \
-		--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 \
-		docdir=${D}/usr/share/doc/${P} || 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.1.ebuild b/media-libs/fontconfig/fontconfig-2.2.1.ebuild
index c6790379e2c3..82f4b207cf6d 100644
--- a/media-libs/fontconfig/fontconfig-2.2.1.ebuild
+++ b/media-libs/fontconfig/fontconfig-2.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 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.1.ebuild,v 1.15 2004/04/17 07:16:52 lv Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/fontconfig/fontconfig-2.2.1.ebuild,v 1.16 2004/06/02 12:44:03 foser Exp $
 
 inherit eutils
 
@@ -102,6 +102,6 @@ pkg_postinst() {
 	then
 		echo
 		einfo "Creating font cache..."
-		HOME="/root" /usr/bin/fc-cache -f
+		HOME="/root" /usr/bin/fc-cache
 	fi
 }
diff --git a/media-libs/fontconfig/fontconfig-2.2.2.ebuild b/media-libs/fontconfig/fontconfig-2.2.2.ebuild
index f79acd6784a3..6e70de468b25 100644
--- a/media-libs/fontconfig/fontconfig-2.2.2.ebuild
+++ b/media-libs/fontconfig/fontconfig-2.2.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 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.2.ebuild,v 1.4 2004/04/28 22:41:11 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/fontconfig/fontconfig-2.2.2.ebuild,v 1.5 2004/06/02 12:44:03 foser Exp $
 
 inherit eutils
 
@@ -11,14 +11,14 @@ SRC_URI="http://freedesktop.org/~fontconfig/release/${P}.tar.gz"
 
 LICENSE="fontconfig"
 SLOT="1.0"
-KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha arm hppa amd64 ~ia64 ~ppc64"
+KEYWORDS="x86 ~ppc ~sparc ~mips ~alpha arm hppa amd64 ~ia64 ~ppc64"
 
 DEPEND=">=sys-apps/sed-4
 	>=media-libs/freetype-2.1.4
-	>=dev-libs/expat-1.95.3
-	>=sys-apps/ed-0.2"
+	>=dev-libs/expat-1.95.3"
 
 src_unpack() {
+
 	unpack ${A}
 	cd ${S}
 
@@ -42,7 +42,7 @@ src_compile() {
 		die "Dont compile fontconfig with ccc, it doesnt work very well"
 
 	# disable docs only disables docs generation (!)
-	econf  --disable-docs \
+	econf --disable-docs \
 		--with-docdir=${D}/usr/share/doc/${PF} \
 		--x-includes=/usr/X11R6/include \
 		--x-libraries=/usr/X11R6/lib \
@@ -92,6 +92,6 @@ pkg_postinst() {
 	then
 		echo
 		einfo "Creating font cache..."
-		HOME="/root" /usr/bin/fc-cache -f
+		HOME="/root" /usr/bin/fc-cache
 	fi
 }