gentoo resync : 19.11.2017

3 files changed, 31 insertions, 1 deletions

diff --git a/x11-terms/aterm/Manifest b/x11-terms/aterm/Manifest
index c17cae882974..32f92d1a9d99 100644
--- a/x11-terms/aterm/Manifest
+++ b/x11-terms/aterm/Manifest
@@ -1,8 +1,9 @@
 AUX aterm-1.0.1-deadkeys.patch 1358 SHA256 5611f694ee0368c46e45389e87cfc8f66a8d4e7ad3b6141098ce7f325cf89640 SHA512 58831fbcc38f14f036a759606baed7beadc4d8b7a377e6c6de2d1fcb5a4e0ad06aff4c0d64f189efd26d790c5cc56d631c51797ce8334879997db4f373bd9298 WHIRLPOOL 5bd0988eaf27d4e719464d75a2b2e64744a1682f733cfa043693a03b7d2e2fd7a45d073d8000db37a80e45686da5e705a3d8f48a2c43ecde1f27e284709dd0ae
 AUX aterm-1.0.1-display-security-issue.patch 797 SHA256 2fa7012ff386d4bc4b7f1b42ce0ddf75243bc6c9bb48b4c7ed009d6651b63ff4 SHA512 23e088f188b2d454f5a3c1f863439426c80524f71c1d8484e451f301aa7b4007ba54988a86b4fe49fc8f3401e0af7ff9b725c5d3e8c08ba2eef007b7ada13e4d WHIRLPOOL 600e2782f3f5ae2b3c46769f9d064e1383e225ea478810e4a4319d51ef20bf31c6eeb47c636244228d57552b921f3a07ee1106b03ca75d9303eaeff4b3b913ba
+AUX aterm-1.0.1-dpy.patch 848 SHA256 9ae9785bf633cbf294e186a301fc0e609067efbf22428a8526ae861a976fae31 SHA512 5d4040cf5c5933e91348531a271cf9687387a740312b12f5185f41877e91f58a0c216e5ad67be19bf47607b23eb9e1b31ca577ceed2a0239a01118073716c2bc WHIRLPOOL 731c4339db9faab2c185cd8972284a2446e87b355cb3a4ca2c877f4ca080ee02052d0591dd1540f2d3d7a5fe678064e96c85c8a0c982c489d5fffb597c8c2d91
 DIST aterm-1.0.1.tar.bz2 276810 SHA256 a161c3b2d9c7149130a41963899993af21eae92e8e362f4b5b3c7c4cb16760ce SHA512 05c78590bba55d892d9f7add384e4ae8d56197dbcd9caff2be4a52d5c162e767a464359ba806fc95961d8035575a2b4a962fc35cfa44f95025b477fa3e15e56b WHIRLPOOL 8586aeef3536bbfb36dffbc3d8d68f86253ecb9f3677908c539fa518e22d6361671a8763867a325058a6931acb71710c9cacdd532d8594c92a68870758946cc2
 EBUILD aterm-1.0.1-r2.ebuild 1995 SHA256 fb990031ca5b4e98f95f8098d63889d41ba95136385e409ad22963f0ca7cfd32 SHA512 f344337763155570f96bf1da4e630deb27beae3b57ccdbbe3d4e6e211e45b891f99a1579404495c49a990472b72792015ef0bef948ada584f0c2fb9f1f31a031 WHIRLPOOL 95b33c68f5602a6547ab846bb0a0ee43870af07810d05674f203329f4d493ebdbc51550fb1cd0029390337d66c58d2dbb93f5f92e84476a898ae4d7a6936c2ea
