| 1 |
commit: 7c9eb809db0bebeb0c99f8fd6ac6a309171920eb |
| 2 |
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Nov 27 22:56:17 2019 +0000 |
| 4 |
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Nov 27 22:56:49 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c9eb809 |
| 7 |
|
| 8 |
games-kids/tuxtype: Fix missing and optional dependencies |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/701298 |
| 11 |
Package-Manager: Portage-2.3.80, Repoman-2.3.17 |
| 12 |
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org> |
| 13 |
|
| 14 |
games-kids/tuxtype/metadata.xml | 3 +++ |
| 15 |
.../{tuxtype-1.8.3.ebuild => tuxtype-1.8.3-r1.ebuild} | 16 ++++++++++++---- |
| 16 |
2 files changed, 15 insertions(+), 4 deletions(-) |
| 17 |
|
| 18 |
diff --git a/games-kids/tuxtype/metadata.xml b/games-kids/tuxtype/metadata.xml |
| 19 |
index 52de2ed0b37..edb3136e701 100644 |
| 20 |
--- a/games-kids/tuxtype/metadata.xml |
| 21 |
+++ b/games-kids/tuxtype/metadata.xml |
| 22 |
@@ -8,4 +8,7 @@ |
| 23 |
<upstream> |
| 24 |
<remote-id type="github">tux4kids/tuxtype</remote-id> |
| 25 |
</upstream> |
| 26 |
+ <use> |
| 27 |
+ <flag name="pango">Render fonts using <pkg>media-libs/sdl-pango</pkg> instead of <pkg>media-libs/sdl-ttf</pkg></flag> |
| 28 |
+ </use> |
| 29 |
</pkgmetadata> |
| 30 |
|
| 31 |
diff --git a/games-kids/tuxtype/tuxtype-1.8.3.ebuild b/games-kids/tuxtype/tuxtype-1.8.3-r1.ebuild |
| 32 |
similarity index 77% |
| 33 |
rename from games-kids/tuxtype/tuxtype-1.8.3.ebuild |
| 34 |
rename to games-kids/tuxtype/tuxtype-1.8.3-r1.ebuild |
| 35 |
index b808b1e4682..ecbbdaebb72 100644 |
| 36 |
--- a/games-kids/tuxtype/tuxtype-1.8.3.ebuild |
| 37 |
+++ b/games-kids/tuxtype/tuxtype-1.8.3-r1.ebuild |
| 38 |
@@ -12,17 +12,19 @@ SRC_URI="https://github.com/tux4kids/${PN}/archive/upstream/${PV}.tar.gz -> ${P} |
| 39 |
LICENSE="GPL-2 OFL-1.1" |
| 40 |
SLOT="0" |
| 41 |
KEYWORDS="~amd64 ~x86" |
| 42 |
-IUSE="svg" |
| 43 |
+IUSE="+pango svg" |
| 44 |
|
| 45 |
DEPEND="acct-group/gamestat |
| 46 |
+ dev-games/t4k-common |
| 47 |
media-libs/libsdl[video] |
| 48 |
media-libs/sdl-image |
| 49 |
media-libs/sdl-mixer |
| 50 |
- media-libs/sdl-pango |
| 51 |
- media-libs/sdl-ttf |
| 52 |
+ !pango? ( media-libs/sdl-ttf ) |
| 53 |
+ pango? ( media-libs/sdl-pango ) |
| 54 |
svg? ( gnome-base/librsvg:2 )" |
| 55 |
|
| 56 |
RDEPEND="${DEPEND}" |
| 57 |
+BDEPEND="virtual/pkgconfig" |
| 58 |
|
| 59 |
S="${WORKDIR}/${PN}-upstream-${PV}" |
| 60 |
|
| 61 |
@@ -32,13 +34,19 @@ PATCHES=( |
| 62 |
|
| 63 |
src_prepare() { |
| 64 |
xdg_src_prepare |
| 65 |
+ |
| 66 |
+ # Fix broken linkage due to incorrect variable casing. |
| 67 |
+ sed -i 's:$SDL_TTF:$SDL_ttf:g' configure.ac || die |
| 68 |
+ |
| 69 |
eautoreconf |
| 70 |
} |
| 71 |
|
| 72 |
src_configure() { |
| 73 |
econf \ |
| 74 |
--localedir="${EPREFIX}"/usr/share/locale \ |
| 75 |
- $(use_with svg rsvg) |
| 76 |
+ $(use_with pango sdlpango) \ |
| 77 |
+ $(use_with svg rsvg) \ |
| 78 |
+ --without-sdlnet # Unused! |
| 79 |
} |
| 80 |
|
| 81 |
src_install() { |
Archives