gentoo resync : 22.10.2018

3 files changed, 3 insertions, 52 deletions

diff --git a/dev-libs/libqtxdg/Manifest b/dev-libs/libqtxdg/Manifest
index 6b214cf97f8f..409a80d72f65 100644
--- a/dev-libs/libqtxdg/Manifest
+++ b/dev-libs/libqtxdg/Manifest
@@ -1,5 +1,3 @@
-DIST libqtxdg-2.0.0.tar.xz 62404 BLAKE2B dc84654693c6504c36633394ce4bafb46705b45ac3e7576b03b92710603c86375fd70d5ea76a2864e498c5b33728b02d215da5b65eb3728218ff97defd883bf0 SHA512 f4e32346eddedd31195093214a45e9831742ee886a14b5d7ba1d640a91e05473b9b8adc7bca9970090f1fa8187597cd10796c32ecea4ac02229e9869cd4f1db3
 DIST libqtxdg-3.2.0.tar.xz 67736 BLAKE2B addc2636a9bbaa0163c3d344337eca9f350ffb38f4d0e785ade9775fc7d3e38c6f7a3c6c8d8d05e7b491f0cf2c34f5ceb8d51d34eb05b56e4170e190a5b5ae4c SHA512 1a52e79e97cd148c9f406402134d6feaa6ccb8d10cfa7c0e2a3fbf728690e193c05e444012b87e38790ce0570d1cf71c6c2cee7105f11d43923040543e0dd143
-EBUILD libqtxdg-2.0.0.ebuild 872 BLAKE2B c03f688865941559943912248790cad65cdd345c3b07dfaf0c2132c7690e86c295cf5a7c25aa441ac2b741b4186aa824753b669b6ee205f0f7f0674379dbdcfe SHA512 d33df38004393c16c002146a2d356676d315042da59fef98e6944e49e860101e19ed732673adc690435d95db8e0cdbcc614af29d0dadcb87c683943f27d46e34
-EBUILD libqtxdg-3.2.0.ebuild 903 BLAKE2B 153891db8770b7b5692fe65986aadfa1407d670d52d4a50ee1d814044c5688ffd6810cf3ae5bf5e386436b5da1ebcadb80e5ecdedd82e725b5f80773bdc29af2 SHA512 5ece9eb766adb3dc71dc3a5daa09841c48c378a32c33988b0c69fb42d652c9bd49ca86a3e6a2adaf9addd84e7758762363ecdc07637c71615e18cb8bcf00566e
+EBUILD libqtxdg-3.2.0.ebuild 898 BLAKE2B c53adcda19dc7700d4023a8edf956b86b78b6c61dd3afb8fe42028e9da196f9c9d68c7d1278d357edef9a4b2c52d1b2b9f88a77a86c04192ac661a68e773aceb SHA512 6d80157a0164728ccdbdd129426c35aa91b24796eb7657475cbaf0659c048378f9e4bb37f1c519c120a98f9ae19840d1ab470d15f8785b061463f7658e3a0aeb
 MISC metadata.xml 422 BLAKE2B 4ca2bdd5f3838e970ebc585ece3d8e922613fdd97713a24f441683ebe54feda53707db50ed90edc1d5475fe468510e4427b95567aaecd0c2a3371d9c6884c640 SHA512 49878c043d764fba09b368154c08959be049afdd30301da7c864c549ef1df53a81d9f0999c2c00663130a5348c26bc072d377ef3cf704774aa30d3bbbcc0918b
diff --git a/dev-libs/libqtxdg/libqtxdg-2.0.0.ebuild b/dev-libs/libqtxdg/libqtxdg-2.0.0.ebuild
deleted file mode 100644
index 710701f20200..000000000000
--- a/dev-libs/libqtxdg/libqtxdg-2.0.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit cmake-utils virtualx
-
-DESCRIPTION="A Qt implementation of XDG standards"
-HOMEPAGE="https://lxqt.org/"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/lxde/${PN}.git"
-else
-	SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~arm64 x86"
-fi
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-IUSE="test"
-
-CDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig
-	test? ( dev-qt/qttest:5 )
-"
-RDEPEND="${CDEPEND}
-	x11-misc/xdg-utils
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_TESTS=$(usex test)
-	)
-	cmake-utils_src_configure
-}
-
-src_test() {
-	VIRTUALX_COMMAND="cmake-utils_src_test" virtualmake
-}
diff --git a/dev-libs/libqtxdg/libqtxdg-3.2.0.ebuild b/dev-libs/libqtxdg/libqtxdg-3.2.0.ebuild
index 8b7be2b0ab39..d9209aa16591 100644
--- a/dev-libs/libqtxdg/libqtxdg-3.2.0.ebuild
+++ b/dev-libs/libqtxdg/libqtxdg-3.2.0.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
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
 	SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 fi
 
 LICENSE="LGPL-2.1+ Nokia-Qt-LGPL-Exception-1.1"