gentoo resync : 20.03.2021

4 files changed, 3 insertions, 98 deletions

diff --git a/x11-misc/efax-gtk/Manifest b/x11-misc/efax-gtk/Manifest
index 1c9d0d381d6e..ff19b8f4b853 100644
--- a/x11-misc/efax-gtk/Manifest
+++ b/x11-misc/efax-gtk/Manifest
@@ -1,6 +1,3 @@
-AUX efax-gtk-3.2.13-fno-common.patch 890 BLAKE2B b21b9e622b33f0691b5cb5d32deaa2beb9b86720b9c41f34f68080a5347066942e34c8cd62d867b182a0b6199304b226ca406b6edade3d74fd5c998c8bb44f90 SHA512 723713ba260ecf77886a5888ed28f3eae48f26461c178787707a888bf910e9bf238256816c659cb9534f0765cc056cc5dd15581d905435ba7d778488e189ead8
-DIST efax-gtk-3.2.14.src.tgz 1241132 BLAKE2B 8907907681076d9238219a42c7a490f15b988019be2dd291131fd48122421f8f9476ae59f4832395ff56c44b0981490f3c38c49df643dbc1125f33e735392bbf SHA512 28e0814c209c4c398a27b4f421b0902942fb2088e94d992c344093d755a74176cedce2912ad6f5c0a21fde1fc57acd8c5bb97bd98c42b76bdf2ab1b5919a595e
 DIST efax-gtk-3.2.15.src.tgz 1253414 BLAKE2B 1cd5eadced1e1ad03cb3d05b2068ce232c5632cebdba3320b721b773685f9ba4f1c69f4f0f0f0e261fce127ccaeb2f8eb5b95a4f6cbcc7adcc36c4a22729acb8 SHA512 83ba678162c2ec5c62eeba941a712f507aaeef3a42dfffe8a7dedca72af5ee46626e9c709d7617fc3bf62191ce0f6b10bac2498e1996cc45270db638fdfb7e63
-EBUILD efax-gtk-3.2.14.ebuild 1199 BLAKE2B 36a88b655703d690310c5c4b37113bf2d164d9f55608461bdefe18d01a7d03bfac1ed1cebba69501a678c9a1f90390e649946d79c255eda3ac419f4a33cc06c9 SHA512 99fe4a109e775b8bb3a5c4afa688ad59a7dac7f136a29477db06dd7a92929d4d52f3ab397d72a9a8c4aa3501d7cc098a5dc67bc913e28227f88e585995eea240
-EBUILD efax-gtk-3.2.15.ebuild 1144 BLAKE2B aeb18760930539ad906618917327ef72332d5f068a8d3abe3de1602ceca6dfcadc05454b1af0d4c9cdf9f912ddc072332993a1b2b7232c4157f9f9d0f0bec582 SHA512 77b30769cc8bf783d8a7923e9d18c84a4ce4526dc827b9cbb8993a2374452598def6790fba3c71d9fef242ea00ffa2baf8c3b56d92c44c1460cd998c924bae87
+EBUILD efax-gtk-3.2.15.ebuild 1142 BLAKE2B 2f8b7d232971d21de801feb977cd43ced1e8525ca70fd1bce1a0cb3804b3d3e4a27d9070c90d0b350aa879050351852320b3bf5bf6b465ed26f8bfb67906517a SHA512 73c0467d91a2133292952139f48119c981e1b444658716f037a240a55839f4edd7dbc9ed916c61d6c9daa041df3f7c2a7765068a0f7edd250978d4a0156f6226
 MISC metadata.xml 354 BLAKE2B c4168be07b9ff9bb2a00459999ce4cd94ce8a0e2da7253df4c3a9c2ceed596e46e589d508dd4b561869ead4cda8c503a88de2256eec027e95be4191c7fc7aecd SHA512 6b32fac40a7eeabdbc54a4416d05fbe7d516b95056d00b4ecf5f707a667b53994fe519f653dbc2c00b48354698602c5b961684f9cfa67e1e6bc75faaabf3941f
