* [gentoo-commits] repo/proj/guru:dev commit in: media-fonts/3270font/
@ 2021-04-17 20:00 Andrew Ammerlaan
2021-04-17 20:00 ` [gentoo-commits] repo/proj/guru:master " Andrew Ammerlaan
0 siblings, 1 reply; 8+ messages in thread
From: Andrew Ammerlaan @ 2021-04-17 20:00 UTC (permalink / raw
To: gentoo-commits
commit: 154302b24ceff100bff685cb82f8b4b2033c6ded
Author: Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
AuthorDate: Sat Apr 17 19:57:40 2021 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
CommitDate: Sat Apr 17 19:57:40 2021 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=154302b2
media-fonts/3270font: add missing RESTRICT="!test? ( test )"
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> riseup.net>
media-fonts/3270font/3270font-2.2.1-r1.ebuild | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/media-fonts/3270font/3270font-2.2.1-r1.ebuild b/media-fonts/3270font/3270font-2.2.1-r1.ebuild
index 90792efaf..540fd1c48 100644
--- a/media-fonts/3270font/3270font-2.2.1-r1.ebuild
+++ b/media-fonts/3270font/3270font-2.2.1-r1.ebuild
@@ -13,9 +13,13 @@ SRC_URI="https://github.com/rbanffy/3270font/archive/v${PV}.tar.gz -> ${P}.tar.g
LICENSE="BSD CC-BY-SA-3.0 GPL-3 OFL"
SLOT="0"
KEYWORDS="~amd64"
+
IUSE="test"
+RESTRICT="!test? ( test )"
+
DOCS=( CHANGELOG.md README.md )
HTML_DOCS=( "DESCRIPTION.en_us.html" )
+
PATCHES=( "${FILESDIR}/remove-useless-tests.patch" )
RDEPEND="
media-gfx/fontforge
^ permalink raw reply related [flat|nested] 8+ messages in thread* [gentoo-commits] repo/proj/guru:master commit in: media-fonts/3270font/
@ 2021-04-18 9:10 Andrew Ammerlaan
0 siblings, 0 replies; 8+ messages in thread
From: Andrew Ammerlaan @ 2021-04-18 9:10 UTC (permalink / raw
To: gentoo-commits
commit: b15c2f379321d89e3b19760344008f9831ffcd5b
Author: Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
AuthorDate: Sun Apr 18 00:07:45 2021 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
CommitDate: Sun Apr 18 00:07:45 2021 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=b15c2f37
media-fonts/3270font: move to python-single-r1
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Alessandro Barbieri <lssndrbarbieri <AT> gmail.com>
media-fonts/3270font/3270font-2.2.1-r1.ebuild | 10 +++++--
media-fonts/3270font/3270font-2.2.1.ebuild | 43 ---------------------------
2 files changed, 7 insertions(+), 46 deletions(-)
diff --git a/media-fonts/3270font/3270font-2.2.1-r1.ebuild b/media-fonts/3270font/3270font-2.2.1-r1.ebuild
index 540fd1c48..da7ce9a46 100644
--- a/media-fonts/3270font/3270font-2.2.1-r1.ebuild
+++ b/media-fonts/3270font/3270font-2.2.1-r1.ebuild
@@ -4,7 +4,7 @@
EAPI="7"
PYTHON_COMPAT=( python3_{7,8} )
-inherit font python-any-r1
+inherit font python-single-r1
DESCRIPTION="A IBM 3270 Terminal font in a modern format"
HOMEPAGE="https://github.com/rbanffy/3270font"
@@ -22,16 +22,20 @@ HTML_DOCS=( "DESCRIPTION.en_us.html" )
PATCHES=( "${FILESDIR}/remove-useless-tests.patch" )
RDEPEND="
+ ${PYTHON_DEPS}
media-gfx/fontforge
"
DEPEND="
${PYTHON_DEPS}
${RDEPEND}
test? (
- dev-python/ipdb
- dev-python/pillow
+ $(python_gen_cond_dep '
+ dev-python/ipdb[${PYTHON_USEDEP}]
+ dev-python/pillow[${PYTHON_USEDEP}]
+ ')
)
"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
FONT_S="${S}/build"
FONT_SUFFIX="otf ttf pfm woff"
diff --git a/media-fonts/3270font/3270font-2.2.1.ebuild b/media-fonts/3270font/3270font-2.2.1.ebuild
deleted file mode 100644
index eaa42e814..000000000
--- a/media-fonts/3270font/3270font-2.2.1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{7,8} )
-inherit font python-any-r1
-
-DESCRIPTION="A IBM 3270 Terminal font in a modern format"
-HOMEPAGE="https://github.com/rbanffy/3270font"
-SRC_URI="https://github.com/rbanffy/3270font/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD CC-BY-SA-3.0 GPL-3 OFL"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-DOCS=( CHANGELOG.md README.md )
-HTML_DOCS=( "DESCRIPTION.en_us.html" )
-#test need network
-RESTRICT="test"
-RDEPEND="
- media-gfx/fontforge
-"
-DEPEND="
- ${PYTHON_DEPS}
- ${RDEPEND}
- test? (
- dev-python/black
- dev-python/ipdb
- dev-python/pillow
- )
-"
-
-FONT_S="${S}/build"
-FONT_SUFFIX="otf ttf pfm woff"
-
-src_compile() {
- emake font
-}
-
-src_test() {
- emake test
-}
^ permalink raw reply related [flat|nested] 8+ messages in thread* [gentoo-commits] repo/proj/guru:dev commit in: media-fonts/3270font/
@ 2021-04-18 15:59 Andrew Ammerlaan
2021-04-18 16:01 ` [gentoo-commits] repo/proj/guru:master " Andrew Ammerlaan
0 siblings, 1 reply; 8+ messages in thread
From: Andrew Ammerlaan @ 2021-04-18 15:59 UTC (permalink / raw
To: gentoo-commits
commit: 4e86dc61f1c27974807b3c74a7d04972c4802950
Author: Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
AuthorDate: Sun Apr 18 15:59:50 2021 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
CommitDate: Sun Apr 18 15:59:50 2021 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=4e86dc61
media-fonts/3270font: remove PYTHON_DEPS from RDEPEND
since this is python-any-r1
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> riseup.net>
media-fonts/3270font/3270font-2.2.1-r1.ebuild | 1 -
1 file changed, 1 deletion(-)
diff --git a/media-fonts/3270font/3270font-2.2.1-r1.ebuild b/media-fonts/3270font/3270font-2.2.1-r1.ebuild
index bf8c4ee33..540fd1c48 100644
--- a/media-fonts/3270font/3270font-2.2.1-r1.ebuild
+++ b/media-fonts/3270font/3270font-2.2.1-r1.ebuild
@@ -22,7 +22,6 @@ HTML_DOCS=( "DESCRIPTION.en_us.html" )
PATCHES=( "${FILESDIR}/remove-useless-tests.patch" )
RDEPEND="
- ${PYTHON_DEPS}
media-gfx/fontforge
"
DEPEND="
^ permalink raw reply related [flat|nested] 8+ messages in thread* [gentoo-commits] repo/proj/guru:master commit in: media-fonts/3270font/
@ 2021-04-18 16:01 Andrew Ammerlaan
0 siblings, 0 replies; 8+ messages in thread
From: Andrew Ammerlaan @ 2021-04-18 16:01 UTC (permalink / raw
To: gentoo-commits
commit: 409b2f7a1530e18a7acc78114c26e9138d897f80
Author: Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
AuthorDate: Sun Apr 18 13:39:07 2021 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
CommitDate: Sun Apr 18 13:39:07 2021 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=409b2f7a
media-fonts/3270font: revert eclass change
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Alessandro Barbieri <lssndrbarbieri <AT> gmail.com>
media-fonts/3270font/3270font-2.2.1-r1.ebuild | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/media-fonts/3270font/3270font-2.2.1-r1.ebuild b/media-fonts/3270font/3270font-2.2.1-r1.ebuild
index da7ce9a46..bf8c4ee33 100644
--- a/media-fonts/3270font/3270font-2.2.1-r1.ebuild
+++ b/media-fonts/3270font/3270font-2.2.1-r1.ebuild
@@ -4,7 +4,7 @@
EAPI="7"
PYTHON_COMPAT=( python3_{7,8} )
-inherit font python-single-r1
+inherit font python-any-r1
DESCRIPTION="A IBM 3270 Terminal font in a modern format"
HOMEPAGE="https://github.com/rbanffy/3270font"
@@ -29,13 +29,10 @@ DEPEND="
${PYTHON_DEPS}
${RDEPEND}
test? (
- $(python_gen_cond_dep '
- dev-python/ipdb[${PYTHON_USEDEP}]
- dev-python/pillow[${PYTHON_USEDEP}]
- ')
+ dev-python/ipdb
+ dev-python/pillow
)
"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
FONT_S="${S}/build"
FONT_SUFFIX="otf ttf pfm woff"
^ permalink raw reply related [flat|nested] 8+ messages in thread* [gentoo-commits] repo/proj/guru:master commit in: media-fonts/3270font/
@ 2021-04-19 8:04 Andrew Ammerlaan
0 siblings, 0 replies; 8+ messages in thread
From: Andrew Ammerlaan @ 2021-04-19 8:04 UTC (permalink / raw
To: gentoo-commits
commit: 789fd69ddc3217b116bbd527577b14797bf0569b
Author: Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
AuthorDate: Sun Apr 18 22:28:39 2021 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
CommitDate: Sun Apr 18 23:31:07 2021 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=789fd69d
media-fonts/3270font: try to correctly use python-any-r1 eclass
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Alessandro Barbieri <lssndrbarbieri <AT> gmail.com>
media-fonts/3270font/3270font-2.2.1-r1.ebuild | 15 +++++++++++++--
1 file changed, 13 insertions(+), 2 deletions(-)
diff --git a/media-fonts/3270font/3270font-2.2.1-r1.ebuild b/media-fonts/3270font/3270font-2.2.1-r1.ebuild
index 540fd1c48..1ed424368 100644
--- a/media-fonts/3270font/3270font-2.2.1-r1.ebuild
+++ b/media-fonts/3270font/3270font-2.2.1-r1.ebuild
@@ -28,14 +28,25 @@ DEPEND="
${PYTHON_DEPS}
${RDEPEND}
test? (
- dev-python/ipdb
- dev-python/pillow
+ $(python_gen_any_dep '
+ dev-python/ipdb[${PYTHON_USEDEP}]
+ dev-python/pillow[${PYTHON_USEDEP}]
+ ')
)
"
FONT_S="${S}/build"
FONT_SUFFIX="otf ttf pfm woff"
+python_check_deps() {
+ has_version -d "dev-python/ipdb[${PYTHON_USEDEP}]" &&
+ has_version -d "dev-python/pillow[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+ use test && python-any-r1_pkg_setup
+}
+
src_compile() {
emake font
}
^ permalink raw reply related [flat|nested] 8+ messages in thread* [gentoo-commits] repo/proj/guru:master commit in: media-fonts/3270font/
@ 2022-12-27 8:05 Viorel Munteanu
0 siblings, 0 replies; 8+ messages in thread
From: Viorel Munteanu @ 2022-12-27 8:05 UTC (permalink / raw
To: gentoo-commits
commit: 79159a716730bf50593b9c753af3ab1448a93b0b
Author: Anna (cybertailor) Vyalkova <cyber+gentoo <AT> sysrq <DOT> in>
AuthorDate: Sat Dec 24 01:28:17 2022 +0000
Commit: Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
CommitDate: Sun Dec 25 02:19:22 2022 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=79159a71
media-fonts/3270font: drop 2.3.0
Signed-off-by: Anna (cybertailor) Vyalkova <cyber+gentoo <AT> sysrq.in>
media-fonts/3270font/3270font-2.3.0.ebuild | 61 ------------------------------
media-fonts/3270font/Manifest | 1 -
2 files changed, 62 deletions(-)
diff --git a/media-fonts/3270font/3270font-2.3.0.ebuild b/media-fonts/3270font/3270font-2.3.0.ebuild
deleted file mode 100644
index 16356a8d7..000000000
--- a/media-fonts/3270font/3270font-2.3.0.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{8..9} )
-
-inherit font python-any-r1
-
-DESCRIPTION="A IBM 3270 Terminal font in a modern format"
-HOMEPAGE="https://github.com/rbanffy/3270font"
-SRC_URI="https://github.com/rbanffy/3270font/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD CC-BY-SA-3.0 GPL-3 OFL"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-
-RESTRICT="test"
-PROPERTIES="test_network"
-DOCS=( CHANGELOG.md README.md )
-HTML_DOCS=( "DESCRIPTION.en_us.html" )
-PATCHES=(
- "${FILESDIR}/remove-useless-tests.patch"
- "${FILESDIR}/${P}-correctly-pass-options.patch"
-)
-
-DEPEND="
- ${PYTHON_DEPS}
- media-gfx/fontforge
- test? (
- $(python_gen_any_dep '
- dev-python/ipdb[${PYTHON_USEDEP}]
- dev-python/pillow[${PYTHON_USEDEP}]
- dev-util/gftools[${PYTHON_SINGLE_USEDEP}]
- media-gfx/fontbakery[${PYTHON_USEDEP}]
- ')
- )
-"
-
-FONT_S="${S}/build"
-FONT_SUFFIX="otf ttf pfm woff"
-
-python_check_deps() {
- has_version -d "dev-python/ipdb[${PYTHON_USEDEP}]" && \
- has_version -d "dev-python/pillow[${PYTHON_USEDEP}]" && \
- has_version -d "dev-util/gftools[${PYTHON_SINGLE_USEDEP}]"
-}
-
-pkg_setup() {
- use test && python-any-r1_pkg_setup
-}
-
-src_compile() {
- emake font
-}
-
-src_test() {
- emake test
- emake fbchecks
-}
diff --git a/media-fonts/3270font/Manifest b/media-fonts/3270font/Manifest
index 388e35cab..d00eb319b 100644
--- a/media-fonts/3270font/Manifest
+++ b/media-fonts/3270font/Manifest
@@ -1,2 +1 @@
-DIST 3270font-2.3.0.tar.gz 520106 BLAKE2B e3ece6a0f476d20bf4135057739a73deee49050b6be9b4bd3731b228729f622d059c53a122a266332e02e71af08dc6b13f215358dc275edd91247e3119d249be SHA512 26d1a32990b0ea8395959ed37d7acc76f1f1d160488ff6e96bb39fc8ca952339c09ed06cb0783a69b6ef6545be72ed63665af3584f79852fe0a813301f77ea7d
DIST 3270font-2.3.1.tar.gz 526018 BLAKE2B c39f71df9f0a597ff3c32ec320f007af6508b0d8d6b68a3a8d621f5484ddc78334d6b73161f9d11e2f75855678f882e500bd698b87b5caa1e51125d763c530e8 SHA512 df1d0909d6acff0b796f236d177828e9e9ded7b771c9cb675a63a7689c0ab1a159d44ab641aa4bca91e8548972a7bca38b583c56ea0c09e15a6b1f1ede798324
^ permalink raw reply related [flat|nested] 8+ messages in thread* [gentoo-commits] repo/proj/guru:master commit in: media-fonts/3270font/
@ 2022-12-27 8:05 Viorel Munteanu
0 siblings, 0 replies; 8+ messages in thread
From: Viorel Munteanu @ 2022-12-27 8:05 UTC (permalink / raw
To: gentoo-commits
commit: 16f24f0dbd38fa6fe4e2e4f63a62de7ba8256bdf
Author: Anna (cybertailor) Vyalkova <cyber+gentoo <AT> sysrq <DOT> in>
AuthorDate: Sat Dec 24 01:18:46 2022 +0000
Commit: Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
CommitDate: Sun Dec 25 02:19:22 2022 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=16f24f0d
media-fonts/3270font: update EAPI 7 -> 8
Signed-off-by: Anna (cybertailor) Vyalkova <cyber+gentoo <AT> sysrq.in>
media-fonts/3270font/3270font-2.3.1.ebuild | 33 +++++++++++++++---------------
1 file changed, 16 insertions(+), 17 deletions(-)
diff --git a/media-fonts/3270font/3270font-2.3.1.ebuild b/media-fonts/3270font/3270font-2.3.1.ebuild
index ef8fcf268..b933d5488 100644
--- a/media-fonts/3270font/3270font-2.3.1.ebuild
+++ b/media-fonts/3270font/3270font-2.3.1.ebuild
@@ -1,15 +1,14 @@
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI="7"
+EAPI=8
PYTHON_COMPAT=( python3_{8..9} )
-
inherit font python-any-r1
DESCRIPTION="A IBM 3270 Terminal font in a modern format"
HOMEPAGE="https://github.com/rbanffy/3270font"
-SRC_URI="https://github.com/rbanffy/3270font/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/rbanffy/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD CC-BY-SA-3.0 GPL-3 OFL"
SLOT="0"
@@ -18,14 +17,8 @@ IUSE="test"
RESTRICT="test"
PROPERTIES="test_network"
-DOCS=( CHANGELOG.md README.md )
-HTML_DOCS=( "DESCRIPTION.en_us.html" )
-PATCHES=(
- "${FILESDIR}/remove-useless-tests.patch"
- "${FILESDIR}/${PN}-2.3.0-correctly-pass-options.patch"
-)
-DEPEND="
+BDEPEND="
${PYTHON_DEPS}
media-gfx/fontforge
test? (
@@ -38,17 +31,23 @@ DEPEND="
)
"
+DOCS=( CHANGELOG.md README.md )
+HTML_DOCS=( "DESCRIPTION.en_us.html" )
+
+PATCHES=(
+ "${FILESDIR}/remove-useless-tests.patch"
+ "${FILESDIR}/${PN}-2.3.0-correctly-pass-options.patch"
+)
+
FONT_S="${S}/build"
FONT_SUFFIX="otf ttf pfm woff"
python_check_deps() {
- has_version -d "dev-python/ipdb[${PYTHON_USEDEP}]" && \
- has_version -d "dev-python/pillow[${PYTHON_USEDEP}]" && \
- has_version -d "dev-util/gftools[${PYTHON_SINGLE_USEDEP}]"
-}
-
-pkg_setup() {
- use test && python-any-r1_pkg_setup
+ use test || return 0
+ python_has_version -b "dev-python/ipdb[${PYTHON_USEDEP}]" &&
+ python_has_version -b "dev-python/pillow[${PYTHON_USEDEP}]" &&
+ python_has_version -b "dev-util/gftools[${PYTHON_SINGLE_USEDEP}]" &&
+ python_has_version -b "media-gfx/fontbakery[${PYTHON_USEDEP}]"
}
src_compile() {
^ permalink raw reply related [flat|nested] 8+ messages in thread
end of thread, other threads:[~2022-12-27 8:05 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-04-17 20:00 [gentoo-commits] repo/proj/guru:dev commit in: media-fonts/3270font/ Andrew Ammerlaan
2021-04-17 20:00 ` [gentoo-commits] repo/proj/guru:master " Andrew Ammerlaan
-- strict thread matches above, loose matches on Subject: below --
2021-04-18 9:10 Andrew Ammerlaan
2021-04-18 15:59 [gentoo-commits] repo/proj/guru:dev " Andrew Ammerlaan
2021-04-18 16:01 ` [gentoo-commits] repo/proj/guru:master " Andrew Ammerlaan
2021-04-18 16:01 Andrew Ammerlaan
2021-04-19 8:04 Andrew Ammerlaan
2022-12-27 8:05 Viorel Munteanu
2022-12-27 8:05 Viorel Munteanu
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox