gentoo resync : 29.06.2020

16 files changed, 599 insertions, 16 deletions

diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index 1c67363f680b..58e822deeeb6 100644
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
diff --git a/app-editors/e3/Manifest b/app-editors/e3/Manifest
index 70329f82323b..c9b1af064742 100644
--- a/app-editors/e3/Manifest
+++ b/app-editors/e3/Manifest
@@ -1,4 +1,4 @@
-AUX e3-2.8.2-makefile.patch 936 BLAKE2B cd06fbaa470d50fbd971b8925d6813ae5040f3826ada652d891e0d5bd3850a0c8136c13b461426115abbefe2c4e5a87d8443ef6471209833972c2ac9f3516dcf SHA512 77fbe6345d0d9285d3e46458c34b09b08e112db1851626ada6aa31aec3a3115a15d3a4a62c78689b228cbbf06a9e4252b85594785a9310461fe5b19c2aeb8112
+AUX e3-2.8.2-makefile.patch 897 BLAKE2B e93fb544396a6f4e6b0abb0f57124e42ad66c2b9fbb13886498e091ff73bc60c4f1779cbd14c52b800a0579a905fa908423f790b6309d3664ba4a41d5340d857 SHA512 0929387f75bd2d933f030ed319191dbba781564d47f36788bd7ec6ecfffa4bccb367691edbbf9b8241b4905b6cafe7ebc7a5b3e6951765f91ade20962bd54f4a
 DIST e3-2.82.tgz 115504 BLAKE2B 09edea9063657373cf6d7d9d8290dddf17b8fb516538d89b83462176127b8b43832bd81f326eec5504116f05ab780023832b8b5d41d72e3ab8e726d89e364a36 SHA512 07c7e40d26879871b60d7e89839805d779383dbaabe42a6a3a7047fa8a4c501c4cd0cdc828a9d29d4ac1c5b949bda07946d8e71e1320c6c303ffce88a3038547
-EBUILD e3-2.8.2.ebuild 881 BLAKE2B 66552a5b2346ff6685025e570dfb5ba6fa2d5dbb315283c4cd239c2cf8d7115a8e23f2b7b73ec99e0fb0058af6e46d98f11018e5b831073148fd96bf5884537b SHA512 65b7d9b207e0bacb5b187dc5478f90fa92037b6980704a67ed515c3103c76a2a750fec42e61cebce37e1a1a1ff6705e34f2187e8db8e938f61c15300062414b9
+EBUILD e3-2.8.2.ebuild 875 BLAKE2B 366b34b1700c36805e2bc2ccd03665242ffbe4c5adb41fda3daee0f52a89fb7db5aa3111c02e4d0aa291497880b206da76d5c8edcbdc63a0a559abb0dc92b9b6 SHA512 dd1eceb5267542660675b77a5ef15ee13cbe5d5200ef1fcd3c4aa00ef6b183b38fff728d4c87b83c0f9941c8e928a11f67b0ce9d3208f26d1aa8c1cd80f8abb9
 MISC metadata.xml 918 BLAKE2B a0bd5163da7fe48664cc720d60b08c11af32234b0b265a8e2cca6d980a3af3b29ad223fdd5a81886ea3b528875fadd0520650a463894040b2f48ad00eabdf8c6 SHA512 9e8d5b6557a492d39c79c06507ea3ee670729e315cee2456e595d53f88178801b629595ac8903ac70878a63e85b46e934c761d70fef328fdfddc78e0c7416f4d
diff --git a/app-editors/e3/e3-2.8.2.ebuild b/app-editors/e3/e3-2.8.2.ebuild
index b554e85be62a..b6a0ab831345 100644
--- a/app-editors/e3/e3-2.8.2.ebuild
+++ b/app-editors/e3/e3-2.8.2.ebuild
@@ -13,7 +13,6 @@ SRC_URI="https://sites.google.com/site/e3editor/Home/${MY_P}.tgz"
 LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="-* amd64 x86"
-RESTRICT="strip"
 
 BDEPEND=">=dev-lang/nasm-2.09.04"
 
