Fixed installation with USE=-fontforge now too, again bug #379505 wrt Nikolay S....

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

diff --git a/media-fonts/liberation-fonts/ChangeLog b/media-fonts/liberation-fonts/ChangeLog
index 8c5fa0315c7165d73f2a9a3ee2d2e50e06033507..857368c2c6ed23ecba6f89788804448a91200bec 100644 (file)
--- 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/Manifest b/media-fonts/liberation-fonts/Manifest
index 1a0e96ae67b28fef58e628556debf35d910e9929..1475c268c0ef5814be2735454eecb358722f3e36 100644 (file)
--- a/media-fonts/liberation-fonts/Manifest
+++ b/media-fonts/liberation-fonts/Manifest
@@ -9,7 +9,7 @@ DIST liberation-fonts-ttf-1.07.0.tar.gz 1326750 RMD160 18b8a71af004b453d87c678f3
 EBUILD liberation-fonts-1.04.ebuild 688 RMD160 9078b88140139608f8d847ddce5170ec09e93f9b SHA1 f5e0c50b54dd8bb77c8c91e5d002febf6f09f710 SHA256 724e045041e38119b1c11fa03c6e8391f469eb73f50c2934e34a99fed4d20e5c
 EBUILD liberation-fonts-1.05.ebuild 904 RMD160 9e8eb64fc4edc719c9e5851cc0462592d6c73136 SHA1 fcff88091d36d0b57965bbcc1b5eb3f1754e9633 SHA256 bc3be7158f62e79893062d50fe9e520c5ea6ccff60e6f7721e4258ff1925b0f0
 EBUILD liberation-fonts-1.06.0.20100721-r1.ebuild 971 RMD160 6628d7100676fa202beb71a5ac14cb49ee804f32 SHA1 3f3c7656adde9fe8191579a03b1092b34c3fee8b SHA256 cb3bccbe252b07b1bc6a11d7f28a15711eb39d3438c3ae7f1592bc8110b6727f
-EBUILD liberation-fonts-1.07.0-r1.ebuild 786 RMD160 ec3b80dc20a1b7d88f8da1e3344c1a55ff22e808 SHA1 e7f185f1b37c203d5dd8dd45e78aec604292f903 SHA256 74186e8644cc63a86fbfe62edd011bc14256ef7d17ab928b51cae44f3e01ffe7
+EBUILD liberation-fonts-1.07.0-r2.ebuild 829 RMD160 b8faa622f9bf2316444b22a88e07a58d1452253d SHA1 e9410aa558b8b53da8fabb1140e5d78923652638 SHA256 0dbf1a87242663d060e090b4afe2abcb15de092a9e53eff74203eb86497463ca
 EBUILD liberation-fonts-1.07.0.ebuild 786 RMD160 ec3b80dc20a1b7d88f8da1e3344c1a55ff22e808 SHA1 e7f185f1b37c203d5dd8dd45e78aec604292f903 SHA256 74186e8644cc63a86fbfe62edd011bc14256ef7d17ab928b51cae44f3e01ffe7
-MISC ChangeLog 4912 RMD160 2c6460788983cbb52a66089515e7ae406acce6bc SHA1 9fc1f2906a09964e4130c32f02739ba6c0d46bf4 SHA256 6b372dc94dbd2c7ac9b3ec3011cf23dc7b7e606f7901a47aeb267d89c4c2c596
+MISC ChangeLog 5169 RMD160 ac2aeaeda1cf05effba68f186923d2aa687cf353 SHA1 5e3d497ffde1088839ef6abb6c7f2b0c3c6a8136 SHA256 142b1511be335642ea106505fb33a8fd6654c8032e5c8a98e807c6b9f39d46aa
 MISC metadata.xml 466 RMD160 4a596d73eee7776ae2fdc53fe3e9bbb1e8710c76 SHA1 080346b810e280957a719cff5f00edf6031294d5 SHA256 ca7559a2f0fdc9cc477adfdbbf73c787439bf0ebfd3c60f049a5c3596cbd5165

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
similarity index 86%
rename from media-fonts/liberation-fonts/liberation-fonts-1.07.0-r1.ebuild
rename to media-fonts/liberation-fonts/liberation-fonts-1.07.0-r2.ebuild
index 263b93d6f129a860c499aa956ee23125811e15a4..0e70767cc6dec06bcaf65d5c94b232f441b62381 100644 (file)
--- 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