gentoo resync : 22.05.2018

8 files changed, 20 insertions, 34 deletions

diff --git a/x11-wm/muffin/Manifest b/x11-wm/muffin/Manifest
index b521d971b657..faf3339d57ad 100644
--- a/x11-wm/muffin/Manifest
+++ b/x11-wm/muffin/Manifest
@@ -4,11 +4,11 @@ DIST muffin-3.2.0.tar.gz 2718913 BLAKE2B c77ee145b53a5362f853777582dbbcdbd849c24
 DIST muffin-3.4.0.tar.gz 2719701 BLAKE2B 245154f95c92789b2195be5d4b498314cbd2c4a8e34bf1522251a4f259705688c826145e38ec55cba30d2b0ea00d5d8f3653912eb7e957f4c78ff86bfe14acef SHA512 27c800dbd433f5eac19aa7db51994311acad347630f1f8b86f71846723f1b7d89929a1c900e6f8766b86ab078ed6b766554fe65dc12d81a61925e0396095e51d
 DIST muffin-3.4.1.tar.gz 2720297 BLAKE2B 94b628bccd6542aa46d950fe6b2818baa8c429f7f116378267b38f302b99b9ff589eb7d95e303ca30f37d5d4a5c3af8d4a50d819a06db3584366892b819e81a3 SHA512 896dcb9c51d4aee28dcf16fbf721c1b3f581bc2a0f5344eb360655339e78f34ee89120c7a9b4ee3ffe55243c7c300f20140b76bfff52a7a9a9f292de33b9488c
 DIST muffin-3.6.0.tar.gz 2720809 BLAKE2B 9d1b92907d545990b409c15f9e9e3bf7b3871cc545d02234296efcb15f0082fc630c3a06849789c5e5aed4af9253e6893cc29feb7590aaaaaf2eb38843591c8d SHA512 d077f1310d7600754c9b4f77fc2a82377aec43f9a1cc0b95e28118764741922a58f2348418bee309d8c7fd1484b97ddc898d0105fa1a3fcd855d2fcc68f3679e
