gentoo resync : 05.01.2018

6 files changed, 13 insertions, 48 deletions

diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index bcc2fe5db33f..7112b3b1345f 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/qtpass/Manifest b/app-admin/qtpass/Manifest
index 5f7e586f1e05..3d6f9adb7121 100644
--- a/app-admin/qtpass/Manifest
+++ b/app-admin/qtpass/Manifest
@@ -1,4 +1,3 @@
-DIST qtpass-1.1.6.tar.gz 325329 BLAKE2B 091cc00bc276f637a5d7f954a715a6e3687e1b369f1fd572f90c956c721524159a82d4283b025980f9b31132e07236706bd79fbbb830adccd3167a979bca48cc SHA512 64d712a33df97b04ab1a9d5472aa7fa567e38e31ff7ba297e567d087a3f32b1c59097b339cdd4f568efc2bce16b93f2d2316e94d2605b6abac299d7cf7d0c3df
-EBUILD qtpass-1.1.6.ebuild 836 BLAKE2B d93e43f531d38b7e15fc89c539532bf585a1290a01d0fa77caed77cb822cda45352af6f304bfe5ba9feb827767036d68793c92aaa0d1518aea40dc0223da2aa2 SHA512 b928a3be74e020b6397e78c97d7573830aaea0468329f0b410490ab3d0680a6bb717ba11ff05aaa0f603e441561f970c944a934317db8b6350cd1e36da062c05
-EBUILD qtpass-9999.ebuild 761 BLAKE2B 2d3f283b751ae7a8384e6cdd954b762f6f6fb14d3a967ae5c639b6a530ecfef2d06c1f347c0b65c59a27c4f23128e5bb2bc811df2c00133fdb2d323dcedc1885 SHA512 351ce80ec7d8116e0f3b970d54d1ae59bcfef2ee24ba14ed61cae44e140c8b59c882b531afdb00552c3151eedb1e53052fca9f9fb1b0aa12b851ae1f09a3776b
+DIST qtpass-1.2.1.tar.gz 361147 BLAKE2B f46ce4362d4d3e0c0b0a425e5a40cf013181b899d5b1a2efc03cc5c4a3eca2d3ce1cdca78fdb95e8fecae23ffe56c01dbe65c9d07e2fff48934e995a710aac40 SHA512 3621a46aab5db5a41e80aea10bc6baf662510bcb249a1f56d33492aa66c824d9f018164f2d6a70256a7b3d59a9b73c4c8459b5d3fbe19886a607f8f0dc7410c1
+EBUILD qtpass-1.2.1.ebuild 1016 BLAKE2B 3ee5b9d94395092a92f71bf20f2392c8a4cbc36fbefd7a61ec8568913b1c52acf3bc7f4ba5ee1d347de187ae4e5dd8b031c58163987a2dd444ac59650e65f49c SHA512 2b12c48a02a6bd43fb3e105d26390cbb7fca23999634f04f4cf5f02a06aa7a583f9e120f1c9ee32f84982c99edb0bbb6832ccec6cede8c76a6536ea3ffcd2e26
 MISC metadata.xml 571 BLAKE2B 1fec9b040ae2b49beec1b99abd0853f631275d3c7f22584a42b503d008ff9403edcd451194881d09224ab0d41ff0598dea2dc7a403aea0227adc4909d02deaad SHA512 937b219855427d7423067037b05ea3b7f19c01eca32fa38e3d6bad9354da039bf2be63a6450f0ebd71fcbd7b6b15b8ca1f993b89391597b1bfb7e3db3d3c04ae
diff --git a/app-admin/qtpass/qtpass-1.1.6.ebuild b/app-admin/qtpass/qtpass-1.2.1.ebuild
index 67195457fc95..dc949c150fc4 100644
--- a/app-admin/qtpass/qtpass-1.1.6.ebuild
+++ b/app-admin/qtpass/qtpass-1.2.1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 MY_P="QtPass-${PV}"
 
-inherit qmake-utils
+inherit qmake-utils desktop
 
 DESCRIPTION="multi-platform GUI for pass, the standard unix password manager"
 HOMEPAGE="https://qtpass.org/"
@@ -27,6 +27,12 @@ RDEPEND="app-admin/pass
 DEPEND="${RDEPEND}
 	dev-qt/linguist-tools:5"
 
+src_prepare() {
+	default
+
+	sed -i 's/SUBDIRS += src tests main/SUBDIRS += src main/' "${S}"/qtpass.pro || die
+	sed -i '/main\.depends = tests/d' "${S}"/qtpass.pro || die
+}
 src_configure() {
 	eqmake5 PREFIX="${D}"/usr
 }
