gentoo resync : 25.04.2020

4 files changed, 49 insertions, 4 deletions

diff --git a/x11-terms/aterm/Manifest b/x11-terms/aterm/Manifest
index 7ea9a360a84e..38dbcf068940 100644
--- a/x11-terms/aterm/Manifest
+++ b/x11-terms/aterm/Manifest
@@ -1,6 +1,7 @@
 AUX aterm-1.0.1-deadkeys.patch 1358 BLAKE2B f692e190a33e50877da050cce3e7a3c8ab36c272f3530f0d4df8ff40e7feb255ebd59eeae275bc7344f632111a84c7db86c5ebea07297346dd2feaf8c1865a04 SHA512 58831fbcc38f14f036a759606baed7beadc4d8b7a377e6c6de2d1fcb5a4e0ad06aff4c0d64f189efd26d790c5cc56d631c51797ce8334879997db4f373bd9298
 AUX aterm-1.0.1-display-security-issue.patch 797 BLAKE2B 2f3d4bcc2c7e705106c6c1e81526e7575514e9a83e064158bcc3dc5a554db5f5592c3af2c33eea78864ff0d8d16770dadf1ef20aea52fa131c5c75ace20991d2 SHA512 23e088f188b2d454f5a3c1f863439426c80524f71c1d8484e451f301aa7b4007ba54988a86b4fe49fc8f3401e0af7ff9b725c5d3e8c08ba2eef007b7ada13e4d
 AUX aterm-1.0.1-dpy.patch 848 BLAKE2B 27325ce9a768ad44ab4d6e875e8b2c85c5e1cb419e4578d14a8bd960c754a5a3cce4646dc40e266f4e32a4fdffa2cddb395fd0af404405ac75d9578f61f8e061 SHA512 5d4040cf5c5933e91348531a271cf9687387a740312b12f5185f41877e91f58a0c216e5ad67be19bf47607b23eb9e1b31ca577ceed2a0239a01118073716c2bc
+AUX aterm-1.0.1-remove-streams.patch 1108 BLAKE2B df7ee9b3409127ab82dc110035baa2b91f4d785874febb615d6d864bc4e5561b371707c7acc25096f59a646468b83a0cba27d2270f57ab80564dcc8b541b50e2 SHA512 d0ee1e6edee1e4b936b4179d9673e78f7bc70266f6d576d88ae76c9e87f4ae939baeaf0d62ba2b19cb1195cc3f4e1e111608ed493d56de4531ffb11257d2967d
 DIST aterm-1.0.1.tar.bz2 276810 BLAKE2B 05d8e70caf20bfe2170ffcea2231b6a1bca0ff3414867bb9e48785e4822112a82868793c0b25f7111545b835aff61852f78461166a574288bc238146226be745 SHA512 05c78590bba55d892d9f7add384e4ae8d56197dbcd9caff2be4a52d5c162e767a464359ba806fc95961d8035575a2b4a962fc35cfa44f95025b477fa3e15e56b
-EBUILD aterm-1.0.1-r3.ebuild 2040 BLAKE2B b000d95802bba815af3b3b5c8ec909c67c7ae7e7d1b1524f35998d180227fd55bb4a67591ca9b94c952717e6ec55a7fed12db2a18d32e4fb49e78e7c614938a9 SHA512 81ce90c8cea0d8690beeacf6c9d8ce78942e1344d1a4838451f418f9a88a7dffc5657f41f111b31e99c0c48d6931843bd66c71a5202c8219d9c060287d524e29
-MISC metadata.xml 456 BLAKE2B 268ce12677cb3678b091d810094c33905df594b0956e4103b132d6c5bc01bb234dffff4f65e34d8331a4ee76f2b893bf5fecbf4bc403b2c0690a357929a0a2cd SHA512 664fece05ae3d5cf3fcf713f83ec9756c1248dbde0fdbb6dd4cc5174ba54aa3238fb2ad1ec060cd9e665a83d83c0eacecddd1422ea44cc95850fe680198806cf
+EBUILD aterm-1.0.1-r4.ebuild 1987 BLAKE2B fac3bc69906ddeac45cfd895936efee2e79ca7ac174dfcb1916591d639f088df8a9a800de13539b4d25191b3cec85f576b08bc69cc81e1753ed3a9acdfe4d307 SHA512 812c5f176ca8126e3f4c02d5242132e0470ecd9fc2cfc6db77ffe00dc8ab96e796e16119ddf37345bcc3b9d6f366abf33b191cdd50453b85698cd106744d2e08
+MISC metadata.xml 643 BLAKE2B d1a621a0e1435528b11b8c990ef81836692c5f16526c78e2814c1568b0681ef02c2a988008c7c58b074ef8771ae95f840b5506447ad44cbf1617c16c5d09d80d SHA512 562485fc40c786d504d41805670a817811865aad74efb43fd210c3a9280d98f0e896410842c2881fcaa372771492e8a3af0167e8a15395351501981976f56700
diff --git a/x11-terms/aterm/aterm-1.0.1-r3.ebuild b/x11-terms/aterm/aterm-1.0.1-r4.ebuild
index ba35a2c82cd6..8427c805ffef 100644
--- a/x11-terms/aterm/aterm-1.0.1-r3.ebuild
+++ b/x11-terms/aterm/aterm-1.0.1-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.afterstep.org/apps/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+KEYWORDS="amd64"
 IUSE="background cjk xgetdefault"
 
 RDEPEND="
