| 1 |
commit: 1ac4db79a15f5dbf186cac519da403ee14445ea6 |
| 2 |
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Apr 24 18:49:30 2020 +0000 |
| 4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Apr 24 19:12:23 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ac4db79 |
| 7 |
|
| 8 |
media-fonts/noto-emoji: fix python support |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/719264 |
| 11 |
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> |
| 12 |
|
| 13 |
media-fonts/noto-emoji/noto-emoji-20200311.ebuild | 16 ++++++++++++---- |
| 14 |
media-fonts/noto-emoji/noto-emoji-20200317-r1.ebuild | 15 ++++++++++----- |
| 15 |
media-fonts/noto-emoji/noto-emoji-20200317.ebuild | 16 ++++++++++++---- |
| 16 |
3 files changed, 34 insertions(+), 13 deletions(-) |
| 17 |
|
| 18 |
diff --git a/media-fonts/noto-emoji/noto-emoji-20200311.ebuild b/media-fonts/noto-emoji/noto-emoji-20200311.ebuild |
| 19 |
index 8c9d46ac17e..96e7679fa64 100644 |
| 20 |
--- a/media-fonts/noto-emoji/noto-emoji-20200311.ebuild |
| 21 |
+++ b/media-fonts/noto-emoji/noto-emoji-20200311.ebuild |
| 22 |
@@ -17,7 +17,7 @@ SLOT="0" |
| 23 |
KEYWORDS="amd64" |
| 24 |
IUSE="" |
| 25 |
|
| 26 |
-DEPEND="${PYTHON_DEPS} |
| 27 |
+BDEPEND="${PYTHON_DEPS} |
| 28 |
app-arch/zopfli |
| 29 |
$(python_gen_any_dep ' |
| 30 |
dev-python/fonttools[${PYTHON_USEDEP}] |
| 31 |
@@ -27,7 +27,6 @@ DEPEND="${PYTHON_DEPS} |
| 32 |
x11-libs/cairo |
| 33 |
|| ( media-gfx/imagemagick[png] media-gfx/graphicsmagick[png] ) |
| 34 |
" |
| 35 |
-RDEPEND="" |
| 36 |
|
| 37 |
RESTRICT="binchecks strip" |
| 38 |
|
| 39 |
@@ -37,8 +36,12 @@ FONT_S="${S}" |
| 40 |
FONT_SUFFIX="ttf" |
| 41 |
|
| 42 |
python_check_deps() { |
| 43 |
- has_version "dev-python/fonttools[${PYTHON_USEDEP}]" && \ |
| 44 |
- has_version "dev-python/nototools[${PYTHON_USEDEP}]" |
| 45 |
+ has_version -b "dev-python/fonttools[${PYTHON_USEDEP}]" && |
| 46 |
+ has_version -b "dev-python/nototools[${PYTHON_USEDEP}]" |
| 47 |
+} |
| 48 |
+ |
| 49 |
+pkg_setup() { |
| 50 |
+ font_pkg_setup |
| 51 |
} |
| 52 |
|
| 53 |
PATCHES=( |
| 54 |
@@ -58,6 +61,11 @@ src_prepare() { |
| 55 |
fi |
| 56 |
} |
| 57 |
|
| 58 |
+src_compile() { |
| 59 |
+ python_setup |
| 60 |
+ default |
| 61 |
+} |
| 62 |
+ |
| 63 |
src_install() { |
| 64 |
font_src_install |
| 65 |
|
| 66 |
|
| 67 |
diff --git a/media-fonts/noto-emoji/noto-emoji-20200317-r1.ebuild b/media-fonts/noto-emoji/noto-emoji-20200317-r1.ebuild |
| 68 |
index e34508200bf..c676a419e55 100644 |
| 69 |
--- a/media-fonts/noto-emoji/noto-emoji-20200317-r1.ebuild |
| 70 |
+++ b/media-fonts/noto-emoji/noto-emoji-20200317-r1.ebuild |
| 71 |
@@ -17,7 +17,8 @@ SLOT="0" |
| 72 |
KEYWORDS="~amd64" |
| 73 |
IUSE="buildfont" |
| 74 |
|
| 75 |
-DEPEND="buildfont? ( |
| 76 |
+BDEPEND=" |
| 77 |
+ buildfont? ( |
| 78 |
${PYTHON_DEPS} |
| 79 |
app-arch/zopfli |
| 80 |
$(python_gen_any_dep ' |
| 81 |
@@ -29,15 +30,18 @@ DEPEND="buildfont? ( |
| 82 |
|| ( media-gfx/imagemagick[png] media-gfx/graphicsmagick[png] ) |
| 83 |
) |
| 84 |
" |
| 85 |
-RDEPEND="" |
| 86 |
|
| 87 |
RESTRICT="binchecks strip" |
| 88 |
|
| 89 |
S="${WORKDIR}/${PN}-${COMMIT}" |
| 90 |
|
| 91 |
python_check_deps() { |
| 92 |
- has_version "dev-python/fonttools[${PYTHON_USEDEP}]" && \ |
| 93 |
- has_version "dev-python/nototools[${PYTHON_USEDEP}]" |
| 94 |
+ has_version -b "dev-python/fonttools[${PYTHON_USEDEP}]" && |
| 95 |
+ has_version -b "dev-python/nototools[${PYTHON_USEDEP}]" |
| 96 |
+} |
| 97 |
+ |
| 98 |
+pkg_setup() { |
| 99 |
+ font_pkg_setup |
| 100 |
} |
| 101 |
|
| 102 |
src_prepare() { |
| 103 |
@@ -55,7 +59,7 @@ src_prepare() { |
| 104 |
eapply "${FILESDIR}"/${PN}-zopflipng-verbose.patch |
| 105 |
|
| 106 |
# Based on Fedora patch to allow graphicsmagick usage |
| 107 |
- if has_version media-gfx/graphicsmagick; then |
| 108 |
+ if has_version -b media-gfx/graphicsmagick; then |
| 109 |
eapply "${FILESDIR}/${PN}-20190328-use-gm.patch" |
| 110 |
fi |
| 111 |
fi |
| 112 |
@@ -68,6 +72,7 @@ src_compile() { |
| 113 |
einfo "To build fonts based on latest images enable 'buildfont'" |
| 114 |
einfo "USE (that will require more time and resources too)." |
| 115 |
else |
| 116 |
+ python_setup |
| 117 |
einfo "Building fonts..." |
| 118 |
default |
| 119 |
fi |
| 120 |
|
| 121 |
diff --git a/media-fonts/noto-emoji/noto-emoji-20200317.ebuild b/media-fonts/noto-emoji/noto-emoji-20200317.ebuild |
| 122 |
index 73217e5becc..b4230796aef 100644 |
| 123 |
--- a/media-fonts/noto-emoji/noto-emoji-20200317.ebuild |
| 124 |
+++ b/media-fonts/noto-emoji/noto-emoji-20200317.ebuild |
| 125 |
@@ -17,7 +17,7 @@ SLOT="0" |
| 126 |
KEYWORDS="~amd64" |
| 127 |
IUSE="" |
| 128 |
|
| 129 |
-DEPEND="${PYTHON_DEPS} |
| 130 |
+BDEPEND="${PYTHON_DEPS} |
| 131 |
app-arch/zopfli |
| 132 |
$(python_gen_any_dep ' |
| 133 |
dev-python/fonttools[${PYTHON_USEDEP}] |
| 134 |
@@ -27,7 +27,6 @@ DEPEND="${PYTHON_DEPS} |
| 135 |
x11-libs/cairo |
| 136 |
|| ( media-gfx/imagemagick[png] media-gfx/graphicsmagick[png] ) |
| 137 |
" |
| 138 |
-RDEPEND="" |
| 139 |
|
| 140 |
RESTRICT="binchecks strip" |
| 141 |
|
| 142 |
@@ -37,8 +36,12 @@ FONT_S="${S}" |
| 143 |
FONT_SUFFIX="ttf" |
| 144 |
|
| 145 |
python_check_deps() { |
| 146 |
- has_version "dev-python/fonttools[${PYTHON_USEDEP}]" && \ |
| 147 |
- has_version "dev-python/nototools[${PYTHON_USEDEP}]" |
| 148 |
+ has_version -b "dev-python/fonttools[${PYTHON_USEDEP}]" && |
| 149 |
+ has_version -b "dev-python/nototools[${PYTHON_USEDEP}]" |
| 150 |
+} |
| 151 |
+ |
| 152 |
+pkg_setup() { |
| 153 |
+ font_pkg_setup |
| 154 |
} |
| 155 |
|
| 156 |
PATCHES=( |
| 157 |
@@ -58,6 +61,11 @@ src_prepare() { |
| 158 |
fi |
| 159 |
} |
| 160 |
|
| 161 |
+src_compile() { |
| 162 |
+ python_setup |
| 163 |
+ default |
| 164 |
+} |
| 165 |
+ |
| 166 |
src_install() { |
| 167 |
font_src_install |
Archives