summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Volkov <pva@gentoo.org>2011-09-11 11:41:49 +0000
committerPeter Volkov <pva@gentoo.org>2011-09-11 11:41:49 +0000
commit151b6d9c5c36a453ed1819453d8c6886fed9a610 (patch)
tree171f24e137249fe6f1f1fe25ef8c1300f6785480 /media-fonts
parentFix XSS vulnerability in rename hint, bug #378803, thank Nikoli for this job.... (diff)
downloadgentoo-2-151b6d9c5c36a453ed1819453d8c6886fed9a610.tar.gz
gentoo-2-151b6d9c5c36a453ed1819453d8c6886fed9a610.tar.bz2
gentoo-2-151b6d9c5c36a453ed1819453d8c6886fed9a610.zip
Fixed installation with USE=-fontforge now too, again bug #379505 wrt Nikolay S. Rybaloff
(Portage version: 2.1.10.11/cvs/Linux x86_64)
Diffstat (limited to 'media-fonts')
-rw-r--r--media-fonts/liberation-fonts/ChangeLog9
-rw-r--r--media-fonts/liberation-fonts/liberation-fonts-1.07.0-r2.ebuild (renamed from media-fonts/liberation-fonts/liberation-fonts-1.07.0-r1.ebuild)8
2 files changed, 13 insertions, 4 deletions
diff --git a/media-fonts/liberation-fonts/ChangeLog b/media-fonts/liberation-fonts/ChangeLog
index 8c5fa0315c71..857368c2c6ed 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.17 2011/09/09 10:22:58 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/liberation-fonts/ChangeLog,v 1.18 2011/09/11 11:41:49 pva Exp $
+
+*liberation-fonts-1.07.0-r2 (11 Sep 2011)
+
+ 11 Sep 2011; Peter Volkov <pva@gentoo.org>
+ -liberation-fonts-1.07.0-r1.ebuild, +liberation-fonts-1.07.0-r2.ebuild:
+ Fixed installation with USE=-fontforge now too, again bug #379505 wrt Nikolay
+ S. Rybaloff
*liberation-fonts-1.07.0-r1 (09 Sep 2011)
diff --git a/media-fonts/liberation-fonts/liberation-fonts-1.07.0-r1.ebuild b/media-fonts/liberation-fonts/liberation-fonts-1.07.0-r2.ebuild
index 263b93d6f129..0e70767cc6de 100644
--- a/media-fonts/liberation-fonts/liberation-fonts-1.07.0-r1.ebuild
+++ b/media-fonts/liberation-fonts/liberation-fonts-1.07.0-r2.ebuild
@@ -24,7 +24,9 @@ DEPEND="fontforge? ( media-gfx/fontforge )
app-arch/unzip"
RDEPEND=""
-FONT_S="${S}/${PN}-ttf-${PV}"
-if ! use fontforge; then
- S=${FONT_S}
+if use fontforge; then
+ FONT_S="${S}/${PN}-ttf-${PV}"
+else
+ FONT_S="${WORKDIR}/${PN}-ttf-${PV}"
+ S="${FONT_S}"
fi