diff options
| author |   Peter Volkov <pva@gentoo.org> | 2011-09-09 10:22:58 +0000 |
|---|---|---|
| committer | Peter Volkov <pva@gentoo.org> | 2011-09-09 10:22:58 +0000 |
| commit | 894138b81adf50b149757b1c3271e4107e4844cb (patch) | |
| tree | 73ed8715df708467b3eb4c6403cbef2ef9a0dece /media-fonts | |
| parent | Fixing bug 382159 (diff) | |
| download | gentoo-2-894138b81adf50b149757b1c3271e4107e4844cb.tar.gz gentoo-2-894138b81adf50b149757b1c3271e4107e4844cb.tar.bz2 gentoo-2-894138b81adf50b149757b1c3271e4107e4844cb.zip | |
Fixed installation with USE=fontforge, bug #379505 thank Nikolay S. Rybaloff for report and fix.
(Portage version: 2.1.10.11/cvs/Linux x86_64)
Diffstat (limited to 'media-fonts')
| -rw-r--r-- | media-fonts/liberation-fonts/ChangeLog | 9 | ||||
| -rw-r--r-- | media-fonts/liberation-fonts/liberation-fonts-1.07.0-r1.ebuild | 30 | ||||
| -rw-r--r-- | media-fonts/liberation-fonts/liberation-fonts-1.07.0.ebuild | 6 |
3 files changed, 40 insertions, 5 deletions
diff --git a/media-fonts/liberation-fonts/ChangeLog b/media-fonts/liberation-fonts/ChangeLog index b0d2caf3cbff..8c5fa0315c71 100644 --- a/media-fonts/liberation-fonts/ChangeLog +++ b/media-fonts/liberation-fonts/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for media-fonts/liberation-fonts # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-fonts/liberation-fonts/ChangeLog,v 1.16 2011/09/07 19:08:11 je_fro Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-fonts/liberation-fonts/ChangeLog,v 1.17 2011/09/09 10:22:58 pva Exp $ + +*liberation-fonts-1.07.0-r1 (09 Sep 2011) + + 09 Sep 2011; Peter Volkov <pva@gentoo.org> liberation-fonts-1.07.0.ebuild, + +liberation-fonts-1.07.0-r1.ebuild: + Fixed installation with USE=fontforge, bug #379505 thank Nikolay S. Rybaloff + for report and fix. 07 Sep 2011; Jeff Gardner <je_fro@gentoo.org> liberation-fonts-1.07.0.ebuild: Add unzip to DEPEND fixing bug #380051 thanks to g0del. diff --git a/media-fonts/liberation-fonts/liberation-fonts-1.07.0-r1.ebuild b/media-fonts/liberation-fonts/liberation-fonts-1.07.0-r1.ebuild new file mode 100644 index 000000000000..263b93d6f129 --- /dev/null +++ b/media-fonts/liberation-fonts/liberation-fonts-1.07.0-r1.ebuild @@ -0,0 +1,30 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $ + +EAPI=3 + +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? ( https://fedorahosted.org/releases/l/i/${PN}/${PN}-ttf-${PV}.tar.gz ) +fontforge? ( https://fedorahosted.org/releases/l/i/${PN}/${P}.tar.gz )" + +KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" +SLOT="0" +LICENSE="GPL-2-with-exceptions" +IUSE="fontforge X" + +FONT_SUFFIX="ttf" + +FONT_CONF=( "${FILESDIR}/60-liberation.conf" ) + +DEPEND="fontforge? ( media-gfx/fontforge ) + app-arch/unzip" +RDEPEND="" + +FONT_S="${S}/${PN}-ttf-${PV}" +if ! use fontforge; then + S=${FONT_S} +fi diff --git a/media-fonts/liberation-fonts/liberation-fonts-1.07.0.ebuild b/media-fonts/liberation-fonts/liberation-fonts-1.07.0.ebuild index 7dc171b69b3e..263b93d6f129 100644 --- a/media-fonts/liberation-fonts/liberation-fonts-1.07.0.ebuild +++ b/media-fonts/liberation-fonts/liberation-fonts-1.07.0.ebuild @@ -24,9 +24,7 @@ DEPEND="fontforge? ( media-gfx/fontforge ) app-arch/unzip" RDEPEND="" -if use fontforge; then - FONT_S="${S}/${PN}-ttf-${PV%.*}.$(date +%Y%m%d)" -else - FONT_S="${WORKDIR}/${PN}-ttf-${PV}" +FONT_S="${S}/${PN}-ttf-${PV}" +if ! use fontforge; then S=${FONT_S} fi |