gentoo resync : 25.11.2020

6 files changed, 66 insertions, 15 deletions

diff --git a/app-editors/dav/Manifest b/app-editors/dav/Manifest
index 630af3a89ff4..ea58ed45eba4 100644
--- a/app-editors/dav/Manifest
+++ b/app-editors/dav/Manifest
@@ -1,6 +1,8 @@
-AUX dav-0.8.5-asneeded.patch 318 BLAKE2B 1556f43aa48931c2687defc85d0b23b7a6519ff1f5c5ac0ce7f1cb0b7a67e19b75af0b97cf72ec5a6665aca386b8f44a0a44446623666bb16e76abae752b2ed3 SHA512 06ad6057354af941512e6c77f59cd9c30a7192c01fdce65d5d66e15fb99476429092f0587130162b78f22ca72354af8925735733c142a889a478c8a07384138f
-AUX dav-0.8.5-davrc-buffer-overflow.patch 246 BLAKE2B ef18f5ad8107e981c60f3bd3191cea342fb466cc9232294a88a29f6c2db37ce6ed846a66bf78722291540e0f813d7ce6ae939979352d370931fb5a43e12d5913 SHA512 36c8e336adc3cdb053af61ea53bf497073d197e67957f2ad011f7199c1518deb08f5fcfffa4ff14c49139f6bab01303332c8c15e5944245696dbc62dceff116c
+AUX dav-0.8.5-asneeded.patch 213 BLAKE2B 84dc034ab97c82106ba90887a66dcb29870a25f6fc3b6ec029d0b177383c226b101b54e65400e182236250644bc441b242cd52ee5c8c7c85e6d4e5ec284a3137 SHA512 ce029cd410eb9c0669e6cd822ca529eadd23d30dce94b2c2fddf10dd4f7637d3bdd58fd041bfdf7d1d750b4d7ed848fa77dd98c64885f8cc848016fbeb96f534
+AUX dav-0.8.5-davrc-buffer-overflow.patch 153 BLAKE2B bc27b0346dc69646b9fe44796f65c7ec399af56f0df278e1579927d05ef643cebbb8f7ce3aa294ba6b7340601088da05c0eb18e78548872babbf6b12d942184a SHA512 0eeb7c6a167a6fbcc60195f93d58ca28f7d98e7e24e93a9c314fb00a035ec83fb1176f52e6676d88ab1ad56e4608869f91ace672ab77a4291c94677f5e028e7c
+AUX dav-0.8.5-fno-common.patch 804 BLAKE2B 11e367e6870e1da6e0932ba933c09ae92b879f93a67830068c9766bff8c783891c5cc7cdaff8a01f4eded3fdd59a2d161cb5591084f172317eee03d1ee6fceb4 SHA512 c1255b35a7765716112bcab43f24cc6db1c47162633fb46365031823ae94f2afc29a9ec547467b360766a26651563b0f60813136350d52ed4fb3c6e90770a71f
+AUX dav-0.8.5-makefile.patch 413 BLAKE2B 4d700f345f144178c63bc382f5a443047225bd3d47ea453496107008fa7ced9a0853b1a80a348eac62d2200f20f2924777a97ee568b31dcbc0be6ed4417b621a SHA512 76a4b50795cc133d5fc3e5499bb143cf3c64d5c68d6060f5d081ab3b4a55f4a2ee43b3ecfd1e0e2b7a54140dd68458f96f5b9872f4cc64039d8bdf6990fefe16
 AUX fix-Wformat-security-warnings.patch 1179 BLAKE2B 524644da22ea8623c3bbdaa9c83ca74a87124cc896dec0f90221cf854d14744d1bc1a86e76a5ff3543fb2e2fc743d76db70bb7be3fe30e22508a374f6f122b83 SHA512 c5665be995e718a460b6c75ae3843104721a58c2d4a5321659d8527034f413d433fdd1140b14d6a8587f298a2e4935f8a07579071e5aa5d6fa49e125da5e4895
 DIST dav-0.8.5.tar.gz 22824 BLAKE2B 969458aa6b914f9cd624554690a88f4c2999dcc6e89db38d13d9ba98db7881a34ce1575ccbdf74b3ecca34345f2ec639cfc805a350e31f856f7d086cf23752de SHA512 cdedff875df392e8525399b40d45cdf4e984b1b014f03d9f5cd5be270eebe0003fcf48e9738f6ac2789138973970bb9fe6d0b8babd20c1df61e193f84ee066b3
