gentoo auto-resync : 19:08:2023 - 15:38:48

3 files changed, 69 insertions, 0 deletions

diff --git a/app-misc/dvorak7min/Manifest b/app-misc/dvorak7min/Manifest
index 0d57588c9987..accf7e39685b 100644
--- a/app-misc/dvorak7min/Manifest
+++ b/app-misc/dvorak7min/Manifest
@@ -1,6 +1,8 @@
+AUX dvorak7min-1.6.1-clang16-build-fix.patch 1222 BLAKE2B 9d5ab537aac82319080fbb0f5b3ccda46f636b270cfdb7001014ee552c6813ae58ada1ceced5cc11296cf875cf452822d56b7c53b341fcbb3040df45f5ae7033 SHA512 1e85d45252b136759d129f5357fd7991033cc5ee2812242adebb96692bda822a34cf92b520c3e3773aae8fe14b2a3e391762a44aefb5e24266fdc36deabf0e99
 AUX dvorak7min-1.6.1-debian-changes.patch 7956 BLAKE2B 77396f83105259f53556e6e47bc15291be00d7a822c5eecb52e95e525e10ee24f3a7cc6c731954de3b9a4228980bedc45b84f90c139c915766a53804a376f763 SHA512 274d9a33b59e18de206431b2fb4f1f37342b27dd4accb37dc16ee5470f4c6163f55c82d8b3466894ac20f3470d65ba05e8f332b0b489dc27814bcfe4270d4115
 AUX dvorak7min-1.6.1-makefile-flags.patch 684 BLAKE2B 94d9a24871d88f3d18e8804b3f09f5435dd1e5c4f084322dff2bb40213dfafd1ced7c931adc439b0ab8e089f080254bdff7dc58a7efc77b42da037ed10c9cfb3 SHA512 173858e4daaba8f6f764f4c9cb4aa8e7c6d513d1dff8bc3e2753a969bad15fd4d1a9e91a7da3b9a9353c67c40209b3f316d7f4394042329205d0d80dc9e1454c
 AUX dvorak7min-1.6.1-ncurses-pkg-config.patch 608 BLAKE2B 0541105aba889a65ed74dcca7696a5bc0fb983778cd81cb7225317b25e17d7bac856ea325f4eed0e1724588d7d7d2fc1a271b7a2ccbc2263d565eb63b24aa7cc SHA512 85e2a05b6ec78be488c3f5bc1a29286a4fbea08bae69f0cbd1901c5f3c03de9d5340900bb898316da61277f66b6ff0a209cae66b029ff5b57166af6ddc320542
 DIST dvorak7min-1.6.1.tar.gz 53115 BLAKE2B f884f1900a7de0422f076e3701f7b982d5c5cba70ae1805bd3540ebd109e9bbaaa9e439272ac530862eac9dca2c0ba67b1d0040aa58294b5cabba2fa126d04ae SHA512 17ed601f298673a51d73b2efeb1555d91337f34cfbcc099a71c11de38fecdb29747de9533abec9028c3abc9f04dc9090e4452bba1c53cdac8d65e86a760e8a7a
 EBUILD dvorak7min-1.6.1-r1.ebuild 822 BLAKE2B 0c6f7136df13e84db9661e73fb0b7cc89b4a46bb6118939606a0ea2a358e0e508cf29158fe5a3754a1111c1bcd40d371913fddd08d920b51a3cee4fdcb8bbaf1 SHA512 819ba083b42db6751cf69f32e48a074e6b74b5e283ee2edc73ff7ee0d989e381543bd674d910799787d6642719a747a211a83753cf83edd199036c3cb714976b
+EBUILD dvorak7min-1.6.1-r2.ebuild 876 BLAKE2B 35ce3379e0620a76c519fd7f2322d795381e3e2a6e8c5258417dd3e0346f33943ef631e2ffb0c085768a670abca3ee56ac148e140b7919fbbc38cbd600a3cd10 SHA512 98d337b2cc2541f548f576e0384d21031b29db5028644e70918a8dbf63ac5b725bac2dae73f79bef07a9c862bfc9c3d0ee2b40f74cfad2cc169369bf015c8a9a
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/app-misc/dvorak7min/dvorak7min-1.6.1-r2.ebuild b/app-misc/dvorak7min/dvorak7min-1.6.1-r2.ebuild
new file mode 100644
index 000000000000..9be49c11fe75
--- /dev/null
+++ b/app-misc/dvorak7min/dvorak7min-1.6.1-r2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="Simple ncurses-based typing tutor for learning the Dvorak keyboard layout"
+HOMEPAGE="http://www.linalco.com/comunidad.html"
+SRC_URI="http://www.linalco.com/ragnar/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+
+BDEPEND="virtual/pkgconfig"
+DEPEND="sys-libs/ncurses:="
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.6.1-debian-changes.patch
+	"${FILESDIR}"/${PN}-1.6.1-makefile-flags.patch
+	"${FILESDIR}"/${PN}-1.6.1-ncurses-pkg-config.patch
+	"${FILESDIR}"/${PN}-1.6.1-clang16-build-fix.patch
+)
+
+src_compile() {
+	tc-export PKG_CONFIG
+	emake \
+		CC="$(tc-getCC)" \
+		PROF="${CFLAGS}" \
+		LDFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+	dobin ${PN}
+	dodoc ChangeLog README
+}
diff --git a/app-misc/dvorak7min/files/dvorak7min-1.6.1-clang16-build-fix.patch b/app-misc/dvorak7min/files/dvorak7min-1.6.1-clang16-build-fix.patch
new file mode 100644
index 000000000000..27c54dc595b7
--- /dev/null
+++ b/app-misc/dvorak7min/files/dvorak7min-1.6.1-clang16-build-fix.patch
@@ -0,0 +1,29 @@
+Bug: https://bugs.gentoo.org/894546
+--- a/dvorak7min.c
++++ b/dvorak7min.c
+@@ -41,6 +41,7 @@
+  *  
+  */
+ 
++#define _GNU_SOURCE
+ #include <strings.h>
+ #include <string.h>
+ #include <stdlib.h>
+@@ -435,7 +436,7 @@ void do_text (char * const text)
+ 	     timeCurrent = time(0);
+ 	     speed = calcSpeed (timeStart, timeCurrent, hits + misses);
+ 	     // Use WPS/WPM as better standards
+-	     mvprintw (LINES - 1, 0, "WPS %.2f  WPM %.2f Hits: %d Misses: %d Seconds: %d Ratio: %.2f%%", speed, speed * 60, hits, misses, time(0) - timeStart, ratio);
++	     mvprintw (LINES - 1, 0, "WPS %.2f  WPM %.2f Hits: %d Misses: %d Seconds: %ld Ratio: %.2f%%", speed, speed * 60, hits, misses, time(0) - timeStart, ratio);
+ 	     clrtoeol();
+ 	  }
+        } while (ch == ERR);
+@@ -521,7 +522,7 @@ void do_text (char * const text)
+     } else {
+        float ratio = hits - misses;
+        ratio = (ratio < 0) ? 0 : (100.0 * ratio / hits);
+-       mvprintw (0, 0, "Elapsed time: %d seconds", timeFinish - timeStart);
++       mvprintw (0, 0, "Elapsed time: %ld seconds", timeFinish - timeStart);
+        mvprintw (1, 0, "Total: %d  Misses: %d  Ratio: %.2f%%",
+                  hits + misses, misses,
+ 		 (float)100*(hits) / (hits + misses));