Fixed installation with USE=fontforge, bug #379505 thank Nikolay S. Rybaloff for...

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 b0d2caf3cbff751d8d8fb7798fd80260f3b7819d..8c5fa0315c7165d73f2a9a3ee2d2e50e06033507 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.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/Manifest b/media-fonts/liberation-fonts/Manifest
index d6b24f5c0ca767bcc170a0ec6b5e68d9a5a27c3a..1a0e96ae67b28fef58e628556debf35d910e9929 100644 (file)
--- a/media-fonts/liberation-fonts/Manifest
+++ b/media-fonts/liberation-fonts/Manifest
@@ -9,6 +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.ebuild 846 RMD160 b80ae79c31fb9ba69d115f8fd0e8e6cf389b3d54 SHA1 dc421169d07eed8a520c9562f4b8995c83de56d9 SHA256 27cfb1b286917c49b0eeeac2fab730e9d91c760c432c68859b5505c722fd2eb8
-MISC ChangeLog 4655 RMD160 e05b4dbfaa4f3a0ca48897f98859a4775c4fad1a SHA1 079307d78b3019d877f0dc84168cbe7aa81c98c2 SHA256 d773c19ad0d7df6758532befa404bc168f1bd53c61f3033409cd22d19562715c
+EBUILD liberation-fonts-1.07.0-r1.ebuild 786 RMD160 ec3b80dc20a1b7d88f8da1e3344c1a55ff22e808 SHA1 e7f185f1b37c203d5dd8dd45e78aec604292f903 SHA256 74186e8644cc63a86fbfe62edd011bc14256ef7d17ab928b51cae44f3e01ffe7
+EBUILD liberation-fonts-1.07.0.ebuild 786 RMD160 ec3b80dc20a1b7d88f8da1e3344c1a55ff22e808 SHA1 e7f185f1b37c203d5dd8dd45e78aec604292f903 SHA256 74186e8644cc63a86fbfe62edd011bc14256ef7d17ab928b51cae44f3e01ffe7
+MISC ChangeLog 4912 RMD160 2c6460788983cbb52a66089515e7ae406acce6bc SHA1 9fc1f2906a09964e4130c32f02739ba6c0d46bf4 SHA256 6b372dc94dbd2c7ac9b3ec3011cf23dc7b7e606f7901a47aeb267d89c4c2c596
 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-r1.ebuild
new file mode 100644 (file)
index 0000000..263b93d
--- /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 7dc171b69b3ea569fc2f4eb68bbbbc33cdb9717b..263b93d6f129a860c499aa956ee23125811e15a4 100644 (file)
--- 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