Version bump, bug #323323, thank Thilo Bangert for report. Drop old.

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

5 files changed, 45 insertions, 24 deletions

diff --git a/media-fonts/liberation-fonts/ChangeLog b/media-fonts/liberation-fonts/ChangeLog
index 3a15be98ee80..2cbc4bd6c1f7 100644
--- a/media-fonts/liberation-fonts/ChangeLog
+++ b/media-fonts/liberation-fonts/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-fonts/liberation-fonts
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/liberation-fonts/ChangeLog,v 1.5 2010/02/03 15:35:44 je_fro Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/liberation-fonts/ChangeLog,v 1.6 2010/06/11 20:28:07 pva Exp $
+
+*liberation-fonts-1.05 (11 Jun 2010)
+
+  11 Jun 2010; Peter Volkov <pva@gentoo.org> -liberation-fonts-1.03.ebuild,
+  +liberation-fonts-1.05.ebuild, metadata.xml:
+  Version bump, bug #323323, thank Thilo Bangert for report. Drop old.
 
   03 Feb 2010; Jeff Gardner <je_fro@gentoo.org>
   liberation-fonts-1.04.ebuild:
diff --git a/media-fonts/liberation-fonts/Manifest b/media-fonts/liberation-fonts/Manifest
index f293089ee167..2d582ed79a32 100644
--- a/media-fonts/liberation-fonts/Manifest
+++ b/media-fonts/liberation-fonts/Manifest
@@ -1,7 +1,8 @@
 AUX 60-liberation.conf 867 RMD160 484cc7aacc7d7f948866fbe28dcae5fe7c2c276e SHA1 c4e05b2bd070712b4252b2437bb83d741d9c9f55 SHA256 fbe4a9ddf44fb6a740261eaa90b65003b67ef8a9b5b975f7cbe90624a8f66f80
-DIST liberation-fonts-1.03.tar.gz 1165152 RMD160 1b467cf47aa83335eeddbf82015c59ac255f2f94 SHA1 0fbc31e27ea2f3fdd11093f625e48f6b68307e1c SHA256 25183100099d4b3795edb6cc47745cd3b9ac7de33a71ffe2690ed1bbd0b85d4c
 DIST liberation-fonts-1.04.tar.gz 1011820 RMD160 25fb4ec3b395ff028bc265fb79bbb42338e7051f SHA1 097882c92e3260742a3dc3bf033792120d8635a3 SHA256 0e0d0957c85b758561a3d4aef4ebcd2c39959e5328429d96ae106249d83531a1
-EBUILD liberation-fonts-1.03.ebuild 688 RMD160 23e7942cc86531967aa0c3801a3aaf169d877bdd SHA1 01abadcca7db51f02824461b96f6ca4d2b0f14af SHA256 48631a019a19ce4cd3b9374c1b02aafe8f25085daf6bad76b977d1b7e7439a63
+DIST liberation-fonts-1.05.tar.gz 2254706 RMD160 43fb3b59453f17b3e4c8c650605a03a08612b73a SHA1 ca2b74ae00e6dc8cefba6af5bc42495950196979 SHA256 b3edba850862e36484eae374edabd0cab428ca63626f997f3e830b78d36fb864
+DIST liberation-fonts-ttf-1.05.zip 1027612 RMD160 0c36c85234a4917c05affa8368ede07413524f22 SHA1 13a438f7279791108b2f957cebe02d734457b2f8 SHA256 ec6292f9ca9a3e9bb57c810cf1d7150c9cd14083eb0820119885c52820f78420
 EBUILD liberation-fonts-1.04.ebuild 683 RMD160 04d8ff4b0146fe6a9de7c7b4955e836a5f8634fa SHA1 f31d9f8fcf88fc3b17b28d35e1d24eface12078c SHA256 d7ddabab7889c59cc30b024477a5ca034da65589122fa1498cee79804af6f111