@@ -22,7 +21,7 @@ PATCHES=("${FILESDIR}"/${P}-makefile.patch)
 QA_FLAGS_IGNORED="/usr/bin/e3"	#726484
 
 src_compile() {
-	emake -- $(usex amd64 64 32) LD="$(tc-getLD)"
+	emake -- $(usex amd64 64 32) LD="$(tc-getLD)" DEBUG=true
 }
 
 src_install() {
diff --git a/app-editors/e3/files/e3-2.8.2-makefile.patch b/app-editors/e3/files/e3-2.8.2-makefile.patch
index 5a22ff67e09d..b37381ef2e28 100644
--- a/app-editors/e3/files/e3-2.8.2-makefile.patch
+++ b/app-editors/e3/files/e3-2.8.2-makefile.patch
@@ -30,7 +30,7 @@
  	cat e3.asm | sed -f e3_32to64.sed  >e3.tmp
  	$(ASSEMBLER64)
 -	ld -b elf64-x86-64 --oformat elf64-x86-64 -o e3 e3.o
-+	$(LD) -b elf64-x86-64 --oformat elf64-x86-64 -o e3 e3.o
++	$(LD) -o e3 e3.o
  ifneq	($(DEBUG),true)
  	strip e3
  endif
diff --git a/app-editors/elvis/Manifest b/app-editors/elvis/Manifest
index 652c43bebe7e..924e74b54bb8 100644
--- a/app-editors/elvis/Manifest
+++ b/app-editors/elvis/Manifest
@@ -4,5 +4,5 @@ AUX ft2.3-symbol-collision-fix.patch 2396 BLAKE2B a890da27b23700d2f6def41ab0a567
 DIST elvis-2.2_0.tar.gz 1439293 BLAKE2B c061370a3a9a9d24bcdba65f1d16b5b8d7dd6a5a9e777949c80862f8e9ce879dac6685f625c0fd86cae26efbbf58277d9626be2f4e513d1b1bed131cc60eb95d SHA512 847cc9ac0af170798abd4725f7dc2ec74d4931fb761b58836d4016d36da5657176bd8cdcdae02bc08438b18e8ce2433eb3340ec2503630fd2992e83ba06adf42
 EBUILD elvis-2.2.0-r6.ebuild 2396 BLAKE2B 71087c0bd2645274858e326a156564676b8d6a02d831a6f57df66131acd789268b08ff0251cf456bff056db10ac9a81ae62a802d31df995a2c31693b4077aa3a SHA512 3c2823dd77b31453b1e06f7741f21ab31ae3f80ea5b15b4771f6ee069a7d54c7bb65fd47028cd3782bda9c1fd3ae7f4d865542a51031bd13595850cf2ca86aca
 EBUILD elvis-2.2.0-r7.ebuild 2404 BLAKE2B cddb49ebd101377d79fcccfb16a5b7a890c6aa142c243132d3098de6798d6f2b6459a42416a76a77ed41d1186ddd9195e2f8faafbb80428bede79652080349ff SHA512 a407b19a0366335de2ae650a7a2d38f9abc6b10a2c5e0e69fc73fcf75ce7cdcb19d12112dec567c2274cec2e33a1998a138b49f8477a8f0f7e847a11b7b54bfc
-EBUILD elvis-2.2.0-r8.ebuild 2484 BLAKE2B 6498d6c0aef75570cf9e4b836bfae0e0eec362cf0cb6e12512e0ad97e450d31c10b8fc0d02c0e9b13c7ec89304c0cd2f21261eca9e6e0a14d316b4ebd146b25b SHA512 f1fa68d3551262e4eda6a30ccef290419fd495845aa853292c0388a2d57ea4d062b3ca49c43b2489cda049d23188be831e3637279bcc2091e6082a61430c0608
+EBUILD elvis-2.2.0-r8.ebuild 2520 BLAKE2B 09f8f2c61646abfbe33ec06f5757fa0da6b925b5efdff5a9cd15128931d526340cf65737cdbba5bb5f19ea54d847a8d90262b2db6f2a82feece2f855656c76a1 SHA512 5a008dab4430c6a0efa2cee4d8d03aec5fb0e438b2086bdd6ee9098eb2f0c35bdde986c0831c13159ec4109f96e464bc08651477ad4ad8929689a964606d5ed4
 MISC metadata.xml 245 BLAKE2B d4f5ef381d0a479a17bfde792cd6828e5fa0ecdd26732c1a13c97fcae2f22396b879fb430aaea7680920d5ba897f78cfbb6e50bb2f65165613a5a0ba1f7dc609 SHA512 6d6d35ccbb839c939bc663cecb55e2178f5fd4e455ee3088b8847416d558dd3e7969f4c78bc445ff29503d6906fec12d302d7249e9adc8cb708d0790e681e5a2
diff --git a/app-editors/elvis/elvis-2.2.0-r8.ebuild b/app-editors/elvis/elvis-2.2.0-r8.ebuild
index 4ac39947e0d6..d5c65e2ef429 100644
--- a/app-editors/elvis/elvis-2.2.0-r8.ebuild
+++ b/app-editors/elvis/elvis-2.2.0-r8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -40,6 +40,7 @@ PATCHES=(
 )
 
 src_configure() {
+	export CC="$(tc-getCC)"
 	./configure \
 		--libs="$($(tc-getPKG_CONFIG) --libs ncurses)" \
 		--prefix="${EPREFIX}"/usr \
@@ -51,7 +52,8 @@ src_configure() {
 
 	# Some Makefile fixups (must happen after configure)
 	# Use our CFLAGS
-	sed -i -e "s:gcc -O2:$(tc-getCC) ${CFLAGS}:" Makefile || die "sed 1 failed"
+	sed -e "s#^CFLAGS=\(.*\)#CFLAGS=\1 ${CFLAGS}#g;" -i Makefile || \
+		die "sed 1 failed"
 
 	# We'll install the man-pages ourselves
 	sed -i -e '/^	sh instman.sh/d' Makefile || die "sed 2 failed"
diff --git a/app-editors/hteditor/Manifest b/app-editors/hteditor/Manifest
index 5dd25b899f54..44f3505f69b2 100644
--- a/app-editors/hteditor/Manifest
+++ b/app-editors/hteditor/Manifest
@@ -5,5 +5,5 @@ AUX hteditor-2.1.0-gcc-6-uchar.patch 1443 BLAKE2B e08ca71c4c0499f8344174ea09fa32
 AUX hteditor-2.1.0-gcc-7.patch 724 BLAKE2B 030fe4de475ce4b140f5dcee8cb0268bb0b6dc19f1e50b94cf0f3b8f0546d462025ca30a1a75acc16f7560c9318efaa8adeb6a29c33789c304c97512b31994c5 SHA512 afdc2fef1c05a225e9a8e8d4ccd25a8b1912ff6532dd09a320f6df031edb732d9b9b99fb77f39cd41ccc45fd9818fae1b802ca1831669a0e2825b59094094de9
 AUX hteditor-2.1.0-tinfo.patch 176 BLAKE2B 936f60f54424b9d69986b7b9564abd3c5de2a321611e66e386aac47ea504f7a40d3c6614f4430a70052b39dcdf68f4540cf1ae4a2dd0a4b237857cd611bbf8fe SHA512 1800a7010f0d94da473bd10e3ab36bea2b99c2d9b78b01f0c3ce7c35d2f9ee33eb3da9a2b091482f213136f23c97bc3afd9a10f59c7e56b36817cb5ba34f4c36
 DIST ht-2.1.0.tar.bz2 884139 BLAKE2B c979563cbfc4df7e14f587b250fbf099d9f4683afddb3afc88693284c378c45466dfa3c47555fc69e83e2972cfabab63f3cdd42fd85602842854372131e4063d SHA512 6b5fc5fcbc63b9b7c85721158e044e4578ebfdc38618c760c0e6de06a276bccd3a960ab8bed172de788934515ad94d86349c4abd3228da66b1601deaaa2ce410
-EBUILD hteditor-2.1.0-r1.ebuild 1189 BLAKE2B 9f8d20d19df3f7d853e2a6a7fa132a595ebbad5ff0837d247f2ed14cc886e0e517d72ad7dbbb200aecb23f3154cd308761615237c054d3edd1785ff9c98fa324 SHA512 8a2e8a8271926882de6f878aee001c54324730c621a1a83d32fed7c3c4ebddd65fd2ee3e83250e1e60ea7626c472236d42e98258b32ee59778ceaa9b9bf0e793
+EBUILD hteditor-2.1.0-r1.ebuild 1414 BLAKE2B 6baa7517d6218432641a95c1c79a865b0f1f63b9fcb06571f9fe0414a903194e943b1d4c5c200ee5363a0cad84fc3c24a1e5fafd166d73922cda0e16dd7ab153 SHA512 12f147751d3da898d9336e34fa795bbe3a315ab430995af6c47ea8babacb61b386ebf0186e6cc18f8db93f9e5a03e5873073c49fb79afa9192898cb3882d1be8
 MISC metadata.xml 464 BLAKE2B 7fdb5c881881e21f4a74db09bf905c4d0aebdb5077598916186266ca12dca891c1619ce550a37ac3400ef92138ff2521dffd91c25bf254d8e49e0b628ea7ebca SHA512 b08be8368d7459a56096769aec6cdb6607225968b87ac12d22c788081287d16345060f071c09c0d505a8caffcb5de9378328250758b13c9229eb1fc5c10a8388
diff --git a/app-editors/hteditor/hteditor-2.1.0-r1.ebuild b/app-editors/hteditor/hteditor-2.1.0-r1.ebuild
index 16a7ab4322f0..5b912857bc6f 100644
--- a/app-editors/hteditor/hteditor-2.1.0-r1.ebuild
+++ b/app-editors/hteditor/hteditor-2.1.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit autotools toolchain-funcs
+inherit autotools flag-o-matic toolchain-funcs
 
 MY_P=${P/editor}
 
@@ -39,6 +39,12 @@ PATCHES=(
 src_prepare() {
 	default
 	eautoreconf
+
+	# Many literals are concatenated with macro definitions.
+	# Instead of patching them all let's pick old c++ standard
+	# and port to c++11 upstream.
+	# https://bugs.gentoo.org/729252
+	append-cxxflags -std=c++98
 }
 
 src_configure() {
diff --git a/app-editors/jasspa-microemacs/Manifest b/app-editors/jasspa-microemacs/Manifest
index 59a10f2f7b3f..fa937eec45ed 100644
--- a/app-editors/jasspa-microemacs/Manifest
+++ b/app-editors/jasspa-microemacs/Manifest
@@ -1,3 +1,4 @@
+AUX 20091011-cc-detect.patch 1002 BLAKE2B 9141e32930c9c433a7a682079a961511fd6e1e83f87d0fee17fcc181d88a6daafeacb634f47684de6f81796ae864da0e9ec3fbb1024aa8e665fed96eb571ead9 SHA512 9742c8050dfd724a6224158420ac3c60d3c5dab5ea7b5a3af454a2c63aa11c05e2c2b0f6ff24159e371f62b8faaab22c5d3740dca0a8f7ee19aab4bb77a02509
 AUX 20091011-linux3.patch 723 BLAKE2B 924852d26fc148c124e51e7d392d2a38482022b30bb1ad31e92ce12dd6efb97a154b7c05b8590788d4a4839c4de0bddb4f5576addf9cd64ac9d4511c6197801c SHA512 c3b0246cc83c6840b59b46cbd25ebe1f9364a029f555f916dbc3ca38d8e490514a9dfc9ae8748e751e49cc9a1f3be89af30d0fab95d35486d32cf87fec93431c
 AUX 20091011-ncurses.patch 583 BLAKE2B eaf5eafcfb9fbe6a889b64fcfe895016ec25d8be63975600c11e9cfb889b42b6d03426e1d574bf65899fd5bac00d0fd49a838c1d57e7ab7e3c2cb172664206af SHA512 d2a4ca646e825a9c517ed075205609d141f94735c9bba2f23f5c94ced05b9290e6e24a718d7e8cfbcad77663a6c07f311a387363e8737cb1cb4fc81cf34e9a22
 AUX jasspa-microemacs.desktop 282 BLAKE2B 4c881a43ab13c3043555bbced246aefd463247c467974f4c449d26f3d4db9e91fc47448afae30b478b6d0053da74d07e44f25f08a1e310c4072c45ddc63725e8 SHA512 e55698b2faf0a5a8fbb04e837400ab0d9be00d50ab20fd3d84718edf75a4bedef1155f04654ea1d491c3b456f1bf047e4b90f05efb0702deeb2f496c9ad091d2
@@ -5,5 +6,5 @@ DIST jasspa-mehtml-20091011.tar.gz 628008 BLAKE2B 97c8326e7acfdc4bc4ddd2ef6bbcf0
 DIST jasspa-memacros-20091017.tar.gz 1105437 BLAKE2B 0a74715db55498fed646f209a9121a96c673cb34c487968c4f838bacf6404db717fbd8392d26f8fa120174923724af91e4a14bda088bf229765d1e99c785d8ba SHA512 08908acac4dbe56695362172dabe621b8cca77a35da599c6cf5b4e87700c03f4ee190ca12d5c69b2d88c623cec527daac0980dec2ed713ff563e88ebe636a725
 DIST jasspa-mesrc-20091011.tar.gz 810128 BLAKE2B ce627dab7cf4ec09b099e755c3eb17e773c64fbff60741244cdb134ee1555ffff592ef3684eecae72d5da36c10cd7caa23a03112154c616ad3c7667d913354b4 SHA512 60cc5a83b3cafd8e517f88732dc94feb0329b962bc714eaa5616ba89776fbfac41833be88fd3a666443291184086494434fb8763747c1dc5e216ce793b694b68
 DIST meicons-extra.tar.gz 43345 BLAKE2B 5b3d6e8a76604364d8e5464ba764aec96d822054c02bffed4cd763f7691f78bc3455904cd06d89ddcf8a0861134ada3c7d228751d4f3685e6700ebfc3dda2354 SHA512 bb6879fb12ec1c7b346bc1df2412a837ffdd0569f6be2800a433307a7736bb31798b3c2a71e02cebdce39c59d93d1a986f80c92184604e4292606c98285fe02a
-EBUILD jasspa-microemacs-20091011-r3.ebuild 2276 BLAKE2B e9ba6dbc37f281d0d2f413dccdfe07d425d24b7e126ba340c18d262abc863b8b1e9582ff5feaaf2edc08476dc2b62457dcb749cfda862d66c098455cc571559e SHA512 180227bc3c5d549d29cc28a6bdb7aa398baf55522329244cf381763a22c8fc00cdb16226b18c40ef5405a5035ad1f9a4c0e08953198591197591e0c756ef4711
+EBUILD jasspa-microemacs-20091011-r3.ebuild 2313 BLAKE2B cbc697d1f7ea0900d3c0042e29729af2b5528d9cf73da4458908e18db43dc697c9a9b9912625337db2c71a5ebbbccb51cfc5559c4bd119f9ccc1027eb62ecaac SHA512 1d3ba93a4ced2ba2b4be6e36a8b8709e653854d80b21f3d8965d596c391369f8de0a5cade2f19376d3d22dbb3bcdb1104a3f25222549f7f154a0b740d6718eb9
 MISC metadata.xml 1094 BLAKE2B 9983b2ebf7f9d7a979180ea0d4aa063ace2fa5a3a630339bb8112a8691eb6b46964d298d9b49c2d02b2dba2750e501b5740de2242da00abc4b24ba08af8d7fb1 SHA512 2116ed586b24da86206c4d38977c118bcf2381d455a3cd0fb9d672f8d709b5113fe4c8767e2d2f20f8c879a71f0e6bfb6384b9efe30cba82e177fa75dc4e0d6a
diff --git a/app-editors/jasspa-microemacs/files/20091011-cc-detect.patch b/app-editors/jasspa-microemacs/files/20091011-cc-detect.patch
new file mode 100644
index 000000000000..123d78c895ff
--- /dev/null
+++ b/app-editors/jasspa-microemacs/files/20091011-cc-detect.patch
@@ -0,0 +1,32 @@
+https://bugs.gentoo.org/729258
+
+--- me091011-orig/src/build
++++ me091011/src/build
+@@ -158,12 +158,8 @@
+         exit 1
+     fi
+ 
+-    # use cc by default if available
+     if [ -r $MAKEBAS.mak ] ; then
+-        # try to detect cc, if found use it in preference
+-        if [ "`type cc | cut -b 1-5`" = "cc is" ] ; then
+-            MAKEFILE=$MAKEBAS.mak
+-        fi
++        MAKEFILE=$MAKEBAS.mak
+         # Special rules for sun, if cc is /usr/ucb then this is a dummy.
+         if [ $PLATFORM = "SunOS" ] ; then 
+             WHATCC=`/usr/bin/which cc`
+@@ -173,12 +169,8 @@
+         fi                      
+     fi
+     if [ -z "$MAKEFILE" ] ; then
+-        # failed to find cc, try gcc
+         if [ -r $MAKEBAS.gmk ] ; then
+-            # try to detect gcc, if found use it in preference
+-            if [ "`type gcc | cut -b 1-6`" = "gcc is" ] ; then
+-                MAKEFILE=$MAKEBAS.gmk
+-            fi
++            MAKEFILE=$MAKEBAS.gmk
+         fi
+     fi
+     if [ -z "$MAKEFILE" ] ; then
diff --git a/app-editors/jasspa-microemacs/jasspa-microemacs-20091011-r3.ebuild b/app-editors/jasspa-microemacs/jasspa-microemacs-20091011-r3.ebuild
index 27f5e8a43037..e41568ee3659 100644
--- a/app-editors/jasspa-microemacs/jasspa-microemacs-20091011-r3.ebuild
+++ b/app-editors/jasspa-microemacs/jasspa-microemacs-20091011-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -37,6 +37,7 @@ S="${WORKDIR}/me${PV:2}"
 PATCHES=(
 	"${FILESDIR}"/${PV}-ncurses.patch
 	"${FILESDIR}"/${PV}-linux3.patch
+	"${FILESDIR}"/${PV}-cc-detect.patch
 )
 
 src_unpack() {
diff --git a/app-editors/mg/Manifest b/app-editors/mg/Manifest
index 14b294cb800d..7ebc8c7bd4d1 100644
--- a/app-editors/mg/Manifest
+++ b/app-editors/mg/Manifest
@@ -4,4 +4,4 @@ DIST mg-20200215.tar.gz 152254 BLAKE2B 89e47aaa94fd95b9409a53b09c9017e26d3f1cc73
 EBUILD mg-20171014.ebuild 1023 BLAKE2B a6b86a471504c94104f4b4174cecfe878104b8d3d18ee6e5b5d005e7c19ce03582e68f6306ff8190f4e0bddcf84b223fd1d2d7b3d923c82c6f794daa0c370000 SHA512 845d09a9e38d0315cc0c2383aa3d65770b73c6dd8a494acb32c471b82d5243072236324a5428ca5a9a6200b75b0fe7a8366c4a94bed2c0f48d683ef36ad8628c
 EBUILD mg-20180408.ebuild 1039 BLAKE2B 1b1c3ad8fd0373d8dd16ddf0a12747f06abb028bc205a6064f50f711ad8fef8a135df1e4b87cb4835656d9ac9834cd2194b83ffe56fbba74e8a6d616dbba3fae SHA512 2acc555ba564b5c9a11bab563847762bb1f726f750a25387b24f282af906c22cf49db2b6912b116dba81f3715e7baa736a57375413d2ac62f2a446e332f124ff
 EBUILD mg-20200215.ebuild 1039 BLAKE2B 1b1c3ad8fd0373d8dd16ddf0a12747f06abb028bc205a6064f50f711ad8fef8a135df1e4b87cb4835656d9ac9834cd2194b83ffe56fbba74e8a6d616dbba3fae SHA512 2acc555ba564b5c9a11bab563847762bb1f726f750a25387b24f282af906c22cf49db2b6912b116dba81f3715e7baa736a57375413d2ac62f2a446e332f124ff
-MISC metadata.xml 384 BLAKE2B 86ad99174028addfaef8bb9f143949161c8d1d81f2e946b3aa9088bd644b61ce97869d0a0b669abcff56e925fe8757d77f6123a2dfe340b8620db2ae84ba0b55 SHA512 70e2db47bef37d81a3842797ea0e12081e697b6e06bd25fbecfb64acf58b80e60a0c31508bf1c93879734af0921a47654fd489f08301b2517757741e0c6d25cf
+MISC metadata.xml 618 BLAKE2B d6aa73580d4aebe2a43f227c56df586058260eb53bc7b09e3cd9355526bcb32bad3c92c2ba20aaa8da9e96634d43b1385921e2f9ef77168e3089eed64b9e7d45 SHA512 a61abb9ef37a2e1d8e04d3476b2ba85e66f1e6287bb81c3d2ba71c7b1022c8e025fbe4f1b46dcef27d38b5f28a75e569608e7b9d5e9b504c8d405680cd764a4d
diff --git a/app-editors/mg/metadata.xml b/app-editors/mg/metadata.xml
index 00486d5abd44..156c5660d642 100644
--- a/app-editors/mg/metadata.xml
+++ b/app-editors/mg/metadata.xml
@@ -6,7 +6,11 @@
   <name>Gentoo Emacs project</name>
 </maintainer>
 <longdescription>
-  mg is Micro GNU/emacs, this is a portable version of the mg maintained by
-  the OpenBSD team.
+  Mg (mg) is intended to be a small, fast, and portable editor for
+  people who can't (or don't want to) run real Emacs for one reason
+  or another. It is compatible with GNU Emacs because there shouldn't
+  be any reason to learn more than one Emacs flavor.
+
+  This is a portable version of the Mg maintained by the OpenBSD team.
 </longdescription>
 </pkgmetadata>
diff --git a/app-editors/teco/Manifest b/app-editors/teco/Manifest
index ea73e676c71a..a8114c1b9ae1 100644
--- a/app-editors/teco/Manifest
+++ b/app-editors/teco/Manifest
@@ -1,8 +1,9 @@
 AUX teco-double-free.patch 907 BLAKE2B 4be36191ed98cd9c210ff523dac796ec7a78697abcbb776ccff526cc1172e2bf6e5da0387df65e70020cbc7041ef6e7ca66245fb886fafe78b5d0f1e67e7ebc0 SHA512 01711be1a61217ed3040f3b13fbcaf52160118c90251098bdf65efe1551a3198ff41228bd9895be7f55e11344858898276f162cff1e207595e3f5e6dfef507ba
 AUX teco-gcc4.patch 294 BLAKE2B b09e7058029fb3d2fe2ded138ab92389f412cdc9613ae30eb3fd5b050f95e6efd48016e8f816a67d25b7d813e1ac2b813c20d60ac240b9138d635d958c7bc10f SHA512 ed7cf0fbe3a13dfb310be93460e07dcff50773ff1d0a1b5e3cfb304ecf5ef972243a7d3e7d429c743478b5cc2942a9ec562a25c1504324f59045685e69611d2b
 AUX teco-no-common.patch 289 BLAKE2B ce84e9132f53b0b465ab1118ef53246d83188f9c6b38ff617a63e52e91f2443ee718e495dceb9d32d8bc81b381923fbad5e837f9fb57474bcf98466244d821f3 SHA512 f0059e69090c345925e1ce50d9074d7c7d0e692e2d529233538cb640bb6705b0c27901ee4d780e2b99500f604e17f521db5a39e2a518396514631ee6c6bd05d7
+AUX teco-void-functions.patch 12115 BLAKE2B f72d87f9ae2a03d7b83aed09c009c05fbe89f80101fb9c62ec4273bdf347a554c0bbe80d9c0742c8d3afbcd176c16338641ca0a773ba731d711d4a5d85375b08 SHA512 27568f730408a6ed3d9cb02c32065a53c2b1f3f469824dc4d2c8e69444f190e266b5c396a8284f191880f59ab1ebd2e4422ba9bee716b96ac2f53a9befc56f9b
 AUX teco-warnings.patch 1206 BLAKE2B f9f8312c66e506d86cdd7544288965927895822eac3ad6f49dd0f1280ddc72f9d2cb2c6e4e7eca7c36c435677559e25bd4c9f6816a9e41816d23a39d64ee445b SHA512 7294ef66917eb549d9437327b32160317313d343c731423e34a07ed407e5595e7ac52d57c55bc1e5c6732f5ed0840533aa9c546ee32f4ea2bef54adf5a91b249
 DIST teco-36_p19940820.tar.gz 61305 BLAKE2B 9bb15fcb20948dbcac1928e32b4ac69c4861be3b0c01d5be68836138d9478e71cc0dd5198d9ac6816245605c34f8b21fcd4e62c48c097e56cd585579df119939 SHA512 686b3944a82d088a2fce12a9b770f4aa5f58aaadde064b3d3342114f0ece2d7cbae27d0e92fd026def6f62a3ff0dc82b37146e30a93b2ec195dc7f376b45fdf7
 DIST tecodoc.tar.gz 154109 BLAKE2B 70b9cd99281ab6180e4c13845f3fc97ccd6c142b4b9a3454ac9dcf189e2a65bfaf9b033312aeb9773301ff4d2ec166f79d587f79158b2b0f3f985f77b06f86c1 SHA512 1819450a08e296bdd3d4c282d9a9c7c58203acf82a67bdc9713b0cdfa2d0c4aa046c86ee4ee6f3b2d9ef0f3052705a13dd3d8afbf372bd3b1be8d4c5e8e96fef
-EBUILD teco-36_p19940820.ebuild 1496 BLAKE2B e6ab0702aa988e1323ff018dce667cd482848e6feaa34600faa33158fdbea82f447db576c46160c2cfd41314c857864f274693be722236e543dd543d8a3cb1e6 SHA512 dd772f5da48194e7b48115a05235b526a225bb41ae274f6a53aac4db2e3eb0a96b16078c2cd3721c1c4c020cdfb8b60790566c5090b0983eef7ba4fdf8c0addb
+EBUILD teco-36_p19940820.ebuild 1538 BLAKE2B 41ed663d279ca03df2e125f02b29f66b63c3e722942717a6b2cff570d03d79422b05521e887286920d8c422f43b85bcc05998bf49f2bed6b6cc1200fdae9b35b SHA512 0560fc4a55badd2b184d5971014fe45f59b5258e99016370f836e4736b08c9e6a53b1408a12ddbe0792863675b472cc9d98eb8ca79bfb7ecb4fdf0fd64f8c5c6
 MISC metadata.xml 1356 BLAKE2B a433a260d80042f9a4e034f93e94793b8ae3e9725d44cf4369f5baf506d6dcf9be045d3a4ccbefa842004c8bccd629d55f947ef591ce37a662c4199d4f27f2ca SHA512 3e8680b16e6de3e239f453d13d4b0cb41545aace84af0e9cf8103c0f605cec29467bb0b5feebd592dbded84cd109360c42f63da69115870fb57c97f8137dfdc0
diff --git a/app-editors/teco/files/teco-void-functions.patch b/app-editors/teco/files/teco-void-functions.patch
new file mode 100644
index 000000000000..f8a1d7ad346e
--- /dev/null
+++ b/app-editors/teco/files/teco-void-functions.patch
@@ -0,0 +1,536 @@
+https://bugs.gentoo.org/729254
+
+--- teco-orig/te_chario.c
++++ teco/te_chario.c
+@@ -24,6 +24,8 @@
+ #define SIGINTMASK 2
+ #endif
+ 
++void crlf(), type_char();
++
+ int lf_sw;                                  /* nonzero: make up a LF following an entered CR */
+ int ttyflags;                               /* flags for (stdin) file descriptor */
+ #ifndef _POSIX_SOURCE
+@@ -44,6 +46,7 @@
+ /* operation; normal mode is none of the above.  TTY_OFF and TTY_ON do this     */
+ /* absolutely; TTY_SUSP and TTY_RESUME use saved signal status.                 */
+ 
++void
+ setup_tty(arg)
+     int arg;
+     {
+@@ -213,6 +216,7 @@
+ #ifdef _POSIX_SOURCE
+ sigset_t  oldmask;
+ 
++void
+ block_inter(func)
+     int func;
+     {
+@@ -313,6 +317,7 @@
+ 
+ /* type a crlf */
+ 
++void
+ crlf()
+     {
+     type_char(CR);
+@@ -340,6 +345,7 @@
+ 
+ /* routine to type one character */
+ 
++void
+ type_char(c)
+     char c;
+     {
+--- teco-orig/te_defs.h
++++ teco/te_defs.h
+@@ -320,7 +320,7 @@
+ extern char mapch[], mapch_l[];         /* char mapping tables              */
+ extern unsigned char spec_chars[];      /* special character table          */
+ 
+-extern char skipto(), find_endcond(), getcmdc(), getcmdc0();    /* routines that return chars */
++extern char skipto(), getcmdc(), getcmdc0();    /* routines that return chars */
+ 
+ extern FILE *eisw;                      /* indirect command file pointer    */
+ extern FILE *fopen();
+--- teco-orig/te_exec0.c
++++ teco/te_exec0.c
+@@ -8,6 +8,7 @@
+ #include <time.h>
+ #include <sys/time.h>
+ 
++void
+ exec_cmdstr()
+     {
+     char c;
+--- teco-orig/te_exec1.c
++++ teco/te_exec1.c
+@@ -6,6 +6,7 @@
+ /* version for multiple buffers  04/13/89 15.55                             */
+ #include "te_defs.h"
+ 
++void
+ exec_cmds1()
+     {
+     char command;                   /* command character */
+--- teco-orig/te_exec2.c
++++ teco/te_exec2.c
+@@ -12,6 +12,9 @@
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ 
++void do_en_next(), set_var(), write_file(), write_stream();
++void kill_output(), pop_iteration(), find_enditer(), find_endcond();
++
+ struct qh oldcstring;                       /* hold command string during ei */
+ 
+ /* file stuff for input/output files */
+@@ -26,6 +29,7 @@
+ 
+ /* process E commands */
+ 
++void
+ do_e()
+     {
+     char c;                         /* temps */
+@@ -567,6 +571,7 @@
+ 
+ /* routine to get next file spec from "EN" list into filespec buffer */
+ 
++void
+ do_en_next()
+     {
+     char c;
+@@ -669,6 +674,7 @@
+ 
+ /* fetch or set variable */
+ 
++void
+ set_var(arg)
+     int *arg;           /* argument is pointer to variable */
+     {
+@@ -764,6 +770,7 @@
+ /* arguments are qp to start of text, number of characters, */
+ /* and an "append FF" switch                                */
+ 
++void
+ write_file(wbuff, nchars, ffsw)
+     struct qp *wbuff;
+     int nchars, ffsw;
+@@ -779,6 +786,7 @@
+ /* Unix processes.  Arguments wbuff, nchars as above; file  */
+ /* is stream pointer, crlf_sw zero converts CRLF to LF      */
+ 
++void
+ write_stream(file, wbuff, nchars, crlf_sw)
+     FILE *file;
+     struct qp *wbuff;
+@@ -809,6 +817,7 @@
+ 
+ /* routine to kill output file: argument is pointer to an output file structure */
+ 
++void
+ kill_output(outptr)
+     struct outfiledata *outptr;
+     {
+@@ -825,6 +834,7 @@
+ 
+ char panic_name[] = "TECO_SAVED.tmp";           /* name of file created to save buffer */
+ 
++void
+ panic()
+     {
+     if (!outfile->fd && pbuff->z) outfile->fd = fopen(panic_name, "w"); /* if buffer nonempty and no file open, make one */
+@@ -838,6 +848,7 @@
+ 
+ /* do "F" commands */
+ 
++void
+ do_f()
+     {
+     struct buffcell *delete_p;
+@@ -954,6 +965,7 @@
+ /* pop iteration: if arg nonzero, exit unconditionally */
+ /* else check exit conditions and exit or reiterate */
+ 
++void
+ pop_iteration(arg)
+     int arg;
+     {
+@@ -973,6 +985,7 @@
+ 
+ /* find end of iteration - read over arbitrary <> and one > */
+ 
++void
+ find_enditer()
+     {
+     register int icnt;
+@@ -988,7 +1001,8 @@
+ 
+ 
+ /* find end of conditional */
+-char find_endcond(arg)
++void
++find_endcond(arg)
+     char arg;
+     {
+     register int icnt;
+--- teco-orig/te_main.c
++++ teco/te_main.c
+@@ -44,6 +44,8 @@
+ 
+ #include "te_defs.h"
+ 
++void cleanup(), print_string(), save_args(), read_startup(), get_term_par();
++
+ main(argc, argv)
+     int argc;           /* arg count */
+     char *argv[];       /* array of string pointers */
+@@ -103,6 +105,7 @@
+ 
+ /* reset screen state, keyboard state; remove open output files */
+ 
++void
+ cleanup()
+     {
+     window(WIN_OFF);            /* restore screen */
+@@ -115,6 +118,7 @@
+ /* print string for error message */
+ /* argument is subscript of a qreg qh, prints text from that buffer */
+ 
++void
+ print_string(arg)
+     int arg;
+     {
+@@ -137,6 +141,7 @@
+ 
+ /* copy invocation command line to a text buffer */
+ 
++void
+ save_args(argc, argv, q)
+     int argc;
+     char *argv[];
+@@ -171,6 +176,7 @@
+ 
+ char startup_name[] = "/.tecorc";       /* name of startup file */
+ 
++void
+ read_startup()
+     {
+     char *hp, *getenv();
+@@ -192,6 +198,7 @@
+ 
+ /* routine to get terminal height and width from termcap */
+ 
++void
+ get_term_par()
+     {
+     char tbuff[1024];   /* termcap buffer */
+--- teco-orig/te_rdcmd.c
++++ teco/te_rdcmd.c
+@@ -6,6 +6,7 @@
+ /* version for multiple buffers  04/13/89 10.22                             */
+ #include "te_defs.h"
+ 
++void retype_cmdstr();
+ int ccount;             /* count of chars read in */
+ 
+ int read_cmdstr()
+@@ -227,6 +228,7 @@
+ 
+ /* retype command string: entirely (arg = '*') or most recent line (arg = ' ') */
+ 
++void
+ retype_cmdstr(c)
+     char c;
+     {
+--- teco-orig/te_subs.c
++++ teco/te_subs.c
+@@ -17,6 +17,7 @@
+ /*    n is the returned number of chars moved   */
+ /* max is the maximum number of chars to move   */
+ 
++void
+ movenchars(from, to, n)
+     struct qp *from, *to;       /* address of buffer pointers */
+     register int n;             /* number of characters */
+@@ -69,6 +70,7 @@
+ 	}
+     }
+ 
++void
+ moveuntil(from, to, c, n, max, trace)
+     struct qp *from, *to;       /* address of buffer pointers   */
+     register char c;            /* match char that ends move    */
+@@ -249,6 +251,7 @@
+ /* leaves bb pointing to end of that text */
+ /* insert2() copies rest of buffer */
+ 
++void
+ insert1()
+     {
+     int nchars;             /* number of chars in cell */
+@@ -269,6 +272,7 @@
+ 
+ 
+ 
++void
+ insert2(count)              /* count is the number of chars added */
+     int count;
+     {
+@@ -289,6 +293,7 @@
+ /* subroutine to delete n characters starting at dot    */
+ /* argument is number of characters                     */
+ 
++void
+ delete1(nchars)
+     int nchars;
+     {
+@@ -314,6 +319,7 @@
+ 
+ struct qh obuff;        /* tag string buffer */
+ 
++void
+ do_o()
+     {
+     int i, j;           /* i used as start of tag, j as end */
+@@ -460,6 +466,7 @@
+ 
+ /* find number of characters to next matching (, [, or {  (like '%' in vi) */
+ 
++void
+ do_ctlp()
+     {
+     int i, l;
+--- teco-orig/te_utils.c
++++ teco/te_utils.c
+@@ -37,6 +37,7 @@
+ 
+ 
+ /* free a list of buffcells */
++void
+ free_blist(p)
+     struct buffcell *p;
+     {
+@@ -51,6 +52,7 @@
+     }
+ 
+ /* free a list of buffcells to the "delayed free" list */
++void
+ dly_free_blist(p)
+     struct buffcell *p;
+     {
+@@ -92,6 +94,7 @@
+ 
+ 
+ /* free a list of cells */
++void
+ free_dlist(p)
+     struct qp *p;
+     {
+@@ -107,6 +110,7 @@
+ 
+ /* build a buffer:  called with address of a qh */
+ /* if no buffer there, get a cell and link it in */
++void
+ make_buffer(p)
+     struct qh *p;
+     {
+@@ -178,6 +182,7 @@
+ 
+ /* set up a pointer to a particular text buffer position */
+ 
++void
+ set_pointer(pos, ptr)   /* first arg is position, 2nd is addr of pointer */
+     int pos;
+     struct qp *ptr;
+--- teco-orig/te_window.c
++++ teco/te_window.c
+@@ -21,6 +21,10 @@
+ #define MAX 0x7fffffff          /* maximum positive integer, for "last modified" location */
+ #define W_MARK 0200             /* "this loc is special" in screen image */
+ 
++void window(), window0(), window1_both(), window1(), window1_abs();
++void window1_inc(), window1_after(), w_rmcurs(), window2(), vtm();
++void w_makecurs(), w_type(), w_init(), w_separators(), w_move();
++void w_scroll(), w_ebol();
+ 
+ /* image of current window */
+ 
+@@ -74,6 +78,7 @@
+ /* routine to perform simple scope operations */
+ /* (an attempt to concentrate VT-100 specific things in one place) */
+ 
++void
+ vt(func)
+     int func;
+     {
+@@ -132,6 +137,7 @@
+ int win_max[]  = { 4,  W_MAX_H, W_MAX_V, 1, MAX, 12, -1,  20,   20, -1, -1 } ;  /* max values */
+ int win_data[] = { 4,  132,     24,      0, 0,    0,  0,   0,    0,  0,  0 } ;  /* window parameters    */
+ 
++void
+ do_window(ref_flag)
+     int ref_flag;                   /* nonzero forces "refresh" operation */
+     {
+@@ -196,6 +202,7 @@
+ /* routine to update screen size with numbers obtained from environment */
+ /* (called by main program's initialization)                            */
+ 
++void
+ set_term_par(lines, cols)
+     int lines, cols;
+     {
+@@ -215,6 +222,7 @@
+ /* WIN_LINE:    does WIN_REFR unless that wouldn't do anything, in which case       */
+ /*              it does effective 1EV output                                        */
+ 
++void
+ window(arg)
+     int arg;
+     {
+@@ -288,6 +296,7 @@
+ /* used for ev, es, and <BS> or <LF> as immediate commands                  */
+ /* starting char position is in w_p1; argument is number of lines           */
+ 
++void
+ window0(num)
+     int num;
+     {
+@@ -364,6 +373,7 @@
+ 
+ struct bh *old_pbuff;
+ 
++void
+ window1_both()
+     {
+     pw0 = &win_1;
+@@ -396,6 +406,7 @@
+ /* if scroll mode is enabled, the VT100 screen is split and only the upper part */
+ /* is used by this routine; else the whole screen is used.                      */
+ 
++void
+ window1()
+     {
+     int i, j, m, lflag;
+@@ -500,6 +511,7 @@
+ 
+ /* routine to redraw screen absolutely */
+ 
++void
+ window1_abs()
+     {
+     int i, j;
+@@ -531,6 +543,7 @@
+ 
+ /* redraw screen incrementally */
+ 
++void
+ window1_inc(wd)
+     int wd;                     /* argument is earliest change */
+     {
+@@ -559,6 +572,7 @@
+ 
+ /* routine to move window downwards: scroll up or redraw as appropriate */
+ 
++void
+ window1_after()
+     {
+     int i, lflag;
+@@ -591,6 +605,7 @@
+ 
+ /* routine to remove the existing cursor */
+ 
++void
+ w_rmcurs()
+     {
+     register struct w_data *pw = pw0;
+@@ -609,6 +624,7 @@
+ /* called with w_p1 at starting char, curr_y, curr_x at starting coordinate         */
+ /* rewrites to end of screen if arg = 0, or only until line with cursor if arg = 1  */
+ 
++void
+ window2(arg)
+     int arg;
+     {
+@@ -794,6 +810,7 @@
+ 
+ /* routine to move cursor to current location and then call vt */
+ 
++void
+ vtm(arg)
+     int arg;
+     {
+@@ -807,6 +824,7 @@
+ /* routine to set reverse video and save cursor location */
+ /* first argument is char at cursor, 2nd is value for curs_crflag */
+ 
++void
+ w_makecurs(wc, crflag)
+     char wc;
+     short crflag;
+@@ -851,6 +869,7 @@
+ /* routine to type one character:  arguments are char and a */
+ /* "mark" bit.  If mark is set, the char is always retyped  */
+ 
++void
+ w_type(c, m)
+     char c;
+     int m;
+@@ -875,6 +894,7 @@
+ 
+ /* initialize display image */
+ 
++void
+ w_init()
+     {
+     short i, j;
+@@ -907,6 +927,7 @@
+ 
+ /* write separator lines between windows on screen */
+ 
++void
+ w_separators()
+     {
+     int i;
+@@ -929,6 +950,7 @@
+ /* put character followed by appropriate number of nulls for "other control function" */
+ /* if argument is 0, output filler chars only */
+ 
++void
+ putchar_d(c)
+     char c;
+     {
+@@ -942,6 +964,7 @@
+ 
+ /* put out appropriate number of filler chars for display function that scrolls (LF, etc.) */
+ 
++void
+ scroll_dly()
+     {
+     int i;
+@@ -952,6 +975,7 @@
+ /* move terminal cursor to stated y, x position */
+ /* uses incremental moves or absolute cursor position, whichever is shorter */
+ 
++void
+ w_move(y, x)
+     short y, x;
+     {
+@@ -993,6 +1017,7 @@
+ 
+ /* scroll screen: argument is count: + up, - down */
+ 
++void
+ w_scroll(count)
+     int count;
+     {
+@@ -1025,6 +1050,7 @@
+ /* clear line to left of curr_x */
+ /* if some chars nonblank, does erase from start of line */
+ 
++void
+ w_ebol()
+     {
+     short i, j;
diff --git a/app-editors/teco/teco-36_p19940820.ebuild b/app-editors/teco/teco-36_p19940820.ebuild
index 4dd048a4f2d5..cb7d37feb456 100644
--- a/app-editors/teco/teco-36_p19940820.ebuild
+++ b/app-editors/teco/teco-36_p19940820.ebuild
@@ -26,6 +26,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-gcc4.patch
 	"${FILESDIR}"/${PN}-warnings.patch
 	"${FILESDIR}"/${PN}-no-common.patch
+	"${FILESDIR}"/${PN}-void-functions.patch
 )
 
 src_prepare() {