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

[Sam James]

commit:     151902e0caf3f5a1d83a21fcd9aa98d4dff414a8
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 19 02:51:19 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Mar 19 02:51:19 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=151902e0

net-dialup/minicom: drop 2.7.1, 2.8

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-dialup/minicom/Manifest                        |  1 -
 .../files/minicom-2.3-gentoo-runscript.patch       | 55 --------------------
 .../minicom/files/minicom-2.7.1-gcc-10.patch       | 31 -----------
 net-dialup/minicom/files/minicom-2.7.1-musl.patch  | 24 ---------
 net-dialup/minicom/minicom-2.7.1.ebuild            | 56 --------------------
 net-dialup/minicom/minicom-2.8.ebuild              | 60 ----------------------
 6 files changed, 227 deletions(-)

diff --git a/net-dialup/minicom/Manifest b/net-dialup/minicom/Manifest
index 920a2cf93f01..56424c22667d 100644
--- a/net-dialup/minicom/Manifest
+++ b/net-dialup/minicom/Manifest
@@ -1,2 +1 @@
-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.3-gentoo-runscript.patch b/net-dialup/minicom/files/minicom-2.3-gentoo-runscript.patch
deleted file mode 100644
index ff72db966b85..000000000000
--- a/net-dialup/minicom/files/minicom-2.3-gentoo-runscript.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-diff -ru minicom-2.3.orig/extras/scriptdemo minicom-2.3/extras/scriptdemo
---- minicom-2.3.orig/extras/scriptdemo	2003-03-30 21:55:39.000000000 +0300
-+++ minicom-2.3/extras/scriptdemo	2008-04-20 05:27:19.000000000 +0300
-@@ -1,5 +1,5 @@
- # A little demonstration of the possibilities of "runscript".
--# This script can be executed by typing: "runscript scriptdemo".
-+# This script can be executed by typing: "/usr/bin/runscript scriptdemo".
- #
- # Adjust the stty's below to your system: BSD-like or SysV-like.
- # Linux ofcourse accepts both :-)
-diff -ru minicom-2.3.orig/man/minicom.1 minicom-2.3/man/minicom.1
---- minicom-2.3.orig/man/minicom.1	2008-02-24 12:22:43.000000000 +0200
-+++ minicom-2.3/man/minicom.1	2008-04-20 05:27:19.000000000 +0300
-@@ -418,7 +418,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
-diff -ru minicom-2.3.orig/man/runscript.1 minicom-2.3/man/runscript.1
---- minicom-2.3.orig/man/runscript.1	2007-11-13 23:35:06.000000000 +0200
-+++ minicom-2.3/man/runscript.1	2008-04-20 05:27:19.000000000 +0300
-@@ -5,7 +5,7 @@
- .\" for conditions under which this file may be redistributed.
- .TH RUNSCRIPT 1 "$Date: 2008/04/20 02:39:28 $" "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]]"
-diff -ru minicom-2.3.orig/src/rwconf.c minicom-2.3/src/rwconf.c
---- minicom-2.3.orig/src/rwconf.c	2007-10-10 23:18:20.000000000 +0300
-+++ minicom-2.3/src/rwconf.c	2008-04-20 05:27:19.000000000 +0300
-@@ -118,7 +118,7 @@
-   { N_("No"),		0,  "kermreal" },
-   { "3",		0,   "colusage" },
-   /* The script program */
--  { "runscript",	0,   "scriptprog" },
-+  { "/usr/bin/runscript",	0,   "scriptprog" },
-   /* Modem parameters */
-   { "~^M~AT S7=45 S0=0 L1 V1 X4 &c1 E1 Q0^M",   0,   "minit" },
-   { "^M~ATZ^M~",	0,   "mreset" },
-@@ -246,7 +246,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.7.1-gcc-10.patch b/net-dialup/minicom/files/minicom-2.7.1-gcc-10.patch
deleted file mode 100644
index 43e057ce1fe8..000000000000
--- a/net-dialup/minicom/files/minicom-2.7.1-gcc-10.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-https://bugs.gentoo.org/705836
---- a/src/minicom.h
-+++ b/src/minicom.h
-@@ -109,13 +109,13 @@ EXTERN char *dial_tty;     /* tty to use. */
- 
- EXTERN char *dial_name;	    /* System we're conneced to */
- EXTERN char *dial_number;   /* Number we've dialed. */
--EXTERN char *dial_user;     /* Our username there */
--EXTERN char *dial_pass;     /* Our password */
-+extern char *dial_user;     /* Our username there */
-+extern char *dial_pass;     /* Our password */
- 
- #ifdef USE_SOCKET
--EXTERN int portfd_is_socket;	/* File descriptor is a unix socket */
--EXTERN int portfd_is_connected;	/* 1 if the socket is connected */
--EXTERN struct sockaddr_un portfd_sock_addr;	/* the unix socket address */
-+extern int portfd_is_socket;	/* File descriptor is a unix socket */
-+extern int portfd_is_connected;	/* 1 if the socket is connected */
-+extern struct sockaddr_un portfd_sock_addr;	/* the unix socket address */
- #define portfd_connected ((portfd_is_socket && !portfd_is_connected) \
-                            ? -1 : portfd)
- #else
-@@ -141,7 +141,7 @@ EXTERN int sbcolor;     /* Status Bar Background Color */
- EXTERN int st_attr;	/* Status Bar attributes. */
- 
- /* jl 04.09.97 conversion tables */
--EXTERN unsigned char vt_outmap[256], vt_inmap[256];
-+extern unsigned char vt_outmap[256], vt_inmap[256];
- 
- /* MARK updated 02/17/95 - history buffer */
- EXTERN int num_hist_lines;  /* History buffer size */

