gentoo resync : 28.04.2018

5 files changed, 6 insertions, 167 deletions

diff --git a/x11-wm/page/Manifest b/x11-wm/page/Manifest
index 2c9ad43a5103..978b9a668384 100644
--- a/x11-wm/page/Manifest
+++ b/x11-wm/page/Manifest
@@ -1,8 +1,3 @@
-DIST page-1.9.8.tar.gz 993882 BLAKE2B 2ede40d5ce223b7ab775d56cd594b5db69dadfd7d376d2232e6739bb288479913807755a74a209e4705b5d43da84e649b341f83461b449a639639372fc1021f0 SHA512 624493282bb3258bbbaf731d4b6e0fe50741a6dfe80a559feb40112042aeb799b46e820c23d8a1679c4374ceb5be0b63890e2f660f1240b4dd249bb3b8aa61a8
 DIST page-1.9.9-r1.tar.gz 1009216 BLAKE2B 8248705f9e5eceaeea37889a9859249d9eb236f215da804f5edad3c36007179f63f132c161c1e4a6a97df6240f87799242140c97877775ae00f2e86dd7eed69d SHA512 9e7594590b1fdeadcf59d715d30727bee9f640903a34cadd8c0d92b3e94059c183d931a7d8e96763adb74f59a94acb03f7bfbbd4f1f8b57371fe886e6a227012
-DIST page-1.9.9.tar.gz 1007419 BLAKE2B 0f7c59d153bdc85b5f8167ff6a07202b3e294829573fb9427893b33b23b66605691ec664223fbdba1244e3059f5b103c4ea62c67165eeccc161738a839a29ae9 SHA512 4dfd7b04823e13c2a592e3037803022d6e30019ac9390b6da9196e0a250de8e213d2a6a7546cd97c3d77deac4fa70410def2ed2367bb3a21c6f1ddb3df61d5f8
-EBUILD page-1.9.8-r1.ebuild 1280 BLAKE2B 3c3bbaf77bdb427133a4120dd367565746fd6734204be1478b376ec328954f63ec6a4dce542d6b75c0c1941b3507779270cc80ed8d85e2abb89c81ef9deef640 SHA512 7624875a2346240593e1b90b14d098612cb291c110e4576e4563ef81230c5cc3c1bb7be00ab05d1ba433b5d3299d3b1df71950280d936d6e425be7956b2052ac
-EBUILD page-1.9.8.ebuild 1278 BLAKE2B 61a4669bef7e8e627ae4d30ddf975e4ba31fab2e61961be68c26ba9aa9bb175f51f6845e9c1da9b0013321ec7e4e9e51125964d3207dd20e1a244f24674885c0 SHA512 18f901d6d0a07e68da1c36421e7fe9e7c31dcaedf5a36a2f7f70533244c8712c0dc1eb0ccd3a987383afb52bdc1664a40659116f7e33d8ce111bf52683381702
-EBUILD page-1.9.9-r1.ebuild 1464 BLAKE2B 3935a367ecb3635ff0c5d9dc341c43a357e2801c5409cdf8947599784da359bef33a3f15888da12d035fd01d2218825c919562a16068cec69c24b4069707e52d SHA512 335958186d44525a725a1bdf15d25d66b4f392af3db4dcf8d8b98ef0cca82589fde50e93d5bd31466d892aba37c4aae13df9bf73b7f39c97eb502624dc884d89
-EBUILD page-1.9.9.ebuild 1463 BLAKE2B 453a539746b8a2eb138a270282d62ad33b9e97f4c6eec31fd16705fad9ab161e900832695ade2ea83e6e35e40af7a24db05847e632e932803f5941591af0775e SHA512 b55d92be0c9cd3cb910b0e61b6f453a1fe50f846086bbd357400bc37a16f486ff652a90d2202308ee133c86c183e1479344d76f78fdd9a488df90440a4e508a7
+EBUILD page-1.9.9-r2.ebuild 1270 BLAKE2B 03b885dfd99c6a2d4a870d833734d233713f6e769171faa571b80cb6cece9f4c50f3babc6da8e5af3268ff048d79a56c06bfff628fb19e34d94616b4756f0244 SHA512 1019cd373e5066dea32e6f8d42fc6096236eb1813826ac3093a424d9049fc5bb4859774a9e47d59f9679671c28d275f1da8b4d64fa9ebb2e4c1a7a2617de6b66
 MISC metadata.xml 498 BLAKE2B 5b05ebd39950f440c83dc9c2893f52e7d39d9515427aa29d04e6c7b9069787117aff644e795f6ce3e125b84f179d6c073294292f75b77f1af14828659f8bec4b SHA512 145a1353db0d958c3a2198f57c2d3e7e163b723ca794c96ca76a76e385e22233683a55bc62528193ca87444889423f38d4ab4fda833ecc8a51c1c87bc6400fca
