gentoo resync : 24.12.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-12-24 14:11:38 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2018-12-24 14:11:38 +0000
commit: de49812990871e1705b64051c35161d5e6400269 (patch)
tree: 5e1e8fcb0ff4579dbd22a1bfee28a6b97dc8aaeb /x11-wm
parent: 536c3711867ec947c1738f2c4b96f22e4863322d (diff)
34 files changed, 238 insertions, 523 deletions
diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz
index f7da860f18cd..20e6656e779e 100644
--- a/x11-wm/Manifest.gz
+++ b/x11-wm/Manifest.gz
diff --git a/x11-wm/cwm/Manifest b/x11-wm/cwm/Manifest
index bcb865073932..5ec183e27b48 100644
--- a/x11-wm/cwm/Manifest
+++ b/x11-wm/cwm/Manifest
@@ -2,4 +2,4 @@ DIST cwm-5.6-chneukirchen.tar.gz 50799 BLAKE2B 4d9341e89b21187044bbcbc658dea2eac
 DIST cwm-5.6-xmw.tar.gz 53738 BLAKE2B 9c36c42fc35a8206035ed59fb8fe2e8eb13effcdb43d488bcc99c2d0f48476e206e46fd52c0928afdb51d55c68d9be03a186aaf4c49d03bcdf8754df0c5d81db SHA512 cf0174523838dba5997206be904ab667efc5ff7e413e98bb81cc3a69d40a79b54e21405787e088486feb8790d1094a2d3cce0be08d7ee36a2b9b0dadd78466c7
 EBUILD cwm-5.6.ebuild 1006 BLAKE2B c104bcfe023a159a8251951ba5854bc81eda5739e1d3d890df3532eebfd41a6fdbfc4eccce83c63a83f2c931c2c1e9897d2386d649b6f32146ab173b36e7ed12 SHA512 e7fbee979acdd1c82bc47bfc4e7b1dc1e0a686c5d9bf5e3dbe8bbcd19a4fdc6c77ecfb03418872440c25c4929fbb5491d18e31ac9e7719c392d76866131da498
 EBUILD cwm-9999.ebuild 871 BLAKE2B 76b7efce92fdd5bd7bf59e4bd9b88e8681aa80b1178b3bd77fa5da8a91ec88d88f27c705a91b709957deebf15a64a57703be4538ccf3569359fe6fb30f77723a SHA512 59c7df88477f281931d02d885291b725bf6dd5857cd77f34187893270113756191faa443b653bead385dc7697b61d0a84aa019b71ca652a460be44a2093fae81
-MISC metadata.xml 324 BLAKE2B 331232b13e393f0d72cff1e0bb37a987c4de69f64e4086abeb00e156dc3bf76b257e59b65913e302d8c5f5e1cf9daf76613ea4ab58532191e3055c194b1575af SHA512 549acd771ebbcb5f82ac43f8ebe578ca6681b1ecf66602dd769b049c9235158e5f59c7605769c0d2642b1ad40235869d35f2f5906d64b0ca0e88d3f5ebe9afcd
+MISC metadata.xml 248 BLAKE2B 86a7b2f7d520b71d9bbed3427dc2c32a5ede55db3ee30766436b19c61a8507efc10d0de50bf84f16bc8cf73dd5b2c0cb31ac17221303dff9bd08ce8fb0e23666 SHA512 07df1249bbdd7c937f1b711b88f3d26f9de18c594692b6446022ea4562570abaa08ed2c83d31d8730707036704fa7decc5b382ec8586adaabd7f1205be4433f8
diff --git a/x11-wm/cwm/metadata.xml b/x11-wm/cwm/metadata.xml
index e13fa1e0d223..9dddd6338e3d 100644
--- a/x11-wm/cwm/metadata.xml
+++ b/x11-wm/cwm/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>xmw@gentoo.org</email>
-		<name>Michael Weber</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">chneukirchen/cwm</remote-id>
 	</upstream>
diff --git a/x11-wm/herbstluftwm/Manifest b/x11-wm/herbstluftwm/Manifest
index bfe38d40d204..f8c9ffd9376f 100644
--- a/x11-wm/herbstluftwm/Manifest
+++ b/x11-wm/herbstluftwm/Manifest
@@ -1,4 +1,6 @@
 DIST herbstluftwm-0.7.0.tar.gz 247469 BLAKE2B 3ee6c4709bd52ad330706aa941fba4372003f6d494759bc0fc87bcf34cffd07a55d5d4b550de13af059d4455ce240e6be3151b8f7563f3fb0d1dc4ef79306c58 SHA512 792e517dff5cfb075b8b5a42b076a7809e983953620212de6d571d3d606c573c83606a0f7694e25d3351c288473f5129191a416fe8977db8438c1016503eacd8
-EBUILD herbstluftwm-0.7.0.ebuild 1549 BLAKE2B 9e54d5dd524da6049701e1b9c39bbba62c5fcc909b18d8c13c2b68a9cd878f848cf1686382885b19a6fe7cd192f1d5b929094351cfb873bd3c12a9c776f7dacf SHA512 cf2f3cf5d89c51a6776428533f2f2db60176e4fc1018efc4eaab26ca019a6b59faf841e1f35c556689d350521ff44a25e6033ce2cb1076bddcfa23feb0088597
-EBUILD herbstluftwm-9999.ebuild 1551 BLAKE2B b11ebc4b5b148d87eed545eae7fa8f0a1adb8875d1a8af861713657d85ec17ad513bf96d78b1522cacbe0b09ef2adabdfb41ac66d5082cc10a4925425a1a10de SHA512 6cb19087cc90c9a93121d544d28a4ad221c061c2cfad1f00b90b98935ac81f2429cb74e1506e1e115fb5e3a2306adbf201dd702a6c8e4c753713f0c2d2106736
+DIST herbstluftwm-0.7.1.tar.gz 244726 BLAKE2B bdc8b769c3991276f03540024212315310aab4c5980321a3f019d5dc044b862aa606746d968e01bb0d8280b10ecf2f7f300710e2ac5cba46afd3129c316df5ae SHA512 1eb25c6e64bc046fca4b93cb9158515dba793bb14676229cc9c9194660eeccfc0c907ddcc4b15581b9ffb8b7f261ad3e2c8efe60a5d11eeb836208dd289dc199
+EBUILD herbstluftwm-0.7.0.ebuild 1549 BLAKE2B 7c834172c2b5a3282d9b951753c6b272ee6ff6b5d10b9b715162b061e0fc22fd5573a782285f0b72f214870b61d13bced811c3870145a1254a947030b5ca97a1 SHA512 d945073866276b0d19f68d23010e6394fe81fc83c044702a555097ed02671401e73e64e579390b6ca86b64181a1946bcd7096c9c1e517c9470eaf2f68d20079e
+EBUILD herbstluftwm-0.7.1.ebuild 1559 BLAKE2B a556fce66aa9e17b289ce6e785f23a55bff347fbffd10d4a3bf7c22c92794634d682f4eb546038937e67f96c8ac067d17f2f5e178f572d1cda696d8563a9a2d7 SHA512 6f55e104631096491c2cbb8d3ea3fd274871c8b311886639b70860176ec6a0de75da95f2c9507bbc67941a269367407719b97691cfdb35fd6577e5e0257b8376
+EBUILD herbstluftwm-9999.ebuild 1559 BLAKE2B a556fce66aa9e17b289ce6e785f23a55bff347fbffd10d4a3bf7c22c92794634d682f4eb546038937e67f96c8ac067d17f2f5e178f572d1cda696d8563a9a2d7 SHA512 6f55e104631096491c2cbb8d3ea3fd274871c8b311886639b70860176ec6a0de75da95f2c9507bbc67941a269367407719b97691cfdb35fd6577e5e0257b8376
 MISC metadata.xml 246 BLAKE2B a30d57a217fcd3c7c7d170b71f1ab806d11e9b520595802ebfb0123a82682d4fc045f033b164402ac51f939fef7cad737eb2012f62864298b6c5d23c69575519 SHA512 ca07e0609b698c2b53062b71008fee49b91af78fc2ef25997311e37985d79283d333f5b842257a16e7dee36ce34c07d405e1f93742f341f10ca70904e9f9a4e6
diff --git a/x11-wm/herbstluftwm/herbstluftwm-0.7.0.ebuild b/x11-wm/herbstluftwm/herbstluftwm-0.7.0.ebuild
index 3bf863251308..0f5e7d231d55 100644
--- a/x11-wm/herbstluftwm/herbstluftwm-0.7.0.ebuild
+++ b/x11-wm/herbstluftwm/herbstluftwm-0.7.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,13 +9,13 @@ if [[ ${PV} == 9999* ]] ; then
 	EGIT_REPO_URI="https://github.com/herbstluftwm/herbstluftwm.git"
 	EXTRA_DEPEND="app-text/asciidoc"
 else
-	SRC_URI="http://herbstluftwm.org/tarballs/${P}.tar.gz"
+	SRC_URI="https://herbstluftwm.org/tarballs/${P}.tar.gz"
 	KEYWORDS="amd64 x86"
 	EXTRA_DEPEND=""
 fi
 
 DESCRIPTION="A manual tiling window manager for X"
-HOMEPAGE="http://herbstluftwm.org"
+HOMEPAGE="https://herbstluftwm.org/"
 
 LICENSE="BSD-2"
 SLOT="0"
