gentoo resync : 28.04.2018

4 files changed, 5 insertions, 81 deletions

diff --git a/x11-libs/xcb-util-cursor/Manifest b/x11-libs/xcb-util-cursor/Manifest
index f87e99ce0167..664920a9a189 100644
--- a/x11-libs/xcb-util-cursor/Manifest
+++ b/x11-libs/xcb-util-cursor/Manifest
@@ -1,7 +1,3 @@
-DIST xcb-util-cursor-0.1.1.tar.bz2 280852 BLAKE2B ab5229e22ccec6e1fbc25e21fd8f3a65a518bc156b0d0c53482a61344f0b8ec7988ce3de46f54b6d8ddb934dcf5efb8031bcb51865b4671e3b36f0b870c286e9 SHA512 599f9074a9801615a29374a96649c2d9d8de8abd053b7ddb245b7cc50a1c9c94610a8df996a7a79a831ade3d903335fdf7ac299e6b33e735ab087c3fe5923d71
-DIST xcb-util-cursor-0.1.2.tar.bz2 289714 BLAKE2B 5439eeac2a80c1d6551eff7662d9262c3341cecd043f6710aee8fb17199067f067e614ffd50e06fed0a626f20ed320cd9c2ec6440bb78dd6eff2211b954cbed1 SHA512 13b9dc0e9f8a61fc72ef6ec722d574ba46c5eacdaf0785d301a3cca00de00b772b6b7fa0b6484f54b4ee19d384a46b3bbf29935bf15ffdde23b004567fc4a85e
 DIST xcb-util-cursor-0.1.3.tar.bz2 295224 BLAKE2B 7a1a89c0f326f4ac0768110c4aa5a7818ddace1f231f6a0dcfacaf8b157a2d6aae53f5278a02cb945822d83eccb8a01ebb14ab98e8828d8f1d506e42f51431ba SHA512 be5eee7b268b18f356d6aae04820a7e1c51397dac9020d876df379e833200255b5194269541c245a9b4ac286edad4cfe44dae8e4fcfd16a4726dd7553c104c21