diff --git a/app-admin/qtpass/qtpass-9999.ebuild b/app-admin/qtpass/qtpass-9999.ebuild
deleted file mode 100644
index 8da3eb46f11f..000000000000
--- a/app-admin/qtpass/qtpass-9999.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit qmake-utils git-r3
-
-DESCRIPTION="multi-platform GUI for pass, the standard unix password manager"
-HOMEPAGE="https://qtpass.org/"
-EGIT_REPO_URI="https://github.com/IJHack/${PN}.git"
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS=""
-IUSE=""
-DOCS=( FAQ.md README.md CONTRIBUTING.md )
-
-RDEPEND="dev-qt/qtcore:5
-	dev-qt/qtgui:5[xcb]
-	dev-qt/qtwidgets:5
-	dev-qt/qtnetwork:5
-	app-admin/pass
-	net-misc/x11-ssh-askpass"
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5
-"
-
-src_configure() {
-	eqmake5 PREFIX="${D}"/usr
-}
-
-src_install() {
-	default
-
-	doman ${PN}.1
-
-	insinto /usr/share/applications
-	doins "${PN}.desktop"
-
-	newicon artwork/icon.svg "${PN}-icon.svg"
-}
diff --git a/app-admin/systemrescuecd-x86/Manifest b/app-admin/systemrescuecd-x86/Manifest
index b5e069526710..a719cd26e5a2 100644
--- a/app-admin/systemrescuecd-x86/Manifest
+++ b/app-admin/systemrescuecd-x86/Manifest
@@ -59,5 +59,5 @@ EBUILD systemrescuecd-x86-5.0.3.ebuild 1590 BLAKE2B 8addcff756be5ff7bc9359ed5f0e
 EBUILD systemrescuecd-x86-5.0.4.ebuild 1590 BLAKE2B 8addcff756be5ff7bc9359ed5f0e618cd04e75f1592bda9f3b5075e48fd9d9e8b53e03e47692a662f613a5e7c0802f546e463a726cd53c1ad10694269e13edba SHA512 24cbac4ee85b17de9750c9a397ff196fc0e4694d5535dccefe6eeeb12762482bd6b957eab6f1de1a2ca301eaf48e423bad0e74a83a02033f5b42baf20f68399c
 EBUILD systemrescuecd-x86-5.1.0.ebuild 1590 BLAKE2B 8addcff756be5ff7bc9359ed5f0e618cd04e75f1592bda9f3b5075e48fd9d9e8b53e03e47692a662f613a5e7c0802f546e463a726cd53c1ad10694269e13edba SHA512 24cbac4ee85b17de9750c9a397ff196fc0e4694d5535dccefe6eeeb12762482bd6b957eab6f1de1a2ca301eaf48e423bad0e74a83a02033f5b42baf20f68399c
 EBUILD systemrescuecd-x86-5.1.1.ebuild 1590 BLAKE2B 8addcff756be5ff7bc9359ed5f0e618cd04e75f1592bda9f3b5075e48fd9d9e8b53e03e47692a662f613a5e7c0802f546e463a726cd53c1ad10694269e13edba SHA512 24cbac4ee85b17de9750c9a397ff196fc0e4694d5535dccefe6eeeb12762482bd6b957eab6f1de1a2ca301eaf48e423bad0e74a83a02033f5b42baf20f68399c
-EBUILD systemrescuecd-x86-5.1.2.ebuild 1590 BLAKE2B 8addcff756be5ff7bc9359ed5f0e618cd04e75f1592bda9f3b5075e48fd9d9e8b53e03e47692a662f613a5e7c0802f546e463a726cd53c1ad10694269e13edba SHA512 24cbac4ee85b17de9750c9a397ff196fc0e4694d5535dccefe6eeeb12762482bd6b957eab6f1de1a2ca301eaf48e423bad0e74a83a02033f5b42baf20f68399c
+EBUILD systemrescuecd-x86-5.1.2.ebuild 1588 BLAKE2B 88c93971c0fd71928de91c7d2d37079ef46537e92abdf7f8aeba30b272325ab3cd889a64f16aef63226bc59dd690ec9b545c0c78cba361a1c156a45560aaab5d SHA512 0a36c0954f88b29305844d133ee8d3171a8be0bbc66e22595daca50568a9ba50d715829d0deec34babeba5791819d89a767c1a197c7efd64b776b3c2f5f1fa5d
 MISC metadata.xml 585 BLAKE2B e0ce16c78e84339e1171bbf2e0aee7e27c3c32d4f795b1d176d872596330c531e6f960acd52526707464da2ad8d058035c42f3b9ff440bce139ce4b5703933d6 SHA512 51a7820398c4c637017c4a38bc0cd7b8b157e5dca57af0495a05c3df0bf09662287954bc04b24995585e8ecf3ff510177561db4dae3fadc64490d184319c18b6
diff --git a/app-admin/systemrescuecd-x86/systemrescuecd-x86-5.1.2.ebuild b/app-admin/systemrescuecd-x86/systemrescuecd-x86-5.1.2.ebuild
index a15aecbe41c4..1ceb856d826f 100644
--- a/app-admin/systemrescuecd-x86/systemrescuecd-x86-5.1.2.ebuild
+++ b/app-admin/systemrescuecd-x86/systemrescuecd-x86-5.1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/systemrescuecd/sysresccd-${PN#*-}/${PV}/${P}.iso"
 
 LICENSE="GPL-2"
 SLOT="${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+isohybrid"
 
 DEPEND="isohybrid? ( >=sys-boot/syslinux-4 )"