gentoo auto-resync : 07:05:2024 - 00:00:56

3 files changed, 117 insertions, 0 deletions

diff --git a/app-misc/gtypist/Manifest b/app-misc/gtypist/Manifest
index 28d9d16a33dd..e41c4848a142 100644
--- a/app-misc/gtypist/Manifest
+++ b/app-misc/gtypist/Manifest
@@ -1,7 +1,9 @@
 AUX 50gtypist-gentoo.el 182 BLAKE2B ae05de070f7c0dd0e0c6b31a4d9a8e9bab1b0f3d6a3faec0766207c7a9ae3ced0014eb13ee732f8d1ca807e0f72d8ddeb3a31e206e6c60d13d485844835ecc83 SHA512 1dd01580d11482f47899b0e3623c61d318d0bc4630851e5a4ee61ea008159db3372a144d68045394332c9a7ae3877e558502cf24c927a3d19a4e60aa046d12a5
 AUX gtypist-2.8.3-xemacs-compat.patch 592 BLAKE2B 23d8195c23c0e510b42c5b4ef9b466cfe13fc094990502615e49b28d97630758f4f7ba6f78dc84c941c2b481547eba423c96156cb909ed5fcb4bf1cd06404777 SHA512 6e85193a1354bc318f78382aaa24dea473d704ec347f8ae854b4a83985f2d4b1b8f64e59e3526b05bdd1e264de8fb8d4d6865bb296cf55f3896a56bfdc0930fb
+AUX gtypist-2.9.5-c99.patch 665 BLAKE2B c4060fb4da3c63d8d14162c040bdb6fb750c846d26d24decc7fcfa5f0b14dae8a7a9de4ea11a07fce5808bc41d1593ef9b3736076236fc16602dc86c4c616c36 SHA512 86621b6166855db7fd99686da9dc03adde237d162daf791f351f630b3dc5fe1edad6ab99b5765ca2bb98f5218f382668bc2dba7279268912bea3da6e94a5e78b
 AUX gtypist-2.9.5-link-infow.patch 453 BLAKE2B 6fd312a511b4d151a42679a329e47acf0e2368b86cdf5f193e7ef5af756abe6bd6a77168c2d6161e45befdc05dc851f5df75f974e865f0975591670fc2ea6fd1 SHA512 eebdaeca3302f0b6a62f91de216f6f6381cd22fb78625bc31395cdacfd2aaf34d7d1df71a7c523b13f97172daa8d5df8d62ba48458d9e8e8d64b5fac3b123186
 DIST colemak.typ 8922 BLAKE2B e3c422e9172e215406a5165a44c51c38f3372c9988f1bafdb537463a9a3209f1759a312c2a5d316ec3a2a0b39563521b87aa6944cdd0b4cf94c960cbe70c7ca3 SHA512 f2c2816836c83d7b640f7f703a4924c62ff0746e0d4cf2a2ca36d434017770272518b835ea273815c93ab9df1c0e4d142f5fea1e5f0b1484ecdc652a53bdc499
 DIST gtypist-2.9.5.tar.xz 929356 BLAKE2B d83506ee8ab26290fae47f98aed4e5e63260f39d5391a9a735d009f34a787cd670b034375c946c7562545b84ed4655d51c385209d676de76cf4891ead9845ea9 SHA512 d6891cd58d23f9b023aec97dc825cb15f7371ab18e82133b9a284d3329b1526bda8e1c5d7225f335c5ec673280cbbe3ad92471eeb15db4ecf29e7feffe27e095
 EBUILD gtypist-2.9.5-r1.ebuild 1579 BLAKE2B 4305543039039e43c990faab45f2065cad4aa5f1800cc54e79341cea096a5be3c2076e2b84484197c9799159f31748b1c71fbbc40618fa91820dc49cc1058aa7 SHA512 d9684f3f9421e0877a061e616a31f76e59f56d6db10fcf1c794fb1e96b1fc306dad9c1736cc510e297c41582ca1862fc7fc94d06fd816068b58f61632eb285d2