-EBUILD xcb-util-cursor-0.1.1-r1.ebuild 1088 BLAKE2B 0d203a0c222fa9cac1f3b4cf8b97fe823e12e918fbb243c41bbc20004673cc4fce13058c6d7edfac4b3ca857077afbaa09d3ee5a36edcec6cd6126142b3a95a9 SHA512 beac2bb4689f27ca869a685748585ebc6ca798d8d2d4d417e99589ddd6a622390ad63ac1811135613d894ceaf26e2283e3212c187516bb690cd02e9f9576e11c
-EBUILD xcb-util-cursor-0.1.2.ebuild 1088 BLAKE2B 0d203a0c222fa9cac1f3b4cf8b97fe823e12e918fbb243c41bbc20004673cc4fce13058c6d7edfac4b3ca857077afbaa09d3ee5a36edcec6cd6126142b3a95a9 SHA512 beac2bb4689f27ca869a685748585ebc6ca798d8d2d4d417e99589ddd6a622390ad63ac1811135613d894ceaf26e2283e3212c187516bb690cd02e9f9576e11c
-EBUILD xcb-util-cursor-0.1.3-r1.ebuild 1348 BLAKE2B 09dcfcec7850d8fe99f27b0c3f20aa34103e73ea47e4b39ae1c8cde24d01309fa2250467423e7d2b328423308e92097e84caecd39743980ed3fadad125fb9014 SHA512 16a786751e5a67c6ecd9541c4c8766cb4f96eb495ded24e3f5fea58c62b202c94d1108c58dd9cb1a85fb9aef92e2e164d3533ef6c8d1e28d6cf1829e9157b7f9
+EBUILD xcb-util-cursor-0.1.3-r2.ebuild 1319 BLAKE2B d2bf6f579a5e058ac15ea6ce2947e9fdb46c135e4d80879c0d8d2ad9921ebdb1ee01c3952eae1afa4eee35ab2e48a85d008b2802a64fb261153abde05de4ab3d SHA512 bf4865a70b8a5da98bfa60ebbc99e7da4ffe156462bf6b2f11b526388289c2c4245bae0010e350e0501e54706499b296ef2f258db35ddefdf245ec63dde9fc29
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/xcb-util-cursor/xcb-util-cursor-0.1.1-r1.ebuild b/x11-libs/xcb-util-cursor/xcb-util-cursor-0.1.1-r1.ebuild
deleted file mode 100644
index 0b93b5f3d406..000000000000
--- a/x11-libs/xcb-util-cursor/xcb-util-cursor-0.1.1-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-XORG_MODULE=/
-XORG_BASE_INDIVIDUAL_URI=https://xcb.freedesktop.org/dist
-XORG_DOC=doc
-XORG_MULTILIB=yes
-inherit xorg-2
-
-EGIT_REPO_URI="https://anongit.freedesktop.org/git/xcb/util-cursor.git"
-EGIT_HAS_SUBMODULES=yes
-
-DESCRIPTION="X C-language Bindings sample implementations"
-HOMEPAGE="https://xcb.freedesktop.org/"
-
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
-IUSE="test"
-
-RDEPEND=">=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}]
-	>=x11-libs/xcb-util-image-0.3.9-r1[${MULTILIB_USEDEP}]
-	>=x11-libs/xcb-util-renderutil-0.3.9[${MULTILIB_USEDEP}]
-	>=x11-proto/xcb-proto-1.8-r3:=[${MULTILIB_USEDEP}]
-	>=x11-proto/xproto-7.0.24:=[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
-	>=dev-util/gperf-3.0.1
-	test? ( >=dev-libs/check-0.9.11[${MULTILIB_USEDEP}] )"
-
-src_configure() {
-	XORG_CONFIGURE_OPTIONS=(
-		$(use_with doc doxygen)
-	)
-
-	xorg-2_src_configure
-}
diff --git a/x11-libs/xcb-util-cursor/xcb-util-cursor-0.1.2.ebuild b/x11-libs/xcb-util-cursor/xcb-util-cursor-0.1.2.ebuild
deleted file mode 100644
index 0b93b5f3d406..000000000000
--- a/x11-libs/xcb-util-cursor/xcb-util-cursor-0.1.2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-XORG_MODULE=/
-XORG_BASE_INDIVIDUAL_URI=https://xcb.freedesktop.org/dist
-XORG_DOC=doc
-XORG_MULTILIB=yes
-inherit xorg-2
-
-EGIT_REPO_URI="https://anongit.freedesktop.org/git/xcb/util-cursor.git"
-EGIT_HAS_SUBMODULES=yes
-
-DESCRIPTION="X C-language Bindings sample implementations"
-HOMEPAGE="https://xcb.freedesktop.org/"
-
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
-IUSE="test"
-
-RDEPEND=">=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}]
-	>=x11-libs/xcb-util-image-0.3.9-r1[${MULTILIB_USEDEP}]
-	>=x11-libs/xcb-util-renderutil-0.3.9[${MULTILIB_USEDEP}]
-	>=x11-proto/xcb-proto-1.8-r3:=[${MULTILIB_USEDEP}]
-	>=x11-proto/xproto-7.0.24:=[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
-	>=dev-util/gperf-3.0.1
-	test? ( >=dev-libs/check-0.9.11[${MULTILIB_USEDEP}] )"
-
-src_configure() {
-	XORG_CONFIGURE_OPTIONS=(
-		$(use_with doc doxygen)
-	)
-
-	xorg-2_src_configure
-}
diff --git a/x11-libs/xcb-util-cursor/xcb-util-cursor-0.1.3-r1.ebuild b/x11-libs/xcb-util-cursor/xcb-util-cursor-0.1.3-r2.ebuild
index 1729b1717639..1b44dc87488b 100644
--- a/x11-libs/xcb-util-cursor/xcb-util-cursor-0.1.3-r1.ebuild
+++ b/x11-libs/xcb-util-cursor/xcb-util-cursor-0.1.3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -20,10 +20,10 @@ IUSE="test"
 
 RDEPEND=">=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}]
 	>=x11-libs/xcb-util-image-0.3.9-r1[${MULTILIB_USEDEP}]
-	>=x11-libs/xcb-util-renderutil-0.3.9[${MULTILIB_USEDEP}]
-	>=x11-proto/xcb-proto-1.8-r3:=[${MULTILIB_USEDEP}]
-	>=x11-proto/xproto-7.0.24:=[${MULTILIB_USEDEP}]"
+	>=x11-libs/xcb-util-renderutil-0.3.9[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}
+	>=x11-base/xcb-proto-1.8-r3:=[${MULTILIB_USEDEP}]
+	x11-base/xorg-proto
 	>=dev-util/gperf-3.0.1
 	test? ( >=dev-libs/check-0.9.11[${MULTILIB_USEDEP}] )"