media-gfx/gnofract4d: version bump to 4.0.1 #9640
Conversation
|
Pull Request assignment Areas affected: ebuilds media-gfx/gnofract4d: @gentoo/graphics No bugs to link found. If your pull request references any of the Gentoo bug reports, please add appropriate GLEP 66 tags to the commit message and ping us to reset the assignment. If you do not receive any reply to this pull request, please open or link a bug to attract the attention of maintainers. In order to force reassignment and/or bug reference scan, please append |
gentoo-bot
added
assigned
|
Looks like doc generation does need: Best way to do this? Duplicate in DEPEND help? ? |
cjmayo
force-pushed
the
gnofract4d-4.0.1
branch
from
6cc2f1b
to
46c4ba0
Compare
a17r
added
the
help wanted
|
As it's only 2 deps, I personally wouldn't introduce any new DOC_DEPEND variable for them, but write them manually in DEPEND="help? ( ..." as you said. |
| PYTHON_COMPAT=( python3_{6,7} ) | ||
| DISTUTILS_SINGLE_IMPL=1 | ||
|
|
||
| inherit distutils-r1 gnome2-utils xdg-utils |
There was a problem hiding this comment.
You should perhaps use the new xdg.eclass instead of gnome-utils and xdg-utils to handle postinst and postrm for you? Then you can also bump EAPI to 7.
(note that with EAPI-7 virtual/pkgconfig is a BDEPEND)
There was a problem hiding this comment.
xdg is much better, used that instead and deleted postinst and postrm.
EAPI 7 discussed below.
Added to DEPEND. For EAPI 7, I think it's not just pkgconfig but the help dependencies that would be BDEPEND. The problem I see is that to generate the help it imports a lot of the code, which I think will pull in the compiled shared object fract4dc.cpython-37m-x86_64-linux-gnu.so. dev-python/pygobject was missing a slot. |
There was a problem hiding this comment.
LGTM!
If their libraries are needed in the target system (and/or linked), then they are in DEPEND. Don't stress about BDEPEND, it's there to ease the burden when cross-compiling, but it's more important to make the package build before fine-tuning details IMO.
cjmayo
force-pushed
the
gnofract4d-4.0.1
branch
2 times, most recently
from
3b937f2
to
eb713f2
Compare
|
Mistakenly tried EAPI 7, restored to previous. |
cjmayo
force-pushed
the
gnofract4d-4.0.1
branch
from
eb713f2
to
959cd0b
Compare
@@ -5,6 +5,7 @@
PYTHON_COMPAT=( python3_{6,7} )
DISTUTILS_SINGLE_IMPL=1
+DISTUTILS_USE_SETUPTOOLS=no
inherit distutils-r1 xdg |
cjmayo
force-pushed
the
gnofract4d-4.0.1
branch
from
959cd0b
to
f8d71d6
Compare
|
xdg.eclass also exports its own src_prepare so add a src_prepare to ensure distutils function is called too. |
cjmayo
force-pushed
the
gnofract4d-4.0.1
branch
from
f8d71d6
to
fad1193
Compare
There was a problem hiding this comment.
Looks like the graphics project won't give attention to this so let's push it through. Few things I want updated first, thanks for proactively updating to latest distutils-r1 stuff and copyright date.
I think you can close the bug while at it with Closes: tag.
| # Copyright 1999-2020 Gentoo Authors | ||
| # Distributed under the terms of the GNU General Public License v2 | ||
|
|
||
| EAPI=6 |
| x11-libs/gtk+:3[introspection] | ||
| video? ( media-video/ffmpeg[vpx,zlib] )" | ||
| DEPEND="${COMMON_DEPEND} | ||
| virtual/pkgconfig |
|
|
||
| src_prepare() { | ||
| distutils-r1_src_prepare | ||
| xdg_environment_reset |
There was a problem hiding this comment.
With EAPI-7 this most likely isn't needed, since it does the environment cleaning.
|
|
||
| python_install_all() { | ||
| distutils-r1_python_install_all | ||
| rm -rf "${ED%/}"/usr/share/doc/${PN} || die |
There was a problem hiding this comment.
You shouldn't use -f but to know when the file is there and when not.
There was a problem hiding this comment.
Removed the -f and %/ from ED now we are EAPI 7.
| python_install_all() { | ||
| distutils-r1_python_install_all | ||
| rm -rf "${ED%/}"/usr/share/doc/${PN} || die | ||
| use help || rm -rf "${ED%/}"/usr/share/gnome/help/${PN} || die |
There was a problem hiding this comment.
Same here, also I'd like this to be opened similarily that is above (ie make it multi-line if ! use; then, or make the rm -r || die inside a subshell.
There was a problem hiding this comment.
As above plus converted to an if.
New help and video USE flags. Closes: https://bugs.gentoo.org/665576 Package-Manager: Portage-2.3.79, Repoman-2.3.16 Signed-off-by: Chris Mayo <aklhfex@gmail.com>
cjmayo
force-pushed
the
gnofract4d-4.0.1
branch
from
fad1193
to
43beb74
Compare
|
Also added Python 3.8. I looked at this again and decided it would be a lot better to take a more current snapshot:
Changes in addition to the above: --- gnofract4d-4.0.1.ebuild
+++ gnofract4d-4.0.1_p1.ebuild
@@ -7,16 +7,19 @@
DISTUTILS_SINGLE_IMPL=1
DISTUTILS_USE_SETUPTOOLS=no
-inherit distutils-r1 xdg
+inherit distutils-r1 virtualx xdg
+
+COMMIT=bd600c20921afff7b02fc0a76ab79242ebd0896d
DESCRIPTION="A program for drawing beautiful mathematically-based images known as fractals"
HOMEPAGE="http://edyoung.github.io/gnofract4d/"
-SRC_URI="https://github.com/edyoung/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/edyoung/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="+help video"
+REQUIRED_USE="test? ( help )"
COMMON_DEPEND="
media-libs/libpng:0=
@@ -33,12 +36,16 @@
dev-libs/libxslt
x11-libs/gtk+:3[introspection] )"
-PATCHES=(
- "${FILESDIR}"/${P}-xsl.patch
-)
+distutils_enable_tests pytest
+
+S="${WORKDIR}/${PN}-${COMMIT}"
src_prepare() {
distutils-r1_src_prepare
+}
+
+python_test() {
+ virtx pytest fract4d fract4dgui test.py || die
}
python_compile_all() { |
Added help and video USE flags.
Package-Manager: Portage-2.3.47, Repoman-2.3.10
New version migrated to Python 3 and GTK+ 3.
Use flags because help needs additional dependencies and specific ffmpeg USE flags needed for video.
gnofract4d-4.0.1-xsl.patch is upstream.
https://sourceforge.net/projects/gnofract4d/ says:
"This project has been moved to Github, Look there instead"