diff --git a/net-dialup/minicom/files/minicom-2.7.1-musl.patch b/net-dialup/minicom/files/minicom-2.7.1-musl.patch
deleted file mode 100644
index da4ce13d0b8f..000000000000
--- a/net-dialup/minicom/files/minicom-2.7.1-musl.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- a/src/dial.c
-+++ b/src/dial.c
-@@ -39,11 +39,9 @@
- #include "intl.h"
- 
- #ifdef VC_MUSIC
--#  if defined(__GLIBC__)
- #    include <sys/ioctl.h>
- #    include <sys/kd.h>
- #    include <sys/time.h>
--#  endif
- #endif
- 
- enum { CURRENT_VERSION = 6 };
---- a/src/getsdir.h
-+++ b/src/getsdir.h
-@@ -22,6 +22,7 @@
-  *	and licensing conditions.  See the source, Luke.
-  */
- 
-+#include <sys/param.h>
- #include <dirent.h>
- 
- typedef struct dirEntry {		/* structure of data item */

diff --git a/net-dialup/minicom/minicom-2.7.1.ebuild b/net-dialup/minicom/minicom-2.7.1.ebuild
deleted file mode 100644
index 4ae4c38c5c6f..000000000000
--- a/net-dialup/minicom/minicom-2.7.1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools
-
-DESCRIPTION="Serial Communication Program"
-HOMEPAGE="https://salsa.debian.org/minicom-team/minicom"
-SRC_URI="https://alioth-archive.debian.org/releases/minicom/Source/${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"
-
-COMMON_DEPEND="sys-libs/ncurses:="
-DEPEND="${COMMON_DEPEND}
-	nls? ( sys-devel/gettext )"
-RDEPEND="${COMMON_DEPEND}
-	net-dialup/lrzsz"
-
-DOCS="AUTHORS ChangeLog NEWS README doc/minicom.FAQ"
-S="${WORKDIR}/${PN}-2.7" # 2.7.1 specific
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.3-gentoo-runscript.patch
-	"${FILESDIR}"/${PN}-2.7-lockdir.patch
-	"${FILESDIR}"/${PN}-2.7.1-gcc-10.patch
-	"${FILESDIR}"/${PN}-2.7.1-musl.patch
-)
-
-src_prepare() {
-	default
-	mv "${S}"/configure.{in,ac}
-	eautoreconf
-}
-
-src_configure() {
-	# Lockdir must exist if not manually specified.
-	# /var/lock is created by openrc.
-	LOCKDIR=/var/lock
-	econf \
-		--sysconfdir="${EPREFIX}"/etc/${PN} \
-		--enable-lock-dir="${LOCKDIR}" \
-		$(use_enable nls)
-}
-
-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
-}

diff --git a/net-dialup/minicom/minicom-2.8.ebuild b/net-dialup/minicom/minicom-2.8.ebuild
deleted file mode 100644
index d68e0a208e56..000000000000
--- a/net-dialup/minicom/minicom-2.8.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# 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 ~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=(
-		--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
-}