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

(Portage version: 2.1.8.3/cvs/Linux x86_64)

4 files changed, 40 insertions, 20 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/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>