diff options
Diffstat (limited to 'app-misc/tmate')
| -rw-r--r-- | app-misc/tmate/Manifest | 1 | ||||
| -rw-r--r-- | app-misc/tmate/files/tmate-2.4.0-msgpack-6.patch | 26 | ||||
| -rw-r--r-- | app-misc/tmate/metadata.xml | 2 | ||||
| -rw-r--r-- | app-misc/tmate/tmate-2.4.0-r1.ebuild (renamed from app-misc/tmate/tmate-2.3.1.ebuild) | 22 | ||||
| -rw-r--r-- | app-misc/tmate/tmate-2.4.0-r2.ebuild (renamed from app-misc/tmate/tmate-2.4.0.ebuild) | 30 |
5 files changed, 54 insertions, 27 deletions
diff --git a/app-misc/tmate/Manifest b/app-misc/tmate/Manifest index 29bd9018a67b..d441076d15a0 100644 --- a/app-misc/tmate/Manifest +++ b/app-misc/tmate/Manifest @@ -1,2 +1 @@ -DIST tmate-2.3.1.tar.gz 611136 BLAKE2B bbcfb137cb9e712bbe3c36b2d57e6f1ea5a68c884e6e6ccd252315bca689b1bbec7a53cd131f0f36a6bab5b1defd3acb26bb458684894c81d676d2585db4790b SHA512 98531e3a3c1cc4da11894e8298df560fd58f1ede6a81ac8cb5f8cbea86f5c21672a016977dab801ec06e14f6c718a64599a9e32740934fcd4c0a155f92710520 DIST tmate-2.4.0.tar.gz 614179 BLAKE2B 9864f71255ceafb10cfd622346ef7d2db2a124d13599a7c8ae81e83950ba56216193e02633a9becd90fd430c6ddff66df763fe2733d58f45b02c74c8fb8f7fc4 SHA512 92d2ca354b295678bfc2747ca83a45ebafeaec40ebac94bd94c4926af4f820b3f3a087f365147f41c80d1c8ad032f52c697a2421839c39315d84f98f7eccada6 diff --git a/app-misc/tmate/files/tmate-2.4.0-msgpack-6.patch b/app-misc/tmate/files/tmate-2.4.0-msgpack-6.patch new file mode 100644 index 000000000000..6fbda6197eef --- /dev/null +++ b/app-misc/tmate/files/tmate-2.4.0-msgpack-6.patch @@ -0,0 +1,26 @@ +https://bugs.gentoo.org/903657 +https://github.com/tmate-io/tmate/pull/281 +--- a/configure.ac ++++ b/configure.ac +@@ -207,7 +207,20 @@ PKG_CHECK_MODULES( + LIBS="$MSGPACK_LIBS $LIBS" + found_msgpack=yes + ], +- found_msgpack=no ++ [ ++ found_msgpack=no ++ # msgpack.pc was renamed to msgpack-c.pc in 6.0.0. ++ PKG_CHECK_MODULES( ++ MSGPACKC, ++ msgpack-c >= 1.1.0, ++ [ ++ CPPFLAGS="$MSGPACKC_CFLAGS $CPPFLAGS" ++ LIBS="$MSGPACKC_LIBS $LIBS" ++ found_msgpack=yes ++ ], ++ found_msgpack=no ++ ) ++ ] + ) + if test "x$found_msgpack" = xno; then + AC_MSG_ERROR("msgpack >= 1.1.0 not found") diff --git a/app-misc/tmate/metadata.xml b/app-misc/tmate/metadata.xml index fbd6cccf4c3b..2a5635e95904 100644 --- a/app-misc/tmate/metadata.xml +++ b/app-misc/tmate/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>dlan@gentoo.org</email> diff --git a/app-misc/tmate/tmate-2.3.1.ebuild b/app-misc/tmate/tmate-2.4.0-r1.ebuild index bdddbdf93b17..920c528ee69e 100644 --- a/app-misc/tmate/tmate-2.3.1.ebuild +++ b/app-misc/tmate/tmate-2.4.0-r1.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit autotools @@ -10,19 +10,18 @@ HOMEPAGE="https://tmate.io/" LICENSE="ISC" SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="debug libressl static-libs" +KEYWORDS="amd64 ~riscv ~x86" +IUSE="debug" SRC_URI="https://github.com/tmate-io/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" RDEPEND=" - sys-libs/zlib[static-libs?] - sys-libs/libutempter[static-libs?] - dev-libs/libevent[static-libs?] - dev-libs/msgpack[static-libs?] - >=net-libs/libssh-0.6.0[static-libs?] - !libressl? ( dev-libs/openssl:0=[static-libs?] ) - libressl? ( dev-libs/libressl:0=[static-libs?] ) + sys-libs/zlib + sys-libs/libutempter + dev-libs/libevent + dev-libs/msgpack + >=net-libs/libssh-0.6.0 + dev-libs/openssl:0= " DEPEND="${RDEPEND}" BDEPEND="virtual/pkgconfig" @@ -35,6 +34,7 @@ src_prepare() { src_configure() { local myeconfargs=( $(use_enable debug) + --disable-static ) econf "${myeconfargs[@]}" } diff --git a/app-misc/tmate/tmate-2.4.0.ebuild b/app-misc/tmate/tmate-2.4.0-r2.ebuild index bdddbdf93b17..3b27ffa1aa08 100644 --- a/app-misc/tmate/tmate-2.4.0.ebuild +++ b/app-misc/tmate/tmate-2.4.0-r2.ebuild @@ -1,32 +1,34 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit autotools DESCRIPTION="Instant terminal sharing" HOMEPAGE="https://tmate.io/" +SRC_URI="https://github.com/tmate-io/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" -LICENSE="ISC" +LICENSE="ISC BSD BSD-2" SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="debug libressl static-libs" - -SRC_URI="https://github.com/tmate-io/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" +KEYWORDS="amd64 ~riscv ~x86" +IUSE="debug" RDEPEND=" - sys-libs/zlib[static-libs?] - sys-libs/libutempter[static-libs?] - dev-libs/libevent[static-libs?] - dev-libs/msgpack[static-libs?] - >=net-libs/libssh-0.6.0[static-libs?] - !libressl? ( dev-libs/openssl:0=[static-libs?] ) - libressl? ( dev-libs/libressl:0=[static-libs?] ) + dev-libs/libevent + dev-libs/msgpack:= + dev-libs/openssl:= + >=net-libs/libssh-0.6.0 + sys-libs/zlib + sys-libs/libutempter " DEPEND="${RDEPEND}" BDEPEND="virtual/pkgconfig" +PATCHES=( + "${FILESDIR}"/${PN}-2.4.0-msgpack-6.patch +) + src_prepare() { default eautoreconf |