gentoo resync : 28.04.2018

4 files changed, 2 insertions, 85 deletions

diff --git a/dev-perl/X11-XCB/Manifest b/dev-perl/X11-XCB/Manifest
index 1ba31d0aec66..4c2f36e0e7d3 100644
--- a/dev-perl/X11-XCB/Manifest
+++ b/dev-perl/X11-XCB/Manifest
@@ -1,6 +1,3 @@
-AUX X11-XCB-0.160.0-526.patch 798 BLAKE2B 7ec134e4668c1c8d7e232845eafd78cb17fe828dd53eef5dd53570e1c0bf33091468c7d9902ed1cbcec13e1ca16e39b5d82821087a10bd3193cffdf2d697d1b2 SHA512 242690f69d7c717d6a8c9928651d1fd08eeea9e20b8e6fb86cfa29dac99a22acf7e50b92ae76285989e51dcf576bb02ad749e3ab2c87f602b1f253e7bbf10808
-DIST X11-XCB-0.16.tar.gz 89791 BLAKE2B 24107c6d9c3340ebe87a5569f4ffb45e892009cd954fb35dd1af93e0388870f76fab79319a618e322a2d3876008978b36b967085a913022e2668ef06eb6b7184 SHA512 08642ffe99b3bb83f68f05157613b895e5abf7f3c17e6bee4b835bde33654208d9bb1c34633163ccae0b9dafbd869c35fd36f3ce46d3220c6ca254f0ccf5926a
 DIST X11-XCB-0.17.tar.gz 90833 BLAKE2B 7de56a99abb27373f0473e4d98c177d3db4f4811bdee358e79a85db26345e59f3dfa0998e10678fce1585ddbf1f58796f75d2adc198ec6d23ae521720b3d93ae SHA512 8a5457afdb3b32fd6d425a27dee1a6afbbded222cf71a9d7201ed2c0db0b0b7c803ae3e69a897c510b9b07b79e880efe0cf062ea025d2d3ff7ee16d364c568bc
-EBUILD X11-XCB-0.160.0.ebuild 977 BLAKE2B c0446cf2e4ce405a929900779efe310bcce25514483c3efb36a70261a1eb661a1bf459743d6c7fef3ba4a4ca2bc7ee7f12bbb6d6cf1bf44bca95e5744529329a SHA512 6848432c755fde991f78ec47296868fc673add53aacce0c91c85e259a5841885bae7bafbc5ce39cde583941c259753f02b5e317d5e368e45e5cbd5f1719d1734
-EBUILD X11-XCB-0.170.0.ebuild 936 BLAKE2B c3d2748713a52a09681c5d4bfcc27e9c32a7f5c937710d972fa13e6370a0ef39bf6cc2cca777a3e28f66ae54f57b1b983d50eda219d08443e4cbb2c09dfa14f9 SHA512 e8092dafebf65a54fa3170773ea8eca169c051892e21640c1eb8a0389c49680bb47047e86c5474fe1b9889105a6bda6ddf157603e20d3b31c8149b123655d126
+EBUILD X11-XCB-0.170.0-r1.ebuild 935 BLAKE2B 70d7dcf4e35fbb590aae1b3de62c120def846afe7cb3ece50693dbf0332994d53327c95db0fe8eefd106ea1c496200e8a4cca3dd1d5f4d0bafb45f4e1d149edb SHA512 654bc78c21c329c28eb6bf4d12e9dcfcd8c1229fe0d59d95ad4381b8bf1955e9b4931755530487657912e8732f1fa2962f2119b7f95113b9e64731e5e88c3c57
 MISC metadata.xml 1271 BLAKE2B 0ee20f9f998f19334c078ffdb26e9ec0cb8d7cb14ef8dfa9d7cb0aded10f89655048af8ab91d11079249b73d84e532d590202af181645df1df71b79b56d098fe SHA512 279d8c3522207df5f1fb7ab6188e8f8848bd18c25e127d1f59765ddb5a6b0fcb89e949ccb703513c592c781396f893befe7a46f9083e4c94640c3cd112da29c2