diff --git a/x11-wm/herbstluftwm/herbstluftwm-0.7.1.ebuild b/x11-wm/herbstluftwm/herbstluftwm-0.7.1.ebuild
new file mode 100644
index 000000000000..f9e402083ad2
--- /dev/null
+++ b/x11-wm/herbstluftwm/herbstluftwm-0.7.1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit toolchain-funcs bash-completion-r1
+
+if [[ ${PV} == 9999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/herbstluftwm/herbstluftwm.git"
+	EXTRA_DEPEND="app-text/asciidoc"
+else
+	SRC_URI="https://herbstluftwm.org/tarballs/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+	EXTRA_DEPEND=""
+fi
+
+DESCRIPTION="A manual tiling window manager for X"
+HOMEPAGE="https://herbstluftwm.org/"
+
+LICENSE="BSD-2"
+SLOT="0"
+IUSE="examples xinerama zsh-completion"
+
+CDEPEND=">=dev-libs/glib-2.24:2
+	x11-libs/libX11
+	x11-libs/libXext
+	xinerama? ( x11-libs/libXinerama )"
+RDEPEND="${CDEPEND}
+	app-shells/bash
+	zsh-completion? ( app-shells/zsh )"
+DEPEND="${CDEPEND}
+	${EXTRA_DEPEND}
+	virtual/pkgconfig"
+
+src_compile() {
+	tc-export CC LD CXX
+
+	emake LDXX="$(tc-getCXX)" COLOR=0 VERBOSE= \
+		$(use xinerama || echo XINERAMAFLAGS= XINERAMALIBS= )
+}
+
+src_install() {
+	dobin herbstluftwm herbstclient
+	dodoc BUGS MIGRATION NEWS README.md
+
+	doman doc/{herbstluftwm,herbstclient}.1
+
+	exeinto /etc/xdg/herbstluftwm
+	doexe share/{autostart,panel.sh,restartpanels.sh}
+
+	insinto /usr/share/xsessions
+	doins share/herbstluftwm.desktop
+
+	newbashcomp share/herbstclient-completion herbstclient
+
+	if use zsh-completion ; then
+		insinto /usr/share/zsh/site-functions
+		doins share/_herbstclient
+	fi
+
+	if use examples ; then
+		exeinto /usr/share/doc/${PF}/examples
+		doexe scripts/*.sh
+		docinto examples
+		dodoc scripts/README
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
diff --git a/x11-wm/herbstluftwm/herbstluftwm-9999.ebuild b/x11-wm/herbstluftwm/herbstluftwm-9999.ebuild
index ee1ebe872762..f9e402083ad2 100644
--- a/x11-wm/herbstluftwm/herbstluftwm-9999.ebuild
+++ b/x11-wm/herbstluftwm/herbstluftwm-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,13 +9,13 @@ if [[ ${PV} == 9999* ]] ; then
 	EGIT_REPO_URI="https://github.com/herbstluftwm/herbstluftwm.git"
 	EXTRA_DEPEND="app-text/asciidoc"
 else
-	SRC_URI="http://herbstluftwm.org/tarballs/${P}.tar.gz"
+	SRC_URI="https://herbstluftwm.org/tarballs/${P}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
 	EXTRA_DEPEND=""
 fi
 
 DESCRIPTION="A manual tiling window manager for X"
-HOMEPAGE="http://herbstluftwm.org"
+HOMEPAGE="https://herbstluftwm.org/"
 
 LICENSE="BSD-2"
 SLOT="0"
@@ -33,7 +33,9 @@ DEPEND="${CDEPEND}
 	virtual/pkgconfig"
 
 src_compile() {
-	emake CC="$(tc-getCC)" LD="$(tc-getCC)" COLOR=0 VERBOSE= \
+	tc-export CC LD CXX
+
+	emake LDXX="$(tc-getCXX)" COLOR=0 VERBOSE= \
 		$(use xinerama || echo XINERAMAFLAGS= XINERAMALIBS= )
 }
 
diff --git a/x11-wm/i3/Manifest b/x11-wm/i3/Manifest
index 89f8605ac7fe..cc8cf833f2c7 100644
--- a/x11-wm/i3/Manifest
+++ b/x11-wm/i3/Manifest
@@ -11,5 +11,5 @@ EBUILD i3-4.14.1.ebuild 2376 BLAKE2B 00f9ca5d7c45ee211a834a50da364a72c0968a778a4
 EBUILD i3-4.14.ebuild 2113 BLAKE2B c602bbb48b166ffa70d735f9181ec81a4174fe7df08830bff5c2cd955f668d2e34453f421dd1c8fb616497be5cc5707332f412d73397287ed55ea5468ffc755d SHA512 709efb5ca49d7e2e1aa6426c631e653b66f15e261eb1462036b4bdef61cd68a690a03a71ae787d221939808b9b15f3d7604551c1cc3227b9194efea076b1390e
 EBUILD i3-4.15.ebuild 2323 BLAKE2B bf5ead0f91a4a040866f00f3dfe4b0c71a2d4e41eb9480c27e464790c37cbf641069729d34e48152223e4f7545a6b6b43be3f45213774219fe49eaa594491ad2 SHA512 95cf2e6f2053ffe180418dda38535a08ed8447085d65cd3ac342ba0e0468e8320d95ed8468bdcc11ec637ea2f2ef4926a0df8bacad186109fc5f2c42330e3692
 EBUILD i3-4.16.ebuild 2318 BLAKE2B 5897090120c632fc6385196d48e8bb14c9c1346699df738230b28c954842a8cf192adc9e690fdee208003e4d514b76d850970e8e12624c7ff17ef7dff0d1046b SHA512 ec02ae998edfa9f4188b51d4038f44cf3a910b5ac7a1e75552bce5387d3b93b77bfa5770adcb04bf4bd82d2b25c79dee6420561d18f9a7ad2062eda3969884a8
-EBUILD i3-9999.ebuild 1812 BLAKE2B ce78f54be6f2cd1949342fa8b24fa4b162679edaa062eef113619af1aca0c976dc3d50302bd49ed80e3a8dc417816b0fdb802f71f31d16305a4a02be9962bfc7 SHA512 77bee1cddd30f86bfbea6276c44aea2112be335aa6d8720856be4aa6f8d77c84282f7c2e2fa32adba35fddfd2e1ac60cd7924f779e1b9bd4705e3a068dcb82cf
+EBUILD i3-9999.ebuild 1814 BLAKE2B 4bc786cad1c87f351da34303c63fa0d5e1874bb97852df7bef3ba4c9837a524c4abd18294c3be46752fe66c66efeb40f781e9964f0c1207c76b4145aa7d7583d SHA512 b3a4429575ac3440f026a73be0dc2d412bc4292a0e1640d20e4042f72c59ed7ade740f8f45fb7b6d7daf69f4cb09b863db923ad7f82b181caadfe2d57aa4bf60
 MISC metadata.xml 470 BLAKE2B 1c4fd7b44860934e88fb5165254fe0e8ca7e647c11af9af7d959f240e51002e6a454d9b93b30da8944891a1aa6a989f7a3e2a8af44ba41de174e78745393dd79 SHA512 52eddb56541d1172b04ca3ae646d01e52fb300dd62f5dfeaf2abe9d791965813e87b24a1477743797227bf8d407051f79076d54edb599524f89f3cfc716cc47e
diff --git a/x11-wm/i3/i3-9999.ebuild b/x11-wm/i3/i3-9999.ebuild
index 44462428862e..d8f7ca7c3a62 100644
--- a/x11-wm/i3/i3-9999.ebuild
+++ b/x11-wm/i3/i3-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -39,7 +39,7 @@ RDEPEND="${CDEPEND}
 	dev-perl/JSON-XS"
 
 PATCHES=(
-	"${FILESDIR}/${PN}-musl-GLOB_TILDE.patch"
+	"${FILESDIR}/${PN}-4.16-musl-GLOB_TILDE.patch"
 )
 
 src_prepare() {
diff --git a/x11-wm/icewm/Manifest b/x11-wm/icewm/Manifest
index a5d9134b59a3..f3826b14588f 100644
--- a/x11-wm/icewm/Manifest
+++ b/x11-wm/icewm/Manifest
@@ -2,5 +2,5 @@ AUX icewm 33 BLAKE2B 5605658012ad8ed16bbd4cf0c4cb7cbe5204f73c20ef2c3d9fef1011a80
 AUX icewm-1.3.10-menu.patch 821 BLAKE2B 2274136f91b891c971a84f80c3ace49f4c3e5245ae0de83408219575a25dc1cb42523459a923634ab25565fdafe1b5320b955adbb1de4b3fda3c7613ba93d7ad SHA512 15ad0cd80fa358ef823ad747b873afab7ce07114590cba90710b91daa6421a8b8030c7ce7bd8af245c85983d75583c2701de85809de3059fe3e838e2f88f016e
 AUX icewm-1.3.8-uclibc.patch 1830 BLAKE2B 36037fcdadb7d70d1cc4125170c05e9800a2acca930148eeb091d084a4aca7f4813f452e3565aece03aca7d441755e958cd75a83c875f684beec335355ee7a16 SHA512 ed3abce7aabb21e5fb516f02a6860d140b2d74f288daf8a7edd14f8d70cd377f5bcf9b4172da4c8ca30b176c79e7500ba2c253004ca59a1ab6e9258b6b8a6f2e
 DIST icewm-1.4.2.tar.gz 1709850 BLAKE2B 1a9dde495345f1601b3ae901b3e98554b60a9b9a8e94b7079f3c766971eb31bde5a3cd3972f5c96d86b5e02e413811df2a0689efc15a461bca39a70842f3df69 SHA512 c01661a7b07b4f42a32b20ecc9e45fb1e9c84c27d33105ec165e75aa9ac84129d55e992cac0d53fb10298bae28bc93ef07f68e874c1c2fccd9adecceb987a872
-EBUILD icewm-1.4.2.ebuild 2443 BLAKE2B 38036c762f5bfb36cd2533ee1e30f7ede5da5325748504a17af7a0f53cd58f74bcf28698218a8be46611a379cf2e49031d46e901d388b398330dde63d9c3fecb SHA512 0dbdfc3a6b30a8c3e61be3ff826e7b02f5ecd325af8db6f185896ec5dcecaf3bc7dd44ca8a02710b780f13ee5694faf9646949bd0609e9d6c5f138e2f2919103
+EBUILD icewm-1.4.2.ebuild 2438 BLAKE2B de1cc5ef5cf186aa332ebcef371fb562875469b8bbb0f96fe01fb2ac35c5f8272a1eb8ca385ea86210846e79a70eb4dec8911ab8297dc2fe414e7d3ea49e8652 SHA512 6d834977adb9680101d45e2a4cd665cc69f694d1419d1d9133e8ece382d0cfa55299039b12fab2585cf46f1853baa57c252f7f7cea39b3a72c47f7a100cb7894
 MISC metadata.xml 619 BLAKE2B f25a8bc7e435eee00d8ba0cfd21a750ae84d3643b25aaad271cf297918b0c5d702ec60e9ffe919c0b7b07e36f5ff10ba82d5c81d561d22072cec94772de4d8bd SHA512 5beee59a4a9d6785a338f2a18b0f4906681dbcff463ddb3bb273634416c297ad646e0a4247d94f367352b4a063d1858953827d775a01e100f1a769941d2d9cb2
diff --git a/x11-wm/icewm/icewm-1.4.2.ebuild b/x11-wm/icewm/icewm-1.4.2.ebuild
index 328bcf3ab891..e3ae5642b7ff 100644
--- a/x11-wm/icewm/icewm-1.4.2.ebuild
+++ b/x11-wm/icewm/icewm-1.4.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 inherit autotools eutils
 
 DESCRIPTION="Ice Window Manager with Themes"
-HOMEPAGE="http://www.icewm.org/ https://github.com/bbidulock/icewm"
+HOMEPAGE="https://ice-wm.org/ https://github.com/bbidulock/icewm"
 LICENSE="GPL-2"
 SRC_URI="https://github.com/bbidulock/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
diff --git a/x11-wm/muffin/Manifest b/x11-wm/muffin/Manifest
index d266a3d15a11..a98538c37878 100644
--- a/x11-wm/muffin/Manifest
+++ b/x11-wm/muffin/Manifest
@@ -1,5 +1,9 @@
+AUX muffin-4.0-clutter-configure.patch 456 BLAKE2B f3f855dbc5fa8cdf85c87fc1ae2dc2d88c348bc9a53872d4f953a816c78a330a036a6e6f16a409f96e096654ea220a93d95b6f7ae57a9ed81f7b4d91280f6aff SHA512 168648d3ee94d3ebecf0b85fd943885af118c0939881a18ceaf7283b59ba34eedc1fbae735f4c589e671e1f0b60fbf94ac6e1009a92d2da2a26881cda40b2e5f
+AUX muffin-4.0-cogl-configure.patch 717 BLAKE2B bf55437c4a3c5b41fe4c9dc4bb0a7e58def0cc5263826f924dd6b35f19e0fc662b9b20c80dce97b92532ab3798b54cfa4cf1851c4d44e05a099bffa5f895b44e SHA512 f8902b5e777106008f5697b9384462633aa07d70ae66eb8a7ad9bc5f1c757a14aa614711614cdd4aec969120ceaf98bec07b91a42ecba4b696ebcf9f63dcba11
 DIST muffin-3.6.0.tar.gz 2720809 BLAKE2B 9d1b92907d545990b409c15f9e9e3bf7b3871cc545d02234296efcb15f0082fc630c3a06849789c5e5aed4af9253e6893cc29feb7590aaaaaf2eb38843591c8d SHA512 d077f1310d7600754c9b4f77fc2a82377aec43f9a1cc0b95e28118764741922a58f2348418bee309d8c7fd1484b97ddc898d0105fa1a3fcd855d2fcc68f3679e
 DIST muffin-3.8.2.tar.gz 2723114 BLAKE2B f8218ac1f71ecfa5b74ca7ae8cf76d76e1207e3ce65f715643d477d2fb6429390671f3b05132a64f23a1853297f71563a62c052555f8a26d084469814972a64d SHA512 62dbfb602dd1164779e365e5e6f782431a491a254dcec8faef8a50f27f50cf7b0f8ab958b6df3b75d6b15edcd90c23a2fd6cc18cb11a2a513e669169f09cba05
+DIST muffin-4.0.3.tar.gz 5194156 BLAKE2B 8d58d37f8410ad5384c09a4edabd3ca5bd8a3a612825ded55bf625a9a8c2ba8aba295187e3eb727fc248716b3efe84e9a567a49f95635150c4bda5f309545ed2 SHA512 34a3f152d2701e06498f2de28639af656bd4efa6c7d5c56244fe9002cf769e929fc2360bd036509318fab9c4fe73c976605c3fdb444c9280f52e6db27867a14c
 EBUILD muffin-3.6.0.ebuild 2015 BLAKE2B a1e42826b62c46bd57de0f2a849525f9cc9eaa162279188a893f3108d33ca9e5a028a8fc1c6c5b7391d444d266773880f5bb6ed0e680609f4c3a387e40e10a6a SHA512 86c08741e7787f220d94900a34f5fe9db2a8b09d9caadfef96b76ba5051f5eb20409d38f1a7a0111c8791664dcad07046ef88cbe53557b199e41b8cd90c43341
 EBUILD muffin-3.8.2.ebuild 2017 BLAKE2B 747a1089dabd01eabc88e1d3aac8c7c458b55873011773da9ad0c85a7d18523532be188c52c1bc162f32442794cd129e1a07c0ce8dca812bb0bffa728e8c2b56 SHA512 d19b4c928844be00ad61cc8a41fc0c76847a895b08ad6bbfe51da256c38757041ffdbc1915b8e3fcec381e9e737f84d2217eff44a68276713b38145ae3b811ac
+EBUILD muffin-4.0.3.ebuild 1996 BLAKE2B afb319d995eae03baedea4287c95005ab08f0d3e52dee3986dc03ffe0f27b466f553c7590b0dd68cf72ca7f3b33bb0f3bd5a4db48a2b71fc9f05030013e9b78b SHA512 4deb518b009494b8871d205bdd18bea4058584adb8496ff012564184a080b55d908bd27d4329139be225faf71c7b9e144eaa880e3de62de9e1f3c5f0d29e6f91
 MISC metadata.xml 333 BLAKE2B d29a873cc8702d8251ff425eca5ec16b4ea2a75f4e512c05513c3a6a61e38e0fde4450158503cdb2e71b324c86a7e66e03c1eecba8bff6a6be81244f040ceaad SHA512 42c7d8e82dd95e76e6b72973d53a0a27de2562108b5989092c34804140d336dcb20b331a4c70b1fcf6730ef5f377f366f480271597c63f7ce3e8f7aa8d359555
diff --git a/x11-wm/muffin/files/muffin-4.0-clutter-configure.patch b/x11-wm/muffin/files/muffin-4.0-clutter-configure.patch
new file mode 100644
index 000000000000..f5ab1de9af29
--- /dev/null
+++ b/x11-wm/muffin/files/muffin-4.0-clutter-configure.patch
@@ -0,0 +1,13 @@
+diff --git a/clutter/configure.ac b/clutter/configure.ac
+index 0b3c3e5..9c0e6cd 100644
+--- a/clutter/configure.ac
++++ b/clutter/configure.ac
+@@ -231,7 +231,7 @@ AC_ARG_ENABLE(
+   [wayland-egl-server],
+   [AC_HELP_STRING([--enable-wayland-egl-server=@<:@no/yes@:>@], [Enable server side wayland support @<:@default=no@:>@])],
+   [],
+-  enable_wayland_egl_server=yes
++  enable_wayland_egl_server=no
+ )
+ 
+ AS_IF([test "x$enable_wayland_egl_server" = "xyes"],
diff --git a/x11-wm/muffin/files/muffin-4.0-cogl-configure.patch b/x11-wm/muffin/files/muffin-4.0-cogl-configure.patch
new file mode 100644
index 000000000000..1e9721dd1bf2
--- /dev/null
+++ b/x11-wm/muffin/files/muffin-4.0-cogl-configure.patch
@@ -0,0 +1,25 @@
+From d3dec860b3390068321c579de85d0ebfab92481a Mon Sep 17 00:00:00 2001
+From: Kristian Fiskerstrand <k_f@gentoo.org>
+Date: Wed, 28 Nov 2018 19:57:20 +0100
+Subject: [PATCH] Fix
+
+---
+ cogl/configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/cogl/configure.ac b/cogl/configure.ac
+index b06677a..209f449 100644
+--- a/cogl/configure.ac
++++ b/cogl/configure.ac
+@@ -700,7 +700,7 @@ AC_ARG_ENABLE(
+   [wayland-egl-server],
+   [AC_HELP_STRING([--enable-wayland-egl-server=@<:@no/yes@:>@], [Enable server side wayland support @<:@default=no@:>@])],
+   [],
+-  enable_wayland_egl_server=yes
++  enable_wayland_egl_server=no
+ )
+ AS_IF([test "x$enable_wayland_egl_server" = "xyes"],
+       [
+-- 
+2.18.1
+
diff --git a/x11-wm/muffin/muffin-4.0.3.ebuild b/x11-wm/muffin/muffin-4.0.3.ebuild
new file mode 100644
index 000000000000..1f5bf4aba312
--- /dev/null
+++ b/x11-wm/muffin/muffin-4.0.3.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools eutils gnome2
+
+DESCRIPTION="Compositing window manager forked from Mutter for use with Cinnamon"
+HOMEPAGE="http://cinnamon.linuxmint.com/"
+SRC_URI="https://github.com/linuxmint/muffin/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="+introspection test xinerama"
+KEYWORDS="~amd64 ~x86"
+
+RESTRICT="test"
+
+COMMON_DEPEND="
+	>=x11-libs/pango-1.2[X,introspection?]
+	>=x11-libs/cairo-1.14:=[X]
+	x11-libs/gdk-pixbuf:2[introspection?]
+	>=x11-libs/gtk+-3.9.12:3[X,introspection?]
+	>=dev-libs/glib-2.37.3:2[dbus]
+	>=gnome-extra/cinnamon-desktop-2.4:0=[introspection?]
+	>=gnome-base/gsettings-desktop-schemas-3.3.0[introspection?]
+	>=media-libs/libcanberra-0.26[gtk3]
+	>=x11-libs/libXcomposite-0.3
+	>=x11-libs/startup-notification-0.7:=
+
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXcursor
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	virtual/opengl
+
+	gnome-extra/zenity
+
+	introspection? ( >=dev-libs/gobject-introspection-0.9.5:= )
+	xinerama? ( x11-libs/libXinerama )
+"
+# needs gtk-doc, not just -am, for gtk-doc.make
+DEPEND="${COMMON_DEPEND}
+	${PYTHON_DEPS}
+	>=app-text/gnome-doc-utils-0.8
+	sys-devel/gettext
+	dev-util/gtk-doc
+	dev-util/gtk-doc-am
+	>=dev-util/intltool-0.35
+	virtual/pkgconfig
+	x11-base/xorg-proto
+	test? ( app-text/docbook-xml-dtd:4.5 )
+"
+RDEPEND="${COMMON_DEPEND}
+	!x11-misc/expocity
+"
+
+src_prepare() {
+	eapply "${FILESDIR}"/muffin-4.0-{cogl,clutter}-configure.patch
+	eautoreconf
+	gnome2_src_prepare
+}
+
+src_configure() {
+	DOCS="AUTHORS ChangeLog HACKING MAINTAINERS NEWS README* *.txt doc/*.txt"
+	gnome2_src_configure \
+		--disable-static \
+		--enable-shape \
+		--enable-sm \
+		--enable-startup-notification \
+		--enable-xsync \
+		--enable-verbose-mode \
+		--with-libcanberra \
+		$(use_enable introspection) \
+		$(use_enable xinerama)
+}
diff --git a/x11-wm/sithwm/Manifest b/x11-wm/sithwm/Manifest
index a720d074b901..9967f6cd67f5 100644
--- a/x11-wm/sithwm/Manifest
+++ b/x11-wm/sithwm/Manifest
@@ -1,4 +1,4 @@
 AUX sithwm-1.2.3-warnings.patch 880 BLAKE2B 1ce24117a5642ceb7edf4700a5edea07acf844c972147efd160ed4532a4274a414f7cfc5ee196cdf8f770ef3a7887f13e2684960b1126740216e0dffbafc3a5b SHA512 1cd1ee4c6b6e71aacafdd10ada0c3f07c89cdf51a3b565408a440ad2fa1b40f5a266b73873a059be19fa232dec35817bc0aca2e58b6271ccce5753e7cdcddb89
 DIST sithwm-1.2.3.tgz 29976 BLAKE2B 23562cb338c6e1cb5f978ad04f49afe58cc16e73707ee3c893de88eb671ccee86bc29cc06a72e3912aabd0f894c55875a860c2d1fea472fd4971961e9ab6d4b7 SHA512 12b57d28da2a5b365b1c165ba6904d901990e69950986cc7be285060a58ccdc32edc4bd60a63d2eba3f6f7f695d461e424bce23542c18a13afd5aab2e91067dd
 EBUILD sithwm-1.2.3.ebuild 561 BLAKE2B a3b99436c3f3bc25897a0c7cf196bb6d105c009fe03d15032a4a22d6edb534e9e41aa0c11b77d0c805e41cd16d28b78c25cca9934b0d9f03cbdf4bb064a7ddf6 SHA512 a77a0dd1c1355b4f141d6c1fa927e275b5e06f65cbacbbcef36652c268b34765a3afa17da63968b654f21f49d90e2426358397772e966d04258ed962e0258497
-MISC metadata.xml 369 BLAKE2B f9fa48f26db431d1b4b1b309827f11b0faf26715bd2b05a9a1924a841eebd0d72783198c27ed5a04140edc1e20720b4792f8893ed2e1fb85a2ba5c9249dbbceb SHA512 ee12f10689840f8f66a60141cb5042d8f9a18e89aca8491408819f6285eb00c923758dc818d540acf6b6a7cbb3774a45b467ae6467d1dfb78f103f5413e15134
+MISC metadata.xml 298 BLAKE2B 07c5032c4ad4c8f3336f076162848d3008c34e1890497930bd9a0548039327ca0c0281d4f31f3e2816c44e7472918ae676d4c0157bb162edf2d4819d227c6a17 SHA512 330598be770732387d2229bef4d884ee22ec5330ba60784e026d6b24d9e9554778c9e8d4d6143df6475548c4a2033dc2f69a724f6e58f9fb94eb9fe4e4ecc289
diff --git a/x11-wm/sithwm/metadata.xml b/x11-wm/sithwm/metadata.xml
index 9c5efbe2fc4d..a177aaf005a8 100644
--- a/x11-wm/sithwm/metadata.xml
+++ b/x11-wm/sithwm/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-<email>xmw@gentoo.org</email>
-<name>Michael Weber</name>
-</maintainer>
+<!-- maintainer-needed -->
 <upstream>
 	<remote-id type="sourceforge">sithwm</remote-id>
 	<bugs-to>https://sourceforge.net/p/sithwm/bugs/</bugs-to>
diff --git a/x11-wm/spectrwm/Manifest b/x11-wm/spectrwm/Manifest
index 138dee605733..136c20bc11dc 100644
--- a/x11-wm/spectrwm/Manifest
+++ b/x11-wm/spectrwm/Manifest
@@ -4,4 +4,4 @@ DIST spectrwm-2.7.2.tgz 132554 BLAKE2B 78d1956be33a192f63a46bdef250427d14f415261
 DIST spectrwm-3.1.0.tar.gz 147206 BLAKE2B abcce22bc7859dbcc109f02ea832d65091c842562579d47cd1dd83c5de82a015b02343972d4d85cf291b63bfbaf0e901616cca94d911014672ffc35436bdd3c1 SHA512 dd8e16361b979a55b210a88a1ae5d53e7086fd854e92320e09b6407d374580cc271c0e974e38606481ab57a504a86e16293edee967d251b043a1eb65e8c77687
 EBUILD spectrwm-2.7.2-r1.ebuild 1093 BLAKE2B 692d22a1d46bb800caafca7fecd868e51a3e65c4e58063544b203d5b674ccf75e14de4aa5839204786d87ffa6ac6cfb24071d04ce7c6ec49419906211b726d68 SHA512 8781f95f64cfa1443ea9c33b01499257ea3d6e31600ed669990a883b9ace0ff070903e5cf7cd501fa0ad0f117fdbda30fca4ffdcb925f852d76df1cfdfa3e568
 EBUILD spectrwm-3.1.0.ebuild 1132 BLAKE2B dacd1cfb94ef799132eef7ee5d7f0c4d521b417529403ca81c4657074df5e61f52af0bd3baee5d53a8652f8e5456fb835ae9c11320a902b99cbb4eb97e7bf06e SHA512 b31a2e6cd77ae1117929f063f8b6cc7cd3a0167189fd3fd86d95254ea91bc6173414b7354af029d2671e08b6f62c9f0cefccc509ea89108fdb562fdf906096bf
-MISC metadata.xml 237 BLAKE2B f22c3926ba75c18fce7667217807f3710a315b12b1341622c949e7bc0056cd1cb403ea6c66d838675f3cb5dcd53d2fc4ec71425ec3f96aaffb94b70b73e99320 SHA512 ae2360aa6b1b00c67e0acea4935c02b64585b9a15e126fec9d5d99637021c542c0a495e5116205f3da287def46fa5b19cb1a7f3042c12c5f7a78d66d92fcb03f
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/x11-wm/spectrwm/metadata.xml b/x11-wm/spectrwm/metadata.xml
index a535b8852829..6f49eba8f496 100644
--- a/x11-wm/spectrwm/metadata.xml
+++ b/x11-wm/spectrwm/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-<email>xmw@gentoo.org</email>
-<name>Michael Weber</name>
-</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/x11-wm/xmonad/Manifest b/x11-wm/xmonad/Manifest
index 92a803e95a62..27a0129813a2 100644
--- a/x11-wm/xmonad/Manifest
+++ b/x11-wm/xmonad/Manifest
@@ -7,9 +7,9 @@ DIST xmonad-0.11.1.tar.gz 59307 BLAKE2B 98dc31dd53e933f68dbf00121c6a0b4e4a24a19c
 DIST xmonad-0.11.tar.gz 59119 BLAKE2B 75ae39e2e54d4b5ed14f99d0144d4ee7741c611f18b5692aedce49b0a4dc07a17f613280d93fd715b812a2c22e27ad9f7fe8693dba38739ccf6dde9742fe03b9 SHA512 34740f032508584f34f6b138d21394eca17e8020bccc4d8c6e8b3cb6b7ca64b153077cfd16636a6130768ebd145fe993569f8a229862d7816d0c89c905ee08bc
 DIST xmonad-0.12.tar.gz 61436 BLAKE2B ea42fc105e30be59a2cb0180c05ef88024e51a1a224bdd6bb910d45cddabc2709411e2f0c7aa6c5723f54653db242bda80ab92249204106955be75a4a077f1ea SHA512 e519c038d90db037bc81e7baf7b07cfa53922509e98ffddacfc4a6cc2c7376383be1e721f613057a5febbfcc661807b6382124eb673ac7a7cda23c738d3539ab
 DIST xmonad-0.13.tar.gz 72034 BLAKE2B c95b24ae406268da642168defcc633cf8185f0f2dbcede1122c48c3812bf250df69d917c479f328cca450dec362ae0614d2acaf09d62123d15d646dcae8d98ec SHA512 9d9436f36fe0f6a9732502b0211fc41a224b1320b843d266b6d2dd201e4329b688f7eed5b08597b2edd713cc25f2b88a2a1f1ee43e18615c0a78e97e4716b122
-EBUILD xmonad-0.11-r1.ebuild 1966 BLAKE2B 6dcc0b2098c39408b711b21aa0a3f22e87929b8eb16e717d1c24db23abbb8470477013c77516555b2c465c8b2cdbebee6c695dfed2262ac1cb7012a1fe4ff997 SHA512 432552c99a1b8ed006d61205d0b7347a51b61ec8fcdf578caaf5ebae96af751d6ab813c8cb5e85ddc2111766d21ee1075866fe19a83219f379b2fe9a8601c240
-EBUILD xmonad-0.11-r3.ebuild 2216 BLAKE2B daefed72d17f7ffe6ec511b02e81818bc7d1f417792dd53793ac17edeb5c5c5c0c97ac23c3ffe1fde67346e8cc6688fdcbe1ab61b13f4cbc4748a93c65cf04c8 SHA512 bd4c7b7bc44db0ebfa07634e0ebe581fdf1a448c6b647d0d5d5b6ceb97869ad717ad65e580d9712ca652759331cbfe55846912bc82221671c39f899914ad63a4
-EBUILD xmonad-0.11.1.ebuild 2181 BLAKE2B 07216505ab007c9503d792e8ed6d2d7196c7540ec512f259de1c45e96825500b38cda1b849364b2d35bab966dfcf16a71627d4811f99e70f81bbbc712492a673 SHA512 861d8b49952528edd2203aef880e772320beecb26c3ba05073c9fa2940b5e74fb48add517c70219706dfbf7cb4f064ad041a25436c2539d47361f0152bcc24c7
-EBUILD xmonad-0.12.ebuild 2458 BLAKE2B 80bf9d7b7cea46e64b9e4771e8ccea8c45219d9809663e4f92785cebf636a82459b1ba2b7c67771ff9b0547dea54d094e1ef17c0ccacc8fbe810e9c53cb2a848 SHA512 bda429abcd1339e61d1c8442d124909976906d013069eec12df4a70c2d8770ba72a1ba458a70aad9061c1f5c9481877b1daf645708e877c69dcbcc884998daac
-EBUILD xmonad-0.13.ebuild 2193 BLAKE2B b4d7b55738e1c38d8fab561c4f9b063eb4a647e18316686067c01f867cbdca662b0e1afc809bedd2d46f3a383a487cdddb547dd8b658a2b84d122d0af9737dc0 SHA512 a1a6c8b870aa05bd7a4e22272a684ccf6514ee50b0b6dcb2694de5e5ef3e4be06a41c4210b4b4c6520f992a5a1f07e76eccbd6887592b6299fc9b71c0c6dc1e3
+EBUILD xmonad-0.11-r1.ebuild 1965 BLAKE2B 372045a866c737afc0e782d57507a003acf7d37f9897488390ec03f34e9e2decabbde3bd32252260aeb2b9889dbab6a6fd06cce0cd38d9651c621d069ce287c4 SHA512 492c80d5acc5754ce183f8f916d6cb52e4cb62eeaca064ceca626f7ee874c9821c82228ca7d3dbc68ad8cf5429b397070cbd3b5a7a75cdf474ffc30974d8ca6b
+EBUILD xmonad-0.11-r3.ebuild 2215 BLAKE2B b207cd50e8c547edbb6ec2d5aca8abdc7b87005a3ae8303ce5d850aaab7067bb4472bd7aebba46f1d5078c94c2b4d49abe1e3d12d80ed79d646b6a560fc9e1a7 SHA512 a6d81091312070ebb0d249ea11d4df13c56452404441d8b350ae07817d91946db6c08213f97f60bede4c8262eb2c430d913359b7a28c49994bbb545a9e677279
+EBUILD xmonad-0.11.1.ebuild 2180 BLAKE2B 16928081702afdabb54a56c1e63230132ed394f71fa185bb6c351d7328a1784c1534f2ae77cc616c4dded300fb2ba720e2e3902377bb72e5208f5f3a5bd6f8d7 SHA512 7a2abef771ae04fa73e820c735ab4cc6a3f797ed2dacd1d581404f487612434dc67ec12efafff03df04340c72be14db99bb26f1a759a51f25279433f1dd1a447
+EBUILD xmonad-0.12.ebuild 2457 BLAKE2B 4bf99bc92a8454b2e32c4d1783b1f97ee2199056bc7d3c1bc776fb7be3d73f27efbfd8764e35aeb3f69602f14111da4adfbdeb8dc669eb439a2b3bc142b0d04d SHA512 b3bc1fe747f8db0ba7afe6bffd395e9f4dbe6ee501945ad139145a37d49f129cde09732f42461029745848273d3c7b93ebfedf349c3aafd267322d192222d1c4
+EBUILD xmonad-0.13.ebuild 2192 BLAKE2B 326da365e3d0af7bfb070ad03c99a101e5bada05b30878db19388bd6b64ef371075c92c6b9548ad95151c2b029ed04afb575040989ee40056cb0ade97d65eaaa SHA512 f80c9344470ceb7d888fd007a12123511155a0c32c31cad9ee35951282afa0db757e280ba24916899855b8ab0f70b3a7730f76b1565374259e88b3f5187adf74
 MISC metadata.xml 1068 BLAKE2B 7ca1c1c62c82e0ecc3352798f8b78bf87787534ef1830bde94b08ecca74a51606c05905903c0ad4b0728282669bcfa532ef798ae2c13148fdef55b259c3168fe SHA512 96efc16a7a57b188e72f2db9fdd90c06cc6460e9a596ac68ca5a8187fd7fbb88feb9ab9ff4e9d8436df014a6c6203c459da317cda0f5ada779096ee0806da8d8
diff --git a/x11-wm/xmonad/xmonad-0.11-r1.ebuild b/x11-wm/xmonad/xmonad-0.11-r1.ebuild
index bbd2c9e330c5..8fc61639af97 100644
--- a/x11-wm/xmonad/xmonad-0.11-r1.ebuild
+++ b/x11-wm/xmonad/xmonad-0.11-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -9,7 +9,7 @@ CABAL_FEATURES="bin lib profile haddock hscolour hoogle"
 inherit haskell-cabal
 
 DESCRIPTION="A tiling window manager"
-HOMEPAGE="http://xmonad.org"
+HOMEPAGE="https://xmonad.org/"
 SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/x11-wm/xmonad/xmonad-0.11-r3.ebuild b/x11-wm/xmonad/xmonad-0.11-r3.ebuild
index a929e260e880..553f65f4e8a9 100644
--- a/x11-wm/xmonad/xmonad-0.11-r3.ebuild
+++ b/x11-wm/xmonad/xmonad-0.11-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -9,7 +9,7 @@ CABAL_FEATURES="bin lib profile haddock hscolour hoogle"
 inherit haskell-cabal
 
 DESCRIPTION="A tiling window manager"
-HOMEPAGE="http://xmonad.org"
+HOMEPAGE="https://xmonad.org/"
 SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/x11-wm/xmonad/xmonad-0.11.1.ebuild b/x11-wm/xmonad/xmonad-0.11.1.ebuild
index 74f0a815225f..f603490c0c06 100644
--- a/x11-wm/xmonad/xmonad-0.11.1.ebuild
+++ b/x11-wm/xmonad/xmonad-0.11.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -9,7 +9,7 @@ CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
 inherit haskell-cabal
 
 DESCRIPTION="A tiling window manager"
-HOMEPAGE="http://xmonad.org"
+HOMEPAGE="https://xmonad.org/"
 SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/x11-wm/xmonad/xmonad-0.12.ebuild b/x11-wm/xmonad/xmonad-0.12.ebuild
index 8745eba3fd89..9b93f9fb4738 100644
--- a/x11-wm/xmonad/xmonad-0.12.ebuild
+++ b/x11-wm/xmonad/xmonad-0.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -10,7 +10,7 @@ CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
 inherit haskell-cabal
 
 DESCRIPTION="A tiling window manager"
-HOMEPAGE="http://xmonad.org"
+HOMEPAGE="https://xmonad.org/"
 SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/x11-wm/xmonad/xmonad-0.13.ebuild b/x11-wm/xmonad/xmonad-0.13.ebuild
index 141d10f46d5f..3dcc815ebc3a 100644
--- a/x11-wm/xmonad/xmonad-0.13.ebuild
+++ b/x11-wm/xmonad/xmonad-0.13.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
 inherit haskell-cabal
 
 DESCRIPTION="A tiling window manager"
-HOMEPAGE="http://xmonad.org"
+HOMEPAGE="https://xmonad.org/"
 SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/x11-wm/xpra/Manifest b/x11-wm/xpra/Manifest
index 7ddd8da58ecd..21eb58f6aec1 100644
--- a/x11-wm/xpra/Manifest
+++ b/x11-wm/xpra/Manifest
@@ -1,15 +1,7 @@
 AUX xpra-0.13.1-ignore-gentoo-no-compile.patch 485 BLAKE2B 2c4a9c0d0fd6e9542abbcd7834d487ca64018b43ef365478f18d8959f0602dd1f4a50f48332487aa413ad4b4f8a91946494ef223b1b2b2c887400e7f7077f429 SHA512 244d6aaa805ef0f99238a0f1ff592efc9fda9d7c3898c0e3ff8a40bfb2d27597737e941b90d1d86c794a50dc61ade8862a4be97ef4938005b0f918565dc7abe9
-AUX xpra-0.17.4-deprecated-avcodec.patch 552 BLAKE2B 3e29cbc526490b65c232756d505625b8725bb46b161676bfb19e4f34a2a404a10f2a3ceb268d9f46b8f42d482f925f646585e26665e74328e38d1cff502d5bda SHA512 9b703001634916516a82cf1a72ec9bdcb626269a5b17daa93964cb204d351986184c6597c6fc0801061bf8856f8811a68eddfe9fed331dd108d9d692f5e153fe
-AUX xpra-1.0.4-suid-warning.patch 653 BLAKE2B eff19bbea48564ca02cea70e56171e57070f42ab22b27619f66eb64991d6d9823b9dca0329af7d4e5ea935befef658b1aec953de9dd1ae8c75bb9a192b41c726 SHA512 1b12b309eba08914af59017b6f3a76f743a27cea13bee9d17d2c73334d8c762fc1c8459f32783275eed1d0de83f571a4104cf0bfc3a334d4ff09ee873458ec9c
 AUX xpra-2.0-suid-warning.patch 617 BLAKE2B dc7f1ba0ec9e30e260601f1151edb43855619a1c34bc29c05536c4dea30c8131179ea17ca30ce3ae2c87d7b374f7a02a5afcde89b6bf29921fc0a9de457e3d54 SHA512 f0d69a6e57435d6c9ef1ecb10e9fa6916b2a8b11f5979b7dffcc37c0a8ec387306b651d50ca3fe10a489cb28f6c2384fbe578510bd7f9bc7a51249e66c4d17ab
-DIST xpra-1.0.9.tar.xz 1899744 BLAKE2B a8577712c29ff637e69f0faf8224c3318397d104364376415c78099d236746c519ead198fd7436ca6ddccfa0888c394ea0ac81165a5d7d27ded0dbed66f27754 SHA512 99422ac58ebba4e1ba1ce47cf819c119249298ea4f9803d3fb9c4a3939ffd6baf3f34f6f6b3f1645fc17bd00b80410ff11f1fe30c5f79f797acf25b0ce2dd9ec
-DIST xpra-2.1.3.tar.xz 2070192 BLAKE2B b1f54705c877317bf0a3397303af2a516f6e7deb6baa252065f768bd3fd07ec87991b04c14a3aa054da0655543185dfdb99fa2972fb1cd8a2a04d72bb31fafc6 SHA512 aa916953d34477c2c80d99a4d5733586b4122edbc18f2c9952a5d3c9581f7b8e8c55cb1ed4077989876a9a7431faa9c4f7f96f82fc007034f92cacad16429ef8
-DIST xpra-2.2.1.tar.xz 2195508 BLAKE2B 5f94e96ddce7df0001ca3ffbc64570c59f02b1b49fc45c364999f47d188b1ef349018e36ed070cf8c26f60efc77c24741f44856f307b68535c982e6082dc0d7a SHA512 fca213a72805b6b1d533f91cd5e4186bd881e083663488b697c71c79fb4a3bf312fd1491aef78cf363e429c5841d706e444c9e69c72351b1551ea7fc9395c0c6
 DIST xpra-2.2.2.tar.xz 2195836 BLAKE2B 39d8354738df399d98248a0d455c3b7fa6124f374f0f6e0a476bae53b9728b9ab16c11bd759b6ff52a28295445809fb18b3379b7fc620f0916944f738a00b280 SHA512 5c09e29732c9ca7d03557e4e6070517b192484e67944532d5aeca53e518c8617f7d3a5919a2557050fbb9aa4123a0302a53720dd7036823db83588264dd3e6d2
 DIST xpra-2.2.6.tar.xz 2198720 BLAKE2B 41f238e98dbb60598cffcc3960375a525658c72db478acace0acb964fe3ee039acb5e352a76ffb5724b6c4acd63ea510505f6841f688c67d0ae2a3cbc2270642 SHA512 f47b7a8b08fc90bdf3cba91e4f7343785cdf6e24a0979f4564e9f6885b0f36c03ff5656e2d7ac5fd21895faca7b00e8839ebd66c82122a2c7cab2b40bd44e745
-EBUILD xpra-1.0.9.ebuild 3998 BLAKE2B 16d1448be9cd206232283ba7b6b31cb2d626f6066fb1c38830f5ad666ff5bd7f106145fa094aca2948598648437a0f6be5c41550416af6c35fc90e3a54770fbd SHA512 51ce11b02cbbd176f0f8ea6e12c2685a3b1a2af8f7a4af768e3756bbd12e58b7234ce63b365c2edf149f3b8d76cb1f4e1cc61064b93d0134e6b60fd6091c004c
-EBUILD xpra-2.1.3.ebuild 3931 BLAKE2B e140452157211b386f97ee56e01a410bf332b770d4dd3ab47504a7b61635243aa26ba1bf430123bb57687b37cf09cfd660826d33cbae3c66b5aacbea5e2824f4 SHA512 e77c348d3e1facfdfe68a8f2c1b9a6ac4a1f00496c5748c5a372fddfc8f0c3eb269f42e292ba88786bca66dfd1fa5ac9548c8e0384f800565d909d0436ae30a8
-EBUILD xpra-2.2.1.ebuild 4090 BLAKE2B ab05de6287b29e3928fba97f27a6637bf83506d8464859b10c7820278c99c5a5354c30be95c32e164c116e88533bdb1afe192cd5521ffbdc2047f73b9170892d SHA512 17d9f938b7d3958a77dfabc519b696a6706722927ebfbbf39b7bda327539a1b789bb857fb86a7bb3f1890a290daff4ee153fe4167b94fb0d861a65b2198c397c
-EBUILD xpra-2.2.2.ebuild 4088 BLAKE2B 8e0fe8bc971767d2f09bfe60b07673afca82f2861aa3f9e9018230d4f5a6f6986b51dd9019c5fb592980633a6145eabc0f48ef12fe58b9419edf43fa6d6c17f9 SHA512 24379373b72e3e812c3aa3956adf322e527a2c227ec563200f4e94840dee432d0fd9f0cb79bfd2d7afc5b0c4df75a250ae71b5d06846c500b6b787926d511d7a
-EBUILD xpra-2.2.6-r1.ebuild 4136 BLAKE2B a8a4f2360dbd12c012ef3645136c24187a45bf09fa1b8f514da2f106debb813e4b1f83d5299f036764f4fe1220bb80a8501edf3f3fa442713ee5c0a20d19654d SHA512 3ab2f8b5a3d028be3f5f66c76e834dffdd703f8dc4e5f3029a006d8e21e223950a8214a3dad4abce28222c4122622011f748ba31a3d6685bf583357421c18f59
-MISC metadata.xml 1028 BLAKE2B 125d8c5e383c543817024a58996fe8108a0e019523f4a44a4bb3fb16cb01b380fa724e8b8fb3d15f38bb7fd05c5937a2021dbec94b5253fb76727f65e7e78f9c SHA512 23fcf8d7e15b0f6b45de40b91d1c8a55878aa548448475a7e29a49ae978353888008fab214f7eb85e5ef097c3ea13476c624619e23e017f9e56849fb93063566
+EBUILD xpra-2.2.2-r1.ebuild 4047 BLAKE2B 0188064f36f179c378a29c0eacb418177eac49ecbe9ea844cb7638ba1e8719b3b09dfa6d9afeaede8a82161b67051c152e9186994fadad421afbd3d6872cdeb7 SHA512 f075fca9a968d24c03136ccb90c059b7ba18ef84f9beb8916f65d5534c0ad804abffd648bf9549c4892a468b59d8277c2827e58b15664140497aa1617ea934c6
+EBUILD xpra-2.2.6-r2.ebuild 4095 BLAKE2B 0e1a4646024233f18422a27886d2da0816ddafccc625aa8a2aeea7aef9078e4e8c0abc4b680ecf1aff53f9bad88a2503709bf389fa43a53ff7b16c3c03708102 SHA512 ffa6e3a20e9f753cbe5f20af611b552f5eb605deda06d82b06642053b6fcffda1b806703763024e902be8007f8962773b39f9e9591ea1a9cb6e48592c2310f46
+MISC metadata.xml 1039 BLAKE2B 26cf74924d6c5e5a7c66d5fd08719f7be5c12f3c7cc51cdcf4fc63c302ba9ec655b972569245046fd92f69dbdd8715c1b9f31d8dd3875ede21c917ef4f1ab8c4 SHA512 09e49932a811b10b60a19401d556c1b7a677bd437b589b23c868d2e124f1a9bfc60e3aaa1a64666dc5c37a66785ef92aa8afa64121f45b7f138c9944188c4a5b
diff --git a/x11-wm/xpra/files/xpra-0.17.4-deprecated-avcodec.patch b/x11-wm/xpra/files/xpra-0.17.4-deprecated-avcodec.patch
deleted file mode 100644
index 13bd4be892d5..000000000000
--- a/x11-wm/xpra/files/xpra-0.17.4-deprecated-avcodec.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- xpra-0.17.4/setup.py
-+++ xpra-0.17.4/setup.py
-@@ -660,7 +660,7 @@
-                         "-Wno-unused-function",
-                         "-Wno-sometimes-uninitialized"]
-             elif get_gcc_version()>=[4, 4]:
--                eifd = ["-Werror",
-+                eifd = ["-Werror", "-Wno-error=deprecated-declarations",
-                         #CentOS 6.x gives us some invalid warnings in nvenc, ignore those:
-                         #"-Wno-error=uninitialized",
-                         #needed on Debian and Ubuntu to avoid this error:
diff --git a/x11-wm/xpra/files/xpra-1.0.4-suid-warning.patch b/x11-wm/xpra/files/xpra-1.0.4-suid-warning.patch
deleted file mode 100644
index 9af267cb4505..000000000000
--- a/x11-wm/xpra/files/xpra-1.0.4-suid-warning.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- xpra-1.0.4/xpra/scripts/config.py
-+++ xpra-1.0.4/xpra/scripts/config.py
-@@ -130,7 +130,7 @@
-                 xorg_stat = os.stat(xorg_bin)
-                 if (xorg_stat.st_mode & stat.S_ISUID)!=0:
-                     if (xorg_stat.st_mode & stat.S_IROTH)==0:
--                        warn("%s is suid and not readable, Xdummy support unavailable" % xorg_bin)
-+                        debug("%s is suid and not readable, Xdummy support unavailable" % xorg_bin)
-                         return get_Xvfb_command()
-                     debug("%s is suid and readable, using the xpra_Xdummy wrapper" % xorg_bin)
-                     use_wrapper = True
diff --git a/x11-wm/xpra/metadata.xml b/x11-wm/xpra/metadata.xml
index d8680e04081a..81ce7aa32a08 100644
--- a/x11-wm/xpra/metadata.xml
+++ b/x11-wm/xpra/metadata.xml
@@ -2,8 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer type="person">
-	<email>xmw@gentoo.org</email>
-	<name>Michael Weber</name>
+	<email>dilfridge@gentoo.org</email>
+	<name>Andreas K. Huettel</name>
 </maintainer>
 <upstream>
 	<bugs-to>https://www.xpra.org/trac/report</bugs-to>
diff --git a/x11-wm/xpra/xpra-1.0.9.ebuild b/x11-wm/xpra/xpra-1.0.9.ebuild
deleted file mode 100644
index 299bde46e312..000000000000
--- a/x11-wm/xpra/xpra-1.0.9.ebuild
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# PyCObject_Check and PyCObject_AsVoidPtr vanished with python 3.3, and setup.py not python3.2 compat
-PYTHON_COMPAT=( python2_7 )
-inherit distutils-r1 eutils flag-o-matic user tmpfiles xdg
-
-DESCRIPTION="X Persistent Remote Apps (xpra) and Partitioning WM (parti) based on wimpiggy"
-HOMEPAGE="http://xpra.org/ http://xpra.org/src/"
-SRC_URI="http://xpra.org/src/${P}.tar.xz"
-
-LICENSE="GPL-2 BSD"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="+client +clipboard csc cups dbus dec_avcodec2 enc_ffmpeg enc_x264 enc_x265 libav +lz4 lzo opengl pillow pulseaudio server sound test vpx webcam webp"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	clipboard? ( || ( server client ) )
-	cups? ( dbus )
-	opengl? ( client )
-	|| ( client server )
-	client? ( enc_x264? ( dec_avcodec2 ) enc_x265? ( dec_avcodec2 ) )"
-
-COMMON_DEPEND=""${PYTHON_DEPS}"
-	dev-python/pygobject:2[${PYTHON_USEDEP}]
-	dev-python/pygtk:2[${PYTHON_USEDEP}]
-	x11-libs/gtk+:2
-	x11-libs/libX11
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXfixes
-	x11-libs/libXrandr
-	x11-libs/libXtst
-	x11-libs/libxkbfile
-	csc? (
-		!libav? ( >=media-video/ffmpeg-1.2.2:0= )
-		libav? ( media-video/libav:0= )
-	)
-	dec_avcodec2? (
-		!libav? ( >=media-video/ffmpeg-2:0= )
-		libav? ( media-video/libav:0= )
-	)
-	enc_ffmpeg? (
-		!libav? ( >=media-video/ffmpeg-3.2.2:0= )
-		libav? ( media-video/libav:0= )
-	)
-	enc_x264? ( media-libs/x264
-		!libav? ( >=media-video/ffmpeg-1.0.4:0= )
-		libav? ( media-video/libav:0= )
-	)
-	enc_x265? ( media-libs/x265
-		!libav? ( >=media-video/ffmpeg-2:0= )
-		libav? ( media-video/libav:0= )
-	opengl? ( dev-python/pygtkglext )
-	pulseaudio? ( media-sound/pulseaudio )
-	sound? ( media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0
-		dev-python/gst-python:1.0 )
-	vpx? ( media-libs/libvpx virtual/ffmpeg )
-	webp? ( media-libs/libwebp )
-	)"
-
-RDEPEND="${COMMON_DEPEND}
-	dev-python/ipython[${PYTHON_USEDEP}]
-	dev-python/netifaces[${PYTHON_USEDEP}]
-	dev-python/rencode[${PYTHON_USEDEP}]
-	virtual/ssh
-	x11-apps/xmodmap
-	cups? ( dev-python/pycups[${PYTHON_USEDEP}] )
-	dbus? ( dev-python/dbus-python[${PYTHON_USEDEP}] )
-	lz4? ( dev-python/lz4[${PYTHON_USEDEP}] )
-	lzo? ( >=dev-python/python-lzo-0.7.0[${PYTHON_USEDEP}] )
-	opengl? (
-		client? ( dev-python/pyopengl_accelerate[${PYTHON_USEDEP}] )
-	)
-	pillow? ( dev-python/pillow[${PYTHON_USEDEP}] )
-	server? ( x11-base/xorg-server[-minimal,xvfb]
-		x11-drivers/xf86-input-void
-	)
-	webcam? ( dev-python/numpy[${PYTHON_USEDEP}]
-		media-libs/opencv[python]
-		dev-python/pyinotify[${PYTHON_USEDEP}] )"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-	>=dev-python/cython-0.16[${PYTHON_USEDEP}]"
-
-PATCHES=( "${FILESDIR}"/${PN}-0.13.1-ignore-gentoo-no-compile.patch
-	"${FILESDIR}"/${PN}-0.17.4-deprecated-avcodec.patch
-	"${FILESDIR}"/${PN}-1.0.4-suid-warning.patch )
-
-pkg_postinst() {
-	enewgroup ${PN}
-	tmpfiles_process /usr/lib/tmpfiles.d/xpra.conf
-
-	xdg_pkg_postinst
-}
-
-python_prepare_all() {
-	sed -e "s:/var/run/xpra:${EROOT}run/xpra:" \
-		-i tmpfiles.d/xpra.conf
-
-	distutils-r1_python_prepare_all
-}
-
-python_configure_all() {
-	sed -e "/'pulseaudio'/s:not OSX and not WIN32:$(usex pulseaudio True False):" \
-		-i setup.py || die
-
-	mydistutilsargs=(
-		--without-PIC
-		--without-Xdummy
-		$(use_with client)
-		$(use_with clipboard)
-		$(use_with csc csc_swscale)
-		$(use_with cups printing)
-		--without-debug
-		$(use_with dbus)
-		$(use_with dec_avcodec2)
-		$(use_with enc_ffmpeg)
-		$(use_with enc_x264)
-		$(use_with enc_x265)
-		--with-gtk2
-		--without-gtk3
-		--without-html5
-		--without-mdns
-		--without-minify
-		$(use_with opengl)
-		$(use_with server shadow)
-		$(use_with server)
-		$(use_with sound)
-		--with-strict
-		$(use_with vpx)
-		--with-warn
-		$(use_with webcam)
-		$(use_with webp)
-		--with-x11
-	)
-
-	# see https://www.xpra.org/trac/ticket/1080
-	# and http://trac.cython.org/ticket/395
-	append-cflags -fno-strict-aliasing
-
-	export XPRA_SOCKET_DIRS="${EROOT}run/xpra"
-}
diff --git a/x11-wm/xpra/xpra-2.1.3.ebuild b/x11-wm/xpra/xpra-2.1.3.ebuild
deleted file mode 100644
index d9f9bec1770d..000000000000
--- a/x11-wm/xpra/xpra-2.1.3.ebuild
+++ /dev/null
@@ -1,145 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# PyCObject_Check and PyCObject_AsVoidPtr vanished with python 3.3
-PYTHON_COMPAT=( python2_7 )
-inherit distutils-r1 eutils flag-o-matic user tmpfiles xdg
-
-DESCRIPTION="X Persistent Remote Apps (xpra) and Partitioning WM (parti) based on wimpiggy"
-HOMEPAGE="http://xpra.org/ http://xpra.org/src/"
-SRC_URI="http://xpra.org/src/${P}.tar.xz"
-
-LICENSE="GPL-2 BSD"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="+client +clipboard csc cups dbus dec_avcodec2 enc_ffmpeg enc_x264 enc_x265 jpeg libav +lz4 lzo opengl pillow pulseaudio server sound test vpx webcam"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	clipboard? ( || ( server client ) )
-	cups? ( dbus )
-	opengl? ( client )
-	|| ( client server )
-	client? ( enc_x264? ( dec_avcodec2 ) enc_x265? ( dec_avcodec2 ) )"
-
-COMMON_DEPEND="${PYTHON_DEPS}
-	dev-python/pygobject:2[${PYTHON_USEDEP}]
-	dev-python/pygtk:2[${PYTHON_USEDEP}]
-	x11-libs/gtk+:2
-	x11-libs/libX11
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXfixes
-	x11-libs/libXrandr
-	x11-libs/libXtst
-	x11-libs/libxkbfile
-	csc? (
-		!libav? ( >=media-video/ffmpeg-1.2.2:0= )
-		libav? ( media-video/libav:0= )
-	)
-	dec_avcodec2? (
-		!libav? ( >=media-video/ffmpeg-2:0= )
-		libav? ( media-video/libav:0= )
-	)
-	enc_ffmpeg? (
-		!libav? ( >=media-video/ffmpeg-3.2.2:0= )
-		libav? ( media-video/libav:0= )
-	)
-	enc_x264? ( media-libs/x264
-		!libav? ( >=media-video/ffmpeg-1.0.4:0= )
-		libav? ( media-video/libav:0= )
-	)
-	enc_x265? ( media-libs/x265
-		!libav? ( >=media-video/ffmpeg-2:0= )
-		libav? ( media-video/libav:0= ) )
-	jpeg? ( media-libs/libjpeg-turbo )
-	opengl? ( dev-python/pygtkglext )
-	pulseaudio? ( media-sound/pulseaudio )
-	sound? ( media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0
-		dev-python/gst-python:1.0 )
-	vpx? ( media-libs/libvpx virtual/ffmpeg )"
-
-RDEPEND="${COMMON_DEPEND}
-	dev-python/ipython[${PYTHON_USEDEP}]
-	dev-python/netifaces[${PYTHON_USEDEP}]
-	dev-python/rencode[${PYTHON_USEDEP}]
-	virtual/ssh
-	x11-apps/xmodmap
-	cups? ( dev-python/pycups[${PYTHON_USEDEP}] )
-	dbus? ( dev-python/dbus-python[${PYTHON_USEDEP}] )
-	lz4? ( dev-python/lz4[${PYTHON_USEDEP}] )
-	lzo? ( >=dev-python/python-lzo-0.7.0[${PYTHON_USEDEP}] )
-	opengl? (
-		client? ( dev-python/pyopengl_accelerate[${PYTHON_USEDEP}] )
-	)
-	pillow? ( dev-python/pillow[${PYTHON_USEDEP}] )
-	server? ( x11-base/xorg-server[-minimal,xvfb]
-		x11-drivers/xf86-input-void
-	)
-	webcam? ( dev-python/numpy[${PYTHON_USEDEP}]
-		media-libs/opencv[python]
-		dev-python/pyinotify[${PYTHON_USEDEP}] )"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-	>=dev-python/cython-0.16[${PYTHON_USEDEP}]"
-
-PATCHES=( "${FILESDIR}"/${PN}-0.13.1-ignore-gentoo-no-compile.patch
-	"${FILESDIR}"/${PN}-2.0-suid-warning.patch )
-
-pkg_postinst() {
-	enewgroup ${PN}
-	tmpfiles_process /usr/lib/tmpfiles.d/xpra.conf
-
-	xdg_pkg_postinst
-}
-
-python_prepare_all() {
-	sed -e "s:/var/run/xpra:${EROOT}run/xpra:" \
-		-i tmpfiles.d/xpra.conf
-
-	distutils-r1_python_prepare_all
-}
-
-python_configure_all() {
-	sed -e "/'pulseaudio'/s:DEFAULT_PULSEAUDIO:$(usex pulseaudio True False):" \
-		-i setup.py || die
-
-	mydistutilsargs=(
-		--without-PIC
-		--without-Xdummy
-		$(use_with client)
-		$(use_with clipboard)
-		$(use_with csc csc_swscale)
-		--without-csc_libyuv
-		$(use_with cups printing)
-		--without-debug
-		$(use_with dbus)
-		$(use_with dec_avcodec2)
-		$(use_with enc_ffmpeg)
-		$(use_with enc_x264)
-		$(use_with enc_x265)
-		--with-gtk2
-		--without-gtk3
-		--without-html5
-		$(use_with jpeg)
-		--without-mdns
-		--without-minify
-		$(use_with opengl)
-		$(use_with server shadow)
-		$(use_with server)
-		$(use_with sound)
-		--with-strict
-		$(use_with vpx)
-		--with-warn
-		$(use_with webcam)
-		--with-x11
-	)
-
-	# see https://www.xpra.org/trac/ticket/1080
-	# and http://trac.cython.org/ticket/395
-	append-cflags -fno-strict-aliasing
-
-	export XPRA_SOCKET_DIRS="${EROOT}run/xpra"
-}
diff --git a/x11-wm/xpra/xpra-2.2.1.ebuild b/x11-wm/xpra/xpra-2.2.1.ebuild
deleted file mode 100644
index 5dcafddd7a59..000000000000
--- a/x11-wm/xpra/xpra-2.2.1.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# PyCObject_Check and PyCObject_AsVoidPtr vanished with python 3.3
-PYTHON_COMPAT=( python2_7 )
-inherit xdg distutils-r1 eutils flag-o-matic user tmpfiles prefix
-
-DESCRIPTION="X Persistent Remote Apps (xpra) and Partitioning WM (parti) based on wimpiggy"
-HOMEPAGE="http://xpra.org/ http://xpra.org/src/"
-SRC_URI="http://xpra.org/src/${P}.tar.xz"
-
-LICENSE="GPL-2 BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="+client +clipboard csc cups dbus dec_avcodec2 enc_ffmpeg enc_x264 enc_x265 jpeg libav +lz4 lzo opengl pillow pulseaudio server sound test vpx webcam webp"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	clipboard? ( || ( server client ) )
-	cups? ( dbus )
-	opengl? ( client )
-	|| ( client server )
-	client? ( enc_x264? ( dec_avcodec2 ) enc_x265? ( dec_avcodec2 ) )"
-
-COMMON_DEPEND="${PYTHON_DEPS}
-	dev-python/pygobject:2[${PYTHON_USEDEP}]
-	dev-python/pygtk:2[${PYTHON_USEDEP}]
-	x11-libs/gtk+:2
-	x11-libs/libX11
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXfixes
-	x11-libs/libXrandr
-	x11-libs/libXtst
-	x11-libs/libxkbfile
-	csc? (
-		!libav? ( >=media-video/ffmpeg-1.2.2:0= )
-		libav? ( media-video/libav:0= )
-	)
-	dec_avcodec2? (
-		!libav? ( >=media-video/ffmpeg-2:0= )
-		libav? ( media-video/libav:0= )
-	)
-	enc_ffmpeg? (
-		!libav? ( >=media-video/ffmpeg-3.2.2:0= )
-		libav? ( media-video/libav:0= )
-	)
-	enc_x264? ( media-libs/x264
-		!libav? ( >=media-video/ffmpeg-1.0.4:0= )
-		libav? ( media-video/libav:0= )
-	)
-	enc_x265? ( media-libs/x265
-		!libav? ( >=media-video/ffmpeg-2:0= )
-		libav? ( media-video/libav:0= ) )
-	jpeg? ( media-libs/libjpeg-turbo )
-	opengl? ( dev-python/pygtkglext )
-	pulseaudio? ( media-sound/pulseaudio )
-	sound? ( media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0
-		dev-python/gst-python:1.0 )
-	vpx? ( media-libs/libvpx virtual/ffmpeg )
-	webp? ( media-libs/libwebp )"
-
-RDEPEND="${COMMON_DEPEND}
-	dev-python/ipython[${PYTHON_USEDEP}]
-	dev-python/netifaces[${PYTHON_USEDEP}]
-	dev-python/rencode[${PYTHON_USEDEP}]
-	virtual/ssh
-	x11-apps/xmodmap
-	cups? ( dev-python/pycups[${PYTHON_USEDEP}] )
-	dbus? ( dev-python/dbus-python[${PYTHON_USEDEP}] )
-	lz4? ( dev-python/lz4[${PYTHON_USEDEP}] )
-	lzo? ( >=dev-python/python-lzo-0.7.0[${PYTHON_USEDEP}] )
-	opengl? (
-		client? ( dev-python/pyopengl_accelerate[${PYTHON_USEDEP}] )
-	)
-	pillow? ( dev-python/pillow[${PYTHON_USEDEP}] )
-	server? ( x11-base/xorg-server[-minimal,xvfb]
-		x11-drivers/xf86-input-void
-	)
-	webcam? ( dev-python/numpy[${PYTHON_USEDEP}]
-		media-libs/opencv[python]
-		dev-python/pyinotify[${PYTHON_USEDEP}] )"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-	>=dev-python/cython-0.16[${PYTHON_USEDEP}]"
-
-PATCHES=( "${FILESDIR}"/${PN}-0.13.1-ignore-gentoo-no-compile.patch
-	"${FILESDIR}"/${PN}-2.0-suid-warning.patch )
-
-pkg_postinst() {
-	enewgroup ${PN}
-	tmpfiles_process /usr/lib/tmpfiles.d/xpra.conf
-
-	xdg_pkg_postinst
-}
-
-python_prepare_all() {
-	hprefixify -w '/os.path/' setup.py
-	hprefixify tmpfiles.d/xpra.conf xpra/server/{server,socket}_util.py \
-		xpra/platform{/xposix,}/paths.py xpra/scripts/server.py
-
-	distutils-r1_python_prepare_all
-}
-
-python_configure_all() {
-	sed -e "/'pulseaudio'/s:DEFAULT_PULSEAUDIO:$(usex pulseaudio True False):" \
-		-i setup.py || die
-
-	mydistutilsargs=(
-		--without-PIC
-		--without-Xdummy
-		$(use_with client)
-		$(use_with clipboard)
-		$(use_with csc csc_swscale)
-		--without-csc_libyuv
-		$(use_with cups printing)
-		--without-debug
-		$(use_with dbus)
-		$(use_with dec_avcodec2)
-		$(use_with enc_ffmpeg)
-		$(use_with enc_x264)
-		$(use_with enc_x265)
-		--with-gtk2
-		--without-gtk3
-		--without-html5
-		$(use_with jpeg)
-		--without-mdns
-		--without-minify
-		$(use_with opengl)
-		$(use_with server shadow)
-		$(use_with server)
-		$(use_with sound)
-		--with-strict
-		$(use_with vpx)
-		--with-warn
-		$(use_with webcam)
-		$(use_with webp)
-		--with-x11
-	)
-
-	# see https://www.xpra.org/trac/ticket/1080
-	# and http://trac.cython.org/ticket/395
-	append-cflags -fno-strict-aliasing
-
-	export XPRA_SOCKET_DIRS="${EPREFIX}/run/xpra"
-}
diff --git a/x11-wm/xpra/xpra-2.2.2.ebuild b/x11-wm/xpra/xpra-2.2.2-r1.ebuild
index 4b7a6699baf9..5cb93348090d 100644
--- a/x11-wm/xpra/xpra-2.2.2.ebuild
+++ b/x11-wm/xpra/xpra-2.2.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -63,7 +63,6 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	webp? ( media-libs/libwebp )"
 
 RDEPEND="${COMMON_DEPEND}
-	dev-python/ipython[${PYTHON_USEDEP}]
 	dev-python/netifaces[${PYTHON_USEDEP}]
 	dev-python/rencode[${PYTHON_USEDEP}]
 	virtual/ssh
diff --git a/x11-wm/xpra/xpra-2.2.6-r1.ebuild b/x11-wm/xpra/xpra-2.2.6-r2.ebuild
index 12fe5f472783..6602c5a6ba85 100644
--- a/x11-wm/xpra/xpra-2.2.6-r1.ebuild
+++ b/x11-wm/xpra/xpra-2.2.6-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -63,7 +63,6 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	webp? ( media-libs/libwebp )"
 
 RDEPEND="${COMMON_DEPEND}
-	dev-python/ipython[${PYTHON_USEDEP}]
 	dev-python/netifaces[${PYTHON_USEDEP}]
 	dev-python/rencode[${PYTHON_USEDEP}]
 	virtual/ssh
author	V3n3RiX <venerix@redcorelinux.org>	2018-12-24 14:11:38 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2018-12-24 14:11:38 +0000
commit	de49812990871e1705b64051c35161d5e6400269 (patch)
tree	5e1e8fcb0ff4579dbd22a1bfee28a6b97dc8aaeb /x11-wm
parent	536c3711867ec947c1738f2c4b96f22e4863322d (diff)