gentoo auto-resync : 20:08:2023 - 09:41:00

6 files changed, 106 insertions, 2 deletions

diff --git a/net-dialup/Manifest.gz b/net-dialup/Manifest.gz
index 4b296d117f34..f2e577e8bc29 100644
--- a/net-dialup/Manifest.gz
+++ b/net-dialup/Manifest.gz
diff --git a/net-dialup/lrzsz/Manifest b/net-dialup/lrzsz/Manifest
index e5a901fbfa40..47dd56b66ce3 100644
--- a/net-dialup/lrzsz/Manifest
+++ b/net-dialup/lrzsz/Manifest
@@ -2,11 +2,13 @@ AUX lrzsz-0.12.20-AR.patch 266 BLAKE2B 51c7a264e02d4609cf771289f897789121cff57a6
 AUX lrzsz-0.12.20-automake-1.12.patch 793 BLAKE2B 969e4f452c6c8240eeea343ebb809fd2d8b33e11bd37dbba679aa5f98ba10a8f182140d1ffe35b83a77fc5db2c0c14cf338a2f3605f7f4d30763d1b1f6b27739 SHA512 8e55cec506a494f97e7bd0c7bf910a0f49ab56485fe916e6d9e7dec7c6ff0f14aadd2b88d393ea16493c1780405e69ec7876490bf93fd05a8c51a3f58666a4a0
 AUX lrzsz-0.12.20-automake-1.13.patch 454 BLAKE2B 19627ec86b92c5e1dfcd4404408b9a64f1bc39ec08746f0c848db5a56be67e16341ccb4c37dcad7369e95b13b32788646daf76d5f0712b6d77c859e3dbea7a0f SHA512 75b0f707704bb4f788de9f2fbb82c29daaa4b748e151271ba2617d24d759a84dea323f2f160b727e2c94675df78ffe1bd8368dd593d4582cbb567643717ec68e
 AUX lrzsz-0.12.20-configure-clang16.patch 283 BLAKE2B 93e58683157cb3da035d8974fe35ecd1b8569df44818bfbdd60d6f4e3e406a86d0b0ce41631c648fc0e3aa6640f753f3912f113caaf07a86a2ee8dc3067aadb9 SHA512 92b6cb4a7575413f63e62225b8c0f852a89703a732625ec7d589890546459a61762260547b6acb8efec87447407cec13e493eebd2610c6e2838f6ef66c06e239
