gentoo resync : 21.10.2017

5 files changed, 666 insertions, 6 deletions

diff --git a/dev-perl/ExtUtils-XSpp/ExtUtils-XSpp-0.170.0.ebuild b/dev-perl/ExtUtils-XSpp/ExtUtils-XSpp-0.170.0.ebuild
index fa3567ad6c6a..c11abdc4a88a 100644
--- a/dev-perl/ExtUtils-XSpp/ExtUtils-XSpp-0.170.0.ebuild
+++ b/dev-perl/ExtUtils-XSpp/ExtUtils-XSpp-0.170.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -23,5 +23,5 @@ DEPEND="
 RDEPEND="
 	>=virtual/perl-ExtUtils-ParseXS-2.22.02
 "
-
+PATCHES=( "${FILESDIR}/${P}-no-dot-inc.patch" )
 SRC_TEST=do
diff --git a/dev-perl/ExtUtils-XSpp/ExtUtils-XSpp-0.180.0.ebuild b/dev-perl/ExtUtils-XSpp/ExtUtils-XSpp-0.180.0.ebuild
index 115357c805a5..730c1130cb27 100644
--- a/dev-perl/ExtUtils-XSpp/ExtUtils-XSpp-0.180.0.ebuild
+++ b/dev-perl/ExtUtils-XSpp/ExtUtils-XSpp-0.180.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -24,5 +24,5 @@ DEPEND="${RDEPEND}
 		dev-perl/Test-Base
 	)
 "
-
+PATCHES=( "${FILESDIR}/${P}-no-dot-inc.patch" )
 SRC_TEST="do parallel"
diff --git a/dev-perl/ExtUtils-XSpp/Manifest b/dev-perl/ExtUtils-XSpp/Manifest
index a0486a044307..40ee139f39cd 100644
--- a/dev-perl/ExtUtils-XSpp/Manifest
+++ b/dev-perl/ExtUtils-XSpp/Manifest
@@ -1,7 +1,9 @@
+AUX ExtUtils-XSpp-0.170.0-no-dot-inc.patch 7135 SHA256 ca627a531b42c91deb91818ec48a66ae63025a71f38806accf9691306d8dd425 SHA512 0ca7aba0c5eee78265c245d0e378fe7ca2849be0acca169f45a6f8f140b731c14e0fee1145f2be476d106e792f8c2eca890b55734a0fa7870dc535fd3cb1e346 WHIRLPOOL 6e437d8a6c211d1ef3093d34baab5b143eea0e0d94f4d53e9ad3a037f44eafe0d6b78f6705442f62216bb2394e894219f404f9b153fc741ea7f648507df0c99f
+AUX ExtUtils-XSpp-0.180.0-no-dot-inc.patch 7820 SHA256 e8a226a518573df5cce858f92662a9e71435d692429460f2de4f3d71dad0baec SHA512 52c4fa509e7eb7d3a7320094c9818b4152ae833fe4b24a04402ede6a091a524f2f623cc12bb03a5e94a938ca5110b75ee828130eaa701334763636ace34f10b5 WHIRLPOOL 932fe475bd50425a46176dfe32ff4f6f7cfc8fcadd3d30ec0ab80b14399d29b7998ccb1eae90709f07f680f968a42a234d87701f64efed8b9156a15b531ef803
 DIST ExtUtils-XSpp-0.1700.tar.gz 175808 SHA256 355305acb5285e60d40471d30555944ca8327967e13bfbe24e257ed9563a57d7 SHA512 12490302e98a499bbc14849a5879087d9d88feb64dedd2d9c79b047fadec2171d5029f1b2e1ffe68e16fb07b1e22dd3d443dead0a6bf1ddf504600cbde92128a WHIRLPOOL 89ed01074926682d3281bca2346e21f1991ef23ea83632d15c787bdf7a33aeb856c4d537497f8e3c3c9d3edfcba727ae97856abeffa03f0e68f0e1ecd3f81849
 DIST ExtUtils-XSpp-0.18.tar.gz 185431 SHA256 9176ad646729e3bd27cf7abf114bedd3424bff1ba61185cfc7d54f3a9223a8ff SHA512 0e075876f8a269bd0df71a37bcfe7c164fa18ffabe72deecb57d5ebefa3a78fc0c2438e75319497e0e1f99e6f9af9ae33af8ecb67e1d411356d6f3a50cd9ea1e WHIRLPOOL 259a905ab6a2d3532e534657ee61022d47e89dc507473b4fa0b45dc30fe93dacb05e23bb55ea5677183c8138a5d4e04bd448e7bb6fdc88f6f09619a1d6935fbc
