commit: 7c9eb809db0bebeb0c99f8fd6ac6a309171920eb Author: James Le Cuirot <chewi <AT> gentoo <DOT> org> AuthorDate: Wed Nov 27 22:56:17 2019 +0000 Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> CommitDate: Wed Nov 27 22:56:49 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c9eb809
games-kids/tuxtype: Fix missing and optional dependencies Closes: https://bugs.gentoo.org/701298 Package-Manager: Portage-2.3.80, Repoman-2.3.17 Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org> games-kids/tuxtype/metadata.xml | 3 +++ .../{tuxtype-1.8.3.ebuild => tuxtype-1.8.3-r1.ebuild} | 16 ++++++++++++---- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/games-kids/tuxtype/metadata.xml b/games-kids/tuxtype/metadata.xml index 52de2ed0b37..edb3136e701 100644 --- a/games-kids/tuxtype/metadata.xml +++ b/games-kids/tuxtype/metadata.xml @@ -8,4 +8,7 @@ <upstream> <remote-id type="github">tux4kids/tuxtype</remote-id> </upstream> + <use> + <flag name="pango">Render fonts using <pkg>media-libs/sdl-pango</pkg> instead of <pkg>media-libs/sdl-ttf</pkg></flag> + </use> </pkgmetadata> diff --git a/games-kids/tuxtype/tuxtype-1.8.3.ebuild b/games-kids/tuxtype/tuxtype-1.8.3-r1.ebuild similarity index 77% rename from games-kids/tuxtype/tuxtype-1.8.3.ebuild rename to games-kids/tuxtype/tuxtype-1.8.3-r1.ebuild index b808b1e4682..ecbbdaebb72 100644 --- a/games-kids/tuxtype/tuxtype-1.8.3.ebuild +++ b/games-kids/tuxtype/tuxtype-1.8.3-r1.ebuild @@ -12,17 +12,19 @@ SRC_URI="https://github.com/tux4kids/${PN}/archive/upstream/${PV}.tar.gz -> ${P} LICENSE="GPL-2 OFL-1.1" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="svg" +IUSE="+pango svg" DEPEND="acct-group/gamestat + dev-games/t4k-common media-libs/libsdl[video] media-libs/sdl-image media-libs/sdl-mixer - media-libs/sdl-pango - media-libs/sdl-ttf + !pango? ( media-libs/sdl-ttf ) + pango? ( media-libs/sdl-pango ) svg? ( gnome-base/librsvg:2 )" RDEPEND="${DEPEND}" +BDEPEND="virtual/pkgconfig" S="${WORKDIR}/${PN}-upstream-${PV}" @@ -32,13 +34,19 @@ PATCHES=( src_prepare() { xdg_src_prepare + + # Fix broken linkage due to incorrect variable casing. + sed -i 's:$SDL_TTF:$SDL_ttf:g' configure.ac || die + eautoreconf } src_configure() { econf \ --localedir="${EPREFIX}"/usr/share/locale \ - $(use_with svg rsvg) + $(use_with pango sdlpango) \ + $(use_with svg rsvg) \ + --without-sdlnet # Unused! } src_install() {