-MISC ChangeLog 2962 RMD160 9cba24efbdb1695fefb004e728ef34f29c8e6953 SHA1 b8b4d2fff699b3de281fa938e19a1efab797dd11 SHA256 f57fcc8d222b4ae04d7bc737dcc794e99b902d9a42daa37b35a335d84de6d9ec
-MISC metadata.xml 292 RMD160 8c8122f106f07d75cb493e7af7e38a8251c09bda SHA1 0b043a7e75f032b77ab92ada807fd8cbe5e5ce79 SHA256 13496c48345c409f7b1a3e0a8e18b6ef823762a45d5d47d8c3902244ad7a23cf
+EBUILD liberation-fonts-1.05.ebuild 908 RMD160 80e0037cfb6297d12bdca76b3abdf5ba9013166f SHA1 27212a5c9e927ee6d6037aabe250b675fe54a075 SHA256 11e452d34fff9804796c6386527409770ed77e2bdc3625fc56b467c62027467a
+MISC ChangeLog 3192 RMD160 75578a26b1d09378e63fe3bc964bd4a9bec3ff70 SHA1 ce2352d0cadc5b5352592fff8bb0ebc1512ae3eb SHA256 d31ef8deebb72cb36c5d99069752c37e179654f9af69d2e4c145a978b43c1167
+MISC metadata.xml 398 RMD160 8593c0f01ccadc084ede4a23a9fef913fa32a7ec SHA1 7a1775e2e2d56c09b34f417b15e9e6ee2ac796c8 SHA256 f60ae28a063afa0022bb0f5d8f2052395e2c22fe479949fc91485d8e5d553c1c
diff --git a/media-fonts/liberation-fonts/liberation-fonts-1.03.ebuild b/media-fonts/liberation-fonts/liberation-fonts-1.03.ebuild
deleted file mode 100644
index 9da0352cc470..000000000000
--- a/media-fonts/liberation-fonts/liberation-fonts-1.03.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/liberation-fonts/liberation-fonts-1.03.ebuild,v 1.2 2009/09/07 21:24:39 dirtyepic Exp $
-
-inherit font
-
-DESCRIPTION="A GPL-2 Helvetica/Times/Courier replacement TrueType font set, courtesy of Red Hat"
-SRC_URI="https://fedorahosted.org/releases/l/i/${PN}/${P}.tar.gz"
-HOMEPAGE="https://fedorahosted.org/liberation-fonts"
-KEYWORDS="alpha amd64 ~ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-SLOT="0"
-LICENSE="GPL-2-with-exceptions"
-IUSE="X"
-RDEPEND="${DEPEND}"
-
-FONT_SUFFIX="ttf"
-DOCS="License.txt"
-
-FONT_CONF=( "${FILESDIR}/60-liberation.conf" )
diff --git a/media-fonts/liberation-fonts/liberation-fonts-1.05.ebuild b/media-fonts/liberation-fonts/liberation-fonts-1.05.ebuild
new file mode 100644
index 000000000000..6f1c7908b72e
--- /dev/null
+++ b/media-fonts/liberation-fonts/liberation-fonts-1.05.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/liberation-fonts/liberation-fonts-1.05.ebuild,v 1.1 2010/06/11 20:28:07 pva Exp $
+
+inherit font
+
+DESCRIPTION="A GPL-2 Helvetica/Times/Courier replacement TrueType font set, courtesy of Red Hat"
+HOMEPAGE="https://fedorahosted.org/liberation-fonts"
+SRC_URI="!fontforge? ( http://github.com/downloads/kaio/${PN}/${PN}-ttf-${PV}.zip )
+fontforge? ( http://github.com/downloads/kaio/${PN}/${P}.tar.gz )"
+
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+SLOT="0"
+LICENSE="GPL-2-with-exceptions"
+IUSE="fontforge X"
+RDEPEND="${DEPEND}"
+
+FONT_SUFFIX="ttf"
+DOCS="License.txt"
+
+FONT_CONF=( "${FILESDIR}/60-liberation.conf" )
+
+DEPEND="fontforge? ( media-gfx/fontforge )"
+RDEPEND=""
+
+if use fontforge; then
+	FONT_S=${S}/ttf
+else
+	FONT_S=${WORKDIR}
+fi
diff --git a/media-fonts/liberation-fonts/metadata.xml b/media-fonts/liberation-fonts/metadata.xml
index ee63e4bca00d..9ede75d16ce7 100644
--- a/media-fonts/liberation-fonts/metadata.xml
+++ b/media-fonts/liberation-fonts/metadata.xml
@@ -6,6 +6,9 @@
 <email>je_fro@gentoo.org</email>
 <name>Jeff Gardner</name>
 </maintainer>
+<use>
+	<flag name='fontforge'>Use <pkg>media-gfx/fontforge</pkg> to build fonts from source</flag>
+</use>
 <longdescription lang="en">
 </longdescription>
 </pkgmetadata>