-EBUILD dav-0.8.5-r2.ebuild 902 BLAKE2B 99aa64dc8347f6e68a7d2fb2b1de46fd0d40144e8d19d42b803d26b9e151d9e120002733dcc2bbb1cd51e8a5262b6d4f7b5ced63ba71060f17f2b2c8f5897d3a SHA512 dcceeeff71a8358517c25644fad9f9978c5b8f2509cca21705303f22355570edcfd46141a9c832d5fa76694e653e50703fe2b403d90288df01583636b510f519
+EBUILD dav-0.8.5-r2.ebuild 1066 BLAKE2B fad7344b1356f2ba60a8c16dd50d367aff440b01e673dfb55f93750c36e8eb5eb04a7bae811383b32109ab5145711e11c8ca8b338f035d45d5a6ae5357084036 SHA512 64add96221e236233e3a4865d94c8f4b324a92b11b22061e640af247479494047c93cdc8ee4ebeaf7e59a80ba169bd6991e85fbee77c2181b43e93b6da664974
 MISC metadata.xml 245 BLAKE2B 0994c9d498383d2c458a3135ca07a8637acc6a2a89547ca1e245bf6354e61cc761e17d1eb33beaaab8c0c30997bbfc5772565212d7f58faf6cbfdaaf082025e8 SHA512 c42813db6849d65a3316be196bafc9fb991f6d78eb75f07e4202ba512c11ba1c6ea4082742df51fc83a06a520bd3297bd6f7404a48fbfee969937d10cd777a18
diff --git a/app-editors/dav/dav-0.8.5-r2.ebuild b/app-editors/dav/dav-0.8.5-r2.ebuild
index b04dad5486e8..bab3b72d4bdf 100644
--- a/app-editors/dav/dav-0.8.5-r2.ebuild
+++ b/app-editors/dav/dav-0.8.5-r2.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
+
 inherit toolchain-funcs
 
 DESCRIPTION="A minimal console text editor"
 HOMEPAGE="http://dav-text.sourceforge.net/"
-
 # The maintainer does not keep sourceforge's mirrors up-to-date,
 # so we point to the website's store of files.
 SRC_URI="http://dav-text.sourceforge.net/files/${P}.tar.gz"
@@ -15,18 +15,20 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
+BDEPEND="virtual/pkgconfig"
 RDEPEND="sys-libs/ncurses:0="
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-"
+DEPEND="${RDEPEND}"
 
 PATCHES=(
 	"${FILESDIR}/${P}-asneeded.patch"
 	"${FILESDIR}/${P}-davrc-buffer-overflow.patch"
 	"${FILESDIR}/fix-Wformat-security-warnings.patch"
+	"${FILESDIR}/${PN}-0.8.5-fno-common.patch"
+	"${FILESDIR}/${PN}-0.8.5-makefile.patch"
 )
 
+DOCS=( README )
+
 # Makefile only
 src_configure() { :; }
 
@@ -37,4 +39,7 @@ src_compile() {
 		LDFLAGS="${LDFLAGS} $( $(tc-getPKG_CONFIG) --libs ncurses)"
 }
 
