Version bumped.

5 files changed, 132 insertions, 9 deletions

diff --git a/media-libs/fontconfig/ChangeLog b/media-libs/fontconfig/ChangeLog
index 8c2ac63899b0..08118305ef12 100644
--- a/media-libs/fontconfig/ChangeLog
+++ b/media-libs/fontconfig/ChangeLog
@@ -1,6 +1,11 @@
 # 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.44 2004/01/13 13:35:15 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/fontconfig/ChangeLog,v 1.45 2004/03/10 23:52:39 matsuu Exp $
+
+*fontconfig-2.2.2 (11 Mar 2004)
+
+  11 Mar 2004; <matsuu@gentoo.org> fontconfig-2.2.2.ebuild, metadata.xml:
+  Version bumped.
 
   13 Jan 2004; <gustavoz@gentoo.org> fontconfig-2.2.1.ebuild:
   marked stable on hppa
diff --git a/media-libs/fontconfig/Manifest b/media-libs/fontconfig/Manifest
index b36af57cd63b..d73c0b9c4d3d 100644
--- a/media-libs/fontconfig/Manifest
+++ b/media-libs/fontconfig/Manifest
@@ -1,19 +1,22 @@
-MD5 6840a8eff977d72fee162074950254d9 ChangeLog 7260
+MD5 62b1b847cafd6dd143d0e668e59f0b88 ChangeLog 7384
 MD5 b51367f97e8105456790865e8f6afe0b fontconfig-2.1-r1.ebuild 2674
 MD5 a9c7e9e12c57754a9669e08b6f491c09 fontconfig-2.2.0-r2.ebuild 3311
 MD5 8887536bff2f609d1672b27f2c5d3c85 fontconfig-2.2.1.ebuild 3157
+MD5 3e349310b446720d4e04addf8b915854 fontconfig-2.2.2.ebuild 3227
+MD5 ae7171ca850597a2455b8b10c72a8de1 metadata.xml 419
+MD5 fd11506a1969709b4d447084344006ba files/digest-fontconfig-2.1-r1 140
 MD5 82f9bbcca9f5c665c6610cbaace58579 files/digest-fontconfig-2.2.0-r2 145
 MD5 88bdeed6518b90c6230b5ea155936c8f files/digest-fontconfig-2.2.1 68
-MD5 fd11506a1969709b4d447084344006ba files/digest-fontconfig-2.1-r1 140
+MD5 d2b7ff87a89e51efb73ac1aaaa9a4957 files/digest-fontconfig-2.2.2 68
 MD5 b38e62e98fd1b99871a5929893cc5902 files/patch/fontconfig-0.0.1.020826.1330-blacklist.patch 1202
 MD5 02faf1cd55aa11892ede7560867d6ae4 files/patch/fontconfig-2.0-defaultconfig.patch 2491
-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 24a80846e464bda0f30e574bd5eaa502 files/patch/fontconfig-2.0-x11fontpath-date-configure.patch 865
-MD5 37e60cdff43bf3f04e9db8931e0d1f47 files/patch/fontconfig-2.1-slighthint.patch 2171
-MD5 8791cc317d1e601f2cff7218460fb5fc files/patch/fontconfig-2.1-x11fontpath-date-configure.patch 585
 MD5 a56fb55c5b144375a684c1626fe5c5db files/patch/fontconfig-2.1-cvs-update-20021221.patch 7727
-MD5 603a8531876d27be276f7325c12b71e8 files/patch/fontconfig-2.1-x11fontpath-date-configure-v2.patch 624
 MD5 4cf5fc54b6e6229ed6526ebc607d8379 files/patch/fontconfig-2.1-fixedwidth.patch 1681
-MD5 4b5453071b61ecef4bb530b0bca695e1 files/patch/fontconfig-2.2-local_fontdir-r1.patch 487
+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
diff --git a/media-libs/fontconfig/files/digest-fontconfig-2.2.2 b/media-libs/fontconfig/files/digest-fontconfig-2.2.2
new file mode 100644
index 000000000000..93b5870488cb
--- /dev/null
+++ b/media-libs/fontconfig/files/digest-fontconfig-2.2.2
@@ -0,0 +1 @@
+MD5 af6e9a8addfa89aa68d703d5eb004185 fontconfig-2.2.2.tar.gz 743895
diff --git a/media-libs/fontconfig/fontconfig-2.2.2.ebuild b/media-libs/fontconfig/fontconfig-2.2.2.ebuild
new file mode 100644
index 000000000000..dec8aebb68ac
--- /dev/null
+++ b/media-libs/fontconfig/fontconfig-2.2.2.ebuild
@@ -0,0 +1,108 @@
+# 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.1 2004/03/10 23:52:39 matsuu Exp $
+
+inherit eutils
+
+S=${WORKDIR}/${P}
+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"
+SRC_URI="http://freedesktop.org/~fontconfig/release/${P}.tar.gz"
+
+IUSE=""
+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 ~ia64 ~amd64 ~ppc64"
+
+DEPEND=">=sys-apps/sed-4
+	>=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 fontpaths (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
+
+	# The date can be troublesome
+	sed -i "s:\`date\`::" configure
+}
+
+src_compile() {
+
+	[ "${ARCH}" == "alpha" -a "${CC}" == "ccc" ] && \
+		die "Dont compile fontconfig with ccc, it doesnt work very well"
+
+	# disable docs only disables docs generation (!)
+	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
+	sed -i "s:fc-cache/fc-cache -f -v:sleep 0:" Makefile
+
+	emake || die
+
+	# remove Luxi TTF fonts from the list, the Type1 are much better
+	sed -i "s:<dir>/usr/X11R6/lib/X11/fonts/TTF</dir>::" 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/metadata.xml b/media-libs/fontconfig/metadata.xml
new file mode 100644
index 000000000000..c8e02c47d817
--- /dev/null
+++ b/media-libs/fontconfig/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>fonts</herd>
+<longdescription>Fontconfig is a font configuration and customization library, which does not depend on the X Window System. It is designed to locate fonts within the system and select them according to requirements specified by applications.</longdescription>
+</pkgmetadata>