Use the freetype interpreter for Type 1 fonts, as pretty much everyone else in the world does.

Package-Manager: portage-2.1.1_rc1-r7

4 files changed, 55 insertions, 15 deletions

diff --git a/x11-libs/libXfont/ChangeLog b/x11-libs/libXfont/ChangeLog
index 8031c533e047..0a78d2457fea 100644
--- a/x11-libs/libXfont/ChangeLog
+++ b/x11-libs/libXfont/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-libs/libXfont
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXfont/ChangeLog,v 1.48 2006/08/23 12:59:29 killerfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXfont/ChangeLog,v 1.49 2006/09/11 09:51:16 dberkholz Exp $
+
+*libXfont-1.2.0-r2 (11 Sep 2006)
+
+  11 Sep 2006; Donnie Berkholz <dberkholz@gentoo.org>;
+  +libXfont-1.2.0-r2.ebuild:
+  Use the freetype interpreter for Type 1 fonts, as pretty much everyone else
+  in the world does.
 
   23 Aug 2006; Rene Nussbaumer <killerfox@gentoo.org>
   libXfont-1.2.0-r1.ebuild:
diff --git a/x11-libs/libXfont/Manifest b/x11-libs/libXfont/Manifest
index 608ad3318285..61333900c583 100644
--- a/x11-libs/libXfont/Manifest
+++ b/x11-libs/libXfont/Manifest
@@ -1,6 +1,3 @@
------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
@@ -15,14 +12,18 @@ EBUILD libXfont-1.2.0-r1.ebuild 948 RMD160 124862fab6a41c3d101e3e0c9d43d11c42b4a
 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
-MISC ChangeLog 6953 RMD160 7a6adf006b6f8982319c4275cb6ff29fd16c17c7 SHA1 2c066f4c69832360c1f3951ade01b841c001bb86 SHA256 7ae5202baca14bed199a570d22db25cd5afad77aa583fbf1208076eaf8de536a
-MD5 174d5b2ba9480add5e4f49ef85418705 ChangeLog 6953
-RMD160 7a6adf006b6f8982319c4275cb6ff29fd16c17c7 ChangeLog 6953
-SHA256 7ae5202baca14bed199a570d22db25cd5afad77aa583fbf1208076eaf8de536a ChangeLog 6953
+MISC ChangeLog 7171 RMD160 60fbf66fd7ea6d35ba56d43f9d15c70ab34080bb SHA1 30eca23af148560842410391b2daba9973d45a7c SHA256 13c4a5c18f10b1e3e33bc8ccbe331904b2c3be07bcdd376b094339d910380593
+MD5 4def7d732bc25429f8d5ffd57290b6d9 ChangeLog 7171
+RMD160 60fbf66fd7ea6d35ba56d43f9d15c70ab34080bb ChangeLog 7171
+SHA256 13c4a5c18f10b1e3e33bc8ccbe331904b2c3be07bcdd376b094339d910380593 ChangeLog 7171
 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
 MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 metadata.xml 156
@@ -36,10 +37,6 @@ SHA256 62a426754e12d456489adfe87a89528b2807acdca6ac174e6208e35b21e33766 files/di
 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
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-
-iD8DBQFE8AWlamhnQswr0vIRAlu3AKC0TdyvbfZK6o6aOIqDlHWPw9IFXACfRTq3
-IELVmjZ/KPMNOHYPJ6UC5vw=
-=FRkE
------END PGP SIGNATURE-----
+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
diff --git a/x11-libs/libXfont/files/digest-libXfont-1.2.0-r2 b/x11-libs/libXfont/files/digest-libXfont-1.2.0-r2
new file mode 100644
index 000000000000..76e060720c53
--- /dev/null
+++ b/x11-libs/libXfont/files/digest-libXfont-1.2.0-r2
@@ -0,0 +1,3 @@
+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.2.0-r2.ebuild b/x11-libs/libXfont/libXfont-1.2.0-r2.ebuild
new file mode 100644
index 000000000000..fd9788bff559
--- /dev/null
+++ b/x11-libs/libXfont/libXfont-1.2.0-r2.ebuild
@@ -0,0 +1,33 @@
+# 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
+}