gentoo resync : 28.04.2021

3 files changed, 2 insertions, 181 deletions

diff --git a/net-dialup/mgetty/Manifest b/net-dialup/mgetty/Manifest
index 9a4c2463e95e..4eed143940b2 100644
--- a/net-dialup/mgetty/Manifest
+++ b/net-dialup/mgetty/Manifest
@@ -7,6 +7,5 @@ AUX mgetty-1.2.1-aarch64.patch 400 BLAKE2B 07d2d0f1bbadd487fb5a8531584af45d25047
 AUX mgetty-1.2.1-gentoo.patch 4020 BLAKE2B fa9f609cc93cbc2287e415888bfcafc3f4069ba0ed6a2be93a952010f6a91bb2383948b62a407c37aa738be70aaaaf4715e578f51a9115837f3944c65f39f9d7 SHA512 24c3d98e43d8f573e395f65a500ea6379e6b27c020db81e00f4c3ea5d203d4ad344a29b6540575fd94c9462fdf51ecadff13a703568d51de3dc4fd815e462143
 AUX mgetty.service 203 BLAKE2B d7bd55ab0f1acc02541cb19ed372faeb2ba1b88dae1d1114677ef955cc91006c7ff5e78f71d8ba3da1aecde111f9bbc4ae916c5c19df20061200731eaab038ac SHA512 c766385d101005980fd992d2e721ffb90a7b756afbd4ea24a55e828f39bd6106a0722461b581736816685c6d5dc3fbc4ebe5fca3faf1c1373d7e0c6658c80a8d
 DIST mgetty-1.2.1.tar.gz 1077415 BLAKE2B 09d48c6cb7917a3dbbfc97c1d32ce43b9a3e64e8a44c8a3a7bfdd168421c287357a9d43504fb4d1b354ffb0f8e2a9c52b56ac3464f196f56064d96a7651e0d6e SHA512 2a82dfb782044d9daf8d41158fa10e991dbd7bd37ab43ea44422166554dd790e989ac49e4ff471d168d1cbb49edc5bedb8762ab61884e4653650686d1bbc2a9b
-EBUILD mgetty-1.2.1-r1.ebuild 4656 BLAKE2B e131a9d0f25e609c085ebd9bdd51350dc3fa51739f6896a9aeed7aa1da1c859dbdd6e787d2eb2a9f030c132ffd57b85c8a01825addadbe04b77b6f0f655fe90a SHA512 3bad236122066579870835c607ddeb04db6de179180c110cc8adb08e51ca6bf718a83ed314da81cca4889985b34f2e2af7239089c007143bfb08e1834d22a397
-EBUILD mgetty-1.2.1-r3.ebuild 4763 BLAKE2B 273ce499fb0f364584e1681f37f763bc2c798f705ac558d318a9384bd5dfb2c3a0c3bb2558eaf212dab09df55d227c4b606802b63315d62b73261228da6de157 SHA512 519564b5d18a0a0bad79686e1c228c82696f91a7f3c5014c83c786226ca68cf7a11ed7da9e42f23cd74985936f7066b2789509660e32fb09305f29e4daf412f0
+EBUILD mgetty-1.2.1-r3.ebuild 4756 BLAKE2B 857451129ab79391dcd5802048d2f4d0dd3f6e1bc6932f0b462be6467ee0ee11d353a41c6a7cf3685507d5b3026b0bbe7c1da0f18f22fcc14668f27b1590c3df SHA512 b596711801b8c0b9ec6622a93352639407ea629edb286884857c1d17811fff506ee18e7a6600c4d3a9e14cd54c390ac869af3672b721c48e2a9c03eddda051db
 MISC metadata.xml 589 BLAKE2B 0875f489eba8df017139195c3873035116e951ad018d86f00d36717f2f274d4e95d4f57fbde8640a6468fd09a819c240fab9e9656c0e931c3857fab37aad8a3b SHA512 8fec8828741b63bdf1e3364dc10ca8069846498905ef3966f8712bbe254a4197f50f73065fb4aec7b6e74e36bb53e47a03cec0dbff994f2b9f02133bfddc636e
