Version bump.

Package-Manager: portage-2.2_rc7/cvs/Linux 2.6.22-ovz005 i686

4 files changed, 117 insertions, 12 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/Manifest b/media-fonts/dejavu/Manifest
index 7cd0e3b42253..d9e0d0208f54 100644
--- a/media-fonts/dejavu/Manifest
+++ b/media-fonts/dejavu/Manifest
@@ -1,13 +1,16 @@
 AUX 59-dejavu.conf 2744 RMD160 f15724522cdfff79b55e0daa8b82d24a02a320c3 SHA1 f499928bbcf015adcd5ceb8713ae9864cac446a0 SHA256 72a9605e41161c7f0e0e77f8ce02ed16eb666ec457693c58334f5e67b12468ff
 DIST dejavu-fonts-2.25.tar.bz2 9072868 RMD160 3f7e68a1df8268b533691efce2903df9c0b4bf43 SHA1 22a017f4668e357827bad3f5c2501331097998f8 SHA256 1fab57e85db108a3a76d48775542b34aa72d1acd204ab3bf40fbe08e95272fae
+DIST dejavu-fonts-2.26.tar.bz2 9151369 RMD160 bb4ef37ab9f70bd8937d0df35b88750245b47204 SHA1 db7577739d3e25a1cd828337f2a5873747007919 SHA256 989993e7095a91e02f3add12405b3aad1ce146a307ffebdb776b926f6b5ee03f
 DIST dejavu-fonts-ttf-2.23.tar.bz2 4078825 RMD160 f3b50db3dd8983c05edf87681ef66dee6e6b69b4 SHA1 c539aaba1f38d337a39474822165b1f4eb28bce7 SHA256 243642a1c3f4b6fd00125f5772ac5c8e4d0bb6586f5abb05829ead4b83ad5233
 DIST dejavu-fonts-ttf-2.24.tar.bz2 3680260 RMD160 86701170d5aaf5d7fd3c66692e0e2d79ee4d9d10 SHA1 515bcef5c1d831a523d7d5a57363ad68de7c3275 SHA256 0f42b12ad2537ea32977809585fd066157394efc35ff5ddf5abb5f47411bd18d
 DIST dejavu-fonts-ttf-2.25.tar.bz2 4008501 RMD160 69a7697e173b8cf0cdfea0785124a5b2a7f10a59 SHA1 71a390224dfb95e02dfb32b6dc2fd9c5fb642350 SHA256 b5f635000e90b8fa3bc692bb2793cd275f189153f73e87b1f31d94764bff48bd
+DIST dejavu-fonts-ttf-2.26.tar.bz2 4156753 RMD160 cd32890a0cfcb349cce2ae59d3c1ad71eb92e18d SHA1 fba795290b86943c6511c193e9b210317ad4939f SHA256 b68a92d74b0639ece692f5444978b836560117732a7dec4db3e238678e9e912f
 DIST dejavu-ttf-2.21.tar.bz2 3568331 RMD160 c6f35bb8ec3b9949664c9ebe63bc58e5e0f693fe SHA1 5f3d3362cf4e6fc269f9d429ab9d25d095e8af48 SHA256 ee27f4d4d3675f6e25d1c37b5d87710f6292ad5dcb9992b6ea04736bb86648ae
 EBUILD dejavu-2.21.ebuild 749 RMD160 b8fb59e9a1966029981ce7fcbb7fb589ca4b5d47 SHA1 99fca56112c5359e8405e4b0a05e9e170ffdbc18 SHA256 7fc1fd7793844938e6c61c43c66a8ba63d0f15c22996b1791b7b99993359dba9
 EBUILD dejavu-2.23.ebuild 1750 RMD160 d1f7a5b3dbe215cf86bd0c73bd21619dec1b25c1 SHA1 9ac40fc487fcd3cb5b7f674808bab52b1e5be951 SHA256 4d2049fc3a95f6ded8fd316745d97b7867a76f375bfbe2590d1b974ddc2adcc7
 EBUILD dejavu-2.24.ebuild 1750 RMD160 78bb85eefac87bd03590830806efd9b96a7e171f SHA1 a923a44a66e7b4837cfca11d762f6f267c6ceabe SHA256 4dae29f7119898a4782b926ce35bac7046a8a023a8ad23a12dbaf5352415ba87
 EBUILD dejavu-2.25-r1.ebuild 2497 RMD160 bebebbf158fbbbc9c1daa01ef33ccf85702a43ff SHA1 6a2279f5ac639a2493348eba5bcfd5e1b3ab0394 SHA256 dca18d9ee54363ed1f735baec376903007953136237e2c8f4978103a57511e58
 EBUILD dejavu-2.25.ebuild 1747 RMD160 ae9de3a7c55dc830cda8425a91bf5f4b81d9909b SHA1 4d3ca900517a770c89ba6d79ec92294db3771f67 SHA256 d5765fb676f8a40d524c57925e945daa3c423658cd347ce9c9c21bed8e194c3f
-MISC ChangeLog 14382 RMD160 df6d4e30375f79bebfad540e34541c03f3ee139b SHA1 091a0c72d69bea512ea4266bb8a2279d8b5b8982 SHA256 cde8d8005728d8cba2fe2c7ce6305d325e8394816c64e4ab3b293b6666c8ee28
-MISC metadata.xml 667 RMD160 ee11e9c2b012997895cf7a6317471ec6dfef477a SHA1 26a8e88cc43c539c3d098df093ae38eb6538a157 SHA256 5e827b10d0e12ca43ee49421a814f68b4e2b37ab329c2510046b6d0531ed429c
+EBUILD dejavu-2.26.ebuild 2489 RMD160 6e05b077c93a986c68e48f5d77d47238c31e24e8 SHA1 c1dc423d2f03e9128dbab9746ee0c6e0605f1372 SHA256 be93017953190c6b9cd7695a0e8e5eb4e17ee4a49446aaa16ed2166164036fe7
+MISC ChangeLog 14587 RMD160 5dbacdc1a0bc10bf402c65a5bd37bfe5bc64c2ab SHA1 850ae17cb99f461c01ad01a3c55769caa9464363 SHA256 6dc44daca8a2a728b60a80349685bc76251628a7f8b78e89186bf9d19a799e4d
+MISC metadata.xml 673 RMD160 285edf855d06ca2c4b715e9ae81c4f67db465f91 SHA1 459437c1c8edeb712f50a59e8345f54d0b9dd4df SHA256 6af80a06cf499d61f933d7bca341e7bf8aa2bcbf68b92060b90be150b223c740
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>