-DOCS=( README )
+src_install() {
+	default
+	docompress -x /usr/share/man/man1/dav.1.gz
+}
diff --git a/app-editors/dav/files/dav-0.8.5-asneeded.patch b/app-editors/dav/files/dav-0.8.5-asneeded.patch
index 75a43c67f43d..92bc6ebfdacc 100644
--- a/app-editors/dav/files/dav-0.8.5-asneeded.patch
+++ b/app-editors/dav/files/dav-0.8.5-asneeded.patch
@@ -1,6 +1,5 @@
-diff -u -r a/Makefile b/Makefile
---- a/Makefile	2004-02-22 02:04:07.000000000 +0100
-+++ b/Makefile	2008-12-30 19:31:19.000000000 +0100
+--- a/Makefile
++++ b/Makefile
 @@ -12,7 +12,7 @@
  LDFLAGS=-lncurses -O3 -Wall
  
diff --git a/app-editors/dav/files/dav-0.8.5-davrc-buffer-overflow.patch b/app-editors/dav/files/dav-0.8.5-davrc-buffer-overflow.patch
index a32e78ebc818..7287d36cc604 100644
--- a/app-editors/dav/files/dav-0.8.5-davrc-buffer-overflow.patch
+++ b/app-editors/dav/files/dav-0.8.5-davrc-buffer-overflow.patch
@@ -1,5 +1,5 @@
---- dav-0.8.5.orig/main.c	2011-01-29 14:16:53.537725568 -0500
-+++ dav-0.8.5/main.c	2011-01-29 14:20:45.139125094 -0500
+--- a/main.c
++++ b/main.c
 @@ -327,7 +327,7 @@
  void loadSettings()
  {
diff --git a/app-editors/dav/files/dav-0.8.5-fno-common.patch b/app-editors/dav/files/dav-0.8.5-fno-common.patch
new file mode 100644
index 000000000000..df58fa36098d
--- /dev/null
+++ b/app-editors/dav/files/dav-0.8.5-fno-common.patch
@@ -0,0 +1,24 @@
+https://bugs.gentoo.org/706846
+https://sources.debian.org/patches/dav-text/0.9.0-2/gcc-10.patch/
+--- a/main.c
++++ b/main.c
+@@ -58,7 +58,7 @@ char displayWholeScreen = 0;
+ struct buffer *buffers;
+ struct buffer *currentBuffer;
+ int currentBufferNum = 0;
+-
++ptrToFunction Fn_ptr[12]; //Bindings for the Fn keys; Fx = Fn_ptr[x-1]
+ 
+ int main(int argc, char *argv[])
+ {
+--- dav-text-0.9.0.orig/main.h
++++ dav-text-0.9.0/main.h
+@@ -47,7 +47,7 @@ void connectLines(struct line *baseline)
+ void determineLineNum(struct position *p);
+ void countTabs(struct line *l);
+ void determineCursX(struct position *p);
+-ptrToFunction Fn_ptr[12]; //Bindings for the Fn keys; Fx = Fn_ptr[x-1]
++extern ptrToFunction Fn_ptr[12]; //Bindings for the Fn keys; Fx = Fn_ptr[x-1]
+ 
+ extern int maxY,maxX;
+ extern int helpBarUpdate;
diff --git a/app-editors/dav/files/dav-0.8.5-makefile.patch b/app-editors/dav/files/dav-0.8.5-makefile.patch
new file mode 100644
index 000000000000..8ff62de305ee
--- /dev/null
+++ b/app-editors/dav/files/dav-0.8.5-makefile.patch
@@ -0,0 +1,21 @@
+diff --git a/Makefile b/Makefile
+index 8b1ff0a..7a57840 100644
+--- a/Makefile
++++ b/Makefile
+@@ -1,4 +1,4 @@
+-CC=gcc
++CC?=gcc
+ OBJECTS=main.o \
+         buffers.o \
+         fileIO.o \
+@@ -8,8 +8,8 @@ OBJECTS=main.o \
+         undo.o \
+         move.o
+         
+-CFLAGS=-O3 -Wall
+-LDFLAGS=-lncurses -O3 -Wall
++CFLAGS?=O3 -Wall
++LDFLAGS?=lncurses -O3 -Wall
+ 
+ dav: $(OBJECTS) 
+ 	$(CC) $(OBJECTS) $(LDFLAGS) -o dav