6 files changed, 34 insertions, 13 deletions
diff --git a/app-misc/dvtm/dvtm-0.15-r5.ebuild b/app-misc/dvtm/dvtm-0.15-r6.ebuild
index f84d708753a0..234251c24cbf 100644
--- a/app-misc/dvtm/dvtm-0.15-r5.ebuild
+++ b/app-misc/dvtm/dvtm-0.15-r6.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 inherit savedconfig toolchain-funcs
 
@@ -10,7 +10,11 @@ HOMEPAGE="https://www.brain-dump.org/projects/dvtm/"
 
 if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
-	EGIT_REPO_URI="https://repo.or.cz/dvtm.git"
+	EGIT_REPO_URI="
+		https://github.com/martanne/dvtm
+		https://git.sr.ht/~martanne/dvtm
+		https://repo.or.cz/dvtm.git
+	"
 else
 	SRC_URI="https://www.brain-dump.org/projects/${PN}/${P}.tar.gz"
 	KEYWORDS="amd64 arm ~arm64 ~riscv x86"
@@ -37,8 +41,6 @@ src_prepare() {
 
 src_compile() {
 	tc-export PKG_CONFIG
-	local msg=""
-	use savedconfig && msg=", please check the configfile"
 	emake CC="$(tc-getCC)" ${PN}
 }
 
diff --git a/app-misc/dvtm/dvtm-9999.ebuild b/app-misc/dvtm/dvtm-9999.ebuild
index c7b6d74ec5e0..6d6d4cf72673 100644
--- a/app-misc/dvtm/dvtm-9999.ebuild
+++ b/app-misc/dvtm/dvtm-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 inherit savedconfig toolchain-funcs
 
@@ -10,10 +10,14 @@ HOMEPAGE="https://www.brain-dump.org/projects/dvtm/"
 
 if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
-	EGIT_REPO_URI="https://repo.or.cz/dvtm.git"
+	EGIT_REPO_URI="
+		https://github.com/martanne/dvtm
+		https://git.sr.ht/~martanne/dvtm
+		https://repo.or.cz/dvtm.git
+	"
 else
 	SRC_URI="https://www.brain-dump.org/projects/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
 fi
 
 LICENSE="MIT"
@@ -26,7 +30,7 @@ DEPEND="
 "
 PATCHES=(
 	"${FILESDIR}"/${PN}-9999-gentoo.patch
-	"${FILESDIR}"/${PN}-0.15-stop-installing-terminfo.patch
+	"${FILESDIR}"/${PN}-9999-stop-installing-terminfo.patch
 )
 
 src_prepare() {
@@ -37,8 +41,6 @@ src_prepare() {
 
 src_compile() {
 	tc-export PKG_CONFIG
-	local msg=""
-	use savedconfig && msg=", please check the configfile"
 	emake CC="$(tc-getCC)" ${PN}
 }
 
diff --git a/app-misc/dvtm/files/dvtm-0.15-gentoo.patch b/app-misc/dvtm/files/dvtm-0.15-gentoo.patch
index 3bb7dec3721f..22a3fe4ebf34 100644
--- a/app-misc/dvtm/files/dvtm-0.15-gentoo.patch
+++ b/app-misc/dvtm/files/dvtm-0.15-gentoo.patch
@@ -1,6 +1,6 @@
 --- a/config.mk
 +++ b/config.mk
-@@ -10,12 +10,12 @@
+@@ -10,12 +10,13 @@ MANPREFIX = ${PREFIX}/share/man
  TERMINFO := ${DESTDIR}${PREFIX}/share/terminfo
  
  INCS = -I.
@@ -8,6 +8,7 @@
 -CPPFLAGS = -D_POSIX_C_SOURCE=200809L -D_XOPEN_SOURCE=700 -D_XOPEN_SOURCE_EXTENDED
 +LIBS = -lc -lutil $(shell $(PKG_CONFIG) --libs ncursesw)
 +CPPFLAGS += -D_POSIX_C_SOURCE=200809L -D_XOPEN_SOURCE=700 -D_XOPEN_SOURCE_EXTENDED
++CPPFLAGS += $(shell $(PKG_CONFIG) --cflags ncursesw)
  CFLAGS += -std=c99 ${INCS} -DVERSION=\"${VERSION}\" -DNDEBUG ${CPPFLAGS}
  LDFLAGS += ${LIBS}
  
@@ -18,7 +19,7 @@
  STRIP ?= strip
 --- a/Makefile
 +++ b/Makefile
-@@ -16,13 +16,13 @@
+@@ -16,13 +16,13 @@ config.h:
  
  .c.o:
  	@echo CC $<
diff --git a/app-misc/dvtm/files/dvtm-9999-gentoo.patch b/app-misc/dvtm/files/dvtm-9999-gentoo.patch
index f29e316c3e5c..8e74b7cb079c 100644
--- a/app-misc/dvtm/files/dvtm-9999-gentoo.patch
+++ b/app-misc/dvtm/files/dvtm-9999-gentoo.patch
@@ -1,6 +1,6 @@
 --- a/config.mk
 +++ b/config.mk
-@@ -7,8 +7,8 @@
+@@ -7,8 +7,9 @@ MANPREFIX = ${PREFIX}/share/man
  TERMINFO := ${DESTDIR}${PREFIX}/share/terminfo
  
  INCS = -I.
@@ -8,6 +8,7 @@
 -CPPFLAGS = -D_POSIX_C_SOURCE=200809L -D_XOPEN_SOURCE=700 -D_XOPEN_SOURCE_EXTENDED
 +LIBS = -lc -lutil $(shell $(PKG_CONFIG) --libs ncursesw)
 +CPPFLAGS += -D_POSIX_C_SOURCE=200809L -D_XOPEN_SOURCE=700 -D_XOPEN_SOURCE_EXTENDED
++CPPFLAGS += $(shell $(PKG_CONFIG) --cflags ncursesw)
  CFLAGS += -std=c99 ${INCS} -DNDEBUG ${CPPFLAGS}
  
  CC ?= cc
diff --git a/app-misc/dvtm/files/dvtm-9999-stop-installing-terminfo.patch b/app-misc/dvtm/files/dvtm-9999-stop-installing-terminfo.patch
new file mode 100644
index 000000000000..da730d36663e
--- /dev/null
+++ b/app-misc/dvtm/files/dvtm-9999-stop-installing-terminfo.patch
@@ -0,0 +1,11 @@
+--- a/Makefile
++++ b/Makefile
+@@ -50,8 +50,6 @@ install: all
+ 		sed -e "s/VERSION/${VERSION}/" < "$$m" >  "${DESTDIR}${MANPREFIX}/man1/$$m" && \
+ 		chmod 644 "${DESTDIR}${MANPREFIX}/man1/$$m"; \
+ 	done
+-	@echo installing terminfo description
+-	@TERMINFO=${TERMINFO} tic -s dvtm.info
+ 
+ uninstall:
+ 	@for b in ${BIN}; do \
diff --git a/app-misc/dvtm/metadata.xml b/app-misc/dvtm/metadata.xml
index 8539ca0d974d..6efc7ab09596 100644
--- a/app-misc/dvtm/metadata.xml
+++ b/app-misc/dvtm/metadata.xml
@@ -5,4 +5,8 @@
 		<email>chithanh@gentoo.org</email>
 		<name>Chí-Thanh Christopher Nguyễn</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">martanne/dvtm</remote-id>
+		<remote-id type="sourcehut">~martanne/dvtm</remote-id>
+	</upstream>
 </pkgmetadata>