gentoo resync : 08.06.2019

9 files changed, 91 insertions, 83 deletions

diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz
index 7cf463086907..2ba8e8f6bbd8 100644
--- a/x11-wm/Manifest.gz
+++ b/x11-wm/Manifest.gz
diff --git a/x11-wm/herbstluftwm/Manifest b/x11-wm/herbstluftwm/Manifest
index f8c9ffd9376f..ae7de38e46f5 100644
--- a/x11-wm/herbstluftwm/Manifest
+++ b/x11-wm/herbstluftwm/Manifest
@@ -1,6 +1,8 @@
 DIST herbstluftwm-0.7.0.tar.gz 247469 BLAKE2B 3ee6c4709bd52ad330706aa941fba4372003f6d494759bc0fc87bcf34cffd07a55d5d4b550de13af059d4455ce240e6be3151b8f7563f3fb0d1dc4ef79306c58 SHA512 792e517dff5cfb075b8b5a42b076a7809e983953620212de6d571d3d606c573c83606a0f7694e25d3351c288473f5129191a416fe8977db8438c1016503eacd8
 DIST herbstluftwm-0.7.1.tar.gz 244726 BLAKE2B bdc8b769c3991276f03540024212315310aab4c5980321a3f019d5dc044b862aa606746d968e01bb0d8280b10ecf2f7f300710e2ac5cba46afd3129c316df5ae SHA512 1eb25c6e64bc046fca4b93cb9158515dba793bb14676229cc9c9194660eeccfc0c907ddcc4b15581b9ffb8b7f261ad3e2c8efe60a5d11eeb836208dd289dc199
+DIST herbstluftwm-0.7.2.tar.gz 245506 BLAKE2B 72d0bb2a77e519161d193ac7b2b9f1f878ccb6cfe4914b6c75d060e2daa0bec4203ee4ebf203b9fa1dfb844d71d50aa7c03257c78aa22e906bf42519d1e592af SHA512 abb49bbc3de9a0ef619ce7063c1cea0d0d25ab2195c53dc0d33e061ad24060da4bbe9b99b9b9126028cdf68b462d4fcc8d1534431e4892d571ff897a68d2113c
 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
+EBUILD herbstluftwm-0.7.2.ebuild 1559 BLAKE2B cd44c6a88dfd2f1084b279a391768b6aeb5baeeed638fc07294b736567574360cd6740543497c40c852a2ec76850e32e438ec61cf18e8391ed434a96a13c8310 SHA512 46153fc48f0993b6d09553d34be9df56d1d2aa69cfbc068af2bd8d65766f1b8db1ed7032690859f077781481f0bde7c2b1942085dfd51aabab5343de4e4758bf
+EBUILD herbstluftwm-9999.ebuild 1559 BLAKE2B cd44c6a88dfd2f1084b279a391768b6aeb5baeeed638fc07294b736567574360cd6740543497c40c852a2ec76850e32e438ec61cf18e8391ed434a96a13c8310 SHA512 46153fc48f0993b6d09553d34be9df56d1d2aa69cfbc068af2bd8d65766f1b8db1ed7032690859f077781481f0bde7c2b1942085dfd51aabab5343de4e4758bf
 MISC metadata.xml 246 BLAKE2B a30d57a217fcd3c7c7d170b71f1ab806d11e9b520595802ebfb0123a82682d4fc045f033b164402ac51f939fef7cad737eb2012f62864298b6c5d23c69575519 SHA512 ca07e0609b698c2b53062b71008fee49b91af78fc2ef25997311e37985d79283d333f5b842257a16e7dee36ce34c07d405e1f93742f341f10ca70904e9f9a4e6
diff --git a/x11-wm/herbstluftwm/herbstluftwm-0.7.2.ebuild b/x11-wm/herbstluftwm/herbstluftwm-0.7.2.ebuild
new file mode 100644
index 000000000000..0cea06f49ee7
--- /dev/null
+++ b/x11-wm/herbstluftwm/herbstluftwm-0.7.2.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+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 f9e402083ad2..0cea06f49ee7 100644
--- a/x11-wm/herbstluftwm/herbstluftwm-9999.ebuild
+++ b/x11-wm/herbstluftwm/herbstluftwm-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 inherit toolchain-funcs bash-completion-r1
 
 if [[ ${PV} == 9999* ]] ; then
