gentoo auto-resync : 19:04:2023 - 17:58:12

3 files changed, 2 insertions, 67 deletions

diff --git a/net-dialup/minicom/Manifest b/net-dialup/minicom/Manifest
index 38e93f496e96..f8e6b5bb87ad 100644
--- a/net-dialup/minicom/Manifest
+++ b/net-dialup/minicom/Manifest
@@ -2,6 +2,5 @@ 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
-EBUILD minicom-2.8-r1.ebuild 1241 BLAKE2B c5928733fe05e822f81d3303f924717f5b35528843fc5fe06153c5e668da42afb30eed50ffb1665d815fc724157cdcdab114e307f4d83cbe9844c47b53345f75 SHA512 9f93f14003bd579fa5e0af442b33d574d3cf1240c6de0792b17412fd158c6f93badbb2ac6f4e7b7302bc61c78f44f7c58fc0ab3607dcb2801d524967258622ae
-EBUILD minicom-2.8-r2.ebuild 1140 BLAKE2B cd529d6fb9c1dce12fef268a935770fb8c545d93c3d818e743b3a46c5865e31914fcc8cb00aee57322b623a96f0400b40671b3a96b3842ee3d96bfa534b6bcc0 SHA512 dc113ba5939fcf3f5b99b932c7eafbcf0cb092d61ef91e0968691d528665ef41dc761b42f135eb25713dcf884efb835748dab656869e5c1da86a5d3ff6a23d01
+EBUILD minicom-2.8-r2.ebuild 1138 BLAKE2B 1ec5398039705c6951b3d4a76febe90c849198fb2f484b743386e3665a082756caffae85016b9a2c2e7e7fc8c502d2f9fd6900e12894b233ebb8c4e7d2310ea3 SHA512 81f42f706b1138167493e0b95c077833df26293b41dcdbfbb9b2e0934451318ed763bfb5c5e5b9b868ff48518333b16a8e16b5a563e394fb1f33ee31eb934219
 MISC metadata.xml 529 BLAKE2B 3b898729ec228a2557e80c69f47f73c4fa16e2cab7934c6c7792a8a4704fe7a428843dcc8e5c61416e0a3346e5f4dc3c932a6a72f15744ee530cc22c17145d2c SHA512 6a4a40a24146a5b33402ff508a47b0b159511930e564f3b4aad1b09016a48db7d1e127babe09d4ebee08321334ef669f3d48b9dc191f411fdf6766ae96131309
diff --git a/net-dialup/minicom/minicom-2.8-r1.ebuild b/net-dialup/minicom/minicom-2.8-r1.ebuild
deleted file mode 100644
index ee85c234711b..000000000000
--- a/net-dialup/minicom/minicom-2.8-r1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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"
-
-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
-	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
-}
-
-pkg_preinst() {
-	[[ -s "${EROOT}"/etc/minicom/minirc.dfl ]] && rm -f "${ED}"/etc/minicom/minirc.dfl
-}
diff --git a/net-dialup/minicom/minicom-2.8-r2.ebuild b/net-dialup/minicom/minicom-2.8-r2.ebuild
index 390ab33e2642..2a2544d4ec53 100644
--- a/net-dialup/minicom/minicom-2.8-r2.ebuild
+++ b/net-dialup/minicom/minicom-2.8-r2.ebuild
@@ -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 ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="nls"
 
 DEPEND="sys-libs/ncurses:="