From c07cd9b9ba80f85e38f92561234644ddbcaa9095 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Tue, 25 Feb 2025 12:34:31 +0100 Subject: [PATCH] net-dialup/minicom: Sync with Gentoo It's from Gentoo commit 128ea6b2542ae3607840503df8d5a01506d20c72. --- .../net-dialup/minicom/Manifest | 3 +- .../files/minicom-2.8-enable-large-file.patch | 30 -------- ...icom-2.8-r2.ebuild => minicom-2.10.ebuild} | 6 +- .../net-dialup/minicom/minicom-2.8-r4.ebuild | 69 ------------------- 4 files changed, 4 insertions(+), 104 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/net-dialup/minicom/files/minicom-2.8-enable-large-file.patch rename sdk_container/src/third_party/portage-stable/net-dialup/minicom/{minicom-2.8-r2.ebuild => minicom-2.10.ebuild} (83%) delete mode 100644 sdk_container/src/third_party/portage-stable/net-dialup/minicom/minicom-2.8-r4.ebuild diff --git a/sdk_container/src/third_party/portage-stable/net-dialup/minicom/Manifest b/sdk_container/src/third_party/portage-stable/net-dialup/minicom/Manifest index c03ddf9606..e32bffb010 100644 --- a/sdk_container/src/third_party/portage-stable/net-dialup/minicom/Manifest +++ b/sdk_container/src/third_party/portage-stable/net-dialup/minicom/Manifest @@ -1,3 +1,2 @@ -DIST minicom-2.8.tar.gz 948015 BLAKE2B 007a2975a996e2dd2390b1cf20e1a70c4bb1b57d224211d30e8d83a9d02a45c147df34bf409961a20ad3746cb6b5551c1e0702a05bb0a0a3f7f042d251b553be SHA512 5ced0ff79cec11464154561130ddc6a38865170d4e4d80185ada540ba173fe89e35703b6d7fd0cf86caef6e020fcad1d7b1fdb4d4f55e3ddb906aea6a4b81b36 +DIST minicom-2.10.tar.gz 798751 BLAKE2B 1828b2670a71f8c94099cabc49b1e85ad35bd0491a78fe99a92d32176811d25b76afa74b417491f44bec40c1a7273e1bbc0ab9729dfa2626291b069b4447b919 SHA512 ced271a21b0ba97ad0b09093f341112d4c4f64f6b72631502acc136d2fb92eeb14965d4187fd8cfed0e0e2519b603b6e54d8dd780e666119ecfc5677203595e2 DIST minicom-2.9.tar.gz 1044053 BLAKE2B 4c17f235d770ff9b4719c0ce9d3dfdb01603986d08cec245b1bfba5addbea597032bb06fc73c585886e035915dec990f37e9690b58d0a80a3e6faf8675485f96 SHA512 3bd41fa3b93b086c7b0fc851e9f46f241b13a037a4a325fc5e0ca6a4db7e9389443e8965891aa938a9c31ff848d50fd0cb88b98690a06737b5f3aca2520a60e2 -DIST minicom-m4-2.8.tar.bz2 26016 BLAKE2B 0cff0bc3ca134b417fdabb5e2994afebaf89224b95c0b3843ec57e815f43778c8eab1f8df6098d756616a0c494812d9fabc4292eaeaa9c09afb62821ce852438 SHA512 d09e141b1b83f215dc11dcd33d0cd62000c46384ea86084edfb07b04a4d30c0d9e2dce49e5e8e78f3f70fb646737f1e55a9c1158906312575ca2f02db6283994 diff --git a/sdk_container/src/third_party/portage-stable/net-dialup/minicom/files/minicom-2.8-enable-large-file.patch b/sdk_container/src/third_party/portage-stable/net-dialup/minicom/files/minicom-2.8-enable-large-file.patch deleted file mode 100644 index 11489b50c6..0000000000 --- a/sdk_container/src/third_party/portage-stable/net-dialup/minicom/files/minicom-2.8-enable-large-file.patch +++ /dev/null @@ -1,30 +0,0 @@ -https://bugs.gentoo.org/912680 -https://salsa.debian.org/minicom-team/minicom/-/commit/4ed314c504bc95d8ccef81d7c68684d5ac31e9db.patch - -From 4ed314c504bc95d8ccef81d7c68684d5ac31e9db Mon Sep 17 00:00:00 2001 -From: Adam Lackorzynski -Date: Sat, 19 Aug 2023 12:52:02 +0200 -Subject: [PATCH] configure.ac: Enable large file support - -Add AC_SYS_LARGEFILE to enable large file support in a portable way. -Thanks the ChromeOS team and Raul Rangel for hinting at this. ---- - configure.ac | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/configure.ac b/configure.ac -index 7b3f0df..6424a3f 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -16,6 +16,8 @@ dnl Checks for programs. - AC_PROG_CC - AM_PROG_AR - -+AC_SYS_LARGEFILE -+ - AC_USE_SYSTEM_EXTENSIONS - AC_USE_SYSTEM_EXTENSIONS - --- -GitLab - diff --git a/sdk_container/src/third_party/portage-stable/net-dialup/minicom/minicom-2.8-r2.ebuild b/sdk_container/src/third_party/portage-stable/net-dialup/minicom/minicom-2.10.ebuild similarity index 83% rename from sdk_container/src/third_party/portage-stable/net-dialup/minicom/minicom-2.8-r2.ebuild rename to sdk_container/src/third_party/portage-stable/net-dialup/minicom/minicom-2.10.ebuild index 352344d5df..3019838c4c 100644 --- a/sdk_container/src/third_party/portage-stable/net-dialup/minicom/minicom-2.8-r2.ebuild +++ b/sdk_container/src/third_party/portage-stable/net-dialup/minicom/minicom-2.10.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -11,7 +11,7 @@ SRC_URI="https://salsa.debian.org/${PN}-team/${PN}/-/archive/${PV}/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" IUSE="nls" DEPEND="sys-libs/ncurses:=" @@ -28,7 +28,7 @@ BDEPEND=" PATCHES=( "${FILESDIR}"/${PN}-2.8-gentoo-runscript.patch - "${FILESDIR}"/${PN}-2.8-lockdir.patch + "${FILESDIR}"/${PN}-2.9-update-gettext.patch ) src_prepare() { diff --git a/sdk_container/src/third_party/portage-stable/net-dialup/minicom/minicom-2.8-r4.ebuild b/sdk_container/src/third_party/portage-stable/net-dialup/minicom/minicom-2.8-r4.ebuild deleted file mode 100644 index 1a6ce15ebf..0000000000 --- a/sdk_container/src/third_party/portage-stable/net-dialup/minicom/minicom-2.8-r4.ebuild +++ /dev/null @@ -1,69 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools - -DESCRIPTION="Serial Communication Program" -HOMEPAGE="https://salsa.debian.org/minicom-team/minicom" -SRC_URI=" - https://salsa.debian.org/${PN}-team/${PN}/-/archive/${PV}/${P}.tar.gz - https://dev.gentoo.org/~ceamac/${CATEGORY}/${PN}/${PN}-m4-${PV}.tar.bz2 -" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" -IUSE="nls" - -DEPEND="sys-libs/ncurses:=" - -RDEPEND=" - ${DEPEND} - net-dialup/lrzsz -" - -BDEPEND=" - virtual/pkgconfig - nls? ( sys-devel/gettext ) -" - -PATCHES=( - "${FILESDIR}"/${PN}-2.8-gentoo-runscript.patch - "${FILESDIR}"/${PN}-2.8-lockdir.patch - "${FILESDIR}"/${PN}-2.8-enable-large-file.patch -) - -src_prepare() { - default - - # 912459 - # Embed the needed m4 macros if gettext is not installed - mv "${WORKDIR}"/m4 . || die - - eautoreconf -} - -src_configure() { - # Lockdir must exist if not manually specified. - # '/var/lock' is created by OpenRC. - local myeconfargs=( - # See bug #788142 - --sysconfdir="${EPREFIX}"/etc/${PN} - - --disable-rpath - --enable-lock-dir="/var/lock" - $(use_enable nls) - ) - - econf "${myeconfargs[@]}" -} - -src_install() { - default - - # Needs to match --sysconfdir above - insinto /etc/minicom - doins "${FILESDIR}"/minirc.dfl -}