diff --git a/x11-wm/page/page-1.9.8-r1.ebuild b/x11-wm/page/page-1.9.8-r1.ebuild
deleted file mode 100644
index e121fb854d10..000000000000
--- a/x11-wm/page/page-1.9.8-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="A mouse friendly tiling window manager"
-HOMEPAGE="http://www.hzog.net/index.php/Main_Page"
-SRC_URI="http://www.hzog.net/pub/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	x11-proto/xcb-proto
-	x11-libs/libxcb
-	x11-libs/xcb-util
-	x11-libs/libXfixes
-	x11-libs/libXdamage
-	x11-proto/damageproto
-	x11-proto/randrproto
-	x11-libs/libXrandr
-	x11-proto/xproto
-	x11-proto/fixesproto
-	x11-proto/compositeproto
-	x11-libs/libXcomposite
-	x11-proto/renderproto
-	x11-libs/libXrender
-	x11-libs/libXext
-	x11-proto/xextproto
-	x11-libs/cairo[X,xcb]
-	x11-libs/pango
-	dev-libs/glib:2"
-
-DEPEND="${RDEPEND}"
-
-src_install() {
-	default
-
-	# Solves file collision with dev-tcltk/tcllib, bug #574074
-	ebegin "Changing references from 'page' to 'pagewm'"
-	mv "${D}"usr/bin/page "${D}"usr/bin/pagewm || die "Could not rename binary!"
-	sed -i -e "s:/usr/bin/page:/usr/bin/pagewm:" "${D}"usr/share/applications/page.desktop || die "Could not change .desktop file!"
-	eend
-}
-
-pkg_postinst() {
-	elog "page can now be launched using \"pagewm\". To find out more about this functionality,"
-	elog "see the following bug report: https://bugs.gentoo.org/574074."
-}
diff --git a/x11-wm/page/page-1.9.8.ebuild b/x11-wm/page/page-1.9.8.ebuild
deleted file mode 100644
index c03cb2442c54..000000000000
--- a/x11-wm/page/page-1.9.8.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="A mouse friendly tiling window manager"
-HOMEPAGE="http://www.hzog.net/index.php/Main_Page"
-SRC_URI="http://www.hzog.net/pub/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	x11-proto/xcb-proto
-	x11-libs/libxcb
-	x11-libs/xcb-util
-	x11-libs/libXfixes
-	x11-libs/libXdamage
-	x11-proto/damageproto
-	x11-proto/randrproto
-	x11-libs/libXrandr
-	x11-proto/xproto
-	x11-proto/fixesproto
-	x11-proto/compositeproto
-	x11-libs/libXcomposite
-	x11-proto/renderproto
-	x11-libs/libXrender
-	x11-libs/libXext
-	x11-proto/xextproto
-	x11-libs/cairo[xcb]
-	x11-libs/pango
-	dev-libs/glib:2"
-
-DEPEND="${RDEPEND}"
-
-src_install() {
-	default
-
-	# Solves file collision with dev-tcltk/tcllib, bug #574074
-	ebegin "Changing references from 'page' to 'pagewm'"
-	mv "${D}"usr/bin/page "${D}"usr/bin/pagewm || die "Could not rename binary!"
-	sed -i -e "s:/usr/bin/page:/usr/bin/pagewm:" "${D}"usr/share/applications/page.desktop || die "Could not change .desktop file!"
-	eend
-}
-
-pkg_postinst() {
-	elog "page can now be launched using \"pagewm\". To find out more about this functionality,"
-	elog "see the following bug report: https://bugs.gentoo.org/574074."
-}
diff --git a/x11-wm/page/page-1.9.9-r1.ebuild b/x11-wm/page/page-1.9.9-r1.ebuild
deleted file mode 100644
index 21d6b712d59c..000000000000
--- a/x11-wm/page/page-1.9.9-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="A mouse friendly tiling window manager"
-HOMEPAGE="http://www.hzog.net/index.php/Main_Page"
-SRC_URI="http://www.hzog.net/pub/${PF}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>=x11-proto/xcb-proto-1.12-r2
-	>=x11-libs/libxcb-1.11[xkb]
-	>=x11-libs/xcb-util-0.4.0
-	>=x11-libs/libXfixes-5.0.3
-	>=x11-libs/libXdamage-1.1.4-r1
-	>=x11-proto/damageproto-1.2.1-r1
-	>=x11-proto/randrproto-1.5.0
-	>=x11-libs/libXrandr-1.5.1
-	>=x11-proto/xproto-7.0.31
-	>=x11-proto/fixesproto-5.0-r1
-	>=x11-proto/compositeproto-0.4.2-r1
-	>=x11-libs/libXcomposite-0.4.4-r1
-	>=x11-proto/renderproto-0.11.1-r1
-	>=x11-libs/libXrender-0.9.10
-	>=x11-libs/libXext-1.3.3
-	>=x11-proto/xextproto-7.3.0
-	>=x11-libs/cairo-1.14.6[X,xcb]
-	>=x11-libs/pango-1.40.5
-	>=dev-libs/glib-2.50.3-r1:2"
-
-DEPEND="${RDEPEND}"
-
-src_install() {
-	default
-
-	# Solves file collision with dev-tcltk/tcllib, bug #574074
-	ebegin "Changing references from 'page' to 'pagewm'"
-	mv "${D}"usr/bin/page "${D}"usr/bin/pagewm || die "Could not rename binary!"
-	sed -i -e "s:/usr/bin/page:/usr/bin/pagewm:" "${D}"usr/share/applications/page.desktop || die "Could not change .desktop file!"
-	eend
-}
-
-pkg_postinst() {
-	elog "page can now be launched using \"pagewm\". To find out more about this functionality,"
-	elog "see the following bug report: https://bugs.gentoo.org/574074."
-}
diff --git a/x11-wm/page/page-1.9.9.ebuild b/x11-wm/page/page-1.9.9-r2.ebuild
index 4bd58b7eb176..a99b66b74284 100644
--- a/x11-wm/page/page-1.9.9.ebuild
+++ b/x11-wm/page/page-1.9.9-r2.ebuild
@@ -1,38 +1,32 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 DESCRIPTION="A mouse friendly tiling window manager"
 HOMEPAGE="http://www.hzog.net/index.php/Main_Page"