diff --git a/net-dialup/mgetty/mgetty-1.2.1-r1.ebuild b/net-dialup/mgetty/mgetty-1.2.1-r1.ebuild
deleted file mode 100644
index 7ebadecad3d3..000000000000
--- a/net-dialup/mgetty/mgetty-1.2.1-r1.ebuild
+++ /dev/null
@@ -1,178 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit flag-o-matic toolchain-funcs user
-
-DESCRIPTION="fax and voice modem programs"
-HOMEPAGE="http://mgetty.greenie.net/"
-SRC_URI="ftp://mgetty.greenie.net/pub/mgetty/source/1.2/${P}.tar.gz"
-
-DEPEND="
-	dev-lang/perl
-	sys-apps/groff
-	sys-apps/texinfo
-	virtual/awk
-	fax? (
-		!net-misc/efax
-		!net-misc/hylafax
-	)
-"
-RDEPEND="${DEPEND}
-	fax? ( media-libs/netpbm app-text/ghostscript-gpl )
-"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
-IUSE="+fax fidonet split-usr"
-
-pkg_setup() {
-	enewgroup fax
-	enewuser fax -1 -1 /dev/null fax
-}
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.1.36-callback.patch
-	"${FILESDIR}"/${PN}-1.1.36-tmpfile.patch
-	"${FILESDIR}"/${PN}-1.1.37-qa-fixes.patch
-	"${FILESDIR}"/${PN}-1.2.1-Lucent.c.patch
-	"${FILESDIR}"/${PN}-1.2.1-gentoo.patch
-)
-
-src_prepare() {
-	default
-
-	chmod +x mkidirs || die
-
-	# don't install fax related files - bug #195467
-	use fax || eapply "${FILESDIR}/${PN}-1.1.37-nofax.patch"
-
-	sed -i -e 's:/usr/local/lib/mgetty+sendfax:/etc/mgetty+sendfax:' faxrunq.config || die 'changing mgetty config dir failed'
-	sed -i -e 's:/usr/local/bin/g3cat:/usr/bin/g3cat:' faxrunq.config fax/faxspool.rules || die 'changing g3cat path failed'
-
-	sed -e "/^doc-all:/s/mgetty.asc mgetty.info mgetty.dvi mgetty.ps/mgetty.info/" \
-		-i doc/Makefile || die 'first sed on doc/Makefile failed'
-
-	sed -i \
-		-e 's:^CC=:CC?=:g' \
-		-e 's:^CFLAGS=:CFLAGS?=:g' \
-		{,*/}Makefile || die
-	sed -i \
-		-e 's:^AR=:AR?=:g' \
-		-e 's:^CFLAGS=:CFLAGS+= -I..:g' \
-		-e 's:^RANLIB=:RANLIB?=:g' \
-		*/Makefile || die
-}
-
-src_configure() {
-	tc-export AR CC RANLIB
-	use fidonet && append-cppflags "-DFIDO"
-	append-cppflags "-DAUTO_PPP"
-
-	sed -e 's:var/log/mgetty:var/log/mgetty/mgetty:' \
-		-e 's:var/log/sendfax:var/log/mgetty/sendfax:' \
-		-e 's:\/\* \(\#define CNDFILE "dialin.config"\) \*\/:\1:' \
-		-e 's:\(\#define FAX_NOTIFY_PROGRAM\).*:\1 "/etc/mgetty+sendfax/new_fax":' \
-		policy.h-dist > policy.h || die 'creating policy.h failed'
-
-	sed -i \
-		-e "s/\$(CFLAGS) -o newslock/${CFLAGS} ${LDFLAGS} -Wall -o newslock/" \
-		-e "s/\$(LDLAGS)/${LDFLAGS}/" \
-		{,fax/}Makefile || die
-}
-
-src_compile() {
-	local target
-	for target in mgetty sedscript all vgetty;do
-		VARTEXFONTS="${T}"/fonts emake prefix=/usr \
-			CONFDIR=/etc/mgetty+sendfax \
-			CFLAGS="${CFLAGS} ${CPPFLAGS}" \
-			LDFLAGS="${LDFLAGS}" \
-			${target}
-	done
-}
-
-src_install() {
-	# parallelization issue: vgetty-install target fails if install target
-	#                        isn't finished
-	local target
-	for target in install "vgetty-install install-callback"; do
-		emake prefix="${D}/usr" \
-			INFODIR="${D}/usr/share/info" \
-			CONFDIR="${D}/etc/mgetty+sendfax" \
-			MAN1DIR="${D}/usr/share/man/man1" \
-			MAN4DIR="${D}/usr/share/man/man4" \
-			MAN5DIR="${D}/usr/share/man/man5" \
-			MAN8DIR="${D}/usr/share/man/man8" \
-			SBINDIR="${D}/usr/sbin" \
-			BINDIR="${D}/usr/bin" \
-			VOICE_DIR="${D}/var/spool/voice" \
-			PHONE_GROUP=fax \
-			PHONE_PERMS=755 \
-			spool="${D}/var/spool" \
-			${target}
-	done
-
-	keepdir /var/log/mgetty
-
-	#Install mgetty into /sbin (#119078)
-	if use split-usr; then
-		dodir /sbin
-		mv "${D}"/usr/sbin/mgetty "${D}"/sbin || die
-		dosym ../../sbin/mgetty /usr/sbin/mgetty
-	fi
-
-	#Don't install ct (#106337)
-	rm "${D}"/usr/bin/ct || die "failed to remove useless ct program"
-
-	dodoc BUGS ChangeLog README.1st Recommend THANKS TODO \
-		doc/*.txt doc/modems.db
-	doinfo doc/mgetty.info
-
-	docinto vgetty
-	dodoc voice/{Readme,Announce,ChangeLog,Credits}
-
-	docinto vgetty/doc
-	dodoc voice/doc/*
-
-	if use fax; then
-		mv samples/new_fax.all samples_new_fax.all || die "move failed."
-		docinto samples
-		dodoc samples/*
-
-		docinto samples/new_fax
-		dodoc samples_new_fax.all/*
-	fi
-
-	if ! use fax; then
-		insinto /usr/share/${PN}/frontends
-		doins -r frontends/{voice,network}
-	else
-		insinto /usr/share/${PN}
-		doins -r frontends
-	fi
-	insinto /usr/share/${PN}
-	doins -r patches
-	insinto /usr/share/${PN}/voice
-	doins -r voice/{contrib,Perl,scripts}
-
-	diropts -m 0750 -o fax -g fax
-	dodir /var/spool/voice
-	keepdir /var/spool/voice/incoming
-	keepdir /var/spool/voice/messages
-	if use fax; then
-		dodir /var/spool/fax
-		dodir /var/spool/fax/outgoing
-		keepdir /var/spool/fax/outgoing/locks
-		keepdir /var/spool/fax/incoming
-	fi
-}
-
-pkg_postinst() {
-	elog "Users who wish to use the fax or voicemail capabilities must be members"
-	elog "of the group fax in order to access files"
-	elog
-	elog "If you want to grab voice messages from a remote location, you must save"
-	elog "the password in /var/spool/voice/.code file"
-}
diff --git a/net-dialup/mgetty/mgetty-1.2.1-r3.ebuild b/net-dialup/mgetty/mgetty-1.2.1-r3.ebuild
index 4f812a8d3984..a02a5ad1b864 100644
--- a/net-dialup/mgetty/mgetty-1.2.1-r3.ebuild
+++ b/net-dialup/mgetty/mgetty-1.2.1-r3.ebuild
@@ -29,7 +29,7 @@ RDEPEND="
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
 IUSE="+fax fidonet split-usr"
 
 PATCHES=(