gentoo resync : 22.05.2018

3 files changed, 5 insertions, 25 deletions

diff --git a/x11-libs/libXres/Manifest b/x11-libs/libXres/Manifest
index 4b88dc4b4b9c..2bc985e0a054 100644
--- a/x11-libs/libXres/Manifest
+++ b/x11-libs/libXres/Manifest
@@ -1,5 +1,3 @@
-DIST libXres-1.0.7.tar.bz2 282925 BLAKE2B fe453dfdddba0a07ed2bc086782e8e714d148adcc0316c35329cc1538fd1be53c286ed1aae136095e5b6f2fc57a0b74c06eb49a74375d6444bcbba96e16ab7e5 SHA512 796a79ab694317910442cb10a936711df9dde95764eef11efb8dedc85114977e56409de2f640553f1ad492325df178b8cfbeaeec3f03bf084638c555e44292e0
 DIST libXres-1.2.0.tar.bz2 286635 BLAKE2B 0c0813118c7ecd5851b075a4001e0e34fa3df92bd8367717eee42ec20352cab3443d232715c1d40c5df313f6508d2dddc779980d11744a1f897cc7511bfdfdf4 SHA512 8eb5a36b1f030eb4e27e676cc4befcc073da66a7bce2b39089314e1facb629d13b087bb53ca2c95fe5291857da7ff9f80c6ab28fb3e245eeb9e0344937900172
-EBUILD libXres-1.0.7.ebuild 546 BLAKE2B 87f33f90cfb623d0fe605520684093e946c60c27c1be5ef59759b8b1a4c05a16165a4771dc4b4c409dadebb74d7101d41cb71036dca124ed06613160d93cb487 SHA512 5d2df1ef0e9dd10f057a4481c85edb007e940cbd3a63738ccbe2d9795a1fc3b1092767a814bccf25bfbdc6c08793c72a14ca78f226db5c0e31edc682111db489
-EBUILD libXres-1.2.0.ebuild 547 BLAKE2B ba64d7fa05e7edb166882bbe32a7133fdaf5e40131c09fdcb3279dcaf56b6dee05a7715fddba9daa2c2d36f2bcf3baeb4bb0741caa3e40dd05555933b3358eec SHA512 2a04ab27823d6416aec900fe2ce26c9a3470bdbc5068304831bccc8d42c4615601d89467d77ae0417b8298a4d91a90b0ace4486bebd2aa19189c42cb3437c24a
+EBUILD libXres-1.2.0-r1.ebuild 521 BLAKE2B 836e1877bfb9b770a019bd048a77fd074d6486fab726d663aea4114f1dbb70940a5d6ea4ff0c35d6ff2bfd2b322d89b6b61ab483de2a546d7422d8c6f2d22e80 SHA512 d31f45c4030c9a419196f1bef21490d4a3f1f6d6f9c015b0fb115011cc557baa348628449e0ef77f7dbd1351376ebc9c98c1625dad5e7da6b0890c1c38a79630
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXres/libXres-1.0.7.ebuild b/x11-libs/libXres/libXres-1.2.0-r1.ebuild
index 0247056ddcb0..e413b50c8dbb 100644
--- a/x11-libs/libXres/libXres-1.0.7.ebuild
+++ b/x11-libs/libXres/libXres-1.2.0-r1.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
@@ -10,8 +10,7 @@ DESCRIPTION="X.Org XRes library"
 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 ~x86-solaris"
 IUSE=""
 
-RDEPEND="x11-libs/libX11
-	x11-libs/libXext
-	x11-proto/xextproto
-	x11-proto/resourceproto"
+RDEPEND="x11-base/xorg-proto
+	x11-libs/libX11
+	x11-libs/libXext"
 DEPEND="${RDEPEND}"
diff --git a/x11-libs/libXres/libXres-1.2.0.ebuild b/x11-libs/libXres/libXres-1.2.0.ebuild
deleted file mode 100644
index effb120a95e8..000000000000
--- a/x11-libs/libXres/libXres-1.2.0.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit xorg-2
-
-EGIT_REPO_URI="https://anongit.freedesktop.org/git/xorg/lib/libXRes.git"
-DESCRIPTION="X.Org XRes library"
-
-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 ~x86-solaris"
-IUSE=""
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXext
-	x11-proto/xextproto
-	x11-proto/resourceproto"
-DEPEND="${RDEPEND}"