+AUX lrzsz-0.12.20-disable-nls.patch 616 BLAKE2B c90986a3b3acf8aecfdd0ccbdd07946ee4fd342db26506afbde872f0c9102a04227fe8e563c7f7bf85881884dad4f011a34bd238e070acf0d6e87a3d6ed5eb2f SHA512 df8535ec3035d6120d00d72c5e3fd1d4171d4e506af027dc9af6f7d1a24a09374b3ae2cf576ddef6aa4a49fee299a72a60b8d5503da353d9de95688a48a4f185
 AUX lrzsz-0.12.20-gettext-0.20.patch 850 BLAKE2B f3d810b7335c33f1e28247cd7a68d50f939a8b6b4ad1d15839a22d46460627343c7515b13729c1cebd8b669310210ca985b17671e538deb9b4fcb9c42cbfd04f SHA512 39c140c7cef024604cd0148d32587176b3ab2e50a622bca2f02307bbf89ae62db3928a6defbcc3790bf1e35f30eaf0fa66e43174ff8dca8a86cb01bda4050b15
 AUX lrzsz-0.12.20-gettext-0.22.patch 1016 BLAKE2B 415f2b2bbb9311bc306ab43f56df416cd66f4c08d95db81f473f284fa4d0618218ca53c55e1765480f2bfeb29b3d2efe7a78d012e26ef339262470ba556ed105 SHA512 0dbf6dc3e3bf6c91e194f19af6ded6c02fe5ad9ef9467669e4151dcaab15ab934a6b7a7e67c3be12ea7bbfa3f063b3932d5f9ce2e9a72976484e54dea329229a
 AUX lrzsz-autotools.patch 8725 BLAKE2B 8f499974f0184784d1e800a43e8fdd09b389bb2a2c48ae335708ca25eb2b7130b5554fcbb8217aa3833ffdf2d0756fe091df615351b4c23214e7889dbf2399aa SHA512 4ba98fb4a72d8fcc654741d57992598d56eded61e7b89c54d44edd7a609149e15d9948d777d70bf41137daa0b860c67e1212a3f38519434cb5d44546bfb94909
 AUX lrzsz-implicit-decl.patch 428 BLAKE2B c08a244d292be32bb49fff6186cbe847c106dee67b3ea463860d1e6387e159af1b106e5f78ea5bce31c347cb7207c95116243fa515e4daafb23d2cc309776480 SHA512 7dd642aa6701671986e6ab1635935c7a8088ad5ee74131b7c486e2e87d748fc835798d1a8a291e85a80ba3f88328ce4f293a8dafb1ebd9924f1f31fb2bd3a7d7
 DIST lrzsz-0.12.20.tar.gz 280938 BLAKE2B 86511ab112da849f5894f18c045f2c8a9dd4c4e97426c1d98c5b91aade6c39e26f4a7e5674e057c9596a240dfd3ef32053fcdc8ee58b33654cf15eec64779b1e SHA512 9bce64036f1f1c65f5910f19802aecaf3dc5ffeab0feeca10fa8d2fe1b83e212391cce23056d22fd0eda52df89e12ede68eb5d22ffcf22f935910d2af7399f12
+DIST lrzsz-m4-0.12.20.tar.bz2 23959 BLAKE2B 933e43f80a40478baef77d69f81fcb04947f2d0afb87f777b0c000ea4223408bf3e55d687cf625ab4835fb30e274f7058ff09ee3b51ad90e09723cd3053ee038 SHA512 c8818381f2e5271bc2dd7d469c0a33a6b22d42d3159b41f168223473a8b03322f3ff91a49ce398e3ef5abe7b355d92b83b1429d0c6d450d19985a60e2e1190d4
 EBUILD lrzsz-0.12.20-r5.ebuild 1573 BLAKE2B f5169193335b6b83c12e06b11a5af6cd89f18f1cd014599c14471d0f950c482d467be2bff07dc5ed4c54d681bdd2c456256829ced1a95200e6015b19eefbe230 SHA512 41683f47f75855addfaf84f83248501e4a6fb8c2b238a7de8a368639fb8f68c2d09ffb8cd64f80bbc2d788662cd857b27e081a43eeda7921957b846162d43c17
-EBUILD lrzsz-0.12.20-r6.ebuild 1613 BLAKE2B 83851c4a9bbb5844ebab6d588cba9c920813b7e7ad07c86bef341e7b2ed4815c3305022745afe246e194aa22c2d30bf3f37e1bd7f1d6e64ce93294dc709247e4 SHA512 220ea2b5e8f85ca57c88dfba112de48d3661b5421143790922a4fea5aaee3768a8e8820577bc5d2541adafe343fd1cc9388f4d5385e6aa0856dceb695f5db590
+EBUILD lrzsz-0.12.20-r7.ebuild 1852 BLAKE2B 0205705379bb5b27f6d8886591a628c05b78a808a6b0dbf9636a5fa887b0550c0915548573701a2a7163151bf61ce2354a9668d46a3baac27f026b72ce49cbb1 SHA512 3ff782726a3ec9a0fe183900f48bf51297c233132d9ed653c3885be9f4df2564481804d3c4cd8e80ba894589ecbbaba5c4a746040f9caa7e5fe2fbed4f4cf7f8
 MISC metadata.xml 248 BLAKE2B 9858a97a2186d5b06e272fe28021e0e668897630d8b99023000e8e58e852e80e16b399d8f864b9dff6c9fda25e1519ac8b4331792a4b441be23922707c4ad6a9 SHA512 a1e8f757e473af3ab0ccf695f849dc91e1be877dd505d339bdd26e35a2cf7fb5ffd8f5bf34e933873a462023aecb0edbddefbbda455289279182059cd6c1b0e5
