gentoo resync : 29.03.2018

5 files changed, 99 insertions, 2 deletions

diff --git a/dev-perl/X11-Protocol/Manifest b/dev-perl/X11-Protocol/Manifest
index 13b3c6aae2ba..380168e54319 100644
--- a/dev-perl/X11-Protocol/Manifest
+++ b/dev-perl/X11-Protocol/Manifest
@@ -1,3 +1,6 @@
+AUX X11-Protocol-0.56-test-tap.patch 859 BLAKE2B f126f1516191c68557d12d0d68a13fc63a1385a715394e9291b3acb06e0dfccca9cda893965223f02c55f69f43413792c402abcafb7bc13a57c7b5869ed66563 SHA512 e48a388e73722bfecec01388c3b149a9e9507cc3d99c101ea0ffe6170925c157628600cbc43474945fe464069632da2890c494e3fb503e2d9aa6e27cbfa9b624
+AUX X11-Protocol-0.56-test-timeout.patch 875 BLAKE2B 4571b7ae0ad18c5545de085bb472c26021ff961e6e22f85310edb8bb6c34ac066a1de58e197daa5d5ccf561f305c6c318755ec3e4831e1a40d2bf90a34d9f6c2 SHA512 cc825c1190b594cbe787aa41fe1302e8b83d318a5ec6d42e802e630cf385193f161bce82f399d9e2f2eb96783afc5ce60c85d08238691d3063539c5686063207
 DIST X11-Protocol-0.56.tar.gz 101227 BLAKE2B 7c13e7f511a36c0f480f500577d4b9f2a5915fc1d071bb660a8d8d56ca0c2d5facc8122e3f9760751bbbe5f669a52e4c5cd6a375f209d7abb4f4281b227157d5 SHA512 1c1a6ed15ceff77e8be29ac32a0e72aa2d0a1e62b5e19af2e34055aa001ee281ab584d993ace82f46f00d4da2e7bd4c60e4e31876a43c6c64c3e216beb13fe5f
-EBUILD X11-Protocol-0.560.0-r1.ebuild 484 BLAKE2B 199b250d6a72eac350c847c584f1e12a59e9ad586ebf0a56c93d6a73a18688581abdef10d770cc89535b4daefb244ab3e875c2b1057c623a1d861da95f9a849d SHA512 d9b9a4b487bb8da73a550001144c40d397997abf72500dfdb9c532e1bd14ce6199ad4a3e72830749929aa907f12053b5ccb2e8953a2f8d3de83565d58b6a77d7
+EBUILD X11-Protocol-0.560.0-r1.ebuild 490 BLAKE2B 02f7936cd0a998f7c4a07a97ee0b214d8b5a33582cbd06139876b0e359163b47c4e25ce50c1a71b2cc590fe2f1bb25960de6917190530b626a2e3caa2060fbe2 SHA512 b1d3827c8e0d44b945c505e26b6e44fbc925bdb91249de27e6adb097710d483802f6bf1c0f2d7052a3439a0752c42fe26805e9c213c021a1aa7cf6a32163a49c
+EBUILD X11-Protocol-0.560.0-r2.ebuild 663 BLAKE2B ef4f350ffac31f53844e9dbe6b4a711add9e227d99d7712bc8ca580b9ad0cb6a426244cec7efa4c73d4158028087feac1373167ac223b7fd2b96e5cdd288eb60 SHA512 1bdc2c16a8a41ae384efe9e91f7a77a61e775430d225af813d1d9ca8a78ffaed9cf3399a0a849741aac88388a05a27424208e4c564790f582c612f13705138a5
 MISC metadata.xml 1594 BLAKE2B 9de873c7cc1a7db3edf3a6ef6c1b7dd1843b0ffe0675ac9cd14c7c96cc92d838d800bb182c4dbf1fdb67560e1aa17dbbab536972f65b3c968bad86189a69140e SHA512 61e03d09767517801cfcc9af58a74ea67f092f6426108438b92afdbefd90de1945fc851b9b066f624f98b1f6cd4780e52cc50b7556b13bcf06fdfd0d6935f9ce
diff --git a/dev-perl/X11-Protocol/X11-Protocol-0.560.0-r1.ebuild b/dev-perl/X11-Protocol/X11-Protocol-0.560.0-r1.ebuild
index 765819a3216a..c405d609b120 100644
--- a/dev-perl/X11-Protocol/X11-Protocol-0.560.0-r1.ebuild
+++ b/dev-perl/X11-Protocol/X11-Protocol-0.560.0-r1.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Client-side interface to the X11 Protocol"
 
 LICENSE="${LICENSE} MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="x11-libs/libXrender
