Version bump.

(Portage version: 2.2_rc7/cvs/Linux 2.6.22-ovz005 i686)

3 files changed, 112 insertions, 10 deletions

diff --git a/media-fonts/dejavu/ChangeLog b/media-fonts/dejavu/ChangeLog
index 36201c75b3d3..ab1a0e9153ea 100644
--- a/media-fonts/dejavu/ChangeLog
+++ b/media-fonts/dejavu/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for media-fonts/dejavu
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/dejavu/ChangeLog,v 1.119 2008/06/18 16:49:49 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/dejavu/ChangeLog,v 1.120 2008/08/12 09:35:15 pva Exp $
+
+  12 Aug 2008; Peter Volkov <pva@gentoo.org> metadata.xml,
+  +dejavu-2.26.ebuild:
+  Version bump.
+
+*dejavu-2.26 (12 Aug 2008)
+
+  12 Aug 2008; Peter Volkov <pva@gentoo.org> +dejavu-2.26.ebuild:
+  Version bump.
 
   18 Jun 2008; Peter Alfredsen <loki_val@gentoo.org> dejavu-2.25-r1.ebuild:
   Snapshot support
diff --git a/media-fonts/dejavu/dejavu-2.26.ebuild b/media-fonts/dejavu/dejavu-2.26.ebuild
new file mode 100644
index 000000000000..93ec283deaa2
--- /dev/null
+++ b/media-fonts/dejavu/dejavu-2.26.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/dejavu/dejavu-2.26.ebuild,v 1.1 2008/08/12 09:35:15 pva Exp $
+
+EAPI=1
+
+inherit font versionator
+
+DESCRIPTION="DejaVu fonts, bitstream vera with ISO-8859-2 characters"
+HOMEPAGE="http://dejavu.sourceforge.net/"
+LICENSE="BitstreamVera"
+
+# If you want to test snapshot from dejavu.sf.net/snapshots/
+# just rename ebuild to dejavu-2.22.20071220.2156.ebuild
+MY_PV=$(get_version_component_range 1-2)
+snapv=$(get_version_component_range 3-4)
+snapv=${snapv/./-}
+MY_BP=${PN}-fonts-ttf-${MY_PV}
+MY_SP=${PN}-fonts-${MY_PV}
+
+if [ -z ${snapv} ]
+then
+	SRC_URI="!fontforge? (  mirror://sourceforge/${PN}/${MY_BP}.tar.bz2 )
+		fontforge? ( mirror://sourceforge/${PN}/${MY_SP}.tar.bz2 )"
+else
+	MY_BP=${MY_BP}-${snapv}
+	MY_SP=${MY_SP}-${snapv}
+	SRC_URI="!fontforge? ( http://dejavu.sourceforge.net/snapshots/${MY_BP}.tar.bz2 )
+		fontforge? ( http://dejavu.sourceforge.net/snapshots/${MY_SP}.tar.bz2 )"
+fi
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+
+IUSE="fontforge"
+DEPEND="fontforge? ( x11-apps/mkfontscale
+		>=media-gfx/fontforge-20080429
+		x11-apps/mkfontdir
+		dev-perl/Font-TTF
+		app-i18n/unicode-data
+		>media-libs/fontconfig-2.6.0 )"
+RDEPEND=""
+
+if use fontforge
+then
+	S=${WORKDIR}/${MY_SP}
+	FONT_S=${S}/build
+else
+	S=${WORKDIR}/${MY_BP}
+	FONT_S=${S}/ttf
+fi
+
+FONT_CONF=( 	"${S}/fontconfig/20-unhint-small-dejavu.conf"
+		"${S}/fontconfig/20-unhint-small-dejavu-experimental.conf"
+		"${S}/fontconfig/57-dejavu.conf"
+		"${S}/fontconfig/61-dejavu-experimental.conf" )
+
+FONT_SUFFIX="ttf"
+DOCS="AUTHORS NEWS README status.txt langcover.txt unicover.txt"
+
+src_compile() {
+	if use fontforge
+	then
+		emake -j1 \
+			BLOCKS=/usr/share/unicode-data/Blocks.txt \
+			UNICODEDATA=/usr/share/unicode-data/UnicodeData.txt \
+			FC-LANG=/usr/share/fc-lang \
+			full sans \
+			|| die "emake failed"
+	fi
+}
+
+src_install() {
+	font_src_install
+	if use fontforge
+	then
+		dodoc build/*.txt
+	fi
+
+}
+
+pkg_postinst() {
+	font_pkg_postinst
+
+	ewarn
+	ewarn "Starting with ${PN}-2.22 font ligatures were re-imported in DejaVu"
+	ewarn "That means that you'll possibly encounter the infamous ligature bug"
+	ewarn "with pango-enabled Firefox (e.g. 'fi' and 'fl' will occasionally"
+	ewarn "overlap). This will be fixed in Firefox-3.x. Until this happens"
+	ewarn "either use Firefox without pango (MOZ_DISABLE_PANGO=1), or use"
+	ewarn "${PN}-2.21"
+	ewarn
+}
diff --git a/media-fonts/dejavu/metadata.xml b/media-fonts/dejavu/metadata.xml
index 2fda36b06762..03f0614f60c8 100644
--- a/media-fonts/dejavu/metadata.xml
+++ b/media-fonts/dejavu/metadata.xml
@@ -2,15 +2,15 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>fonts</herd>
-<maintainer>
- <email>pva@gentoo.org</email>
- <name>Peter Volkov</name>
-</maintainer>
+<use>
+	<flag name='fontforge'>USE fontforge to build fonts from source</flag>
+</use>
 <longdescription>
-The DejaVu fonts are a font family based on the Vera Fonts release 1.10. Its
-purpose is to provide a wider range of characters while maintaining the original
-look and feel through the process of collaborative development. Available
-families (Sans = sans serif, Mono = monospaced): DejaVu Sans, DejaVu Sans Mono,
-DejaVu Sans Condensed (experimental), DejaVu Serif, DejaVu Serif Condensed
+	The DejaVu fonts are a font family based on the Vera Fonts release 1.10. Its
+	purpose is to provide a wider range of characters while maintaining the
+	original look and feel through the process of collaborative development.
+	Available families (Sans = sans serif, Mono = monospaced): DejaVu Sans,
+	DejaVu Sans Mono, DejaVu Sans Condensed (experimental), DejaVu Serif, DejaVu
+	Serif Condensed
 </longdescription>
 </pkgmetadata>