From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 3854B138334 for ; Wed, 27 Nov 2019 22:57:11 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 64CB2E09CF; Wed, 27 Nov 2019 22:57:10 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 47568E09CF for ; Wed, 27 Nov 2019 22:57:10 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5FDA934D4EC for ; Wed, 27 Nov 2019 22:57:09 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 128638B5 for ; Wed, 27 Nov 2019 22:57:08 +0000 (UTC) From: "James Le Cuirot" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "James Le Cuirot" Message-ID: <1574895409.7c9eb809db0bebeb0c99f8fd6ac6a309171920eb.chewi@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: games-kids/tuxtype/ X-VCS-Repository: repo/gentoo X-VCS-Files: games-kids/tuxtype/metadata.xml games-kids/tuxtype/tuxtype-1.8.3-r1.ebuild games-kids/tuxtype/tuxtype-1.8.3.ebuild X-VCS-Directories: games-kids/tuxtype/ X-VCS-Committer: chewi X-VCS-Committer-Name: James Le Cuirot X-VCS-Revision: 7c9eb809db0bebeb0c99f8fd6ac6a309171920eb X-VCS-Branch: master Date: Wed, 27 Nov 2019 22:57:08 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 1e24f84e-c2e6-476e-977b-a52508d78161 X-Archives-Hash: b0f4a8d15672dcd777ede2e2d0d5c6c1 commit: 7c9eb809db0bebeb0c99f8fd6ac6a309171920eb Author: James Le Cuirot gentoo org> AuthorDate: Wed Nov 27 22:56:17 2019 +0000 Commit: James Le Cuirot gentoo 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 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 @@ tux4kids/tuxtype + + Render fonts using media-libs/sdl-pango instead of media-libs/sdl-ttf + 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() {