diff --git a/x11-wm/muffin/Manifest b/x11-wm/muffin/Manifest
index 2a73c7bbee10..904fc0517da3 100644
--- a/x11-wm/muffin/Manifest
+++ b/x11-wm/muffin/Manifest
@@ -5,5 +5,5 @@ DIST muffin-3.8.2.tar.gz 2723114 BLAKE2B f8218ac1f71ecfa5b74ca7ae8cf76d76e1207e3
 DIST muffin-4.0.3.tar.gz 5194156 BLAKE2B 8d58d37f8410ad5384c09a4edabd3ca5bd8a3a612825ded55bf625a9a8c2ba8aba295187e3eb727fc248716b3efe84e9a567a49f95635150c4bda5f309545ed2 SHA512 34a3f152d2701e06498f2de28639af656bd4efa6c7d5c56244fe9002cf769e929fc2360bd036509318fab9c4fe73c976605c3fdb444c9280f52e6db27867a14c
 EBUILD muffin-3.6.0.ebuild 2047 BLAKE2B 91bef2b48265f8abb8e72430404ea3b5bb86a9fb7603f7a5f6eca1ce04888a5693c42773abce631544083f0ac33075bb6b1f53ada813cd3249736671a6a38571 SHA512 3c8f33c6760d08a48b9d5cb58ab58afddd6294beabfd46653e5525db99a66abbbe69ad98f0ba14f4bbd8e05e093f1e480bea8948f00f27c8956b7b02a90b9314
 EBUILD muffin-3.8.2.ebuild 2049 BLAKE2B 787f368ec25ce0ba32712fee1304c575e1727f96e0867d2122cec4b303bfcb736e948adfe1db55761790c2d3605bb618450f85e1727c146e8b23c6ea85857b85 SHA512 a7caafcc86ae7fc2327eec12e445e86056cdc080d2ec8870cd67e74e80890b1ed1fd50fe41dbed23c54e1a57229d9f41447dd52136b9453ef29e4cadfd187de9
-EBUILD muffin-4.0.3.ebuild 2028 BLAKE2B 8947af0e8e8f32ed35aa493d8a0eb1a75f09fa142aae590f956f43683d44129e555a972b152410376edc226ae81520059e6c2b89def1c5a794d5e5162be3f2eb SHA512 4bcbd1a07cf209ad3a097a8353da96e2b4265898463da6763c70d2e4e7116003e7208db8c1b6686999db09473b8b8ec1a0797a6e00056847d4f43ffc5098d5cb
+EBUILD muffin-4.0.3.ebuild 2026 BLAKE2B cc032e3a46a86e52a9b235a6df018cb50028987de9e91d40fa92fb240011eb322fa6b265dd4b79290874430d61bbcb9e0df1cb57b953557e6fd332debc4c2d90 SHA512 80d397c253b6ffe00b9420b99a650df2f6e77b1e150d083828e99b68ca8a88c8a0c30fa41ec81b3b80b04ac4e112a047c406e60ee219a79b673a5b915e3adc14
 MISC metadata.xml 333 BLAKE2B d29a873cc8702d8251ff425eca5ec16b4ea2a75f4e512c05513c3a6a61e38e0fde4450158503cdb2e71b324c86a7e66e03c1eecba8bff6a6be81244f040ceaad SHA512 42c7d8e82dd95e76e6b72973d53a0a27de2562108b5989092c34804140d336dcb20b331a4c70b1fcf6730ef5f377f366f480271597c63f7ce3e8f7aa8d359555
diff --git a/x11-wm/muffin/muffin-4.0.3.ebuild b/x11-wm/muffin/muffin-4.0.3.ebuild
index 612e2ad001ad..47f849d8b751 100644
--- a/x11-wm/muffin/muffin-4.0.3.ebuild
+++ b/x11-wm/muffin/muffin-4.0.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="amd64 x86"
 
 RESTRICT="test"
 