-EBUILD muffin-2.8.5.ebuild 2113 BLAKE2B 73cf05267d58cc0568cde5da90913dcfcbd88e0b0aaa6029f19e5fa0609755ccf2ac7467b624b0c7e95471f368ceac03261e9a618bc017d538c9ce0d781ad374 SHA512 572c9c02850d30fe088ff832a1a92df2ad422d250a6739e94d0240668e1669ad8f677ac55409b4d136bca6f8d6f5591b232096dab2bf09378e56c3ccd5c30f2c
-EBUILD muffin-3.0.5.ebuild 2070 BLAKE2B be1df268e344dc8ae35e29c18bcce44fbdae2be99382525467be1dd708ba76ca0b1651079519b3bc2163c1195f4741cede47d57773b1c939042dc9cac2ed17d0 SHA512 f3596e96d56b7b7577bc5c368c792322260221951fd5fb2eac71689d1d4cc54dc8ddc0b2990a41d5d7a5aafd6ff293c01fcc36f026853a2d2161fb4ee172ccd7
-EBUILD muffin-3.2.0-r1.ebuild 2074 BLAKE2B b644ff89d1eebda22769e29839749831f975dcaeccd65addab2ac73c46379ee751ea04c01bc4a203bfc4f2bddd9096d6a8facfcf9086f54636fccb39ac472dab SHA512 4093e47d2a93ce7c0e70748b26145b1daf990f39e8558b8d3a8672c66f5cf2f04e19b0a8681495021d05857dd688e2842cb5288d3a68bc6d34af5109a5065bd9
-EBUILD muffin-3.2.0.ebuild 2072 BLAKE2B f297b24912e563e831e94406f4afda05751273dd3b422d309682f7b935a63c1fd3bb430dc349fdfdfc54d95b85ca39fc16f42df00db8d9f2398399afb7418365 SHA512 85a1a978cef004b7874c9febecb7ed7723a4c68241fcc2b573b7e0527fd8f78092da3ae21c1f7f91c976a0ea90c1f75fb71e73475bbf29bfde4e2909e65494ac
-EBUILD muffin-3.4.0.ebuild 2074 BLAKE2B b644ff89d1eebda22769e29839749831f975dcaeccd65addab2ac73c46379ee751ea04c01bc4a203bfc4f2bddd9096d6a8facfcf9086f54636fccb39ac472dab SHA512 4093e47d2a93ce7c0e70748b26145b1daf990f39e8558b8d3a8672c66f5cf2f04e19b0a8681495021d05857dd688e2842cb5288d3a68bc6d34af5109a5065bd9
-EBUILD muffin-3.4.1.ebuild 2074 BLAKE2B b644ff89d1eebda22769e29839749831f975dcaeccd65addab2ac73c46379ee751ea04c01bc4a203bfc4f2bddd9096d6a8facfcf9086f54636fccb39ac472dab SHA512 4093e47d2a93ce7c0e70748b26145b1daf990f39e8558b8d3a8672c66f5cf2f04e19b0a8681495021d05857dd688e2842cb5288d3a68bc6d34af5109a5065bd9
-EBUILD muffin-3.6.0.ebuild 2072 BLAKE2B 1cdc618503123feec486e43853c48cd85caf57ca7a40250b0a435c760e88d51287cc3fb9f7ce9d963579183a6bddd21f5ca33114145aec5002419e10a7be703a SHA512 04a92d3c7314ffbce7170819a1e01972f56fcb8319c7a142b1db447c2b022fbce69713ff3a1f41cf79da3f46fdcc4c6073f8da3eb86178bb8d0bfe198f0df624
+EBUILD muffin-2.8.5.ebuild 2056 BLAKE2B bfb7be5032d41266fb45c8d21dd9b6d0ef8d8edfaf371f33492710824e399e8ca1cf0cf4c74c7a77eebf5e8799df62bb1c6212f92b068e229a9b83a4039949a0 SHA512 b72de64ab390367c6977eb8e899b92db9bfa29392239f1a7151998d244f40798a2a161b1c2e5b5921a58f509223e09b9747ec76a38d8f05902d656122508f96d
+EBUILD muffin-3.0.5.ebuild 2013 BLAKE2B 6545978d6ed60c71e2d6a6466c4b727b28a1ad701b567b3884bc01b32b1fb0775cee5709cc02cf28004860fd59004a30584e6668c39ecff2cfdde3ccb8d58de9 SHA512 1a349ec0c3985ad36d866a2f5754b49506b7c105cfcbbc15a20c5c309f89c24e645c3f52cfb399df9e0ff6e3eedd56cce374650cf787905c65db93289faa8370
+EBUILD muffin-3.2.0-r1.ebuild 2017 BLAKE2B 747a1089dabd01eabc88e1d3aac8c7c458b55873011773da9ad0c85a7d18523532be188c52c1bc162f32442794cd129e1a07c0ce8dca812bb0bffa728e8c2b56 SHA512 d19b4c928844be00ad61cc8a41fc0c76847a895b08ad6bbfe51da256c38757041ffdbc1915b8e3fcec381e9e737f84d2217eff44a68276713b38145ae3b811ac
+EBUILD muffin-3.2.0.ebuild 2015 BLAKE2B 757ac4f0c132db1b9763d075b65ea64fb696b50e8522ae499f753e8ca634efaa2deb42a01d48fd4181fe0b4fd13fa1bff2c33f168ab65b099fcb1ff63daab4ea SHA512 9b48be96b243c2cb2adefa6fbd0a611ab4e5ed77845ae9255d1aa707b4f33f53a656f8db878ec97b0b5fd4fcac282a79ec92aaeefcc477d93e3b928c0ed714f3
+EBUILD muffin-3.4.0.ebuild 2017 BLAKE2B 747a1089dabd01eabc88e1d3aac8c7c458b55873011773da9ad0c85a7d18523532be188c52c1bc162f32442794cd129e1a07c0ce8dca812bb0bffa728e8c2b56 SHA512 d19b4c928844be00ad61cc8a41fc0c76847a895b08ad6bbfe51da256c38757041ffdbc1915b8e3fcec381e9e737f84d2217eff44a68276713b38145ae3b811ac
+EBUILD muffin-3.4.1.ebuild 2017 BLAKE2B 747a1089dabd01eabc88e1d3aac8c7c458b55873011773da9ad0c85a7d18523532be188c52c1bc162f32442794cd129e1a07c0ce8dca812bb0bffa728e8c2b56 SHA512 d19b4c928844be00ad61cc8a41fc0c76847a895b08ad6bbfe51da256c38757041ffdbc1915b8e3fcec381e9e737f84d2217eff44a68276713b38145ae3b811ac
+EBUILD muffin-3.6.0.ebuild 2015 BLAKE2B a1e42826b62c46bd57de0f2a849525f9cc9eaa162279188a893f3108d33ca9e5a028a8fc1c6c5b7391d444d266773880f5bb6ed0e680609f4c3a387e40e10a6a SHA512 86c08741e7787f220d94900a34f5fe9db2a8b09d9caadfef96b76ba5051f5eb20409d38f1a7a0111c8791664dcad07046ef88cbe53557b199e41b8cd90c43341
 MISC metadata.xml 333 BLAKE2B d29a873cc8702d8251ff425eca5ec16b4ea2a75f4e512c05513c3a6a61e38e0fde4450158503cdb2e71b324c86a7e66e03c1eecba8bff6a6be81244f040ceaad SHA512 42c7d8e82dd95e76e6b72973d53a0a27de2562108b5989092c34804140d336dcb20b331a4c70b1fcf6730ef5f377f366f480271597c63f7ce3e8f7aa8d359555