diff --git a/dev-perl/X11-XCB/X11-XCB-0.160.0.ebuild b/dev-perl/X11-XCB/X11-XCB-0.160.0.ebuild
deleted file mode 100644
index 215dfcde73f8..000000000000
--- a/dev-perl/X11-XCB/X11-XCB-0.160.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=MSTPLBG
-DIST_VERSION=0.16
-inherit perl-module virtualx
-
-DESCRIPTION="Perl bindings for libxcb"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND="
-	dev-perl/Data-Dump
-	dev-perl/Mouse
-	dev-perl/MouseX-NativeTraits
-	dev-perl/Try-Tiny
-	dev-perl/XML-Descent
-	dev-perl/XML-Simple
-	>=virtual/perl-XSLoader-0.20.0
-	x11-proto/xcb-proto
-	>=x11-libs/libxcb-1.2
-	x11-libs/xcb-util
-	x11-libs/xcb-util-wm
-"
-DEPEND="${RDEPEND}
-	>=virtual/perl-Devel-PPPort-3.190.0
-	dev-perl/ExtUtils-Depends
-	>=virtual/perl-ExtUtils-MakeMaker-6.590.0
-	>=virtual/perl-ExtUtils-ParseXS-3.180.0
-	dev-perl/ExtUtils-PkgConfig
-	dev-perl/XS-Object-Magic
-	test? (
-		dev-perl/Test-Deep
-		dev-perl/Test-Exception
-		virtual/perl-Test-Simple
-	)
-"
-PATCHES=( "${FILESDIR}/${P}-526.patch" )
-src_compile() {
-	MAKEOPTS="-j1" perl-module_src_compile
-}
-src_test() {
-	virtx perl-module_src_test
-}
diff --git a/dev-perl/X11-XCB/X11-XCB-0.170.0.ebuild b/dev-perl/X11-XCB/X11-XCB-0.170.0-r1.ebuild
index dc970e896d51..7f439ecb1b9b 100644
--- a/dev-perl/X11-XCB/X11-XCB-0.170.0.ebuild
+++ b/dev-perl/X11-XCB/X11-XCB-0.170.0-r1.ebuild
@@ -20,12 +20,12 @@ RDEPEND="
 	dev-perl/XML-Descent
 	dev-perl/XML-Simple
 	>=virtual/perl-XSLoader-0.20.0
-	x11-proto/xcb-proto
 	>=x11-libs/libxcb-1.2
 	x11-libs/xcb-util
 	x11-libs/xcb-util-wm
 "
 DEPEND="${RDEPEND}
+	x11-base/xcb-proto
 	>=virtual/perl-Devel-PPPort-3.190.0
 	dev-perl/ExtUtils-Depends
 	>=virtual/perl-ExtUtils-MakeMaker-6.590.0
diff --git a/dev-perl/X11-XCB/files/X11-XCB-0.160.0-526.patch b/dev-perl/X11-XCB/files/X11-XCB-0.160.0-526.patch
deleted file mode 100644
index 875041b10412..000000000000
--- a/dev-perl/X11-XCB/files/X11-XCB-0.160.0-526.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From e84699188ca845d39c6d5a7037a8a4d1620bb348 Mon Sep 17 00:00:00 2001
-From: Kent Fredric <kentfredric@gmail.com>
-Date: Thu, 14 Sep 2017 15:29:34 +1200
-Subject: Fix for 5.26 .-in-@INC issues
-
----
- Makefile.PL | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/Makefile.PL b/Makefile.PL
-index 91a3da6..9ed7403 100644
---- a/Makefile.PL
-+++ b/Makefile.PL
-@@ -33,6 +33,7 @@ __
-            != grep { $ok{$_} = eval "require $_; 1" } @configure_req;
- }
- 
-+BEGIN { unshift @INC, '.'; }
- use inc::Module::Install;
- 
- name 'X11-XCB';
-@@ -81,7 +82,7 @@ WriteMakefile(
- 
- postamble <<'END_OF_MAKEFILE';
- XCB_xs.inc:
--	$(PERL) -M_GenerateMyXS -E '_GenerateMyXS::generate()'
-+	$(PERL) -I. -M_GenerateMyXS -E '_GenerateMyXS::generate()'
- 
- XCB.c: XCB_xs.inc XCB_util.inc XCB.inc
- 
--- 
-2.14.1
-