diff --git a/net-dialup/lrzsz/files/lrzsz-0.12.20-disable-nls.patch b/net-dialup/lrzsz/files/lrzsz-0.12.20-disable-nls.patch
new file mode 100644
index 000000000000..b0f290e71564
--- /dev/null
+++ b/net-dialup/lrzsz/files/lrzsz-0.12.20-disable-nls.patch
@@ -0,0 +1,25 @@
+This package does not contain the m4 macros from gettext, so if gettext is not
+installed the macros are lost when running eautoreconf.
+
+Embed the required m4 files and add the directory to configure.ac.
+
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -5,6 +5,7 @@
+ noinst_SCRIPTS=systype
+ PR=@PACKAGE@-@VERSION@
+ CLEAN_FILES=fastcheck.done
++AC_CONFIG_MACRO_DIR=-I m4
+ 
+ dist-hook:
+ 	mkdir $(distdir)/debian
+--- a/configure.in
++++ b/configure.in
+@@ -3,6 +3,7 @@
+ AC_INIT(src/crctab.c)
+ AM_INIT_AUTOMAKE(lrzsz, 0.12.20)
+ AC_CONFIG_HEADERS([config.h])
++AC_CONFIG_MACRO_DIR([m4])
+ 
+ 
+ dnl AC_C_CROSS is in AC_PROG_CC since 2.12
diff --git a/net-dialup/lrzsz/lrzsz-0.12.20-r6.ebuild b/net-dialup/lrzsz/lrzsz-0.12.20-r7.ebuild
index 08671484501a..252debc21c72 100644
--- a/net-dialup/lrzsz/lrzsz-0.12.20-r6.ebuild
+++ b/net-dialup/lrzsz/lrzsz-0.12.20-r7.ebuild
@@ -7,7 +7,10 @@ inherit autotools toolchain-funcs
 
 DESCRIPTION="Communication package providing the X, Y, and ZMODEM file transfer protocols"
 HOMEPAGE="https://www.ohse.de/uwe/software/lrzsz.html"
-SRC_URI="https://www.ohse.de/uwe/releases/${P}.tar.gz"
+SRC_URI="
+	https://www.ohse.de/uwe/releases/${P}.tar.gz
+	https://dev.gentoo.org/~ceamac/${CATEGORY}/${PN}/${PN}-m4-${PV}.tar.bz2
+"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -15,6 +18,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~
 IUSE="nls"
 
 DEPEND="nls? ( virtual/libintl )"
