gentoo resync : 04.05.2019

3 files changed, 2 insertions, 53 deletions

diff --git a/x11-misc/xcompmgr/Manifest b/x11-misc/xcompmgr/Manifest
index 0a28801dda27..bc2845c7f04c 100644
--- a/x11-misc/xcompmgr/Manifest
+++ b/x11-misc/xcompmgr/Manifest
@@ -1,5 +1,3 @@
-DIST xcompmgr-1.1.7.tar.bz2 136667 BLAKE2B 3231cca0cebc13aade6f008414d77461913d274303289c28b8eb366640905cf9bbb4715d5aa7ad8eb897ac94db099b040e408b2e3867dd2ad46940b3bcfe518f SHA512 f93a6be78169dd41ff08d71409e28746fd62902810a2f6930c0ac44f1415bc7391a8fb885b074fd40afedd7f1c1590aa7c67fc101c3b6488ddaa74495b42149c
 DIST xcompmgr-1.1.8.tar.bz2 138806 BLAKE2B 85a7cd04c97c3594ab9acf7888aa0024b60027654dc8fa609c8f2fb801b5cd58105aa50c2afe9c322a02657eeea6e57da3f35720ac63c191a81c62fbf9ee4468 SHA512 ccf29426ffb0797a53653d1ce152de5eee0cec284811fed4b8e634ea0d948180531e4619d96f47e4f9594432c57322624fe0fdaee2c9200efac427fc0904953d
-EBUILD xcompmgr-1.1.7-r1.ebuild 925 BLAKE2B 7e60d31646a305ce57ea6139e78519d6d0a1e222653e71b4deddd84936ed7642e17b0f3760fe6c48a20b19b608a902ccd2574ca432104b6b865a954b84d7011e SHA512 c77097b068b1a6913bae00aaf5ea207a6a8162bd70dd0e6c04c6e389a91ef341b595db99b43f6203078eb6e0b444ec255d848f7cf74eb51cb90727d9c43e2ef8
-EBUILD xcompmgr-1.1.8.ebuild 416 BLAKE2B 04a4b8a7c34925582f4dfbe46bc4fdd34c7eef8482b0ae8388d839e2504da536955cefeebbfff7299f0910bcae1131a3c66143c344b370e4a3c639a1a5fea1d6 SHA512 29dfa74a8e4f1ae64ce39f147eecc806dcf3cc0d5ec814b6a0bb7677c0ba184c1e0bbfbc91eafc9adc4ed025eee471c2202acb9ef26c751b0ac01b2efaf196a2
+EBUILD xcompmgr-1.1.8.ebuild 415 BLAKE2B 3f51a4d05113a84fed66ddd4b9eebefd4a516a4d62f1487a2ea68b6c9f706f129fffc557b7448ac4cdfe885adbcfb8236640ac4fd1dad56f4a004a0675d4c4cf SHA512 9ca5febb86bdc02de115c769d5430104244e061fd4d5735610fa9272113a8aec6425f5a727fd9c4d029854c6a201aeaa0b112cdf0ce305fa8e6b6fdedda583de
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-misc/xcompmgr/xcompmgr-1.1.7-r1.ebuild b/x11-misc/xcompmgr/xcompmgr-1.1.7-r1.ebuild
deleted file mode 100644
index 1934ad373f37..000000000000
--- a/x11-misc/xcompmgr/xcompmgr-1.1.7-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="X Compositing manager"
-HOMEPAGE="https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/xcompmgr"
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/app/xcompmgr.git"
-	inherit autotools git-r3
-	# x11-misc-util/macros only required on live ebuilds
-	LIVE_DEPEND=">=x11-misc/util-macros-1.18"
-else
-	SRC_URI="mirror://xorg/app/${P}.tar.bz2"
-	KEYWORDS="amd64 ppc ppc64 sparc x86"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-BDEPEND="
-	virtual/pkgconfig
-"
-RDEPEND="
-	x11-libs/libXrender
-	x11-libs/libXdamage
-	x11-libs/libXfixes
-	x11-libs/libXcomposite
-	x11-libs/libXext
-"
-DEPEND="
-	${LIVE_DEPEND}
-	${RDEPEND}
-"
-
-src_prepare() {
-	default
-	[[ ${PV} == 9999 ]] && eautoreconf
-}
-
-src_configure() {
-	local econfargs=(
-		--disable-selective-werror
-	)
-
-	econf "${econfargs[@]}"
-}
diff --git a/x11-misc/xcompmgr/xcompmgr-1.1.8.ebuild b/x11-misc/xcompmgr/xcompmgr-1.1.8.ebuild
index edaf48fbd64b..5d3be298debd 100644
--- a/x11-misc/xcompmgr/xcompmgr-1.1.8.ebuild
+++ b/x11-misc/xcompmgr/xcompmgr-1.1.8.ebuild
@@ -10,7 +10,7 @@ inherit xorg-3
 DESCRIPTION="X Compositing manager"
 
 LICENSE="BSD"
-KEYWORDS="amd64 ppc ppc64 ~sparc x86"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE=""
 
 RDEPEND="