[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-meta/

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-meta/

[Michael Palimaka]

commit:     90e7383f1282e1d63ce70cfc3a1c357714e934d5
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 31 17:33:45 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sat Oct 31 17:34:08 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=90e7383f

dev-qt/qt-meta: restore package

Package-Manager: portage-2.2.20.1

 dev-qt/qt-meta/qt-meta-4.8.6.ebuild | 41 +++++++++++++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)

diff --git a/dev-qt/qt-meta/qt-meta-4.8.6.ebuild b/dev-qt/qt-meta/qt-meta-4.8.6.ebuild
new file mode 100644
index 0000000..b812f55
--- /dev/null
+++ b/dev-qt/qt-meta/qt-meta-4.8.6.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="Cross-platform application development framework (metapackage)"
+HOMEPAGE="https://www.qt.io/"
+
+LICENSE="metapackage"
+SLOT="4"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="+dbus examples kde openvg +qt3support +webkit"
+
+DEPEND=""
+RDEPEND="
+	>=dev-qt/assistant-${PV}:4
+	>=dev-qt/designer-${PV}:4
+	>=dev-qt/linguist-${PV}:4
+	>=dev-qt/pixeltool-${PV}:4
+	dbus? ( >=dev-qt/qdbusviewer-${PV}:4 )
+	qt3support? ( >=dev-qt/qt3support-${PV}:4 )
+	>=dev-qt/qtbearer-${PV}:4
+	>=dev-qt/qtcore-${PV}:4
+	dbus? ( >=dev-qt/qtdbus-${PV}:4 )
+	>=dev-qt/qtdeclarative-${PV}:4
+	examples? ( >=dev-qt/qtdemo-${PV}:4 )
+	>=dev-qt/qtgui-${PV}:4
+	>=dev-qt/qthelp-${PV}:4
+	>=dev-qt/qtmultimedia-${PV}:4
+	>=dev-qt/qtopengl-${PV}:4
+	openvg? ( >=dev-qt/qtopenvg-${PV}:4 )
+	kde? ( media-libs/phonon[qt4] )
+	!kde? ( || ( >=dev-qt/qtphonon-${PV}:4 media-libs/phonon[qt4] ) )
+	>=dev-qt/qtscript-${PV}:4
+	>=dev-qt/qtsql-${PV}:4
+	>=dev-qt/qtsvg-${PV}:4
+	>=dev-qt/qttest-${PV}:4
+	webkit? ( >=dev-qt/qtwebkit-${PV}:4 )
+	>=dev-qt/qtxmlpatterns-${PV}:4
+"

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-meta/

[Michael Palimaka]

commit:     f0580ee296001492681fa38b5092725421bbbe82
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 30 13:55:20 2017 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Aug 30 14:05:05 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f0580ee2

dev-qt/qt-meta: remove KDE use flag

Gentoo-bug: 629144
Package-Manager: Portage-2.3.6, Repoman-2.3.3

 dev-qt/qt-meta/metadata.xml         | 1 -
 dev-qt/qt-meta/qt-meta-4.8.6.ebuild | 5 ++---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/dev-qt/qt-meta/metadata.xml b/dev-qt/qt-meta/metadata.xml
index 9d64d73a77f..202b54f3e09 100644
--- a/dev-qt/qt-meta/metadata.xml
+++ b/dev-qt/qt-meta/metadata.xml
@@ -6,7 +6,6 @@
 		<name>Gentoo Qt Project</name>
 	</maintainer>
 	<use>
-		<flag name="kde">Select <pkg>media-libs/phonon</pkg> as Phonon variant (needed for KDE)</flag>
 		<flag name="qt3support">Enable the Qt3Support library for Qt4</flag>
 	</use>
 </pkgmetadata>

diff --git a/dev-qt/qt-meta/qt-meta-4.8.6.ebuild b/dev-qt/qt-meta/qt-meta-4.8.6.ebuild
index a4744de4f14..2e381a85404 100644
--- a/dev-qt/qt-meta/qt-meta-4.8.6.ebuild
+++ b/dev-qt/qt-meta/qt-meta-4.8.6.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://www.qt.io/"
 LICENSE="metapackage"
 SLOT="4"
 KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="+dbus examples kde +qt3support +webkit"
+IUSE="+dbus examples +qt3support +webkit"
 
 DEPEND=""
 RDEPEND="
@@ -28,12 +28,11 @@ RDEPEND="
 	>=dev-qt/qthelp-${PV}:4
 	>=dev-qt/qtmultimedia-${PV}:4
 	>=dev-qt/qtopengl-${PV}:4
-	kde? ( media-libs/phonon[qt4] )
-	!kde? ( || ( >=dev-qt/qtphonon-${PV}:4 media-libs/phonon[qt4] ) )
 	>=dev-qt/qtscript-${PV}:4
 	>=dev-qt/qtsql-${PV}:4
 	>=dev-qt/qtsvg-${PV}:4
 	>=dev-qt/qttest-${PV}:4
 	webkit? ( >=dev-qt/qtwebkit-${PV}:4 )
 	>=dev-qt/qtxmlpatterns-${PV}:4
+	media-libs/phonon[qt4]
 "

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-meta/

[Andreas Sturmlechner]

commit:     0d64baf7dadd37154b654d6a76ec84d989e5c44e
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat May 26 23:00:23 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat May 26 23:07:14 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d64baf7

dev-qt/qt-meta: Drop media-libs/phonon from RDEPEND

Package-Manager: Portage-2.3.38, Repoman-2.3.9

 dev-qt/qt-meta/{qt-meta-4.8.6.ebuild => qt-meta-4.8.6-r1.ebuild} | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/dev-qt/qt-meta/qt-meta-4.8.6.ebuild b/dev-qt/qt-meta/qt-meta-4.8.6-r1.ebuild
similarity index 93%
rename from dev-qt/qt-meta/qt-meta-4.8.6.ebuild
rename to dev-qt/qt-meta/qt-meta-4.8.6-r1.ebuild
index 2e381a85404..f3d4853b85f 100644
--- a/dev-qt/qt-meta/qt-meta-4.8.6.ebuild
+++ b/dev-qt/qt-meta/qt-meta-4.8.6-r1.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=5
@@ -34,5 +34,4 @@ RDEPEND="
 	>=dev-qt/qttest-${PV}:4
 	webkit? ( >=dev-qt/qtwebkit-${PV}:4 )
 	>=dev-qt/qtxmlpatterns-${PV}:4
-	media-libs/phonon[qt4]
 "