diff --git a/x11-wm/musca/Manifest b/x11-wm/musca/Manifest
index 7f7fca5a3138..0a05039cd6d0 100644
--- a/x11-wm/musca/Manifest
+++ b/x11-wm/musca/Manifest
@@ -5,6 +5,5 @@ AUX musca-0.9.24_p20100226-fix-pad.patch 818 BLAKE2B b89d6eea59c6c172832750e9d42
 AUX musca-0.9.24_p20100226-null.patch 4271 BLAKE2B 52ec8124f563fbe0e3b281e36cabc4b59ed0a8091af40dee2eddc49b2d2cd1233a2c8bf6da5feb3e3251a4df4a5ead0922b6af66cbb96cdfb01ee9b287ed9797 SHA512 76bf5d67eee6a5045d1781b818333ef36bac87276bb6050b794502abc4aa77a930092f62ec07622ee18f6bb270924ec40813ee70d25ea8e5d3cf1458a39569a5
 AUX musca.xsession 16 BLAKE2B ce00d05a09d8611a71c4d219a48bcc3e9386deb67c5ccb7d6638fab0d41862f0a503cb0ff506b71881606abb2a36da3d0df717791ff95cb8b344370ce3c4d366 SHA512 f276046ab82ceeaebf5307ea9050d55767a55cbd1913854ef0f73bdf162d2d751537ad604fc2a99d8d9c9b89426b609f127451c7a3f6b36868c74842d28a8622
 DIST musca-0.9.24_p20100226.tgz 81490 BLAKE2B 6aa9ccdd94749df1a701d605f07c29f8dbb7cb0afb73bdb9392d35df7e518496219e972535e671dd5d6d32520fa7e1d928e91489c2a303aebfe051cdd11a5230 SHA512 9030931dbc332fce144edc6bea907d86aab1eef6b1384958a7889b533af5065a2f20b7233ea063648fff0eb468c2083a310e38586c2c4d83848c773fb1984f45
-EBUILD musca-0.9.24_p20100226-r3.ebuild 1180 BLAKE2B a54c5c5492f08781e36f8da2429bad0d52b84006ca7c81a15075b867864466d0a0eb0219f1223ee2ce28bc77a27c85ea735c554f003677e805077722b5d63169 SHA512 bca766ac4931ad5d81ca212b44c69f85a318a175a303340b8e3116790bda7cae9600aa1108081b3c128c34b8d99aa6d7f0ad6a7120ee80c86dfcc990853bc2e1
-EBUILD musca-0.9.24_p20100226-r4.ebuild 1234 BLAKE2B c729fb8db4480ffacf76ebd4694da222c9e48e280ddadcc10adc5ca1375725ec602a2e4ef6a46d70d573256f921efde1b0178a6fb7e93e22ff983d7b92183de6 SHA512 87c82a3f29f69d4364238a7041ff9867a95d2fe98a85b5af132ceb6d6e054797505d896562be1efe285051c50f6e6dfc1043db99311d4f41d4ac04796cac3d76
+EBUILD musca-0.9.24_p20100226-r4.ebuild 1220 BLAKE2B 1fca1b50cb9c9e918bb4033e26d48ecc382b0734fc0be211a72cc385ff9a917c771d86b3bf7cfdb3d0e4e139190ab28ea6db6ec1284fca838fa77c06499c1461 SHA512 39ae3a9813bf5fb2cbc057c520e60c8348301800df958aac9860ef3de8857095c6d36037ca82646fbfe0ce71c19f1378392329b1c25860a6c565a290a6cd09cd
 MISC metadata.xml 486 BLAKE2B 12bdde943981e2eb7a6dc26a6744d596a8fce6b8125f788e760f27d1d7f3f6d8c840b173d7cd3418371a33fe2f064421b4f66484507dff22ea4895695a89cd8f SHA512 098a06d7dff066cf54e909923066078fc8347f7402846a66c26bae0e5df4752cd5a44dec6457e977b2060be5f3068e16ad5147e151ea1b4cac23b4e9e20c136a
