From 6657c680376cedf378fcf328e5fa03ed3b41d580 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 2 Jun 2024 00:07:23 +0100 Subject: gentoo auto-resync : 02:06:2024 - 00:07:23 --- app-misc/tmux/Manifest | 6 ++- app-misc/tmux/files/tmux.service | 9 ++++ app-misc/tmux/files/tmux.socket | 8 ++++ app-misc/tmux/tmux-3.4-r1.ebuild | 91 ++++++++++++++++++++++++++++++++++++++++ app-misc/tmux/tmux-3.4.ebuild | 86 ------------------------------------- app-misc/tmux/tmux-9999.ebuild | 7 +++- 6 files changed, 118 insertions(+), 89 deletions(-) create mode 100644 app-misc/tmux/files/tmux.service create mode 100644 app-misc/tmux/files/tmux.socket create mode 100644 app-misc/tmux/tmux-3.4-r1.ebuild delete mode 100644 app-misc/tmux/tmux-3.4.ebuild (limited to 'app-misc/tmux') diff --git a/app-misc/tmux/Manifest b/app-misc/tmux/Manifest index f2dc069f02b3..18ed20d2d49e 100644 --- a/app-misc/tmux/Manifest +++ b/app-misc/tmux/Manifest @@ -1,9 +1,11 @@ AUX tmux-2.4-flags.patch 456 BLAKE2B df85b32486894e8e3c5531937461ad46ca5effc5dd4d31b4f7a3f9bcf8d3dfa38fc186a603a90fe734b25781b9d517115c2b089648c29e4605fa9610f6dc311a SHA512 505d5ec4fa1d7844870c67aedccac3a147db1971464fc21d19319bb343fb6fd73b696e85298f8592e46900774b35b250cc53841b05514333c44c3e973bcdb860 AUX tmux-3.3a-clang.patch 2480 BLAKE2B 33733a38035930f42e041ad43f36fa157d5411c7778f2fac67f4a37a645fe3bc508ff68ebda0a41f5d3ef0180a95dde79597db72db4fa318c55777cd573a1dd4 SHA512 a7dcaa2a07712bf4e820b0d252b8ab1efe9f7f9429e85b2fa75cb2e0c081f023b2aa9abc27529c30499f2ffe957f7195c5aa76cd4d224070bf135639d08bafa3 +AUX tmux.service 124 BLAKE2B a4eecfeb4baa24433408c9dfb4848d420da4d54a2c62f6a4e05b0538e7b4c75bcec113d6ca86fea5085264903122e92e9adf7572e94ffafa3fe7f2038148b717 SHA512 73d3daf5362222da3e91641cc776c66fdaea50048000827a5eaa8693c769da73a320c19488aec6fd7660095eb6c44ef02f3473b2443909d55451442dfea70d28 +AUX tmux.socket 132 BLAKE2B 9aa90b43f2eaedfce327287cc8eee4808c7870364668c54d0ffd4b5064d45a4c986702fdf64dde5fe24496635e700e1385a92a02060cb07819b48ab9d381b65b SHA512 fd2a8feb7474702515e9186a801fa5601feca5aedd39138d0f0623911b93255bc7cf4aa0ee066ba2c059601a21f2eb29794fe041d5a8cff91c63584e579aaff9 DIST tmux-3.3a.tar.gz 677448 BLAKE2B e835ce0f136175521035a684419f221864edb0a9506d7d68cbc0239b1349e78949ebd96573a9d8651a2df6d99acb433075d6e0c20d7394a53fe6b44bd9e56069 SHA512 29a846df7d93601c42a22f84f606931dc65da1f70b67d351d0425f77ea3affe3e8218b2940d42cd3dadf3cd1aa95032daad3ecb14fbff0f69939d1beae0498c7 DIST tmux-3.4.tar.gz 707213 BLAKE2B 2b1990b95d7439702e9287402d9828d4ecab573202c099aa482969c047b540d4b899f79d87587fc712e727d9cebf5fa7393512087e469fc355b4a30b1894e229 SHA512 bd3880211d99d8ee15947000abf8a1832fdfa48b29b2df81b66d5969cf3f4e64e746f984f6139bfc57e3ebee7fe8dc7cbb6bccb779307607de6c376969fecbff DIST tmux-bash-completion-678a27616b70c649c6701cae9cd8c92b58cc051b 458 BLAKE2B 04143e6d1cfbbd467f1656f949363cb7a4a3e16e9b3cf56b8b0423babe56276abee2622964cb490005fc76d1cbe12201fb1a6446a6f860c2cc1ff3c9bd5fc496 SHA512 fe0aca7d03067af87e0788a2fa902c7ef5500ba72295cb63c5a1814534a008c224256d7f890ac1af6d17f3734b45148765e1632f075e284c453185df2927b979 EBUILD tmux-3.3a-r1.ebuild 1923 BLAKE2B fc69a9a9900bf1fa62c90a7b05621512cea072765ee4d572a5bb1cba6ca0d916c10a6690aee03816edfe02eeeab0b2e7bfc67e17a9531ad9f6ccff652ed033d4 SHA512 253f0c66b91a532e1c21875a6024ae009e20f083e0ee45733300c349853c59ca2937faae15085fdf98d5b7a3afb026aa32e72edea0bd871308ed18683df8acdd -EBUILD tmux-3.4.ebuild 1966 BLAKE2B 4f1f727cbc7d6d16d93a1b3dc36241e43f3b1f8e9b65e30105ed737de56ab1250aefaff6511f4c60d8044f485d6925e4e1feb32cb1ee8a6f94fcce2b6b3be263 SHA512 55aef83907777aad4b1d3d41eaab792ffc5115f1173430276f8330d9c9de0b5858578fbdc2b8eef01e80e688dd722b2ba6f39cdba339f8b9da5566562828c11d -EBUILD tmux-9999.ebuild 1973 BLAKE2B 42c0b6f8bd6cf9a489f9ec36396be0c6cdf08e4c0cff5033264707b28787d23e9c6c2f0a58fa7aaab66a1b489f2dd026b7a2ff35bce12e519e16aa6b73e9c0e1 SHA512 a9214b41fff39ad4a26edaf6466fbef48e554d46e579d459399c4ac99b45e632276b2cf1f10efb819c9f327a4a3024f12cfaa2e0adc773cf48d04fcb5859511c +EBUILD tmux-3.4-r1.ebuild 2125 BLAKE2B 3d01c1c4ce4d3ba5d8ccbd881122b2ebee78811136497fe7559d0236d6d2c34f6c4fb63ca56ed3905c30610fd90053f07c7ba02642f834d9490d9159f2bd8a55 SHA512 c6784ff4a668f371c59d1caf3c9c437f02ce1075c237d90806235eebdbbb0a0a55c5a19a25a516e1386704e6f1c9353abce889eebb2538fd7e528da89489ca54 +EBUILD tmux-9999.ebuild 2132 BLAKE2B 99502d5fd3d781c405d3adcc3c738545e54bea5072622956d2add6c81f51f14307a3d767954f32ab53c51c0e2fcae79159c99915f08267b8e5992a9b2658833f SHA512 8696c366d8b74eb2b44d58fbeb04595f9cf167ec4ca2143bdd894d7b30269acc0bb5b138cae7a659a65abe8ed35d92565daa26a4eebc0a472307c9dfc5b56faa MISC metadata.xml 709 BLAKE2B 69d79a4cd812421b661ee2562d4c4afb18ad6818c4dd2c1a0e402594523579019b5d36ce75032b45e96a397c4b9b28a8850d2d767b0faf12af04abe2fb6db813 SHA512 7fadd4eda7e47bf4880f170a17fcd60a3ac5d1f98058197eac2fd354c1aa4a868fcc73d044114f4d46f6efd192dd6c9345e6690e6e4c98faa7fd97b06cb1f93d diff --git a/app-misc/tmux/files/tmux.service b/app-misc/tmux/files/tmux.service new file mode 100644 index 000000000000..d6eed0eb5bcd --- /dev/null +++ b/app-misc/tmux/files/tmux.service @@ -0,0 +1,9 @@ +[Unit] +Requires=tmux@%i.socket + +[Service] +ExecStart=/usr/bin/tmux -D + +[Install] +Also=tmux@%i.socket +DefaultInstance=default diff --git a/app-misc/tmux/files/tmux.socket b/app-misc/tmux/files/tmux.socket new file mode 100644 index 000000000000..9b94d4235efb --- /dev/null +++ b/app-misc/tmux/files/tmux.socket @@ -0,0 +1,8 @@ +[Socket] +ListenStream=/tmp/tmux-%U/%i +DirectoryMode=0700 +SocketMode=0660 + +[Install] +WantedBy=sockets.target +DefaultInstance=default diff --git a/app-misc/tmux/tmux-3.4-r1.ebuild b/app-misc/tmux/tmux-3.4-r1.ebuild new file mode 100644 index 000000000000..d90d053355f5 --- /dev/null +++ b/app-misc/tmux/tmux-3.4-r1.ebuild @@ -0,0 +1,91 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools flag-o-matic systemd + +DESCRIPTION="Terminal multiplexer" +HOMEPAGE="https://tmux.github.io/" +if [[ ${PV} == 9999 ]] ; then + inherit git-r3 + SRC_URI="https://raw.githubusercontent.com/przepompownia/tmux-bash-completion/678a27616b70c649c6701cae9cd8c92b58cc051b/completions/tmux -> tmux-bash-completion-678a27616b70c649c6701cae9cd8c92b58cc051b" + EGIT_REPO_URI="https://github.com/tmux/tmux.git" +else + SRC_URI="https://github.com/tmux/tmux/releases/download/${PV}/${P/_/-}.tar.gz" + if [[ ${PV} != *_rc* ]] ; then + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" + fi + S="${WORKDIR}/${P/_/-}" +fi + +LICENSE="ISC" +SLOT="0" +IUSE="debug selinux systemd utempter vim-syntax" + +DEPEND=" + dev-libs/libevent:= + sys-libs/ncurses:= + systemd? ( sys-apps/systemd:= ) + utempter? ( sys-libs/libutempter ) + kernel_Darwin? ( dev-libs/libutf8proc:= ) +" + +BDEPEND=" + virtual/pkgconfig + app-alternatives/yacc +" + +RDEPEND=" + ${DEPEND} + selinux? ( sec-policy/selinux-screen ) + vim-syntax? ( app-vim/vim-tmux ) +" + +# BSD only functions +QA_CONFIG_IMPL_DECL_SKIP=( strtonum recallocarray ) + +DOCS=( CHANGES README ) + +PATCHES=( + "${FILESDIR}"/${PN}-2.4-flags.patch +) + +src_prepare() { + default + eautoreconf +} + +src_configure() { + # bug 438558 + # 1.7 segfaults when entering copy mode if compiled with -Os + replace-flags -Os -O2 + + local myeconfargs=( + --sysconfdir="${EPREFIX}"/etc + $(use_enable debug) + $(use_enable systemd) + $(use_enable utempter) + + # For now, we only expose this for macOS, because + # upstream strongly encourage it. I'm not sure it's + # needed on Linux right now. + $(use_enable kernel_Darwin utf8proc) + ) + + econf "${myeconfargs[@]}" +} + +src_install() { + default + + einstalldocs + + dodoc example_tmux.conf + docompress -x /usr/share/doc/${PF}/example_tmux.conf + + if use systemd; then + systemd_newuserunit "${FILESDIR}"/tmux.service tmux@.service + systemd_newuserunit "${FILESDIR}"/tmux.socket tmux@.socket + fi +} diff --git a/app-misc/tmux/tmux-3.4.ebuild b/app-misc/tmux/tmux-3.4.ebuild deleted file mode 100644 index fd74496420c5..000000000000 --- a/app-misc/tmux/tmux-3.4.ebuild +++ /dev/null @@ -1,86 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools flag-o-matic - -DESCRIPTION="Terminal multiplexer" -HOMEPAGE="https://tmux.github.io/" -if [[ ${PV} == 9999 ]] ; then - inherit git-r3 - SRC_URI="https://raw.githubusercontent.com/przepompownia/tmux-bash-completion/678a27616b70c649c6701cae9cd8c92b58cc051b/completions/tmux -> tmux-bash-completion-678a27616b70c649c6701cae9cd8c92b58cc051b" - EGIT_REPO_URI="https://github.com/tmux/tmux.git" -else - SRC_URI="https://github.com/tmux/tmux/releases/download/${PV}/${P/_/-}.tar.gz" - if [[ ${PV} != *_rc* ]] ; then - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" - fi - S="${WORKDIR}/${P/_/-}" -fi - -LICENSE="ISC" -SLOT="0" -IUSE="debug selinux systemd utempter vim-syntax" - -DEPEND=" - dev-libs/libevent:= - sys-libs/ncurses:= - systemd? ( sys-apps/systemd:= ) - utempter? ( sys-libs/libutempter ) - kernel_Darwin? ( dev-libs/libutf8proc:= ) -" - -BDEPEND=" - virtual/pkgconfig - app-alternatives/yacc -" - -RDEPEND=" - ${DEPEND} - selinux? ( sec-policy/selinux-screen ) - vim-syntax? ( app-vim/vim-tmux ) -" - -# BSD only functions -QA_CONFIG_IMPL_DECL_SKIP=( strtonum recallocarray ) - -DOCS=( CHANGES README ) - -PATCHES=( - "${FILESDIR}"/${PN}-2.4-flags.patch -) - -src_prepare() { - default - eautoreconf -} - -src_configure() { - # bug 438558 - # 1.7 segfaults when entering copy mode if compiled with -Os - replace-flags -Os -O2 - - local myeconfargs=( - --sysconfdir="${EPREFIX}"/etc - $(use_enable debug) - $(use_enable systemd) - $(use_enable utempter) - - # For now, we only expose this for macOS, because - # upstream strongly encourage it. I'm not sure it's - # needed on Linux right now. - $(use_enable kernel_Darwin utf8proc) - ) - - econf "${myeconfargs[@]}" -} - -src_install() { - default - - einstalldocs - - dodoc example_tmux.conf - docompress -x /usr/share/doc/${PF}/example_tmux.conf -} diff --git a/app-misc/tmux/tmux-9999.ebuild b/app-misc/tmux/tmux-9999.ebuild index c213890ee26b..3f3b9e9bf1a6 100644 --- a/app-misc/tmux/tmux-9999.ebuild +++ b/app-misc/tmux/tmux-9999.ebuild @@ -3,7 +3,7 @@ EAPI=8 -inherit autotools flag-o-matic +inherit autotools flag-o-matic systemd DESCRIPTION="Terminal multiplexer" HOMEPAGE="https://tmux.github.io/" @@ -83,4 +83,9 @@ src_install() { dodoc example_tmux.conf docompress -x /usr/share/doc/${PF}/example_tmux.conf + + if use systemd; then + systemd_newuserunit "${FILESDIR}"/tmux.service tmux@.service + systemd_newuserunit "${FILESDIR}"/tmux.socket tmux@.socket + fi } -- cgit v1.2.3