Gentoo Archives: gentoo-commits

From: Joonas Niilola <juippis@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/gnofract4d/
Date: Sun, 05 Jan 2020 10:10:23
Message-Id: 1578218983.18fb920c894f93e955efad11bb6b44f40f64023e.juippis@gentoo
1 commit: 18fb920c894f93e955efad11bb6b44f40f64023e
2 Author: Joonas Niilola <juippis <AT> gentoo <DOT> org>
3 AuthorDate: Sun Jan 5 08:36:18 2020 +0000
4 Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
5 CommitDate: Sun Jan 5 10:09:43 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18fb920c
7
8 media-gfx/gnofract4d: reformat use flags
9
10 Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
11
12 media-gfx/gnofract4d/gnofract4d-4.0.1_p1.ebuild | 24 +++++++++++++++---------
13 media-gfx/gnofract4d/metadata.xml | 3 +--
14 2 files changed, 16 insertions(+), 11 deletions(-)
15
16 diff --git a/media-gfx/gnofract4d/gnofract4d-4.0.1_p1.ebuild b/media-gfx/gnofract4d/gnofract4d-4.0.1_p1.ebuild
17 index b4044c6aed2..b87c0d129ea 100644
18 --- a/media-gfx/gnofract4d/gnofract4d-4.0.1_p1.ebuild
19 +++ b/media-gfx/gnofract4d/gnofract4d-4.0.1_p1.ebuild
20 @@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{6,7,8} )
21 DISTUTILS_SINGLE_IMPL=1
22 DISTUTILS_USE_SETUPTOOLS=no
23
24 -inherit distutils-r1 virtualx xdg
25 +inherit distutils-r1 eutils virtualx xdg
26
27 COMMIT=bd600c20921afff7b02fc0a76ab79242ebd0896d
28
29 @@ -18,8 +18,8 @@ SRC_URI="https://github.com/edyoung/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.g
30 LICENSE="BSD"
31 SLOT="0"
32 KEYWORDS="~amd64 ~x86"
33 -IUSE="+help video"
34 -REQUIRED_USE="test? ( help )"
35 +IUSE="+doc"
36 +REQUIRED_USE="test? ( doc )"
37
38 COMMON_DEPEND="
39 media-libs/libpng:0=
40 @@ -27,14 +27,15 @@ COMMON_DEPEND="
41 RDEPEND="${COMMON_DEPEND}
42 dev-python/pycairo[${PYTHON_USEDEP}]
43 dev-python/pygobject:3[${PYTHON_USEDEP}]
44 - x11-libs/gtk+:3[introspection]
45 - video? ( media-video/ffmpeg[vpx,zlib] )"
46 + x11-libs/gtk+:3[introspection]"
47 BDEPEND="virtual/pkgconfig"
48 DEPEND="${COMMON_DEPEND}
49 - help? ( app-text/docbook-xsl-stylesheets
50 + doc? (
51 + app-text/docbook-xsl-stylesheets
52 dev-python/pygobject[${PYTHON_USEDEP}]
53 dev-libs/libxslt
54 - x11-libs/gtk+:3[introspection] )"
55 + x11-libs/gtk+:3[introspection]
56 + )"
57
58 distutils_enable_tests pytest
59
60 @@ -49,7 +50,7 @@ python_test() {
61 }
62
63 python_compile_all() {
64 - if use help; then
65 + if use doc; then
66 ln -s "${BUILD_DIR}"/lib/fract4d/*.so fract4d/ || die
67 "${EPYTHON}" createdocs.py || die
68 fi
69 @@ -58,7 +59,12 @@ python_compile_all() {
70 python_install_all() {
71 distutils-r1_python_install_all
72 rm -r "${ED}"/usr/share/doc/${PN} || die
73 - if ! use help; then
74 + if ! use doc; then
75 rm -r "${ED}"/usr/share/gnome/help/${PN} || die
76 fi
77 }
78 +
79 +pkg_postinst() {
80 + elog "Optional missing features:"
81 + optfeature "creating videos" media-video/ffmpeg[vpx,zlib]
82 +}
83
84 diff --git a/media-gfx/gnofract4d/metadata.xml b/media-gfx/gnofract4d/metadata.xml
85 index 9d262e8792a..38cc24b2d95 100644
86 --- a/media-gfx/gnofract4d/metadata.xml
87 +++ b/media-gfx/gnofract4d/metadata.xml
88 @@ -9,7 +9,6 @@
89 <remote-id type="github">edyoung/gnofract4d</remote-id>
90 </upstream>
91 <use>
92 - <flag name="help">Install user manual</flag>
93 - <flag name="video">Support creation of videos</flag>
94 + <flag name="doc">Install user manual</flag>
95 </use>
96 </pkgmetadata>