[gentoo-commits] proj/qt:master commit in: dev-qt/qtdemo/, dev-qt/pixeltool/, dev-qt/designer/, dev-qt/qthelp/, ...

[Davide Pesavento]

commit:     e89bc4b56d7a8b15b8f560f20d9ef17968914a98
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Wed May 21 16:26:47 2014 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Wed May 21 16:26:47 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=e89bc4b5

[dev-qt/qt*:4] Sync with portage.

---
 dev-qt/assistant/assistant-4.8.9999.ebuild         | 2 +-
 dev-qt/designer/designer-4.8.9999.ebuild           | 2 +-
 dev-qt/linguist/linguist-4.8.9999.ebuild           | 2 +-
 dev-qt/pixeltool/pixeltool-4.8.9999.ebuild         | 2 +-
 dev-qt/qtbearer/qtbearer-4.8.9999.ebuild           | 2 +-
 dev-qt/qtdeclarative/qtdeclarative-4.8.9999.ebuild | 2 +-
 dev-qt/qtdemo/qtdemo-4.8.9999.ebuild               | 4 ++--
 dev-qt/qthelp/qthelp-4.8.9999.ebuild               | 2 +-
 8 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/dev-qt/assistant/assistant-4.8.9999.ebuild b/dev-qt/assistant/assistant-4.8.9999.ebuild
index b0d5461..64b67e3 100644
--- a/dev-qt/assistant/assistant-4.8.9999.ebuild
+++ b/dev-qt/assistant/assistant-4.8.9999.ebuild
@@ -11,7 +11,7 @@ SLOT="4"
 if [[ ${QT4_BUILD_TYPE} == live ]]; then
 	KEYWORDS=""
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 fi
 
 IUSE="webkit"

diff --git a/dev-qt/designer/designer-4.8.9999.ebuild b/dev-qt/designer/designer-4.8.9999.ebuild
index 8ddc15d..17368dd 100644
--- a/dev-qt/designer/designer-4.8.9999.ebuild
+++ b/dev-qt/designer/designer-4.8.9999.ebuild
@@ -11,7 +11,7 @@ SLOT="4"
 if [[ ${QT4_BUILD_TYPE} == live ]]; then
 	KEYWORDS=""
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 fi
 
 DESIGNER_PLUGINS="declarative phonon qt3support webkit"

diff --git a/dev-qt/linguist/linguist-4.8.9999.ebuild b/dev-qt/linguist/linguist-4.8.9999.ebuild
index 372c89c..a0a367a 100644
--- a/dev-qt/linguist/linguist-4.8.9999.ebuild
+++ b/dev-qt/linguist/linguist-4.8.9999.ebuild
@@ -11,7 +11,7 @@ SLOT="4"
 if [[ ${QT4_BUILD_TYPE} == live ]]; then
 	KEYWORDS=""
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 fi
 
 IUSE=""

diff --git a/dev-qt/pixeltool/pixeltool-4.8.9999.ebuild b/dev-qt/pixeltool/pixeltool-4.8.9999.ebuild
index 1e9b4cb..2f5a6fe 100644
--- a/dev-qt/pixeltool/pixeltool-4.8.9999.ebuild
+++ b/dev-qt/pixeltool/pixeltool-4.8.9999.ebuild
@@ -11,7 +11,7 @@ SLOT="4"
 if [[ ${QT4_BUILD_TYPE} == live ]]; then
 	KEYWORDS=""
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 fi
 
 IUSE=""

diff --git a/dev-qt/qtbearer/qtbearer-4.8.9999.ebuild b/dev-qt/qtbearer/qtbearer-4.8.9999.ebuild
index aab4a14..a0d6807 100644
--- a/dev-qt/qtbearer/qtbearer-4.8.9999.ebuild
+++ b/dev-qt/qtbearer/qtbearer-4.8.9999.ebuild
@@ -11,7 +11,7 @@ SLOT="4"
 if [[ ${QT4_BUILD_TYPE} == live ]]; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 fi
 IUSE="connman networkmanager"
 

diff --git a/dev-qt/qtdeclarative/qtdeclarative-4.8.9999.ebuild b/dev-qt/qtdeclarative/qtdeclarative-4.8.9999.ebuild
index e47d3fb..063b4a7 100644
--- a/dev-qt/qtdeclarative/qtdeclarative-4.8.9999.ebuild
+++ b/dev-qt/qtdeclarative/qtdeclarative-4.8.9999.ebuild
@@ -11,7 +11,7 @@ SLOT="4"
 if [[ ${QT4_BUILD_TYPE} == live ]]; then
 	KEYWORDS=""
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
 fi
 IUSE="+accessibility qt3support webkit"
 

diff --git a/dev-qt/qtdemo/qtdemo-4.8.9999.ebuild b/dev-qt/qtdemo/qtdemo-4.8.9999.ebuild
index fd39ce6..20344e4 100644
--- a/dev-qt/qtdemo/qtdemo-4.8.9999.ebuild
+++ b/dev-qt/qtdemo/qtdemo-4.8.9999.ebuild
@@ -97,10 +97,10 @@ src_configure() {
 	myconf+="
 		$(qt_use dbus)
 		$(qt_use declarative)
-		$(qt_use multimedia)
+		$(qt_use multimedia) -no-audio-backend
 		$(qt_use opengl)
 		$(qt_use openvg)
-		$(qt_use phonon)
+		$(qt_use phonon) -no-phonon-backend
 		$(qt_use qt3support)
 		$(qt_use webkit)
 		$(qt_use xmlpatterns)"

diff --git a/dev-qt/qthelp/qthelp-4.8.9999.ebuild b/dev-qt/qthelp/qthelp-4.8.9999.ebuild
index 042fc66..5eebfea 100644
--- a/dev-qt/qthelp/qthelp-4.8.9999.ebuild
+++ b/dev-qt/qthelp/qthelp-4.8.9999.ebuild
@@ -17,7 +17,7 @@ SLOT="4"
 if [[ ${QT4_BUILD_TYPE} == live ]]; then
 	KEYWORDS=""
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 fi
 
 IUSE="compat doc"