(#164196) Clean out vulnerable ebuilds.

Package-Manager: portage-2.1.2-r4

11 files changed, 11 insertions, 297 deletions

diff --git a/x11-libs/libXfont/ChangeLog b/x11-libs/libXfont/ChangeLog
index 8c0fec825e09..f09b975c51c2 100644
--- a/x11-libs/libXfont/ChangeLog
+++ b/x11-libs/libXfont/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-libs/libXfont
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXfont/ChangeLog,v 1.56 2007/01/28 20:51:28 eroyf Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXfont/ChangeLog,v 1.57 2007/01/28 21:05:32 dberkholz Exp $
+
+  28 Jan 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+  -files/1.2.0-pcfread-git.diff, -libXfont-1.1.0-r1.ebuild,
+  -libXfont-1.2.0.ebuild, -libXfont-1.2.0-r1.ebuild,
+  -libXfont-1.2.0-r2.ebuild:
+  (#164196) Clean out vulnerable ebuilds.
 
   28 Jan 2007; Alexander H. Færøy <eroyf@gentoo.org>
   libXfont-1.2.2.ebuild:
diff --git a/x11-libs/libXfont/Manifest b/x11-libs/libXfont/Manifest
index 38e2aaa9a438..c86a8f8900f7 100644
--- a/x11-libs/libXfont/Manifest
+++ b/x11-libs/libXfont/Manifest
@@ -1,31 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX 1.2.0-pcfread-git.diff 4121 RMD160 fde1d622558a1ef0c050f764e54e109d2afbe36b SHA1 35c8d3685e971f0e439356298f740631f7e13fc3 SHA256 d84d9176d9727553435919782eb54efdc3319bcafbecfa95acde91f546c9e7fc
-MD5 1743c6e18836c1b00c85fe7b730155f0 files/1.2.0-pcfread-git.diff 4121
-RMD160 fde1d622558a1ef0c050f764e54e109d2afbe36b files/1.2.0-pcfread-git.diff 4121
-SHA256 d84d9176d9727553435919782eb54efdc3319bcafbecfa95acde91f546c9e7fc files/1.2.0-pcfread-git.diff 4121
-DIST libXfont-1.1.0.tar.bz2 591235 RMD160 36f8180891623d362379b77eb24a18a45a1e9b2e SHA1 0f09897deed6c07c56064f9d3e5b9fad7840bb54 SHA256 30bafca0519ed511c037d2b46e062bdf5088f4741a5a66f6ec39c77640a44380
-DIST libXfont-1.2.0.tar.bz2 591129 RMD160 8faaeb2514390fe2f17534c27a5ad20e2f177ff0 SHA1 c17aa459c105a9aa57a88c8d4e2c4bee85e99d99 SHA256 130d6991971a10ba8b54f52848bcb00cbb7b4229eb839f88500972e11fecf8f0
 DIST libXfont-1.2.2.tar.bz2 597652 RMD160 dacca74fe5cd882bcd6cceac4963f8cd8b4938d6 SHA1 87493c319e1f4b79de7154dd6e2de5baadce3465 SHA256 fb2f8c2ec321b4e38a65df4eaabffa1192ed8e19408e81be20cdcfc3e98b7487
 DIST libXfont-1.2.6.tar.bz2 582191 RMD160 2bf77e7c9bdb5aa0aa67e3ee2d05f3cf79722646 SHA1 db1e027f15a92192fd5c20ec000eea02a8bf7705 SHA256 9337670709697046e5071d028fb0c72e0e8b01b6890e952b8bd1021d7cd4fe9a
 DIST libXfont-1.2.7.tar.bz2 573915 RMD160 33e2688d1e3490d8b588ca2304b3d4068568dcae SHA1 60deba746e544785ca05c7c68ccfbd5d71370a29 SHA256 2f8c004c0b914d460e6fd2b48d8b425cf4778d415467fc1f1d938b200462d18b
-EBUILD libXfont-1.1.0-r1.ebuild 902 RMD160 eea54a0b30b51824103ad3ae6b35991af677c80b SHA1 770a7a8b71ca0b306a1410bc9bdd763c0835a0b8 SHA256 179addae8f78f46359def09c422653d7a03ccfc64cbb00b67119f6ec050aa7dc
-MD5 9f23cdfa9b7b822e715b9aa38e04fb24 libXfont-1.1.0-r1.ebuild 902
-RMD160 eea54a0b30b51824103ad3ae6b35991af677c80b libXfont-1.1.0-r1.ebuild 902
-SHA256 179addae8f78f46359def09c422653d7a03ccfc64cbb00b67119f6ec050aa7dc libXfont-1.1.0-r1.ebuild 902
-EBUILD libXfont-1.2.0-r1.ebuild 948 RMD160 124862fab6a41c3d101e3e0c9d43d11c42b4ac17 SHA1 73a6d4a03174789629f1a1e74e4f322c638edd54 SHA256 11c40f2f9d4bb90c27c2f8f0a7168cf63b94f94f3f9aef7b6b76954a1973c9d4
-MD5 88f2613fc38ebe4315e855c015ba4cab libXfont-1.2.0-r1.ebuild 948
-RMD160 124862fab6a41c3d101e3e0c9d43d11c42b4ac17 libXfont-1.2.0-r1.ebuild 948
-SHA256 11c40f2f9d4bb90c27c2f8f0a7168cf63b94f94f3f9aef7b6b76954a1973c9d4 libXfont-1.2.0-r1.ebuild 948
-EBUILD libXfont-1.2.0-r2.ebuild 935 RMD160 e51ebe0235f46fc4033703b40681a153bafbe3bc SHA1 f4b7de489c7ef66819a637893ba5792c43cd1024 SHA256 eee11459c9b024b40fa638c7179a8af48f9ca4a11abf200caf03f5d4c765dd65
-MD5 31ffe1ad64a94c33e8e8d096794f6c7f libXfont-1.2.0-r2.ebuild 935
-RMD160 e51ebe0235f46fc4033703b40681a153bafbe3bc libXfont-1.2.0-r2.ebuild 935
-SHA256 eee11459c9b024b40fa638c7179a8af48f9ca4a11abf200caf03f5d4c765dd65 libXfont-1.2.0-r2.ebuild 935
-EBUILD libXfont-1.2.0.ebuild 915 RMD160 914ba988fc2bb42620ca73954e164a555d48289a SHA1 b2d2d31c569d8ab914cfcdda002c134fe0aa1ca3 SHA256 53b099f195925021e5e4a18d45661cee8ca8105d7eb58eb49e10ee281b4a1063
-MD5 820d77065b04a59638a49e776b6e1ff4 libXfont-1.2.0.ebuild 915
-RMD160 914ba988fc2bb42620ca73954e164a555d48289a libXfont-1.2.0.ebuild 915
-SHA256 53b099f195925021e5e4a18d45661cee8ca8105d7eb58eb49e10ee281b4a1063 libXfont-1.2.0.ebuild 915
 EBUILD libXfont-1.2.2.ebuild 884 RMD160 825852d3660deaa07a0194c4188e9c62ae2a07e4 SHA1 760ea4b2b5b9da7c2003521d4af5ad42264c6c5f SHA256 2319390f0c91570423f72cc3473ed7b627daa4bece927de1091ff5850d1c87ea
 MD5 cd7739e76fa0fc6e379c6b693005a490 libXfont-1.2.2.ebuild 884
 RMD160 825852d3660deaa07a0194c4188e9c62ae2a07e4 libXfont-1.2.2.ebuild 884
@@ -38,26 +13,14 @@ EBUILD libXfont-1.2.7.ebuild 901 RMD160 93fcfb7aeae0803d3fa8653cf3bec81208f0604b
 MD5 c6c01138e709f2542388160f56719536 libXfont-1.2.7.ebuild 901
 RMD160 93fcfb7aeae0803d3fa8653cf3bec81208f0604b libXfont-1.2.7.ebuild 901
 SHA256 5c802d24096c6950b162cdc3d6e3bd8f289dd67baec2d5c0589d2cce6aad412c libXfont-1.2.7.ebuild 901
-MISC ChangeLog 8545 RMD160 4a93562b32d09556373aab410d04fc1888eb1414 SHA1 ad3e78f065c3399226ff1d7985731cc815d46358 SHA256 ea4c413f1c316a4ec72d5a9e34b147fddf252488a5d81b74ae73a6afc3ded24e
-MD5 42b08c02a7d90a03093345a2beebc551 ChangeLog 8545
-RMD160 4a93562b32d09556373aab410d04fc1888eb1414 ChangeLog 8545
-SHA256 ea4c413f1c316a4ec72d5a9e34b147fddf252488a5d81b74ae73a6afc3ded24e ChangeLog 8545
+MISC ChangeLog 8789 RMD160 b8b19a236f7e9c00692e8ca42969d95495d89f54 SHA1 133013e6bf2e9c2a895db59bb7aae5a77e750676 SHA256 510e08d61820fc18e53ed36bd5debdc5abb1906d5b0aa9515b741d90ffb03d7a
+MD5 a6a1c85a9a7dffd9e6609b14bd629f76 ChangeLog 8789
+RMD160 b8b19a236f7e9c00692e8ca42969d95495d89f54 ChangeLog 8789
+SHA256 510e08d61820fc18e53ed36bd5debdc5abb1906d5b0aa9515b741d90ffb03d7a ChangeLog 8789
 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
 MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 metadata.xml 156
 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055 metadata.xml 156
-MD5 0d99eb98c9d5b0b01807f16398b8eafe files/digest-libXfont-1.1.0-r1 247
-RMD160 70a8697fb3a080deeaee3642fe9ae69e70425ba6 files/digest-libXfont-1.1.0-r1 247
-SHA256 82746534d08b62dc1426776cc68da555947432b41cb26eaecf8e9c0c9a9548e2 files/digest-libXfont-1.1.0-r1 247
-MD5 230a15d6c7296813bf64f23b0fcaee5a files/digest-libXfont-1.2.0 247
-RMD160 63d31524e68f5d1017fe670912078aa255f51dc1 files/digest-libXfont-1.2.0 247
-SHA256 62a426754e12d456489adfe87a89528b2807acdca6ac174e6208e35b21e33766 files/digest-libXfont-1.2.0 247
-MD5 230a15d6c7296813bf64f23b0fcaee5a files/digest-libXfont-1.2.0-r1 247
-RMD160 63d31524e68f5d1017fe670912078aa255f51dc1 files/digest-libXfont-1.2.0-r1 247
-SHA256 62a426754e12d456489adfe87a89528b2807acdca6ac174e6208e35b21e33766 files/digest-libXfont-1.2.0-r1 247
-MD5 230a15d6c7296813bf64f23b0fcaee5a files/digest-libXfont-1.2.0-r2 247
-RMD160 63d31524e68f5d1017fe670912078aa255f51dc1 files/digest-libXfont-1.2.0-r2 247
-SHA256 62a426754e12d456489adfe87a89528b2807acdca6ac174e6208e35b21e33766 files/digest-libXfont-1.2.0-r2 247
 MD5 8c84f32500abfd3298b1e59586273dc8 files/digest-libXfont-1.2.2 247
 RMD160 48f204bb2e1f54eb46948db9b05bf74321eb4c56 files/digest-libXfont-1.2.2 247
 SHA256 518a7a98a5bd5a481a5db86b4facd7864aa7c71674b1c8fb6eb5808d54e0a8d0 files/digest-libXfont-1.2.2 247
@@ -67,10 +30,3 @@ SHA256 aa6690162cf79b9add5f74998160876999f3c0092a70326a5eabc79b4cba3265 files/di
 MD5 2d518c39f448c545c6dcb091a59bfe1b files/digest-libXfont-1.2.7 247
 RMD160 fd70eb958eabf7e7e9f02da63481015046594cd9 files/digest-libXfont-1.2.7 247
 SHA256 0edd43f442689799d119592a55940936869c4e0b62e29d71f47febd4fb673059 files/digest-libXfont-1.2.7 247
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.1 (GNU/Linux)
-
-iD8DBQFFvQy16Xxn2nLwtdQRAjHqAKCBDMf0RAf4wHLyIpR1W77d78fX+ACeMBsN
-hV2SjGC8JUTIA7ncP5xtUmM=
-=8fff
------END PGP SIGNATURE-----
diff --git a/x11-libs/libXfont/files/1.2.0-pcfread-git.diff b/x11-libs/libXfont/files/1.2.0-pcfread-git.diff
deleted file mode 100644
index 50131fd8055a..000000000000
--- a/x11-libs/libXfont/files/1.2.0-pcfread-git.diff
+++ /dev/null
@@ -1,103 +0,0 @@
-diff --git a/src/bitmap/pcfread.c b/src/bitmap/pcfread.c
-index dd76868..6210f18 100644
---- a/src/bitmap/pcfread.c
-+++ b/src/bitmap/pcfread.c
-@@ -45,6 +45,7 @@ #define   MAX(a,b)    (((a)>(b)) ? a : b
- #endif
- 
- #include <stdarg.h>
-+#include <stdint.h>
- 
- void
- pcfError(const char* message, ...)
-@@ -133,6 +134,10 @@ pcfReadTOC(FontFilePtr file, int *countp
- 	return (PCFTablePtr) NULL;
-     count = pcfGetLSB32(file);
-     if (IS_EOF(file)) return (PCFTablePtr) NULL;
-+    if (count < 0 || count > INT32_MAX / sizeof(PCFTableRec)) {
-+	pcfError("pcfReadTOC(): invalid file format\n");
-+	return NULL;
-+    }
-     tables = (PCFTablePtr) xalloc(count * sizeof(PCFTableRec));
-     if (!tables) {
-       pcfError("pcfReadTOC(): Couldn't allocate tables (%d*%d)\n", count, sizeof(PCFTableRec));
-@@ -252,6 +257,10 @@ pcfGetProperties(FontInfoPtr pFontInfo, 
-     if (!PCF_FORMAT_MATCH(format, PCF_DEFAULT_FORMAT))
- 	goto Bail;
-     nprops = pcfGetINT32(file, format);
-+    if (nprops <= 0 || nprops > INT32_MAX / sizeof(FontPropRec)) {
-+	pcfError("pcfGetProperties(): invalid nprops value (%d)\n", nprops);
-+	goto Bail;
-+    }
-     if (IS_EOF(file)) goto Bail;
-     props = (FontPropPtr) xalloc(nprops * sizeof(FontPropRec));
-     if (!props) {
-@@ -267,6 +276,13 @@ pcfGetProperties(FontInfoPtr pFontInfo, 
- 	props[i].name = pcfGetINT32(file, format);
- 	isStringProp[i] = pcfGetINT8(file, format);
- 	props[i].value = pcfGetINT32(file, format);
-+	if (props[i].name < 0 
-+	    || (isStringProp[i] != 0 && isStringProp[i] != 1)
-+	    || (isStringProp[i] && props[i].value < 0)) {
-+	    pcfError("pcfGetProperties(): invalid file format %d %d %d\n",
-+		     props[i].name, isStringProp[i], props[i].value);
-+	    goto Bail;
-+	}
- 	if (IS_EOF(file)) goto Bail;
-     }
-     /* pad the property array */
-@@ -282,6 +298,7 @@ pcfGetProperties(FontInfoPtr pFontInfo, 
-     }
-     if (IS_EOF(file)) goto Bail;
-     string_size = pcfGetINT32(file, format);
-+    if (string_size < 0) goto Bail;
-     if (IS_EOF(file)) goto Bail;
-     strings = (char *) xalloc(string_size);
-     if (!strings) {
-@@ -422,6 +439,10 @@ pcfReadFont(FontPtr pFont, FontFilePtr f
-     else
- 	nmetrics = pcfGetINT16(file, format);
-     if (IS_EOF(file)) goto Bail;
-+    if (nmetrics < 0 || nmetrics > INT32_MAX / sizeof(CharInfoRec)) {
-+	pcfError("pcfReadFont(): invalid file format\n");
-+	goto Bail;
-+    }
-     metrics = (CharInfoPtr) xalloc(nmetrics * sizeof(CharInfoRec));
-     if (!metrics) {
-       pcfError("pcfReadFont(): Couldn't allocate metrics (%d*%d)\n", nmetrics, sizeof(CharInfoRec));
-@@ -447,7 +468,7 @@ pcfReadFont(FontPtr pFont, FontFilePtr f
-     nbitmaps = pcfGetINT32(file, format);
-     if (nbitmaps != nmetrics || IS_EOF(file))
- 	goto Bail;
--
-+    /* nmetrics is alreadt ok, so nbitmap also is */
-     offsets = (CARD32 *) xalloc(nbitmaps * sizeof(CARD32));
-     if (!offsets) {
-       pcfError("pcfReadFont(): Couldn't allocate offsets (%d*%d)\n", nbitmaps, sizeof(CARD32));
-@@ -461,6 +482,7 @@ pcfReadFont(FontPtr pFont, FontFilePtr f
-     for (i = 0; i < GLYPHPADOPTIONS; i++) {
- 	bitmapSizes[i] = pcfGetINT32(file, format);
- 	if (IS_EOF(file)) goto Bail;
-+	if (bitmapSizes[i] < 0) goto Bail;
-     }
-     
-     sizebitmaps = bitmapSizes[PCF_GLYPH_PAD_INDEX(format)];
-@@ -536,6 +558,7 @@ pcfReadFont(FontPtr pFont, FontFilePtr f
- 	if (IS_EOF(file)) goto Bail;
- 	if (nink_metrics != nmetrics)
- 	    goto Bail;
-+	/* nmetrics already checked */
- 	ink_metrics = (xCharInfo *) xalloc(nink_metrics * sizeof(xCharInfo));
-       if (!ink_metrics) {
-           pcfError("pcfReadFont(): Couldn't allocate ink_metrics (%d*%d)\n", nink_metrics, sizeof(xCharInfo));       
-@@ -809,6 +832,10 @@ pmfReadFont(FontPtr pFont, FontFilePtr f
-     else
- 	nmetrics = pcfGetINT16(file, format);
-     if (IS_EOF(file)) goto Bail;
-+    if (nmetrics < 0 || nmetrics > INT32_MAX / sizeof(CharInfoRec)) {
-+	pcfError("pmfReadFont(): invalid file format\n");
-+	goto Bail;
-+    }
-     metrics = (CharInfoPtr) xalloc(nmetrics * sizeof(CharInfoRec));
-     if (!metrics) {
-       pcfError("pmfReadFont(): Couldn't allocate metrics (%d*%d)\n", nmetrics, sizeof(CharInfoRec));
diff --git a/x11-libs/libXfont/files/digest-libXfont-1.1.0-r1 b/x11-libs/libXfont/files/digest-libXfont-1.1.0-r1
deleted file mode 100644
index b83bf76b273f..000000000000
--- a/x11-libs/libXfont/files/digest-libXfont-1.1.0-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 d40f0da6cb2b3017ec0f5c44d5dc9821 libXfont-1.1.0.tar.bz2 591235
-RMD160 36f8180891623d362379b77eb24a18a45a1e9b2e libXfont-1.1.0.tar.bz2 591235
-SHA256 30bafca0519ed511c037d2b46e062bdf5088f4741a5a66f6ec39c77640a44380 libXfont-1.1.0.tar.bz2 591235
diff --git a/x11-libs/libXfont/files/digest-libXfont-1.2.0 b/x11-libs/libXfont/files/digest-libXfont-1.2.0
deleted file mode 100644
index 76e060720c53..000000000000
--- a/x11-libs/libXfont/files/digest-libXfont-1.2.0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 038315ade283d8da92422baebac553a2 libXfont-1.2.0.tar.bz2 591129
-RMD160 8faaeb2514390fe2f17534c27a5ad20e2f177ff0 libXfont-1.2.0.tar.bz2 591129
-SHA256 130d6991971a10ba8b54f52848bcb00cbb7b4229eb839f88500972e11fecf8f0 libXfont-1.2.0.tar.bz2 591129
diff --git a/x11-libs/libXfont/files/digest-libXfont-1.2.0-r1 b/x11-libs/libXfont/files/digest-libXfont-1.2.0-r1
deleted file mode 100644
index 76e060720c53..000000000000
--- a/x11-libs/libXfont/files/digest-libXfont-1.2.0-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 038315ade283d8da92422baebac553a2 libXfont-1.2.0.tar.bz2 591129
-RMD160 8faaeb2514390fe2f17534c27a5ad20e2f177ff0 libXfont-1.2.0.tar.bz2 591129
-SHA256 130d6991971a10ba8b54f52848bcb00cbb7b4229eb839f88500972e11fecf8f0 libXfont-1.2.0.tar.bz2 591129
diff --git a/x11-libs/libXfont/files/digest-libXfont-1.2.0-r2 b/x11-libs/libXfont/files/digest-libXfont-1.2.0-r2
deleted file mode 100644
index 76e060720c53..000000000000
--- a/x11-libs/libXfont/files/digest-libXfont-1.2.0-r2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 038315ade283d8da92422baebac553a2 libXfont-1.2.0.tar.bz2 591129
-RMD160 8faaeb2514390fe2f17534c27a5ad20e2f177ff0 libXfont-1.2.0.tar.bz2 591129
-SHA256 130d6991971a10ba8b54f52848bcb00cbb7b4229eb839f88500972e11fecf8f0 libXfont-1.2.0.tar.bz2 591129
diff --git a/x11-libs/libXfont/libXfont-1.1.0-r1.ebuild b/x11-libs/libXfont/libXfont-1.1.0-r1.ebuild
deleted file mode 100644
index adb1d3cf4fed..000000000000
--- a/x11-libs/libXfont/libXfont-1.1.0-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXfont/libXfont-1.1.0-r1.ebuild,v 1.9 2006/08/06 16:42:45 vapier Exp $
-
-# Must be before x-modular eclass is inherited
-# SNAPSHOT="yes"
-
-inherit x-modular flag-o-matic
-
-DESCRIPTION="X.Org Xfont library"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE="ipv6"
-RDEPEND="x11-libs/xtrans
-	x11-libs/libfontenc
-	x11-proto/xproto
-	x11-proto/fontsproto
-	>=media-libs/freetype-2"
-DEPEND="${RDEPEND}
-	x11-proto/fontcacheproto"
-
-CONFIGURE_OPTIONS="$(use_enable ipv6)
-	--enable-type1
-	--with-encodingsdir=/usr/share/fonts/encodings"
-
-pkg_setup() {
-	# No such function yet
-	# x-modular_pkg_setup
-
-	# (#125465) Broken with Bdirect support
-	filter-flags -Wl,-Bdirect
-	filter-ldflags -Bdirect
-	filter-ldflags -Wl,-Bdirect
-}
diff --git a/x11-libs/libXfont/libXfont-1.2.0-r1.ebuild b/x11-libs/libXfont/libXfont-1.2.0-r1.ebuild
deleted file mode 100644
index a98ec74d717a..000000000000
--- a/x11-libs/libXfont/libXfont-1.2.0-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXfont/libXfont-1.2.0-r1.ebuild,v 1.9 2006/08/26 08:24:29 vapier Exp $
-
-# Must be before x-modular eclass is inherited
-# SNAPSHOT="yes"
-
-inherit x-modular flag-o-matic
-
-DESCRIPTION="X.Org Xfont library"
-KEYWORDS="alpha amd64 arm hppa ~ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE="ipv6"
-RDEPEND="x11-libs/xtrans
-	x11-libs/libfontenc
-	x11-proto/xproto
-	x11-proto/fontsproto
-	>=media-libs/freetype-2"
-DEPEND="${RDEPEND}
-	x11-proto/fontcacheproto"
-
-CONFIGURE_OPTIONS="$(use_enable ipv6)
-	--enable-type1
-	--with-encodingsdir=/usr/share/fonts/encodings"
-PATCHES="${FILESDIR}/${PV}-pcfread-git.diff"
-
-pkg_setup() {
-	# No such function yet
-	# x-modular_pkg_setup
-
-	# (#125465) Broken with Bdirect support
-	filter-flags -Wl,-Bdirect
-	filter-ldflags -Bdirect
-	filter-ldflags -Wl,-Bdirect
-}
diff --git a/x11-libs/libXfont/libXfont-1.2.0-r2.ebuild b/x11-libs/libXfont/libXfont-1.2.0-r2.ebuild
deleted file mode 100644
index fd9788bff559..000000000000
--- a/x11-libs/libXfont/libXfont-1.2.0-r2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXfont/libXfont-1.2.0-r2.ebuild,v 1.1 2006/09/11 09:51:16 dberkholz Exp $
-
-# Must be before x-modular eclass is inherited
-# SNAPSHOT="yes"
-
-inherit x-modular flag-o-matic
-
-DESCRIPTION="X.Org Xfont library"
-KEYWORDS="alpha amd64 arm hppa ~ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE="ipv6"
-RDEPEND="x11-libs/xtrans
-	x11-libs/libfontenc
-	x11-proto/xproto
-	x11-proto/fontsproto
-	>=media-libs/freetype-2"
-DEPEND="${RDEPEND}
-	x11-proto/fontcacheproto"
-
-CONFIGURE_OPTIONS="$(use_enable ipv6)
-	--with-encodingsdir=/usr/share/fonts/encodings"
-PATCHES="${FILESDIR}/${PV}-pcfread-git.diff"
-
-pkg_setup() {
-	# No such function yet
-	# x-modular_pkg_setup
-
-	# (#125465) Broken with Bdirect support
-	filter-flags -Wl,-Bdirect
-	filter-ldflags -Bdirect
-	filter-ldflags -Wl,-Bdirect
-}
diff --git a/x11-libs/libXfont/libXfont-1.2.0.ebuild b/x11-libs/libXfont/libXfont-1.2.0.ebuild
deleted file mode 100644
index 874834e335fd..000000000000
--- a/x11-libs/libXfont/libXfont-1.2.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXfont/libXfont-1.2.0.ebuild,v 1.1 2006/07/08 17:31:25 dberkholz Exp $
-
-# Must be before x-modular eclass is inherited
-# SNAPSHOT="yes"
-
-inherit x-modular flag-o-matic
-
-DESCRIPTION="X.Org Xfont library"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="ipv6"
-RDEPEND="x11-libs/xtrans
-	x11-libs/libfontenc
-	x11-proto/xproto
-	x11-proto/fontsproto
-	>=media-libs/freetype-2"
-DEPEND="${RDEPEND}
-	x11-proto/fontcacheproto"
-
-CONFIGURE_OPTIONS="$(use_enable ipv6)
-	--enable-type1
-	--with-encodingsdir=/usr/share/fonts/encodings"
-
-pkg_setup() {
-	# No such function yet
-	# x-modular_pkg_setup
-
-	# (#125465) Broken with Bdirect support
-	filter-flags -Wl,-Bdirect
-	filter-ldflags -Bdirect
-	filter-ldflags -Wl,-Bdirect
-}