Version bump. No differences from 2.5.93-r1.

Major changes since 2.5.0:

* Handle bitmap-only TTF files that do not have a GLYF table

* Ignore point size and DPI for bitmap (PCF) fonts.

* Add fantasy and cursive generic families

* Merge Fedora and Mandriva configuration options

* Build fixes for cross compile and Win32 platforms
(Portage version: 2.2_pre7-r1/cvs/Linux 2.6.25-gentoo-r3 Intel(R) Core(TM)2 Duo CPU T9300 @ 2.50GHz)

3 files changed, 20 insertions, 81 deletions

diff --git a/media-libs/fontconfig/ChangeLog b/media-libs/fontconfig/ChangeLog
index 87316e5af747..6e803376b5ab 100644
--- a/media-libs/fontconfig/ChangeLog
+++ b/media-libs/fontconfig/ChangeLog
@@ -1,6 +1,24 @@
 # ChangeLog for media-libs/fontconfig
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/fontconfig/ChangeLog,v 1.114 2008/06/01 19:48:01 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/fontconfig/ChangeLog,v 1.115 2008/06/03 04:51:40 dirtyepic Exp $
+
+*fontconfig-2.6.0 (03 Jun 2008)
+
+  03 Jun 2008; Ryan Hill <dirtyepic@gentoo.org> -fontconfig-2.5.92.ebuild,
+  -fontconfig-2.5.93.ebuild, +fontconfig-2.6.0.ebuild:
+  Version bump. No differences from 2.5.93-r1.
+
+  Major changes since 2.5.0:
+
+  * Handle bitmap-only TTF files that do not have a GLYF table
+
+  * Ignore point size and DPI for bitmap (PCF) fonts.
+
+  * Add fantasy and cursive generic families
+
+  * Merge Fedora and Mandriva configuration options
+
+  * Build fixes for cross compile and Win32 platforms
 
 *fontconfig-2.5.93-r1 (01 Jun 2008)
 
diff --git a/media-libs/fontconfig/fontconfig-2.5.92.ebuild b/media-libs/fontconfig/fontconfig-2.5.92.ebuild
deleted file mode 100644
index adc1bb40c15b..000000000000
--- a/media-libs/fontconfig/fontconfig-2.5.92.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/fontconfig/fontconfig-2.5.92.ebuild,v 1.1 2008/05/25 01:48:30 dirtyepic Exp $
-
-inherit eutils
-
-DESCRIPTION="A library for configuring and customizing font access"
-HOMEPAGE="http://fontconfig.org/"
-SRC_URI="http://fontconfig.org/release/${P}.tar.gz"
-
-LICENSE="fontconfig"
-SLOT="1.0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
-IUSE="doc xml"
-
-RDEPEND=">=media-libs/freetype-2.1.4
-	!xml? ( >=dev-libs/expat-1.95.3 )
-	xml? ( >=dev-libs/libxml2-2.6 )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	doc? ( app-text/docbook-sgml-utils )"
-PDEPEND="app-admin/eselect-fontconfig"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epunt_cxx #74077
-}
-
-src_compile() {
-	econf $(use_enable doc docs) \
-		--localstatedir=/var \
-		--with-docdir=/usr/share/doc/${PF} \
-		--with-default-fonts=/usr/share/fonts \
-		--with-add-fonts=/usr/local/share/fonts \
-		$(use_enable xml libxml2) \
-		|| die
-
-	emake || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-
-	insinto /etc/fonts
-	doins "${S}"/fonts.conf
-
-	doman $(find "${S}" -type f -name *.1 -print)
-	newman doc/fonts-conf.5 fonts.conf.5
-	dodoc doc/fontconfig-user.{txt,pdf}
-
-	if use doc; then
-		doman doc/Fc*.3
-		dohtml doc/fontconfig-devel.html doc
-		dodoc doc/fontconfig-devel.{txt,pdf}
-	fi
-
-	dodoc AUTHORS ChangeLog README
-
-	# 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)
-	echo 'CONFIG_PROTECT_MASK="/etc/fonts/fonts.conf"' > "${T}"/37fontconfig
-	doenvd "${T}"/37fontconfig
-}
-
-pkg_postinst() {
-	echo
-	ewarn "Please make fontconfig configuration changes in /etc/fonts/conf.d/"
-	ewarn "and NOT to /etc/fonts/fonts.conf, as it will be replaced!"
-	echo
-
-	if [[ ${ROOT} = / ]]; then
-		ebegin "Creating global font cache..."
-		/usr/bin/fc-cache -sr
-		eend $?
-	fi
-}
diff --git a/media-libs/fontconfig/fontconfig-2.5.93.ebuild b/media-libs/fontconfig/fontconfig-2.6.0.ebuild
index 73146f5f06fd..20e13f09b48a 100644
--- a/media-libs/fontconfig/fontconfig-2.5.93.ebuild
+++ b/media-libs/fontconfig/fontconfig-2.6.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/fontconfig/fontconfig-2.5.93.ebuild,v 1.2 2008/05/30 18:53:46 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/fontconfig/fontconfig-2.6.0.ebuild,v 1.1 2008/06/03 04:51:40 dirtyepic Exp $
 
 inherit eutils libtool