Version bump. Fix several deps.

(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 0xDADED6B2671CB57D!)

3 files changed, 17 insertions, 13 deletions

diff --git a/dev-libs/libqtxdg/ChangeLog b/dev-libs/libqtxdg/ChangeLog
index 2c7079f9549a..0764942a7ece 100644
--- a/dev-libs/libqtxdg/ChangeLog
+++ b/dev-libs/libqtxdg/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/libqtxdg
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libqtxdg/ChangeLog,v 1.4 2015/04/03 10:25:29 dlan Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libqtxdg/ChangeLog,v 1.5 2015/06/28 13:11:38 pesa Exp $
+
+*libqtxdg-1.2.0 (28 Jun 2015)
+
+  28 Jun 2015; Davide Pesavento <pesa@gentoo.org> +libqtxdg-1.2.0.ebuild,
+  -libqtxdg-1.0.0.ebuild, libqtxdg-1.1.0.ebuild:
+  Version bump. Fix several deps.
 
   03 Apr 2015; Yixun Lan <dlan@gentoo.org> libqtxdg-1.1.0.ebuild:
   keyword arm/arm64, tested on cortex-a9/cortex-a53 hardware
diff --git a/dev-libs/libqtxdg/libqtxdg-1.1.0.ebuild b/dev-libs/libqtxdg/libqtxdg-1.1.0.ebuild
index 41a6f294ee5b..310692dd2156 100644
--- a/dev-libs/libqtxdg/libqtxdg-1.1.0.ebuild
+++ b/dev-libs/libqtxdg/libqtxdg-1.1.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libqtxdg/libqtxdg-1.1.0.ebuild,v 1.2 2015/04/03 10:25:29 dlan Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libqtxdg/libqtxdg-1.1.0.ebuild,v 1.3 2015/06/28 13:11:38 pesa Exp $
 
 EAPI=5
 inherit cmake-utils
@@ -26,7 +26,6 @@ CDEPEND="
 	dev-qt/qtgui:5
 	dev-qt/qtwidgets:5
 	dev-qt/qtxml:5
-	dev-qt/linguist-tools:5
 "
 DEPEND="${CDEPEND}
 	test? ( dev-qt/qttest:5 )
diff --git a/dev-libs/libqtxdg/libqtxdg-1.0.0.ebuild b/dev-libs/libqtxdg/libqtxdg-1.2.0.ebuild
index 3dd33bec227a..47050f6f66b5 100644
--- a/dev-libs/libqtxdg/libqtxdg-1.0.0.ebuild
+++ b/dev-libs/libqtxdg/libqtxdg-1.2.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libqtxdg/libqtxdg-1.0.0.ebuild,v 1.2 2014/11/16 12:40:04 jauhien Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libqtxdg/libqtxdg-1.2.0.ebuild,v 1.1 2015/06/28 13:11:38 pesa Exp $
 
 EAPI=5
 inherit cmake-utils
@@ -8,13 +8,12 @@ inherit cmake-utils
 DESCRIPTION="A Qt implementation of XDG standards"
 HOMEPAGE="http://lxqt.org/"
 
-if [[ ${PV} = *9999* ]]; then
+if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="git://git.lxde.org/git/lxde/${PN}.git"
 else
-	SRC_URI="http://lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
-	S="${WORKDIR}/${PN}"
+	SRC_URI="http://downloads.lxqt.org/${PN}/${PV}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
 
 LICENSE="LGPL-2.1"
@@ -22,14 +21,14 @@ SLOT="0"
 IUSE="test"
 
 CDEPEND="
-	sys-apps/file
 	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
 	dev-qt/qtgui:5
 	dev-qt/qtwidgets:5
 	dev-qt/qtxml:5
-	dev-qt/linguist-tools:5
 "
 DEPEND="${CDEPEND}
+	virtual/pkgconfig
 	test? ( dev-qt/qttest:5 )
 "
 RDEPEND="${CDEPEND}
@@ -38,8 +37,8 @@ RDEPEND="${CDEPEND}
 
 src_configure() {
 	local mycmakeargs=(
-		-DUSE_QT5=ON
-		$(cmake-utils_use test BUILD_TESTS)
+		-DUSE_QT4=OFF
+		$(cmake-utils_use_build test TESTS)
 	)
 	cmake-utils_src_configure
 }