diff --git a/x11-misc/efax-gtk/efax-gtk-3.2.14.ebuild b/x11-misc/efax-gtk/efax-gtk-3.2.14.ebuild
deleted file mode 100644
index 776229b9a314..000000000000
--- a/x11-misc/efax-gtk/efax-gtk-3.2.14.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="A graphical frontend for the 'efax' application"
-HOMEPAGE="http://efax-gtk.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.src.tgz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
-
-RDEPEND="
-	>=dev-libs/glib-2.10
-	media-libs/tiff:0=
-	x11-libs/libX11
-	x11-libs/c++-gtk-utils:0[gtk]
-	x11-libs/gtk+:3
-"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-	sys-devel/gettext
-"
-
-DOCS="AUTHORS BUGS ChangeLog README"
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.2.13-fno-common.patch
-)
-
-src_prepare() {
-	default
-	# Prevent sandbox violation with chown/chgrp and existing spooldir
-	sed -i -e '/ch.*lp.*spooldir/d' efax-gtk-faxfilter/Makefile.in || die
-
-	sed -i \
-		-e '/^Categories/s:Office;::' \
-		${PN}.desktop || die
-}
-
-src_configure() {
-	econf \
-		--with-gtk-version=gtk3
-}
-
-src_install() {
-	default
-	# File collision with net-misc/efax wrt #401221
-	mv "${ED}"/usr/share/man/man1/efax{,-0.9a}.1 || die
-	mv "${ED}"/usr/share/man/man1/efix{,-0.9a}.1 || die
-}
-
-pkg_postinst() {
-	local spooldir="${EROOT}"/var/spool/fax
-	[[ -d ${spooldir} ]] && chown lp:lp "${spooldir}"
-}
diff --git a/x11-misc/efax-gtk/efax-gtk-3.2.15.ebuild b/x11-misc/efax-gtk/efax-gtk-3.2.15.ebuild
index 1f8dcfaca924..fd4111a4aa70 100644
--- a/x11-misc/efax-gtk/efax-gtk-3.2.15.ebuild
+++ b/x11-misc/efax-gtk/efax-gtk-3.2.15.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.src.tgz"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
 
 RDEPEND="
 	>=dev-libs/glib-2.10
diff --git a/x11-misc/efax-gtk/files/efax-gtk-3.2.13-fno-common.patch b/x11-misc/efax-gtk/files/efax-gtk-3.2.13-fno-common.patch
deleted file mode 100644
index 4cfd79afd164..000000000000
--- a/x11-misc/efax-gtk/files/efax-gtk-3.2.13-fno-common.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- a/efax/efaxos.h
-+++ b/efax/efaxos.h
-@@ -11,10 +11,6 @@
- #define UNIXSIGS  SIGHUP, SIGQUIT, SIGIOT, SIGALRM
- #define CATCHSIGS ANSISIGS, UNIXSIGS
- 
--/* Bit order reversal table. */
--
--extern unsigned char normalbits [ ] ;
--
- typedef enum ttymodes		/* serial port modes:  */
- {
-     COMMAND,			/*   19200 8N1, no f/c, DTR high */
---- a/efax/efaxlib.h
-+++ b/efax/efaxlib.h
-@@ -208,7 +208,7 @@
- /* Bit reversal lookup tables (note that the `normalbits' array
-    is the one actually used for the bit reversal.  */
- 
--uchar reversebits [ 256 ], normalbits [ 256 ] ;
-+extern uchar reversebits [ 256 ], normalbits [ 256 ] ;
- 
- void initbittab(void) ;
- 
---- a/efax/efaxlib.c
-+++ b/efax/efaxlib.c
-@@ -48,6 +48,8 @@
-   return n < 0 ;
- }
- 
-+uchar reversebits [ 256 ], normalbits [ 256 ] ;
-+
- /* Provide dummy gettext() function if there is no internationalisation support */
- 
- #ifndef ENABLE_NLS