summaryrefslogtreecommitdiff
path: root/app-misc/dvtm
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2022-10-07 13:23:59 +0100
committerV3n3RiX <venerix@koprulu.sector>2022-10-07 13:23:59 +0100
commit27a61babf89122aeb64d52f4ea8f6f068b928da4 (patch)
tree56cc72dcfb76f622af8103ed350c61f432d5f686 /app-misc/dvtm
parentbbdc49d5ccd04563006a608c87c870413f75057e (diff)
gentoo auto-resync : 07:10:2022 - 13:23:59
Diffstat (limited to 'app-misc/dvtm')
-rw-r--r--app-misc/dvtm/Manifest12
-rw-r--r--app-misc/dvtm/dvtm-0.15-r5.ebuild8
-rw-r--r--app-misc/dvtm/dvtm-0.15-r6.ebuild62
-rw-r--r--app-misc/dvtm/dvtm-9999.ebuild14
-rw-r--r--app-misc/dvtm/files/dvtm-0.15-gentoo.patch5
-rw-r--r--app-misc/dvtm/files/dvtm-9999-gentoo.patch3
-rw-r--r--app-misc/dvtm/files/dvtm-9999-stop-installing-terminfo.patch11
-rw-r--r--app-misc/dvtm/metadata.xml4
8 files changed, 102 insertions, 17 deletions
diff --git a/app-misc/dvtm/Manifest b/app-misc/dvtm/Manifest
index 9c324ee7a634..48178a7ae522 100644
--- a/app-misc/dvtm/Manifest
+++ b/app-misc/dvtm/Manifest
@@ -1,7 +1,9 @@
-AUX dvtm-0.15-gentoo.patch 961 BLAKE2B 611e19b936957c80eb234186a4199f32e83aefc7a3be90b6b896e9655dd7b1aa0b6528bb7f2fc92f40d448823990f60f5d58726e7358f6ce8304875ae2dc8903 SHA512 dd660b77457326949d41e80527fc81738c3a54f957f47d2bff94c9ee84dbbc5d2f31d43db9e85311826398c50927d18711816dfabba3ce9cddde0da66e15fe09
+AUX dvtm-0.15-gentoo.patch 1057 BLAKE2B ef7ad08418ee24919b886cdbaac223c75b462b4ae8b8e5e72f89db000f6fe144a71ba156053ac28116a48779a4f431630dfd87a84bab24bf11aa108c72268b13 SHA512 86fd5b096f80cab67ba82fd42165b20edf29b41718fef228cd1e1379025931c9dd473df51debffe530ba13d3613062972d9eaa83d8fa4aefe4468cfe2de8e465
AUX dvtm-0.15-stop-installing-terminfo.patch 474 BLAKE2B a2a1552592b51bc21d817039b3f09e8108c36e3cdb77c9b6f43f12ebc3f856e9a0d21e9ec8fc82f843166ad16ebf9644ccbd9fc8a80746ce9670d9b7ce191653 SHA512 cea8b8e6974ffc6d891fa176c1d7ef67dfb994bea779b3e7485094f4cd414b8be928ecb0db14e16ce5508b0454465084cde37ee4d09de21f91e18a5a2958931b
-AUX dvtm-9999-gentoo.patch 426 BLAKE2B b5cd8066a16005b240c5725374ea31fa42394076ea477f9ed35576b57a2d816123fbd4adfd877a092b56ecd42f321d4a092a20b20a7848a16df8fdb93fcfb7d3 SHA512 ee3d94108e8d74ef4777c2bdbb2887af9a4f62832311524cde7a69b0307a71edd89616e475c486745b2f5461932cb13cb46dbb2a6ab4af0a8ad8caae92e10275
+AUX dvtm-9999-gentoo.patch 512 BLAKE2B 6672d5ed032b7f9f04db143cd820946bb11477575e97207e5a001f841103ab1b0fb48487bfb83b7c3a60d2e1d63a2a5f30c6a6e7ca0a772724e9287d91dc0c12 SHA512 d42437eddbf09f03e84ea6971c987f4c77d31b1512efd8ba54a542a70190e2595f666389ed1274cf50589a69271b374ee8fc0a71dfb766bacdd4ba277775ed8c
+AUX dvtm-9999-stop-installing-terminfo.patch 322 BLAKE2B 30866f5fe749d9e948f6aef26614fba58506d5181447076e6a96d93e4253a7d55d6dac1fb065006607dbd80c52d4f4aededafd8e26cf920b7da8420e56d657c5 SHA512 f9d868847d6639b8019edef56f17eea0705f7c65fcc5f63bcf45b45e6f89ed14a3809a4ea3e98184b4de046c2c882d207498f2cfc50c8f4fc22970b9397068e2
DIST dvtm-0.15.tar.gz 40511 BLAKE2B cc5075b5337a66b3eb5a3845f18aaadc6be36804e1a0e217e6bfe640893ec5af7553aa69578f8bda6c3b11b28c02ba5398e19f9cad9844bfcb1bd32ca4f24c12 SHA512 48a0c8fd6a50fe5d43414d0223c9f4b9920a31d42fe3bfc428ce1ae7d0e41a41ebe2597eae0824c7c76bfb0e32a13e440c8d5fcdb1886d55d6791fa3fe3fd77b
-EBUILD dvtm-0.15-r5.ebuild 1266 BLAKE2B 6853a6ee8e484c7e6cc193a1e53c2722622b69f4a9c57ffba7ce9bd31a92893bedf6497ca2014b325f6aa3a99e4f9d31efb4ad75402eeb2ac8ed03e1568178a8 SHA512 bbbb9571c6d5269a7c75c9c5d52cb8ed7d9ec54362526707641dbc71d9739271d58027209297eedf9e44e57f049d471ae2b80aad8813ef5ac7ab16e74a48980b
-EBUILD dvtm-9999.ebuild 1256 BLAKE2B 9223f5980a391c41f84155016781be8c5f45bfdaa9aa6962085ad2b900196f1bef798b1aea09052f881ac1c008dbeecbb06d15d2548c98b5e0a9d519c3805718 SHA512 b70a071446f15a2b97a6b707a0c4b51c63f1194f870cd3a3520074e1951193def9973e2030467dac31f6ec842d6b9b9f646a8a3ced93cbe89fa54f73bfc677fc
-MISC metadata.xml 267 BLAKE2B 15dbae618f9047d37b671714f3615b968ff63cd013ec0dfe03fefd1b172d68c19f27276151efe8e005b7e59c4eaa017ec6693f2f03ec005894d8c67b1c8e47c2 SHA512 391ca69b1498920f9678a1e8cafbe14090bfdf6666fac4b508f11990f656de77717ce124cf435c2025474cc2034a22bc7df47257b5dec44c55d7bd99108fcf55
+EBUILD dvtm-0.15-r5.ebuild 1271 BLAKE2B d5008f85fb49301a6b4187d5ab813507d6dd5b9eaf75715b45ac5736500b1905ded91a1c5a82c1b272427a17f2e76bb19cd067bcdcac2548f22f77a3040fd9cc SHA512 97a1028e436c95a99137656acd8f83f47e926174d4e0dc20c2520ca4bb1b7e232f92abd4aef4e0765c9d8ef2a1bb8883d5294a86401660e45f94b2368d992245
+EBUILD dvtm-0.15-r6.ebuild 1274 BLAKE2B 54839ff43766bc2354df972b9b14887f3fc19a36c393d4e9399e280e0b2076abac6dbc761bd21276d605cd847a4fdb074bf55e2dbad8d944b42da8fe4c48af5f SHA512 5f6ad2fc9d27439cd79fc425716e598f88eab28b3c62c56e0340c36fc906bfe6083636b866fe5d94698a373fbecedcda66da98a8921ffecdecd667aa419d5766
+EBUILD dvtm-9999.ebuild 1275 BLAKE2B 709f793ac519b377138359e5a38b4d7f86c619d76e983285ae1ad13eb5ec002d18a88d6856fda67ae21ef9ff06ccd2a61a865bc058d9bda519f44c7c1b161169 SHA512 44fa3f2e1ad88b7d51d15e0d153704802e8dc65e47a8465479b040e482e739ad925ddbdcf492a2467f182d0c9932581fa523afeaf46ec83cc192d1a300859ada
+MISC metadata.xml 402 BLAKE2B 25c815ab5188e07d7455f6ae10f61e4a50b84f901759e3c7b3146f1837b85744965751723092cd893a534e24e95ad538184bdbbb5a1b035684106c789f91beff SHA512 4dfffd70f4ed7534fee720e3afb636c6756bf3fa912232879f398ed9d44357e8bf24dd7b081ffe0d7fbe64bc87b58a6834981fb6af5b0c3a91c1641c09a890ef
diff --git a/app-misc/dvtm/dvtm-0.15-r5.ebuild b/app-misc/dvtm/dvtm-0.15-r5.ebuild
index f84d708753a0..2f8d0464fa4b 100644
--- a/app-misc/dvtm/dvtm-0.15-r5.ebuild
+++ b/app-misc/dvtm/dvtm-0.15-r5.ebuild
@@ -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-0.15-r6.ebuild b/app-misc/dvtm/dvtm-0.15-r6.ebuild
new file mode 100644
index 000000000000..85425583c5af
--- /dev/null
+++ b/app-misc/dvtm/dvtm-0.15-r6.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit savedconfig toolchain-funcs
+
+DESCRIPTION="Dynamic virtual terminal manager"
+HOMEPAGE="https://www.brain-dump.org/projects/dvtm/"
+
+if [[ ${PV} == *9999 ]]; then
+ inherit git-r3
+ 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"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+
+RDEPEND=">=sys-libs/ncurses-6.1:=[unicode(+)]"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.15-gentoo.patch
+ "${FILESDIR}"/${PN}-0.15-stop-installing-terminfo.patch
+)
+
+src_prepare() {
+ default
+
+ restore_config config.h
+}
+
+src_compile() {
+ tc-export PKG_CONFIG
+ emake CC="$(tc-getCC)" ${PN}
+}
+
+src_install() {
+ emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" STRIP=true install
+
+ insinto /usr/share/${PN}
+ newins config.h ${PF}.config.h
+
+ dodoc README.md
+
+ save_config config.h
+}
+
+pkg_postinst() {
+ elog "This ebuild has support for user defined configs"
+ elog "Please read this ebuild for more details and re-emerge as needed"
+ elog "if you want to add or remove functionality for ${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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-06 11:08:44 +0000