1 |
commit: b15c2f379321d89e3b19760344008f9831ffcd5b |
2 |
Author: Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com> |
3 |
AuthorDate: Sun Apr 18 00:07:45 2021 +0000 |
4 |
Commit: Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com> |
5 |
CommitDate: Sun Apr 18 00:07:45 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=b15c2f37 |
7 |
|
8 |
media-fonts/3270font: move to python-single-r1 |
9 |
|
10 |
Package-Manager: Portage-3.0.18, Repoman-3.0.3 |
11 |
Signed-off-by: Alessandro Barbieri <lssndrbarbieri <AT> gmail.com> |
12 |
|
13 |
media-fonts/3270font/3270font-2.2.1-r1.ebuild | 10 +++++-- |
14 |
media-fonts/3270font/3270font-2.2.1.ebuild | 43 --------------------------- |
15 |
2 files changed, 7 insertions(+), 46 deletions(-) |
16 |
|
17 |
diff --git a/media-fonts/3270font/3270font-2.2.1-r1.ebuild b/media-fonts/3270font/3270font-2.2.1-r1.ebuild |
18 |
index 540fd1c48..da7ce9a46 100644 |
19 |
--- a/media-fonts/3270font/3270font-2.2.1-r1.ebuild |
20 |
+++ b/media-fonts/3270font/3270font-2.2.1-r1.ebuild |
21 |
@@ -4,7 +4,7 @@ |
22 |
EAPI="7" |
23 |
|
24 |
PYTHON_COMPAT=( python3_{7,8} ) |
25 |
-inherit font python-any-r1 |
26 |
+inherit font python-single-r1 |
27 |
|
28 |
DESCRIPTION="A IBM 3270 Terminal font in a modern format" |
29 |
HOMEPAGE="https://github.com/rbanffy/3270font" |
30 |
@@ -22,16 +22,20 @@ HTML_DOCS=( "DESCRIPTION.en_us.html" ) |
31 |
|
32 |
PATCHES=( "${FILESDIR}/remove-useless-tests.patch" ) |
33 |
RDEPEND=" |
34 |
+ ${PYTHON_DEPS} |
35 |
media-gfx/fontforge |
36 |
" |
37 |
DEPEND=" |
38 |
${PYTHON_DEPS} |
39 |
${RDEPEND} |
40 |
test? ( |
41 |
- dev-python/ipdb |
42 |
- dev-python/pillow |
43 |
+ $(python_gen_cond_dep ' |
44 |
+ dev-python/ipdb[${PYTHON_USEDEP}] |
45 |
+ dev-python/pillow[${PYTHON_USEDEP}] |
46 |
+ ') |
47 |
) |
48 |
" |
49 |
+REQUIRED_USE="${PYTHON_REQUIRED_USE}" |
50 |
|
51 |
FONT_S="${S}/build" |
52 |
FONT_SUFFIX="otf ttf pfm woff" |
53 |
|
54 |
diff --git a/media-fonts/3270font/3270font-2.2.1.ebuild b/media-fonts/3270font/3270font-2.2.1.ebuild |
55 |
deleted file mode 100644 |
56 |
index eaa42e814..000000000 |
57 |
--- a/media-fonts/3270font/3270font-2.2.1.ebuild |
58 |
+++ /dev/null |
59 |
@@ -1,43 +0,0 @@ |
60 |
-# Copyright 1999-2021 Gentoo Authors |
61 |
-# Distributed under the terms of the GNU General Public License v2 |
62 |
- |
63 |
-EAPI="7" |
64 |
- |
65 |
-PYTHON_COMPAT=( python3_{7,8} ) |
66 |
-inherit font python-any-r1 |
67 |
- |
68 |
-DESCRIPTION="A IBM 3270 Terminal font in a modern format" |
69 |
-HOMEPAGE="https://github.com/rbanffy/3270font" |
70 |
-SRC_URI="https://github.com/rbanffy/3270font/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
71 |
- |
72 |
-LICENSE="BSD CC-BY-SA-3.0 GPL-3 OFL" |
73 |
-SLOT="0" |
74 |
-KEYWORDS="~amd64" |
75 |
-IUSE="test" |
76 |
-DOCS=( CHANGELOG.md README.md ) |
77 |
-HTML_DOCS=( "DESCRIPTION.en_us.html" ) |
78 |
-#test need network |
79 |
-RESTRICT="test" |
80 |
-RDEPEND=" |
81 |
- media-gfx/fontforge |
82 |
-" |
83 |
-DEPEND=" |
84 |
- ${PYTHON_DEPS} |
85 |
- ${RDEPEND} |
86 |
- test? ( |
87 |
- dev-python/black |
88 |
- dev-python/ipdb |
89 |
- dev-python/pillow |
90 |
- ) |
91 |
-" |
92 |
- |
93 |
-FONT_S="${S}/build" |
94 |
-FONT_SUFFIX="otf ttf pfm woff" |
95 |
- |
96 |
-src_compile() { |
97 |
- emake font |
98 |
-} |
99 |
- |
100 |
-src_test() { |
101 |
- emake test |
102 |
-} |