diff --git a/x11-wm/muffin/muffin-2.8.5.ebuild b/x11-wm/muffin/muffin-2.8.5.ebuild
index ec923203378d..c8ed0ba12a9b 100644
--- a/x11-wm/muffin/muffin-2.8.5.ebuild
+++ b/x11-wm/muffin/muffin-2.8.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -55,10 +55,8 @@ DEPEND="${COMMON_DEPEND}
 	dev-util/gtk-doc-am
 	>=dev-util/intltool-0.35
 	virtual/pkgconfig
+	x11-base/xorg-proto
 	test? ( app-text/docbook-xml-dtd:4.5 )
-	xinerama? ( x11-proto/xineramaproto )
-	x11-proto/xextproto
-	x11-proto/xproto
 "
 RDEPEND="${COMMON_DEPEND}
 	!x11-misc/expocity
diff --git a/x11-wm/muffin/muffin-3.0.5.ebuild b/x11-wm/muffin/muffin-3.0.5.ebuild
index 67813feeeb3b..489e8ebb0541 100644
--- a/x11-wm/muffin/muffin-3.0.5.ebuild
+++ b/x11-wm/muffin/muffin-3.0.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -53,10 +53,8 @@ DEPEND="${COMMON_DEPEND}
 	dev-util/gtk-doc-am
 	>=dev-util/intltool-0.35
 	virtual/pkgconfig
+	x11-base/xorg-proto
 	test? ( app-text/docbook-xml-dtd:4.5 )
-	xinerama? ( x11-proto/xineramaproto )
-	x11-proto/xextproto
-	x11-proto/xproto
 "
 RDEPEND="${COMMON_DEPEND}
 	!x11-misc/expocity
diff --git a/x11-wm/muffin/muffin-3.2.0-r1.ebuild b/x11-wm/muffin/muffin-3.2.0-r1.ebuild
index 54cfd8ecf95d..691da9e9652a 100644
--- a/x11-wm/muffin/muffin-3.2.0-r1.ebuild
+++ b/x11-wm/muffin/muffin-3.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=6
@@ -53,10 +53,8 @@ DEPEND="${COMMON_DEPEND}
 	dev-util/gtk-doc-am
 	>=dev-util/intltool-0.35
 	virtual/pkgconfig