+EBUILD gtypist-2.9.5-r2.ebuild 1731 BLAKE2B 217fd1fbfd6254f3752b61606df236c3aa31b5fd43f29f460cf1078d54275bd7b724d46ff6790f1a3cb977be7222faa5d5ee7e262e91d50383857f37dc4e25d8 SHA512 c9cde7b53e10ea40123e4999eb6007e59b6fa3cfe00801b9fcfa498b4751eefe0ae0a1c89abdb666eac1b2e464a19e295110107a73ff3a3a73b6a2dcecc14137
 MISC metadata.xml 485 BLAKE2B 170769676ef1f0491fd62bd5d2ea6a090f1341b5edb22d7d073203f6e7ceddfff4e9a0b3c84e965975e3216fe4b2dd9be71a630108fc857c0d34d5c77389f79e SHA512 a339886b430ccd8eeee7ec4840412872b34c953ccc1ae0ff14b7ded54f8bf84ff317b22ba1a700a7c069245b23eac48767ca0b6e4a8014a55f70e4f3aaa5d81e
diff --git a/app-misc/gtypist/files/gtypist-2.9.5-c99.patch b/app-misc/gtypist/files/gtypist-2.9.5-c99.patch
new file mode 100644
index 000000000000..e191c3dd7bb5
--- /dev/null
+++ b/app-misc/gtypist/files/gtypist-2.9.5-c99.patch
@@ -0,0 +1,31 @@
+--- a/src/cursmenu.c
++++ b/src/cursmenu.c
+@@ -35,6 +35,8 @@
+ #include <ctype.h>
+ 
+ #include "gettext.h"
++#include "utf8.h"
++
+ #define _(String) gettext (String)
+ 
+ extern int isUTF8Locale;
+--- a/src/script.h
++++ b/src/script.h
+@@ -90,6 +90,7 @@ extern void seek_label( FILE *script, char *label, char *ref_line );
+ extern int hash_label( char *label );
+ extern void do_exit( FILE *script );
+ 
++void check_script_file_with_current_encoding( FILE *script );
+ 
+ extern void bind_F12 (const char *);	// Defined in gtypist.c
+ 
+--- a/src/utf8.c
++++ b/src/utf8.c
+@@ -18,6 +18,7 @@
+  */
+ 
+ #include "config.h"
++#include "error.h"
+ #include "utf8.h"
+ 
+ #ifdef HAVE_PDCURSES
diff --git a/app-misc/gtypist/gtypist-2.9.5-r2.ebuild b/app-misc/gtypist/gtypist-2.9.5-r2.ebuild
new file mode 100644
index 000000000000..450f18d97cde
--- /dev/null
+++ b/app-misc/gtypist/gtypist-2.9.5-r2.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit elisp-common autotools
+
+DESCRIPTION="Universal typing tutor"
+HOMEPAGE="https://www.gnu.org/software/gtypist/"
+SRC_URI="
+	mirror://gnu/gtypist/${P}.tar.xz
+	http://colemak.com/pub/learn/colemak.typ
+"
+
+LICENSE="GPL-2 public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc ~riscv ~x86 ~amd64-linux"
+IUSE="nls emacs xemacs"
+
+DEPEND="
+	>=sys-libs/ncurses-5.2:0=
+	emacs? ( >=app-editors/emacs-23.1:* )
+	xemacs? ( !emacs? ( app-editors/xemacs app-xemacs/fsf-compat ) )
+"
+RDEPEND="${DEPEND}"
+
+SITEFILE=50${PN}-gentoo.el
+
+src_unpack() {
+	unpack ${P}.tar.xz
+}
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.8.3-xemacs-compat.patch
+
+	# solution from https://bugs.gentoo.org/698764#c0
+	"${FILESDIR}"/${PN}-2.9.5-link-infow.patch
+
+	# Last release was 10 years ago but many commits in git since,
+	# looks fixed there but not backportable.
+	"${FILESDIR}"/${PN}-2.9.5-c99.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local lispdir=""
+	if use emacs; then
+		lispdir="${SITELISP}/${PN}"
+		einfo "Configuring to build with GNU Emacs support"
+	elif use xemacs; then
+		lispdir="${EPREFIX}/usr/lib/xemacs/site-packages/lisp/${PN}"
+		einfo "Configuring to build with XEmacs support"
+	fi
+
+	econf \
+		$(use_enable nls) \
+		EMACS=$(usev emacs || usev xemacs || echo no) \
+		--with-lispdir="${lispdir}"
+}
+
+DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )
+
+src_install() {
+	default
+
+	insinto /usr/share/gtypist
+	doins "${DISTDIR}"/colemak.typ
+
+	if use emacs; then
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
+	fi
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}