diff --git a/x11-wm/musca/musca-0.9.24_p20100226-r3.ebuild b/x11-wm/musca/musca-0.9.24_p20100226-r3.ebuild
deleted file mode 100644
index df917b3ed563..000000000000
--- a/x11-wm/musca/musca-0.9.24_p20100226-r3.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit eutils savedconfig toolchain-funcs
-
-DESCRIPTION="A simple dynamic window manager, with features nicked from ratpoison and dwm"
-HOMEPAGE="https://launchpad.net/musca"
-SRC_URI="mirror://gentoo/${P}.tgz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="apis xlisten"
-
-COMMON="x11-libs/libX11"
-DEPEND="${COMMON}
-	sys-apps/sed"
-RDEPEND="
-	${COMMON}
-	>=x11-misc/dmenu-4.4
-	apis? ( x11-misc/xbindkeys )
-"
-
-src_prepare() {
-	restore_config config.h
-
-	sed -i config.h \
-		-e 's:"sort | dmenu -i -b":"-i -b":g' \
-		-e 's:sed.*exec.*-i::g' \
-		|| die
-
-	epatch \
-		"${FILESDIR}"/${PN}-0.9.24-make.patch \
-		"${FILESDIR}"/${PN}-0.9.24_p20100226-dmenu-4.4.patch \
-		"${FILESDIR}"/${PN}-0.9.24_p20100226-null.patch
-
-	local i
-	for i in apis xlisten; do
-		if ! use ${i}; then
-			sed -e "s|${i}||g" -i Makefile || die
-		fi
-	done
-
-	tc-export CC
-}
-
-src_install() {
-	dobin musca
-
-	local i
-	for i in xlisten apis; do
-		if use ${i}; then
-			dobin ${i}
-		fi
-	done
-	doman musca.1
-
-	exeinto /etc/X11/Sessions
-	newexe "${FILESDIR}"/${PN}.xsession musca
-
-	save_config config.h
-}
diff --git a/x11-wm/musca/musca-0.9.24_p20100226-r4.ebuild b/x11-wm/musca/musca-0.9.24_p20100226-r4.ebuild
index adef927a76b5..3b59bc329b78 100644
--- a/x11-wm/musca/musca-0.9.24_p20100226-r4.ebuild
+++ b/x11-wm/musca/musca-0.9.24_p20100226-r4.ebuild
@@ -2,7 +2,6 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-
 inherit savedconfig toolchain-funcs
 
 DESCRIPTION="A simple dynamic window manager, with features nicked from ratpoison and dwm"
@@ -11,14 +10,24 @@ SRC_URI="mirror://gentoo/${P}.tgz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="apis xlisten"
 
-DEPEND="x11-libs/libX11"
+DEPEND="
+	x11-libs/libX11
+"
 RDEPEND="
 	${DEPEND}
 	>=x11-misc/dmenu-4.4
-	apis? ( x11-misc/xbindkeys )"
+	apis? ( x11-misc/xbindkeys )
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.9.24-make.patch
+	"${FILESDIR}"/${PN}-0.9.24_p20100226-dmenu-4.4.patch
+	"${FILESDIR}"/${PN}-0.9.24_p20100226-null.patch
+	"${FILESDIR}"/${PN}-0.9.24_p20100226-fix-cycle.patch
+	"${FILESDIR}"/${PN}-0.9.24_p20100226-fix-pad.patch
+)
 
 src_prepare() {
 	restore_config config.h
@@ -28,13 +37,7 @@ src_prepare() {
 		-e 's:sed.*exec.*-i::g' \
 		|| die
 
-	eapply \
-		"${FILESDIR}"/${PN}-0.9.24-make.patch \
-		"${FILESDIR}"/${PN}-0.9.24_p20100226-dmenu-4.4.patch \
-		"${FILESDIR}"/${PN}-0.9.24_p20100226-null.patch \
-		"${FILESDIR}"/${PN}-0.9.24_p20100226-fix-cycle.patch \
-		"${FILESDIR}"/${PN}-0.9.24_p20100226-fix-pad.patch
-	eapply_user
+	default
 
 	local i
 	for i in apis xlisten; do