new version

4 files changed, 112 insertions, 1 deletions

diff --git a/media-libs/fontconfig/ChangeLog b/media-libs/fontconfig/ChangeLog
index 9c2424e972fb..e5c17e7ab345 100644
--- a/media-libs/fontconfig/ChangeLog
+++ b/media-libs/fontconfig/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/fontconfig
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/fontconfig/ChangeLog,v 1.26 2003/04/19 14:03:22 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/fontconfig/ChangeLog,v 1.27 2003/04/23 12:34:33 foser Exp $
+
+*fontconfig-2.2.0 (23 Apr 2003)
+
+  23 Apr 2003; foser <foser@gentoo.org> fontconfig-2.2.0.ebuild :
+  New version, added some more standard fontpaths on request (#19564)
 
 *fontconfig-2.1.94-r1 (18 Apr 2003)
 
diff --git a/media-libs/fontconfig/files/digest-fontconfig-2.2.0 b/media-libs/fontconfig/files/digest-fontconfig-2.2.0
new file mode 100644
index 000000000000..8660f2779997
--- /dev/null
+++ b/media-libs/fontconfig/files/digest-fontconfig-2.2.0
@@ -0,0 +1 @@
+MD5 cf0ce6c87e5d6362e9ebc8d94a45fdc4 fontconfig-2.2.0.tar.gz 612758
diff --git a/media-libs/fontconfig/files/patch/fontconfig-2.2-local_fontdir-r1.patch b/media-libs/fontconfig/files/patch/fontconfig-2.2-local_fontdir-r1.patch
new file mode 100644
index 000000000000..ee0219f0d279
--- /dev/null
+++ b/media-libs/fontconfig/files/patch/fontconfig-2.2-local_fontdir-r1.patch
@@ -0,0 +1,13 @@
+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,9 @@
+ 
+ 	<dir>@FC_DEFAULT_FONTS@</dir>
+ 	@FC_FONTPATH@
++	<dir>/usr/share/fonts</dir>
++	<dir>/usr/X11R6/lib/X11/fonts/75dpi</dir>
++	<dir>/usr/X11R6/lib/X11/fonts/100dpi</dir>
+ 	<dir>~/.fonts</dir>
+ 
+ <!--
diff --git a/media-libs/fontconfig/fontconfig-2.2.0.ebuild b/media-libs/fontconfig/fontconfig-2.2.0.ebuild
new file mode 100644
index 000000000000..ce8552d65cdd
--- /dev/null
+++ b/media-libs/fontconfig/fontconfig-2.2.0.ebuild
@@ -0,0 +1,92 @@
+# 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
+}
+