new release

4 files changed, 47 insertions, 38 deletions

diff --git a/media-libs/fontconfig/ChangeLog b/media-libs/fontconfig/ChangeLog
index 8d19dc936ea9..ffabbfff314e 100644
--- a/media-libs/fontconfig/ChangeLog
+++ b/media-libs/fontconfig/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/fontconfig
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/fontconfig/ChangeLog,v 1.52 2004/07/14 03:06:45 geoman Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/fontconfig/ChangeLog,v 1.53 2004/07/19 19:30:34 foser Exp $
+
+*fontconfig-2.2.3 (19 Jul 2004)
+
+  19 Jul 2004; foser <foser@gentoo.org> fontconfig-2.2.3.ebuild :
+  New release
 
   13 Jul 2004; Stephen P. Becker <geoman@gentoo.org> fontconfig-2.2.2.ebuild:
   Stable on mips - bug 56886
diff --git a/media-libs/fontconfig/files/digest-fontconfig-2.1-r1 b/media-libs/fontconfig/files/digest-fontconfig-2.1-r1
deleted file mode 100644
index dd8149a1c181..000000000000
--- a/media-libs/fontconfig/files/digest-fontconfig-2.1-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 2f2852c80924a9b5356c3037a471c1a1 fcpackage.2_1.tar.gz 544661
-MD5 447ec2f65da7aa027aab7c23f3eaa358 fontconfig-2.1-r1-gentoo.tar.bz2 5464
diff --git a/media-libs/fontconfig/files/digest-fontconfig-2.2.3 b/media-libs/fontconfig/files/digest-fontconfig-2.2.3
new file mode 100644
index 000000000000..c02daf6bae4e
--- /dev/null
+++ b/media-libs/fontconfig/files/digest-fontconfig-2.2.3
@@ -0,0 +1 @@
+MD5 2466a797d645cda5eb466080fdaec416 fontconfig-2.2.3.tar.gz 750035
diff --git a/media-libs/fontconfig/fontconfig-2.1-r1.ebuild b/media-libs/fontconfig/fontconfig-2.2.3.ebuild
index efce634c86dc..f4537945073f 100644
--- a/media-libs/fontconfig/fontconfig-2.1-r1.ebuild
+++ b/media-libs/fontconfig/fontconfig-2.2.3.ebuild
@@ -1,67 +1,71 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/fontconfig/fontconfig-2.1-r1.ebuild,v 1.24 2004/06/24 23:00:12 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/fontconfig/fontconfig-2.2.3.ebuild,v 1.1 2004/07/19 19:30:34 foser Exp $
 
-inherit debug eutils gcc
+inherit eutils
 
-S="${WORKDIR}/fcpackage.${PV/\./_}/fontconfig"
 DESCRIPTION="A library for configuring and customizing font access"
-HOMEPAGE="http://freedesktop.org/"
-SRC_URI="http://pdx.freedesktop.org/software/fontconfig/releases/fcpackage.${PV/\./_}.tar.gz"
+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"
 
 LICENSE="fontconfig"
 SLOT="1.0"
-KEYWORDS="x86 ppc sparc mips alpha hppa amd64"
+KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~arm ~hppa ~amd64 ~ia64 ~ppc64"
 IUSE=""
 
-# Seems like patches in freetype-2.1.2-r2 fixes bug #10028
-DEPEND=">=media-libs/freetype-2.1.2-r2
-	>=dev-libs/expat-1.95.3
-	>=sys-apps/ed-0.2"
+RDEPEND=">=media-libs/freetype-2.1.4
+	>=dev-libs/expat-1.95.3"
 
-fc_setup() {
-	# Do not use 'cc' to compile
-	export CC="$(gcc-getCC)"
-}
+DEPEND="${RDEPEND}
+	>=sys-apps/sed-4"
 
 src_unpack() {
-	unpack ${A}
 
+	unpack ${A}
 	cd ${S}
-	local PPREFIX="${FILESDIR}/patch/${PN}"
 
-	# Cvs update from XFree86 tree
-	epatch ${PPREFIX}-${PV}-cvs-update-20021221.patch
+	local PPREFIX="${FILESDIR}/patch/${PN}"
 
 	# Some patches from Redhat
-	epatch ${PPREFIX}-2.0-defaultconfig.patch
-	epatch ${PPREFIX}-${PV}-slighthint.patch
-	# Blacklist certain fonts that freetype can't handle
-	epatch ${PPREFIX}-0.0.1.020826.1330-blacklist.patch
-	# Fix config script to alway include X11 fontpath and remove date
-	epatch ${PPREFIX}-${PV}-x11fontpath-date-configure-v2.patch
-	# fix font width bug with cjk fonts
-	epatch ${PPREFIX}-${PV}-fixedwidth.patch
+	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() {
-	fc_setup
 
 	[ "${ARCH}" == "alpha" -a "${CC}" == "ccc" ] && \
 		die "Dont compile fontconfig with ccc, it doesnt work very well"
 
-	econf \
+	# disable docs only disables docs generation (!)
+	econf --disable-docs \
+		--with-docdir=/usr/share/doc/${PF} \
 		--x-includes=/usr/X11R6/include \
-		--x-libraries=/usr/X11R6/lib || die
+		--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 -j1 || 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
 
-	emake || die
 }
 
 src_install() {
-	fc_setup
 
-	einstall confdir=${D}/etc/fonts \
-		datadir=${D}/usr/share || die
+	make DESTDIR=${D} install || die
 
 	insinto /etc/fonts
 	doins ${S}/fonts.conf
@@ -76,6 +80,7 @@ src_install() {
 }
 
 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)
@@ -88,7 +93,7 @@ pkg_postinst() {
 	then
 		echo
 		einfo "Creating font cache..."
-		HOME="/root" /usr/bin/fc-cache -f
+		HOME="/root" /usr/bin/fc-cache
 	fi
-}
 
+}