-EBUILD aterm-1.0.1-r3.ebuild 2017 SHA256 ee7a6c4def29729b9eeccd2eef854ebd9d42a447117d8e8841a4b0a64da0c0ba SHA512 1d2734be8e0e72c6d5edbf26bf1837a0b5a34bddfeef11a928286fa72b1b7656cfc1b8d070c0ebddfff90b64b8ab6f926171f1d77709c8348612c2ea201a9702 WHIRLPOOL 80ec4131f2ce62b752fbc645da18e056fe158dc6c35098d3779501ef2698cd22ce950618f4721ee01b7b351d410fad8b21e577a31692e92000a6ddf9270e8bde
+EBUILD aterm-1.0.1-r3.ebuild 2054 SHA256 864c79506451e0bf679115db10ceb35a26bc185f3b03ac15a8c951108ef01223 SHA512 656a27a2c6842484cffea14110212e9c92fed7c784a25959a1eb45bd6cb2ced372239a8d4e81ec98f832bac74bb56f3207691103f2cf728bb95f5b262f519ab4 WHIRLPOOL 014c4d13d95be6c6cbe3b7f5e01010153f535c5d34a5d52084ce1b15c9f2c1dc855d8c44b124c7cf4c0598e6170415dbba07e419b1805d800096dc399f0e0a09
 MISC ChangeLog 3155 SHA256 82989c0c7c922fd46518a9ae705a4f0fac05658edd465b39ddf6754da1563ba6 SHA512 cb6de21a57f935dcf39137690763c97e6617216d87bc74d99f61b6933661a0ef1c5c77712d80a8cded019ba7cb3ea7f527015eb898966216151b9967132acf6f WHIRLPOOL 41f7c9a10b3c454ccb70b66ba339c71a5dc28f8b6d6a44fce648df479b5c04576b9fab725727f9ada73afddbea3d16864383054f6acbf1f3a1d0827e45b537b5
 MISC ChangeLog-2015 19945 SHA256 707c1b1328efdd39d7b29048ef906cde508b4253817d8029c72216367792e992 SHA512 4b1bc0f37cfe9ed301415868d29a7787168bb0841c2b879c5bba0735b1f6a15520e149131d24bd9ac3a5b183043b7a6c43d3ffb0fa22b0a7d51a1063358ca999 WHIRLPOOL 01a675e34972a13fc3bebc44da5acc38bf363ee7679f033b12c036baa2f666f35b96df93e389a8e29216cdd05d09d1105c94598204be412a1672a203c6f8cf33
 MISC metadata.xml 456 SHA256 4f24c3c2b44842fa1cd575392461f929125fdcadeaf4f9b268f33dc7c5b6ebf8 SHA512 664fece05ae3d5cf3fcf713f83ec9756c1248dbde0fdbb6dd4cc5174ba54aa3238fb2ad1ec060cd9e665a83d83c0eacecddd1422ea44cc95850fe680198806cf WHIRLPOOL 123c3882e57bf373e7d67a96c2beb5b3c0fb72f59e7bdf5cd528a3311f0b378425ef2eb7a6f61e7a6754c647e6bc27a2f3ba874472ea31fff046b1af61069c9f
diff --git a/x11-terms/aterm/aterm-1.0.1-r3.ebuild b/x11-terms/aterm/aterm-1.0.1-r3.ebuild
index e8db05b719d5..13ec64d087df 100644
--- a/x11-terms/aterm/aterm-1.0.1-r3.ebuild
+++ b/x11-terms/aterm/aterm-1.0.1-r3.ebuild
@@ -31,6 +31,7 @@ src_prepare() {
 	# Security bug #219746
 	eapply "${FILESDIR}/${P}-display-security-issue.patch"
 	eapply "${FILESDIR}"/${P}-deadkeys.patch
+	eapply "${FILESDIR}/${P}-dpy.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-dpy.patch b/x11-terms/aterm/files/aterm-1.0.1-dpy.patch
new file mode 100644
index 000000000000..fbe9800d2189
--- /dev/null
+++ b/x11-terms/aterm/files/aterm-1.0.1-dpy.patch
@@ -0,0 +1,28 @@
+Resolve build failure. Patch from Fedora.
+
+Bug: https://bugs.gentoo.org/615836
+
+diff -up aterm-1.0.1/src/main.c.orig aterm-1.0.1/src/main.c
+--- aterm-1.0.1/src/main.c.orig	2011-02-19 09:12:01.000000000 +0200
++++ aterm-1.0.1/src/main.c	2011-02-19 09:25:02.000000000 +0200
+@@ -2087,10 +2087,10 @@ main(int argc, char *argv[])
+ #endif
+ 
+ 	ConnectX ( &Scr, 0 );
+-    Xdisplay = dpy ;
+-    Xscreen = Scr.screen ;
++       Xscreen = Scr.screen ;
+ 	asv = Scr.asv ;
+ 
++	Xdisplay = asv->dpy;
+ 	Xcmap = asv->colormap;
+ 	Xdepth = asv->visual_info.depth;
+ 	Xvisual = asv->visual_info.visual;
+@@ -2125,7 +2125,6 @@ main(int argc, char *argv[])
+ 	XdisplayHeight = DisplayHeight (Xdisplay, Xscreen);
+ 
+ #ifdef HAVE_AFTERIMAGE
+-	dpy = Xdisplay ;
+ 	asv = create_asvisual (Xdisplay, Xscreen, Xdepth, NULL);
+ 	Xcmap = asv->colormap;
+ 	Xdepth = asv->visual_info.depth;