commit: 190d0e3e44dce096d25a30020e6e45151ee12697 Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Wed Jul 15 11:33:23 2020 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Wed Jul 15 11:33:52 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=190d0e3e
dev-python/pygame: Fix missing test deps Closes: https://bugs.gentoo.org/732452 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> dev-python/pygame/pygame-1.9.6-r1.ebuild | 16 +++++++++++++--- dev-python/pygame/pygame-2.0.0_pre10.ebuild | 10 ++++++++-- dev-python/pygame/pygame-9999.ebuild | 10 ++++++++-- 3 files changed, 29 insertions(+), 7 deletions(-) diff --git a/dev-python/pygame/pygame-1.9.6-r1.ebuild b/dev-python/pygame/pygame-1.9.6-r1.ebuild index 89eb5d201d1..2a3444dbdc6 100644 --- a/dev-python/pygame/pygame-1.9.6-r1.ebuild +++ b/dev-python/pygame/pygame-1.9.6-r1.ebuild @@ -16,7 +16,7 @@ KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ~ppc64 ~sparc x86" IUSE="doc examples midi opengl test X" RESTRICT="!test? ( test )" -DEPEND="dev-python/numpy[${PYTHON_USEDEP}] +RDEPEND="dev-python/numpy[${PYTHON_USEDEP}] >=media-libs/sdl-image-1.2.2[png,jpeg] >=media-libs/sdl-mixer-1.2.4 >=media-libs/sdl-ttf-2.0.6 @@ -24,10 +24,20 @@ DEPEND="dev-python/numpy[${PYTHON_USEDEP}] midi? ( media-libs/portmidi ) X? ( >=media-libs/libsdl-1.2.5[opengl?,video,X] ) !X? ( >=media-libs/libsdl-1.2.5 )" -RDEPEND="${DEPEND}" +DEPEND="${RDEPEND} + test? ( + media-libs/sdl-image[gif,png,jpeg] + media-libs/sdl-mixer[mp3,vorbis,wav] + )" +# fontconfig used for fc-list +RDEPEND+=" + media-libs/fontconfig" # util-linux provides script BDEPEND=" - test? ( sys-apps/util-linux )" + test? ( + media-libs/fontconfig + sys-apps/util-linux + )" src_prepare() { # segfaults on Xvfb diff --git a/dev-python/pygame/pygame-2.0.0_pre10.ebuild b/dev-python/pygame/pygame-2.0.0_pre10.ebuild index e0019d48ec6..f1da10c2c2c 100644 --- a/dev-python/pygame/pygame-2.0.0_pre10.ebuild +++ b/dev-python/pygame/pygame-2.0.0_pre10.ebuild @@ -22,7 +22,7 @@ IUSE="doc examples midi opengl test X" RESTRICT="!test? ( test )" RDEPEND="dev-python/numpy[${PYTHON_USEDEP}] - >=media-libs/sdl2-image-1.2.2[jpeg,png] + >=media-libs/sdl2-image-1.2.2 >=media-libs/sdl2-mixer-1.2.4 >=media-libs/sdl2-ttf-2.0.6 >=media-libs/smpeg2-0.4.4-r1 @@ -34,9 +34,15 @@ DEPEND="${RDEPEND} media-libs/sdl2-image[gif,jpeg,png] media-libs/sdl2-mixer[mp3,vorbis,wav] )" +# fontconfig used for fc-list +RDEPEND+=" + media-libs/fontconfig" # util-linux provides script BDEPEND=" - test? ( sys-apps/util-linux )" + test? ( + media-libs/fontconfig + sys-apps/util-linux + )" PATCHES=( "${FILESDIR}"/${P}-py39.patch diff --git a/dev-python/pygame/pygame-9999.ebuild b/dev-python/pygame/pygame-9999.ebuild index 9a1c6f7040a..1023f6136c3 100644 --- a/dev-python/pygame/pygame-9999.ebuild +++ b/dev-python/pygame/pygame-9999.ebuild @@ -17,7 +17,7 @@ IUSE="doc examples midi opengl test X" RESTRICT="!test? ( test )" RDEPEND="dev-python/numpy[${PYTHON_USEDEP}] - >=media-libs/sdl2-image-1.2.2[jpeg,png] + >=media-libs/sdl2-image-1.2.2 >=media-libs/sdl2-mixer-1.2.4 >=media-libs/sdl2-ttf-2.0.6 >=media-libs/smpeg2-0.4.4-r1 @@ -29,9 +29,15 @@ DEPEND="${RDEPEND} media-libs/sdl2-image[gif,jpeg,png] media-libs/sdl2-mixer[mp3,vorbis,wav] )" +# fontconfig used for fc-list +RDEPEND+=" + media-libs/fontconfig" # util-linux provides script BDEPEND=" - test? ( sys-apps/util-linux )" + test? ( + media-libs/fontconfig + sys-apps/util-linux + )" python_configure() { PORTMIDI_INC_PORTTIME=1 LOCALBASE="${EPREFIX}/usr" \
