commit: a3802cca42a3caed4985a42abf9d6b1087bd82cd Author: Petr Vaněk <arkamar <AT> atlas <DOT> cz> AuthorDate: Thu Oct 6 14:48:08 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Fri Oct 7 11:28:13 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a3802cca
app-misc/dvtm: sync live - EAPI bump to 8 - sync keywords with 0.15-r5 - sync stop-installing-terminfo patch with upstream - modification of 9999-gentoo.patch which fixes bug 870526 because addnwstr function is defined in ncursesw. Bug: https://bugs.gentoo.org/870526 Signed-off-by: Petr Vaněk <arkamar <AT> atlas.cz> Signed-off-by: Sam James <sam <AT> gentoo.org> app-misc/dvtm/dvtm-9999.ebuild | 6 +++--- app-misc/dvtm/files/dvtm-9999-gentoo.patch | 3 ++- app-misc/dvtm/files/dvtm-9999-stop-installing-terminfo.patch | 11 +++++++++++ 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/app-misc/dvtm/dvtm-9999.ebuild b/app-misc/dvtm/dvtm-9999.ebuild index 4874e768efea..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 @@ -17,7 +17,7 @@ if [[ ${PV} == *9999 ]]; then " 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" @@ -30,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() { 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 \
