fix for bug 11086

5 files changed, 115 insertions, 3 deletions

diff --git a/media-libs/fontconfig/ChangeLog b/media-libs/fontconfig/ChangeLog
index b15fd98bf884..c4de75bd8b10 100644
--- a/media-libs/fontconfig/ChangeLog
+++ b/media-libs/fontconfig/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/fontconfig
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/fontconfig/ChangeLog,v 1.7 2002/11/02 07:32:59 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/fontconfig/ChangeLog,v 1.8 2002/11/26 00:45:25 foser Exp $
+
+*fontconfig-2.0-r4 (26 Nov 2002)
+
+  26 Nov 2002; foser <foser@gentoo.org> fontconfig-2.0-r3.ebuild :
+  New patch to fix both date and x11 fontdir problem in bug #11086
 
 *fontconfig-2.0-r3 (31 Oct 2002)
 
diff --git a/media-libs/fontconfig/files/digest-fontconfig-2.0-r4 b/media-libs/fontconfig/files/digest-fontconfig-2.0-r4
new file mode 100644
index 000000000000..05efa21a9a47
--- /dev/null
+++ b/media-libs/fontconfig/files/digest-fontconfig-2.0-r4
@@ -0,0 +1 @@
+MD5 5ef5c58e501b0cb873ee2b2a04ed74e3 fcpackage.2_0.tar.gz 538159
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
new file mode 100644
index 000000000000..3684418231e6
--- /dev/null
+++ b/media-libs/fontconfig/files/patch/fontconfig-2.0-x11fontpath-date-configure.patch
@@ -0,0 +1,26 @@
+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/fontconfig-2.0-r3.ebuild b/media-libs/fontconfig/fontconfig-2.0-r3.ebuild
index 2bc30e349961..5e6a0e35b2ae 100644
--- a/media-libs/fontconfig/fontconfig-2.0-r3.ebuild
+++ b/media-libs/fontconfig/fontconfig-2.0-r3.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2002 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.1 2002/11/02 07:32:59 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/fontconfig/fontconfig-2.0-r3.ebuild,v 1.2 2002/11/26 00:45:25 foser Exp $
+
+inherit debug
 
 S="${WORKDIR}/fcpackage.${PV/\./_}/fontconfig"
 DESCRIPTION="A library for configuring and customizing font access."
@@ -38,7 +40,9 @@ src_unpack() {
 }
 
 src_compile() {
-	econf || die
+	econf \
+		--x-includes=/usr/X11R6/include \
+		--x-libraries=/usr/X11R6/lib || die
 	
 	emake || die
 }
diff --git a/media-libs/fontconfig/fontconfig-2.0-r4.ebuild b/media-libs/fontconfig/fontconfig-2.0-r4.ebuild
new file mode 100644
index 000000000000..0279eeaa363f
--- /dev/null
+++ b/media-libs/fontconfig/fontconfig-2.0-r4.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2002 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.1 2002/11/26 00:45:25 foser 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 ~sparc64"
+
+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
+	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
+	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..."
+		/usr/bin/fc-cache
+	fi
+}
+