-EBUILD ExtUtils-XSpp-0.170.0.ebuild 422 SHA256 f4edb0ebcacde5dcfdb39ee9828d2e12c4058c716072256dcecb5350e5509971 SHA512 3bb7ce0bbfbe4b5548eb4b230361a5ca0790145f4771a99664ff2eee2e5a8c0a56d5838295eef89f08e4be682d8251d07185172f118c133e5dbe08ef21508d89 WHIRLPOOL 88f52033242fcc766bf4447affbb60a4408bad54b52134b70aa23354db02fecd58b45fd9c1bf2018912f56e4f159a41712888c4646807678d202a1211e8a465e
-EBUILD ExtUtils-XSpp-0.180.0.ebuild 473 SHA256 8f7eb491f76ed60f3d93632337f2ea1814717f2f9717b772ea765da6a8d539ca SHA512 31ee5c59330790abb84152d959ce583cef116ba3b3c9fcd2f65de8e28440fc5f2fceb64db7ae6b0b05941f5d4ef2170d744713e79ea656a84ba731557f619aa1 WHIRLPOOL 4a87e5c793df5f427501fdca88d1e0d992b9c3c6d251c2648f5474c46dd10f1e033268f1b63cc3a6cbcbefc3b79734080b0d0844e02227bdd2cb70ae2e7c6208
+EBUILD ExtUtils-XSpp-0.170.0.ebuild 469 SHA256 877cbdd22fcf8be54e4d50bdc6cb984983eabc58a4e435da5eb9865c9e285090 SHA512 6e5a9ef026b2263e7273fa57f86194b83a59e2780b3b35986ae42d8dfccf7ad8f9fcf8f1c43c86047059fae1605eab661adb5d8493d968e1963271df1779366c WHIRLPOOL 71b1eac6f4c8563a7c365f90276bfa993e9b1cd0f069ccf4a695d206e8cdbc0323de21794349990fb57aaa1ea2dcb5e9b4f724471e1d3947fee3dea4d5663181
+EBUILD ExtUtils-XSpp-0.180.0.ebuild 520 SHA256 018d2639044f3f8706f329c5c3dd1d50e8d611304e63be883ac248c103c2e1f0 SHA512 12f42f3927ab156345f70d1d2fa6ebea6accfd7d39da7181bbba1c3252d8b48fdcae4ce190e4078512bac6c330fe28cd7762af88dbf4afa6b410e62c32e51407 WHIRLPOOL 2f05999a81a6375dcd536b761fb55d8a16231c0b9e1037806cb76655d6ee0bc32765f210e870e08c8599cc9dac579d950747e826d8048532355cdbc2e5e91ff4
 MISC ChangeLog 2905 SHA256 086f7ede13ac364a0e7250d0aa0b9fe236d634aa826923ebc5a765d065b98dd3 SHA512 28748f125c7728ffe3576436bbfce8e32d2471f64f580ac31d417b121b00d45f238ba48e2c885ca605cd6fb830b6f6e58b7dbe752401def441f71a73c7d44b7b WHIRLPOOL 67057eb5f0525c687def1803d620f684594530b617aa1f43deaf3f8a354471cffd027dbe55d684609155c62768d15c68a42276e929b4fa683d1e425b4c225a8c
 MISC ChangeLog-2015 4251 SHA256 7dc41e3118b651cffb3413a94cb6c1a025077a64f937efc48c980f5ef650f0d9 SHA512 145ff373ed510702d8c61eee267e8890dce17a6415e4d865b69f2d44aebd02ad9ae49d1a17efd4ab8dbc5565f33776ec5d87f30ab4bd2c2b84305d8c3570f17e WHIRLPOOL cdca165f11476555484f90a2125ff9186dfe201f6e89c08d8877b8c1c31dc108fc148cf59540a009fd49e9b5c68fe6c1841b2f826461364e47e009e529d24a34
 MISC metadata.xml 3043 SHA256 e7c2f9acd0abfcc6ed9a7b07e186d5c6ed469423ca84fc1c54c5bb557cba4757 SHA512 5a0172d4d3bfe0fe174fd690ff796f589350b2ee91f93d72a23d90f128cb48434bec712bda6c3619b205b0ba980d1207c0116ecf9a6ae50963fe09f413ce4a00 WHIRLPOOL 1170f43a89fa1b7eccfce59fc35a14ee232a59654f8f07d4b553663fd5cdc40cc2afc392849c12428cd0994678b703272861a3e7bd7adb496b920c4d61dd7f0e