-SRC_URI="http://www.hzog.net/pub/${P}.tar.gz"
+SRC_URI="http://www.hzog.net/pub/${PN}-1.9.9-r1.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
 RDEPEND="
-	>=x11-proto/xcb-proto-1.12-r2
 	>=x11-libs/libxcb-1.11[xkb]
 	>=x11-libs/xcb-util-0.4.0
 	>=x11-libs/libXfixes-5.0.3
 	>=x11-libs/libXdamage-1.1.4-r1
-	>=x11-proto/damageproto-1.2.1-r1
-	>=x11-proto/randrproto-1.5.0
 	>=x11-libs/libXrandr-1.5.1
-	>=x11-proto/xproto-7.0.31
-	>=x11-proto/fixesproto-5.0-r1
-	>=x11-proto/compositeproto-0.4.2-r1
 	>=x11-libs/libXcomposite-0.4.4-r1
-	>=x11-proto/renderproto-0.11.1-r1
 	>=x11-libs/libXrender-0.9.10
 	>=x11-libs/libXext-1.3.3
-	>=x11-proto/xextproto-7.3.0
 	>=x11-libs/cairo-1.14.6[X,xcb]
 	>=x11-libs/pango-1.40.5
 	>=dev-libs/glib-2.50.3-r1:2"
 
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+	>=x11-base/xcb-proto-1.12-r2
+	x11-base/xorg-proto"
 
 src_install() {
 	default