+	x11-base/xorg-proto
 	test? ( app-text/docbook-xml-dtd:4.5 )
-	xinerama? ( x11-proto/xineramaproto )
-	x11-proto/xextproto
-	x11-proto/xproto
 "
 RDEPEND="${COMMON_DEPEND}
 	!x11-misc/expocity
diff --git a/x11-wm/muffin/muffin-3.2.0.ebuild b/x11-wm/muffin/muffin-3.2.0.ebuild
index afdf5b916e46..4f0194061da0 100644
--- a/x11-wm/muffin/muffin-3.2.0.ebuild
+++ b/x11-wm/muffin/muffin-3.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -53,10 +53,8 @@ DEPEND="${COMMON_DEPEND}
 	dev-util/gtk-doc-am
 	>=dev-util/intltool-0.35
 	virtual/pkgconfig
+	x11-base/xorg-proto
 	test? ( app-text/docbook-xml-dtd:4.5 )
-	xinerama? ( x11-proto/xineramaproto )
-	x11-proto/xextproto
-	x11-proto/xproto
 "
 RDEPEND="${COMMON_DEPEND}
 	!x11-misc/expocity
diff --git a/x11-wm/muffin/muffin-3.4.0.ebuild b/x11-wm/muffin/muffin-3.4.0.ebuild
index 54cfd8ecf95d..691da9e9652a 100644
--- a/x11-wm/muffin/muffin-3.4.0.ebuild
+++ b/x11-wm/muffin/muffin-3.4.0.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=6
@@ -53,10 +53,8 @@ DEPEND="${COMMON_DEPEND}
 	dev-util/gtk-doc-am
 	>=dev-util/intltool-0.35
 	virtual/pkgconfig
+	x11-base/xorg-proto
 	test? ( app-text/docbook-xml-dtd:4.5 )
-	xinerama? ( x11-proto/xineramaproto )
-	x11-proto/xextproto
-	x11-proto/xproto
 "
 RDEPEND="${COMMON_DEPEND}
 	!x11-misc/expocity
diff --git a/x11-wm/muffin/muffin-3.4.1.ebuild b/x11-wm/muffin/muffin-3.4.1.ebuild
index 54cfd8ecf95d..691da9e9652a 100644
--- a/x11-wm/muffin/muffin-3.4.1.ebuild
+++ b/x11-wm/muffin/muffin-3.4.1.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=6
@@ -53,10 +53,8 @@ DEPEND="${COMMON_DEPEND}
 	dev-util/gtk-doc-am
 	>=dev-util/intltool-0.35
 	virtual/pkgconfig
+	x11-base/xorg-proto
 	test? ( app-text/docbook-xml-dtd:4.5 )
-	xinerama? ( x11-proto/xineramaproto )
-	x11-proto/xextproto
-	x11-proto/xproto
 "
 RDEPEND="${COMMON_DEPEND}
 	!x11-misc/expocity
diff --git a/x11-wm/muffin/muffin-3.6.0.ebuild b/x11-wm/muffin/muffin-3.6.0.ebuild
index 843e993737d2..5b0e9e55033a 100644
--- a/x11-wm/muffin/muffin-3.6.0.ebuild
+++ b/x11-wm/muffin/muffin-3.6.0.ebuild
@@ -53,10 +53,8 @@ DEPEND="${COMMON_DEPEND}
 	dev-util/gtk-doc-am
 	>=dev-util/intltool-0.35
 	virtual/pkgconfig
+	x11-base/xorg-proto
 	test? ( app-text/docbook-xml-dtd:4.5 )
-	xinerama? ( x11-proto/xineramaproto )
-	x11-proto/xextproto
-	x11-proto/xproto
 "
 RDEPEND="${COMMON_DEPEND}
 	!x11-misc/expocity