diff --git a/dev-perl/X11-Protocol/X11-Protocol-0.560.0-r2.ebuild b/dev-perl/X11-Protocol/X11-Protocol-0.560.0-r2.ebuild
new file mode 100644
index 000000000000..c307b6d921d4
--- /dev/null
+++ b/dev-perl/X11-Protocol/X11-Protocol-0.560.0-r2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=SMCCAM
+DIST_VERSION=0.56
+DIST_EXAMPLES=("eg/*")
+inherit perl-module virtualx
+
+DESCRIPTION="Client-side interface to the X11 Protocol"
+
+LICENSE="${LICENSE} MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND="x11-libs/libXrender
+	x11-libs/libXext"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.56-test-timeout.patch"
+	"${FILESDIR}/${PN}-0.56-test-tap.patch"
+)
+src_test() {
+	virtx perl-module_src_test
+}
diff --git a/dev-perl/X11-Protocol/files/X11-Protocol-0.56-test-tap.patch b/dev-perl/X11-Protocol/files/X11-Protocol-0.56-test-tap.patch
new file mode 100644
index 000000000000..83c07bebc37a
--- /dev/null
+++ b/dev-perl/X11-Protocol/files/X11-Protocol-0.56-test-tap.patch
@@ -0,0 +1,28 @@
+From 663aaa7eefbf9dcad54c8c7f4c463bf289a9b907 Mon Sep 17 00:00:00 2001
+From: Kent Fredric <kentnl@gentoo.org>
+Date: Wed, 28 Mar 2018 23:46:13 +1300
+Subject: Move to a TAP::Harness friendly test layout
+
+---
+ MANIFEST           | 2 +-
+ test.pl => t/x11.t | 0
+ 2 files changed, 1 insertion(+), 1 deletion(-)
+ rename test.pl => t/x11.t (100%)
+
+diff --git a/MANIFEST b/MANIFEST
+index 24c14b7..8648607 100644
+--- a/MANIFEST
++++ b/MANIFEST
+@@ -33,4 +33,4 @@ eg/widgets2.pl				X11-Motif version of widget example
+ eg/widgets3.pl				Unfinished OO-interface widget example
+ eg/widgets.c				C Xlib version of widget example
+ eg/wintree.pl				Window hierarchy utility example
+-test.pl					Short test of Protocol.pm et al.
++t/x11.t					Short test of Protocol.pm et al.
+diff --git a/test.pl b/t/x11.t
+similarity index 100%
+rename from test.pl
+rename to t/x11.t
+-- 
+2.16.2
+
diff --git a/dev-perl/X11-Protocol/files/X11-Protocol-0.56-test-timeout.patch b/dev-perl/X11-Protocol/files/X11-Protocol-0.56-test-timeout.patch
new file mode 100644
index 000000000000..c20ae4d73b91
--- /dev/null
+++ b/dev-perl/X11-Protocol/files/X11-Protocol-0.56-test-timeout.patch
@@ -0,0 +1,38 @@
+From 00202116b49691de109c397f298c55960d2b9896 Mon Sep 17 00:00:00 2001
+From: Slaven Rezic <slaven@rezic.de>
+Date: Sat, 25 Nov 2017 09:57:00 +0100
+Subject: timeout tests on inactivity
+
+Bug: https://rt.cpan.org/Ticket/Display.html?id=123736
+---
+ test.pl | 12 +++++++++++-
+ 1 file changed, 11 insertions(+), 1 deletion(-)
+
+diff --git a/test.pl b/test.pl
+index 8436a47..209a6a6 100644
+--- a/test.pl
++++ b/test.pl
+@@ -91,9 +91,19 @@ $gc = getGC($win, $font);
+ 
+ $x->MapWindow($win);
+ 
++$SIG{ALRM} = sub { die "Timeout" };
++alarm(5);
+ while (1)
+   {
+-    $x->handle_input until %e = $x->dequeue_event;
++    eval { $x->handle_input until %e = $x->dequeue_event; };
++    if ($@)
++    {
++        if ($@ =~ /Timeout/) {
++            print "ok 3\n";
++            last;
++        }
++        die $@;
++    }
+     if ($e{name} eq "Expose")
+       {
+ 	next unless $e{count} == 0;
+-- 
+2.16.2
+