gentoo resync : 02.09.2020

3 files changed, 68 insertions, 9 deletions

diff --git a/app-editors/jasspa-microemacs/Manifest b/app-editors/jasspa-microemacs/Manifest
index fa937eec45ed..2a1641297ff6 100644
--- a/app-editors/jasspa-microemacs/Manifest
+++ b/app-editors/jasspa-microemacs/Manifest
@@ -1,4 +1,5 @@
 AUX 20091011-cc-detect.patch 1002 BLAKE2B 9141e32930c9c433a7a682079a961511fd6e1e83f87d0fee17fcc181d88a6daafeacb634f47684de6f81796ae864da0e9ec3fbb1024aa8e665fed96eb571ead9 SHA512 9742c8050dfd724a6224158420ac3c60d3c5dab5ea7b5a3af454a2c63aa11c05e2c2b0f6ff24159e371f62b8faaab22c5d3740dca0a8f7ee19aab4bb77a02509
+AUX 20091011-glibc-2.32.patch 2909 BLAKE2B 8b0e29d735cb08f73787a6a61910793208c2778d7444a4b46388483bd306797494defb9e31f697bd272639fe389bf48f9653c2e10f81508cfa34462f97979bf9 SHA512 d287c48c1b82424458e87e9ba8be5f0604bcca19bbdb87f79be0e8f14420a03c7b6229f1d47fdf827f75036b864dc1441de32944abe72a20f99609c9d5aaf045
 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
@@ -6,5 +7,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 2313 BLAKE2B cbc697d1f7ea0900d3c0042e29729af2b5528d9cf73da4458908e18db43dc697c9a9b9912625337db2c71a5ebbbccb51cfc5559c4bd119f9ccc1027eb62ecaac SHA512 1d3ba93a4ced2ba2b4be6e36a8b8709e653854d80b21f3d8965d596c391369f8de0a5cade2f19376d3d22dbb3bcdb1104a3f25222549f7f154a0b740d6718eb9
+EBUILD jasspa-microemacs-20091011-r3.ebuild 2367 BLAKE2B 52807ebae4275e6d77b7852fe36eef905f6fd12d4da2c82843e2d2e3b3374d81eff01bc3183e38bb6501a3ec7a721f15a67b6984a1b7bd18027512565884a1f0 SHA512 efdd65e53042d4d7fb260c331b40a17cb6e78ce67d4ffa1615a672c030e6f97db3afc95730117bac456bcf8ffff8101e43488c5d02b0d6c528b763f227b198f9
 MISC metadata.xml 1094 BLAKE2B 9983b2ebf7f9d7a979180ea0d4aa063ace2fa5a3a630339bb8112a8691eb6b46964d298d9b49c2d02b2dba2750e501b5740de2242da00abc4b24ba08af8d7fb1 SHA512 2116ed586b24da86206c4d38977c118bcf2381d455a3cd0fb9d672f8d709b5113fe4c8767e2d2f20f8c879a71f0e6bfb6384b9efe30cba82e177fa75dc4e0d6a