+BDEPEND="nls? ( sys-devel/gettext )"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-autotools.patch
@@ -25,6 +29,7 @@ PATCHES=(
 	"${FILESDIR}"/${P}-AR.patch
 	"${FILESDIR}"/${P}-configure-clang16.patch
 	"${FILESDIR}"/${P}-gettext-0.22.patch
+	"${FILESDIR}"/${P}-disable-nls.patch
 )
 
 DOCS=( AUTHORS COMPATABILITY ChangeLog NEWS \
@@ -39,6 +44,8 @@ src_prepare() {
 	rm missing || die
 	# Autoheader does not like seeing this file.
 	rm acconfig.h || die
+	# embed default m4 files in case gettext is not installed
+	mv "${WORKDIR}"/m4 . || die
 
 	eautoreconf
 }
diff --git a/net-dialup/minicom/Manifest b/net-dialup/minicom/Manifest
index f8e6b5bb87ad..26dc2f7bf367 100644
--- a/net-dialup/minicom/Manifest
+++ b/net-dialup/minicom/Manifest
@@ -2,5 +2,7 @@ AUX minicom-2.8-gentoo-runscript.patch 1331 BLAKE2B 6e9ee88bec01054710bd60163fe3
 AUX minicom-2.8-lockdir.patch 431 BLAKE2B 536586d955557d8250b76f7cec1571d7c0f4f31d10eb713fe4ebc624ca90e88fef56ed3bbabb15be2ac35d60b4948e1bb641dac0b61c4ca4bad807cb5dd2c836 SHA512 765eabe70368475d323f898cf3c9f3d817f25b039a225d5284450600a895a284e92d7589b678b39010c429435ced00fb3f57506063242aa094c7c2551c533fcf
 AUX minirc.dfl 66 BLAKE2B fa087c52ace0bcc5915e58074b96f8d6b0304690dccdb5d2710a2d3c334825f05d89e75d9a613ac1c40a44bd1605cae8765d24a259212767e62fe3a6f8779b57 SHA512 dc6f65392ec4ee9e0f499596b6220cb23e443530a3802edc8805412a7999ffb48cb2f9f5c9f7a7ebfbbe166fdbf128847f00141c4f67c0176bb245081814955c
 DIST minicom-2.8.tar.gz 948015 BLAKE2B 007a2975a996e2dd2390b1cf20e1a70c4bb1b57d224211d30e8d83a9d02a45c147df34bf409961a20ad3746cb6b5551c1e0702a05bb0a0a3f7f042d251b553be SHA512 5ced0ff79cec11464154561130ddc6a38865170d4e4d80185ada540ba173fe89e35703b6d7fd0cf86caef6e020fcad1d7b1fdb4d4f55e3ddb906aea6a4b81b36
+DIST minicom-m4-2.8.tar.bz2 26016 BLAKE2B 0cff0bc3ca134b417fdabb5e2994afebaf89224b95c0b3843ec57e815f43778c8eab1f8df6098d756616a0c494812d9fabc4292eaeaa9c09afb62821ce852438 SHA512 d09e141b1b83f215dc11dcd33d0cd62000c46384ea86084edfb07b04a4d30c0d9e2dce49e5e8e78f3f70fb646737f1e55a9c1158906312575ca2f02db6283994
 EBUILD minicom-2.8-r2.ebuild 1138 BLAKE2B 1ec5398039705c6951b3d4a76febe90c849198fb2f484b743386e3665a082756caffae85016b9a2c2e7e7fc8c502d2f9fd6900e12894b233ebb8c4e7d2310ea3 SHA512 81f42f706b1138167493e0b95c077833df26293b41dcdbfbb9b2e0934451318ed763bfb5c5e5b9b868ff48518333b16a8e16b5a563e394fb1f33ee31eb934219
+EBUILD minicom-2.8-r3.ebuild 1320 BLAKE2B 89e7d1d7d20b085c9c6a687fe6ff4c2e98d98e9ca67ecd1534dfc59f2fc304cde5adb812f2f9a2b7ca130f96a1f58553f1e9150d5e02c33c2635c651f127eb6f SHA512 92fcba47c68109219dd1efa9d91892281b11271c351715370353678908a3aa1d28aec91890774993cc84bbba4dba6fb624ed624670aa9a3a240afd0a8285095d
 MISC metadata.xml 529 BLAKE2B 3b898729ec228a2557e80c69f47f73c4fa16e2cab7934c6c7792a8a4704fe7a428843dcc8e5c61416e0a3346e5f4dc3c932a6a72f15744ee530cc22c17145d2c SHA512 6a4a40a24146a5b33402ff508a47b0b159511930e564f3b4aad1b09016a48db7d1e127babe09d4ebee08321334ef669f3d48b9dc191f411fdf6766ae96131309
diff --git a/net-dialup/minicom/minicom-2.8-r3.ebuild b/net-dialup/minicom/minicom-2.8-r3.ebuild
new file mode 100644
index 000000000000..cd9a960d5175
--- /dev/null
+++ b/net-dialup/minicom/minicom-2.8-r3.ebuild
@@ -0,0 +1,68 @@
+# 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 ~ia64 ~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
+)
+
+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
+}