summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gilbert <floppym@gentoo.org>2016-06-05 13:59:03 -0400
committerMike Gilbert <floppym@gentoo.org>2016-06-05 14:00:26 -0400
commitcbdb2a0fafcc98ac24070a325313293b0111d61d (patch)
treee1065da8882e86aab34c507c325e4c96682cc0e6 /media-fonts/dejavu
parentxfce-extra/xfce4-power-manager: Version bump to 1.6.0, #585070 (diff)
downloadgentoo-cbdb2a0fafcc98ac24070a325313293b0111d61d.tar.gz
gentoo-cbdb2a0fafcc98ac24070a325313293b0111d61d.tar.bz2
gentoo-cbdb2a0fafcc98ac24070a325313293b0111d61d.zip
media-fonts/dejavu: stop calling use in global scope
Bug: https://bugs.gentoo.org/585068 Package-Manager: portage-2.3.0_rc1_p14
Diffstat (limited to 'media-fonts/dejavu')
-rw-r--r--media-fonts/dejavu/dejavu-2.34.ebuild37
-rw-r--r--media-fonts/dejavu/dejavu-2.35.ebuild36
2 files changed, 40 insertions, 33 deletions
diff --git a/media-fonts/dejavu/dejavu-2.34.ebuild b/media-fonts/dejavu/dejavu-2.34.ebuild
index 203cdf7eca78..4eda0b2e4e10 100644
--- a/media-fonts/dejavu/dejavu-2.34.ebuild
+++ b/media-fonts/dejavu/dejavu-2.34.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -41,30 +41,33 @@ DEPEND="fontforge? ( x11-apps/mkfontscale
>media-libs/fontconfig-2.6.0 )"
RDEPEND=""
-if use fontforge
-then
- S=${WORKDIR}/${MY_SP}
- FONT_S=${S}/build
-else
- S=${WORKDIR}/${MY_BP}
- FONT_S=${S}/ttf
-fi
-
FONT_CONF=(
- "${S}"/fontconfig/20-unhint-small-dejavu-sans-mono.conf
- "${S}"/fontconfig/20-unhint-small-dejavu-sans.conf
- "${S}"/fontconfig/20-unhint-small-dejavu-serif.conf
- "${S}"/fontconfig/57-dejavu-sans-mono.conf
- "${S}"/fontconfig/57-dejavu-sans.conf
- "${S}"/fontconfig/57-dejavu-serif.conf )
+ fontconfig/20-unhint-small-dejavu-sans-mono.conf
+ fontconfig/20-unhint-small-dejavu-sans.conf
+ fontconfig/20-unhint-small-dejavu-serif.conf
+ fontconfig/57-dejavu-sans-mono.conf
+ fontconfig/57-dejavu-sans.conf
+ fontconfig/57-dejavu-serif.conf
+)
+FONT_S="ttf"
FONT_SUFFIX="ttf"
DOCS="AUTHORS NEWS README status.txt langcover.txt unicover.txt"
+src_unpack() {
+ default
+ if use fontforge; then
+ mv "${MY_SP}" "${P}" || die
+ else
+ mv "${MY_BP}" "${P}" || die
+ fi
+}
+
src_compile() {
if use fontforge
then
emake -j1 \
+ BUILDDIR=ttf \
BLOCKS=/usr/share/unicode-data/Blocks.txt \
UNICODEDATA=/usr/share/unicode-data/UnicodeData.txt \
FC-LANG=/usr/share/fc-lang \
@@ -77,6 +80,6 @@ src_install() {
font_src_install
if use fontforge
then
- dodoc build/*.txt
+ dodoc ttf/*.txt
fi
}
diff --git a/media-fonts/dejavu/dejavu-2.35.ebuild b/media-fonts/dejavu/dejavu-2.35.ebuild
index 2cb1ac871089..a7e8968de215 100644
--- a/media-fonts/dejavu/dejavu-2.35.ebuild
+++ b/media-fonts/dejavu/dejavu-2.35.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -36,28 +36,32 @@ DEPEND="fontforge? ( x11-apps/mkfontscale
app-i18n/unicode-data
>media-libs/fontconfig-2.6.0 )"
-if use fontforge; then
- S=${WORKDIR}/${MY_SP}
- FONT_S=${S}/build
-else
- S=${WORKDIR}/${MY_BP}
- FONT_S=${S}/ttf
-fi
-
FONT_CONF=(
- "${S}"/fontconfig/20-unhint-small-dejavu-sans-mono.conf
- "${S}"/fontconfig/20-unhint-small-dejavu-sans.conf
- "${S}"/fontconfig/20-unhint-small-dejavu-serif.conf
- "${S}"/fontconfig/57-dejavu-sans-mono.conf
- "${S}"/fontconfig/57-dejavu-sans.conf
- "${S}"/fontconfig/57-dejavu-serif.conf )
+ fontconfig/20-unhint-small-dejavu-sans-mono.conf
+ fontconfig/20-unhint-small-dejavu-sans.conf
+ fontconfig/20-unhint-small-dejavu-serif.conf
+ fontconfig/57-dejavu-sans-mono.conf
+ fontconfig/57-dejavu-sans.conf
+ fontconfig/57-dejavu-serif.conf
+)
+FONT_S="ttf"
FONT_SUFFIX="ttf"
DOCS="AUTHORS NEWS README status.txt langcover.txt unicover.txt"
+src_unpack() {
+ default
+ if use fontforge; then
+ mv "${MY_SP}" "${P}" || die
+ else
+ mv "${MY_BP}" "${P}" || die
+ fi
+}
+
src_compile() {
if use fontforge; then
emake -j1 \
+ BUILDDIR=ttf \
BLOCKS=/usr/share/unicode-data/Blocks.txt \
UNICODEDATA=/usr/share/unicode-data/UnicodeData.txt \
FC-LANG=/usr/share/fc-lang \
@@ -69,6 +73,6 @@ src_compile() {
src_install() {
font_src_install
if use fontforge; then
- dodoc build/*.txt
+ dodoc ttf/*.txt
fi
}