gentoo resync : 25.01.2018

3 files changed, 2 insertions, 43 deletions

diff --git a/x11-misc/screengrab/Manifest b/x11-misc/screengrab/Manifest
index 48d2a9f99af6..0188bfb4a5b7 100644
--- a/x11-misc/screengrab/Manifest
+++ b/x11-misc/screengrab/Manifest
@@ -1,5 +1,3 @@
-DIST screengrab-1.2.1.tar.gz 156692 BLAKE2B 481a989de626a8307544ba8dd55bde95019c646fa238657543b024c34ca9c0cb4ae502acf0dcaeb9a0db8af96e4cef068de20fb3919cfa2745f956a2444a7c2c SHA512 12892eaf33fe48875c1d0dccdc631cc64c246ba2ba10432539099b35e75c36f19c8ff8b97dee959575f214ea852d1afaa9cf46476f98e0978b379a05df101805
 DIST screengrab-1.97.tar.gz 161792 BLAKE2B c2f53cd3d7333d89737ae55753a03de2d3c39f7adcc85f278d54bfb6d734e6f71d9126f035184262bf437e4a5032350f4f7a07060a3eb4014dab15563f78db29 SHA512 4fea4fe68a212ef5436b4f2b2db64e6f830233e5af0cd28259ad84d292e5df6a38e22de1ba40efe083f18ffc973be78aafa0d9eed990229b5e2a8660d1b6ece1
-EBUILD screengrab-1.2.1-r1.ebuild 707 BLAKE2B f9f7ed2d34b20d75db942af7596007184b74c3bf06f0848cb1b6209035c4612768c5ff824369bef21bd9cea4e08da8f81fffecf5674554996066bf501853e935 SHA512 65cde44c9e4b59427eb1e612524ae6af87c666aac8e86cdc7ba7543e2f1e709a4563ffa60da2f08f91a67a4048fbadde5719d210ebef9271a9ebae84b0ac8b06
-EBUILD screengrab-1.97.ebuild 719 BLAKE2B 1efa0f65ecee9d139b1dfa1b77167aaadd70aafee59eeb3c8ae3127ad23072e7136f9f17494c375917433b98702af36c8b3dc581537efc30c0c76c293f3e2d17 SHA512 c2eb52cd647dc6e4da83c50be5fc51d77057cb39d5163b3d5e89cac43092d19d53548025f3a581307450e98a39e955aa050d71b656c61ae6b79470ea77e9b20f
+EBUILD screengrab-1.97.ebuild 718 BLAKE2B 9ea014854d796cc578a7ac45b172d01d3f0f2aba416ace4128f75b66e6c4a2c1fe3c00fa88242d3e4e27e0ab9a63e4f558a8e1399a38caabc8c0ddbebd2344aa SHA512 fe7adc46cd3f8b27ef1401b0f88018b484755a73332037191b2cf4c23752593eb76b52a4c25c08d6174e16718a931b3e30ddc7271091dc2a5496d372397eb137
 MISC metadata.xml 444 BLAKE2B 2fb0a84a26a3063f8bbd3b1ad9857b358935de8e262b5ad60be88e62f36568c4fc2e0f5f42728de6e414ee21ec14ea61b14515fee9711e10ea5ab9bb2b998e1a SHA512 7fd9195b7a9cf80ebcf7b845bb8a85adbf2ea5c83988ea389c10a7c56300fd0678ff901eecf907afa755500b3cf18b6a165fa2587ad9dcbd234f36a4c4254956
diff --git a/x11-misc/screengrab/screengrab-1.2.1-r1.ebuild b/x11-misc/screengrab/screengrab-1.2.1-r1.ebuild
deleted file mode 100644
index f74d9c2b1491..000000000000
--- a/x11-misc/screengrab/screengrab-1.2.1-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-utils
-
-DESCRIPTION="Qt application for getting screenshots"
-HOMEPAGE="http://screengrab.doomer.org"
-SRC_URI="https://github.com/DOOMer/screengrab/archive/1.2.1.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="
-	dev-qt/qtcore:4
-	dev-qt/qtgui:4
-	x11-libs/libqxt
-	x11-libs/libX11
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	sed -i -e "/LICENSE.txt/d" CMakeLists.txt || die
-	rm -r src/3rdparty || die
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DSG_DOCDIR=${PF}
-		-DSG_USE_SYSTEM_QXT=ON
-	)
-
-	cmake-utils_src_configure
-}
diff --git a/x11-misc/screengrab/screengrab-1.97.ebuild b/x11-misc/screengrab/screengrab-1.97.ebuild
index e2d42076a371..6e9bf5da14d2 100644
--- a/x11-misc/screengrab/screengrab-1.97.ebuild
+++ b/x11-misc/screengrab/screengrab-1.97.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/QtDesktop/screengrab/archive/${PV}.tar.gz -> ${P}.ta
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="