[gentoo-commits] repo/gentoo:master commit in: net-dialup/minicom/, net-dialup/minicom/files/

["Conrad Kostecki" <conikost@gentoo.org>]

commit:     1cb0b3c6e6a61ad3cbb0d2b14bc896d6bb1ebe0a
Author:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 27 21:50:19 2021 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sat Mar 27 21:55:01 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1cb0b3c6

net-dialup/minicom: bump to version 2.8

Changelog:
- Bump to EAPI=7
- Correct license to GPL-2+
- Add missing pkgconfig to deps
- Overhaul ebuild
- Dropped GCC-10 fix, as it's merged
- Updated gentoo-runscript patch

Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 net-dialup/minicom/Manifest                        |  1 +
 .../files/minicom-2.8-gentoo-runscript.patch       | 42 +++++++++++++++
 net-dialup/minicom/files/minicom-2.8-lockdir.patch | 14 +++++
 net-dialup/minicom/metadata.xml                    | 23 +++++----
 net-dialup/minicom/minicom-2.8.ebuild              | 60 ++++++++++++++++++++++
 5 files changed, 129 insertions(+), 11 deletions(-)

diff --git a/net-dialup/minicom/Manifest b/net-dialup/minicom/Manifest
index c218b898488..920a2cf93f0 100644
--- a/net-dialup/minicom/Manifest
+++ b/net-dialup/minicom/Manifest
@@ -1 +1,2 @@
 DIST minicom-2.7.1.tar.gz 863544 BLAKE2B 473dbf9695e16fdf23581b831d1b76f32a5b9f47cf82c6430386646a4ad04a58d61bea08ba032d0c4f779fd19d90d12270df317b719bad6cba63d921c197c87c SHA512 eb9679ac3a3d3585ea06c54407567898e50b981378656e7f8a241071c91054ff0928cc9023d2c79d1936588cdffa9426f4962b556e8daa1783add0c5ac59b5af
+DIST minicom-2.8.tar.gz 948015 BLAKE2B 007a2975a996e2dd2390b1cf20e1a70c4bb1b57d224211d30e8d83a9d02a45c147df34bf409961a20ad3746cb6b5551c1e0702a05bb0a0a3f7f042d251b553be SHA512 5ced0ff79cec11464154561130ddc6a38865170d4e4d80185ada540ba173fe89e35703b6d7fd0cf86caef6e020fcad1d7b1fdb4d4f55e3ddb906aea6a4b81b36

diff --git a/net-dialup/minicom/files/minicom-2.8-gentoo-runscript.patch b/net-dialup/minicom/files/minicom-2.8-gentoo-runscript.patch
new file mode 100644
index 00000000000..97c53e91c8e
--- /dev/null
+++ b/net-dialup/minicom/files/minicom-2.8-gentoo-runscript.patch
@@ -0,0 +1,42 @@
+--- a/man/minicom.1
++++ b/man/minicom.1
+@@ -469,7 +469,7 @@
+ .TP 0.5i
+ .B D - Script program
+ Which program to use as the script interpreter. Defaults to the
+-program "runscript", but if you want to use something else (eg,
++program "/usr/bin/runscript", but if you want to use something else (eg,
+ /bin/sh or "expect") it is possible.  Stdin and stdout are connected
+ to the modem, stderr to the screen.
+ .RS 0.5i
+--- a/man/runscript.1
++++ b/man/runscript.1
+@@ -5,7 +5,7 @@
+ .\" for conditions under which this file may be redistributed.
+ .TH RUNSCRIPT 1 "$Date: 2007-10-07 18:13:51 $" "User's Manual"
+ .SH NAME
+-runscript \- script interpreter for minicom
++/usr/bin/runscript \- script interpreter for minicom
+ .SH SYNOPSIS
+ .B runscript
+ .RI "scriptname [logfile [homedir]]"
+--- a/src/rwconf.c
++++ b/src/rwconf.c
+@@ -105,7 +105,7 @@
+   { N_("No"),		0,  "kermreal" },
+   { "3",		0,   "colusage" },
+   /* The script program */
+-  { "runscript",	0,   "scriptprog" },
++  { "/usr/bin/runscript",	0,   "scriptprog" },
+   /* Modem parameters */
+   { "",                 0,   "minit" },
+   { "",                 0,   "mreset" },
+@@ -245,7 +245,7 @@
+   int matched;
+ 
+   if (conftype == CONFIG_GLOBAL)
+-    strcpy(P_SCRIPTPROG, "runscript");
++    strcpy(P_SCRIPTPROG, "/usr/bin/runscript");
+ 
+   line = malloc(line_size);
+   if (!line) {

diff --git a/net-dialup/minicom/files/minicom-2.8-lockdir.patch b/net-dialup/minicom/files/minicom-2.8-lockdir.patch
new file mode 100644
index 00000000000..17fb635cd9b
--- /dev/null
+++ b/net-dialup/minicom/files/minicom-2.8-lockdir.patch
@@ -0,0 +1,14 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -219,7 +219,10 @@
+ 
+ if test "x$UUCPLOCK" != x
+ then
+-	if test -d $UUCPLOCK
++	dnl If a lock directory was manually specified, do not test it actually,
++	dnl as that might not be true during a chroot build, and the
++	dnl packager is responsible for making sure it exists at runtime.
++	if true
+ 	then
+ 		AC_MSG_RESULT($UUCPLOCK)
+ 		AC_DEFINE_UNQUOTED(UUCPLOCK, "$UUCPLOCK", [Lock directory])

diff --git a/net-dialup/minicom/metadata.xml b/net-dialup/minicom/metadata.xml
index acd06db3222..51d4c88904c 100644
--- a/net-dialup/minicom/metadata.xml
+++ b/net-dialup/minicom/metadata.xml
@@ -1,15 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>embedded@gentoo.org</email>
-    <name>Embedded Gentoo</name>
-  </maintainer>
-  <longdescription lang="en">
-    Minicom is a menu driven communications program. It emulates ANSI and VT102
-    terminals. It has a dialing directory and auto zmodem download.
-  </longdescription>
-  <upstream>
-    <remote-id type="cpe">cpe:/a:minicom_project:minicom</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>embedded@gentoo.org</email>
+		<name>Embedded Gentoo</name>
+	</maintainer>
+	<longdescription>
+		Minicom is a menu driven communications program.
+		It emulates ANSI and VT102 terminals and
+		has a dialing directory and auto zmodem download.
+	</longdescription>
+	<upstream>
+		<remote-id type="cpe">cpe:/a:minicom_project:minicom</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/net-dialup/minicom/minicom-2.8.ebuild b/net-dialup/minicom/minicom-2.8.ebuild
new file mode 100644
index 00000000000..dad212bacba
--- /dev/null
+++ b/net-dialup/minicom/minicom-2.8.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2021 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 ~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=(
+		--disable-rpath
+		--enable-lock-dir="/var/lock"
+		$(use_enable nls)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	insinto /etc/minicom
+	doins "${FILESDIR}"/minirc.dfl
+}
+
+pkg_preinst() {
+	[[ -s "${EROOT}"/etc/minicom/minirc.dfl ]] && rm -f "${ED}"/etc/minicom/minirc.dfl
+}