diff --git a/app-editors/jasspa-microemacs/files/20091011-glibc-2.32.patch b/app-editors/jasspa-microemacs/files/20091011-glibc-2.32.patch
new file mode 100644
index 000000000000..7e2f57c934bf
--- /dev/null
+++ b/app-editors/jasspa-microemacs/files/20091011-glibc-2.32.patch
@@ -0,0 +1,57 @@
+Fix compilation with glibc-2.32.
+
+--- me091011-orig/src/file.c
++++ me091011/src/file.c
+@@ -1325,7 +1325,7 @@
+                    )
+                 {
+                     /* READ ONLY DIR */
+-                    mlwrite(MWPAUSE,(meUByte *)"%s: %s", dirbuf, sys_errlist[errno]);
++                    mlwrite(MWPAUSE,(meUByte *)"%s: %s", dirbuf, strerror(errno));
+                     /* Zap the filename - it is invalid.
+                        We only want a buffer */
+                     mlwrite (0,(meUByte *)"[New buffer %s]", getFileBaseName(fname));
+@@ -1355,7 +1355,7 @@
+             {
+                 /* We are not allowed to read the file */
+ #if ((defined _UNIX) || (defined _DOS))
+-                mlwrite(MWABORT,(meUByte *)"[%s: %s]", fn, sys_errlist[errno]) ;
++                mlwrite(MWABORT,(meUByte *)"[%s: %s]", fn, strerror(errno)) ;
+ #else
+                 mlwrite(MWABORT,"[cannot read: %s]", fn) ;
+ #endif
+--- me091011-orig/src/fileio.c
++++ me091011/src/fileio.c
+@@ -2331,7 +2331,7 @@
+                                 if(meRename(filename,filename2) && (ffFileOp(filename,filename2,meRWFLAG_DELETE,-1) <= 0))
+                                 {
+                                     mlwrite(MWABORT|MWPAUSE,(meUByte *)"[Unable to backup file to %s (%d - %s)]", 
+-                                            filename2,errno,sys_errlist[errno]) ;
++                                            filename2,errno,strerror(errno)) ;
+                                     if(meUnlink(filename))
+                                     {
+                                         mlwrite(MWABORT|MWPAUSE,(meUByte *)"[Unable to remove backup file %s]", filename) ;
+@@ -2346,7 +2346,7 @@
+                         mlwrite(MWABORT|MWPAUSE,(meUByte *)"[Unable to remove backup file %s]", filename) ;
+                     else if(meRename(filenameOld,filename) && (ffFileOp(filenameOld,filename,meRWFLAG_DELETE,-1) <= 0))
+                         mlwrite(MWABORT|MWPAUSE,(meUByte *)"[Unable to backup file to %s (%d - %s)]", 
+-                                filename,errno,sys_errlist[errno]) ;
++                                filename,errno,strerror(errno)) ;
+                     else if(bp != NULL)
+                     {
+                         meUShort ss;
+--- me091011-orig/src/spawn.c
++++ me091011/src/spawn.c
+@@ -219,10 +219,10 @@
+         case 0:
+             /* we want the children to die on interrupt */
+             execlp("xterm", "xterm", "-sl", "200", "-sb", NULL);
+-            mlwrite(MWABORT,(meUByte *)"exec failed, %s", sys_errlist[errno]);
++            mlwrite(MWABORT,(meUByte *)"exec failed, %s", strerror(errno));
+             meExit(127);
+         case -1:
+-            ss = mlwrite(MWABORT,(meUByte *)"exec failed, %s", sys_errlist[errno]);
++            ss = mlwrite(MWABORT,(meUByte *)"exec failed, %s", strerror(errno));
+         default:
+             ss = meTRUE ;
+         }
diff --git a/app-editors/jasspa-microemacs/jasspa-microemacs-20091011-r3.ebuild b/app-editors/jasspa-microemacs/jasspa-microemacs-20091011-r3.ebuild
index e41568ee3659..a2277979f14d 100644
--- a/app-editors/jasspa-microemacs/jasspa-microemacs-20091011-r3.ebuild
+++ b/app-editors/jasspa-microemacs/jasspa-microemacs-20091011-r3.ebuild
@@ -17,10 +17,10 @@ SRC_URI="http://www.jasspa.com/release_20090909/jasspa-mesrc-${PV}.tar.gz
 LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
-IUSE="nanoemacs X xpm"
+IUSE="gui nanoemacs xpm"
 
 RDEPEND="sys-libs/ncurses:0=
-	X? (
+	gui? (
 		x11-libs/libX11
 		xpm? ( x11-libs/libXpm )
 	)
@@ -28,7 +28,7 @@ RDEPEND="sys-libs/ncurses:0=
 
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
-	X? (
+	gui? (
 		x11-base/xorg-proto
 		x11-libs/libXt
 	)"
@@ -38,6 +38,7 @@ PATCHES=(
 	"${FILESDIR}"/${PV}-ncurses.patch
 	"${FILESDIR}"/${PV}-linux3.patch
 	"${FILESDIR}"/${PV}-cc-detect.patch
+	"${FILESDIR}"/${PV}-glibc-2.32.patch
 )
 
 src_unpack() {
@@ -62,7 +63,7 @@ src_compile() {
 	local pkgdatadir="${EPREFIX}/usr/share/jasspa"
 	local me="" type=c
 	use nanoemacs && me="-ne"
-	use X && type=cw
+	use gui && type=cw
 	use xpm || export XPM_INCLUDE=.		# prevent Xpm autodetection
 
 	cd src || die
@@ -77,23 +78,23 @@ src_compile() {
 src_install() {
 	local me=me type=c
 	use nanoemacs && me=ne
-	use X && type=cw
+	use gui && type=cw
 	newbin src/${me}${type} ${me}
 
 	if ! use nanoemacs; then
 		keepdir /usr/share/jasspa/site
 		insinto /usr/share
 		doins -r "${WORKDIR}"/jasspa
-		use X && domenu "${FILESDIR}"/${PN}.desktop
+		use gui && domenu "${FILESDIR}"/${PN}.desktop
 	fi
 
 	dodoc faq.txt readme.txt change.log
 }
 
 pkg_postinst() {
-	use X && xdg_desktop_database_update
+	use gui && xdg_desktop_database_update
 }
 
 pkg_postrm() {
-	use X && xdg_desktop_database_update
+	use gui && xdg_desktop_database_update
 }