@@ -32,6 +32,7 @@ src_prepare() {
 	eapply "${FILESDIR}/${P}-display-security-issue.patch"
 	eapply "${FILESDIR}"/${P}-deadkeys.patch
 	eapply "${FILESDIR}/${P}-dpy.patch"
+	eapply "${FILESDIR}/${P}-remove-streams.patch"
 
 	#fix pre-stripped files
 	sed -i -e "/INSTALL_PROGRAM/ s:-s::" autoconf/Make.common.in || die "sed Makefile failed"
diff --git a/x11-terms/aterm/files/aterm-1.0.1-remove-streams.patch b/x11-terms/aterm/files/aterm-1.0.1-remove-streams.patch
new file mode 100644
index 000000000000..fc9f3f82ba17
--- /dev/null
+++ b/x11-terms/aterm/files/aterm-1.0.1-remove-streams.patch
@@ -0,0 +1,36 @@
+diff -ur aterm-1.0.1-orig/src/command.c aterm-1.0.1/src/command.c
+--- aterm-1.0.1-orig/src/command.c	2020-04-01 12:50:59.222929696 -0400
++++ aterm-1.0.1/src/command.c	2020-04-01 12:49:47.319579199 -0400
+@@ -91,10 +91,13 @@
+ 
+ #if defined (__svr4__) || defined (__lnx21__)
+ # include <sys/resource.h>	/* for struct rlimit */
+-# include <sys/stropts.h>	/* for I_PUSH */
+ # define _NEW_TTY_CTRL		/* to get proper defines in <termios.h> */
+ #endif
+ 
++#if defined (__svr4__)
++# include <sys/stropts.h>	/* for I_PUSH */
++#endif
++
+ /*}}} */
+ 
+ static unsigned int ModMetaMask, ModNumLockMask;
+@@ -672,7 +675,7 @@
+ 	print_error("can't open slave tty %s", ttydev);
+ 	exit(EXIT_FAILURE);
+     }
+-#if defined (__svr4__) || defined (__lnx21__)
++#if defined (__svr4__)
+ /*
+  * Push STREAMS modules:
+  *    ptem: pseudo-terminal hardware emulation module.
+@@ -682,6 +685,8 @@
+     ioctl(fd, I_PUSH, "ptem");
+     ioctl(fd, I_PUSH, "ldterm");
+     ioctl(fd, I_PUSH, "ttcompat");
++#elif defined (__lnx21__)
++    /* do nothing */
+ #else				/* __svr4__ */
+     {
+     	/* change ownership of tty to real uid and real group */
diff --git a/x11-terms/aterm/metadata.xml b/x11-terms/aterm/metadata.xml
index edce71995413..33527ab06bea 100644
--- a/x11-terms/aterm/metadata.xml
+++ b/x11-terms/aterm/metadata.xml
@@ -1,7 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>imirkin@alum.mit.edu</email>
+		<name>Ilia Mirkin</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>mattst88@gentoo.org</email>
+		<name>Matt Turner</name>
+	</maintainer>
 	<use>
 		<flag name="background">Enable background image support via
 			<pkg>media-libs/libafterimage</pkg></flag>