diff --git a/dev-perl/ExtUtils-XSpp/files/ExtUtils-XSpp-0.170.0-no-dot-inc.patch b/dev-perl/ExtUtils-XSpp/files/ExtUtils-XSpp-0.170.0-no-dot-inc.patch
new file mode 100644
index 000000000000..f3a5120a4efe
--- /dev/null
+++ b/dev-perl/ExtUtils-XSpp/files/ExtUtils-XSpp-0.170.0-no-dot-inc.patch
@@ -0,0 +1,314 @@
+From 890c6563bca6c297500ed7ad6be7147e0222c797 Mon Sep 17 00:00:00 2001
+From: Kent Fredric <kentnl@gentoo.org>
+Date: Sat, 21 Oct 2017 11:04:37 +1300
+Subject: Fix test failures without '.' in @INC on 5.26+
+
+This fixes test failures when perl is running with PERL_USE_UNSAFE_INC=0
+set in the environment.
+
+Bug: https://rt.cpan.org/Ticket/Display.html?id=121070
+Bug: https://bugs.gentoo.org/615240
+Bug: https://github.com/mbarbon/extutils-xspp/pull/3
+---
+ t/010_base.t            | 3 ++-
+ t/011_multiple_files.t  | 3 ++-
+ t/012_preprocessor.t    | 3 ++-
+ t/015_reference.t       | 3 ++-
+ t/020_rename.t          | 3 ++-
+ t/022_static.t          | 3 ++-
+ t/022_virtual.t         | 3 ++-
+ t/023_base_classes.t    | 3 ++-
+ t/024_enum.t            | 3 ++-
+ t/030_code_blocks.t     | 3 ++-
+ t/031_verbatim_blocks.t | 3 ++-
+ t/035_include.t         | 3 ++-
+ t/040_plugin.t          | 7 ++++---
+ t/043_parser_plugins.t  | 3 ++-
+ t/075_types.t           | 3 ++-
+ t/080_complex_typemap.t | 3 ++-
+ t/090_exceptions.t      | 3 ++-
+ t/lib/XSP/Plugin.pm     | 2 +-
+ t/lib/XSP/Test.pm       | 4 ++--
+ 19 files changed, 39 insertions(+), 22 deletions(-)
+
+diff --git a/t/010_base.t b/t/010_base.t
+index 3d8b3c9..58cfd30 100644
+--- a/t/010_base.t
++++ b/t/010_base.t
+@@ -2,7 +2,8 @@
+ 
+ use strict;
+ use warnings;
+-use t::lib::XSP::Test tests => 14;
++use lib 't/lib';
++use XSP::Test tests => 14;
+ 
+ run_diff xsp_stdout => 'expected';
+ 
+diff --git a/t/011_multiple_files.t b/t/011_multiple_files.t
+index d52f930..d37d36b 100644
+--- a/t/011_multiple_files.t
++++ b/t/011_multiple_files.t
+@@ -2,7 +2,8 @@
+ 
+ use strict;
+ use warnings;
+-use t::lib::XSP::Test tests => 3;
++use lib 't/lib';
++use XSP::Test tests => 3;
+ 
+ run_diff process => 'expected';
+ 
+diff --git a/t/012_preprocessor.t b/t/012_preprocessor.t
+index 953bd73..7bf64f9 100644
+--- a/t/012_preprocessor.t
++++ b/t/012_preprocessor.t
+@@ -2,7 +2,8 @@
+ 
+ use strict;
+ use warnings;
+-use t::lib::XSP::Test tests => 6;
++use lib 't/lib';
++use XSP::Test tests => 6;
+ 
+ # monkeypatch print methods to test conditionals are parsed correctly
+ no warnings 'redefine';
+diff --git a/t/015_reference.t b/t/015_reference.t
+index e060a25..4b33887 100644
+--- a/t/015_reference.t
++++ b/t/015_reference.t
+@@ -2,7 +2,8 @@
+ 
+ use strict;
+ use warnings;
+-use t::lib::XSP::Test tests => 2;
++use lib 't/lib';
++use XSP::Test tests => 2;
+ 
+ run_diff xsp_stdout => 'expected';
+ 
+diff --git a/t/020_rename.t b/t/020_rename.t
+index df6abc3..ec1a0fd 100644
+--- a/t/020_rename.t
++++ b/t/020_rename.t
+@@ -2,7 +2,8 @@
+ 
+ use strict;
+ use warnings;
+-use t::lib::XSP::Test tests => 9;
++use lib 't/lib';
++use XSP::Test tests => 9;
+ 
+ run_diff xsp_stdout => 'expected';
+ 
+diff --git a/t/022_static.t b/t/022_static.t
+index de77672..138f02a 100644
+--- a/t/022_static.t
++++ b/t/022_static.t
+@@ -2,7 +2,8 @@
+ 
+ use strict;
+ use warnings;
+-use t::lib::XSP::Test tests => 1;
++use lib 't/lib';
++use XSP::Test tests => 1;
+ 
+ run_diff xsp_stdout => 'expected';
+ 
+diff --git a/t/022_virtual.t b/t/022_virtual.t
+index 2186690..7434d53 100644
+--- a/t/022_virtual.t
++++ b/t/022_virtual.t
+@@ -2,7 +2,8 @@
+ 
+ use strict;
+ use warnings;
+-use t::lib::XSP::Test tests => 3;
++use lib 't/lib';
++use XSP::Test tests => 3;
+ 
+ run_diff xsp_stdout => 'expected';
+ 
+diff --git a/t/023_base_classes.t b/t/023_base_classes.t
+index a53d5f8..00b2c06 100644
+--- a/t/023_base_classes.t
++++ b/t/023_base_classes.t
+@@ -2,7 +2,8 @@
+ 
+ use strict;
+ use warnings;
+-use t::lib::XSP::Test tests => 2;
++use lib 't/lib';
++use XSP::Test tests => 2;
+ 
+ run_diff xsp_stdout => 'expected';
+ 
+diff --git a/t/024_enum.t b/t/024_enum.t
+index 30a88e0..6ca1edf 100644
+--- a/t/024_enum.t
++++ b/t/024_enum.t
+@@ -2,7 +2,8 @@
+ 
+ use strict;
+ use warnings;
+-use t::lib::XSP::Test tests => 2;
++use lib 't/lib';
++use XSP::Test tests => 2;
+ 
+ # monkeypatch Enum/EnumValue just to test that they were parsed correctly
+ no warnings 'redefine';
+diff --git a/t/030_code_blocks.t b/t/030_code_blocks.t
+index dc6df69..aca157e 100644
+--- a/t/030_code_blocks.t
++++ b/t/030_code_blocks.t
+@@ -2,7 +2,8 @@
+ 
+ use strict;
+ use warnings;
+-use t::lib::XSP::Test tests => 6;
++use lib 't/lib';
++use XSP::Test tests => 6;
+ 
+ run_diff xsp_stdout => 'expected';
+ 
+diff --git a/t/031_verbatim_blocks.t b/t/031_verbatim_blocks.t
+index d123f66..5c2d373 100644
+--- a/t/031_verbatim_blocks.t
++++ b/t/031_verbatim_blocks.t
+@@ -2,7 +2,8 @@
+ 
+ use strict;
+ use warnings;
+-use t::lib::XSP::Test tests => 2;
++use lib 't/lib';
++use XSP::Test tests => 2;
+ 
+ run_diff xsp_stdout => 'expected';
+ 
+diff --git a/t/035_include.t b/t/035_include.t
+index 4d5f4e5..306e183 100644
+--- a/t/035_include.t
++++ b/t/035_include.t
+@@ -2,7 +2,8 @@
+ 
+ use strict;
+ use warnings;
+-use t::lib::XSP::Test tests => 1;
++use lib 't/lib';
++use XSP::Test tests => 1;
+ 
+ run_diff xsp_stdout => 'expected';
+ 
+diff --git a/t/040_plugin.t b/t/040_plugin.t
+index 798ba62..f8f1ea8 100644
+--- a/t/040_plugin.t
++++ b/t/040_plugin.t
+@@ -2,7 +2,8 @@
+ 
+ use strict;
+ use warnings;
+-use t::lib::XSP::Test tests => 2;
++use lib 't/lib';
++use XSP::Test tests => 2;
+ 
+ run_diff xsp_stdout => 'expected';
+ 
+@@ -12,8 +13,8 @@ __DATA__
+ --- xsp_stdout
+ %module{Foo};
+ %package{Foo};
+-%loadplugin{t::lib::XSP::Plugin};
+-%loadplugin{t::lib::XSP::Plugin};
++%loadplugin{XSP::Plugin};
++%loadplugin{XSP::Plugin};
+ 
+ int foo(int y);
+ 
+diff --git a/t/043_parser_plugins.t b/t/043_parser_plugins.t
+index e89c5cb..a84342b 100644
+--- a/t/043_parser_plugins.t
++++ b/t/043_parser_plugins.t
+@@ -2,7 +2,8 @@
+ 
+ use strict;
+ use warnings;
+-use t::lib::XSP::Test tests => 2;
++use lib 't/lib';
++use XSP::Test tests => 2;
+ 
+ run_diff xsp_stdout => 'expected';
+ 
+diff --git a/t/075_types.t b/t/075_types.t
+index 441d66b..a4db077 100644
+--- a/t/075_types.t
++++ b/t/075_types.t
+@@ -2,7 +2,8 @@
+ 
+ use strict;
+ use warnings;
+-use t::lib::XSP::Test tests => 5;
++use lib 't/lib';
++use XSP::Test tests => 5;
+ 
+ run_diff xsp_stdout => 'expected';
+ 
+diff --git a/t/080_complex_typemap.t b/t/080_complex_typemap.t
+index f86df61..44314b2 100644
+--- a/t/080_complex_typemap.t
++++ b/t/080_complex_typemap.t
+@@ -2,7 +2,8 @@
+ 
+ use strict;
+ use warnings;
+-use t::lib::XSP::Test tests => 6;
++use lib 't/lib';
++use XSP::Test tests => 6;
+ 
+ run_diff xsp_stdout => 'expected';
+ 
+diff --git a/t/090_exceptions.t b/t/090_exceptions.t
+index 0bb30fd..0e8071d 100644
+--- a/t/090_exceptions.t
++++ b/t/090_exceptions.t
+@@ -2,7 +2,8 @@
+ 
+ use strict;
+ use warnings;
+-use t::lib::XSP::Test tests => 9;
++use lib 't/lib';
++use XSP::Test tests => 9;
+ 
+ run_diff xsp_stdout => 'expected';
+ 
+diff --git a/t/lib/XSP/Plugin.pm b/t/lib/XSP/Plugin.pm
+index 8f0cd2a..e4b2212 100644
+--- a/t/lib/XSP/Plugin.pm
++++ b/t/lib/XSP/Plugin.pm
+@@ -1,4 +1,4 @@
+-package t::lib::XSP::Plugin;
++package XSP::Plugin;
+ 
+ use strict;
+ use warnings;
+diff --git a/t/lib/XSP/Test.pm b/t/lib/XSP/Test.pm
+index 719b829..081938f 100644
+--- a/t/lib/XSP/Test.pm
++++ b/t/lib/XSP/Test.pm
+@@ -1,4 +1,4 @@
+-package t::lib::XSP::Test;
++package XSP::Test;
+ 
+ use strict;
+ use warnings;
+@@ -37,7 +37,7 @@ sub run_diff(@) {
+ 
+ use ExtUtils::XSpp;
+ 
+-package t::lib::XSP::Test::Filter;
++package XSP::Test::Filter;
+ 
+ use Test::Base::Filter -base;
+ 
+-- 
+2.14.2
+
diff --git a/dev-perl/ExtUtils-XSpp/files/ExtUtils-XSpp-0.180.0-no-dot-inc.patch b/dev-perl/ExtUtils-XSpp/files/ExtUtils-XSpp-0.180.0-no-dot-inc.patch
new file mode 100644
index 000000000000..1605f278b2d8
--- /dev/null
+++ b/dev-perl/ExtUtils-XSpp/files/ExtUtils-XSpp-0.180.0-no-dot-inc.patch
@@ -0,0 +1,344 @@
+From 6875b61003a7a5e3d4c96ad12d74a02433baf9d7 Mon Sep 17 00:00:00 2001
+From: Kent Fredric <kentnl@gentoo.org>
+Date: Sat, 21 Oct 2017 11:04:37 +1300
+Subject: Fix test failures without '.' in @INC on 5.26+
+
+This fixes test failures when perl is running with PERL_USE_UNSAFE_INC=0
+set in the environment.
+
+Bug: https://rt.cpan.org/Ticket/Display.html?id=121070
+Bug: https://bugs.gentoo.org/615240
+Bug: https://github.com/mbarbon/extutils-xspp/pull/3
+---
+ t/010_base.t            | 3 ++-
+ t/011_multiple_files.t  | 3 ++-
+ t/012_preprocessor.t    | 3 ++-
+ t/013_typemap_output.t  | 3 ++-
+ t/015_reference.t       | 3 ++-
+ t/020_rename.t          | 3 ++-
+ t/022_static.t          | 3 ++-
+ t/022_virtual.t         | 3 ++-
+ t/023_base_classes.t    | 3 ++-
+ t/024_enum.t            | 3 ++-
+ t/025_member.t          | 3 ++-
+ t/030_code_blocks.t     | 3 ++-
+ t/031_verbatim_blocks.t | 3 ++-
+ t/035_include.t         | 3 ++-
+ t/040_plugin.t          | 7 ++++---
+ t/043_parser_plugins.t  | 3 ++-
+ t/075_types.t           | 3 ++-
+ t/080_complex_typemap.t | 3 ++-
+ t/090_exceptions.t      | 3 ++-
+ t/lib/XSP/Plugin.pm     | 2 +-
+ t/lib/XSP/Test.pm       | 4 ++--
+ 21 files changed, 43 insertions(+), 24 deletions(-)
+
+diff --git a/t/010_base.t b/t/010_base.t
+index 893857a..1c36dce 100644
+--- a/t/010_base.t
++++ b/t/010_base.t
+@@ -2,7 +2,8 @@
+ 
+ use strict;
+ use warnings;
+-use t::lib::XSP::Test tests => 14;
++use lib 't/lib';
++use XSP::Test tests => 14;
+ 
+ run_diff xsp_stdout => 'expected';
+ 
+diff --git a/t/011_multiple_files.t b/t/011_multiple_files.t
+index addf386..e4df4a5 100644
+--- a/t/011_multiple_files.t
++++ b/t/011_multiple_files.t
+@@ -2,7 +2,8 @@
+ 
+ use strict;
+ use warnings;
+-use t::lib::XSP::Test tests => 3;
++use lib 't/lib';
++use XSP::Test tests => 3;
+ 
+ run_diff process => 'expected';
+ 
+diff --git a/t/012_preprocessor.t b/t/012_preprocessor.t
+index 44e41a7..9a73626 100644
+--- a/t/012_preprocessor.t
++++ b/t/012_preprocessor.t
+@@ -2,7 +2,8 @@
+ 
+ use strict;
+ use warnings;
+-use t::lib::XSP::Test tests => 6;
++use lib 't/lib';
++use XSP::Test tests => 6;
+ 
+ # monkeypatch print methods to test conditionals are parsed correctly
+ no warnings 'redefine';
+diff --git a/t/013_typemap_output.t b/t/013_typemap_output.t
+index 6ed48bb..fb38f4a 100644
+--- a/t/013_typemap_output.t
++++ b/t/013_typemap_output.t
+@@ -2,7 +2,8 @@
+ 
+ use strict;
+ use warnings;
+-use t::lib::XSP::Test tests => 5;
++use lib 't/lib';
++use XSP::Test tests => 5;
+ 
+ use ExtUtils::XSpp;
+ use ExtUtils::XSpp::Typemap::simple;
+diff --git a/t/015_reference.t b/t/015_reference.t
+index e3ade61..0728c16 100644
+--- a/t/015_reference.t
++++ b/t/015_reference.t
+@@ -2,7 +2,8 @@
+ 
+ use strict;
+ use warnings;
+-use t::lib::XSP::Test tests => 2;
++use lib 't/lib';
++use XSP::Test tests => 2;
+ 
+ run_diff xsp_stdout => 'expected';
+ 
+diff --git a/t/020_rename.t b/t/020_rename.t
+index da55b07..7ecb125 100644
+--- a/t/020_rename.t
++++ b/t/020_rename.t
+@@ -2,7 +2,8 @@
+ 
+ use strict;
+ use warnings;
+-use t::lib::XSP::Test tests => 9;
++use lib 't/lib';
++use XSP::Test tests => 9;
+ 
+ run_diff xsp_stdout => 'expected';
+ 
+diff --git a/t/022_static.t b/t/022_static.t
+index 857ca30..24c13ed 100644
+--- a/t/022_static.t
++++ b/t/022_static.t
+@@ -2,7 +2,8 @@
+ 
+ use strict;
+ use warnings;
+-use t::lib::XSP::Test tests => 1;
++use lib 't/lib';
++use XSP::Test tests => 1;
+ 
+ run_diff xsp_stdout => 'expected';
+ 
+diff --git a/t/022_virtual.t b/t/022_virtual.t
+index b8d3a65..1dfdb3d 100644
+--- a/t/022_virtual.t
++++ b/t/022_virtual.t
+@@ -2,7 +2,8 @@
+ 
+ use strict;
+ use warnings;
+-use t::lib::XSP::Test tests => 3;
++use lib 't/lib';
++use XSP::Test tests => 3;
+ 
+ run_diff xsp_stdout => 'expected';
+ 
+diff --git a/t/023_base_classes.t b/t/023_base_classes.t
+index 52b01be..a25aeb7 100644
+--- a/t/023_base_classes.t
++++ b/t/023_base_classes.t
+@@ -2,7 +2,8 @@
+ 
+ use strict;
+ use warnings;
+-use t::lib::XSP::Test tests => 2;
++use lib 't/lib';
++use XSP::Test tests => 2;
+ 
+ run_diff xsp_stdout => 'expected';
+ 
+diff --git a/t/024_enum.t b/t/024_enum.t
+index 536d661..53c1774 100644
+--- a/t/024_enum.t
++++ b/t/024_enum.t
+@@ -2,7 +2,8 @@
+ 
+ use strict;
+ use warnings;
+-use t::lib::XSP::Test tests => 2;
++use lib 't/lib';
++use XSP::Test tests => 2;
+ 
+ # monkeypatch Enum/EnumValue just to test that they were parsed correctly
+ no warnings 'redefine';
+diff --git a/t/025_member.t b/t/025_member.t
+index c7f4fdc..ba1d8a3 100644
+--- a/t/025_member.t
++++ b/t/025_member.t
+@@ -2,7 +2,8 @@
+ 
+ use strict;
+ use warnings;
+-use t::lib::XSP::Test tests => 4;
++use lib 't/lib';
++use XSP::Test tests => 4;
+ 
+ run_diff xsp_stdout => 'expected';
+ 
+diff --git a/t/030_code_blocks.t b/t/030_code_blocks.t
+index 56cc97e..1f2f873 100644
+--- a/t/030_code_blocks.t
++++ b/t/030_code_blocks.t
+@@ -2,7 +2,8 @@
+ 
+ use strict;
+ use warnings;
+-use t::lib::XSP::Test tests => 6;
++use lib 't/lib';
++use XSP::Test tests => 6;
+ 
+ run_diff xsp_stdout => 'expected';
+ 
+diff --git a/t/031_verbatim_blocks.t b/t/031_verbatim_blocks.t
+index 68b66a7..1f3b6a7 100644
+--- a/t/031_verbatim_blocks.t
++++ b/t/031_verbatim_blocks.t
+@@ -2,7 +2,8 @@
+ 
+ use strict;
+ use warnings;
+-use t::lib::XSP::Test tests => 2;
++use lib 't/lib';
++use XSP::Test tests => 2;
+ 
+ run_diff xsp_stdout => 'expected';
+ 
+diff --git a/t/035_include.t b/t/035_include.t
+index b52a25d..66de3e0 100644
+--- a/t/035_include.t
++++ b/t/035_include.t
+@@ -2,7 +2,8 @@
+ 
+ use strict;
+ use warnings;
+-use t::lib::XSP::Test tests => 1;
++use lib 't/lib';
++use XSP::Test tests => 1;
+ 
+ run_diff xsp_stdout => 'expected';
+ 
+diff --git a/t/040_plugin.t b/t/040_plugin.t
+index dc3d975..680eda1 100644
+--- a/t/040_plugin.t
++++ b/t/040_plugin.t
+@@ -2,7 +2,8 @@
+ 
+ use strict;
+ use warnings;
+-use t::lib::XSP::Test tests => 2;
++use lib 't/lib';
++use XSP::Test tests => 2;
+ 
+ run_diff xsp_stdout => 'expected';
+ 
+@@ -12,8 +13,8 @@ __DATA__
+ --- xsp_stdout
+ %module{Foo};
+ %package{Foo};
+-%loadplugin{t::lib::XSP::Plugin};
+-%loadplugin{t::lib::XSP::Plugin};
++%loadplugin{XSP::Plugin};
++%loadplugin{XSP::Plugin};
+ 
+ int foo(int y);
+ 
+diff --git a/t/043_parser_plugins.t b/t/043_parser_plugins.t
+index 5d2a56e..9c11b1b 100644
+--- a/t/043_parser_plugins.t
++++ b/t/043_parser_plugins.t
+@@ -2,7 +2,8 @@
+ 
+ use strict;
+ use warnings;
+-use t::lib::XSP::Test tests => 4;
++use lib 't/lib';
++use XSP::Test tests => 4;
+ 
+ run_diff xsp_stdout => 'expected';
+ 
+diff --git a/t/075_types.t b/t/075_types.t
+index 7616be2..b31de8d 100644
+--- a/t/075_types.t
++++ b/t/075_types.t
+@@ -2,7 +2,8 @@
+ 
+ use strict;
+ use warnings;
+-use t::lib::XSP::Test tests => 5;
++use lib 't/lib';
++use XSP::Test tests => 5;
+ 
+ run_diff xsp_stdout => 'expected';
+ 
+diff --git a/t/080_complex_typemap.t b/t/080_complex_typemap.t
+index 560f502..5e7c84b 100644
+--- a/t/080_complex_typemap.t
++++ b/t/080_complex_typemap.t
+@@ -2,7 +2,8 @@
+ 
+ use strict;
+ use warnings;
+-use t::lib::XSP::Test tests => 6;
++use lib 't/lib';
++use XSP::Test tests => 6;
+ 
+ run_diff xsp_stdout => 'expected';
+ 
+diff --git a/t/090_exceptions.t b/t/090_exceptions.t
+index 0ad4f94..8043f61 100644
+--- a/t/090_exceptions.t
++++ b/t/090_exceptions.t
+@@ -2,7 +2,8 @@
+ 
+ use strict;
+ use warnings;
+-use t::lib::XSP::Test tests => 9;
++use lib 't/lib';
++use XSP::Test tests => 9;
+ 
+ run_diff xsp_stdout => 'expected';
+ 
+diff --git a/t/lib/XSP/Plugin.pm b/t/lib/XSP/Plugin.pm
+index 8f0cd2a..e4b2212 100644
+--- a/t/lib/XSP/Plugin.pm
++++ b/t/lib/XSP/Plugin.pm
+@@ -1,4 +1,4 @@
+-package t::lib::XSP::Plugin;
++package XSP::Plugin;
+ 
+ use strict;
+ use warnings;
+diff --git a/t/lib/XSP/Test.pm b/t/lib/XSP/Test.pm
+index 4bd7000..1d9f4bb 100644
+--- a/t/lib/XSP/Test.pm
++++ b/t/lib/XSP/Test.pm
+@@ -1,4 +1,4 @@
+-package t::lib::XSP::Test;
++package XSP::Test;
+ 
+ use strict;
+ use warnings;
+@@ -39,7 +39,7 @@ sub run_diff(@) {
+ 
+ use ExtUtils::XSpp;
+ 
+-package t::lib::XSP::Test::Filter;
++package XSP::Test::Filter;
+ 
+ use Test::Base::Filter -base;
+ 
+-- 
+2.14.2
+