[gentoo-commits] repo/gentoo:master commit in: games-kids/tuxtype/files/, games-kids/tuxtype/
commit: c3f197ba78bebdc6c23482fa1e227e73d5f576c5
Author: Ionen Wolkens gentoo org>
AuthorDate: Thu Jun 10 13:20:27 2021 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Thu Jun 10 13:21:28 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c3f197ba
games-kids/tuxtype: fix build without t4k-common
Closes: https://bugs.gentoo.org/795222
Signed-off-by: Ionen Wolkens gentoo.org>
.../tuxtype/files/tuxtype-1.8.3-t4kcommon.patch | 20
games-kids/tuxtype/tuxtype-1.8.3-r2.ebuild | 1 +
2 files changed, 21 insertions(+)
diff --git a/games-kids/tuxtype/files/tuxtype-1.8.3-t4kcommon.patch
b/games-kids/tuxtype/files/tuxtype-1.8.3-t4kcommon.patch
new file mode 100644
index 000..14ded561904
--- /dev/null
+++ b/games-kids/tuxtype/files/tuxtype-1.8.3-t4kcommon.patch
@@ -0,0 +1,20 @@
+This was added ahead of time (for next version), currently unused.
+--- a/configure.ac
b/configure.ac
+@@ -249,16 +249,4 @@
+ dnl libt4kcommon is now required:
+
+-PKG_CHECK_MODULES([T4K_COMMON],
+- [t4k_common],
+- [],
+- [AC_MSG_NOTICE([t4k_common not located by pkg-config, checking with AC
CHECK LIB:])
+- AC_CHECK_LIB([t4k_common],
+- [InitT4KCommon],
+- [],
+- [AC_MSG_ERROR([libt4k_common is required:
git://git.debian.org/tux4kids/t4kcommon.git])])])
+-
+-AC_DEFINE([HAVE_LIBT4K_COMMON],[1],[Define to 1 if you have the `t4k_common`
library])
+-CFLAGS="$CFLAGS $T4K_COMMON_CFLAGS"
+-LIBS="$LIBS $T4K_COMMON_LIBS"
+
+
diff --git a/games-kids/tuxtype/tuxtype-1.8.3-r2.ebuild
b/games-kids/tuxtype/tuxtype-1.8.3-r2.ebuild
index 55d2d6b8927..5c8cb51013e 100644
--- a/games-kids/tuxtype/tuxtype-1.8.3-r2.ebuild
+++ b/games-kids/tuxtype/tuxtype-1.8.3-r2.ebuild
@@ -26,6 +26,7 @@ BDEPEND="virtual/pkgconfig"
PATCHES=(
"${FILESDIR}"/${P}-games-group.patch
"${FILESDIR}"/${P}-missing-text.patch
+ "${FILESDIR}"/${P}-t4kcommon.patch
)
src_prepare() {
[gentoo-commits] repo/gentoo:master commit in: games-kids/tuxtype/
commit: 72d082ddbf4d0db056e7428711a079df01fbf7c5
Author: Ionen Wolkens gentoo org>
AuthorDate: Thu Jun 10 10:34:37 2021 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Thu Jun 10 11:51:43 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=72d082dd
games-kids/tuxtype: drop 1.8.3-r1
With current libsdl, this version won't display text and is unplayable.
Signed-off-by: Ionen Wolkens gentoo.org>
games-kids/tuxtype/metadata.xml| 3 --
games-kids/tuxtype/tuxtype-1.8.3-r1.ebuild | 63 --
2 files changed, 66 deletions(-)
diff --git a/games-kids/tuxtype/metadata.xml b/games-kids/tuxtype/metadata.xml
index edb3136e701..52de2ed0b37 100644
--- a/games-kids/tuxtype/metadata.xml
+++ b/games-kids/tuxtype/metadata.xml
@@ -8,7 +8,4 @@
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-r1.ebuild
b/games-kids/tuxtype/tuxtype-1.8.3-r1.ebuild
deleted file mode 100644
index ecbbdaebb72..000
--- a/games-kids/tuxtype/tuxtype-1.8.3-r1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools desktop xdg
-
-DESCRIPTION="Typing tutorial with lots of eye-candy"
-HOMEPAGE="https://github.com/tux4kids/tuxtype;
-SRC_URI="https://github.com/tux4kids/${PN}/archive/upstream/${PV}.tar.gz ->
${P}.tar.gz"
-
-LICENSE="GPL-2 OFL-1.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+pango svg"
-
-DEPEND="acct-group/gamestat
- dev-games/t4k-common
- media-libs/libsdl[video]
- media-libs/sdl-image
- media-libs/sdl-mixer
- !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}"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.8.3-games-group.patch
-)
-
-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 pango sdlpango) \
- $(use_with svg rsvg) \
- --without-sdlnet # Unused!
-}
-
-src_install() {
- emake install DESTDIR="${D}"
- rm -v "${ED}"/usr/share/doc/${PF}/{ABOUT-NLS,COPYING,INSTALL} || die
- keepdir /etc/${PN} /var/lib/${PN}/words
-
- newicon -s 64 icon.png ${PN}.png
- make_desktop_entry ${PN} TuxTyping
-
- fowners root:gamestat /var/lib/${PN} /usr/bin/${PN}
- fperms 660 /var/lib/${PN}
- fperms 2755 /usr/bin/${PN}
-}
[gentoo-commits] repo/gentoo:master commit in: games-kids/tuxtype/files/, games-kids/tuxtype/
commit: 5b5f4cc8dc131511fda89d87b8458707c4d1b1c0
Author: Ionen Wolkens gentoo org>
AuthorDate: Thu Jun 10 10:19:35 2021 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Thu Jun 10 11:51:42 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b5f4cc8
games-kids/tuxtype: fix missing text, force pango, tidy
Removed unused t4k-common dep given this package hasn't been migrated
to use it yet (upstream snapshot only has work-in-progress support).
This means needed to bring the t4k-common fix for missing text here.
Removed IUSE:
- svg: this is only work-in-progress code with no real use for now
- pango: sdl-ttf code is seeing neglect and upstream only really
use/test sdl-pango, forcing brings this in-line with t4k-common
and allows to remove bundled fonts.
Signed-off-by: Ionen Wolkens gentoo.org>
.../tuxtype/files/tuxtype-1.8.3-missing-text.patch | 15 +
games-kids/tuxtype/tuxtype-1.8.3-r2.ebuild | 67 ++
2 files changed, 82 insertions(+)
diff --git a/games-kids/tuxtype/files/tuxtype-1.8.3-missing-text.patch
b/games-kids/tuxtype/files/tuxtype-1.8.3-missing-text.patch
new file mode 100644
index 000..9553cfa8984
--- /dev/null
+++ b/games-kids/tuxtype/files/tuxtype-1.8.3-missing-text.patch
@@ -0,0 +1,15 @@
+Fix some missing (transparent) text with libsdl-1.2.15_p20210224.
+Same issue as t4k-common-0.1.1 given tuxtype shares the same
+code and wasn't migrated to support the separate library yet.
+--- a/src/SDL_extras.c
b/src/SDL_extras.c
+@@ -1297,3 +1297,3 @@
+ /* Use color key for eventual transparency: */
+- color_key = SDL_MapRGB(bg->format, 01, 01, 01);
++ color_key = SDL_MapRGBA(bg->format, 01, 01, 01, 0xff);
+ SDL_FillRect(bg, NULL, color_key);
+@@ -1344,3 +1344,3 @@
+ SDL_SetColorKey(bg, SDL_SRCCOLORKEY|SDL_RLEACCEL, color_key);
+- out = SDL_DisplayFormatAlpha(bg);
++ out = SDL_DisplayFormat(bg);
+ SDL_FreeSurface(bg);
diff --git a/games-kids/tuxtype/tuxtype-1.8.3-r2.ebuild
b/games-kids/tuxtype/tuxtype-1.8.3-r2.ebuild
new file mode 100644
index 000..55d2d6b8927
--- /dev/null
+++ b/games-kids/tuxtype/tuxtype-1.8.3-r2.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools desktop optfeature
+
+DESCRIPTION="Typing tutorial with lots of eye-candy"
+HOMEPAGE="https://www.tux4kids.com/;
+SRC_URI="https://github.com/tux4kids/${PN}/archive/upstream/${PV}.tar.gz ->
${P}.tar.gz"
+S="${WORKDIR}/${PN}-upstream-${PV}"
+
+LICENSE="CC-BY-3.0 CC-BY-SA-3.0 GPL-3+ public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+ acct-group/gamestat
+ media-libs/libsdl[video]
+ media-libs/sdl-image[jpeg,png]
+ media-libs/sdl-mixer
+ media-libs/sdl-pango"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-games-group.patch
+ "${FILESDIR}"/${P}-missing-text.patch
+)
+
+src_prepare() {
+ default
+
+ eautoreconf
+}
+
+src_configure() {
+ local econfargs=(
+ # these are a placeholder for future features, i.e. not useful
for now
+ --without-rsvg
+ --without-sdlnet
+ )
+ econf "${econfargs[@]}"
+}
+
+src_install() {
+ emake DESTDIR="${D}" install # skip einstalldocs, wrong files
+
+ keepdir /etc/${PN} /var/lib/${PN}
+
+ fowners :gamestat /var/lib/${PN} /usr/bin/${PN}
+ fperms g+s /usr/bin/${PN}
+ fperms 660 /var/lib/${PN}
+
+ newicon icon.png ${PN}.png
+ domenu ${PN}.desktop
+
+ # bundled fonts are unused if sdl-pango is enabled
+ rm -r "${ED}"/usr/share/${PN}/fonts || die
+ rm "${ED}"/usr/share/doc/${PF}/{ABOUT-NLS,COPYING,OFL,INSTALL} || die
+ rmdir "${ED}"/var/lib/${PN}/words || die
+}
+
+pkg_postinst() {
+ # mod detection fails if using modplug over mikmod
+ optfeature "music support" "media-libs/sdl-mixer[mod,mikmod,vorbis]"
+}
[gentoo-commits] repo/gentoo:master commit in: games-kids/tuxtype/
commit: 7c9eb809db0bebeb0c99f8fd6ac6a309171920eb
Author: James Le Cuirot gentoo org>
AuthorDate: Wed Nov 27 22:56:17 2019 +
Commit: James Le Cuirot gentoo org>
CommitDate: Wed Nov 27 22:56:49 2019 +
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() {
[gentoo-commits] repo/gentoo:master commit in: games-kids/tuxtype/
commit: e936a711934ce0297abbe79c5eb094f30162a44b
Author: James Le Cuirot gentoo org>
AuthorDate: Wed Nov 27 22:24:57 2019 +
Commit: James Le Cuirot gentoo org>
CommitDate: Wed Nov 27 22:56:46 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e936a711
games-kids/tuxtype: Drop old 1.8.1-r1
Package-Manager: Portage-2.3.79, Repoman-2.3.17
Signed-off-by: James Le Cuirot gentoo.org>
games-kids/tuxtype/Manifest| 1 -
games-kids/tuxtype/tuxtype-1.8.1-r1.ebuild | 46 --
2 files changed, 47 deletions(-)
diff --git a/games-kids/tuxtype/Manifest b/games-kids/tuxtype/Manifest
index be5b7102a95..0e6eba5b287 100644
--- a/games-kids/tuxtype/Manifest
+++ b/games-kids/tuxtype/Manifest
@@ -1,2 +1 @@
-DIST tuxtype-1.8.1.tar.gz 11470321 BLAKE2B
13650d319e75ed9770113475841780c3413b1d9918f9641bb5b32cf67a622ab731c54149e52252f69030ab8e016b4de408a835aaed29cbf5772213b58cab3e65
SHA512
c7285ece93168260215e20cb5e4f4a46da00687c22241e70f97f735e19501ea8f1abb38e4070fac108c524e5aa3f23f680acef6ef9f5654bc2dab954bcadab01
DIST tuxtype-1.8.3.tar.gz 11805625 BLAKE2B
f34b2386234001452a3aba8afda7206a6bf674e6e60d5e5a8ea889e462f6979615f46bd47d62353c75e814c785e6a2ce97728f8cef6c44e43bb799b633ca0175
SHA512
7638cf7b5cb3a02072d36b43d385e43797bb846c5a69fda532432fb80ece19c44ca7b9b54bd73d4d3b7462b18f90cadb4648ed82a1d9e4822d7f3bd2c7a89343
diff --git a/games-kids/tuxtype/tuxtype-1.8.1-r1.ebuild
b/games-kids/tuxtype/tuxtype-1.8.1-r1.ebuild
deleted file mode 100644
index db74faed70e..000
--- a/games-kids/tuxtype/tuxtype-1.8.1-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop xdg
-
-DESCRIPTION="Typing tutorial with lots of eye-candy"
-HOMEPAGE="https://github.com/tux4kids/tuxtype;
-SRC_URI="https://github.com/tux4kids/${PN}/archive/upstream/${PV}.tar.gz ->
${P}.tar.gz"
-
-LICENSE="GPL-2 OFL-1.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="svg"
-
-DEPEND="acct-group/gamestat
- media-libs/libsdl[video]
- media-libs/sdl-image
- media-libs/sdl-mixer
- media-libs/sdl-pango
- media-libs/sdl-ttf
- svg? ( gnome-base/librsvg:2 )"
-
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN}-upstream-${PV}"
-
-src_configure() {
- econf \
- --localedir="${EPREFIX}"/usr/share/locale \
- $(use_with svg rsvg)
-}
-
-src_install() {
- default
- rm -v "${ED}"/usr/share/doc/${PF}/{ABOUT-NLS,COPYING,INSTALL} || die
- keepdir /etc/${PN} /var/games/${PN}/words
-
- newicon -s 64 icon.png ${PN}.png
- make_desktop_entry ${PN} TuxTyping
-
- fowners root:gamestat /var/games/${PN} /usr/bin/${PN}
- fperms 660 /var/games/${PN}
- fperms 2755 /usr/bin/${PN}
-}
[gentoo-commits] repo/gentoo:master commit in: games-kids/tuxtype/
commit: 5f4ca15feab1287e17fe8f6c2432388d9a679264
Author: James Le Cuirot gentoo org>
AuthorDate: Tue Nov 26 21:09:27 2019 +
Commit: James Le Cuirot gentoo org>
CommitDate: Tue Nov 26 21:09:27 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f4ca15f
games-kids/tuxtype: EAPI 7, fix EPREFIX, xdg.eclass
Package-Manager: Portage-2.3.79, Repoman-2.3.17
Signed-off-by: James Le Cuirot gentoo.org>
games-kids/tuxtype/tuxtype-1.8.1-r1.ebuild | 21 -
1 file changed, 12 insertions(+), 9 deletions(-)
diff --git a/games-kids/tuxtype/tuxtype-1.8.1-r1.ebuild
b/games-kids/tuxtype/tuxtype-1.8.1-r1.ebuild
index 5ca2f0d987c..db74faed70e 100644
--- a/games-kids/tuxtype/tuxtype-1.8.1-r1.ebuild
+++ b/games-kids/tuxtype/tuxtype-1.8.1-r1.ebuild
@@ -1,8 +1,9 @@
# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
-inherit eutils
+EAPI=7
+
+inherit desktop xdg
DESCRIPTION="Typing tutorial with lots of eye-candy"
HOMEPAGE="https://github.com/tux4kids/tuxtype;
@@ -19,24 +20,26 @@ DEPEND="acct-group/gamestat
media-libs/sdl-mixer
media-libs/sdl-pango
media-libs/sdl-ttf
- svg? ( gnome-base/librsvg )"
-RDEPEND=${DEPEND}
+ svg? ( gnome-base/librsvg:2 )"
+
+RDEPEND="${DEPEND}"
-S=${WORKDIR}/${PN}-upstream-${PV}
+S="${WORKDIR}/${PN}-upstream-${PV}"
src_configure() {
econf \
- --localedir=/usr/share/locale \
+ --localedir="${EPREFIX}"/usr/share/locale \
$(use_with svg rsvg)
}
src_install() {
default
- rm -f "${D}"/usr/share/doc/${PF}/{COPYING,INSTALL,ABOUT-NLS}*
- doicon ${PN}.ico
- make_desktop_entry ${PN} TuxTyping /usr/share/pixmaps/${PN}.ico
+ rm -v "${ED}"/usr/share/doc/${PF}/{ABOUT-NLS,COPYING,INSTALL} || die
keepdir /etc/${PN} /var/games/${PN}/words
+ newicon -s 64 icon.png ${PN}.png
+ make_desktop_entry ${PN} TuxTyping
+
fowners root:gamestat /var/games/${PN} /usr/bin/${PN}
fperms 660 /var/games/${PN}
fperms 2755 /usr/bin/${PN}
[gentoo-commits] repo/gentoo:master commit in: games-kids/tuxtype/, games-kids/tuxtype/files/
commit: e101e08423f550004c4d5de0af8ec65557407807
Author: James Le Cuirot gentoo org>
AuthorDate: Tue Nov 26 21:24:10 2019 +
Commit: James Le Cuirot gentoo org>
CommitDate: Tue Nov 26 21:24:10 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e101e084
games-kids/tuxtype: Bump to 1.8.3, fix use of games group
Suggested-by: maurerpe
Closes: https://bugs.gentoo.org/658814
Package-Manager: Portage-2.3.79, Repoman-2.3.17
Signed-off-by: James Le Cuirot gentoo.org>
games-kids/tuxtype/Manifest| 1 +
.../tuxtype/files/tuxtype-1.8.3-games-group.patch | 11 +
games-kids/tuxtype/tuxtype-1.8.3.ebuild| 55 ++
3 files changed, 67 insertions(+)
diff --git a/games-kids/tuxtype/Manifest b/games-kids/tuxtype/Manifest
index 7767407cec5..be5b7102a95 100644
--- a/games-kids/tuxtype/Manifest
+++ b/games-kids/tuxtype/Manifest
@@ -1 +1,2 @@
DIST tuxtype-1.8.1.tar.gz 11470321 BLAKE2B
13650d319e75ed9770113475841780c3413b1d9918f9641bb5b32cf67a622ab731c54149e52252f69030ab8e016b4de408a835aaed29cbf5772213b58cab3e65
SHA512
c7285ece93168260215e20cb5e4f4a46da00687c22241e70f97f735e19501ea8f1abb38e4070fac108c524e5aa3f23f680acef6ef9f5654bc2dab954bcadab01
+DIST tuxtype-1.8.3.tar.gz 11805625 BLAKE2B
f34b2386234001452a3aba8afda7206a6bf674e6e60d5e5a8ea889e462f6979615f46bd47d62353c75e814c785e6a2ce97728f8cef6c44e43bb799b633ca0175
SHA512
7638cf7b5cb3a02072d36b43d385e43797bb846c5a69fda532432fb80ece19c44ca7b9b54bd73d4d3b7462b18f90cadb4648ed82a1d9e4822d7f3bd2c7a89343
diff --git a/games-kids/tuxtype/files/tuxtype-1.8.3-games-group.patch
b/games-kids/tuxtype/files/tuxtype-1.8.3-games-group.patch
new file mode 100644
index 000..444794c5f5e
--- /dev/null
+++ b/games-kids/tuxtype/files/tuxtype-1.8.3-games-group.patch
@@ -0,0 +1,11 @@
+diff -Naur a/Makefile.am b/Makefile.am
+--- a/Makefile.am 2014-08-20 04:47:21.0 +0100
b/Makefile.am 2019-11-26 21:12:23.430972975 +
+@@ -49,7 +49,6 @@
+ $(MKDIR_P) -m 2755 $(DESTDIR)$(pkglocalstatedir)
+ $(MKDIR_P) -m 2755 $(DESTDIR)$(pkglocalstatedir)/words
+ # chown root:games $(DESTDIR)$(pkglocalstatedir)
+- chown root:games $(DESTDIR)$(pkglocalstatedir)/words
+
+
+ uninstall-hook:
diff --git a/games-kids/tuxtype/tuxtype-1.8.3.ebuild
b/games-kids/tuxtype/tuxtype-1.8.3.ebuild
new file mode 100644
index 000..b808b1e4682
--- /dev/null
+++ b/games-kids/tuxtype/tuxtype-1.8.3.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools desktop xdg
+
+DESCRIPTION="Typing tutorial with lots of eye-candy"
+HOMEPAGE="https://github.com/tux4kids/tuxtype;
+SRC_URI="https://github.com/tux4kids/${PN}/archive/upstream/${PV}.tar.gz ->
${P}.tar.gz"
+
+LICENSE="GPL-2 OFL-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="svg"
+
+DEPEND="acct-group/gamestat
+ media-libs/libsdl[video]
+ media-libs/sdl-image
+ media-libs/sdl-mixer
+ media-libs/sdl-pango
+ media-libs/sdl-ttf
+ svg? ( gnome-base/librsvg:2 )"
+
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${PN}-upstream-${PV}"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.8.3-games-group.patch
+)
+
+src_prepare() {
+ xdg_src_prepare
+ eautoreconf
+}
+
+src_configure() {
+ econf \
+ --localedir="${EPREFIX}"/usr/share/locale \
+ $(use_with svg rsvg)
+}
+
+src_install() {
+ emake install DESTDIR="${D}"
+ rm -v "${ED}"/usr/share/doc/${PF}/{ABOUT-NLS,COPYING,INSTALL} || die
+ keepdir /etc/${PN} /var/lib/${PN}/words
+
+ newicon -s 64 icon.png ${PN}.png
+ make_desktop_entry ${PN} TuxTyping
+
+ fowners root:gamestat /var/lib/${PN} /usr/bin/${PN}
+ fperms 660 /var/lib/${PN}
+ fperms 2755 /usr/bin/${PN}
+}
[gentoo-commits] repo/gentoo:master commit in: games-kids/tuxtype/
commit: 93578f9f6373160fa92439789b014e671fb11018
Author: Ulrich Müller gentoo org>
AuthorDate: Mon Jul 8 08:39:15 2019 +
Commit: James Le Cuirot gentoo org>
CommitDate: Wed Jul 17 20:03:48 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=93578f9f
games-kids/tuxtype: Depend on acct-group/gamestat.
Package-Manager: Portage-2.3.68, Repoman-2.3.16
Signed-off-by: Ulrich Müller gentoo.org>
Signed-off-by: James Le Cuirot gentoo.org>
games-kids/tuxtype/tuxtype-1.8.1-r1.ebuild | 9 +++--
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/games-kids/tuxtype/tuxtype-1.8.1-r1.ebuild
b/games-kids/tuxtype/tuxtype-1.8.1-r1.ebuild
index 42859408849..5ca2f0d987c 100644
--- a/games-kids/tuxtype/tuxtype-1.8.1-r1.ebuild
+++ b/games-kids/tuxtype/tuxtype-1.8.1-r1.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=6
-inherit eutils user
+inherit eutils
DESCRIPTION="Typing tutorial with lots of eye-candy"
HOMEPAGE="https://github.com/tux4kids/tuxtype;
@@ -13,7 +13,8 @@ SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="svg"
-DEPEND="media-libs/libsdl[video]
+DEPEND="acct-group/gamestat
+ media-libs/libsdl[video]
media-libs/sdl-image
media-libs/sdl-mixer
media-libs/sdl-pango
@@ -23,10 +24,6 @@ RDEPEND=${DEPEND}
S=${WORKDIR}/${PN}-upstream-${PV}
-pkg_setup(){
- enewgroup gamestat 36
-}
-
src_configure() {
econf \
--localedir=/usr/share/locale \
[gentoo-commits] repo/gentoo:master commit in: games-kids/tuxtype/
commit: de15c375e5f0bf616f3255322ea8ace2666a8690
Author: Wim Muskee gmail com>
AuthorDate: Fri Apr 19 06:38:39 2019 +
Commit: James Le Cuirot gentoo org>
CommitDate: Fri Apr 19 12:33:19 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de15c375
games-kids/tuxtype: update HOMEPAGE, SRC_URI, metadata
Closes: https://bugs.gentoo.org/680742
Signed-off-by: Wim Muskee gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/11737
Signed-off-by: James Le Cuirot gentoo.org>
games-kids/tuxtype/Manifest| 2 +-
games-kids/tuxtype/metadata.xml| 11 +++
games-kids/tuxtype/tuxtype-1.8.1-r1.ebuild | 8
3 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/games-kids/tuxtype/Manifest b/games-kids/tuxtype/Manifest
index 8fcbd166406..7767407cec5 100644
--- a/games-kids/tuxtype/Manifest
+++ b/games-kids/tuxtype/Manifest
@@ -1 +1 @@
-DIST tuxtype_w_fonts-1.8.1.tar.gz 11528002 BLAKE2B
45cf547f94665913746c6f3fbcd25554cd4adeda1b6cbcc7cbffc1afec3c161f590ad9d21fa53c8e141978916a2d943cfa626cf412f805aeaf7d327284b11615
SHA512
2c360807295f8d9f3d18f36b64c49e39fac78d81570c7a554244a01ee76627c90579e580b609ea7994378f5bbff916142e293ad94306b7b38d132fdc1c53734f
+DIST tuxtype-1.8.1.tar.gz 11470321 BLAKE2B
13650d319e75ed9770113475841780c3413b1d9918f9641bb5b32cf67a622ab731c54149e52252f69030ab8e016b4de408a835aaed29cbf5772213b58cab3e65
SHA512
c7285ece93168260215e20cb5e4f4a46da00687c22241e70f97f735e19501ea8f1abb38e4070fac108c524e5aa3f23f680acef6ef9f5654bc2dab954bcadab01
diff --git a/games-kids/tuxtype/metadata.xml b/games-kids/tuxtype/metadata.xml
index 78274e0fa55..52de2ed0b37 100644
--- a/games-kids/tuxtype/metadata.xml
+++ b/games-kids/tuxtype/metadata.xml
@@ -1,8 +1,11 @@
http://www.gentoo.org/dtd/metadata.dtd;>
-
- ga...@gentoo.org
- Gentoo Games Project
-
+
+ ga...@gentoo.org
+ Gentoo Games Project
+
+
+ tux4kids/tuxtype
+
diff --git a/games-kids/tuxtype/tuxtype-1.8.1-r1.ebuild
b/games-kids/tuxtype/tuxtype-1.8.1-r1.ebuild
index ecb8f47f771..42859408849 100644
--- a/games-kids/tuxtype/tuxtype-1.8.1-r1.ebuild
+++ b/games-kids/tuxtype/tuxtype-1.8.1-r1.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
inherit eutils user
DESCRIPTION="Typing tutorial with lots of eye-candy"
-HOMEPAGE="https://alioth.debian.org/projects/tux4kids;
-SRC_URI="https://alioth.debian.org/frs/download.php/3270/tuxtype_w_fonts-${PV}.tar.gz;
+HOMEPAGE="https://github.com/tux4kids/tuxtype;
+SRC_URI="https://github.com/tux4kids/${PN}/archive/upstream/${PV}.tar.gz ->
${P}.tar.gz"
LICENSE="GPL-2 OFL-1.1"
SLOT="0"
@@ -21,7 +21,7 @@ DEPEND="media-libs/libsdl[video]
svg? ( gnome-base/librsvg )"
RDEPEND=${DEPEND}
-S=${WORKDIR}/tuxtype_w_fonts-${PV}
+S=${WORKDIR}/${PN}-upstream-${PV}
pkg_setup(){
enewgroup gamestat 36
[gentoo-commits] repo/gentoo:master commit in: games-kids/tuxtype/
commit: 3912422796dc31017efea3c749da4d4fe73a39e6
Author: Michael Mair-Keimberger gmail com>
AuthorDate: Fri May 11 12:39:33 2018 +
Commit: James Le Cuirot gentoo org>
CommitDate: Fri May 11 20:38:45 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=39124227
games-kids/tuxtype: use HTTPS
games-kids/tuxtype/tuxtype-1.8.1-r1.ebuild | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/games-kids/tuxtype/tuxtype-1.8.1-r1.ebuild
b/games-kids/tuxtype/tuxtype-1.8.1-r1.ebuild
index bef649358fc..ecb8f47f771 100644
--- a/games-kids/tuxtype/tuxtype-1.8.1-r1.ebuild
+++ b/games-kids/tuxtype/tuxtype-1.8.1-r1.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
inherit eutils user
DESCRIPTION="Typing tutorial with lots of eye-candy"
-HOMEPAGE="http://alioth.debian.org/projects/tux4kids/;
-SRC_URI="http://alioth.debian.org/frs/download.php/3270/tuxtype_w_fonts-${PV}.tar.gz;
+HOMEPAGE="https://alioth.debian.org/projects/tux4kids;
+SRC_URI="https://alioth.debian.org/frs/download.php/3270/tuxtype_w_fonts-${PV}.tar.gz;
LICENSE="GPL-2 OFL-1.1"
SLOT="0"
[gentoo-commits] repo/gentoo:master commit in: games-kids/tuxtype/
commit: 0b5fc6d4d3b4dd1ed50cccdb766a980716b946f0
Author: Austin English gentoo org>
AuthorDate: Mon Jul 18 20:01:12 2016 +
Commit: Austin English gentoo org>
CommitDate: Mon Jul 18 20:01:45 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b5fc6d4
games-kids/tuxtype: remove deprecated games eclass
Also update to EAPI 6
Gentoo-Bug: https://bugs.gentoo.org/574082
Package-Manager: portage-2.3.0
games-kids/tuxtype/tuxtype-1.8.1-r1.ebuild | 47 ++
1 file changed, 47 insertions(+)
diff --git a/games-kids/tuxtype/tuxtype-1.8.1-r1.ebuild
b/games-kids/tuxtype/tuxtype-1.8.1-r1.ebuild
new file mode 100644
index 000..3348657
--- /dev/null
+++ b/games-kids/tuxtype/tuxtype-1.8.1-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit eutils user
+
+DESCRIPTION="Typing tutorial with lots of eye-candy"
+HOMEPAGE="http://alioth.debian.org/projects/tux4kids/;
+SRC_URI="http://alioth.debian.org/frs/download.php/3270/tuxtype_w_fonts-${PV}.tar.gz;
+
+LICENSE="GPL-2 OFL-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="svg"
+
+DEPEND="media-libs/libsdl[video]
+ media-libs/sdl-image
+ media-libs/sdl-mixer
+ media-libs/sdl-pango
+ media-libs/sdl-ttf
+ svg? ( gnome-base/librsvg )"
+RDEPEND=${DEPEND}
+
+S=${WORKDIR}/tuxtype_w_fonts-${PV}
+
+pkg_setup(){
+ enewgroup gamestat 36
+}
+
+src_configure() {
+ econf \
+ --localedir=/usr/share/locale \
+ $(use_with svg rsvg)
+}
+
+src_install() {
+ default
+ rm -f "${D}"/usr/share/doc/${PF}/{COPYING,INSTALL,ABOUT-NLS}*
+ doicon ${PN}.ico
+ make_desktop_entry ${PN} TuxTyping /usr/share/pixmaps/${PN}.ico
+ keepdir /etc/${PN} /var/games/${PN}/words
+
+ fowners root:gamestat /var/games/${PN} /usr/bin/${PN}
+ fperms 660 /var/games/${PN}
+ fperms 2755 /usr/bin/${PN}
+}
[gentoo-commits] repo/gentoo:master commit in: games-kids/tuxtype/
commit: c60800328d089e03af5689ba9a03f72e23e3d1e6
Author: Michael Sterrett gentoo org>
AuthorDate: Fri May 6 01:07:15 2016 +
Commit: Michael Sterrett gentoo org>
CommitDate: Fri May 6 02:49:06 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c6080032
games-kids/tuxtype: set RDEPEND
Package-Manager: portage-2.2.26
games-kids/tuxtype/tuxtype-1.8.1.ebuild | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/games-kids/tuxtype/tuxtype-1.8.1.ebuild
b/games-kids/tuxtype/tuxtype-1.8.1.ebuild
index 50045ea..ebb64cd 100644
--- a/games-kids/tuxtype/tuxtype-1.8.1.ebuild
+++ b/games-kids/tuxtype/tuxtype-1.8.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -14,12 +14,13 @@ SLOT="0"
KEYWORDS="amd64 ppc x86"
IUSE="svg"
-DEPEND="media-libs/libsdl:0[video]
+DEPEND="media-libs/libsdl[video]
media-libs/sdl-pango
media-libs/sdl-mixer
media-libs/sdl-image
media-libs/sdl-ttf
svg? ( gnome-base/librsvg )"
+RDEPEND=${DEPEND}
S=${WORKDIR}/tuxtype_w_fonts-${PV}
