* [gentoo-commits] proj/qt:master commit in: x11-libs/qt-opengl/, x11-libs/qt-script/, x11-libs/qt-qt3support/, ...
@ 2012-02-01 20:04 Markos Chandras
0 siblings, 0 replies; 11+ messages in thread
From: Markos Chandras @ 2012-02-01 20:04 UTC (permalink / raw
To: gentoo-commits
commit: ba48807ef6ada260350136b8afa7086050c14e1e
Author: Markos Chandras <hwoarang <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 1 20:02:45 2012 +0000
Commit: Markos Chandras <hwoarang <AT> gentoo <DOT> org>
CommitDate: Wed Feb 1 20:02:45 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=ba48807e
x11-libs/qt-*-*9999: Make live ebuilds EAPI4
---
x11-libs/qt-assistant/Manifest | 4 ++--
x11-libs/qt-assistant/qt-assistant-4.8.9999.ebuild | 2 +-
x11-libs/qt-assistant/qt-assistant-4.9999.ebuild | 2 +-
x11-libs/qt-core/Manifest | 4 ++--
x11-libs/qt-core/qt-core-4.8.9999.ebuild | 2 +-
x11-libs/qt-core/qt-core-4.9999.ebuild | 2 +-
x11-libs/qt-dbus/Manifest | 4 ++--
x11-libs/qt-dbus/qt-dbus-4.8.9999.ebuild | 2 +-
x11-libs/qt-dbus/qt-dbus-4.9999.ebuild | 2 +-
x11-libs/qt-declarative/Manifest | 4 ++--
.../qt-declarative/qt-declarative-4.8.9999.ebuild | 2 +-
.../qt-declarative/qt-declarative-4.9999.ebuild | 2 +-
x11-libs/qt-demo/Manifest | 4 ++--
x11-libs/qt-demo/qt-demo-4.8.9999.ebuild | 2 +-
x11-libs/qt-demo/qt-demo-4.9999.ebuild | 2 +-
x11-libs/qt-gui/Manifest | 4 ++--
x11-libs/qt-gui/qt-gui-4.8.9999.ebuild | 2 +-
x11-libs/qt-gui/qt-gui-4.9999.ebuild | 2 +-
x11-libs/qt-multimedia/Manifest | 4 ++--
.../qt-multimedia/qt-multimedia-4.8.9999.ebuild | 2 +-
x11-libs/qt-multimedia/qt-multimedia-4.9999.ebuild | 2 +-
x11-libs/qt-opengl/Manifest | 4 ++--
x11-libs/qt-opengl/qt-opengl-4.8.9999.ebuild | 2 +-
x11-libs/qt-opengl/qt-opengl-4.9999.ebuild | 2 +-
x11-libs/qt-openvg/Manifest | 4 ++--
x11-libs/qt-openvg/qt-openvg-4.8.9999.ebuild | 2 +-
x11-libs/qt-openvg/qt-openvg-4.9999.ebuild | 2 +-
x11-libs/qt-phonon/Manifest | 4 ++--
x11-libs/qt-phonon/qt-phonon-4.8.9999.ebuild | 2 +-
x11-libs/qt-phonon/qt-phonon-4.9999.ebuild | 2 +-
x11-libs/qt-qt3support/Manifest | 4 ++--
.../qt-qt3support/qt-qt3support-4.8.9999.ebuild | 2 +-
x11-libs/qt-qt3support/qt-qt3support-4.9999.ebuild | 2 +-
x11-libs/qt-script/Manifest | 4 ++--
x11-libs/qt-script/qt-script-4.8.9999.ebuild | 2 +-
x11-libs/qt-script/qt-script-4.9999.ebuild | 2 +-
x11-libs/qt-sql/Manifest | 4 ++--
x11-libs/qt-sql/qt-sql-4.8.9999.ebuild | 2 +-
x11-libs/qt-sql/qt-sql-4.9999.ebuild | 2 +-
x11-libs/qt-svg/Manifest | 4 ++--
x11-libs/qt-svg/qt-svg-4.8.9999.ebuild | 2 +-
x11-libs/qt-svg/qt-svg-4.9999.ebuild | 2 +-
x11-libs/qt-test/Manifest | 4 ++--
x11-libs/qt-test/qt-test-4.8.9999.ebuild | 2 +-
x11-libs/qt-test/qt-test-4.9999.ebuild | 2 +-
x11-libs/qt-webkit/Manifest | 4 ++--
x11-libs/qt-webkit/qt-webkit-4.8.9999.ebuild | 2 +-
x11-libs/qt-webkit/qt-webkit-4.9999.ebuild | 2 +-
x11-libs/qt-xmlpatterns/Manifest | 4 ++--
.../qt-xmlpatterns/qt-xmlpatterns-4.8.9999.ebuild | 2 +-
.../qt-xmlpatterns/qt-xmlpatterns-4.9999.ebuild | 2 +-
51 files changed, 68 insertions(+), 68 deletions(-)
diff --git a/x11-libs/qt-assistant/Manifest b/x11-libs/qt-assistant/Manifest
index c109158..c3b53af 100644
--- a/x11-libs/qt-assistant/Manifest
+++ b/x11-libs/qt-assistant/Manifest
@@ -4,6 +4,6 @@ AUX qt-assistant-4.7-include.tar.gz 448 RMD160 5432ab486dae1d2510798b53c32365f86
AUX qt-assistant-4.8.0-install-fix.patch 2708 RMD160 b64c206d48b0939e4c504585a44cc06cd29fd62a SHA1 cb1740e69ffb163234e6cfff4043e071ee85d4bf SHA256 7c525c8bf696e3082bdf86e079703b2a033ea16b3fb882d519fc6463da8e5dde
DIST qt-assistant-qassistantclient-library-compat-src-4.6.3.tar.gz 329896 RMD160 f34da3587cb311f42aa19b9c8259b90269590c61 SHA1 7a5e5155136c406e5b7eb880eed752f56625d10b SHA256 e698be8fc0d32c5f0b5b46cafcb8f615accaed524b864e58b99b64b7b5549c2d
EBUILD qt-assistant-4.7.9999.ebuild 2772 RMD160 3630fabc5bd1c439e6b2d9d123f2d6b747a28a84 SHA1 c81e03e87e62cefb0f1496106c3a680fc6cbe9b1 SHA256 005ddd402c7485d988d4987f8bc39ca3f0e4616456228831e2eb0bf1394530d3
-EBUILD qt-assistant-4.8.9999.ebuild 4456 RMD160 1b83c00d9f9163e990ab47e183c5b2a9ca4e499d SHA1 2c81ccd1cb217117e9251ec51f84b98fa46ca6a5 SHA256 e07cc4c31ae102100de4c223b37e52ef9fc611653b0e6e1793765a8379f7471f
-EBUILD qt-assistant-4.9999.ebuild 4456 RMD160 1b83c00d9f9163e990ab47e183c5b2a9ca4e499d SHA1 2c81ccd1cb217117e9251ec51f84b98fa46ca6a5 SHA256 e07cc4c31ae102100de4c223b37e52ef9fc611653b0e6e1793765a8379f7471f
+EBUILD qt-assistant-4.8.9999.ebuild 4456 RMD160 81de97c973378ff68a5145a29713f6b0fd85d932 SHA1 b7a66ccda011cf1ccc443bcf9c7790e76294781e SHA256 4bf977babc860dca0bd2b6f06043e2a71d38c0f7312b7aaadae8ede2055a17dc
+EBUILD qt-assistant-4.9999.ebuild 4456 RMD160 81de97c973378ff68a5145a29713f6b0fd85d932 SHA1 b7a66ccda011cf1ccc443bcf9c7790e76294781e SHA256 4bf977babc860dca0bd2b6f06043e2a71d38c0f7312b7aaadae8ede2055a17dc
MISC metadata.xml 816 RMD160 7f4cdb5e95a0e1f50fa64172fc238ced50797074 SHA1 8d04c81cb77a5dbe825a070958700cda6fbb64b3 SHA256 080d4e3bc86ad0b0907f13b2ac88cedf515d2508d3135ee4276babdd6098763f
diff --git a/x11-libs/qt-assistant/qt-assistant-4.8.9999.ebuild b/x11-libs/qt-assistant/qt-assistant-4.8.9999.ebuild
index 81c2d5e..2c8b30b 100644
--- a/x11-libs/qt-assistant/qt-assistant-4.8.9999.ebuild
+++ b/x11-libs/qt-assistant/qt-assistant-4.8.9999.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-EAPI="3"
+EAPI="4"
if [[ ${PV} == 4*9999 ]]; then
ECLASS="-edge"
fi
diff --git a/x11-libs/qt-assistant/qt-assistant-4.9999.ebuild b/x11-libs/qt-assistant/qt-assistant-4.9999.ebuild
index 81c2d5e..2c8b30b 100644
--- a/x11-libs/qt-assistant/qt-assistant-4.9999.ebuild
+++ b/x11-libs/qt-assistant/qt-assistant-4.9999.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-EAPI="3"
+EAPI="4"
if [[ ${PV} == 4*9999 ]]; then
ECLASS="-edge"
fi
diff --git a/x11-libs/qt-core/Manifest b/x11-libs/qt-core/Manifest
index e6785cd..0a63901 100644
--- a/x11-libs/qt-core/Manifest
+++ b/x11-libs/qt-core/Manifest
@@ -1,5 +1,5 @@
AUX qt-core-4.8.0-qurl-regression-fix.patch 742 RMD160 0fc99db2d43af1784c5dfcdf948915dc34749536 SHA1 44463c6f8faf5857d238778d0b57b12c36364096 SHA256 4a799c2948966a7c746e98e680db38fd05da8bf9fea581a1780ad3f94305f5dc
EBUILD qt-core-4.7.9999.ebuild 4022 RMD160 fa68febaa31c0cce43b5c350d06459e2f38dfa9e SHA1 318ce1b9622e8054a8ca89c4c6b18cbc464135d5 SHA256 c60b5ceb76f8190464cf494aa7209666ec97a0a23693e8059de461766e2991a2
-EBUILD qt-core-4.8.9999.ebuild 4964 RMD160 777bfe1558e8a46a3ff558af596bca112d385212 SHA1 9c4d36ce2f649aed5af338138ac99c0814c56c8c SHA256 4dda1308b86cae80f7440f77acc73cce0919b2d5cb7a8da633ede6f430a9de5f
-EBUILD qt-core-4.9999.ebuild 4964 RMD160 777bfe1558e8a46a3ff558af596bca112d385212 SHA1 9c4d36ce2f649aed5af338138ac99c0814c56c8c SHA256 4dda1308b86cae80f7440f77acc73cce0919b2d5cb7a8da633ede6f430a9de5f
+EBUILD qt-core-4.8.9999.ebuild 4964 RMD160 28d43d0ceece24a7bc6f502d0b17d20c139832be SHA1 e217b2d1ca46674c4260ec5f83ffcff86eff6c67 SHA256 44bf6306f2707366ab59bfd6f05547dc208a52995b8cda3ab6435c5d66a218a3
+EBUILD qt-core-4.9999.ebuild 4964 RMD160 28d43d0ceece24a7bc6f502d0b17d20c139832be SHA1 e217b2d1ca46674c4260ec5f83ffcff86eff6c67 SHA256 44bf6306f2707366ab59bfd6f05547dc208a52995b8cda3ab6435c5d66a218a3
MISC metadata.xml 803 RMD160 83aa032a8ce070f8cb633679563d4c9a501a0eda SHA1 332f440bedc7f39993f64d7d18508c6eac55cb08 SHA256 33c8d5ca13dfc9ea047db0078e8f9a9e4ecd47694a937f47f8f499df07428681
diff --git a/x11-libs/qt-core/qt-core-4.8.9999.ebuild b/x11-libs/qt-core/qt-core-4.8.9999.ebuild
index f1800e5..99395ce 100644
--- a/x11-libs/qt-core/qt-core-4.8.9999.ebuild
+++ b/x11-libs/qt-core/qt-core-4.8.9999.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-EAPI="3"
+EAPI="4"
if [[ ${PV} == 4*9999 ]]; then
ECLASS="-edge"
fi
diff --git a/x11-libs/qt-core/qt-core-4.9999.ebuild b/x11-libs/qt-core/qt-core-4.9999.ebuild
index f1800e5..99395ce 100644
--- a/x11-libs/qt-core/qt-core-4.9999.ebuild
+++ b/x11-libs/qt-core/qt-core-4.9999.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-EAPI="3"
+EAPI="4"
if [[ ${PV} == 4*9999 ]]; then
ECLASS="-edge"
fi
diff --git a/x11-libs/qt-dbus/Manifest b/x11-libs/qt-dbus/Manifest
index f8d6ddd..db32d7b 100644
--- a/x11-libs/qt-dbus/Manifest
+++ b/x11-libs/qt-dbus/Manifest
@@ -1,5 +1,5 @@
AUX qt-4.6-master-nolibx11.patch 1201 RMD160 54cd69c157b4624f687dcd05fa49c659973531c7 SHA1 1a320131804aba3a441d07dff9414a1b0d799125 SHA256 25a7f06997fdc7fc642d945fec279b62a13505764ea15f7bd77518e08825e4a8
EBUILD qt-dbus-4.7.9999.ebuild 758 RMD160 c6db295132086cb2b61408e2e20ceadfe9e49665 SHA1 7060bde745f6a0328ef243bb98edfffe358146ed SHA256 78bdbbd13a9bf5572bb4c18ff6357cb9f1b8ab6eb8d58f41f0e4658f17f31430
-EBUILD qt-dbus-4.8.9999.ebuild 1089 RMD160 1b6a2bc4d090eec1a5e799c6d6036f1f41acb980 SHA1 96b3a7be2eeb1f7e9a464b8da42067c86a26d5be SHA256 5a201b53f35da8c568db918002ab3a90f3d7df58636922db6e433246e9e4aef2
-EBUILD qt-dbus-4.9999.ebuild 1089 RMD160 1b6a2bc4d090eec1a5e799c6d6036f1f41acb980 SHA1 96b3a7be2eeb1f7e9a464b8da42067c86a26d5be SHA256 5a201b53f35da8c568db918002ab3a90f3d7df58636922db6e433246e9e4aef2
+EBUILD qt-dbus-4.8.9999.ebuild 1089 RMD160 b03159911629c9df75e736923e353b202f206f7c SHA1 6a05be6c34d080d6a4b488f7c979afb10168fb7a SHA256 07764b94d8623248eb30629ce58f8291615c0d8287a5bf5b728a2b138846ee6e
+EBUILD qt-dbus-4.9999.ebuild 1089 RMD160 b03159911629c9df75e736923e353b202f206f7c SHA1 6a05be6c34d080d6a4b488f7c979afb10168fb7a SHA256 07764b94d8623248eb30629ce58f8291615c0d8287a5bf5b728a2b138846ee6e
MISC metadata.xml 369 RMD160 52b34abcd322c2436157d9045cb892cffdbf00e4 SHA1 91a5ea601ffcd5d32626c6cd23767f39ecc743cb SHA256 f92954ba27e6923458310562b1537216409895a1ba484399f49809824a80e980
diff --git a/x11-libs/qt-dbus/qt-dbus-4.8.9999.ebuild b/x11-libs/qt-dbus/qt-dbus-4.8.9999.ebuild
index 1eeba45..6a9686d 100644
--- a/x11-libs/qt-dbus/qt-dbus-4.8.9999.ebuild
+++ b/x11-libs/qt-dbus/qt-dbus-4.8.9999.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-EAPI="3"
+EAPI="4"
if [[ ${PV} == 4*9999 ]]; then
ECLASS="-edge"
fi
diff --git a/x11-libs/qt-dbus/qt-dbus-4.9999.ebuild b/x11-libs/qt-dbus/qt-dbus-4.9999.ebuild
index 1eeba45..6a9686d 100644
--- a/x11-libs/qt-dbus/qt-dbus-4.9999.ebuild
+++ b/x11-libs/qt-dbus/qt-dbus-4.9999.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-EAPI="3"
+EAPI="4"
if [[ ${PV} == 4*9999 ]]; then
ECLASS="-edge"
fi
diff --git a/x11-libs/qt-declarative/Manifest b/x11-libs/qt-declarative/Manifest
index 916b754..2e419fa 100644
--- a/x11-libs/qt-declarative/Manifest
+++ b/x11-libs/qt-declarative/Manifest
@@ -1,4 +1,4 @@
EBUILD qt-declarative-4.7.9999.ebuild 1443 RMD160 7e6b3d0640342d1445dc7242c567ef248f71cb08 SHA1 0363d5c6e706bfa86b76f4962ea0079af966442a SHA256 f02cf2db39284741431e4bca0de782a28db0967ec4bdbf1fa220a038bf3beb41
-EBUILD qt-declarative-4.8.9999.ebuild 1986 RMD160 2650fa89a05da99d0df6ac6e9211b5fbec02148a SHA1 441d7596665b83c51658aadf2863265810461c00 SHA256 dadafe8ac4169751fb3d7a03713c38f01ff9b43a591a68eb9ec28502449eaec0
-EBUILD qt-declarative-4.9999.ebuild 1986 RMD160 2650fa89a05da99d0df6ac6e9211b5fbec02148a SHA1 441d7596665b83c51658aadf2863265810461c00 SHA256 dadafe8ac4169751fb3d7a03713c38f01ff9b43a591a68eb9ec28502449eaec0
+EBUILD qt-declarative-4.8.9999.ebuild 1986 RMD160 24562328d6a901d77c3fc3cafec37e0d33b80533 SHA1 8d571206702e2a483e4ae4ed21805d38c39fd18c SHA256 dcd4812bc976125da4a46ce4652efdd9b74e6da10a1ab5becf41fe7cd6c438a2
+EBUILD qt-declarative-4.9999.ebuild 1986 RMD160 24562328d6a901d77c3fc3cafec37e0d33b80533 SHA1 8d571206702e2a483e4ae4ed21805d38c39fd18c SHA256 dcd4812bc976125da4a46ce4652efdd9b74e6da10a1ab5becf41fe7cd6c438a2
MISC metadata.xml 771 RMD160 748f75e17df3c56ff7995fca9c221fe4a6b09e87 SHA1 ad7c8f705f772abdc836943e71c12c21ac30a334 SHA256 59cec9bb689c2d007f743731cc9185af0064d9c0be2a965ea3fab4037fd3a1f6
diff --git a/x11-libs/qt-declarative/qt-declarative-4.8.9999.ebuild b/x11-libs/qt-declarative/qt-declarative-4.8.9999.ebuild
index 73d2cc1..186934a 100644
--- a/x11-libs/qt-declarative/qt-declarative-4.8.9999.ebuild
+++ b/x11-libs/qt-declarative/qt-declarative-4.8.9999.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-EAPI="3"
+EAPI="4"
inherit qt4-build-edge
DESCRIPTION="The Declarative module for the Qt toolkit"
diff --git a/x11-libs/qt-declarative/qt-declarative-4.9999.ebuild b/x11-libs/qt-declarative/qt-declarative-4.9999.ebuild
index 73d2cc1..186934a 100644
--- a/x11-libs/qt-declarative/qt-declarative-4.9999.ebuild
+++ b/x11-libs/qt-declarative/qt-declarative-4.9999.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-EAPI="3"
+EAPI="4"
inherit qt4-build-edge
DESCRIPTION="The Declarative module for the Qt toolkit"
diff --git a/x11-libs/qt-demo/Manifest b/x11-libs/qt-demo/Manifest
index 540f470..aebcaeb 100644
--- a/x11-libs/qt-demo/Manifest
+++ b/x11-libs/qt-demo/Manifest
@@ -1,5 +1,5 @@
AUX qt-demo-4.6-plugandpaint.patch 609 RMD160 ff44028ca4dd26cf3d4ebf893894826f46765c17 SHA1 e20b648c29659e58ff210cc8e368bf5afd894ddf SHA256 e7c8fccf933dfee061b2960b5754e4835e7cb87c0e36166d3b11d69632732215
EBUILD qt-demo-4.7.9999.ebuild 1446 RMD160 0b4605864fb90e9960b8030bc6b3a698c4192746 SHA1 a4cbf2689e3117eda10fc2699b2aed8737fc9dd7 SHA256 4244bfed7370386b836548a6b897852ce64183629f628f6d234c6d354e2efd6f
-EBUILD qt-demo-4.8.9999.ebuild 1856 RMD160 35d5b2047d0ce3da254bb4b5527ef37bb07da9b6 SHA1 0fe0dc7eced9076ee6b58e180ae3ea33bc9c3850 SHA256 ce8c082764ef8de62b0eb9eb0ef8698c455b53f45698696146d12fa4f6d9064e
-EBUILD qt-demo-4.9999.ebuild 1856 RMD160 35d5b2047d0ce3da254bb4b5527ef37bb07da9b6 SHA1 0fe0dc7eced9076ee6b58e180ae3ea33bc9c3850 SHA256 ce8c082764ef8de62b0eb9eb0ef8698c455b53f45698696146d12fa4f6d9064e
+EBUILD qt-demo-4.8.9999.ebuild 1856 RMD160 85dcdb819d9e9b798658d6d4bcc8dbe32ea05725 SHA1 1b26954ab9a6338c9359bb0567d8cc3d489ae3f7 SHA256 0a562936d8fa2f1ff65efb3aebb80b71c459003f6df9f1f96a3dcdcc7069cf26
+EBUILD qt-demo-4.9999.ebuild 1856 RMD160 85dcdb819d9e9b798658d6d4bcc8dbe32ea05725 SHA1 1b26954ab9a6338c9359bb0567d8cc3d489ae3f7 SHA256 0a562936d8fa2f1ff65efb3aebb80b71c459003f6df9f1f96a3dcdcc7069cf26
MISC metadata.xml 518 RMD160 03b664357b0df6874f63e6084411a559a79bb7d0 SHA1 4c1c214ce2b1d73051ffc777ef39aa12adb70c89 SHA256 741d44d6c80f9940db77a97011737e0aba70306618ab350b41e337f1917d62b3
diff --git a/x11-libs/qt-demo/qt-demo-4.8.9999.ebuild b/x11-libs/qt-demo/qt-demo-4.8.9999.ebuild
index 891549a..5205aaa 100644
--- a/x11-libs/qt-demo/qt-demo-4.8.9999.ebuild
+++ b/x11-libs/qt-demo/qt-demo-4.8.9999.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-EAPI="3"
+EAPI="4"
inherit qt4-build-edge
DESCRIPTION="Demonstration module of the Qt toolkit"
diff --git a/x11-libs/qt-demo/qt-demo-4.9999.ebuild b/x11-libs/qt-demo/qt-demo-4.9999.ebuild
index 891549a..5205aaa 100644
--- a/x11-libs/qt-demo/qt-demo-4.9999.ebuild
+++ b/x11-libs/qt-demo/qt-demo-4.9999.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-EAPI="3"
+EAPI="4"
inherit qt4-build-edge
DESCRIPTION="Demonstration module of the Qt toolkit"
diff --git a/x11-libs/qt-gui/Manifest b/x11-libs/qt-gui/Manifest
index 961e8dc..89958b3 100644
--- a/x11-libs/qt-gui/Manifest
+++ b/x11-libs/qt-gui/Manifest
@@ -1,4 +1,4 @@
EBUILD qt-gui-4.7.9999.ebuild 5083 RMD160 b99516597f486511bacd62918db8a3d94184059d SHA1 f9c4e39c1370d2cdfef97146b8f1c03b9cd7ff53 SHA256 b83595594926df6d92af63f434bb77bb6c5ae704ec81c74a6798ff288452ef12
-EBUILD qt-gui-4.8.9999.ebuild 7769 RMD160 882315cafa777c8fdcf7804e2a94647dfe44e6ed SHA1 edc5501ea20e44c3048b4504586d8db6908774be SHA256 3e6feea58350de375483e5f55e83a9f2e24148b219d525d5426c0d9733a48684
-EBUILD qt-gui-4.9999.ebuild 7769 RMD160 882315cafa777c8fdcf7804e2a94647dfe44e6ed SHA1 edc5501ea20e44c3048b4504586d8db6908774be SHA256 3e6feea58350de375483e5f55e83a9f2e24148b219d525d5426c0d9733a48684
+EBUILD qt-gui-4.8.9999.ebuild 7769 RMD160 954c39dd926f9a6ab2dab36aa1f0f4dae06ca785 SHA1 125677700f1a955cc428eb28c65ffbdcd3990481 SHA256 76af686f5950cc699ab60323b0aa6ebf2b79fe6e06ef3e320fc91628c187a185
+EBUILD qt-gui-4.9999.ebuild 7769 RMD160 954c39dd926f9a6ab2dab36aa1f0f4dae06ca785 SHA1 125677700f1a955cc428eb28c65ffbdcd3990481 SHA256 76af686f5950cc699ab60323b0aa6ebf2b79fe6e06ef3e320fc91628c187a185
MISC metadata.xml 1275 RMD160 a472aaec5ec0f859adf00d4d945a46b2b5681177 SHA1 76d59ad94fc2797657824adca31a167c1a89794d SHA256 124ac7d79112c4fee538d41fa616e11dcf0f8ff6319020da329ead4f66fcc119
diff --git a/x11-libs/qt-gui/qt-gui-4.8.9999.ebuild b/x11-libs/qt-gui/qt-gui-4.8.9999.ebuild
index 6f9e9f6..2e1fe7b 100644
--- a/x11-libs/qt-gui/qt-gui-4.8.9999.ebuild
+++ b/x11-libs/qt-gui/qt-gui-4.8.9999.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-EAPI="3"
+EAPI="4"
inherit eutils confutils qt4-build-edge
DESCRIPTION="The GUI module for the Qt toolkit"
diff --git a/x11-libs/qt-gui/qt-gui-4.9999.ebuild b/x11-libs/qt-gui/qt-gui-4.9999.ebuild
index 6f9e9f6..2e1fe7b 100644
--- a/x11-libs/qt-gui/qt-gui-4.9999.ebuild
+++ b/x11-libs/qt-gui/qt-gui-4.9999.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-EAPI="3"
+EAPI="4"
inherit eutils confutils qt4-build-edge
DESCRIPTION="The GUI module for the Qt toolkit"
diff --git a/x11-libs/qt-multimedia/Manifest b/x11-libs/qt-multimedia/Manifest
index 3640576..a2b65b7 100644
--- a/x11-libs/qt-multimedia/Manifest
+++ b/x11-libs/qt-multimedia/Manifest
@@ -1,4 +1,4 @@
EBUILD qt-multimedia-4.7.9999.ebuild 1286 RMD160 5bb6312875b35c1fd56e7cdee8c1c1721cfb4032 SHA1 c8888d200acec83cb108bf543a4ef80664d478f1 SHA256 9bc48f6d9bf9ce848ae72fe7f041d6d1d1b676f87f3b7059285a9818825a9e9a
-EBUILD qt-multimedia-4.8.9999.ebuild 1534 RMD160 86f6b61a6d528d84eb1bb7573872ea4a4dae2f7b SHA1 8f80a3c881fbffe303098ce18d80efc46d553aa2 SHA256 3666e29a9ac3fe925017c7ab394b016bf585a838e2dd363f33fbbe1ee583455e
-EBUILD qt-multimedia-4.9999.ebuild 1534 RMD160 86f6b61a6d528d84eb1bb7573872ea4a4dae2f7b SHA1 8f80a3c881fbffe303098ce18d80efc46d553aa2 SHA256 3666e29a9ac3fe925017c7ab394b016bf585a838e2dd363f33fbbe1ee583455e
+EBUILD qt-multimedia-4.8.9999.ebuild 1534 RMD160 270184f55c672c30f0953875e9ab1b9ba3c856f9 SHA1 e9ebdb73c50f300302bd36e12c83c8ce18f383b5 SHA256 9d2a6426b6486434be8068029fbc1850a2327fc5dab3fad1989b31097bc27a1a
+EBUILD qt-multimedia-4.9999.ebuild 1534 RMD160 270184f55c672c30f0953875e9ab1b9ba3c856f9 SHA1 e9ebdb73c50f300302bd36e12c83c8ce18f383b5 SHA256 9d2a6426b6486434be8068029fbc1850a2327fc5dab3fad1989b31097bc27a1a
MISC metadata.xml 370 RMD160 5b30a4fc776dece1b8ec3f87b1766f6c73d5a7d6 SHA1 b05f6bfb42822615c5f96d6a2efade3a7e749b51 SHA256 b0dc0de9623129db6c8ee9e22769fbcb384e8a8b290030cad4e5778fc6eb0a61
diff --git a/x11-libs/qt-multimedia/qt-multimedia-4.8.9999.ebuild b/x11-libs/qt-multimedia/qt-multimedia-4.8.9999.ebuild
index f52be33..35a0cf5 100644
--- a/x11-libs/qt-multimedia/qt-multimedia-4.8.9999.ebuild
+++ b/x11-libs/qt-multimedia/qt-multimedia-4.8.9999.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-EAPI="3"
+EAPI="4"
inherit qt4-build-edge
DESCRIPTION="The Qt multimedia module"
diff --git a/x11-libs/qt-multimedia/qt-multimedia-4.9999.ebuild b/x11-libs/qt-multimedia/qt-multimedia-4.9999.ebuild
index f52be33..35a0cf5 100644
--- a/x11-libs/qt-multimedia/qt-multimedia-4.9999.ebuild
+++ b/x11-libs/qt-multimedia/qt-multimedia-4.9999.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-EAPI="3"
+EAPI="4"
inherit qt4-build-edge
DESCRIPTION="The Qt multimedia module"
diff --git a/x11-libs/qt-opengl/Manifest b/x11-libs/qt-opengl/Manifest
index e0e1119..40ea1f2 100644
--- a/x11-libs/qt-opengl/Manifest
+++ b/x11-libs/qt-opengl/Manifest
@@ -1,5 +1,5 @@
AUX qtbug-9691-Xdefs.patch 2874 RMD160 f8a9f5b233466744dcd6e8003e091c59f42ba0d4 SHA1 3715be8f360fef018a3ba84b40ba7b7721d5580d SHA256 46a500351f0e6ae40ac00dcab788d6e3b94709c3fefa72f04bf01c14e2d177f9
EBUILD qt-opengl-4.7.9999.ebuild 990 RMD160 85c82f867e5bafc406485f679d1478eec2e105b2 SHA1 41432be51928eacd80bd67809e83869024c61b7d SHA256 5e09c444226da676d166e9ca9b5cc57b44d1ab5a99fa8da24ff808fdcb48a2dd
-EBUILD qt-opengl-4.8.9999.ebuild 1559 RMD160 a7696bedc1494fec246c13ff34d7f15a4f64f163 SHA1 1b14d7154ee9e3b346e046f21fbf15110fb521c1 SHA256 39683427b05bbfa9fc45288261b2be3383ba1cba13db4c8ece974b36b286463a
-EBUILD qt-opengl-4.9999.ebuild 1559 RMD160 a7696bedc1494fec246c13ff34d7f15a4f64f163 SHA1 1b14d7154ee9e3b346e046f21fbf15110fb521c1 SHA256 39683427b05bbfa9fc45288261b2be3383ba1cba13db4c8ece974b36b286463a
+EBUILD qt-opengl-4.8.9999.ebuild 1559 RMD160 68f69e7a943151f4b75fdc7d8ff5fbc80074ab5a SHA1 8b1cf642fd4793a89afab9e82c67aefa5456cabe SHA256 7063f21f86e2364a0b14d296ce479656e50c99d5af0f506985df17be43f50b37
+EBUILD qt-opengl-4.9999.ebuild 1559 RMD160 68f69e7a943151f4b75fdc7d8ff5fbc80074ab5a SHA1 8b1cf642fd4793a89afab9e82c67aefa5456cabe SHA256 7063f21f86e2364a0b14d296ce479656e50c99d5af0f506985df17be43f50b37
MISC metadata.xml 560 RMD160 866518853e273fcbb0156bd3d73fae67202ccc52 SHA1 a280738638ba23330c3a3ba2edc564bbfdb87811 SHA256 a251618b65d1c25ed5c1c7540a457a6749f10d6b7f05d96a4cac54813f1b463d
diff --git a/x11-libs/qt-opengl/qt-opengl-4.8.9999.ebuild b/x11-libs/qt-opengl/qt-opengl-4.8.9999.ebuild
index aeb3952..b9bf3ff 100644
--- a/x11-libs/qt-opengl/qt-opengl-4.8.9999.ebuild
+++ b/x11-libs/qt-opengl/qt-opengl-4.8.9999.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-EAPI="3"
+EAPI="4"
inherit qt4-build-edge
DESCRIPTION="The OpenGL module for the Qt toolkit"
diff --git a/x11-libs/qt-opengl/qt-opengl-4.9999.ebuild b/x11-libs/qt-opengl/qt-opengl-4.9999.ebuild
index aeb3952..b9bf3ff 100644
--- a/x11-libs/qt-opengl/qt-opengl-4.9999.ebuild
+++ b/x11-libs/qt-opengl/qt-opengl-4.9999.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-EAPI="3"
+EAPI="4"
inherit qt4-build-edge
DESCRIPTION="The OpenGL module for the Qt toolkit"
diff --git a/x11-libs/qt-openvg/Manifest b/x11-libs/qt-openvg/Manifest
index 3cd63b7..87b9265 100644
--- a/x11-libs/qt-openvg/Manifest
+++ b/x11-libs/qt-openvg/Manifest
@@ -2,6 +2,6 @@ DIST qt-everywhere-opensource-src-4.7.0.tar.gz 208320257 RMD160 3e9c0f0d9843b5c0
DIST qt-everywhere-opensource-src-4.7.1.tar.gz 211768512 RMD160 de6998948eb9f51a9193b9020ba80cfd52d50899 SHA1 fcf764d39d982c7f84703821582bd10c3192e341 SHA256 8cb5277c41f824cfc6dcee0e95e0bf23a9ad2c8d18d245105137481d092b124a
EBUILD qt-openvg-4.7.0.ebuild 985 RMD160 fd4e70e89d5aa555bfded72f313cc0eb37352b70 SHA1 ddbd106a48b4672cbf2c95cb5fc41d83c77d794f SHA256 14cfeb16008737287ae874e010ec67f5769517c438c7de584e04e107cfdc445a
EBUILD qt-openvg-4.7.1.ebuild 985 RMD160 fd4e70e89d5aa555bfded72f313cc0eb37352b70 SHA1 ddbd106a48b4672cbf2c95cb5fc41d83c77d794f SHA256 14cfeb16008737287ae874e010ec67f5769517c438c7de584e04e107cfdc445a
-EBUILD qt-openvg-4.8.9999.ebuild 1448 RMD160 ab4270385ab4598720cc6c804a14d889897f6407 SHA1 a2daadb4dd66640aff17ce01671f0564f0c241d8 SHA256 9c4d5466a76b3f109101fb9e82e20e60eedad41b252a1c3c219e81333df13666
-EBUILD qt-openvg-4.9999.ebuild 1448 RMD160 ab4270385ab4598720cc6c804a14d889897f6407 SHA1 a2daadb4dd66640aff17ce01671f0564f0c241d8 SHA256 9c4d5466a76b3f109101fb9e82e20e60eedad41b252a1c3c219e81333df13666
+EBUILD qt-openvg-4.8.9999.ebuild 1448 RMD160 50797cba5adb3ebd66850eb7642cb202734f8833 SHA1 893bb5eb7c111646129cc30da7563d37e677e724 SHA256 9fa7733cdfe2aa92d26459bada3aee797e142affa659adad505a07c950574438
+EBUILD qt-openvg-4.9999.ebuild 1448 RMD160 50797cba5adb3ebd66850eb7642cb202734f8833 SHA1 893bb5eb7c111646129cc30da7563d37e677e724 SHA256 9fa7733cdfe2aa92d26459bada3aee797e142affa659adad505a07c950574438
MISC metadata.xml 560 RMD160 866518853e273fcbb0156bd3d73fae67202ccc52 SHA1 a280738638ba23330c3a3ba2edc564bbfdb87811 SHA256 a251618b65d1c25ed5c1c7540a457a6749f10d6b7f05d96a4cac54813f1b463d
diff --git a/x11-libs/qt-openvg/qt-openvg-4.8.9999.ebuild b/x11-libs/qt-openvg/qt-openvg-4.8.9999.ebuild
index d183315..f072491 100644
--- a/x11-libs/qt-openvg/qt-openvg-4.8.9999.ebuild
+++ b/x11-libs/qt-openvg/qt-openvg-4.8.9999.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-EAPI="3"
+EAPI="4"
inherit qt4-build-edge
DESCRIPTION="The OpenVG module for the Qt toolkit"
diff --git a/x11-libs/qt-openvg/qt-openvg-4.9999.ebuild b/x11-libs/qt-openvg/qt-openvg-4.9999.ebuild
index d183315..f072491 100644
--- a/x11-libs/qt-openvg/qt-openvg-4.9999.ebuild
+++ b/x11-libs/qt-openvg/qt-openvg-4.9999.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-EAPI="3"
+EAPI="4"
inherit qt4-build-edge
DESCRIPTION="The OpenVG module for the Qt toolkit"
diff --git a/x11-libs/qt-phonon/Manifest b/x11-libs/qt-phonon/Manifest
index b2a39fe..11ab638 100644
--- a/x11-libs/qt-phonon/Manifest
+++ b/x11-libs/qt-phonon/Manifest
@@ -1,5 +1,5 @@
AUX qtbug-9691-Xdefs.patch 2874 RMD160 f8a9f5b233466744dcd6e8003e091c59f42ba0d4 SHA1 3715be8f360fef018a3ba84b40ba7b7721d5580d SHA256 46a500351f0e6ae40ac00dcab788d6e3b94709c3fefa72f04bf01c14e2d177f9
EBUILD qt-phonon-4.7.9999.ebuild 872 RMD160 30706bfb86866fc08f48785c7473e97b66b1fda5 SHA1 920b17140f630f3615a22a8d9a0905841055a511 SHA256 8c8c7b0fb676515b777227e0893236cde18e7649b22420cdfaefa39d7ea3e7f3
-EBUILD qt-phonon-4.8.9999.ebuild 1408 RMD160 7fdc6b71e0663e862b5b13856b6e4f9a410dac7e SHA1 f89e0990f42bb8ea47c2311586c5a4f3d47ca1c5 SHA256 cdcee1820ebdd4db9b9c92f008a1958b4e23ea5ea6c5be60d83b03ac866968d0
-EBUILD qt-phonon-4.9999.ebuild 1408 RMD160 7fdc6b71e0663e862b5b13856b6e4f9a410dac7e SHA1 f89e0990f42bb8ea47c2311586c5a4f3d47ca1c5 SHA256 cdcee1820ebdd4db9b9c92f008a1958b4e23ea5ea6c5be60d83b03ac866968d0
+EBUILD qt-phonon-4.8.9999.ebuild 1408 RMD160 9c9496fd6dd2e5eddbb4543d30ec0f300b72b75a SHA1 8d074ad823167d3c489d91d33116e2f2165b20d7 SHA256 22129054148ad52ffece866c35e5038d9db981ad293d742bf174033edc9ec6e1
+EBUILD qt-phonon-4.9999.ebuild 1408 RMD160 9c9496fd6dd2e5eddbb4543d30ec0f300b72b75a SHA1 8d074ad823167d3c489d91d33116e2f2165b20d7 SHA256 22129054148ad52ffece866c35e5038d9db981ad293d742bf174033edc9ec6e1
MISC metadata.xml 369 RMD160 52b34abcd322c2436157d9045cb892cffdbf00e4 SHA1 91a5ea601ffcd5d32626c6cd23767f39ecc743cb SHA256 f92954ba27e6923458310562b1537216409895a1ba484399f49809824a80e980
diff --git a/x11-libs/qt-phonon/qt-phonon-4.8.9999.ebuild b/x11-libs/qt-phonon/qt-phonon-4.8.9999.ebuild
index c97dd36..85980f4 100644
--- a/x11-libs/qt-phonon/qt-phonon-4.8.9999.ebuild
+++ b/x11-libs/qt-phonon/qt-phonon-4.8.9999.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-phonon/qt-phonon-4.7.4.ebuild,v 1.1 2011/09/08 09:21:01 wired Exp $
-EAPI="3"
+EAPI="4"
inherit qt4-build-edge
DESCRIPTION="The Phonon module for the Qt toolkit"
diff --git a/x11-libs/qt-phonon/qt-phonon-4.9999.ebuild b/x11-libs/qt-phonon/qt-phonon-4.9999.ebuild
index c97dd36..85980f4 100644
--- a/x11-libs/qt-phonon/qt-phonon-4.9999.ebuild
+++ b/x11-libs/qt-phonon/qt-phonon-4.9999.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-phonon/qt-phonon-4.7.4.ebuild,v 1.1 2011/09/08 09:21:01 wired Exp $
-EAPI="3"
+EAPI="4"
inherit qt4-build-edge
DESCRIPTION="The Phonon module for the Qt toolkit"
diff --git a/x11-libs/qt-qt3support/Manifest b/x11-libs/qt-qt3support/Manifest
index f9b9e0c..fb4be59 100644
--- a/x11-libs/qt-qt3support/Manifest
+++ b/x11-libs/qt-qt3support/Manifest
@@ -1,4 +1,4 @@
EBUILD qt-qt3support-4.7.9999.ebuild 1013 RMD160 0c0c81b25a71eff5db51fa4b208f4a32f76c18a8 SHA1 f9f95d67f22c6d93501b08e5745ac3f7d8c0ba7f SHA256 520b69df3bdce99ac8a07181fdb8f064298c63a8def56dff3d7619e558e19e10
-EBUILD qt-qt3support-4.8.9999.ebuild 1370 RMD160 53a5a9c26295f7f7a7798f22a2555d3c422ebc91 SHA1 06d53220b578857290e78611951f782f9a599ab7 SHA256 ef4d5a7579c0adb794823e7f2233a4485da52486df6a74bc303d5ac5734e943a
-EBUILD qt-qt3support-4.9999.ebuild 1370 RMD160 53a5a9c26295f7f7a7798f22a2555d3c422ebc91 SHA1 06d53220b578857290e78611951f782f9a599ab7 SHA256 ef4d5a7579c0adb794823e7f2233a4485da52486df6a74bc303d5ac5734e943a
+EBUILD qt-qt3support-4.8.9999.ebuild 1370 RMD160 c348240667415cb515f79de4cbc85c8a0a08febc SHA1 3a82bb0bba19bed99b66d893225c76b229db0be1 SHA256 aedc1d20dc67b9bcf5f02a14fee186eb60879fef4dafa5d5ab0e44204fd50c82
+EBUILD qt-qt3support-4.9999.ebuild 1370 RMD160 c348240667415cb515f79de4cbc85c8a0a08febc SHA1 3a82bb0bba19bed99b66d893225c76b229db0be1 SHA256 aedc1d20dc67b9bcf5f02a14fee186eb60879fef4dafa5d5ab0e44204fd50c82
MISC metadata.xml 561 RMD160 2de7bdd25b6297cb46ba85c50fb27cd154b1806b SHA1 9c2433b99c7eafd3513bfc33526bc0141382bc6f SHA256 8709a30ccaa6deb60e689f740083c222c60bb3f8b0d8c5b847504a40a6548b0e
diff --git a/x11-libs/qt-qt3support/qt-qt3support-4.8.9999.ebuild b/x11-libs/qt-qt3support/qt-qt3support-4.8.9999.ebuild
index 1482da1..2c9a507 100644
--- a/x11-libs/qt-qt3support/qt-qt3support-4.8.9999.ebuild
+++ b/x11-libs/qt-qt3support/qt-qt3support-4.8.9999.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-qt3support/qt-qt3support-4.7.4.ebuild,v 1.1 2011/09/08 09:21:19 wired Exp $
-EAPI="3"
+EAPI="4"
inherit qt4-build-edge
DESCRIPTION="The Qt3 support module for the Qt toolkit"
diff --git a/x11-libs/qt-qt3support/qt-qt3support-4.9999.ebuild b/x11-libs/qt-qt3support/qt-qt3support-4.9999.ebuild
index 1482da1..2c9a507 100644
--- a/x11-libs/qt-qt3support/qt-qt3support-4.9999.ebuild
+++ b/x11-libs/qt-qt3support/qt-qt3support-4.9999.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-qt3support/qt-qt3support-4.7.4.ebuild,v 1.1 2011/09/08 09:21:19 wired Exp $
-EAPI="3"
+EAPI="4"
inherit qt4-build-edge
DESCRIPTION="The Qt3 support module for the Qt toolkit"
diff --git a/x11-libs/qt-script/Manifest b/x11-libs/qt-script/Manifest
index 407745f..f6dc407 100644
--- a/x11-libs/qt-script/Manifest
+++ b/x11-libs/qt-script/Manifest
@@ -1,5 +1,5 @@
AUX qt-4.6-master-nolibx11.patch 1201 RMD160 54cd69c157b4624f687dcd05fa49c659973531c7 SHA1 1a320131804aba3a441d07dff9414a1b0d799125 SHA256 25a7f06997fdc7fc642d945fec279b62a13505764ea15f7bd77518e08825e4a8
EBUILD qt-script-4.7.9999.ebuild 1222 RMD160 dfc422aae6100c5632be9ed4e2949fbaf3d5a0c8 SHA1 fd122c7b3b4d7aa4ca70ac2170449737e27fc774 SHA256 b3b2a74d257647457b934e1d5e3e9d88739e88421267a99bcdc841ed4e764c8a
-EBUILD qt-script-4.8.9999.ebuild 1472 RMD160 c3ad77ef72058c77284c60d824daab94362dfdd1 SHA1 5d725736718c3d222d03cd6ff2237dd3c499d0a5 SHA256 1785ba33effcc86930174630d071c143aa0c58588577cae1d0a629bc81ad8f54
-EBUILD qt-script-4.9999.ebuild 1472 RMD160 c3ad77ef72058c77284c60d824daab94362dfdd1 SHA1 5d725736718c3d222d03cd6ff2237dd3c499d0a5 SHA256 1785ba33effcc86930174630d071c143aa0c58588577cae1d0a629bc81ad8f54
+EBUILD qt-script-4.8.9999.ebuild 1472 RMD160 ede1c969baa3501d5234e8915382cd268dde99e9 SHA1 1870c4b1610bf4052ebe2a684e78b0c5c9e43604 SHA256 a41e7350b9f0903e6fb0efc386bb7a4a7d80a7fbfc77087cd6a30f6a934b6553
+EBUILD qt-script-4.9999.ebuild 1472 RMD160 ede1c969baa3501d5234e8915382cd268dde99e9 SHA1 1870c4b1610bf4052ebe2a684e78b0c5c9e43604 SHA256 a41e7350b9f0903e6fb0efc386bb7a4a7d80a7fbfc77087cd6a30f6a934b6553
MISC metadata.xml 512 RMD160 2898ef80c079f80213a3c61d440b89b882d1e197 SHA1 a289c48a1a20f6d8dcd823ae9de0b4fd59cbf8e8 SHA256 ea5e8cd090e693b016f0da7e6ae8e73362abd9af48f5a4dc8f5b83b8b8bc7e36
diff --git a/x11-libs/qt-script/qt-script-4.8.9999.ebuild b/x11-libs/qt-script/qt-script-4.8.9999.ebuild
index 20ded32..414dfc4 100644
--- a/x11-libs/qt-script/qt-script-4.8.9999.ebuild
+++ b/x11-libs/qt-script/qt-script-4.8.9999.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-EAPI="3"
+EAPI="4"
inherit qt4-build-edge
DESCRIPTION="The ECMAScript module for the Qt toolkit"
diff --git a/x11-libs/qt-script/qt-script-4.9999.ebuild b/x11-libs/qt-script/qt-script-4.9999.ebuild
index 20ded32..414dfc4 100644
--- a/x11-libs/qt-script/qt-script-4.9999.ebuild
+++ b/x11-libs/qt-script/qt-script-4.9999.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-EAPI="3"
+EAPI="4"
inherit qt4-build-edge
DESCRIPTION="The ECMAScript module for the Qt toolkit"
diff --git a/x11-libs/qt-sql/Manifest b/x11-libs/qt-sql/Manifest
index 920838b..08a40d4 100644
--- a/x11-libs/qt-sql/Manifest
+++ b/x11-libs/qt-sql/Manifest
@@ -1,5 +1,5 @@
AUX qt-4.6-master-nolibx11.patch 1201 RMD160 54cd69c157b4624f687dcd05fa49c659973531c7 SHA1 1a320131804aba3a441d07dff9414a1b0d799125 SHA256 25a7f06997fdc7fc642d945fec279b62a13505764ea15f7bd77518e08825e4a8
EBUILD qt-sql-4.7.9999.ebuild 2244 RMD160 758683177c2cf30dc2a3ebc661de4f133e56a717 SHA1 43148792969a5d4a5a360b28160be7c3bba4b3ad SHA256 2733a401b70e5c8f2909004f17fc6453728bdea14781515a08806a417649bddd
-EBUILD qt-sql-4.8.9999.ebuild 2538 RMD160 3cd8338f13de76feacf3f84cb7777fe0c05d6fb8 SHA1 f04d06e16b29950274ba399331c5c8c11bd3aaba SHA256 08e9d8b01edddb434ecc30a129417bc4e87cfb64c3f40f38f76b6b16b3c883e2
-EBUILD qt-sql-4.9999.ebuild 2538 RMD160 3cd8338f13de76feacf3f84cb7777fe0c05d6fb8 SHA1 f04d06e16b29950274ba399331c5c8c11bd3aaba SHA256 08e9d8b01edddb434ecc30a129417bc4e87cfb64c3f40f38f76b6b16b3c883e2
+EBUILD qt-sql-4.8.9999.ebuild 2538 RMD160 45e692478f5011b90dea07c92753a8d47f17f60d SHA1 831749177114a2318112595de64b53d76858b29b SHA256 14a693390be26397b383ad9ab8d63fe3059d6fa5a04228f462e2af5f446247a9
+EBUILD qt-sql-4.9999.ebuild 2538 RMD160 45e692478f5011b90dea07c92753a8d47f17f60d SHA1 831749177114a2318112595de64b53d76858b29b SHA256 14a693390be26397b383ad9ab8d63fe3059d6fa5a04228f462e2af5f446247a9
MISC metadata.xml 505 RMD160 c8a09c05b2ac9e644089e0f1646a7806122e728c SHA1 6d8d42dd88275004b99ddea893aa6c6bb8abfe39 SHA256 ba88cdd53713d9956ffe86328b31a1f19d03d91672623cc00ebff7c4fd45b785
diff --git a/x11-libs/qt-sql/qt-sql-4.8.9999.ebuild b/x11-libs/qt-sql/qt-sql-4.8.9999.ebuild
index bcbb6e4..d581165 100644
--- a/x11-libs/qt-sql/qt-sql-4.8.9999.ebuild
+++ b/x11-libs/qt-sql/qt-sql-4.8.9999.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-EAPI="3"
+EAPI="4"
inherit qt4-build-edge
DESCRIPTION="The SQL module for the Qt toolkit"
diff --git a/x11-libs/qt-sql/qt-sql-4.9999.ebuild b/x11-libs/qt-sql/qt-sql-4.9999.ebuild
index bcbb6e4..d581165 100644
--- a/x11-libs/qt-sql/qt-sql-4.9999.ebuild
+++ b/x11-libs/qt-sql/qt-sql-4.9999.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-EAPI="3"
+EAPI="4"
inherit qt4-build-edge
DESCRIPTION="The SQL module for the Qt toolkit"
diff --git a/x11-libs/qt-svg/Manifest b/x11-libs/qt-svg/Manifest
index 96013ad..6052b1d 100644
--- a/x11-libs/qt-svg/Manifest
+++ b/x11-libs/qt-svg/Manifest
@@ -1,4 +1,4 @@
EBUILD qt-svg-4.7.9999.ebuild 1191 RMD160 e8b1a537a6077679ea0d6698cafb85955db99d4e SHA1 fef38b47c30c1e5e6bd7fca0847f2a3e52acdde7 SHA256 e08910666b63b5b7ba2f727b921d7f3b10c952ea86babfbd62462a83967fb98a
-EBUILD qt-svg-4.8.9999.ebuild 1537 RMD160 f5e55a03e01b2df6e6ada98fe29398dd63717b00 SHA1 40e1cbb0c0222f9a47fb1af513e893ddc8a09d3b SHA256 2e8e283c2955fe08d4fc9f08272206475639f590de9d499cdd12eedc6ed06877
-EBUILD qt-svg-4.9999.ebuild 1176 RMD160 52b8127758899285ff6ea05b887c481838067c54 SHA1 8c2f88dd97b3e55e4f7f77b9cd1abde6f6140812 SHA256 2f76ee5876f4d5f9f105dc79c36f01593c4d1ff7b278844b6ea754127644df69
+EBUILD qt-svg-4.8.9999.ebuild 1537 RMD160 a8605bb1a59ecbf26539ee3f5ca2a84525a01103 SHA1 e92405a25ae3a721e9d6204d97707f648179fdc1 SHA256 b7b78ea9c3e66ad97f1889b50e39644c2d180e69e47fbc0088ac44a96cdb54aa
+EBUILD qt-svg-4.9999.ebuild 1176 RMD160 96b44bb66e40650fbf6bb35f539aa5bc84a1ffdc SHA1 a08a2ca1a69b8de9f8771c512953df2319dddabb SHA256 3844570db82f09c5b1a7b44efe87759c133c5cc663118cd1d36bfcb12bc2dc9d
MISC metadata.xml 369 RMD160 52b34abcd322c2436157d9045cb892cffdbf00e4 SHA1 91a5ea601ffcd5d32626c6cd23767f39ecc743cb SHA256 f92954ba27e6923458310562b1537216409895a1ba484399f49809824a80e980
diff --git a/x11-libs/qt-svg/qt-svg-4.8.9999.ebuild b/x11-libs/qt-svg/qt-svg-4.8.9999.ebuild
index b89e920..97e353b 100644
--- a/x11-libs/qt-svg/qt-svg-4.8.9999.ebuild
+++ b/x11-libs/qt-svg/qt-svg-4.8.9999.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-svg/qt-svg-4.7.4.ebuild,v 1.1 2011/09/08 09:22:11 wired Exp $
-EAPI="3"
+EAPI="4"
inherit qt4-build-edge
DESCRIPTION="The SVG module for the Qt toolkit"
diff --git a/x11-libs/qt-svg/qt-svg-4.9999.ebuild b/x11-libs/qt-svg/qt-svg-4.9999.ebuild
index 85eb9ef..cbb6f24 100644
--- a/x11-libs/qt-svg/qt-svg-4.9999.ebuild
+++ b/x11-libs/qt-svg/qt-svg-4.9999.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-EAPI="3"
+EAPI="4"
inherit qt4-build-edge
DESCRIPTION="The SVG module for the Qt toolkit"
diff --git a/x11-libs/qt-test/Manifest b/x11-libs/qt-test/Manifest
index 1630f26..fb6e03d 100644
--- a/x11-libs/qt-test/Manifest
+++ b/x11-libs/qt-test/Manifest
@@ -1,5 +1,5 @@
AUX qt-4.6-master-nolibx11.patch 1201 RMD160 54cd69c157b4624f687dcd05fa49c659973531c7 SHA1 1a320131804aba3a441d07dff9414a1b0d799125 SHA256 25a7f06997fdc7fc642d945fec279b62a13505764ea15f7bd77518e08825e4a8
EBUILD qt-test-4.7.9999.ebuild 968 RMD160 837435f0e498e20eb028f84725df5321f68cddff SHA1 70337ed054334b1778799938bdc47b4f7066658e SHA256 b75f0e8b5aa0c6660f2764c680c592c717e8e720ac8432b4301c5eba986f3c77
-EBUILD qt-test-4.8.9999.ebuild 1303 RMD160 fad790cb4e2810b8171a2c633a742de29aa7a4d0 SHA1 36fece667f640bc0fcc04cef9fc6e6350dc1e08e SHA256 fafafe2e40cc8333d397eb485c13a81cfef3eaa15a825839263ecb544b5bd997
-EBUILD qt-test-4.9999.ebuild 1303 RMD160 fad790cb4e2810b8171a2c633a742de29aa7a4d0 SHA1 36fece667f640bc0fcc04cef9fc6e6350dc1e08e SHA256 fafafe2e40cc8333d397eb485c13a81cfef3eaa15a825839263ecb544b5bd997
+EBUILD qt-test-4.8.9999.ebuild 1303 RMD160 ebdcb29c7dcd7f70825051ff28382db3be5bdd12 SHA1 9e47ada206d1ae63db7e1ef35a2bb3de809e7b2f SHA256 8a2ed8d850400d0444288be83412b848c70b85f82445da912392baf662173c19
+EBUILD qt-test-4.9999.ebuild 1303 RMD160 ebdcb29c7dcd7f70825051ff28382db3be5bdd12 SHA1 9e47ada206d1ae63db7e1ef35a2bb3de809e7b2f SHA256 8a2ed8d850400d0444288be83412b848c70b85f82445da912392baf662173c19
MISC metadata.xml 369 RMD160 52b34abcd322c2436157d9045cb892cffdbf00e4 SHA1 91a5ea601ffcd5d32626c6cd23767f39ecc743cb SHA256 f92954ba27e6923458310562b1537216409895a1ba484399f49809824a80e980
diff --git a/x11-libs/qt-test/qt-test-4.8.9999.ebuild b/x11-libs/qt-test/qt-test-4.8.9999.ebuild
index 3496264..904ef58 100644
--- a/x11-libs/qt-test/qt-test-4.8.9999.ebuild
+++ b/x11-libs/qt-test/qt-test-4.8.9999.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-test/qt-test-4.7.4.ebuild,v 1.1 2011/09/08 09:22:28 wired Exp $
-EAPI="3"
+EAPI="4"
inherit qt4-build-edge
DESCRIPTION="The testing framework module for the Qt toolkit"
diff --git a/x11-libs/qt-test/qt-test-4.9999.ebuild b/x11-libs/qt-test/qt-test-4.9999.ebuild
index 3496264..904ef58 100644
--- a/x11-libs/qt-test/qt-test-4.9999.ebuild
+++ b/x11-libs/qt-test/qt-test-4.9999.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-test/qt-test-4.7.4.ebuild,v 1.1 2011/09/08 09:22:28 wired Exp $
-EAPI="3"
+EAPI="4"
inherit qt4-build-edge
DESCRIPTION="The testing framework module for the Qt toolkit"
diff --git a/x11-libs/qt-webkit/Manifest b/x11-libs/qt-webkit/Manifest
index 72eb9b7..f375415 100644
--- a/x11-libs/qt-webkit/Manifest
+++ b/x11-libs/qt-webkit/Manifest
@@ -2,6 +2,6 @@ AUX kde-phonon.patch 1076 RMD160 87c9eef2e8f6582fff9f2c12332279053f8d5be6 SHA1 1
AUX qt-webkit-4.8.0-c++0x-fix.patch 4886 RMD160 1983e6c19ebc4ea14114e33ce97b4af9f707b1ac SHA1 d09b4cd4ee7924080afc2eb7e7b99335fc265ded SHA256 986d83696feb008b8bc7f410c8598b700cec330b035e793d23e73db2e31620af
AUX sparc-qt-webkit-sigbus.patch 5337 RMD160 8115404ff15afaff75df56d7e769741e066a4fc7 SHA1 5115dccef4ac8214788fcdca8aa8541d4eee2a1f SHA256 46c8fdb2c6c39d69dcc34f22ec887187dfea95a5892d291e9ed5496c307b73cc
EBUILD qt-webkit-4.7.9999.ebuild 1477 RMD160 a81fc8ba7e52acfec80220b205ca4ee9c2019802 SHA1 19a30e9bdf34da50fc70382c93c5dd2e3366ff8d SHA256 82ea52f99e5fe620de93a6e347ff665bf36e2669644ac705f76d336f0d253215
-EBUILD qt-webkit-4.8.9999.ebuild 1963 RMD160 3d1d4557519dea2d0146b398b9b8e49bffedaba1 SHA1 ed53cec158363fe23ca2b42bbc424f767d4a5218 SHA256 a65f18c74cbfac7122a2f0e584cd33aa6d8dbfa5e9c50ac61f883364d7449187
-EBUILD qt-webkit-4.9999.ebuild 1963 RMD160 3d1d4557519dea2d0146b398b9b8e49bffedaba1 SHA1 ed53cec158363fe23ca2b42bbc424f767d4a5218 SHA256 a65f18c74cbfac7122a2f0e584cd33aa6d8dbfa5e9c50ac61f883364d7449187
+EBUILD qt-webkit-4.8.9999.ebuild 1963 RMD160 c6a263b81b0d2c99eec6d1a57c6731c9acf6fad2 SHA1 29016c5325d26b98b30b8141f1051e181e02d612 SHA256 cb78d85ae02c1967378fbf8e33b76d661636f9771cb23a10be7a382f6285aee6
+EBUILD qt-webkit-4.9999.ebuild 1963 RMD160 c6a263b81b0d2c99eec6d1a57c6731c9acf6fad2 SHA1 29016c5325d26b98b30b8141f1051e181e02d612 SHA256 cb78d85ae02c1967378fbf8e33b76d661636f9771cb23a10be7a382f6285aee6
MISC metadata.xml 369 RMD160 52b34abcd322c2436157d9045cb892cffdbf00e4 SHA1 91a5ea601ffcd5d32626c6cd23767f39ecc743cb SHA256 f92954ba27e6923458310562b1537216409895a1ba484399f49809824a80e980
diff --git a/x11-libs/qt-webkit/qt-webkit-4.8.9999.ebuild b/x11-libs/qt-webkit/qt-webkit-4.8.9999.ebuild
index e32ad59..338ec4c 100644
--- a/x11-libs/qt-webkit/qt-webkit-4.8.9999.ebuild
+++ b/x11-libs/qt-webkit/qt-webkit-4.8.9999.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-webkit/qt-webkit-4.7.4.ebuild,v 1.1 2011/09/08 09:22:47 wired Exp $
-EAPI="3"
+EAPI="4"
inherit qt4-build-edge
DESCRIPTION="The Webkit module for the Qt toolkit"
diff --git a/x11-libs/qt-webkit/qt-webkit-4.9999.ebuild b/x11-libs/qt-webkit/qt-webkit-4.9999.ebuild
index e32ad59..338ec4c 100644
--- a/x11-libs/qt-webkit/qt-webkit-4.9999.ebuild
+++ b/x11-libs/qt-webkit/qt-webkit-4.9999.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-webkit/qt-webkit-4.7.4.ebuild,v 1.1 2011/09/08 09:22:47 wired Exp $
-EAPI="3"
+EAPI="4"
inherit qt4-build-edge
DESCRIPTION="The Webkit module for the Qt toolkit"
diff --git a/x11-libs/qt-xmlpatterns/Manifest b/x11-libs/qt-xmlpatterns/Manifest
index fa6e144..2d94f94 100644
--- a/x11-libs/qt-xmlpatterns/Manifest
+++ b/x11-libs/qt-xmlpatterns/Manifest
@@ -1,5 +1,5 @@
AUX qt-4.6-master-nolibx11.patch 1201 RMD160 54cd69c157b4624f687dcd05fa49c659973531c7 SHA1 1a320131804aba3a441d07dff9414a1b0d799125 SHA256 25a7f06997fdc7fc642d945fec279b62a13505764ea15f7bd77518e08825e4a8
EBUILD qt-xmlpatterns-4.7.9999.ebuild 746 RMD160 6dbbf8cddfb846c31b99052541ee2122addf52a9 SHA1 0f39a3a34afcee520fbef46a6269366eefd115d5 SHA256 f7b0d52f2e10c7e6e2424b82e6a7e994b9855af74cdded08a0baa3b8e1e21817
-EBUILD qt-xmlpatterns-4.8.9999.ebuild 1112 RMD160 ec6916de4a2da2f297ef88e83db23ed8a976ab55 SHA1 c1d0763b89aa27cb20e18419be6e905843b037df SHA256 5350ae55d79491dbaccf9e5727f8d4cafa83f2e24a99a41cff48019c062d6500
-EBUILD qt-xmlpatterns-4.9999.ebuild 1112 RMD160 ec6916de4a2da2f297ef88e83db23ed8a976ab55 SHA1 c1d0763b89aa27cb20e18419be6e905843b037df SHA256 5350ae55d79491dbaccf9e5727f8d4cafa83f2e24a99a41cff48019c062d6500
+EBUILD qt-xmlpatterns-4.8.9999.ebuild 1112 RMD160 ca329bb7f5ac646779c6379b42234910ad4c2eaf SHA1 59b67772197ca240944fd1f85fc8c96ea4304bf4 SHA256 f50787c9d20132730ab9f38766ae9dbfb1db6c92fccc264254c26afc7aef0a27
+EBUILD qt-xmlpatterns-4.9999.ebuild 1112 RMD160 ca329bb7f5ac646779c6379b42234910ad4c2eaf SHA1 59b67772197ca240944fd1f85fc8c96ea4304bf4 SHA256 f50787c9d20132730ab9f38766ae9dbfb1db6c92fccc264254c26afc7aef0a27
MISC metadata.xml 302 RMD160 0a9b17773072312b3e141076b1257a7ed154101d SHA1 e0172a957ea64b2aa564ef706a83eb5f561b6414 SHA256 0c2cc02f4a6393e15f6eaedd7834688ef3d67b03053667f0e0f7e0acc38ab3f1
diff --git a/x11-libs/qt-xmlpatterns/qt-xmlpatterns-4.8.9999.ebuild b/x11-libs/qt-xmlpatterns/qt-xmlpatterns-4.8.9999.ebuild
index 6707dcc..25cf891 100644
--- a/x11-libs/qt-xmlpatterns/qt-xmlpatterns-4.8.9999.ebuild
+++ b/x11-libs/qt-xmlpatterns/qt-xmlpatterns-4.8.9999.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-xmlpatterns/qt-xmlpatterns-4.7.4.ebuild,v 1.1 2011/09/08 09:23:04 wired Exp $
-EAPI="3"
+EAPI="4"
inherit qt4-build-edge
DESCRIPTION="The patternist module for the Qt toolkit"
diff --git a/x11-libs/qt-xmlpatterns/qt-xmlpatterns-4.9999.ebuild b/x11-libs/qt-xmlpatterns/qt-xmlpatterns-4.9999.ebuild
index 6707dcc..25cf891 100644
--- a/x11-libs/qt-xmlpatterns/qt-xmlpatterns-4.9999.ebuild
+++ b/x11-libs/qt-xmlpatterns/qt-xmlpatterns-4.9999.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-xmlpatterns/qt-xmlpatterns-4.7.4.ebuild,v 1.1 2011/09/08 09:23:04 wired Exp $
-EAPI="3"
+EAPI="4"
inherit qt4-build-edge
DESCRIPTION="The patternist module for the Qt toolkit"
^ permalink raw reply related [flat|nested] 11+ messages in thread* [gentoo-commits] proj/qt:master commit in: x11-libs/qt-opengl/, x11-libs/qt-script/, x11-libs/qt-qt3support/, ...
@ 2012-02-04 9:14 Markos Chandras
0 siblings, 0 replies; 11+ messages in thread
From: Markos Chandras @ 2012-02-04 9:14 UTC (permalink / raw
To: gentoo-commits
commit: a4f70ce98520b4b2c3fd9adb3e1dcd8ef40951b8
Author: Markos Chandras <hwoarang <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 4 09:13:35 2012 +0000
Commit: Markos Chandras <hwoarang <AT> gentoo <DOT> org>
CommitDate: Sat Feb 4 09:13:35 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=a4f70ce9
qt-*-4.7.9999: Removed from tree. Please upgrade to 4.8.9999
---
profiles/package.mask | 21 ---
x11-libs/qt-assistant/qt-assistant-4.7.9999.ebuild | 93 ------------
x11-libs/qt-core/qt-core-4.7.9999.ebuild | 156 --------------------
x11-libs/qt-dbus/qt-dbus-4.7.9999.ebuild | 39 -----
.../qt-declarative/qt-declarative-4.7.9999.ebuild | 54 -------
x11-libs/qt-demo/qt-demo-4.7.9999.ebuild | 51 -------
x11-libs/qt-gui/qt-gui-4.7.9999.ebuild | 155 -------------------
.../qt-multimedia/qt-multimedia-4.7.9999.ebuild | 47 ------
x11-libs/qt-opengl/qt-opengl-4.7.9999.ebuild | 48 ------
x11-libs/qt-openvg/Manifest | 2 +-
x11-libs/qt-phonon/qt-phonon-4.7.9999.ebuild | 39 -----
.../qt-qt3support/qt-qt3support-4.7.9999.ebuild | 40 -----
x11-libs/qt-script/qt-script-4.7.9999.ebuild | 45 ------
x11-libs/qt-simulator/qt-simulator-4.7.9999.ebuild | 87 -----------
x11-libs/qt-sql/qt-sql-4.7.9999.ebuild | 71 ---------
x11-libs/qt-svg/qt-svg-4.7.9999.ebuild | 48 ------
x11-libs/qt-test/qt-test-4.7.9999.ebuild | 34 -----
x11-libs/qt-webkit/qt-webkit-4.7.9999.ebuild | 52 -------
.../qt-xmlpatterns/qt-xmlpatterns-4.7.9999.ebuild | 36 -----
19 files changed, 1 insertions(+), 1117 deletions(-)
diff --git a/profiles/package.mask b/profiles/package.mask
index 08d7840..1a2ecf4 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -2,27 +2,6 @@
# Add your name and the date, as well as an explanation for the mask
# Make sure the atoms you add are valid!
-# Markos Chandras <hwoarang@gentoo.org> (28 Jan 2012)
-# 4.7.9999 ebuilds are outdated and not supported anymore
-# Please upgrade to 4.8.9999 or 4.99999
-# 4.7.9999 ebuild will be removed in 10 days
-~x11-libs/qt-assistant-4.7.9999
-~x11-libs/qt-core-4.7.9999
-~x11-libs/qt-declarative-4.7.9999
-~x11-libs/qt-dbus-4.7.9999
-~x11-libs/qt-demo-4.7.9999
-~x11-libs/qt-gui-4.7.9999
-~x11-libs/qt-multimedia-4.7.9999
-~x11-libs/qt-opengl-4.7.9999
-~x11-libs/qt-phonon-4.7.9999
-~x11-libs/qt-qt3support-4.7.9999
-~x11-libs/qt-script-4.7.9999
-~x11-libs/qt-sql-4.7.9999
-~x11-libs/qt-svg-4.7.9999
-~x11-libs/qt-test-4.7.9999
-~x11-libs/qt-webkit-4.7.9999
-~x11-libs/qt-xmlpatterns-4.7.9999
-
# Markos Chandras <hwoarang@gentoo.org> (31 Dec 2011)
# Masking latest releases
=dev-python/sip-4.13.1_pre*
diff --git a/x11-libs/qt-assistant/qt-assistant-4.7.9999.ebuild b/x11-libs/qt-assistant/qt-assistant-4.7.9999.ebuild
deleted file mode 100644
index 3a64092..0000000
--- a/x11-libs/qt-assistant/qt-assistant-4.7.9999.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="3"
-inherit qt4-build-edge
-
-DESCRIPTION="The assistant help module for the Qt toolkit"
-SLOT="4"
-KEYWORDS=""
-IUSE="doc +glib qt3support trace"
-
-DEPEND="~x11-libs/qt-gui-${PV}[stable-branch=,glib=,trace?,qt3support=]
- ~x11-libs/qt-sql-${PV}[sqlite,stable-branch=,qt3support=]
- ~x11-libs/qt-webkit-${PV}[stable-branch=]
- ~x11-libs/qt-declarative-${PV}[stable-branch=,qt3support=]"
-RDEPEND="${DEPEND}"
-
-# Pixeltool isn't really assistant related, but it relies on
-# the assistant libraries. doc/qch/
-QT4_TARGET_DIRECTORIES="
- tools/assistant
- tools/pixeltool
- tools/qdoc3"
-QT4_EXTRACT_DIRECTORIES="
- tools/
- demos/
- examples/
- src/
- include/
- doc/"
-
-pkg_setup() {
- use trace && QT4_TARGET_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
- tools/qttracereplay"
- QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
- ${QT4_EXTRACT_DIRECTORIES}"
- qt4-build-edge_pkg_setup
-}
-
-src_prepare() {
- qt4-build-edge_src_prepare
- sed -e "s/\(sub-qdoc3\.depends =\).*/\1/" \
- -i doc/doc.pri || die "patching qdoc3 depends failed"
-}
-
-src_configure() {
- myconf="${myconf} -no-xkb -no-fontconfig -no-xrender -no-xrandr
- -no-xfixes -no-xcursor -no-xinerama -no-xshape -no-sm -no-opengl
- -no-nas-sound -no-dbus -iconv -no-cups -no-nis -no-gif -no-libpng
- -no-libmng -no-libjpeg -no-openssl -system-zlib -no-phonon
- -no-xmlpatterns -no-freetype -no-libtiff -no-accessibility
- -no-fontconfig -no-multimedia -no-qt3support -no-svg
- $(qt_use qt3support)"
- ! use glib && myconf="${myconf} -no-glib"
- qt4-build-edge_src_configure
-}
-
-src_compile() {
- # help libQtHelp find freshly built libQtCLucene (bug #289811)
- export LD_LIBRARY_PATH="${S}/lib:${QTLIBDIR}"
- export DYLD_LIBRARY_PATH="${S}/lib:${S}/lib/QtHelp.framework"
-
- qt4-build-edge_src_compile
-
- # ugly hack to build docs
- cd "${S}"
- qmake "LIBS+=-L${QTLIBDIR}" "CONFIG+=nostrip" projects.pro || die
- emake qch_docs || die "emake qch_docs failed"
- if use doc; then
- emake docs || die "emake docs failed"
- fi
- qmake "LIBS+=-L${QTLIBDIR}" "CONFIG+=nostrip" projects.pro || die
-}
-
-src_install() {
- qt4-build-edge_src_install
- cd "${S}"
- emake INSTALL_ROOT="${D}" install_qchdocs \
- || die "failed to install qch docs"
- if use doc; then
- emake INSTALL_ROOT="${D}" install_htmldocs \
- || die "failed to install htmldocs"
- fi
- dobin "${S}"/bin/qdoc3 || die "Failed to install qdoc3"
- # install correct assistant icon, bug 241208
- dodir /usr/share/pixmaps/ || die
- insinto /usr/share/pixmaps/
- doins tools/assistant/tools/assistant/images/assistant.png || die
- # Note: absolute image path required here!
- make_desktop_entry assistant Assistant \
- /usr/share/pixmaps/assistant.png 'Qt;Development;GUIDesigner' || die
-}
diff --git a/x11-libs/qt-core/qt-core-4.7.9999.ebuild b/x11-libs/qt-core/qt-core-4.7.9999.ebuild
deleted file mode 100644
index 22ae4fe..0000000
--- a/x11-libs/qt-core/qt-core-4.7.9999.ebuild
+++ /dev/null
@@ -1,156 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="3"
-inherit qt4-build-edge
-
-DESCRIPTION="The Qt toolkit is a comprehensive C++ application development framework"
-SLOT="4"
-KEYWORDS=""
-IUSE="+glib iconv optimized-qmake private-headers qt3support ssl"
-
-DEPEND="sys-libs/zlib
- glib? ( dev-libs/glib )
- ssl? ( dev-libs/openssl )
- !<x11-libs/qt-4.4.0:4"
-RDEPEND="${DEPEND}"
-PDEPEND="qt3support? ( ~x11-libs/qt-gui-${PV}[qt3support,stable-branch=] )"
-
-pkg_setup() {
- QT4_TARGET_DIRECTORIES="
- src/tools/bootstrap
- src/tools/moc
- src/tools/rcc
- src/tools/uic
- src/corelib
- src/xml
- src/network
- src/plugins/codecs
- tools/linguist/lconvert
- tools/linguist/lrelease
- tools/linguist/lupdate"
-
- QT4_EXTRACT_DIRECTORIES="
- include/Qt
- include/QtCore
- include/QtNetwork
- include/QtScript
- include/QtXml
- src/plugins/plugins.pro
- src/plugins/qpluginbase.pri
- src/src.pro
- src/3rdparty/des
- src/3rdparty/harfbuzz
- src/3rdparty/md4
- src/3rdparty/md5
- src/3rdparty/sha1/
- src/3rdparty/easing
- src/script
- tools/linguist/shared
- translations"
- qt4-build-edge_pkg_setup
- QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
- ${QT4_EXTRACT_DIRECTORIES}"
-}
-
-src_prepare() {
- # Don't pre-strip, bug 235026
- for i in kr jp cn tw ; do
- echo "CONFIG+=nostrip" >> "${S}"/src/plugins/codecs/${i}/${i}.pro
- done
-
- qt4-build-edge_src_prepare
-
- # bug 172219
- sed -i -e "s:CXXFLAGS.*=:CXXFLAGS=${CXXFLAGS} :" \
- "${S}/qmake/Makefile.unix" || die "sed qmake/Makefile.unix CXXFLAGS failed"
- sed -i -e "s:LFLAGS.*=:LFLAGS=${LDFLAGS} :" \
- "${S}/qmake/Makefile.unix" || die "sed qmake/Makefile.unix LDFLAGS failed"
-}
-
-src_configure() {
- unset QMAKESPEC
-
- myconf="${myconf}
- $(qt_use glib)
- $(qt_use iconv)
- $(qt_use optimized-qmake)
- $(qt_use ssl openssl)
- $(qt_use qt3support)"
-
- myconf="${myconf} -no-xkb -no-fontconfig -no-xrender -no-xrandr
- -no-xfixes -no-xcursor -no-xinerama -no-xshape -no-sm -no-opengl
- -no-nas-sound -no-dbus -no-cups -no-gif -no-libpng
- -no-libmng -no-libjpeg -system-zlib -no-webkit -no-phonon -no-xmlpatterns
- -no-freetype -no-libtiff -no-accessibility -no-fontconfig -no-opengl
- -no-svg -no-gtkstyle -no-phonon-backend -no-script -no-scripttools
- -no-cups -no-xsync -no-xinput -no-multimedia"
- qt4-build-edge_src_configure
-}
-
-src_compile() {
- # bug 259736
- unset QMAKESPEC
- qt4-build-edge_src_compile
-}
-
-src_install() {
- dobin "${S}"/bin/{qmake,moc,rcc,uic,lconvert,lrelease,lupdate} || die
-
- install_directories src/{corelib,xml,network,plugins/codecs}
-
- emake INSTALL_ROOT="${D}" install_mkspecs || die
-
- #install private headers
- if use private-headers; then
- insinto ${QTHEADERDIR}/QtCore/private
- find "${S}"/src/corelib -type f -name "*_p.h" -exec doins {} \;
- fi
- # use freshly built libraries
- local DYLD_FPATH=
- [[ -d "${S}"/lib/QtCore.framework ]] \
- && DYLD_FPATH=$(for x in "${S}/lib/"*.framework; do echo -n ":$x"; done)
- DYLD_LIBRARY_PATH="${S}/lib${DYLD_FPATH}" \
- LD_LIBRARY_PATH="${S}/lib" "${S}"/bin/lrelease translations/*.ts || die
- insinto ${QTTRANSDIR}
- doins translations/*.qm || die
-
- setqtenv
- fix_library_files
-
- # List all the multilib libdirs
- local libdirs=
- for libdir in $(get_all_libdirs); do
- libdirs="${libdirs}:/usr/${libdir}/qt4"
- done
-
- cat <<-EOF > "${T}/44qt4"
- LDPATH=${libdirs:1}
- EOF
- doenvd "${T}/44qt4"
-
- dodir /${QTDATADIR}/mkspecs/gentoo
- mv "${D}"/${QTDATADIR}/mkspecs/qconfig.pri "${D}${QTDATADIR}"/mkspecs/gentoo \
- || die
-
- sed -i -e '2a#include <Gentoo/gentoo-qconfig.h>\n' \
- "${D}${QTHEADERDIR}"/QtCore/qconfig.h \
- "${D}${QTHEADERDIR}"/Qt/qconfig.h \
- || die
- if use glib; then
- QCONFIG_DEFINE=" $(use glib && echo QT_GLIB)
- $(use ssl && echo QT_OPENSSL)"
- install_qconfigs
- fi
- #remove .la files
- find "${D}"${QTLIBDIR} -name "*.la" -print0 | xargs -0 rm
- # remove some unnecessary headers
- rm -f "${D}${QTHEADERDIR}"/{Qt,QtCore}/{\
-qatomic_macosx.h,\
-qatomic_windows.h,\
-qatomic_windowsce.h,\
-qt_windows.h}
-
- keepdir "${QTSYSCONFDIR}"
-}
diff --git a/x11-libs/qt-dbus/qt-dbus-4.7.9999.ebuild b/x11-libs/qt-dbus/qt-dbus-4.7.9999.ebuild
deleted file mode 100644
index c1bee69..0000000
--- a/x11-libs/qt-dbus/qt-dbus-4.7.9999.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="3"
-inherit qt4-build-edge
-
-DESCRIPTION="The DBus module for the Qt toolkit"
-SLOT="4"
-KEYWORDS=""
-IUSE=""
-
-DEPEND="~x11-libs/qt-core-${PV}[debug=,stable-branch=]
- >=sys-apps/dbus-1.0.2"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
- QT4_TARGET_DIRECTORIES="
- src/dbus
- tools/qdbus/qdbus
- tools/qdbus/qdbusxml2cpp
- tools/qdbus/qdbuscpp2xml"
- QCONFIG_ADD="dbus dbus-linked"
- QCONFIG_DEFINE="QT_DBUS"
-
- QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
- include/QtCore
- include/QtDBus
- include/QtXml
- src/corelib
- src/xml"
-
- qt4-build-edge_pkg_setup
-}
-
-src_configure() {
- myconf="${myconf} -dbus-linked"
- qt4-build-edge_src_configure
-}
diff --git a/x11-libs/qt-declarative/qt-declarative-4.7.9999.ebuild b/x11-libs/qt-declarative/qt-declarative-4.7.9999.ebuild
deleted file mode 100644
index 92b05b3..0000000
--- a/x11-libs/qt-declarative/qt-declarative-4.7.9999.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="3"
-inherit qt4-build-edge
-
-DESCRIPTION="The Declarative module for the Qt toolkit"
-SLOT="4"
-KEYWORDS=""
-IUSE="private-headers qt3support webkit"
-
-DEPEND="~x11-libs/qt-core-${PV}[stable-branch=,qt3support=]
- ~x11-libs/qt-gui-${PV}[stable-branch=,qt3support=]
- ~x11-libs/qt-multimedia-${PV}[stable-branch=]
- ~x11-libs/qt-opengl-${PV}[stable-branch=,qt3support=]
- ~x11-libs/qt-script-${PV}[stable-branch=]
- ~x11-libs/qt-sql-${PV}[stable-branch=,qt3support=]
- ~x11-libs/qt-svg-${PV}[stable-branch=]
- ~x11-libs/qt-webkit-${PV}[stable-branch=]
- ~x11-libs/qt-xmlpatterns-${PV}[stable-branch=]
- qt3support? ( ~x11-libs/qt-qt3support-${PV}[stable-branch=] )
- webkit? ( ~x11-libs/qt-webkit-${PV}[stable-branch=] )"
-RDEPEND="${DEPEND}"
-
-QCONFIG_ADD="declarative"
-
-pkg_setup() {
- QT4_TARGET_DIRECTORIES="
- src/declarative
- tools/qml"
- QT4_EXTRACT_DIRECTORIES="
- include/
- src/
- tools/"
- if use webkit; then
- QT4_TARGET_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
- src/3rdparty/webkit/WebKit/qt/declarative"
- fi
- qt4-build-edge_pkg_setup
-}
-
-src_configure() {
- myconf="${myconf} -declarative"
- qt4-build-edge_src_configure
-}
-
-src_install() {
- qt4-build-edge_src_install
- if use private-headers; then
- insinto ${QTHEADERDIR}/QtDeclarative/private
- find "${S}"/src/declarative/ -type f -name "*_p.h" -exec doins {} \;
- fi
-}
diff --git a/x11-libs/qt-demo/qt-demo-4.7.9999.ebuild b/x11-libs/qt-demo/qt-demo-4.7.9999.ebuild
deleted file mode 100644
index e86dcfa..0000000
--- a/x11-libs/qt-demo/qt-demo-4.7.9999.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="3"
-inherit qt4-build-edge
-
-DESCRIPTION="Demonstration module of the Qt toolkit"
-SLOT="4"
-KEYWORDS=""
-IUSE="qt3support"
-
-DEPEND="~x11-libs/qt-assistant-${PV}:${SLOT}[stable-branch=]
- ~x11-libs/qt-core-${PV}:${SLOT}[stable-branch=,qt3support=]
- ~x11-libs/qt-dbus-${PV}:${SLOT}[stable-branch=]
- ~x11-libs/qt-gui-${PV}:${SLOT}[stable-branch=,qt3support]
- ~x11-libs/qt-declarative-${PV}:${SLOT}[stable-branch=,webkit]
- ~x11-libs/qt-multimedia-${PV}:${SLOT}[stable-branch=]
- ~x11-libs/qt-opengl-${PV}:${SLOT}[stable-branch=,qt3support=]
- || ( ~x11-libs/qt-phonon-${PV}:${SLOT}[stable-branch=] media-libs/phonon )
- ~x11-libs/qt-script-${PV}:${SLOT}[stable-branch=]
- ~x11-libs/qt-sql-${PV}:${SLOT}[stable-branch=]
- ~x11-libs/qt-svg-${PV}:${SLOT}[stable-branch=]
- ~x11-libs/qt-test-${PV}:${SLOT}[stable-branch=]
- ~x11-libs/qt-webkit-${PV}:${SLOT}[stable-branch=]
- ~x11-libs/qt-xmlpatterns-${PV}:${SLOT}[stable-branch=]"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
- QT4_TARGET_DIRECTORIES="demos
- examples"
- QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
- doc/src/images
- src/
- include/
- tools/"
-
- qt4-build-edge_pkg_setup
-}
-
-src_configure() {
- myconf="${myconf} $(qt_use qt3support)"
- qt4-build-edge_src_configure
-}
-
-src_install() {
- insinto ${QTDOCDIR}/src
- doins -r "${S}"/doc/src/images || die
-
- qt4-build-edge_src_install
-}
diff --git a/x11-libs/qt-gui/qt-gui-4.7.9999.ebuild b/x11-libs/qt-gui/qt-gui-4.7.9999.ebuild
deleted file mode 100644
index d756e71..0000000
--- a/x11-libs/qt-gui/qt-gui-4.7.9999.ebuild
+++ /dev/null
@@ -1,155 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="3"
-inherit confutils eutils qt4-build-edge
-
-DESCRIPTION="The GUI module for the Qt toolkit"
-SLOT="4"
-KEYWORDS=""
-IUSE="+accessibility cups dbus egl +glib gtkstyle mng nas nis private-headers +raster tiff trace qt3support xinerama"
-
-RDEPEND="media-libs/fontconfig
- media-libs/freetype:2
- virtual/jpeg
- media-libs/libpng
- sys-libs/zlib
- x11-libs/libX11
- x11-libs/libXext
- x11-libs/libXrandr
- x11-libs/libXcursor
- x11-libs/libXfont
- x11-libs/libSM
- x11-libs/libXi
- ~x11-libs/qt-core-${PV}[debug=,glib=,qt3support=,stable-branch=]
- ~x11-libs/qt-script-${PV}[debug=,stable-branch=]
- cups? ( net-print/cups )
- dbus? ( ~x11-libs/qt-dbus-${PV}[debug=,stable-branch=] )
- gtkstyle? ( x11-libs/gtk+:2 )
- mng? ( >=media-libs/libmng-1.0.9 )
- nas? ( >=media-libs/nas-1.5 )
- tiff? ( media-libs/tiff )
- xinerama? ( x11-libs/libXinerama )"
-DEPEND="${RDEPEND}
- xinerama? ( x11-proto/xineramaproto )
- gtkstyle? ( || ( >=x11-libs/cairo-1.10.0[-qt4] <x11-libs/cairo-1.10.0 ) )
- x11-proto/xextproto
- x11-proto/inputproto"
-PDEPEND="qt3support? ( ~x11-libs/qt-qt3support-${PV}[debug=,stable-branch=] )"
-
-pkg_setup() {
- if ! use qt3support; then
- ewarn "WARNING: if you need 'qtconfig', you _must_ enable qt3support."
- fi
-
- confutils_use_depend_all gtk glib
-
- QT4_TARGET_DIRECTORIES="
- src/gui
- src/scripttools
- tools/designer
- tools/linguist/linguist
- src/plugins/imageformats/gif
- src/plugins/imageformats/ico
- src/plugins/imageformats/jpeg
- src/plugins/inputmethods"
-
- QT4_EXTRACT_DIRECTORIES="
- include
- src
- tools/linguist/phrasebooks
- tools/linguist/shared
- tools/shared"
-
- use dbus && QT4_TARGET_DIRECTORIES="${QT4_TARGET_DIRECTORIES} tools/qdbus/qdbusviewer"
- use mng && QT4_TARGET_DIRECTORIES="${QT4_TARGET_DIRECTORIES} src/plugins/imageformats/mng"
- use tiff && QT4_TARGET_DIRECTORIES="${QT4_TARGET_DIRECTORIES} src/plugins/imageformats/tiff"
- use accessibility && QT4_TARGET_DIRECTORIES="${QT4_TARGET_DIRECTORIES} src/plugins/accessible/widgets"
- use trace && QT4_TARGET_DIRECTORIES="${QT4_TARGET_DIRECTORIES} src/plugins/graphicssystems/trace"
-
- QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES} ${QT4_EXTRACT_DIRECTORIES}"
-
- qt4-build-edge_pkg_setup
-}
-
-src_prepare() {
- qt4-build-edge_src_prepare
-
- # Don't build plugins this go around, because they depend on qt3support lib
- sed -i -e "s:CONFIG(shared:# &:g" "${S}"/tools/designer/src/src.pro
-}
-
-src_configure() {
- export PATH="${S}/bin:${PATH}"
- export LD_LIBRARY_PATH="${S}/lib:${LD_LIBRARY_PATH}"
-
- myconf="$(qt_use accessibility)
- $(qt_use cups)
- $(qt_use egl)
- $(qt_use glib)
- $(qt_use mng libmng system)
- $(qt_use nis)
- $(qt_use tiff libtiff system)
- $(qt_use dbus qdbus)
- $(qt_use dbus)
- $(qt_use qt3support)
- $(qt_use gtkstyle)
- $(qt_use xinerama)"
-
- use nas && myconf="${myconf} -system-nas-sound"
- use raster && myconf="${myconf} -graphicssystem raster"
-
- myconf="${myconf} -qt-gif -system-libpng -system-libjpeg
- -no-sql-mysql -no-sql-psql -no-sql-ibase -no-sql-sqlite -no-sql-sqlite2
- -no-sql-odbc -xrender -xrandr -xkb -xshape -sm -no-svg -no-webkit
- -no-phonon -no-opengl"
-
- qt4-build-edge_src_configure
-}
-
-src_install() {
- QCONFIG_ADD="x11sm xshape xcursor xfixes xrandr xrender xkb fontconfig
- $(usev accessibility) $(usev xinerama) $(usev cups) $(usev nas)
- gif png system-png system-jpeg
- $(use mng && echo system-mng)
- $(use tiff && echo system-tiff)"
- QCONFIG_REMOVE="no-gif no-png"
- QCONFIG_DEFINE="$(use accessibility && echo QT_ACCESSIBILITY)
- $(use cups && echo QT_CUPS) QT_FONTCONFIG QT_IMAGEFORMAT_JPEG
- $(use mng && echo QT_IMAGEFORMAT_MNG)
- $(use nas && echo QT_NAS)
- $(use nis && echo QT_NIS) QT_IMAGEFORMAT_PNG QT_SESSIONMANAGER QT_SHAPE
- $(use tiff && echo QT_IMAGEFORMAT_TIFF) QT_XCURSOR
- $(use xinerama && echo QT_XINERAMA) QT_XFIXES QT_XKB QT_XRANDR QT_XRENDER"
-
- qt4-build-edge_src_install
-
- # qt-creator
- # some qt-creator headers are located
- # under /usr/include/qt4/QtDesigner/private.
- # those headers are just includes of the headers
- # which are located under tools/designer/src/lib/*
- # So instead of installing both, we create the private folder
- # and drop tools/designer/src/lib/* headers in it.
- dodir /usr/include/qt4/QtDesigner/private/ || die
- insinto /usr/include/qt4/QtDesigner/private/
- doins "${S}"/tools/designer/src/lib/shared/* || die
- doins "${S}"/tools/designer/src/lib/sdk/* || die
- #install private headers
- if use private-headers; then
- insinto ${QTHEADERDIR}/QtGui/private
- find "${S}"/src/gui -type f -name "*_p.h" -exec doins {} \;
- fi
-
- # install correct designer and linguist icons, bug 241208
- doicon tools/linguist/linguist/images/icons/linguist-128-32.png \
- tools/designer/src/designer/images/designer.png || die
- # Note: absolute image path required here!
- make_desktop_entry linguist Linguist \
- /usr/share/pixmaps/linguist-128-32.png \
- 'Qt;Development;GUIDesigner' || die
- make_desktop_entry designer Designer \
- /usr/share/pixmaps/designer.png \
- 'Qt;Development;GUIDesigner' || die
-}
diff --git a/x11-libs/qt-multimedia/qt-multimedia-4.7.9999.ebuild b/x11-libs/qt-multimedia/qt-multimedia-4.7.9999.ebuild
deleted file mode 100644
index 2cd10c8..0000000
--- a/x11-libs/qt-multimedia/qt-multimedia-4.7.9999.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="3"
-inherit qt4-build-edge
-
-DESCRIPTION="The Qt multimedia module"
-SLOT="4"
-KEYWORDS=""
-IUSE="iconv"
-
-DEPEND="media-libs/alsa-lib
- ~x11-libs/qt-core-${PV}[debug=,stable-branch=]
- ~x11-libs/qt-gui-${PV}[debug=,stable-branch=]"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
- QT4_TARGET_DIRECTORIES="src/multimedia"
- QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
- include/Qt/
- include/QtCore/
- include/QtGui/
- include/QtMultimedia/
- src/src.pro
- src/corelib/
- src/gui/
- src/plugins
- src/3rdparty
- src/tools"
-
- qt4-build-edge_pkg_setup
-}
-
-src_configure() {
- myconf="${myconf} $(qt_use iconv) -no-xkb -no-fontconfig -no-xrender
- -no-xrandr -no-xfixes -no-xcursor -no-xinerama -no-xshape -no-sm
- -no-opengl -no-nas-sound -no-dbus -no-cups -no-nis -no-gif -no-libpng
- -no-libmng -no-libjpeg -no-openssl -system-zlib -no-webkit -no-phonon
- -no-xmlpatterns -no-freetype -no-libtiff -no-accessibility
- -no-fontconfig -no-sql-mysql -no-sql-psql -no-sql-ibase -no-sql-sqlite
- -no-sql-sqlite2 -no-sql-odbc -no-glib -no-opengl -no-svg -no-gtkstyle
- -no-phonon-backend -no-script -no-scripttools -no-cups -no-xsync
- -no-xinput"
-
- qt4-build-edge_src_configure
-}
diff --git a/x11-libs/qt-opengl/qt-opengl-4.7.9999.ebuild b/x11-libs/qt-opengl/qt-opengl-4.7.9999.ebuild
deleted file mode 100644
index 9d8e4c9..0000000
--- a/x11-libs/qt-opengl/qt-opengl-4.7.9999.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="3"
-inherit qt4-build-edge
-
-DESCRIPTION="The OpenGL module for the Qt toolkit"
-SLOT="4"
-KEYWORDS=""
-IUSE="egl qt3support"
-
-DEPEND="~x11-libs/qt-core-${PV}[debug=,qt3support=,stable-branch=]
- ~x11-libs/qt-gui-${PV}[debug=,egl=,qt3support=,stable-branch=]
- virtual/opengl"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
- QT4_TARGET_DIRECTORIES="
- src/opengl
- src/plugins/graphicssystems/opengl"
-
- QT4_EXTRACT_DIRECTORIES="
- include/QtCore
- include/QtGui
- include/QtOpenGL
- src/corelib
- src/gui
- src/opengl
- src/plugins
- src/3rdparty"
-
- QCONFIG_ADD="opengl"
- QCONFIG_DEFINE="QT_OPENGL $(use egl && echo QT_EGL)"
-
- qt4-build-edge_pkg_setup
-}
-
-src_configure() {
- myconf="${myconf} -opengl
- $(qt_use egl)
- $(qt_use qt3support)"
-
- qt4-build-edge_src_configure
-
- # Not building tools/designer/src/plugins/tools/view3d as it's
- # commented out of the build in the source
-}
diff --git a/x11-libs/qt-openvg/Manifest b/x11-libs/qt-openvg/Manifest
index 4590e46..23bd05a 100644
--- a/x11-libs/qt-openvg/Manifest
+++ b/x11-libs/qt-openvg/Manifest
@@ -1,2 +1,2 @@
DIST qt-everywhere-opensource-src-4.7.0.tar.gz 208320257 RMD160 3e9c0f0d9843b5c03ad4bd6193aff98531ee0746 SHA1 a5796c8f468c8f59249e5c696f913864c979f411 SHA256 e05256d560ca7d674cd4310bb791748900ad14ad662cbfe22b6d72ada43e7955
-DIST qt-everywhere-opensource-src-4.7.1.tar.gz 211768512 RMD160 de6998948eb9f51a9193b9020ba80cfd52d50899 SHA1 fcf764d39d982c7f84703821582bd10c3192e341 SHA256 8cb5277c41f824cfc6dcee0e95e0bf23a9ad2c8d18d245105137481d092b124a
+DIST qt-everywhere-opensource-src-4.7.1.tar.gz 211768512 SHA256 8cb5277c41f824cfc6dcee0e95e0bf23a9ad2c8d18d245105137481d092b124a SHA512 adca9f9ea9914eb7715277ec61e0710f4492e0562fce5e72d02e88c2df58b4fbc77a4346abd8ebf79aa8eff94d0075191a8709fbb502785682ba37ee2151ae7f WHIRLPOOL 79b16f663cb49e029cb0d86cb0a98854e975746f6e7f5ef1707d7851325556c5a248e8eaf9393d234099058d6e54ef69767ce653bf9a665cca87d2f2a5829e8d
diff --git a/x11-libs/qt-phonon/qt-phonon-4.7.9999.ebuild b/x11-libs/qt-phonon/qt-phonon-4.7.9999.ebuild
deleted file mode 100644
index 2452118..0000000
--- a/x11-libs/qt-phonon/qt-phonon-4.7.9999.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="3"
-inherit qt4-build-edge
-
-DESCRIPTION="The Phonon module for the Qt toolkit"
-SLOT="4"
-KEYWORDS=""
-IUSE="dbus"
-
-DEPEND="~x11-libs/qt-gui-${PV}[debug=,glib,qt3support,stable-branch=]
- !kde-base/phonon-kde
- !kde-base/phonon-xine
- !media-libs/phonon
- media-libs/gstreamer
- media-plugins/gst-plugins-meta
- dbus? ( ~x11-libs/qt-dbus-${PV}[debug=,stable-branch=] )"
-RDEPEND="${DEPEND}"
-
-QT4_TARGET_DIRECTORIES="
- src/phonon
- src/plugins/phonon
- tools/designer/src/plugins/phononwidgets"
-QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
- include/
- src
- tools"
-
-QCONFIG_ADD="phonon"
-QCONFIG_DEFINE="QT_GSTREAMER"
-
-src_configure() {
- myconf="${myconf} -phonon -phonon-backend -no-opengl -no-svg
- $(qt_use dbus qdbus)"
-
- qt4-build-edge_src_configure
-}
diff --git a/x11-libs/qt-qt3support/qt-qt3support-4.7.9999.ebuild b/x11-libs/qt-qt3support/qt-qt3support-4.7.9999.ebuild
deleted file mode 100644
index ff4cf94..0000000
--- a/x11-libs/qt-qt3support/qt-qt3support-4.7.9999.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="3"
-inherit qt4-build-edge
-
-DESCRIPTION="The Qt3 support module for the Qt toolkit"
-SLOT="4"
-KEYWORDS=""
-IUSE="+accessibility kde phonon"
-
-DEPEND="~x11-libs/qt-core-${PV}[debug=,qt3support,stable-branch=]
- ~x11-libs/qt-gui-${PV}[accessibility=,debug=,qt3support,stable-branch=]
- ~x11-libs/qt-sql-${PV}[debug=,qt3support,stable-branch=]
- phonon? (
- !kde? ( || ( ~x11-libs/qt-phonon-${PV}[debug=,stable-branch=]
- media-libs/phonon[gstreamer] ) )
- kde? ( media-libs/phonon[gstreamer] ) )"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
- QT4_TARGET_DIRECTORIES="
- src/qt3support
- src/tools/uic3
- tools/designer/src/plugins/widgets
- tools/qtconfig
- tools/porting"
- QT4_EXTRACT_DIRECTORIES="src include tools"
-
- qt4-build-edge_pkg_setup
-}
-
-src_configure() {
- myconf="${myconf} -qt3support
- $(qt_use phonon gstreamer)
- $(qt_use phonon)
- $(qt_use accessibility)"
- qt4-build-edge_src_configure
-}
diff --git a/x11-libs/qt-script/qt-script-4.7.9999.ebuild b/x11-libs/qt-script/qt-script-4.7.9999.ebuild
deleted file mode 100644
index 9a7c009..0000000
--- a/x11-libs/qt-script/qt-script-4.7.9999.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="3"
-inherit qt4-build-edge
-
-DESCRIPTION="The ECMAScript module for the Qt toolkit"
-SLOT="4"
-KEYWORDS=""
-IUSE="iconv private-headers"
-
-DEPEND="~x11-libs/qt-core-${PV}[debug=,stable-branch=]"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
- QT4_TARGET_DIRECTORIES="src/script/"
- QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
- include/Qt/
- include/QtCore/
- include/QtScript/
- src/corelib/"
-
- qt4-build-edge_pkg_setup
-}
-
-src_configure() {
- myconf="${myconf} $(qt_use iconv) -no-xkb -no-fontconfig -no-xrender
- -no-xrandr -no-xfixes -no-xcursor -no-xinerama -no-xshape -no-sm
- -no-opengl -no-nas-sound -no-dbus -no-cups -no-nis -no-gif -no-libpng
- -no-libmng -no-libjpeg -no-openssl -system-zlib -no-webkit -no-phonon
- -no-qt3support -no-xmlpatterns -no-freetype -no-libtiff
- -no-accessibility -no-fontconfig -no-glib -no-opengl -no-svg
- -no-gtkstyle"
- qt4-build-edge_src_configure
-}
-
-src_install() {
- qt4-build-edge_src_install
- #install private headers
- if use private-headers; then
- insinto ${QTHEADERDIR}/QtScript/private
- find "${S}"/src/script -type f -name "*_p.h" -exec doins {} \;
- fi
-}
diff --git a/x11-libs/qt-simulator/qt-simulator-4.7.9999.ebuild b/x11-libs/qt-simulator/qt-simulator-4.7.9999.ebuild
deleted file mode 100644
index 5584c3d..0000000
--- a/x11-libs/qt-simulator/qt-simulator-4.7.9999.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=3
-
-EGIT_REPO_URI="git://gitorious.org/~qtbynokia/qt/simulator-qt.git"
-EGIT_BRANCH="4.7"
-#EGIT_BRANCH="4.7.0-beta1"
-
-inherit git multilib qt4-r2 toolchain-funcs
-
-DESCRIPTION="Qt Simulator is a simulator for Qt applications intended to run on Nokia devices"
-HOMEPAGE="http://labs.trolltech.com/page/Projects/Tools/QtSimulator"
-SRC_URI=""
-
-LICENSE="LGPL-2.1"
-SLOT="4"
-KEYWORDS=""
-IUSE="debug qt3support xmlpatterns multimedia phonon svg webkit \
-script dbus"
-
-DEPEND="~x11-libs/qt-gui-${PV}"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
- PLATFORM="simulator"
-}
-
-src_unpack() {
- git_src_unpack
- qt4-r2_src_unpack
-}
-
-src_prepare() {
- sed -i -e "s:CXXFLAGS.*=:CXXFLAGS=${CXXFLAGS} :" \
- "${S}/qmake/Makefile.unix" || die "sed qmake/Makefile.unix
- CXXFLAGS failed"
- sed -i -e "s:LFLAGS.*=:LFLAGS=${LDFLAGS} :" \
- "${S}/qmake/Makefile.unix" || die "sed
- qmake/Makefile.unix LDFLAGS failed"
- sed -i '/^QMAKE_CFLAGS_\(RELEASE\|DEBUG\)/s:+=.*:+=:' \
- mkspecs/common/g++.conf
- sed -e "s:\(^SYSTEM_VARIABLES\):CC=$(tc-getCC)\nCXX=$(tc-getCXX)\nCFLAGS=\"${CFLAGS}\"\nCXXFLAGS=\"${CXXFLAGS}\"\nLDFLAGS=\"${LDFLAGS}\"\n\1:" \
- -i configure || die "sed qmake compilers failed"
- find ./config.tests/unix -name "*.test" -type f -exec grep -lZ \$MAKE '{}' \; | \
- xargs -0 \
- sed -e "s:\(\$MAKE\):\1 CC=$(tc-getCC) CXX=$(tc-getCXX) LD=$(tc-getCXX) LINK=$(tc-getCXX):g" \
- -i || die "sed test compilers failed"
-}
-
-src_configure() {
- local myconf=""
- local datadir="/usr/share/qt4"
- local libdir="/usr/$(get_libdir)/qt4"
-
- myconf+="-prefix '/usr'
- -prefix-install
- -hostprefix '/usr'
- -libdir '${libdir}'
- -headerdir '/usr/include/qt4'
- -plugindir '${libdir}/plugins'
- -docdir '/usr/share/doc/${PF}'
- -demosdir '${datadir}/demos'
- -examplesdir '${datadir}/examples'
- -sysconfdir '/etc/qt4'
- -translationdir '${datadir}/translations'
- -opensource -confirm-license -stl -verbose
- "
-
- for module in ${IUSE}; do
- if [ ${module} = "debug" ]; then
- myconf+=" $(use debug && echo -debug || echo -release)"
- else
- myconf+=" $(use ${module} && echo -${module} || echo -no-${module})"
- fi
- done
- ! use webkit && myconf+=" -no-javascript-jit"
-
- ./configure ${myconf} || die "configure failed"
-}
-
-src_compile() {
- emake CC="$(tc-getCC)" \
- CXX="$(tc-getCXX)" \
- LINK="$(tc-getCXX)" || die "emake failed"
-}
diff --git a/x11-libs/qt-sql/qt-sql-4.7.9999.ebuild b/x11-libs/qt-sql/qt-sql-4.7.9999.ebuild
deleted file mode 100644
index 5f8b332..0000000
--- a/x11-libs/qt-sql/qt-sql-4.7.9999.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="3"
-inherit qt4-build-edge
-
-DESCRIPTION="The SQL module for the Qt toolkit"
-SLOT="4"
-KEYWORDS=""
-IUSE="firebird freetds iconv mysql odbc postgres qt3support +sqlite"
-
-DEPEND="~x11-libs/qt-core-${PV}[debug=,qt3support=,stable-branch=]
- firebird? ( dev-db/firebird )
- freetds? ( dev-db/freetds )
- mysql? ( virtual/mysql )
- odbc? ( dev-db/unixODBC )
- postgres? ( dev-db/postgresql-base )
- sqlite? ( dev-db/sqlite:3 )"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
- QT4_TARGET_DIRECTORIES="src/sql src/plugins/sqldrivers"
- QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
- include/Qt/
- include/QtCore/
- include/QtSql/
- include/QtScript/
- src/src.pro
- src/corelib/
- src/plugins
- src/3rdparty
- src/tools"
-
- if ! ( use firebird || use freetds || use mysql || use odbc || use postgres || use sqlite );
- then
- ewarn "You need to enable at least one SQL driver. Enable at least"
- ewarn "one of these USE flags: \"firebird fretds mysql odbc postgres sqlite\"."
- die "Enable at least one SQL driver."
- fi
-
- qt4-build-edge_pkg_setup
-}
-
-src_prepare() {
- qt4-build-edge_src_prepare
-
- sed -e '/pg_config --libs/d' -i "${S}"/configure \
- || die "sed to fix postgresql usage in ./configure failed"
-}
-
-src_configure() {
- # Don't support sqlite2 anymore
- myconf="${myconf} -no-sql-sqlite2
- $(qt_use mysql sql-mysql plugin) $(use mysql && echo "-I/usr/include/mysql -L/usr/$(get_libdir)/mysql ")
- $(qt_use postgres sql-psql plugin) $(use postgres && echo "-I/usr/include/postgresql/pgsql ")
- $(qt_use sqlite sql-sqlite plugin) $(use sqlite && echo '-system-sqlite')
- $(qt_use odbc sql-odbc plugin)
- $(qt_use freetds sql-tds plugin)
- $(qt_use firebird sql-ibase plugin)
- $(qt_use qt3support)"
-
- myconf="${myconf} $(qt_use iconv) -no-xkb -no-fontconfig -no-xrender
- -no-xrandr -no-xfixes -no-xcursor -no-xinerama -no-xshape -no-sm
- -no-opengl -no-nas-sound -no-dbus -no-cups -no-nis -no-gif -no-libpng
- -no-libmng -no-libjpeg -no-openssl -system-zlib -no-webkit -no-phonon
- -no-xmlpatterns -no-freetype -no-libtiff -no-accessibility
- -no-fontconfig -no-glib -no-opengl -no-svg -no-gtkstyle"
-
- qt4-build-edge_src_configure
-}
diff --git a/x11-libs/qt-svg/qt-svg-4.7.9999.ebuild b/x11-libs/qt-svg/qt-svg-4.7.9999.ebuild
deleted file mode 100644
index 6baecaf..0000000
--- a/x11-libs/qt-svg/qt-svg-4.7.9999.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="3"
-inherit qt4-build-edge
-
-DESCRIPTION="The SVG module for the Qt toolkit"
-SLOT="4"
-KEYWORDS=""
-IUSE="iconv"
-
-DEPEND="~x11-libs/qt-gui-${PV}[debug=,stable-branch=]"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
- QT4_TARGET_DIRECTORIES="
- src/svg
- src/plugins/imageformats/svg
- src/plugins/iconengines/svgiconengine"
- QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
- include/QtSvg/
- include/Qt/
- include/QtGui/
- include/QtCore/
- include/QtXml/
- src/corelib/
- src/gui/
- src/plugins/
- src/xml
- src/3rdparty"
-
- QCONFIG_ADD="svg"
- QCONFIG_DEFINE="QT_SVG"
-
- qt4-build-edge_pkg_setup
-}
-
-src_configure() {
- myconf="${myconf} $(qt_use iconv) -svg -no-xkb -no-fontconfig -no-xrender
- -no-xrandr -no-xfixes -no-xcursor -no-xinerama -no-xshape -no-sm
- -no-opengl -no-nas-sound -no-dbus -no-cups -no-nis -no-gif -no-libpng
- -no-libmng -no-libjpeg -no-openssl -system-zlib -no-webkit -no-phonon
- -no-qt3support -no-xmlpatterns -no-freetype -no-libtiff
- -no-accessibility -no-fontconfig -no-glib -no-opengl -no-gtkstyle
- -v -continue"
- qt4-build-edge_src_configure
-}
diff --git a/x11-libs/qt-test/qt-test-4.7.9999.ebuild b/x11-libs/qt-test/qt-test-4.7.9999.ebuild
deleted file mode 100644
index add153e..0000000
--- a/x11-libs/qt-test/qt-test-4.7.9999.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="3"
-inherit qt4-build-edge
-
-DESCRIPTION="The testing framework module for the Qt toolkit"
-SLOT="4"
-KEYWORDS=""
-IUSE="iconv"
-
-DEPEND="~x11-libs/qt-core-${PV}[debug=,stable-branch=]"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
- QT4_TARGET_DIRECTORIES="src/testlib"
- QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
- include/QtTest/
- include/QtCore/
- src/corelib/"
-
- qt4-build-edge_pkg_setup
-}
-
-src_configure() {
- myconf="${myconf} $(qt_use iconv) -no-xkb -no-fontconfig -no-xrender
- -no-xrandr -no-xfixes -no-xcursor -no-xinerama -no-xshape -no-sm
- -no-opengl -no-nas-sound -no-dbus -no-cups -no-nis -no-gif -no-libpng
- -no-libmng -no-libjpeg -no-openssl -system-zlib -no-webkit -no-phonon
- -no-qt3support -no-xmlpatterns -no-freetype -no-libtiff
- -no-accessibility -no-fontconfig -no-glib -no-opengl -no-svg"
- qt4-build-edge_src_configure
-}
diff --git a/x11-libs/qt-webkit/qt-webkit-4.7.9999.ebuild b/x11-libs/qt-webkit/qt-webkit-4.7.9999.ebuild
deleted file mode 100644
index 47bd0d8..0000000
--- a/x11-libs/qt-webkit/qt-webkit-4.7.9999.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="3"
-inherit qt4-build-edge
-
-DESCRIPTION="The Webkit module for the Qt toolkit"
-SLOT="4"
-KEYWORDS=""
-IUSE="dbus +jit kde"
-
-DEPEND="~x11-libs/qt-core-${PV}[debug=,ssl,stable-branch=]
- ~x11-libs/qt-gui-${PV}[dbus?,debug=,stable-branch=]
- ~x11-libs/qt-xmlpatterns-${PV}[debug=,stable-branch=]
- ~x11-libs/qt-xmlpatterns-${PV}[debug=,stable-branch=]
- dbus? ( ~x11-libs/qt-dbus-${PV}[debug=,stable-branch=] )
- !kde? ( || ( ~x11-libs/qt-phonon-${PV}:${SLOT}[dbus=,debug=,stable-branch=]
- media-libs/phonon ) )
- kde? ( media-libs/phonon )"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
- QT4_TARGET_DIRECTORIES="
- src/3rdparty/webkit/JavaScriptCore
- src/3rdparty/webkit/WebCore
- tools/designer/src/plugins/qwebview"
- QT4_EXTRACT_DIRECTORIES="
- include/
- src/
- tools/"
-
- QCONFIG_ADD="webkit"
- QCONFIG_DEFINE="QT_WEBKIT"
-
- qt4-build-edge_pkg_setup
-}
-
-src_prepare() {
- [[ $(tc-arch) == "ppc64" ]] && append-flags -mminimal-toc #241900
- # drop qt_webkit_version.pri from installation files since qt-core
- # installs it
- sed -i "/INSTALLS += modfile/d" src/3rdparty/webkit/WebCore/WebCore.pro
- sed -i "/INSTALLS += target headers modfile/s: modfile::" \
- src/3rdparty/webkit/WebCore/WebCore.pro
- qt4-build-edge_src_prepare
-}
-
-src_configure() {
- myconf="${myconf} -system-sqlite -webkit $(qt_use jit javascript-jit) $(qt_use dbus qdbus)"
- qt4-build-edge_src_configure
-}
diff --git a/x11-libs/qt-xmlpatterns/qt-xmlpatterns-4.7.9999.ebuild b/x11-libs/qt-xmlpatterns/qt-xmlpatterns-4.7.9999.ebuild
deleted file mode 100644
index aca4396..0000000
--- a/x11-libs/qt-xmlpatterns/qt-xmlpatterns-4.7.9999.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="3"
-inherit qt4-build-edge
-
-DESCRIPTION="The patternist module for the Qt toolkit"
-SLOT="4"
-KEYWORDS=""
-IUSE=""
-
-DEPEND="~x11-libs/qt-core-${PV}[debug=,exceptions,stable-branch=]"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
- QT4_TARGET_DIRECTORIES="src/xmlpatterns tools/xmlpatterns"
- QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
- include/QtCore
- include/QtNetwork
- include/QtXml
- include/QtXmlPatterns
- src/network/
- src/xml/
- src/corelib/"
-
- QCONFIG_ADD="xmlpatterns"
- QCONFIG_DEFINE="QT_XMLPATTERNS"
-
- qt4-build-edge_pkg_setup
-}
-
-src_configure() {
- myconf="${myconf} -xmlpatterns"
- qt4-build-edge_src_configure
-}
^ permalink raw reply related [flat|nested] 11+ messages in thread* [gentoo-commits] proj/qt:master commit in: x11-libs/qt-opengl/, x11-libs/qt-script/, x11-libs/qt-qt3support/, ...
@ 2012-03-30 15:20 Davide Pesavento
0 siblings, 0 replies; 11+ messages in thread
From: Davide Pesavento @ 2012-03-30 15:20 UTC (permalink / raw
To: gentoo-commits
commit: 263186de049d59f238418f433de67fafd7523d5a
Author: Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Fri Mar 30 15:19:49 2012 +0000
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Fri Mar 30 15:19:49 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=263186de
Delete all qt-*-4.9999 ebuilds.
They were tracking the master branch which no longer exists in upstream repo.
---
x11-libs/qt-assistant/qt-assistant-4.9999.ebuild | 141 ------------
x11-libs/qt-core/qt-core-4.9999.ebuild | 171 --------------
x11-libs/qt-dbus/qt-dbus-4.9999.ebuild | 48 ----
.../qt-declarative/qt-declarative-4.9999.ebuild | 70 ------
x11-libs/qt-demo/qt-demo-4.9999.ebuild | 60 -----
x11-libs/qt-gui/qt-gui-4.9999.ebuild | 234 --------------------
x11-libs/qt-multimedia/qt-multimedia-4.9999.ebuild | 57 -----
x11-libs/qt-opengl/qt-opengl-4.9999.ebuild | 66 ------
x11-libs/qt-openvg/qt-openvg-4.9999.ebuild | 61 -----
x11-libs/qt-phonon/qt-phonon-4.9999.ebuild | 53 -----
x11-libs/qt-qt3support/qt-qt3support-4.9999.ebuild | 44 ----
x11-libs/qt-script/qt-script-4.9999.ebuild | 51 -----
x11-libs/qt-sql/qt-sql-4.9999.ebuild | 77 -------
x11-libs/qt-svg/qt-svg-4.9999.ebuild | 56 -----
x11-libs/qt-test/qt-test-4.9999.ebuild | 39 ----
x11-libs/qt-webkit/qt-webkit-4.9999.ebuild | 75 -------
.../qt-xmlpatterns/qt-xmlpatterns-4.9999.ebuild | 45 ----
17 files changed, 0 insertions(+), 1348 deletions(-)
diff --git a/x11-libs/qt-assistant/qt-assistant-4.9999.ebuild b/x11-libs/qt-assistant/qt-assistant-4.9999.ebuild
deleted file mode 100644
index 71b63ee..0000000
--- a/x11-libs/qt-assistant/qt-assistant-4.9999.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="4"
-if [[ ${PV} == 4*9999 ]]; then
- QT_ECLASS="-edge"
-fi
-inherit qt4-build${QT_ECLASS}
-
-DESCRIPTION="The assistant help module for the Qt toolkit"
-SLOT="4"
-if [[ ${PV} != 4*9999 ]]; then
- KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~ppc-macos"
-else
- KEYWORDS=""
-fi
-IUSE="compat doc +glib qt3support trace webkit"
-SRC_URI+=" compat? ( ftp://ftp.qt.nokia.com/qt/source/${PN}-qassistantclient-library-compat-src-4.6.3.tar.gz )"
-
-DEPEND="~x11-libs/qt-gui-${PV}[aqua=,c++0x=,qpa=,debug=,glib=,qt3support=,trace?]
- ~x11-libs/qt-sql-${PV}[aqua=,c++0x=,qpa=,debug=,qt3support=,sqlite]
- webkit? ( ~x11-libs/qt-webkit-${PV}[aqua=,c++0x=,qpa=,debug=] )"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
- # Pixeltool isn't really assistant related, but it relies on
- # the assistant libraries. doc/qch/
- QT4_TARGET_DIRECTORIES="
- tools/assistant
- tools/pixeltool
- tools/qdoc3"
- if [[ ${PV} != 4*9999 ]]; then
- QT4_EXTRACT_DIRECTORIES="
- tools/
- demos/
- examples/
- src/
- include/
- doc/"
- fi
-
- use trace && QT4_TARGET_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
- tools/qttracereplay"
- QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
- ${QT4_EXTRACT_DIRECTORIES}"
-
- qt4-build${QT_ECLASS}_pkg_setup
-}
-
-src_unpack() {
- qt4-build${QT_ECLASS}_src_unpack
- # compat version
- # http://labs.qt.nokia.com/2010/06/22/qt-assistant-compat-version-available-as-extra-source-package/
- if use compat; then
- unpack "${PN}"-qassistantclient-library-compat-src-4.6.3.tar.gz
- mv "${WORKDIR}"/"${PN}"-qassistantclient-library-compat-version-4.6.3 \
- "${S}"/tools/assistant/compat ||
- die "moving compat to the right place failed"
- tar xzf "${FILESDIR}"/"${PN}"-4.7-include.tar.gz -C "${S}"/include/ ||
- die "unpacking the include files failed"
- fi
-}
-
-src_prepare() {
- qt4-build${QT_ECLASS}_src_prepare
- use compat && epatch "${FILESDIR}"/"${PN}"-4.7-fix-compat.patch
-
- # bug 401173
- ! use webkit && epatch "${FILESDIR}"/disable-webkit.patch
-
- # bug 348034
- sed -i -e '/^sub-qdoc3\.depends/d' doc/doc.pri || die
-}
-
-src_configure() {
- myconf="${myconf} -no-xkb -no-fontconfig -no-xrandr
- -no-xfixes -no-xcursor -no-xinerama -no-xshape -no-sm -no-opengl
- -no-nas-sound -no-dbus -iconv -no-cups -no-nis -no-gif -no-libpng
- -no-libmng -no-libjpeg -no-openssl -system-zlib -no-phonon
- -no-xmlpatterns -no-freetype -no-libtiff -no-accessibility
- -no-fontconfig -no-multimedia
- -no-svg $(qt_use qt3support) $(qt_use webkit)"
- ! use glib && myconf="${myconf} -no-glib"
-
- qt4-build${QT_ECLASS}_src_configure
-}
-
-src_compile() {
- # help libQtHelp find freshly built libQtCLucene (bug #289811)
- export LD_LIBRARY_PATH="${S}/lib:${QTLIBDIR}"
- export DYLD_LIBRARY_PATH="${S}/lib:${S}/lib/QtHelp.framework"
-
- qt4-build${QT_ECLASS}_src_compile
-
- # ugly hack to build docs
- cd "${S}"
- qmake "LIBS+=-L${QTLIBDIR}" "CONFIG+=nostrip" projects.pro || die
- # live ebuild cannot build qch_docs. It will build them through emake docs
- if [[ ${PV} != 4*9999 ]]; then
- emake qch_docs || die "emake qch_docs failed "
- fi
- if use doc; then
- emake docs || die "emake docs failed"
- fi
- qmake "LIBS+=-L${QTLIBDIR}" "CONFIG+=nostrip" projects.pro || die
-}
-
-src_install() {
- qt4-build${QT_ECLASS}_src_install
- cd "${S}"
- #see src_compile note
- if [[ ${PV} != 4*9999 ]]; then
- emake INSTALL_ROOT="${D}" install_qchdocs \
- || die "failed to install qch docs"
- fi
- if use doc; then
- emake INSTALL_ROOT="${D}" install_htmldocs \
- || die "failed to install htmldocs"
- # Now it is time for the live ebuild to install the qch docs
- if [[ ${PV} == 4*9999 ]]; then
- emake INSTALL_ROOT="${D}" install_qchdocs \
- || die "failed to install qch docs"
- fi
- fi
- dobin "${S}"/bin/qdoc3 || die "Failed to install qdoc3"
- # install correct assistant icon, bug 241208
- dodir /usr/share/pixmaps/ || die "dodir failed"
- insinto /usr/share/pixmaps/
- doins tools/assistant/tools/assistant/images/assistant.png ||
- die "doins failed"
- # Note: absolute image path required here!
- make_desktop_entry assistant Assistant \
- "${EPREFIX}"/usr/share/pixmaps/assistant.png 'Qt;Development;GUIDesigner' \
- || die "make_desktop_entry failed"
-
- if use compat; then
- insinto /usr/share/qt4/mkspecs/features || die "insinto failed"
- doins tools/assistant/compat/features/assistant.prf || die "doins failed"
- fi
-}
diff --git a/x11-libs/qt-core/qt-core-4.9999.ebuild b/x11-libs/qt-core/qt-core-4.9999.ebuild
deleted file mode 100644
index 71e7b4d..0000000
--- a/x11-libs/qt-core/qt-core-4.9999.ebuild
+++ /dev/null
@@ -1,171 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="4"
-if [[ ${PV} == 4*9999 ]]; then
- QT_ECLASS="-edge"
-fi
-inherit qt4-build${QT_ECLASS}
-
-DESCRIPTION="The Qt toolkit is a comprehensive C++ application development framework"
-SLOT="4"
-if [[ ${PV} != 4*9999 ]]; then
- KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 -sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-else
- KEYWORDS=""
-fi
-IUSE="+glib iconv optimized-qmake qt3support ssl"
-
-DEPEND="sys-libs/zlib
- glib? ( dev-libs/glib )
- ssl? ( dev-libs/openssl )
- !<x11-libs/qt-4.4.0:4
- !<x11-libs/cairo-1.10.2-r2"
-RDEPEND="${DEPEND}"
-PDEPEND="qt3support? ( ~x11-libs/qt-gui-${PV}[aqua=,c++0x=,qpa=,debug=,glib=,qt3support] )"
-
-pkg_setup() {
- QT4_TARGET_DIRECTORIES="
- src/tools/bootstrap
- src/tools/moc
- src/tools/rcc
- src/tools/uic
- src/corelib
- src/xml
- src/network
- src/plugins/codecs
- tools/linguist/lconvert
- tools/linguist/lrelease
- tools/linguist/lupdate"
-
- # This is not needed in live ebuilds since the git repo contains everything
- if [[ ${PV} != 4*9999 ]]; then
- QT4_EXTRACT_DIRECTORIES=" ${QT4_TARGET_DIRECTORIES}
- include/Qt
- include/QtCore
- include/QtDeclarative
- include/QtGui
- include/QtNetwork
- include/QtScript
- include/QtXml
- src/plugins/plugins.pro
- src/plugins/qpluginbase.pri
- src/src.pro
- src/3rdparty/des
- src/3rdparty/harfbuzz
- src/3rdparty/md4
- src/3rdparty/md5
- src/3rdparty/sha1
- src/3rdparty/easing
- src/3rdparty/zlib_dependency.pri
- src/declarative
- src/gui
- src/script
- tools/shared
- tools/linguist/shared
- translations"
- fi
- qt4-build${QT_ECLASS}_pkg_setup
-}
-
-src_prepare() {
- # Don't pre-strip, bug 235026
- for i in kr jp cn tw ; do
- echo "CONFIG+=nostrip" >> "${S}"/src/plugins/codecs/${i}/${i}.pro
- done
-
- qt4-build${QT_ECLASS}_src_prepare
-
- # bug 172219
- sed -i -e "s:CXXFLAGS.*=:CXXFLAGS=${CXXFLAGS} :" \
- "${S}/qmake/Makefile.unix" || die "sed qmake/Makefile.unix CXXFLAGS failed"
- sed -i -e "s:LFLAGS.*=:LFLAGS=${LDFLAGS} :" \
- "${S}/qmake/Makefile.unix" || die "sed qmake/Makefile.unix LDFLAGS failed"
-}
-
-src_configure() {
- myconf+="
- -no-accessibility -no-xmlpatterns -no-multimedia -no-audio-backend -no-phonon
- -no-phonon-backend -no-svg -no-webkit -no-script -no-scripttools -no-declarative
- -system-zlib -no-gif -no-libtiff -no-libpng -no-libmng -no-libjpeg
- -no-cups -no-dbus -no-gtkstyle -no-nas-sound -no-opengl
- -no-sm -no-xshape -no-xvideo -no-xsync -no-xinerama -no-xcursor -no-xfixes
- -no-xrandr -no-xrender -no-mitshm -no-fontconfig -no-freetype -no-xinput -no-xkb
- $(qt_use glib)
- $(qt_use iconv)
- $(qt_use optimized-qmake)
- $(qt_use ssl openssl)
- $(qt_use qt3support)"
-
- qt4-build${QT_ECLASS}_src_configure
-}
-
-src_install() {
- dobin "${S}"/bin/{qmake,moc,rcc,uic,lconvert,lrelease,lupdate} || die "dobin failed"
-
- install_directories src/{corelib,xml,network,plugins/codecs}
-
- emake INSTALL_ROOT="${D}" install_mkspecs || die "emake install_mkspecs failed"
-
- #install private headers
- insinto "${QTHEADERDIR#${EPREFIX}}"/QtCore/private
- find "${S}"/src/corelib -type f -name "*_p.h" -exec doins {} \;
-
- # use freshly built libraries
- local DYLD_FPATH=
- [[ -d "${S}"/lib/QtCore.framework ]] \
- && DYLD_FPATH=$(for x in "${S}/lib/"*.framework; do echo -n ":$x"; done)
- DYLD_LIBRARY_PATH="${S}/lib${DYLD_FPATH}" \
- LD_LIBRARY_PATH="${S}/lib" "${S}"/bin/lrelease translations/*.ts \
- || die "generating translations failed"
- insinto "${QTTRANSDIR#${EPREFIX}}"
- doins translations/*.qm || die "doins translations failed"
-
- setqtenv
- fix_library_files
-
- # List all the multilib libdirs
- local libdirs=
- for libdir in $(get_all_libdirs); do
- libdirs+=":${EPREFIX}/usr/${libdir}/qt4"
- done
-
- cat <<-EOF > "${T}/44qt4"
- LDPATH="${libdirs:1}"
- EOF
- doenvd "${T}/44qt4"
-
- dodir "${QTDATADIR#${EPREFIX}}"/mkspecs/gentoo || die "dodir failed"
- mv "${D}/${QTDATADIR}"/mkspecs/qconfig.pri "${D}${QTDATADIR}"/mkspecs/gentoo \
- || die "Failed to move qconfig.pri"
-
- # Framework hacking
- if use aqua && [[ ${CHOST#*-darwin} -ge 9 ]] ; then
- #TODO do this better
- sed -i -e '2a#include <QtCore/Gentoo/gentoo-qconfig.h>\n' \
- "${D}${QTLIBDIR}"/QtCore.framework/Headers/qconfig.h \
- || die "sed for qconfig.h failed."
- dosym "${QTHEADERDIR#${EPREFIX}}"/Gentoo "${QTLIBDIR#${EPREFIX}}"/QtCore.framework/Headers/Gentoo ||
- die "dosym failed"
- else
- sed -i -e '2a#include <Gentoo/gentoo-qconfig.h>\n' \
- "${D}${QTHEADERDIR}"/QtCore/qconfig.h \
- "${D}${QTHEADERDIR}"/Qt/qconfig.h \
- || die "sed for qconfig.h failed"
- fi
-
- if use glib; then
- QCONFIG_DEFINE="$(use glib && echo QT_GLIB)
- $(use ssl && echo QT_OPENSSL)"
- install_qconfigs
- fi
-
- # remove .la files
- find "${D}${QTLIBDIR}" -name "*.la" -print0 | xargs -0 rm
-
- keepdir "${QTSYSCONFDIR#${EPREFIX}}"
-
- # Framework magic
- fix_includes
-}
diff --git a/x11-libs/qt-dbus/qt-dbus-4.9999.ebuild b/x11-libs/qt-dbus/qt-dbus-4.9999.ebuild
deleted file mode 100644
index 3975740..0000000
--- a/x11-libs/qt-dbus/qt-dbus-4.9999.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="4"
-if [[ ${PV} == 4*9999 ]]; then
- QT_ECLASS="-edge"
-fi
-inherit qt4-build${QT_ECLASS}
-
-DESCRIPTION="The DBus module for the Qt toolkit"
-SLOT="4"
-if [[ ${PV} != 4*9999 ]]; then
- KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 -sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-else
- KEYWORDS=""
-fi
-IUSE=""
-
-DEPEND="~x11-libs/qt-core-${PV}[aqua=,c++0x=,qpa=,debug=]
- >=sys-apps/dbus-1.0.2"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
- QT4_TARGET_DIRECTORIES="
- src/dbus
- tools/qdbus/qdbus
- tools/qdbus/qdbusxml2cpp
- tools/qdbus/qdbuscpp2xml"
- QCONFIG_ADD="dbus dbus-linked"
- QCONFIG_DEFINE="QT_DBUS"
-
- if [[ ${PV} != 4*9999 ]]; then
- QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
- include/QtCore
- include/QtDBus
- include/QtXml
- src/corelib
- src/xml"
- fi
-
- qt4-build${QT_ECLASS}_pkg_setup
-}
-
-src_configure() {
- myconf="${myconf} -dbus-linked"
- qt4-build${QT_ECLASS}_src_configure
-}
diff --git a/x11-libs/qt-declarative/qt-declarative-4.9999.ebuild b/x11-libs/qt-declarative/qt-declarative-4.9999.ebuild
deleted file mode 100644
index 186934a..0000000
--- a/x11-libs/qt-declarative/qt-declarative-4.9999.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="4"
-inherit qt4-build-edge
-
-DESCRIPTION="The Declarative module for the Qt toolkit"
-SLOT="4"
-if [[ ${PV} != 4*9999 ]]; then
- KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-else
- KEYWORDS=""
-fi
-
-IUSE="+accessibility qt3support webkit"
-
-DEPEND="~x11-libs/qt-core-${PV}[aqua=,c++0x=,qpa=,debug=,qt3support=]
- ~x11-libs/qt-gui-${PV}[accessibility=,aqua=,c++0x=,qpa=,debug=,qt3support=]
- ~x11-libs/qt-opengl-${PV}[aqua=,c++0x=,qpa=,debug=,qt3support=]
- ~x11-libs/qt-script-${PV}[aqua=,c++0x=,qpa=,debug=]
- ~x11-libs/qt-sql-${PV}[aqua=,c++0x=,qpa=,debug=,qt3support=]
- ~x11-libs/qt-svg-${PV}[accessibility=,aqua=,c++0x=,qpa=,debug=]
- ~x11-libs/qt-xmlpatterns-${PV}[aqua=,c++0x=,qpa=,debug=]
- qt3support? ( ~x11-libs/qt-qt3support-${PV}[accessibility=,aqua=,c++0x=,qpa=,debug=] )
- webkit? ( ~x11-libs/qt-webkit-${PV}[aqua=,c++0x=,qpa=,debug=] )
- "
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
- QCONFIG_ADD="declarative"
-
- QT4_TARGET_DIRECTORIES="
- src/declarative
- src/imports
- tools/designer/src/plugins/qdeclarativeview
- tools/qml
- tools/qmlplugindump"
-
- if use webkit; then
- QT4_TARGET_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
- src/3rdparty/webkit/Source/WebKit/qt/declarative"
- fi
-
- QT4_EXTRACT_DIRECTORIES="
- include/
- src/
- tools/
- translations/"
-
- qt4-build-edge_pkg_setup
-}
-
-src_configure() {
- myconf="${myconf} -declarative -no-gtkstyle
- $(qt_use accessibility) $(qt_use qt3support) $(qt_use webkit)"
- qt4-build-edge_src_configure
-}
-
-src_install() {
- qt4-build-edge_src_install
- if use aqua && [[ ${CHOST##*-darwin} -ge 9 ]] ; then
- insinto "${QTLIBDIR#${EPREFIX}}"/QtDeclarative.framework/Headers/private
- # ran for the 2nd time, need it for the updated headers
- fix_includes
- else
- insinto "${QTHEADERDIR#${EPREFIX}}"/QtDeclarative/private
- fi
- find "${S}"/src/declarative/ -type f -name "*_p.h" -exec doins {} \;
-}
diff --git a/x11-libs/qt-demo/qt-demo-4.9999.ebuild b/x11-libs/qt-demo/qt-demo-4.9999.ebuild
deleted file mode 100644
index 5205aaa..0000000
--- a/x11-libs/qt-demo/qt-demo-4.9999.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="4"
-inherit qt4-build-edge
-
-DESCRIPTION="Demonstration module of the Qt toolkit"
-SLOT="4"
-if [[ ${PV} != 4*9999 ]]; then
- KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-else
- KEYWORDS=""
-fi
-IUSE="kde qt3support"
-
-DEPEND="~x11-libs/qt-assistant-${PV}:${SLOT}[aqua=,c++0x=,qpa=,debug=]
- ~x11-libs/qt-core-${PV}:${SLOT}[aqua=,c++0x=,qpa=,debug=,qt3support=]
- ~x11-libs/qt-dbus-${PV}:${SLOT}[aqua=,c++0x=,qpa=,debug=]
- ~x11-libs/qt-declarative-${PV}:${SLOT}[aqua=,c++0x=,qpa=,debug=,webkit]
- ~x11-libs/qt-gui-${PV}:${SLOT}[aqua=,c++0x=,qpa=,debug=,qt3support=]
- ~x11-libs/qt-multimedia-${PV}:${SLOT}[aqua=,c++0x=,qpa=,debug=]
- ~x11-libs/qt-opengl-${PV}:${SLOT}[aqua=,c++0x=,qpa=,debug=,qt3support=]
- !kde? ( || ( ~x11-libs/qt-phonon-${PV}:${SLOT}[aqua=,c++0x=,qpa=,debug=]
- media-libs/phonon[aqua=,debug=] ) )
- kde? ( media-libs/phonon[aqua=,debug=] )
- ~x11-libs/qt-script-${PV}:${SLOT}[aqua=,c++0x=,qpa=,debug=]
- ~x11-libs/qt-sql-${PV}:${SLOT}[aqua=,c++0x=,qpa=,debug=,qt3support=]
- ~x11-libs/qt-svg-${PV}:${SLOT}[aqua=,c++0x=,qpa=,debug=]
- ~x11-libs/qt-test-${PV}:${SLOT}[aqua=,c++0x=,qpa=,debug=]
- ~x11-libs/qt-webkit-${PV}:${SLOT}[aqua=,c++0x=,qpa=,debug=]
- ~x11-libs/qt-xmlpatterns-${PV}:${SLOT}[aqua=,c++0x=,qpa=,debug=]"
-
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}/${PN}-4.6-plugandpaint.patch" )
-
-pkg_setup() {
- QT4_TARGET_DIRECTORIES="demos
- examples"
- QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
- doc/src/images
- src/
- include/
- tools/"
-
- qt4-build-edge_pkg_setup
-}
-
-src_configure() {
- myconf="${myconf} $(qt_use qt3support) -no-openvg"
- qt4-build-edge_src_configure
-}
-
-src_install() {
- insinto "${QTDOCDIR#${EPREFIX}}"/src
- doins -r "${S}"/doc/src/images || die "Installing images failed."
-
- qt4-build-edge_src_install
-}
diff --git a/x11-libs/qt-gui/qt-gui-4.9999.ebuild b/x11-libs/qt-gui/qt-gui-4.9999.ebuild
deleted file mode 100644
index fb41abd..0000000
--- a/x11-libs/qt-gui/qt-gui-4.9999.ebuild
+++ /dev/null
@@ -1,234 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="4"
-if [[ ${PV} == 4*9999 ]]; then
- QT_ECLASS="-edge"
-fi
-inherit eutils confutils qt4-build${QT_ECLASS}
-
-DESCRIPTION="The GUI module for the Qt toolkit"
-SLOT="4"
-if [[ ${PV} != 4*9999 ]]; then
- KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 -sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-else
- KEYWORDS=""
-fi
-
-IUSE="+accessibility cups dbus egl gif +glib gtkstyle mng nas nis qt3support tiff trace xinerama"
-
-RDEPEND="
- app-admin/eselect-qtgraphicssystem
- media-libs/fontconfig
- media-libs/freetype:2
- media-libs/libpng:0
- sys-libs/zlib
- virtual/jpeg
- ~x11-libs/qt-core-${PV}[aqua=,c++0x=,qpa=,debug=,glib=,qt3support=]
- ~x11-libs/qt-script-${PV}[aqua=,c++0x=,qpa=,debug=]
- !aqua? (
- x11-libs/libX11
- x11-libs/libXext
- x11-libs/libXrandr
- x11-libs/libXcursor
- x11-libs/libXfont
- x11-libs/libSM
- x11-libs/libXi
- )
- cups? ( net-print/cups )
- dbus? ( ~x11-libs/qt-dbus-${PV}[aqua=,c++0x=,qpa=,debug=] )
- egl? ( media-libs/mesa[egl] )
- gtkstyle? ( x11-libs/gtk+:2[aqua=] )
- mng? ( >=media-libs/libmng-1.0.9 )
- nas? ( >=media-libs/nas-1.5 )
- tiff? ( media-libs/tiff:0 )
- xinerama? ( x11-libs/libXinerama )"
-DEPEND="${RDEPEND}
- !aqua? (
- x11-proto/xextproto
- x11-proto/inputproto
- )
- xinerama? ( x11-proto/xineramaproto )"
-RDEPEND="${RDEPEND}
- !~x11-themes/qgtkstyle-4.7.2"
-PDEPEND="qt3support? ( ~x11-libs/qt-qt3support-${PV}[aqua=,c++0x=,qpa=,debug=] )"
-
-pkg_setup() {
- # this belongs to pkg_pretend, we have to upgrade to EAPI 4 :)
- # was planning to use a dep, but to reproduce this you have to
- # clean-emerge qt-gui[gtkstyle] while having cairo[qt4] installed.
- # no need to restrict normal first time users for that :)
- if use gtkstyle && ! has_version x11-libs/qt-gui && has_version x11-libs/cairo[qt4]; then
- echo
- eerror "When building qt-gui[gtkstyle] from scratch with cairo present,"
- eerror "cairo must have the qt4 use flag disabled, otherwise the gtk"
- eerror "style cannot be built."
- ewarn
- eerror "You have the following options:"
- eerror " - rebuild cairo with -qt4 USE"
- eerror " - build qt-gui with -gtkstyle USE"
- ewarn
- eerror "After you successfully install qt-gui, you'll be able to"
- eerror "re-enable the disabled use flag and/or reinstall cairo."
- ewarn
- echo
- die "can't build qt-gui with gtkstyle USE if cairo has qt4 USE enabled"
- fi
-
- confutils_use_depend_all gtkstyle glib
-
- QT4_TARGET_DIRECTORIES="
- src/gui
- src/scripttools
- tools/designer
- tools/linguist/linguist
- src/plugins/imageformats/gif
- src/plugins/imageformats/ico
- src/plugins/imageformats/jpeg
- src/plugins/inputmethods"
-
- if [[ ${PV} != 4*9999 ]]; then
- QT4_EXTRACT_DIRECTORIES="
- include
- src
- tools"
- fi
-
- use dbus && QT4_TARGET_DIRECTORIES="${QT4_TARGET_DIRECTORIES} tools/qdbus/qdbusviewer"
- use mng && QT4_TARGET_DIRECTORIES="${QT4_TARGET_DIRECTORIES} src/plugins/imageformats/mng"
- use tiff && QT4_TARGET_DIRECTORIES="${QT4_TARGET_DIRECTORIES} src/plugins/imageformats/tiff"
- use accessibility && QT4_TARGET_DIRECTORIES="${QT4_TARGET_DIRECTORIES} src/plugins/accessible/widgets"
- use trace && QT4_TARGET_DIRECTORIES="${QT4_TARGET_DIRECTORIES} src/plugins/graphicssystems/trace"
-
- QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES} ${QT4_EXTRACT_DIRECTORIES}"
-
- # mac version does not contain qtconfig?
- [[ ${CHOST} == *-darwin* ]] || QT4_TARGET_DIRECTORIES+=" tools/qtconfig"
-
- qt4-build${QT_ECLASS}_pkg_setup
-}
-
-src_prepare() {
- qt4-build${QT_ECLASS}_src_prepare
-
- # Don't build plugins this go around, because they depend on qt3support lib
- sed -i -e "s:CONFIG(shared:# &:g" "${S}"/tools/designer/src/src.pro || die
-}
-
-src_configure() {
- export PATH="${S}/bin:${PATH}"
- export LD_LIBRARY_PATH="${S}/lib:${LD_LIBRARY_PATH}"
-
- myconf="$(qt_use accessibility)
- $(qt_use cups)
- $(qt_use glib)
- $(qt_use mng libmng system)
- $(qt_use nis)
- $(qt_use tiff libtiff system)
- $(qt_use dbus qdbus)
- $(qt_use dbus)
- $(qt_use egl)
- $(qt_use qt3support)
- $(qt_use gtkstyle)
- $(qt_use xinerama)"
-
- use gif || myconf="${myconf} -no-gif"
- use nas && myconf="${myconf} -system-nas-sound"
-
- [[ x86_64-apple-darwin* ]] && myconf="${myconf} -no-ssse3" #367045
-
- myconf="${myconf} -system-libpng -system-libjpeg
- -no-sql-mysql -no-sql-psql -no-sql-ibase -no-sql-sqlite -no-sql-sqlite2
- -no-sql-odbc -xrender -xrandr -xkb -xshape -sm -no-svg -no-webkit
- -no-phonon -no-opengl"
-
- qt4-build${QT_ECLASS}_src_configure
-
- if use gtkstyle; then
- einfo "patching the Makefile to fix qgtkstyle compilation"
- sed "s:-I/usr/include/qt4 ::" -i src/gui/Makefile ||
- die "sed failed"
- fi
- einfo "patching the Makefile to fix bug #361277"
- sed "s:-I/usr/include/qt4/QtGui ::" -i src/gui/Makefile ||
- die "sed failed"
-}
-
-src_install() {
- QCONFIG_ADD="x11sm xshape xcursor xfixes xrandr xrender xkb fontconfig
- $(usev accessibility) $(usev xinerama) $(usev cups) $(usev nas)
- gif png system-png system-jpeg
- $(use mng && echo system-mng)
- $(use tiff && echo system-tiff)"
- QCONFIG_REMOVE="no-gif no-png"
- QCONFIG_DEFINE="$(use accessibility && echo QT_ACCESSIBILITY)
- $(use cups && echo QT_CUPS) QT_FONTCONFIG QT_IMAGEFORMAT_JPEG
- $(use mng && echo QT_IMAGEFORMAT_MNG)
- $(use nas && echo QT_NAS)
- $(use nis && echo QT_NIS) QT_IMAGEFORMAT_PNG QT_SESSIONMANAGER QT_SHAPE
- $(use tiff && echo QT_IMAGEFORMAT_TIFF) QT_XCURSOR
- $(use xinerama && echo QT_XINERAMA) QT_XFIXES QT_XKB QT_XRANDR QT_XRENDER"
-
- qt4-build${QT_ECLASS}_src_install
-
- # qt-creator
- # some qt-creator headers are located
- # under /usr/include/qt4/QtDesigner/private.
- # those headers are just includes of the headers
- # which are located under tools/designer/src/lib/*
- # So instead of installing both, we create the private folder
- # and drop tools/designer/src/lib/* headers in it.
- if use aqua && [[ ${CHOST##*-darwin} -ge 9 ]] ; then
- insinto "${QTLIBDIR#${EPREFIX}}"/QtDesigner.framework/Headers/private/
- else
- insinto "${QTHEADERDIR#${EPREFIX}}"/QtDesigner/private/
- fi
- doins "${S}"/tools/designer/src/lib/shared/* || die
- doins "${S}"/tools/designer/src/lib/sdk/* || die
-
- #touch the available graphics systems
- mkdir -p "${ED}/usr/share/qt4/graphicssystems/" ||
- die "could not create ${ED}/usr/share/qt4/graphicssystems/"
- echo "default" > "${ED}/usr/share/qt4/graphicssystems/raster" ||
- die "could not create ${ED}/usr/share/qt4/graphicssystems/raster"
- touch "${ED}/usr/share/qt4/graphicssystems/native" ||
- die "could not touch ${ED}/usr/share/qt4/graphicssystems/native"
-
- #install private headers
- if use aqua && [[ ${CHOST##*-darwin} -ge 9 ]] ; then
- insinto "${QTLIBDIR#${EPREFIX}}"/QtGui.framework/Headers/private/
- else
- insinto "${QTHEADERDIR#${EPREFIX}}"/QtGui/private
- fi
- find "${S}"/src/gui -type f -name "*_p.h" -exec doins {} \;
-
- if use aqua && [[ ${CHOST##*-darwin} -ge 9 ]] ; then
- # rerun to get links to headers right
- fix_includes
- fi
-
- # install correct designer and linguist icons, bug 241208
- doicon tools/linguist/linguist/images/icons/linguist-128-32.png \
- tools/designer/src/designer/images/designer.png \
- || die "doicon failed"
- # Note: absolute image path required here!
- make_desktop_entry linguist Linguist \
- /usr/share/pixmaps/linguist-128-32.png \
- 'Qt;Development;GUIDesigner' \
- || die "linguist make_desktop_entry failed"
- make_desktop_entry designer Designer \
- /usr/share/pixmaps/designer.png \
- 'Qt;Development;GUIDesigner' \
- || die "designer make_desktop_entry failed"
-}
-
-pkg_postinst() {
- # raster is the default graphicssystems, set it if first install
- eselect qtgraphicssystem set raster --use-old
- elog "Starting with qt 4.8.0, you may choose the active Qt Graphics System"
- elog "by using a new eselect module called qtgraphicssystem."
- elog "Run"
- elog " eselect qtgraphicssystem"
- elog "for more information"
-}
diff --git a/x11-libs/qt-multimedia/qt-multimedia-4.9999.ebuild b/x11-libs/qt-multimedia/qt-multimedia-4.9999.ebuild
deleted file mode 100644
index 86483d8..0000000
--- a/x11-libs/qt-multimedia/qt-multimedia-4.9999.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="4"
-inherit qt4-build-edge
-
-DESCRIPTION="The Qt multimedia module"
-SLOT="4"
-if [[ ${PV} != 4*9999 ]]; then
- KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 -sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-else
- KEYWORDS=""
-fi
-
-IUSE="iconv"
-
-DEPEND="!aqua? ( media-libs/alsa-lib )
- ~x11-libs/qt-core-${PV}[aqua=,c++0x=,qpa=,debug=]
- ~x11-libs/qt-gui-${PV}[aqua=,c++0x=,qpa=,debug=]"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
- QT4_TARGET_DIRECTORIES="src/multimedia"
-
- if [[ ${PV} != 4*9999 ]]; then
- QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
- include/Qt/
- include/QtCore/
- include/QtGui/
- include/QtMultimedia/
- include/QtNetwork/
- src/src.pro
- src/3rdparty/
- src/corelib/
- src/gui/
- src/network/
- src/plugins/
- src/tools/"
- fi
-
- qt4-build-edge_pkg_setup
-}
-
-src_configure() {
- myconf="${myconf} $(qt_use iconv) -no-xkb -no-fontconfig -no-xrender
- -no-xrandr -no-xfixes -no-xcursor -no-xinerama -no-xshape -no-sm
- -no-opengl -no-nas-sound -no-dbus -no-cups -no-nis -no-gif -no-libpng
- -no-libmng -no-libjpeg -no-openssl -system-zlib -no-webkit -no-phonon
- -no-xmlpatterns -no-freetype -no-libtiff -no-accessibility
- -no-fontconfig -no-sql-mysql -no-sql-psql -no-sql-ibase -no-sql-sqlite
- -no-sql-sqlite2 -no-sql-odbc -no-glib -no-opengl -no-svg -no-gtkstyle
- -no-phonon-backend -no-script -no-scripttools -no-cups -no-xsync
- -no-xinput"
-
- qt4-build-edge_src_configure
-}
diff --git a/x11-libs/qt-opengl/qt-opengl-4.9999.ebuild b/x11-libs/qt-opengl/qt-opengl-4.9999.ebuild
deleted file mode 100644
index a87661a..0000000
--- a/x11-libs/qt-opengl/qt-opengl-4.9999.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="4"
-if [[ ${PV} == 4*9999 ]]; then
- QT_ECLASS="-edge"
-fi
-inherit qt4-build${QT_ECLASS}
-
-DESCRIPTION="The OpenGL module for the Qt toolkit"
-SLOT="4"
-if [[ ${PV} != 4*9999 ]]; then
- KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 -sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-else
- KEYWORDS=""
-fi
-
-IUSE="egl qt3support"
-
-DEPEND="~x11-libs/qt-core-${PV}[aqua=,c++0x=,qpa=,debug=,qt3support=]
- ~x11-libs/qt-gui-${PV}[aqua=,c++0x=,qpa=,debug=,egl=,qt3support=]
- virtual/opengl"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
- QT4_TARGET_DIRECTORIES="
- src/opengl
- src/plugins/graphicssystems/opengl"
- if [[ ${PV} != 4*9999 ]]; then
- QT4_EXTRACT_DIRECTORIES="
- include/QtCore
- include/QtGui
- include/QtOpenGL
- src/corelib
- src/gui
- src/opengl
- src/plugins
- src/3rdparty"
- fi
-
- QCONFIG_ADD="opengl"
- QCONFIG_DEFINE="QT_OPENGL $(use egl && echo QT_EGL)"
- qt4-build${QT_ECLASS}_pkg_setup
-}
-
-src_configure() {
- myconf="${myconf} -opengl
- $(qt_use qt3support)
- $(qt_use egl)"
-
- qt4-build${QT_ECLASS}_src_configure
-
- # Not building tools/designer/src/plugins/tools/view3d as it's
- # commented out of the build in the source
-}
-
-src_install() {
- qt4-build${QT_ECLASS}_src_install
-
- #touch the available graphics systems
- mkdir -p "${ED}/usr/share/qt4/graphicssystems/" ||
- die "could not create ${ED}/usr/share/qt4/graphicssystems/"
- echo "experimental" > "${ED}/usr/share/qt4/graphicssystems/opengl" ||
- die "could not create ${ED}/usr/share/qt4/graphicssystems/opengl"
-}
diff --git a/x11-libs/qt-openvg/qt-openvg-4.9999.ebuild b/x11-libs/qt-openvg/qt-openvg-4.9999.ebuild
deleted file mode 100644
index 14ab72f..0000000
--- a/x11-libs/qt-openvg/qt-openvg-4.9999.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="4"
-inherit qt4-build-edge
-
-DESCRIPTION="The OpenVG module for the Qt toolkit"
-SLOT="4"
-if [[ ${PV} != 4*9999 ]]; then
- KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-else
- KEYWWORDS=""
-fi
-
-IUSE="qt3support"
-
-DEPEND="~x11-libs/qt-core-${PV}[aqua=,c++0x=,debug=,qpa=,qt3support=]
- ~x11-libs/qt-gui-${PV}[aqua=,c++0x=,debug=,egl,qpa=,qt3support=]
- media-libs/mesa[openvg]"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
- QT4_TARGET_DIRECTORIES="
- src/openvg
- src/plugins/graphicssystems/openvg"
- if [[ ${PV} != 4*9999 ]]; then
- QT4_EXTRACT_DIRECTORIES="
- include/QtCore
- include/QtGui
- include/QtOpenVG
- src/corelib
- src/gui
- src/openvg
- src/plugins
- src/3rdparty"
- fi
- QCONFIG_ADD="openvg"
- QCONFIG_DEFINE="QT_OPENVG"
-
- qt4-build-edge_pkg_setup
-}
-
-src_configure() {
- gltype="desktop"
-
- myconf="${myconf} -openvg -egl
- $(qt_use qt3support)"
-
- qt4-build-edge_src_configure
-}
-
-src_install() {
- qt4-build-edge_src_install
-
- #touch the available graphics systems
- mkdir -p "${D}/usr/share/qt4/graphicssystems/" ||
- die "could not create ${D}/usr/share/qt4/graphicssystems/"
- echo "experimental" > "${D}/usr/share/qt4/graphicssystems/openvg" ||
- die "could not create ${D}/usr/share/qt4/graphicssystems/openvg"
-}
diff --git a/x11-libs/qt-phonon/qt-phonon-4.9999.ebuild b/x11-libs/qt-phonon/qt-phonon-4.9999.ebuild
deleted file mode 100644
index 85980f4..0000000
--- a/x11-libs/qt-phonon/qt-phonon-4.9999.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-phonon/qt-phonon-4.7.4.ebuild,v 1.1 2011/09/08 09:21:01 wired Exp $
-
-EAPI="4"
-inherit qt4-build-edge
-
-DESCRIPTION="The Phonon module for the Qt toolkit"
-SLOT="4"
-if [[ ${PV} != 4*9999 ]]; then
- KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 -sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
-else
- KEYWORDS=""
-fi
-
-IUSE="dbus qt3support"
-
-DEPEND="~x11-libs/qt-gui-${PV}[aqua=,c++0x=,qpa=,debug=,qt3support=]
- !kde-base/phonon-kde
- !kde-base/phonon-xine
- !media-libs/phonon
- !media-sound/phonon
- !aqua? ( media-libs/gstreamer
- media-plugins/gst-plugins-meta )
- aqua? ( ~x11-libs/qt-opengl-${PV}[aqua,debug=,qt3support=] )
- dbus? ( ~x11-libs/qt-dbus-${PV}[aqua=,c++0x=,qpa=,debug=] )"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
- QT4_TARGET_DIRECTORIES="
- src/phonon
- src/plugins/phonon
- tools/designer/src/plugins/phononwidgets"
- if [[ ${PV} != 4*9999 ]]; then
- QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
- include/
- src
- tools"
- fi
-
- QCONFIG_ADD="phonon"
- use aqua || QCONFIG_DEFINE="QT_GSTREAMER"
-
- qt4-build-edge_pkg_setup
-}
-
-src_configure() {
- myconf="${myconf} -phonon -phonon-backend -no-opengl -no-svg
- $(qt_use dbus qdbus)
- $(qt_use qt3support)"
-
- qt4-build-edge_src_configure
-}
diff --git a/x11-libs/qt-qt3support/qt-qt3support-4.9999.ebuild b/x11-libs/qt-qt3support/qt-qt3support-4.9999.ebuild
deleted file mode 100644
index 59b4e58..0000000
--- a/x11-libs/qt-qt3support/qt-qt3support-4.9999.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-qt3support/qt-qt3support-4.7.4.ebuild,v 1.1 2011/09/08 09:21:19 wired Exp $
-
-EAPI="4"
-if [[ ${PV} == 4*9999 ]]; then
- QT_ECLASS="-edge"
-fi
-inherit qt4-build${QT_ECLASS}
-
-DESCRIPTION="The Qt3 support module for the Qt toolkit"
-SLOT="4"
-if [[ ${PV} != 4*9999 ]]; then
- KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 -sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
-else
- KEYWORDS=""
-fi
-
-IUSE="+accessibility"
-
-DEPEND="~x11-libs/qt-core-${PV}[aqua=,c++0x=,qpa=,debug=,qt3support]
- ~x11-libs/qt-gui-${PV}[accessibility=,aqua=,c++0x=,qpa=,debug=,qt3support]
- ~x11-libs/qt-sql-${PV}[aqua=,c++0x=,qpa=,debug=,qt3support]"
-
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
- QT4_TARGET_DIRECTORIES="
- src/qt3support
- src/tools/uic3
- tools/designer/src/plugins/widgets
- tools/porting"
- if [[ ${PV} != 4*9999 ]]; then
- QT4_EXTRACT_DIRECTORIES="src include tools"
- fi
-
- qt4-build${QT_ECLASS}_pkg_setup
-}
-
-src_configure() {
- myconf="${myconf} -qt3support
- $(qt_use accessibility)"
- qt4-build${QT_ECLASS}_src_configure
-}
diff --git a/x11-libs/qt-script/qt-script-4.9999.ebuild b/x11-libs/qt-script/qt-script-4.9999.ebuild
deleted file mode 100644
index 24d6b3c..0000000
--- a/x11-libs/qt-script/qt-script-4.9999.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="4"
-inherit qt4-build-edge
-
-DESCRIPTION="The ECMAScript module for the Qt toolkit"
-SLOT="4"
-if [[ ${PV} != 4*9999 ]]; then
- KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 -sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-else
- KEYWORDS=""
-fi
-IUSE="iconv +jit"
-
-DEPEND="~x11-libs/qt-core-${PV}[aqua=,c++0x=,qpa=,debug=]"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
- QT4_TARGET_DIRECTORIES="src/script/"
-
- if [[ ${PV} != 4*9999 ]]; then
- QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
- include/Qt/
- include/QtCore/
- include/QtScript/
- src/3rdparty/javascriptcore/
- src/corelib/"
- fi
-
- qt4-build-edge_pkg_setup
-}
-
-src_configure() {
- myconf="${myconf} $(qt_use iconv) $(qt_use jit javascript-jit) -no-xkb
- -no-fontconfig -no-xrender -no-xrandr -no-xfixes -no-xcursor -no-xinerama
- -no-xshape -no-sm -no-opengl -no-nas-sound -no-dbus -no-cups -no-nis -no-gif
- -no-libpng -no-libmng -no-libjpeg -no-openssl -system-zlib -no-webkit -no-phonon
- -no-qt3support -no-xmlpatterns -no-freetype -no-libtiff
- -no-accessibility -no-fontconfig -no-glib -no-opengl -no-svg
- -no-gtkstyle"
- qt4-build-edge_src_configure
-}
-
-src_install() {
- qt4-build_src_install
- #install private headers
- insinto "${QTHEADERDIR#${EPREFIX}}"/QtScript/private
- find "${S}"/src/script -type f -name "*_p.h" -exec doins {} \;
-}
diff --git a/x11-libs/qt-sql/qt-sql-4.9999.ebuild b/x11-libs/qt-sql/qt-sql-4.9999.ebuild
deleted file mode 100644
index 6f5dca6..0000000
--- a/x11-libs/qt-sql/qt-sql-4.9999.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="4"
-if [[ ${PV} == 4*9999 ]]; then
- QT_ECLASS="-edge"
-fi
-
-inherit qt4-build${QT_ECLASS}
-
-DESCRIPTION="The SQL module for the Qt toolkit"
-SLOT="4"
-if [[ ${PV} != 4*9999 ]]; then
- KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 -sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-else
- KEYWORDS=""
-fi
-IUSE="firebird freetds mysql odbc postgres qt3support +sqlite"
-
-DEPEND="~x11-libs/qt-core-${PV}[aqua=,c++0x=,qpa=,debug=,qt3support=]
- firebird? ( dev-db/firebird )
- freetds? ( dev-db/freetds )
- mysql? ( virtual/mysql )
- odbc? ( || ( dev-db/unixODBC dev-db/libiodbc ) )
- postgres? ( dev-db/postgresql-base )
- sqlite? ( dev-db/sqlite:3 )"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
- QT4_TARGET_DIRECTORIES="
- src/sql
- src/plugins/sqldrivers"
-
- if [[ ${PV} != 4*9999 ]]; then
- QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
- include/Qt/
- include/QtCore/
- include/QtSql/
- src/src.pro
- src/corelib/
- src/plugins
- src/tools/tools.pro"
- fi
-
- if ! (use firebird || use freetds || use mysql || use odbc || use postgres || use sqlite ); then
- ewarn "You need to enable at least one SQL driver. Enable at least"
- ewarn "one of these USE flags: \"firebird freetds mysql odbc postgres sqlite \""
- die "Enable at least one SQL driver."
- fi
-
- qt4-build${QT_ECLASS}_pkg_setup
-}
-
-src_configure() {
- myconf+="
- $(qt_use firebird sql-ibase plugin)
- $(qt_use freetds sql-tds plugin)
- $(qt_use mysql sql-mysql plugin) $(use mysql && echo "-I${EPREFIX}/usr/include/mysql -L${EPREFIX}/usr/$(get_libdir)/mysql")
- $(qt_use odbc sql-odbc plugin) $(use odbc && echo "-I${EPREFIX}/usr/include/iodbc")
- $(qt_use postgres sql-psql plugin) $(use postgres && echo "-I${EPREFIX}/usr/include/postgresql/pgsql")
- $(qt_use sqlite sql-sqlite plugin) $(use sqlite && echo -system-sqlite)
- -no-sql-db2
- -no-sql-oci
- -no-sql-sqlite2
- -no-sql-symsql
- $(qt_use qt3support)
- -no-accessibility -no-xmlpatterns -no-multimedia -no-audio-backend -no-phonon
- -no-phonon-backend -no-svg -no-webkit -no-script -no-scripttools -no-declarative
- -system-zlib -no-gif -no-libtiff -no-libpng -no-libmng -no-libjpeg -no-openssl
- -no-cups -no-dbus -no-gtkstyle -no-nas-sound -no-opengl
- -no-sm -no-xshape -no-xvideo -no-xsync -no-xinerama -no-xcursor -no-xfixes
- -no-xrandr -no-xrender -no-mitshm -no-fontconfig -no-freetype -no-xinput -no-xkb
- -no-glib"
-
- qt4-build${QT_ECLASS}_src_configure
-}
diff --git a/x11-libs/qt-svg/qt-svg-4.9999.ebuild b/x11-libs/qt-svg/qt-svg-4.9999.ebuild
deleted file mode 100644
index f2aab78..0000000
--- a/x11-libs/qt-svg/qt-svg-4.9999.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="4"
-inherit qt4-build-edge
-
-DESCRIPTION="The SVG module for the Qt toolkit"
-SLOT="4"
-if [[ ${PV} != 4*9999 ]]; then
- KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 -sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-else
- KEYWORDS=""
-fi
-IUSE="+accessibility iconv"
-
-DEPEND="~x11-libs/qt-gui-${PV}[accessibility=,aqua=,c++0x=,debug=,qpa=]"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
- QT4_TARGET_DIRECTORIES="
- src/svg
- src/plugins/imageformats/svg
- src/plugins/iconengines/svgiconengine"
- if [[ ${PV} != 4*9999 ]]; then
- QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
- include/QtSvg/
- include/Qt/
- include/QtGui/
- include/QtCore/
- include/QtXml/
- src/corelib/
- src/gui/
- src/plugins/
- src/xml
- src/3rdparty"
- fi
-
- QCONFIG_ADD="svg"
- QCONFIG_DEFINE="QT_SVG"
-
- qt4-build-edge_pkg_setup
-}
-
-src_configure() {
- myconf="${myconf} -svg
- $(qt_use accessibility)
- $(qt_use iconv)
- -no-xkb -no-xrender
- -no-xrandr -no-xfixes -no-xcursor -no-xinerama -no-xshape -no-sm
- -no-opengl -no-nas-sound -no-dbus -no-cups -no-nis -no-gif -no-libpng
- -no-libmng -no-libjpeg -no-openssl -system-zlib -no-webkit -no-phonon
- -no-qt3support -no-xmlpatterns -no-freetype -no-libtiff
- -no-fontconfig -no-glib -no-gtkstyle"
- qt4-build-edge_src_configure
-}
diff --git a/x11-libs/qt-test/qt-test-4.9999.ebuild b/x11-libs/qt-test/qt-test-4.9999.ebuild
deleted file mode 100644
index 904ef58..0000000
--- a/x11-libs/qt-test/qt-test-4.9999.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-test/qt-test-4.7.4.ebuild,v 1.1 2011/09/08 09:22:28 wired Exp $
-
-EAPI="4"
-inherit qt4-build-edge
-
-DESCRIPTION="The testing framework module for the Qt toolkit"
-SLOT="4"
-if [[ ${PV} != 4*9999 ]]; then
- KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 -sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
- KEYWORDS=""
-fi
-IUSE="iconv"
-
-DEPEND="~x11-libs/qt-core-${PV}[aqua=,c++0x=,qpa=,debug=]"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
- QT4_TARGET_DIRECTORIES="src/testlib"
- if [[ ${PV} != 4*9999 ]]; then
- QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
- include/QtTest/
- include/QtCore/
- src/corelib/"
- fi
-
- qt4-build-edge_pkg_setup
-}
-
-src_configure() {
- myconf="${myconf} $(qt_use iconv) -no-xkb -no-fontconfig -no-xrender
- -no-xrandr -no-xfixes -no-xcursor -no-xinerama -no-xshape -no-sm
- -no-opengl -no-nas-sound -no-dbus -no-cups -no-nis -no-gif -no-libpng
- -no-libmng -no-libjpeg -no-openssl -system-zlib -no-webkit -no-phonon
- -no-qt3support -no-xmlpatterns -no-freetype -no-libtiff
- -no-accessibility -no-fontconfig -no-glib -no-opengl -no-svg"
- qt4-build-edge_src_configure
-}
diff --git a/x11-libs/qt-webkit/qt-webkit-4.9999.ebuild b/x11-libs/qt-webkit/qt-webkit-4.9999.ebuild
deleted file mode 100644
index bfeebbe..0000000
--- a/x11-libs/qt-webkit/qt-webkit-4.9999.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="4"
-
-if [[ ${PV} == 4*9999 ]]; then
- QT_ECLASS="-edge"
-fi
-inherit qt4-build${QT_ECLASS} flag-o-matic
-
-DESCRIPTION="The WebKit module for the Qt toolkit"
-SLOT="4"
-if [[ ${PV} != 4*9999 ]]; then
- KEYWORDS="~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 -sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
-else
- KEYWORDS=""
-fi
-IUSE="+gstreamer +jit"
-
-DEPEND="
- dev-db/sqlite:3
- dev-libs/icu
- x11-libs/libXrender
- ~x11-libs/qt-core-${PV}[aqua=,c++0x=,qpa=,debug=,ssl]
- ~x11-libs/qt-gui-${PV}[aqua=,c++0x=,qpa=,debug=]
- ~x11-libs/qt-xmlpatterns-${PV}[aqua=,c++0x=,qpa=,debug=]
- gstreamer? (
- dev-libs/glib:2
- media-libs/gstreamer:0.10
- media-libs/gst-plugins-base:0.10
- )"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
- QT4_TARGET_DIRECTORIES="
- src/3rdparty/webkit/Source/JavaScriptCore
- src/3rdparty/webkit/Source/WebCore
- src/3rdparty/webkit/Source/WebKit/qt
- tools/designer/src/plugins/qwebview"
- if [[ ${PV} != 4*9999 ]]; then
- QT4_EXTRACT_DIRECTORIES="
- include/
- src/
- tools/"
- fi
-
- QCONFIG_ADD="webkit"
- QCONFIG_DEFINE="QT_WEBKIT"
-
- qt4-build${QT_ECLASS}_pkg_setup
-}
-
-src_prepare() {
- use c++0x && append-cxxflags -fpermissive
-
- # Always enable icu to avoid build failure, bug 407315
- sed -i -e '/CONFIG\s*+=\s*text_breaking_with_icu/ s:^#\s*::' \
- src/3rdparty/webkit/Source/JavaScriptCore/JavaScriptCore.pri || die
-
- sed -i -e '/QMAKE_CXXFLAGS\s*+=/ s:-Werror::g' \
- src/3rdparty/webkit/Source/WebKit.pri || die
-
- qt4-build${QT_ECLASS}_src_prepare
-}
-
-src_configure() {
- myconf+="
- -webkit
- -icu -system-sqlite
- $(qt_use jit javascript-jit)
- $(use gstreamer || echo -DENABLE_VIDEO=0)
- "
- qt4-build${QT_ECLASS}_src_configure
-}
diff --git a/x11-libs/qt-xmlpatterns/qt-xmlpatterns-4.9999.ebuild b/x11-libs/qt-xmlpatterns/qt-xmlpatterns-4.9999.ebuild
deleted file mode 100644
index c280792..0000000
--- a/x11-libs/qt-xmlpatterns/qt-xmlpatterns-4.9999.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-xmlpatterns/qt-xmlpatterns-4.7.4.ebuild,v 1.1 2011/09/08 09:23:04 wired Exp $
-
-EAPI="4"
-inherit qt4-build-edge
-
-DESCRIPTION="The patternist module for the Qt toolkit"
-SLOT="4"
-if [[ ${PV} != 4*9999 ]]; then
- KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 -sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
- KEYWORDS=""
-fi
-IUSE=""
-
-DEPEND="~x11-libs/qt-core-${PV}[aqua=,c++0x=,qpa=,debug=,exceptions]"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
- QT4_TARGET_DIRECTORIES="
- src/xmlpatterns
- tools/xmlpatterns
- tools/xmlpatternsvalidator"
-
- if [[ ${PV} != 4*9999 ]]; then
- QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
- include/QtCore
- include/QtNetwork
- include/QtXml
- include/QtXmlPatterns
- src/network/
- src/xml/
- src/corelib/"
- fi
-
- QCONFIG_ADD="xmlpatterns"
- QCONFIG_DEFINE="QT_XMLPATTERNS"
-
- qt4-build-edge_pkg_setup
-}
-
-src_configure() {
- myconf="${myconf} -xmlpatterns"
- qt4-build-edge_src_configure
-}
^ permalink raw reply related [flat|nested] 11+ messages in thread* [gentoo-commits] proj/qt:master commit in: x11-libs/qt-opengl/, x11-libs/qt-script/, x11-libs/qt-qt3support/, ...
@ 2012-03-31 18:12 Michael Palimaka
0 siblings, 0 replies; 11+ messages in thread
From: Michael Palimaka @ 2012-03-31 18:12 UTC (permalink / raw
To: gentoo-commits
commit: d3ce129aa329b8c9556d1fa0add21a221825e584
Author: Michael Palimaka <kensington <AT> astralcloak <DOT> net>
AuthorDate: Sat Mar 31 18:09:14 2012 +0000
Commit: Michael Palimaka <kensington <AT> astralcloak <DOT> net>
CommitDate: Sat Mar 31 18:09:14 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=d3ce129a
[x11-libs/qt-*] Sync with portage.
(Portage version: 2.1.10.52/git/Linux x86_64, unsigned Manifest commit)
---
x11-libs/qt-assistant/qt-assistant-4.8.9999.ebuild | 129 +++++++--------
x11-libs/qt-core/qt-core-4.8.9999.ebuild | 69 ++++----
.../qt-dbus/files/qt-4.6-master-nolibx11.patch | 20 ---
.../qt-dbus-4.7-qdbusintegrator-no-const.patch | 11 ++
x11-libs/qt-dbus/qt-dbus-4.8.9999.ebuild | 36 +++--
.../qt-declarative/qt-declarative-4.8.9999.ebuild | 70 ++++----
x11-libs/qt-demo/qt-demo-4.8.9999.ebuild | 53 ++++---
x11-libs/qt-gui/files/qt-gui-4.7.3-cups.patch | 84 +++++++++
x11-libs/qt-gui/qt-gui-4.8.9999.ebuild | 177 ++++++++++----------
.../files/qt-multimedia-4.8.0-alsa.patch | 25 +++
.../qt-multimedia/qt-multimedia-4.8.9999.ebuild | 85 +++++-----
x11-libs/qt-opengl/files/qtbug-9691-Xdefs.patch | 97 -----------
x11-libs/qt-opengl/qt-opengl-4.8.9999.ebuild | 64 ++++----
x11-libs/qt-openvg/qt-openvg-4.8.9999.ebuild | 57 ++++---
x11-libs/qt-phonon/files/qtbug-9691-Xdefs.patch | 97 -----------
x11-libs/qt-phonon/qt-phonon-4.8.9999.ebuild | 45 +++---
.../qt-qt3support/qt-qt3support-4.8.9999.ebuild | 42 +++---
.../qt-script/files/qt-4.6-master-nolibx11.patch | 20 ---
x11-libs/qt-script/qt-script-4.8.9999.ebuild | 55 ++++---
x11-libs/qt-sql/files/qt-4.6-master-nolibx11.patch | 20 ---
x11-libs/qt-sql/qt-sql-4.8.9999.ebuild | 51 +++---
x11-libs/qt-svg/qt-svg-4.8.9999.ebuild | 57 ++++---
.../qt-test/files/qt-4.6-master-nolibx11.patch | 20 ---
x11-libs/qt-test/qt-test-4.8.9999.ebuild | 50 +++---
.../files/qt-webkit-4.8.0-c++0x-fix.patch | 101 +++++++++++
x11-libs/qt-webkit/qt-webkit-4.8.9999.ebuild | 50 +++---
.../files/qt-4.6-master-nolibx11.patch | 20 ---
.../qt-xmlpatterns/qt-xmlpatterns-4.8.9999.ebuild | 45 +++---
28 files changed, 809 insertions(+), 841 deletions(-)
diff --git a/x11-libs/qt-assistant/qt-assistant-4.8.9999.ebuild b/x11-libs/qt-assistant/qt-assistant-4.8.9999.ebuild
index 71b63ee..f3bef74 100644
--- a/x11-libs/qt-assistant/qt-assistant-4.8.9999.ebuild
+++ b/x11-libs/qt-assistant/qt-assistant-4.8.9999.ebuild
@@ -2,88 +2,90 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-EAPI="4"
-if [[ ${PV} == 4*9999 ]]; then
- QT_ECLASS="-edge"
-fi
-inherit qt4-build${QT_ECLASS}
+EAPI=4
+
+inherit qt4-build
-DESCRIPTION="The assistant help module for the Qt toolkit"
+DESCRIPTION="The Help module and Assistant application for the Qt toolkit"
+SRC_URI+=" compat? ( ftp://ftp.qt.nokia.com/qt/source/${PN}-qassistantclient-library-compat-src-4.6.3.tar.gz )"
SLOT="4"
-if [[ ${PV} != 4*9999 ]]; then
- KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~ppc-macos"
-else
+
+if [[ ${QT4_BUILD_TYPE} == live ]]; then
KEYWORDS=""
+else
+ KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~ppc-macos"
fi
IUSE="compat doc +glib qt3support trace webkit"
-SRC_URI+=" compat? ( ftp://ftp.qt.nokia.com/qt/source/${PN}-qassistantclient-library-compat-src-4.6.3.tar.gz )"
-DEPEND="~x11-libs/qt-gui-${PV}[aqua=,c++0x=,qpa=,debug=,glib=,qt3support=,trace?]
- ~x11-libs/qt-sql-${PV}[aqua=,c++0x=,qpa=,debug=,qt3support=,sqlite]
- webkit? ( ~x11-libs/qt-webkit-${PV}[aqua=,c++0x=,qpa=,debug=] )"
+DEPEND="
+ ~x11-libs/qt-gui-${PV}[aqua=,c++0x=,debug=,glib=,qpa=,qt3support=,trace?]
+ ~x11-libs/qt-sql-${PV}[aqua=,c++0x=,debug=,qpa=,qt3support=,sqlite]
+ webkit? ( ~x11-libs/qt-webkit-${PV}[aqua=,c++0x=,debug=,qpa=] )
+"
RDEPEND="${DEPEND}"
pkg_setup() {
# Pixeltool isn't really assistant related, but it relies on
- # the assistant libraries. doc/qch/
+ # the assistant libraries.
QT4_TARGET_DIRECTORIES="
tools/assistant
tools/pixeltool
tools/qdoc3"
- if [[ ${PV} != 4*9999 ]]; then
- QT4_EXTRACT_DIRECTORIES="
- tools/
- demos/
- examples/
- src/
- include/
- doc/"
- fi
+ QT4_EXTRACT_DIRECTORIES="
+ tools
+ demos
+ examples
+ src
+ include
+ doc"
+
+ use trace && QT4_TARGET_DIRECTORIES+=" tools/qttracereplay"
- use trace && QT4_TARGET_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
- tools/qttracereplay"
QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
${QT4_EXTRACT_DIRECTORIES}"
- qt4-build${QT_ECLASS}_pkg_setup
+ qt4-build_pkg_setup
}
src_unpack() {
- qt4-build${QT_ECLASS}_src_unpack
+ qt4-build_src_unpack
+
# compat version
# http://labs.qt.nokia.com/2010/06/22/qt-assistant-compat-version-available-as-extra-source-package/
if use compat; then
- unpack "${PN}"-qassistantclient-library-compat-src-4.6.3.tar.gz
- mv "${WORKDIR}"/"${PN}"-qassistantclient-library-compat-version-4.6.3 \
+ unpack ${PN}-qassistantclient-library-compat-src-4.6.3.tar.gz
+ mv "${WORKDIR}"/${PN}-qassistantclient-library-compat-version-4.6.3 \
"${S}"/tools/assistant/compat ||
die "moving compat to the right place failed"
- tar xzf "${FILESDIR}"/"${PN}"-4.7-include.tar.gz -C "${S}"/include/ ||
+ tar xzf "${FILESDIR}"/${PN}-4.7-include.tar.gz -C "${S}"/include/ ||
die "unpacking the include files failed"
fi
}
src_prepare() {
- qt4-build${QT_ECLASS}_src_prepare
- use compat && epatch "${FILESDIR}"/"${PN}"-4.7-fix-compat.patch
+ qt4-build_src_prepare
+
+ use compat && epatch "${FILESDIR}"/${PN}-4.7-fix-compat.patch
# bug 401173
- ! use webkit && epatch "${FILESDIR}"/disable-webkit.patch
+ use webkit || epatch "${FILESDIR}"/disable-webkit.patch
# bug 348034
sed -i -e '/^sub-qdoc3\.depends/d' doc/doc.pri || die
}
src_configure() {
- myconf="${myconf} -no-xkb -no-fontconfig -no-xrandr
+ myconf+="
+ -no-xkb -no-fontconfig -no-xrandr
-no-xfixes -no-xcursor -no-xinerama -no-xshape -no-sm -no-opengl
-no-nas-sound -no-dbus -iconv -no-cups -no-nis -no-gif -no-libpng
-no-libmng -no-libjpeg -no-openssl -system-zlib -no-phonon
-no-xmlpatterns -no-freetype -no-libtiff -no-accessibility
- -no-fontconfig -no-multimedia
- -no-svg $(qt_use qt3support) $(qt_use webkit)"
- ! use glib && myconf="${myconf} -no-glib"
+ -no-fontconfig -no-multimedia -no-svg
+ $(qt_use qt3support) $(qt_use webkit)"
+ use glib || myconf+=" -no-glib"
- qt4-build${QT_ECLASS}_src_configure
+ qt4-build_src_configure
}
src_compile() {
@@ -91,51 +93,34 @@ src_compile() {
export LD_LIBRARY_PATH="${S}/lib:${QTLIBDIR}"
export DYLD_LIBRARY_PATH="${S}/lib:${S}/lib/QtHelp.framework"
- qt4-build${QT_ECLASS}_src_compile
+ qt4-build_src_compile
# ugly hack to build docs
- cd "${S}"
qmake "LIBS+=-L${QTLIBDIR}" "CONFIG+=nostrip" projects.pro || die
- # live ebuild cannot build qch_docs. It will build them through emake docs
- if [[ ${PV} != 4*9999 ]]; then
- emake qch_docs || die "emake qch_docs failed "
- fi
+
if use doc; then
- emake docs || die "emake docs failed"
+ emake docs
+ else
+ emake qch_docs
fi
- qmake "LIBS+=-L${QTLIBDIR}" "CONFIG+=nostrip" projects.pro || die
}
src_install() {
- qt4-build${QT_ECLASS}_src_install
- cd "${S}"
- #see src_compile note
- if [[ ${PV} != 4*9999 ]]; then
- emake INSTALL_ROOT="${D}" install_qchdocs \
- || die "failed to install qch docs"
- fi
+ qt4-build_src_install
+
+ emake INSTALL_ROOT="${D}" install_qchdocs
+ # do not compress .qch files
+ docompress -x "${QTDOCDIR}"/qch
+
if use doc; then
- emake INSTALL_ROOT="${D}" install_htmldocs \
- || die "failed to install htmldocs"
- # Now it is time for the live ebuild to install the qch docs
- if [[ ${PV} == 4*9999 ]]; then
- emake INSTALL_ROOT="${D}" install_qchdocs \
- || die "failed to install qch docs"
- fi
+ emake INSTALL_ROOT="${D}" install_htmldocs
fi
- dobin "${S}"/bin/qdoc3 || die "Failed to install qdoc3"
- # install correct assistant icon, bug 241208
- dodir /usr/share/pixmaps/ || die "dodir failed"
- insinto /usr/share/pixmaps/
- doins tools/assistant/tools/assistant/images/assistant.png ||
- die "doins failed"
- # Note: absolute image path required here!
- make_desktop_entry assistant Assistant \
- "${EPREFIX}"/usr/share/pixmaps/assistant.png 'Qt;Development;GUIDesigner' \
- || die "make_desktop_entry failed"
+
+ doicon tools/assistant/tools/assistant/images/assistant.png
+ make_desktop_entry assistant Assistant assistant 'Qt;Development'
if use compat; then
- insinto /usr/share/qt4/mkspecs/features || die "insinto failed"
- doins tools/assistant/compat/features/assistant.prf || die "doins failed"
+ insinto /usr/share/qt4/mkspecs/features
+ doins tools/assistant/compat/features/assistant.prf
fi
}
diff --git a/x11-libs/qt-core/qt-core-4.8.9999.ebuild b/x11-libs/qt-core/qt-core-4.8.9999.ebuild
index 71e7b4d..3a56e19 100644
--- a/x11-libs/qt-core/qt-core-4.8.9999.ebuild
+++ b/x11-libs/qt-core/qt-core-4.8.9999.ebuild
@@ -2,28 +2,30 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-EAPI="4"
-if [[ ${PV} == 4*9999 ]]; then
- QT_ECLASS="-edge"
-fi
-inherit qt4-build${QT_ECLASS}
+EAPI=4
+
+inherit qt4-build
DESCRIPTION="The Qt toolkit is a comprehensive C++ application development framework"
SLOT="4"
-if [[ ${PV} != 4*9999 ]]; then
- KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 -sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-else
+if [[ ${QT4_BUILD_TYPE} == live ]]; then
KEYWORDS=""
+else
+ KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
fi
IUSE="+glib iconv optimized-qmake qt3support ssl"
-DEPEND="sys-libs/zlib
+DEPEND="
+ sys-libs/zlib
glib? ( dev-libs/glib )
ssl? ( dev-libs/openssl )
+ !<x11-libs/cairo-1.10.2-r2
!<x11-libs/qt-4.4.0:4
- !<x11-libs/cairo-1.10.2-r2"
+"
RDEPEND="${DEPEND}"
-PDEPEND="qt3support? ( ~x11-libs/qt-gui-${PV}[aqua=,c++0x=,qpa=,debug=,glib=,qt3support] )"
+PDEPEND="
+ qt3support? ( ~x11-libs/qt-gui-${PV}[aqua=,c++0x=,debug=,glib=,qpa=,qt3support] )
+"
pkg_setup() {
QT4_TARGET_DIRECTORIES="
@@ -66,16 +68,16 @@ pkg_setup() {
tools/linguist/shared
translations"
fi
- qt4-build${QT_ECLASS}_pkg_setup
+ qt4-build_pkg_setup
}
src_prepare() {
# Don't pre-strip, bug 235026
- for i in kr jp cn tw ; do
+ for i in kr jp cn tw; do
echo "CONFIG+=nostrip" >> "${S}"/src/plugins/codecs/${i}/${i}.pro
done
- qt4-build${QT_ECLASS}_src_prepare
+ qt4-build_src_prepare
# bug 172219
sed -i -e "s:CXXFLAGS.*=:CXXFLAGS=${CXXFLAGS} :" \
@@ -98,29 +100,30 @@ src_configure() {
$(qt_use ssl openssl)
$(qt_use qt3support)"
- qt4-build${QT_ECLASS}_src_configure
+ qt4-build_src_configure
}
src_install() {
- dobin "${S}"/bin/{qmake,moc,rcc,uic,lconvert,lrelease,lupdate} || die "dobin failed"
+ dobin bin/{qmake,moc,rcc,uic,lconvert,lrelease,lupdate}
install_directories src/{corelib,xml,network,plugins/codecs}
- emake INSTALL_ROOT="${D}" install_mkspecs || die "emake install_mkspecs failed"
+ emake INSTALL_ROOT="${D}" install_mkspecs
- #install private headers
+ # install private headers
insinto "${QTHEADERDIR#${EPREFIX}}"/QtCore/private
- find "${S}"/src/corelib -type f -name "*_p.h" -exec doins {} \;
+ find "${S}"/src/corelib -type f -name "*_p.h" -exec doins {} +
# use freshly built libraries
local DYLD_FPATH=
[[ -d "${S}"/lib/QtCore.framework ]] \
- && DYLD_FPATH=$(for x in "${S}/lib/"*.framework; do echo -n ":$x"; done)
+ && DYLD_FPATH=$(for x in "${S}"/lib/*.framework; do echo -n ":$x"; done)
DYLD_LIBRARY_PATH="${S}/lib${DYLD_FPATH}" \
- LD_LIBRARY_PATH="${S}/lib" "${S}"/bin/lrelease translations/*.ts \
+ LD_LIBRARY_PATH="${S}/lib" \
+ "${S}"/bin/lrelease translations/*.ts \
|| die "generating translations failed"
insinto "${QTTRANSDIR#${EPREFIX}}"
- doins translations/*.qm || die "doins translations failed"
+ doins translations/*.qm
setqtenv
fix_library_files
@@ -131,23 +134,22 @@ src_install() {
libdirs+=":${EPREFIX}/usr/${libdir}/qt4"
done
- cat <<-EOF > "${T}/44qt4"
+ cat <<-EOF > "${T}"/44qt4
LDPATH="${libdirs:1}"
EOF
- doenvd "${T}/44qt4"
+ doenvd "${T}"/44qt4
- dodir "${QTDATADIR#${EPREFIX}}"/mkspecs/gentoo || die "dodir failed"
+ dodir "${QTDATADIR#${EPREFIX}}"/mkspecs/gentoo
mv "${D}/${QTDATADIR}"/mkspecs/qconfig.pri "${D}${QTDATADIR}"/mkspecs/gentoo \
- || die "Failed to move qconfig.pri"
+ || die "failed to move qconfig.pri"
# Framework hacking
- if use aqua && [[ ${CHOST#*-darwin} -ge 9 ]] ; then
- #TODO do this better
+ if use aqua && [[ ${CHOST#*-darwin} -ge 9 ]]; then
+ # TODO: do this better
sed -i -e '2a#include <QtCore/Gentoo/gentoo-qconfig.h>\n' \
"${D}${QTLIBDIR}"/QtCore.framework/Headers/qconfig.h \
|| die "sed for qconfig.h failed."
- dosym "${QTHEADERDIR#${EPREFIX}}"/Gentoo "${QTLIBDIR#${EPREFIX}}"/QtCore.framework/Headers/Gentoo ||
- die "dosym failed"
+ dosym "${QTHEADERDIR#${EPREFIX}}"/Gentoo "${QTLIBDIR#${EPREFIX}}"/QtCore.framework/Headers/Gentoo
else
sed -i -e '2a#include <Gentoo/gentoo-qconfig.h>\n' \
"${D}${QTHEADERDIR}"/QtCore/qconfig.h \
@@ -155,11 +157,8 @@ src_install() {
|| die "sed for qconfig.h failed"
fi
- if use glib; then
- QCONFIG_DEFINE="$(use glib && echo QT_GLIB)
- $(use ssl && echo QT_OPENSSL)"
- install_qconfigs
- fi
+ QCONFIG_DEFINE="QT_ZLIB"
+ install_qconfigs
# remove .la files
find "${D}${QTLIBDIR}" -name "*.la" -print0 | xargs -0 rm
diff --git a/x11-libs/qt-dbus/files/qt-4.6-master-nolibx11.patch b/x11-libs/qt-dbus/files/qt-4.6-master-nolibx11.patch
deleted file mode 100644
index 14e5fce..0000000
--- a/x11-libs/qt-dbus/files/qt-4.6-master-nolibx11.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Index: qt-everywhere-opensource-src-4.6.9999/configure
-===================================================================
---- qt-everywhere-opensource-src-4.6.9999.orig/configure
-+++ qt-everywhere-opensource-src-4.6.9999/configure
-@@ -5069,15 +5069,6 @@ if [ "$PLATFORM_X11" = "yes" ]; then
- X11TESTS_FLAGS="$X11TESTS_FLAGS -fpermissive"
- fi
-
-- # Check we actually have X11 :-)
-- "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/xlib "XLib" $L_FLAGS $I_FLAGS $l_FLAGS $X11TESTS_FLAGS
-- if [ $? != "0" ]; then
-- echo "Basic XLib functionality test failed!"
-- echo " You might need to modify the include and library search paths by editing"
-- echo " QMAKE_INCDIR_X11 and QMAKE_LIBDIR_X11 in ${XQMAKESPEC}."
-- exit 1
-- fi
--
- # auto-detect OpenGL support (es1 = OpenGL ES 1.x Common, es1cl = ES 1.x common lite, es2 = OpenGL ES 2.x)
- if [ "$CFG_OPENGL" = "auto" ] || [ "$CFG_OPENGL" = "yes" ]; then
- if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/opengl "OpenGL" $L_FLAGS $I_FLAGS $l_FLAGS $X11TESTS_FLAGS; then
diff --git a/x11-libs/qt-dbus/files/qt-dbus-4.7-qdbusintegrator-no-const.patch b/x11-libs/qt-dbus/files/qt-dbus-4.7-qdbusintegrator-no-const.patch
new file mode 100644
index 0000000..086eb47
--- /dev/null
+++ b/x11-libs/qt-dbus/files/qt-dbus-4.7-qdbusintegrator-no-const.patch
@@ -0,0 +1,11 @@
+--- src/dbus/qdbusintegrator.cpp.orig 2011-03-12 02:11:32.313467991 +0100
++++ src/dbus/qdbusintegrator.cpp 2011-03-12 02:11:03.795809176 +0100
+@@ -71,7 +71,7 @@
+ static bool isDebugging;
+ #define qDBusDebug if (!::isDebugging); else qDebug
+
+-Q_GLOBAL_STATIC_WITH_ARGS(const QString, orgFreedesktopDBusString, (QLatin1String(DBUS_SERVICE_DBUS)))
++Q_GLOBAL_STATIC_WITH_ARGS(QString, orgFreedesktopDBusString, (QLatin1String(DBUS_SERVICE_DBUS)))
+
+ static inline QString dbusServiceString()
+ { return *orgFreedesktopDBusString(); }
diff --git a/x11-libs/qt-dbus/qt-dbus-4.8.9999.ebuild b/x11-libs/qt-dbus/qt-dbus-4.8.9999.ebuild
index 3975740..cd9c7d8 100644
--- a/x11-libs/qt-dbus/qt-dbus-4.8.9999.ebuild
+++ b/x11-libs/qt-dbus/qt-dbus-4.8.9999.ebuild
@@ -2,33 +2,35 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-EAPI="4"
-if [[ ${PV} == 4*9999 ]]; then
- QT_ECLASS="-edge"
-fi
-inherit qt4-build${QT_ECLASS}
+EAPI=4
+
+inherit qt4-build
DESCRIPTION="The DBus module for the Qt toolkit"
SLOT="4"
-if [[ ${PV} != 4*9999 ]]; then
- KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 -sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-else
+if [[ ${QT4_BUILD_TYPE} == live ]]; then
KEYWORDS=""
+else
+ KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
fi
IUSE=""
-DEPEND="~x11-libs/qt-core-${PV}[aqua=,c++0x=,qpa=,debug=]
- >=sys-apps/dbus-1.0.2"
+DEPEND="
+ >=sys-apps/dbus-1.2
+ ~x11-libs/qt-core-${PV}[aqua=,c++0x=,debug=,qpa=]
+"
RDEPEND="${DEPEND}"
+PATCHES=(
+ "${FILESDIR}/${PN}-4.7-qdbusintegrator-no-const.patch"
+)
+
pkg_setup() {
QT4_TARGET_DIRECTORIES="
src/dbus
tools/qdbus/qdbus
tools/qdbus/qdbusxml2cpp
tools/qdbus/qdbuscpp2xml"
- QCONFIG_ADD="dbus dbus-linked"
- QCONFIG_DEFINE="QT_DBUS"
if [[ ${PV} != 4*9999 ]]; then
QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
@@ -39,10 +41,14 @@ pkg_setup() {
src/xml"
fi
- qt4-build${QT_ECLASS}_pkg_setup
+ QCONFIG_ADD="dbus dbus-linked"
+ QCONFIG_DEFINE="QT_DBUS"
+
+ qt4-build_pkg_setup
}
src_configure() {
- myconf="${myconf} -dbus-linked"
- qt4-build${QT_ECLASS}_src_configure
+ myconf+=" -dbus-linked"
+
+ qt4-build_src_configure
}
diff --git a/x11-libs/qt-declarative/qt-declarative-4.8.9999.ebuild b/x11-libs/qt-declarative/qt-declarative-4.8.9999.ebuild
index 186934a..10a1211 100644
--- a/x11-libs/qt-declarative/qt-declarative-4.8.9999.ebuild
+++ b/x11-libs/qt-declarative/qt-declarative-4.8.9999.ebuild
@@ -1,35 +1,34 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-EAPI="4"
-inherit qt4-build-edge
+EAPI=4
+
+inherit qt4-build
DESCRIPTION="The Declarative module for the Qt toolkit"
SLOT="4"
-if [[ ${PV} != 4*9999 ]]; then
- KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-else
+if [[ ${QT4_BUILD_TYPE} == live ]]; then
KEYWORDS=""
+else
+ KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
fi
-
IUSE="+accessibility qt3support webkit"
-DEPEND="~x11-libs/qt-core-${PV}[aqua=,c++0x=,qpa=,debug=,qt3support=]
- ~x11-libs/qt-gui-${PV}[accessibility=,aqua=,c++0x=,qpa=,debug=,qt3support=]
- ~x11-libs/qt-opengl-${PV}[aqua=,c++0x=,qpa=,debug=,qt3support=]
- ~x11-libs/qt-script-${PV}[aqua=,c++0x=,qpa=,debug=]
- ~x11-libs/qt-sql-${PV}[aqua=,c++0x=,qpa=,debug=,qt3support=]
- ~x11-libs/qt-svg-${PV}[accessibility=,aqua=,c++0x=,qpa=,debug=]
- ~x11-libs/qt-xmlpatterns-${PV}[aqua=,c++0x=,qpa=,debug=]
- qt3support? ( ~x11-libs/qt-qt3support-${PV}[accessibility=,aqua=,c++0x=,qpa=,debug=] )
- webkit? ( ~x11-libs/qt-webkit-${PV}[aqua=,c++0x=,qpa=,debug=] )
- "
+DEPEND="
+ ~x11-libs/qt-core-${PV}[aqua=,c++0x=,debug=,qpa=,qt3support=]
+ ~x11-libs/qt-gui-${PV}[accessibility=,aqua=,c++0x=,debug=,qpa=,qt3support=]
+ ~x11-libs/qt-opengl-${PV}[aqua=,c++0x=,debug=,qpa=,qt3support=]
+ ~x11-libs/qt-script-${PV}[aqua=,c++0x=,debug=,qpa=]
+ ~x11-libs/qt-sql-${PV}[aqua=,c++0x=,debug=,qpa=,qt3support=]
+ ~x11-libs/qt-svg-${PV}[accessibility=,aqua=,c++0x=,debug=,qpa=]
+ ~x11-libs/qt-xmlpatterns-${PV}[aqua=,c++0x=,debug=,qpa=]
+ qt3support? ( ~x11-libs/qt-qt3support-${PV}[accessibility=,aqua=,c++0x=,debug=,qpa=] )
+ webkit? ( ~x11-libs/qt-webkit-${PV}[aqua=,c++0x=,debug=,qpa=] )
+"
RDEPEND="${DEPEND}"
pkg_setup() {
- QCONFIG_ADD="declarative"
-
QT4_TARGET_DIRECTORIES="
src/declarative
src/imports
@@ -38,33 +37,40 @@ pkg_setup() {
tools/qmlplugindump"
if use webkit; then
- QT4_TARGET_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
- src/3rdparty/webkit/Source/WebKit/qt/declarative"
+ QT4_TARGET_DIRECTORIES+=" src/3rdparty/webkit/Source/WebKit/qt/declarative"
fi
QT4_EXTRACT_DIRECTORIES="
- include/
- src/
- tools/
- translations/"
+ include
+ src
+ tools
+ translations"
- qt4-build-edge_pkg_setup
+ QCONFIG_ADD="declarative"
+ QCONFIG_DEFINE="QT_DECLARATIVE"
+
+ qt4-build_pkg_setup
}
src_configure() {
- myconf="${myconf} -declarative -no-gtkstyle
- $(qt_use accessibility) $(qt_use qt3support) $(qt_use webkit)"
- qt4-build-edge_src_configure
+ myconf+="
+ -declarative -no-gtkstyle
+ $(qt_use accessibility)
+ $(qt_use qt3support)
+ $(qt_use webkit)"
+ qt4-build_src_configure
}
src_install() {
- qt4-build-edge_src_install
- if use aqua && [[ ${CHOST##*-darwin} -ge 9 ]] ; then
+ qt4-build_src_install
+
+ # install private headers
+ if use aqua && [[ ${CHOST##*-darwin} -ge 9 ]]; then
insinto "${QTLIBDIR#${EPREFIX}}"/QtDeclarative.framework/Headers/private
# ran for the 2nd time, need it for the updated headers
fix_includes
else
insinto "${QTHEADERDIR#${EPREFIX}}"/QtDeclarative/private
fi
- find "${S}"/src/declarative/ -type f -name "*_p.h" -exec doins {} \;
+ find "${S}"/src/declarative/ -type f -name "*_p.h" -exec doins {} +
}
diff --git a/x11-libs/qt-demo/qt-demo-4.8.9999.ebuild b/x11-libs/qt-demo/qt-demo-4.8.9999.ebuild
index 5205aaa..e7188d5 100644
--- a/x11-libs/qt-demo/qt-demo-4.8.9999.ebuild
+++ b/x11-libs/qt-demo/qt-demo-4.8.9999.ebuild
@@ -1,60 +1,67 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-demo/qt-demo-4.8.1.ebuild,v 1.1 2012/03/29 22:11:13 pesa Exp $
-EAPI="4"
-inherit qt4-build-edge
+EAPI=4
+
+inherit qt4-build
DESCRIPTION="Demonstration module of the Qt toolkit"
SLOT="4"
-if [[ ${PV} != 4*9999 ]]; then
- KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-else
+if [[ ${QT4_BUILD_TYPE} == live ]]; then
KEYWORDS=""
+else
+ KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
fi
IUSE="kde qt3support"
-DEPEND="~x11-libs/qt-assistant-${PV}:${SLOT}[aqua=,c++0x=,qpa=,debug=]
+DEPEND="
+ ~x11-libs/qt-assistant-${PV}:${SLOT}[aqua=,c++0x=,qpa=,debug=]
~x11-libs/qt-core-${PV}:${SLOT}[aqua=,c++0x=,qpa=,debug=,qt3support=]
~x11-libs/qt-dbus-${PV}:${SLOT}[aqua=,c++0x=,qpa=,debug=]
~x11-libs/qt-declarative-${PV}:${SLOT}[aqua=,c++0x=,qpa=,debug=,webkit]
~x11-libs/qt-gui-${PV}:${SLOT}[aqua=,c++0x=,qpa=,debug=,qt3support=]
~x11-libs/qt-multimedia-${PV}:${SLOT}[aqua=,c++0x=,qpa=,debug=]
~x11-libs/qt-opengl-${PV}:${SLOT}[aqua=,c++0x=,qpa=,debug=,qt3support=]
- !kde? ( || ( ~x11-libs/qt-phonon-${PV}:${SLOT}[aqua=,c++0x=,qpa=,debug=]
- media-libs/phonon[aqua=,debug=] ) )
- kde? ( media-libs/phonon[aqua=,debug=] )
+ kde? ( media-libs/phonon[aqua=] )
+ !kde? ( || (
+ ~x11-libs/qt-phonon-${PV}:${SLOT}[aqua=,c++0x=,qpa=,debug=]
+ media-libs/phonon[aqua=]
+ ) )
~x11-libs/qt-script-${PV}:${SLOT}[aqua=,c++0x=,qpa=,debug=]
~x11-libs/qt-sql-${PV}:${SLOT}[aqua=,c++0x=,qpa=,debug=,qt3support=]
~x11-libs/qt-svg-${PV}:${SLOT}[aqua=,c++0x=,qpa=,debug=]
~x11-libs/qt-test-${PV}:${SLOT}[aqua=,c++0x=,qpa=,debug=]
~x11-libs/qt-webkit-${PV}:${SLOT}[aqua=,c++0x=,qpa=,debug=]
- ~x11-libs/qt-xmlpatterns-${PV}:${SLOT}[aqua=,c++0x=,qpa=,debug=]"
-
+ ~x11-libs/qt-xmlpatterns-${PV}:${SLOT}[aqua=,c++0x=,qpa=,debug=]
+"
RDEPEND="${DEPEND}"
-PATCHES=( "${FILESDIR}/${PN}-4.6-plugandpaint.patch" )
+PATCHES=(
+ "${FILESDIR}/${PN}-4.6-plugandpaint.patch"
+)
pkg_setup() {
- QT4_TARGET_DIRECTORIES="demos
+ QT4_TARGET_DIRECTORIES="
+ demos
examples"
QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
doc/src/images
- src/
- include/
- tools/"
+ src
+ include
+ tools"
- qt4-build-edge_pkg_setup
+ qt4-build_pkg_setup
}
src_configure() {
- myconf="${myconf} $(qt_use qt3support) -no-openvg"
- qt4-build-edge_src_configure
+ myconf="${myconf} $(qt_use qt3support)"
+ qt4-build_src_configure
}
src_install() {
insinto "${QTDOCDIR#${EPREFIX}}"/src
- doins -r "${S}"/doc/src/images || die "Installing images failed."
+ doins -r "${S}"/doc/src/images
- qt4-build-edge_src_install
+ qt4-build_src_install
}
diff --git a/x11-libs/qt-gui/files/qt-gui-4.7.3-cups.patch b/x11-libs/qt-gui/files/qt-gui-4.7.3-cups.patch
new file mode 100644
index 0000000..e0305e1
--- /dev/null
+++ b/x11-libs/qt-gui/files/qt-gui-4.7.3-cups.patch
@@ -0,0 +1,84 @@
+diff -ur qt-everywhere-opensource-src-4.6.2/src/gui/dialogs/qprintdialog_unix.cpp qt-everywhere-opensource-src-4.6.2-cups/src/gui/dialogs/qprintdialog_unix.cpp
+--- qt-everywhere-opensource-src-4.6.2/src/gui/dialogs/qprintdialog_unix.cpp 2010-02-11 16:55:22.000000000 +0100
++++ qt-everywhere-opensource-src-4.6.2-cups/src/gui/dialogs/qprintdialog_unix.cpp 2010-02-28 04:34:16.000000000 +0100
+@@ -569,6 +569,32 @@
+ void QPrintDialogPrivate::selectPrinter(QCUPSSupport *cups)
+ {
+ options.duplex->setEnabled(cups && cups->ppdOption("Duplex"));
++
++ if (cups) {
++ const ppd_option_t* duplex = cups->ppdOption("Duplex");
++ if (duplex) {
++ // copy default ppd duplex to qt dialog
++ if (qstrcmp(duplex->defchoice, "DuplexTumble") == 0)
++ options.duplexShort->setChecked(true);
++ else if (qstrcmp(duplex->defchoice, "DuplexNoTumble") == 0)
++ options.duplexLong->setChecked(true);
++ else
++ options.noDuplex->setChecked(true);
++ }
++
++ if (cups->currentPPD()) {
++ // set default color
++ if (cups->currentPPD()->color_device)
++ options.color->setChecked(true);
++ else
++ options.grayscale->setChecked(true);
++ }
++
++ // set collation
++ const ppd_option_t *collate = cups->ppdOption("Collate");
++ if (collate)
++ options.collate->setChecked(qstrcmp(collate->defchoice, "True")==0);
++ }
+ }
+ #endif
+
+diff -ur qt-everywhere-opensource-src-4.6.2/src/gui/painting/qprinter.cpp qt-everywhere-opensource-src-4.6.2-cups/src/gui/painting/qprinter.cpp
+--- qt-everywhere-opensource-src-4.6.2/src/gui/painting/qprinter.cpp 2010-02-11 16:55:22.000000000 +0100
++++ qt-everywhere-opensource-src-4.6.2-cups/src/gui/painting/qprinter.cpp 2010-02-28 04:55:15.000000000 +0100
+@@ -627,6 +627,44 @@
+ && d_ptr->paintEngine->type() != QPaintEngine::MacPrinter) {
+ setOutputFormat(QPrinter::PdfFormat);
+ }
++
++#if !defined(QT_NO_CUPS) && !defined(QT_NO_LIBRARY)
++ // fill in defaults from ppd file
++ QCUPSSupport cups;
++
++ int printernum = -1;
++ for (int i = 0; i < cups.availablePrintersCount(); i++) {
++ if (printerName().toLocal8Bit() == cups.availablePrinters()[i].name)
++ printernum = i;
++ }
++ if (printernum >= 0) {
++ cups.setCurrentPrinter(printernum);
++
++ const ppd_option_t* duplex = cups.ppdOption("Duplex");
++ if (duplex) {
++ // copy default ppd duplex to qt dialog
++ if (qstrcmp(duplex->defchoice, "DuplexTumble") == 0)
++ setDuplex(DuplexShortSide);
++ else if (qstrcmp(duplex->defchoice, "DuplexNoTumble") == 0)
++ setDuplex(DuplexLongSide);
++ else
++ setDuplex(DuplexNone);
++ }
++
++ if (cups.currentPPD()) {
++ // set default color
++ if (cups.currentPPD()->color_device)
++ setColorMode(Color);
++ else
++ setColorMode(GrayScale);
++ }
++
++ // set collation
++ const ppd_option_t *collate = cups.ppdOption("Collate");
++ if (collate)
++ setCollateCopies(qstrcmp(collate->defchoice, "True")==0);
++ }
++#endif
+ }
+
+ /*!
diff --git a/x11-libs/qt-gui/qt-gui-4.8.9999.ebuild b/x11-libs/qt-gui/qt-gui-4.8.9999.ebuild
index fb41abd..309bd3b 100644
--- a/x11-libs/qt-gui/qt-gui-4.8.9999.ebuild
+++ b/x11-libs/qt-gui/qt-gui-4.8.9999.ebuild
@@ -2,21 +2,22 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-EAPI="4"
-if [[ ${PV} == 4*9999 ]]; then
- QT_ECLASS="-edge"
-fi
-inherit eutils confutils qt4-build${QT_ECLASS}
+EAPI=4
+
+inherit qt4-build
DESCRIPTION="The GUI module for the Qt toolkit"
SLOT="4"
-if [[ ${PV} != 4*9999 ]]; then
- KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 -sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-else
+if [[ ${QT4_BUILD_TYPE} == live ]]; then
KEYWORDS=""
+else
+ KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
fi
+IUSE="+accessibility cups dbus egl gif +glib gtkstyle mng nas nis qt3support tiff trace xinerama +xv"
-IUSE="+accessibility cups dbus egl gif +glib gtkstyle mng nas nis qt3support tiff trace xinerama"
+REQUIRED_USE="
+ gtkstyle? ( glib )
+"
RDEPEND="
app-admin/eselect-qtgraphicssystem
@@ -28,13 +29,16 @@ RDEPEND="
~x11-libs/qt-core-${PV}[aqua=,c++0x=,qpa=,debug=,glib=,qt3support=]
~x11-libs/qt-script-${PV}[aqua=,c++0x=,qpa=,debug=]
!aqua? (
+ x11-libs/libICE
+ x11-libs/libSM
x11-libs/libX11
- x11-libs/libXext
- x11-libs/libXrandr
x11-libs/libXcursor
- x11-libs/libXfont
- x11-libs/libSM
+ x11-libs/libXext
x11-libs/libXi
+ x11-libs/libXrandr
+ x11-libs/libXrender
+ xinerama? ( x11-libs/libXinerama )
+ xv? ( x11-libs/libXv )
)
cups? ( net-print/cups )
dbus? ( ~x11-libs/qt-dbus-${PV}[aqua=,c++0x=,qpa=,debug=] )
@@ -43,16 +47,20 @@ RDEPEND="
mng? ( >=media-libs/libmng-1.0.9 )
nas? ( >=media-libs/nas-1.5 )
tiff? ( media-libs/tiff:0 )
- xinerama? ( x11-libs/libXinerama )"
+"
DEPEND="${RDEPEND}
!aqua? (
- x11-proto/xextproto
x11-proto/inputproto
+ x11-proto/xextproto
+ xinerama? ( x11-proto/xineramaproto )
+ xv? ( x11-proto/videoproto )
)
- xinerama? ( x11-proto/xineramaproto )"
-RDEPEND="${RDEPEND}
- !~x11-themes/qgtkstyle-4.7.2"
-PDEPEND="qt3support? ( ~x11-libs/qt-qt3support-${PV}[aqua=,c++0x=,qpa=,debug=] )"
+"
+PDEPEND="qt3support? ( ~x11-libs/qt-qt3support-${PV}[aqua=,c++0x=,debug=,qpa=] )"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-4.7.3-cups.patch"
+)
pkg_setup() {
# this belongs to pkg_pretend, we have to upgrade to EAPI 4 :)
@@ -73,11 +81,9 @@ pkg_setup() {
eerror "re-enable the disabled use flag and/or reinstall cairo."
ewarn
echo
- die "can't build qt-gui with gtkstyle USE if cairo has qt4 USE enabled"
+ die "can't build ${PN} with USE=gtkstyle if cairo has 'qt4' USE flag enabled"
fi
- confutils_use_depend_all gtkstyle glib
-
QT4_TARGET_DIRECTORIES="
src/gui
src/scripttools
@@ -88,32 +94,33 @@ pkg_setup() {
src/plugins/imageformats/jpeg
src/plugins/inputmethods"
- if [[ ${PV} != 4*9999 ]]; then
- QT4_EXTRACT_DIRECTORIES="
- include
- src
- tools"
- fi
+ QT4_EXTRACT_DIRECTORIES="
+ include
+ src
+ tools"
+ use accessibility && QT4_TARGET_DIRECTORIES="${QT4_TARGET_DIRECTORIES} src/plugins/accessible/widgets"
use dbus && QT4_TARGET_DIRECTORIES="${QT4_TARGET_DIRECTORIES} tools/qdbus/qdbusviewer"
use mng && QT4_TARGET_DIRECTORIES="${QT4_TARGET_DIRECTORIES} src/plugins/imageformats/mng"
use tiff && QT4_TARGET_DIRECTORIES="${QT4_TARGET_DIRECTORIES} src/plugins/imageformats/tiff"
- use accessibility && QT4_TARGET_DIRECTORIES="${QT4_TARGET_DIRECTORIES} src/plugins/accessible/widgets"
use trace && QT4_TARGET_DIRECTORIES="${QT4_TARGET_DIRECTORIES} src/plugins/graphicssystems/trace"
- QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES} ${QT4_EXTRACT_DIRECTORIES}"
-
# mac version does not contain qtconfig?
[[ ${CHOST} == *-darwin* ]] || QT4_TARGET_DIRECTORIES+=" tools/qtconfig"
- qt4-build${QT_ECLASS}_pkg_setup
+ QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES} ${QT4_EXTRACT_DIRECTORIES}"
+
+ qt4-build_pkg_setup
}
src_prepare() {
- qt4-build${QT_ECLASS}_src_prepare
+ qt4-build_src_prepare
+
+ # Add -xvideo to the list of accepted configure options
+ sed -i -e 's:|-xinerama|:&-xvideo|:' configure
# Don't build plugins this go around, because they depend on qt3support lib
- sed -i -e "s:CONFIG(shared:# &:g" "${S}"/tools/designer/src/src.pro || die
+ sed -i -e 's:CONFIG(shared:# &:g' tools/designer/src/src.pro
}
src_configure() {
@@ -122,8 +129,10 @@ src_configure() {
myconf="$(qt_use accessibility)
$(qt_use cups)
+ $(use gif || echo -no-gif)
$(qt_use glib)
$(qt_use mng libmng system)
+ $(qt_use nas nas-sound system)
$(qt_use nis)
$(qt_use tiff libtiff system)
$(qt_use dbus qdbus)
@@ -131,46 +140,56 @@ src_configure() {
$(qt_use egl)
$(qt_use qt3support)
$(qt_use gtkstyle)
- $(qt_use xinerama)"
+ $(qt_use xinerama)
+ $(qt_use xv xvideo)"
- use gif || myconf="${myconf} -no-gif"
- use nas && myconf="${myconf} -system-nas-sound"
+ myconf+="
+ -system-libpng -system-libjpeg
+ -no-sql-mysql -no-sql-psql -no-sql-ibase -no-sql-sqlite -no-sql-sqlite2 -no-sql-odbc
+ -sm -xshape -xsync -xcursor -xfixes -xrandr -xrender -mitshm -xinput -xkb
+ -fontconfig -no-svg -no-webkit -no-phonon -no-opengl"
- [[ x86_64-apple-darwin* ]] && myconf="${myconf} -no-ssse3" #367045
+ [[ ${CHOST} == *86*-apple-darwin* ]] && myconf+=" -no-ssse3" #367045
- myconf="${myconf} -system-libpng -system-libjpeg
- -no-sql-mysql -no-sql-psql -no-sql-ibase -no-sql-sqlite -no-sql-sqlite2
- -no-sql-odbc -xrender -xrandr -xkb -xshape -sm -no-svg -no-webkit
- -no-phonon -no-opengl"
-
- qt4-build${QT_ECLASS}_src_configure
+ qt4-build_src_configure
if use gtkstyle; then
einfo "patching the Makefile to fix qgtkstyle compilation"
sed "s:-I/usr/include/qt4 ::" -i src/gui/Makefile ||
die "sed failed"
fi
- einfo "patching the Makefile to fix bug #361277"
- sed "s:-I/usr/include/qt4/QtGui ::" -i src/gui/Makefile ||
- die "sed failed"
+ sed -i -e "s:-I/usr/include/qt4/QtGui ::" src/gui/Makefile || die "sed failed"
}
src_install() {
- QCONFIG_ADD="x11sm xshape xcursor xfixes xrandr xrender xkb fontconfig
- $(usev accessibility) $(usev xinerama) $(usev cups) $(usev nas)
- gif png system-png system-jpeg
+ QCONFIG_ADD="
+ mitshm x11sm xcursor xfixes xinput xkb xrandr xrender xshape xsync
+ fontconfig gif png system-png jpeg system-jpeg
+ $(usev accessibility)
+ $(usev cups)
$(use mng && echo system-mng)
- $(use tiff && echo system-tiff)"
- QCONFIG_REMOVE="no-gif no-png"
+ $(usev nas)
+ $(usev nis)
+ $(use tiff && echo system-tiff)
+ $(usev xinerama)
+ $(use xv && echo xvideo)"
+ QCONFIG_REMOVE="no-gif no-jpeg no-png"
QCONFIG_DEFINE="$(use accessibility && echo QT_ACCESSIBILITY)
- $(use cups && echo QT_CUPS) QT_FONTCONFIG QT_IMAGEFORMAT_JPEG
+ $(use cups && echo QT_CUPS)
+ $(use egl && echo QT_EGL)
+ QT_FONTCONFIG
+ $(use gtkstyle && echo QT_STYLE_GTK)
+ QT_IMAGEFORMAT_JPEG QT_IMAGEFORMAT_PNG
$(use mng && echo QT_IMAGEFORMAT_MNG)
$(use nas && echo QT_NAS)
- $(use nis && echo QT_NIS) QT_IMAGEFORMAT_PNG QT_SESSIONMANAGER QT_SHAPE
- $(use tiff && echo QT_IMAGEFORMAT_TIFF) QT_XCURSOR
- $(use xinerama && echo QT_XINERAMA) QT_XFIXES QT_XKB QT_XRANDR QT_XRENDER"
+ $(use nis && echo QT_NIS)
+ $(use tiff && echo QT_IMAGEFORMAT_TIFF)
+ QT_SESSIONMANAGER QT_SHAPE QT_XCURSOR QT_XFIXES
+ $(use xinerama && echo QT_XINERAMA)
+ QT_XINPUT QT_XKB QT_XRANDR QT_XRENDER QT_XSYNC
+ $(use xv && echo QT_XVIDEO)"
- qt4-build${QT_ECLASS}_src_install
+ qt4-build_src_install
# qt-creator
# some qt-creator headers are located
@@ -184,51 +203,39 @@ src_install() {
else
insinto "${QTHEADERDIR#${EPREFIX}}"/QtDesigner/private/
fi
- doins "${S}"/tools/designer/src/lib/shared/* || die
- doins "${S}"/tools/designer/src/lib/sdk/* || die
-
- #touch the available graphics systems
- mkdir -p "${ED}/usr/share/qt4/graphicssystems/" ||
- die "could not create ${ED}/usr/share/qt4/graphicssystems/"
- echo "default" > "${ED}/usr/share/qt4/graphicssystems/raster" ||
- die "could not create ${ED}/usr/share/qt4/graphicssystems/raster"
- touch "${ED}/usr/share/qt4/graphicssystems/native" ||
- die "could not touch ${ED}/usr/share/qt4/graphicssystems/native"
-
- #install private headers
+ doins "${S}"/tools/designer/src/lib/shared/*
+ doins "${S}"/tools/designer/src/lib/sdk/*
+
+ # install private headers
if use aqua && [[ ${CHOST##*-darwin} -ge 9 ]] ; then
insinto "${QTLIBDIR#${EPREFIX}}"/QtGui.framework/Headers/private/
else
insinto "${QTHEADERDIR#${EPREFIX}}"/QtGui/private
fi
- find "${S}"/src/gui -type f -name "*_p.h" -exec doins {} \;
+ find "${S}"/src/gui -type f -name '*_p.h' -exec doins {} +
if use aqua && [[ ${CHOST##*-darwin} -ge 9 ]] ; then
# rerun to get links to headers right
fix_includes
fi
- # install correct designer and linguist icons, bug 241208
- doicon tools/linguist/linguist/images/icons/linguist-128-32.png \
- tools/designer/src/designer/images/designer.png \
- || die "doicon failed"
- # Note: absolute image path required here!
- make_desktop_entry linguist Linguist \
- /usr/share/pixmaps/linguist-128-32.png \
- 'Qt;Development;GUIDesigner' \
- || die "linguist make_desktop_entry failed"
- make_desktop_entry designer Designer \
- /usr/share/pixmaps/designer.png \
- 'Qt;Development;GUIDesigner' \
- || die "designer make_desktop_entry failed"
+ # touch the available graphics systems
+ dodir /usr/share/qt4/graphicssystems
+ echo "default" > "${ED}"/usr/share/qt4/graphicssystems/raster || die
+ touch "${ED}"/usr/share/qt4/graphicssystems/native || die
+
+ doicon tools/designer/src/designer/images/designer.png \
+ tools/linguist/linguist/images/icons/linguist-128-32.png
+ make_desktop_entry designer Designer designer 'Qt;Development;GUIDesigner'
+ make_desktop_entry linguist Linguist linguist-128-32 'Qt;Development;GUIDesigner'
}
pkg_postinst() {
# raster is the default graphicssystems, set it if first install
eselect qtgraphicssystem set raster --use-old
- elog "Starting with qt 4.8.0, you may choose the active Qt Graphics System"
+ elog "Starting with Qt 4.8.0, you may choose the active Qt Graphics System"
elog "by using a new eselect module called qtgraphicssystem."
elog "Run"
elog " eselect qtgraphicssystem"
- elog "for more information"
+ elog "for more information."
}
diff --git a/x11-libs/qt-multimedia/files/qt-multimedia-4.8.0-alsa.patch b/x11-libs/qt-multimedia/files/qt-multimedia-4.8.0-alsa.patch
new file mode 100644
index 0000000..8bd40ed
--- /dev/null
+++ b/x11-libs/qt-multimedia/files/qt-multimedia-4.8.0-alsa.patch
@@ -0,0 +1,25 @@
+--- qt-everywhere-opensource-src-4.8.0.orig/configure 2012-03-13 00:45:02.502205702 +0100
++++ qt-everywhere-opensource-src-4.8.0/configure 2012-03-13 00:47:40.386231881 +0100
+@@ -1049,7 +1049,7 @@
+ VAL=no
+ ;;
+ #Qt style yes options
+- -incremental|-qvfb|-profile|-shared|-static|-sm|-xinerama|-xshape|-xsync|-xinput|-egl|-reduce-exports|-pch|-separate-debug-info|-stl|-freetype|-xcursor|-xfixes|-xrandr|-xrender|-mitshm|-fontconfig|-xkb|-nis|-qdbus|-dbus|-dbus-linked|-glib|-gstreamer|-gtkstyle|-cups|-iconv|-largefile|-h|-help|-v|-verbose|-debug|-release|-fast|-accessibility|-confirm-license|-gnumake|-framework|-qt3support|-debug-and-release|-exceptions|-cocoa|-carbon|-universal|-harfbuzz|-prefix-install|-silent|-armfpa|-optimized-qmake|-dwarf2|-reduce-relocations|-sse|-openssl|-openssl-linked|-ptmalloc|-xmlpatterns|-phonon|-phonon-backend|-multimedia|-audio-backend|-svg|-declarative|-declarative-debug|-javascript-jit|-script|-scripttools|-rpath|-force-pkg-config|-s60|-usedeffiles|-icu)
++ -incremental|-qvfb|-profile|-shared|-static|-sm|-xinerama|-xshape|-xsync|-xinput|-egl|-reduce-exports|-pch|-separate-debug-info|-stl|-freetype|-xcursor|-xfixes|-xrandr|-xrender|-mitshm|-fontconfig|-xkb|-nis|-qdbus|-dbus|-dbus-linked|-glib|-gstreamer|-gtkstyle|-cups|-iconv|-largefile|-h|-help|-v|-verbose|-debug|-release|-fast|-accessibility|-confirm-license|-gnumake|-framework|-qt3support|-debug-and-release|-exceptions|-cocoa|-carbon|-universal|-harfbuzz|-prefix-install|-silent|-armfpa|-optimized-qmake|-dwarf2|-reduce-relocations|-sse|-openssl|-openssl-linked|-ptmalloc|-xmlpatterns|-phonon|-phonon-backend|-multimedia|-audio-backend|-svg|-declarative|-declarative-debug|-javascript-jit|-script|-scripttools|-rpath|-force-pkg-config|-s60|-usedeffiles|-icu|-alsa)
+ VAR=`echo $1 | sed "s,^-\(.*\),\1,"`
+ VAL=yes
+ ;;
+@@ -2399,6 +2399,13 @@
+ else
+ UNKNOWN_OPT=yes
+ fi
++ ;;
++ alsa)
++ if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
++ CFG_ALSA="$VAL"
++ else
++ UNKNOWN_OPT=yes
++ fi
+ ;;
+ *)
+ UNKNOWN_OPT=yes
diff --git a/x11-libs/qt-multimedia/qt-multimedia-4.8.9999.ebuild b/x11-libs/qt-multimedia/qt-multimedia-4.8.9999.ebuild
index 86483d8..a86bd6b 100644
--- a/x11-libs/qt-multimedia/qt-multimedia-4.8.9999.ebuild
+++ b/x11-libs/qt-multimedia/qt-multimedia-4.8.9999.ebuild
@@ -2,56 +2,59 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-EAPI="4"
-inherit qt4-build-edge
+EAPI=4
-DESCRIPTION="The Qt multimedia module"
+inherit qt4-build
+
+DESCRIPTION="The Multimedia module for the Qt toolkit"
SLOT="4"
-if [[ ${PV} != 4*9999 ]]; then
- KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 -sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-else
+if [[ ${QT4_BUILD_TYPE} == live ]]; then
KEYWORDS=""
+else
+ KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
fi
+IUSE="alsa"
-IUSE="iconv"
-
-DEPEND="!aqua? ( media-libs/alsa-lib )
- ~x11-libs/qt-core-${PV}[aqua=,c++0x=,qpa=,debug=]
- ~x11-libs/qt-gui-${PV}[aqua=,c++0x=,qpa=,debug=]"
+DEPEND="
+ ~x11-libs/qt-core-${PV}[aqua=,c++0x=,debug=,qpa=]
+ ~x11-libs/qt-gui-${PV}[aqua=,c++0x=,debug=,qpa=]
+ alsa? ( media-libs/alsa-lib )
+"
RDEPEND="${DEPEND}"
+PATCHES=(
+ "${FILESDIR}/${PN}-4.8.0-alsa.patch"
+)
+
pkg_setup() {
- QT4_TARGET_DIRECTORIES="src/multimedia"
-
- if [[ ${PV} != 4*9999 ]]; then
- QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
- include/Qt/
- include/QtCore/
- include/QtGui/
- include/QtMultimedia/
- include/QtNetwork/
- src/src.pro
- src/3rdparty/
- src/corelib/
- src/gui/
- src/network/
- src/plugins/
- src/tools/"
- fi
-
- qt4-build-edge_pkg_setup
+ QT4_TARGET_DIRECTORIES="
+ src/multimedia"
+
+ QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
+ include/Qt
+ include/QtCore
+ include/QtGui
+ include/QtMultimedia
+ src/src.pro
+ src/corelib
+ src/gui"
+
+ QCONFIG_ADD="multimedia"
+ QCONFIG_DEFINE="QT_MULTIMEDIA"
+
+ qt4-build_pkg_setup
}
src_configure() {
- myconf="${myconf} $(qt_use iconv) -no-xkb -no-fontconfig -no-xrender
- -no-xrandr -no-xfixes -no-xcursor -no-xinerama -no-xshape -no-sm
- -no-opengl -no-nas-sound -no-dbus -no-cups -no-nis -no-gif -no-libpng
- -no-libmng -no-libjpeg -no-openssl -system-zlib -no-webkit -no-phonon
- -no-xmlpatterns -no-freetype -no-libtiff -no-accessibility
- -no-fontconfig -no-sql-mysql -no-sql-psql -no-sql-ibase -no-sql-sqlite
- -no-sql-sqlite2 -no-sql-odbc -no-glib -no-opengl -no-svg -no-gtkstyle
- -no-phonon-backend -no-script -no-scripttools -no-cups -no-xsync
- -no-xinput"
-
- qt4-build-edge_src_configure
+ myconf+="
+ -multimedia -audio-backend
+ $(qt_use alsa)
+ -no-accessibility -no-qt3support -no-xmlpatterns -no-phonon -no-phonon-backend
+ -no-svg -no-webkit -no-script -no-scripttools -no-declarative
+ -system-zlib -no-gif -no-libtiff -no-libpng -no-libmng -no-libjpeg -no-openssl
+ -no-cups -no-dbus -no-gtkstyle -no-nas-sound -no-opengl
+ -no-sm -no-xshape -no-xvideo -no-xsync -no-xinerama -no-xcursor -no-xfixes
+ -no-xrandr -no-xrender -no-mitshm -no-fontconfig -no-freetype -no-xinput -no-xkb"
+
+ qt4-build_src_configure
}
diff --git a/x11-libs/qt-opengl/files/qtbug-9691-Xdefs.patch b/x11-libs/qt-opengl/files/qtbug-9691-Xdefs.patch
deleted file mode 100644
index dfd351d..0000000
--- a/x11-libs/qt-opengl/files/qtbug-9691-Xdefs.patch
+++ /dev/null
@@ -1,97 +0,0 @@
---- qt/src/opengl/qglpaintdevice.cpp.ark 2010-04-12 17:10:24.569947561 +0200
-+++ qt/src/opengl/qglpaintdevice.cpp 2010-04-12 17:17:02.170326744 +0200
-@@ -39,8 +39,15 @@
- **
- ****************************************************************************/
-
-+#include <QtCore/qglobal.h>
-+#ifdef Q_WS_X11
-+#include <X11/Xdefs.h> // for Bool
-+#endif
- #include <private/qglpaintdevice_p.h>
- #include <private/qgl_p.h>
-+#if defined(Q_WS_X11) && !defined(Status)
-+#define Status int
-+#endif
- #include <private/qglpixelbuffer_p.h>
- #include <private/qglframebufferobject_p.h>
- #include <private/qwindowsurface_gl_p.h>
---- qt/src/opengl/qglpixelbuffer.cpp.ark 2010-04-12 17:11:21.820358541 +0200
-+++ qt/src/opengl/qglpixelbuffer.cpp 2010-04-12 17:12:35.950561190 +0200
-@@ -82,6 +82,10 @@
- #include <private/qpaintengineex_opengl2_p.h>
- #endif
-
-+#ifdef Q_WS_X11
-+#include <X11/Xdefs.h> // for Bool, needed by GL/glx.h
-+#define Status int
-+#endif
- #include <qglpixelbuffer.h>
- #include <private/qglpixelbuffer_p.h>
- #include <qimage.h>
---- qt/src/opengl/qglpixelbuffer_x11.cpp.ark 2010-04-12 17:21:23.483840735 +0200
-+++ qt/src/opengl/qglpixelbuffer_x11.cpp 2010-04-12 17:22:39.463626818 +0200
-@@ -40,11 +40,15 @@
- ****************************************************************************/
- #include <qlibrary.h>
- #include <qdebug.h>
--#include <private/qgl_p.h>
- #include <private/qt_x11_p.h>
-+#include <private/qgl_p.h>
- #include <private/qpaintengine_opengl_p.h>
-
- #include <qx11info_x11.h>
-+#include <X11/Xdefs.h> // for Bool
-+#ifndef Status
-+#define Status int
-+#endif
- #include <GL/glx.h>
- #include <qimage.h>
-
---- qt/src/opengl/qgl_x11.cpp.ark 2010-04-12 17:20:07.366862655 +0200
-+++ qt/src/opengl/qgl_x11.cpp 2010-04-12 17:21:02.240510982 +0200
-@@ -39,9 +39,6 @@
- **
- ****************************************************************************/
-
--#include "qgl.h"
--#include "qgl_p.h"
--
- #include "qmap.h"
- #include "qapplication.h"
- #include "qcolormap.h"
-@@ -82,6 +79,11 @@
- #endif // Q_OS_VXWORKS
- #include <X11/Xatom.h>
-
-+#include "qgl.h"
-+#include "qgl_p.h"
-+
-+#include <X11/Xdefs.h>
-+
- #if defined(Q_OS_LINUX) || defined(Q_OS_BSD4)
- #include <dlfcn.h>
- #endif
---- qt/src/opengl/qpaintengine_opengl.cpp.ark 2010-04-12 17:17:13.883240412 +0200
-+++ qt/src/opengl/qpaintengine_opengl.cpp 2010-04-12 17:18:26.056568593 +0200
-@@ -48,6 +48,10 @@
- #include "qapplication.h"
- #include "qbrush.h"
- #include "qgl.h"
-+#include <qglobal.h>
-+#ifdef Q_WS_X11
-+#include <X11/Xdefs.h> // Needed for Bool, needed by GL/glx.h
-+#endif
- #include <private/qgl_p.h>
- #include <private/qglpaintdevice_p.h>
- #include <private/qpainter_p.h>
-@@ -57,6 +61,9 @@
- #include "qpen.h"
- #include "qvarlengtharray.h"
- #include <private/qpainter_p.h>
-+#ifdef Q_WS_X11
-+#define Status int
-+#endif
- #include <private/qglpixelbuffer_p.h>
- #include <private/qbezier_p.h>
- #include <qglframebufferobject.h>
diff --git a/x11-libs/qt-opengl/qt-opengl-4.8.9999.ebuild b/x11-libs/qt-opengl/qt-opengl-4.8.9999.ebuild
index a87661a..83838d3 100644
--- a/x11-libs/qt-opengl/qt-opengl-4.8.9999.ebuild
+++ b/x11-libs/qt-opengl/qt-opengl-4.8.9999.ebuild
@@ -2,65 +2,63 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-EAPI="4"
-if [[ ${PV} == 4*9999 ]]; then
- QT_ECLASS="-edge"
-fi
-inherit qt4-build${QT_ECLASS}
+EAPI=4
+
+inherit qt4-build
DESCRIPTION="The OpenGL module for the Qt toolkit"
SLOT="4"
-if [[ ${PV} != 4*9999 ]]; then
- KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 -sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-else
+if [[ ${QT4_BUILD_TYPE} == live ]]; then
KEYWORDS=""
+else
+ KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
fi
-
IUSE="egl qt3support"
-DEPEND="~x11-libs/qt-core-${PV}[aqua=,c++0x=,qpa=,debug=,qt3support=]
- ~x11-libs/qt-gui-${PV}[aqua=,c++0x=,qpa=,debug=,egl=,qt3support=]
- virtual/opengl"
+DEPEND="
+ virtual/opengl
+ ~x11-libs/qt-core-${PV}[aqua=,c++0x=,debug=,qpa=,qt3support=]
+ ~x11-libs/qt-gui-${PV}[aqua=,c++0x=,debug=,egl=,qpa=,qt3support=]
+"
RDEPEND="${DEPEND}"
pkg_setup() {
QT4_TARGET_DIRECTORIES="
src/opengl
src/plugins/graphicssystems/opengl"
- if [[ ${PV} != 4*9999 ]]; then
- QT4_EXTRACT_DIRECTORIES="
- include/QtCore
- include/QtGui
- include/QtOpenGL
- src/corelib
- src/gui
- src/opengl
- src/plugins
- src/3rdparty"
- fi
+
+ QT4_EXTRACT_DIRECTORIES="
+ include/QtCore
+ include/QtGui
+ include/QtOpenGL
+ src/corelib
+ src/gui
+ src/opengl
+ src/plugins
+ src/3rdparty"
QCONFIG_ADD="opengl"
- QCONFIG_DEFINE="QT_OPENGL $(use egl && echo QT_EGL)"
- qt4-build${QT_ECLASS}_pkg_setup
+ QCONFIG_DEFINE="QT_OPENGL"
+
+ qt4-build_pkg_setup
}
src_configure() {
- myconf="${myconf} -opengl
+ myconf+="
+ -opengl
$(qt_use qt3support)
$(qt_use egl)"
- qt4-build${QT_ECLASS}_src_configure
+ qt4-build_src_configure
# Not building tools/designer/src/plugins/tools/view3d as it's
# commented out of the build in the source
}
src_install() {
- qt4-build${QT_ECLASS}_src_install
+ qt4-build_src_install
- #touch the available graphics systems
- mkdir -p "${ED}/usr/share/qt4/graphicssystems/" ||
- die "could not create ${ED}/usr/share/qt4/graphicssystems/"
- echo "experimental" > "${ED}/usr/share/qt4/graphicssystems/opengl" ||
- die "could not create ${ED}/usr/share/qt4/graphicssystems/opengl"
+ # touch the available graphics systems
+ dodir /usr/share/qt4/graphicssystems
+ echo "experimental" > "${ED}"/usr/share/qt4/graphicssystems/opengl || die
}
diff --git a/x11-libs/qt-openvg/qt-openvg-4.8.9999.ebuild b/x11-libs/qt-openvg/qt-openvg-4.8.9999.ebuild
index 14ab72f..1cd981c 100644
--- a/x11-libs/qt-openvg/qt-openvg-4.8.9999.ebuild
+++ b/x11-libs/qt-openvg/qt-openvg-4.8.9999.ebuild
@@ -2,60 +2,61 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-EAPI="4"
-inherit qt4-build-edge
+EAPI=4
+
+inherit qt4-build
DESCRIPTION="The OpenVG module for the Qt toolkit"
SLOT="4"
-if [[ ${PV} != 4*9999 ]]; then
- KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+if [[ ${QT4_BUILD_TYPE} == live ]]; then
+ KEYWORDS=""
else
- KEYWWORDS=""
+ KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
fi
-
IUSE="qt3support"
-DEPEND="~x11-libs/qt-core-${PV}[aqua=,c++0x=,debug=,qpa=,qt3support=]
+DEPEND="
+ media-libs/mesa[egl,openvg]
+ ~x11-libs/qt-core-${PV}[aqua=,c++0x=,debug=,qpa=,qt3support=]
~x11-libs/qt-gui-${PV}[aqua=,c++0x=,debug=,egl,qpa=,qt3support=]
- media-libs/mesa[openvg]"
+"
RDEPEND="${DEPEND}"
pkg_setup() {
QT4_TARGET_DIRECTORIES="
src/openvg
src/plugins/graphicssystems/openvg"
- if [[ ${PV} != 4*9999 ]]; then
- QT4_EXTRACT_DIRECTORIES="
- include/QtCore
- include/QtGui
- include/QtOpenVG
- src/corelib
- src/gui
- src/openvg
- src/plugins
- src/3rdparty"
- fi
+
+ QT4_EXTRACT_DIRECTORIES="
+ include/QtCore
+ include/QtGui
+ include/QtOpenVG
+ src/corelib
+ src/gui
+ src/openvg
+ src/plugins
+ src/3rdparty"
+
QCONFIG_ADD="openvg"
QCONFIG_DEFINE="QT_OPENVG"
- qt4-build-edge_pkg_setup
+ qt4-build_pkg_setup
}
src_configure() {
gltype="desktop"
- myconf="${myconf} -openvg -egl
+ myconf+="
+ -openvg -egl
$(qt_use qt3support)"
- qt4-build-edge_src_configure
+ qt4-build_src_configure
}
src_install() {
- qt4-build-edge_src_install
+ qt4-build_src_install
- #touch the available graphics systems
- mkdir -p "${D}/usr/share/qt4/graphicssystems/" ||
- die "could not create ${D}/usr/share/qt4/graphicssystems/"
- echo "experimental" > "${D}/usr/share/qt4/graphicssystems/openvg" ||
- die "could not create ${D}/usr/share/qt4/graphicssystems/openvg"
+ # touch the available graphics systems
+ dodir /usr/share/qt4/graphicssystems
+ echo "experimental" > "${ED}"/usr/share/qt4/graphicssystems/openvg || die
}
diff --git a/x11-libs/qt-phonon/files/qtbug-9691-Xdefs.patch b/x11-libs/qt-phonon/files/qtbug-9691-Xdefs.patch
deleted file mode 100644
index dfd351d..0000000
--- a/x11-libs/qt-phonon/files/qtbug-9691-Xdefs.patch
+++ /dev/null
@@ -1,97 +0,0 @@
---- qt/src/opengl/qglpaintdevice.cpp.ark 2010-04-12 17:10:24.569947561 +0200
-+++ qt/src/opengl/qglpaintdevice.cpp 2010-04-12 17:17:02.170326744 +0200
-@@ -39,8 +39,15 @@
- **
- ****************************************************************************/
-
-+#include <QtCore/qglobal.h>
-+#ifdef Q_WS_X11
-+#include <X11/Xdefs.h> // for Bool
-+#endif
- #include <private/qglpaintdevice_p.h>
- #include <private/qgl_p.h>
-+#if defined(Q_WS_X11) && !defined(Status)
-+#define Status int
-+#endif
- #include <private/qglpixelbuffer_p.h>
- #include <private/qglframebufferobject_p.h>
- #include <private/qwindowsurface_gl_p.h>
---- qt/src/opengl/qglpixelbuffer.cpp.ark 2010-04-12 17:11:21.820358541 +0200
-+++ qt/src/opengl/qglpixelbuffer.cpp 2010-04-12 17:12:35.950561190 +0200
-@@ -82,6 +82,10 @@
- #include <private/qpaintengineex_opengl2_p.h>
- #endif
-
-+#ifdef Q_WS_X11
-+#include <X11/Xdefs.h> // for Bool, needed by GL/glx.h
-+#define Status int
-+#endif
- #include <qglpixelbuffer.h>
- #include <private/qglpixelbuffer_p.h>
- #include <qimage.h>
---- qt/src/opengl/qglpixelbuffer_x11.cpp.ark 2010-04-12 17:21:23.483840735 +0200
-+++ qt/src/opengl/qglpixelbuffer_x11.cpp 2010-04-12 17:22:39.463626818 +0200
-@@ -40,11 +40,15 @@
- ****************************************************************************/
- #include <qlibrary.h>
- #include <qdebug.h>
--#include <private/qgl_p.h>
- #include <private/qt_x11_p.h>
-+#include <private/qgl_p.h>
- #include <private/qpaintengine_opengl_p.h>
-
- #include <qx11info_x11.h>
-+#include <X11/Xdefs.h> // for Bool
-+#ifndef Status
-+#define Status int
-+#endif
- #include <GL/glx.h>
- #include <qimage.h>
-
---- qt/src/opengl/qgl_x11.cpp.ark 2010-04-12 17:20:07.366862655 +0200
-+++ qt/src/opengl/qgl_x11.cpp 2010-04-12 17:21:02.240510982 +0200
-@@ -39,9 +39,6 @@
- **
- ****************************************************************************/
-
--#include "qgl.h"
--#include "qgl_p.h"
--
- #include "qmap.h"
- #include "qapplication.h"
- #include "qcolormap.h"
-@@ -82,6 +79,11 @@
- #endif // Q_OS_VXWORKS
- #include <X11/Xatom.h>
-
-+#include "qgl.h"
-+#include "qgl_p.h"
-+
-+#include <X11/Xdefs.h>
-+
- #if defined(Q_OS_LINUX) || defined(Q_OS_BSD4)
- #include <dlfcn.h>
- #endif
---- qt/src/opengl/qpaintengine_opengl.cpp.ark 2010-04-12 17:17:13.883240412 +0200
-+++ qt/src/opengl/qpaintengine_opengl.cpp 2010-04-12 17:18:26.056568593 +0200
-@@ -48,6 +48,10 @@
- #include "qapplication.h"
- #include "qbrush.h"
- #include "qgl.h"
-+#include <qglobal.h>
-+#ifdef Q_WS_X11
-+#include <X11/Xdefs.h> // Needed for Bool, needed by GL/glx.h
-+#endif
- #include <private/qgl_p.h>
- #include <private/qglpaintdevice_p.h>
- #include <private/qpainter_p.h>
-@@ -57,6 +61,9 @@
- #include "qpen.h"
- #include "qvarlengtharray.h"
- #include <private/qpainter_p.h>
-+#ifdef Q_WS_X11
-+#define Status int
-+#endif
- #include <private/qglpixelbuffer_p.h>
- #include <private/qbezier_p.h>
- #include <qglframebufferobject.h>
diff --git a/x11-libs/qt-phonon/qt-phonon-4.8.9999.ebuild b/x11-libs/qt-phonon/qt-phonon-4.8.9999.ebuild
index 85980f4..efb3818 100644
--- a/x11-libs/qt-phonon/qt-phonon-4.8.9999.ebuild
+++ b/x11-libs/qt-phonon/qt-phonon-4.8.9999.ebuild
@@ -1,29 +1,31 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-phonon/qt-phonon-4.7.4.ebuild,v 1.1 2011/09/08 09:21:01 wired Exp $
+# $Header: $
-EAPI="4"
-inherit qt4-build-edge
+EAPI=4
+
+inherit qt4-build
DESCRIPTION="The Phonon module for the Qt toolkit"
SLOT="4"
-if [[ ${PV} != 4*9999 ]]; then
- KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 -sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
-else
+if [[ ${QT4_BUILD_TYPE} == live ]]; then
KEYWORDS=""
+else
+ KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
fi
-
IUSE="dbus qt3support"
-DEPEND="~x11-libs/qt-gui-${PV}[aqua=,c++0x=,qpa=,debug=,qt3support=]
+DEPEND="
+ ~x11-libs/qt-gui-${PV}[aqua=,c++0x=,qpa=,debug=,qt3support=]
!kde-base/phonon-kde
!kde-base/phonon-xine
!media-libs/phonon
!media-sound/phonon
!aqua? ( media-libs/gstreamer
- media-plugins/gst-plugins-meta )
+ media-plugins/gst-plugins-meta )
aqua? ( ~x11-libs/qt-opengl-${PV}[aqua,debug=,qt3support=] )
- dbus? ( ~x11-libs/qt-dbus-${PV}[aqua=,c++0x=,qpa=,debug=] )"
+ dbus? ( ~x11-libs/qt-dbus-${PV}[aqua=,c++0x=,qpa=,debug=] )
+"
RDEPEND="${DEPEND}"
pkg_setup() {
@@ -31,23 +33,24 @@ pkg_setup() {
src/phonon
src/plugins/phonon
tools/designer/src/plugins/phononwidgets"
- if [[ ${PV} != 4*9999 ]]; then
- QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
- include/
- src
- tools"
- fi
+
+ QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
+ include
+ src
+ tools"
QCONFIG_ADD="phonon"
- use aqua || QCONFIG_DEFINE="QT_GSTREAMER"
+ QCONFIG_DEFINE="QT_PHONON
+ $(use !aqua && echo QT_GSTREAMER)"
- qt4-build-edge_pkg_setup
+ qt4-build_pkg_setup
}
src_configure() {
- myconf="${myconf} -phonon -phonon-backend -no-opengl -no-svg
+ myconf+="
+ -phonon -phonon-backend -no-opengl -no-svg
$(qt_use dbus qdbus)
$(qt_use qt3support)"
- qt4-build-edge_src_configure
+ qt4-build_src_configure
}
diff --git a/x11-libs/qt-qt3support/qt-qt3support-4.8.9999.ebuild b/x11-libs/qt-qt3support/qt-qt3support-4.8.9999.ebuild
index 59b4e58..2978a7f 100644
--- a/x11-libs/qt-qt3support/qt-qt3support-4.8.9999.ebuild
+++ b/x11-libs/qt-qt3support/qt-qt3support-4.8.9999.ebuild
@@ -1,27 +1,25 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-qt3support/qt-qt3support-4.7.4.ebuild,v 1.1 2011/09/08 09:21:19 wired Exp $
+# $Header: $
-EAPI="4"
-if [[ ${PV} == 4*9999 ]]; then
- QT_ECLASS="-edge"
-fi
-inherit qt4-build${QT_ECLASS}
+EAPI=4
+
+inherit qt4-build
DESCRIPTION="The Qt3 support module for the Qt toolkit"
SLOT="4"
-if [[ ${PV} != 4*9999 ]]; then
- KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 -sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
-else
+if [[ ${QT4_BUILD_TYPE} == live ]]; then
KEYWORDS=""
+else
+ KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
fi
-
IUSE="+accessibility"
-DEPEND="~x11-libs/qt-core-${PV}[aqua=,c++0x=,qpa=,debug=,qt3support]
- ~x11-libs/qt-gui-${PV}[accessibility=,aqua=,c++0x=,qpa=,debug=,qt3support]
- ~x11-libs/qt-sql-${PV}[aqua=,c++0x=,qpa=,debug=,qt3support]"
-
+DEPEND="
+ ~x11-libs/qt-core-${PV}[aqua=,c++0x=,debug=,qpa=,qt3support]
+ ~x11-libs/qt-gui-${PV}[accessibility=,aqua=,c++0x=,debug=,qpa=,qt3support]
+ ~x11-libs/qt-sql-${PV}[aqua=,c++0x=,debug=,qpa=,qt3support]
+"
RDEPEND="${DEPEND}"
pkg_setup() {
@@ -30,15 +28,19 @@ pkg_setup() {
src/tools/uic3
tools/designer/src/plugins/widgets
tools/porting"
- if [[ ${PV} != 4*9999 ]]; then
- QT4_EXTRACT_DIRECTORIES="src include tools"
- fi
- qt4-build${QT_ECLASS}_pkg_setup
+ QT4_EXTRACT_DIRECTORIES="
+ src
+ include
+ tools"
+
+ qt4-build_pkg_setup
}
src_configure() {
- myconf="${myconf} -qt3support
+ myconf+="
+ -qt3support
$(qt_use accessibility)"
- qt4-build${QT_ECLASS}_src_configure
+
+ qt4-build_src_configure
}
diff --git a/x11-libs/qt-script/files/qt-4.6-master-nolibx11.patch b/x11-libs/qt-script/files/qt-4.6-master-nolibx11.patch
deleted file mode 100644
index 14e5fce..0000000
--- a/x11-libs/qt-script/files/qt-4.6-master-nolibx11.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Index: qt-everywhere-opensource-src-4.6.9999/configure
-===================================================================
---- qt-everywhere-opensource-src-4.6.9999.orig/configure
-+++ qt-everywhere-opensource-src-4.6.9999/configure
-@@ -5069,15 +5069,6 @@ if [ "$PLATFORM_X11" = "yes" ]; then
- X11TESTS_FLAGS="$X11TESTS_FLAGS -fpermissive"
- fi
-
-- # Check we actually have X11 :-)
-- "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/xlib "XLib" $L_FLAGS $I_FLAGS $l_FLAGS $X11TESTS_FLAGS
-- if [ $? != "0" ]; then
-- echo "Basic XLib functionality test failed!"
-- echo " You might need to modify the include and library search paths by editing"
-- echo " QMAKE_INCDIR_X11 and QMAKE_LIBDIR_X11 in ${XQMAKESPEC}."
-- exit 1
-- fi
--
- # auto-detect OpenGL support (es1 = OpenGL ES 1.x Common, es1cl = ES 1.x common lite, es2 = OpenGL ES 2.x)
- if [ "$CFG_OPENGL" = "auto" ] || [ "$CFG_OPENGL" = "yes" ]; then
- if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/opengl "OpenGL" $L_FLAGS $I_FLAGS $l_FLAGS $X11TESTS_FLAGS; then
diff --git a/x11-libs/qt-script/qt-script-4.8.9999.ebuild b/x11-libs/qt-script/qt-script-4.8.9999.ebuild
index 24d6b3c..0c84dda 100644
--- a/x11-libs/qt-script/qt-script-4.8.9999.ebuild
+++ b/x11-libs/qt-script/qt-script-4.8.9999.ebuild
@@ -2,50 +2,59 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-EAPI="4"
-inherit qt4-build-edge
+EAPI=4
+
+inherit qt4-build
DESCRIPTION="The ECMAScript module for the Qt toolkit"
SLOT="4"
-if [[ ${PV} != 4*9999 ]]; then
- KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 -sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-else
+if [[ ${QT4_BUILD_TYPE} == live ]]; then
KEYWORDS=""
+else
+ KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
fi
IUSE="iconv +jit"
-DEPEND="~x11-libs/qt-core-${PV}[aqua=,c++0x=,qpa=,debug=]"
+DEPEND="
+ ~x11-libs/qt-core-${PV}[aqua=,c++0x=,debug=,qpa=]
+"
RDEPEND="${DEPEND}"
pkg_setup() {
- QT4_TARGET_DIRECTORIES="src/script/"
-
- if [[ ${PV} != 4*9999 ]]; then
- QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
- include/Qt/
- include/QtCore/
- include/QtScript/
- src/3rdparty/javascriptcore/
- src/corelib/"
- fi
-
- qt4-build-edge_pkg_setup
+ QT4_TARGET_DIRECTORIES="
+ src/script"
+
+ QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
+ include/Qt
+ include/QtCore
+ include/QtScript
+ src/3rdparty/javascriptcore
+ src/corelib"
+
+ QCONFIG_ADD="script"
+ QCONFIG_DEFINE="QT_SCRIPT"
+
+ qt4-build_pkg_setup
}
src_configure() {
- myconf="${myconf} $(qt_use iconv) $(qt_use jit javascript-jit) -no-xkb
- -no-fontconfig -no-xrender -no-xrandr -no-xfixes -no-xcursor -no-xinerama
+ myconf+="
+ $(qt_use iconv)
+ $(qt_use jit javascript-jit)
+ -no-xkb -no-fontconfig -no-xrender -no-xrandr -no-xfixes -no-xcursor -no-xinerama
-no-xshape -no-sm -no-opengl -no-nas-sound -no-dbus -no-cups -no-nis -no-gif
-no-libpng -no-libmng -no-libjpeg -no-openssl -system-zlib -no-webkit -no-phonon
-no-qt3support -no-xmlpatterns -no-freetype -no-libtiff
-no-accessibility -no-fontconfig -no-glib -no-opengl -no-svg
-no-gtkstyle"
- qt4-build-edge_src_configure
+
+ qt4-build_src_configure
}
src_install() {
qt4-build_src_install
- #install private headers
+
+ # install private headers
insinto "${QTHEADERDIR#${EPREFIX}}"/QtScript/private
- find "${S}"/src/script -type f -name "*_p.h" -exec doins {} \;
+ find "${S}"/src/script -type f -name "*_p.h" -exec doins {} +
}
diff --git a/x11-libs/qt-sql/files/qt-4.6-master-nolibx11.patch b/x11-libs/qt-sql/files/qt-4.6-master-nolibx11.patch
deleted file mode 100644
index 14e5fce..0000000
--- a/x11-libs/qt-sql/files/qt-4.6-master-nolibx11.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Index: qt-everywhere-opensource-src-4.6.9999/configure
-===================================================================
---- qt-everywhere-opensource-src-4.6.9999.orig/configure
-+++ qt-everywhere-opensource-src-4.6.9999/configure
-@@ -5069,15 +5069,6 @@ if [ "$PLATFORM_X11" = "yes" ]; then
- X11TESTS_FLAGS="$X11TESTS_FLAGS -fpermissive"
- fi
-
-- # Check we actually have X11 :-)
-- "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/xlib "XLib" $L_FLAGS $I_FLAGS $l_FLAGS $X11TESTS_FLAGS
-- if [ $? != "0" ]; then
-- echo "Basic XLib functionality test failed!"
-- echo " You might need to modify the include and library search paths by editing"
-- echo " QMAKE_INCDIR_X11 and QMAKE_LIBDIR_X11 in ${XQMAKESPEC}."
-- exit 1
-- fi
--
- # auto-detect OpenGL support (es1 = OpenGL ES 1.x Common, es1cl = ES 1.x common lite, es2 = OpenGL ES 2.x)
- if [ "$CFG_OPENGL" = "auto" ] || [ "$CFG_OPENGL" = "yes" ]; then
- if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/opengl "OpenGL" $L_FLAGS $I_FLAGS $l_FLAGS $X11TESTS_FLAGS; then
diff --git a/x11-libs/qt-sql/qt-sql-4.8.9999.ebuild b/x11-libs/qt-sql/qt-sql-4.8.9999.ebuild
index 6f5dca6..d783419 100644
--- a/x11-libs/qt-sql/qt-sql-4.8.9999.ebuild
+++ b/x11-libs/qt-sql/qt-sql-4.8.9999.ebuild
@@ -1,55 +1,50 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-EAPI="4"
-if [[ ${PV} == 4*9999 ]]; then
- QT_ECLASS="-edge"
-fi
+EAPI=4
-inherit qt4-build${QT_ECLASS}
+inherit qt4-build
DESCRIPTION="The SQL module for the Qt toolkit"
SLOT="4"
-if [[ ${PV} != 4*9999 ]]; then
- KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 -sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-else
+if [[ ${QT4_BUILD_TYPE} == live ]]; then
KEYWORDS=""
+else
+ KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
fi
IUSE="firebird freetds mysql odbc postgres qt3support +sqlite"
-DEPEND="~x11-libs/qt-core-${PV}[aqua=,c++0x=,qpa=,debug=,qt3support=]
+REQUIRED_USE="
+ || ( firebird freetds mysql odbc postgres sqlite )
+"
+
+DEPEND="
+ ~x11-libs/qt-core-${PV}[aqua=,c++0x=,debug=,qpa=,qt3support=]
firebird? ( dev-db/firebird )
freetds? ( dev-db/freetds )
mysql? ( virtual/mysql )
odbc? ( || ( dev-db/unixODBC dev-db/libiodbc ) )
postgres? ( dev-db/postgresql-base )
- sqlite? ( dev-db/sqlite:3 )"
+ sqlite? ( dev-db/sqlite:3 )
+"
RDEPEND="${DEPEND}"
pkg_setup() {
QT4_TARGET_DIRECTORIES="
- src/sql
- src/plugins/sqldrivers"
+ src/sql
+ src/plugins/sqldrivers"
- if [[ ${PV} != 4*9999 ]]; then
- QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
- include/Qt/
- include/QtCore/
- include/QtSql/
+ QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
+ include/Qt
+ include/QtCore
+ include/QtSql
src/src.pro
- src/corelib/
+ src/corelib
src/plugins
src/tools/tools.pro"
- fi
-
- if ! (use firebird || use freetds || use mysql || use odbc || use postgres || use sqlite ); then
- ewarn "You need to enable at least one SQL driver. Enable at least"
- ewarn "one of these USE flags: \"firebird freetds mysql odbc postgres sqlite \""
- die "Enable at least one SQL driver."
- fi
- qt4-build${QT_ECLASS}_pkg_setup
+ qt4-build_pkg_setup
}
src_configure() {
@@ -73,5 +68,5 @@ src_configure() {
-no-xrandr -no-xrender -no-mitshm -no-fontconfig -no-freetype -no-xinput -no-xkb
-no-glib"
- qt4-build${QT_ECLASS}_src_configure
+ qt4-build_src_configure
}
diff --git a/x11-libs/qt-svg/qt-svg-4.8.9999.ebuild b/x11-libs/qt-svg/qt-svg-4.8.9999.ebuild
index 1c363da..478df04 100644
--- a/x11-libs/qt-svg/qt-svg-4.8.9999.ebuild
+++ b/x11-libs/qt-svg/qt-svg-4.8.9999.ebuild
@@ -1,20 +1,25 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-svg/qt-svg-4.7.4.ebuild,v 1.1 2011/09/08 09:22:11 wired Exp $
+# $Header: $
-EAPI="4"
-inherit qt4-build-edge
+EAPI=4
+
+inherit qt4-build
DESCRIPTION="The SVG module for the Qt toolkit"
SLOT="4"
-if [[ ${PV} != 4*9999 ]]; then
- KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 -sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-else
+if [[ ${QT4_BUILD_TYPE} == live ]]; then
KEYWORDS=""
+else
+ KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
fi
-IUSE="+accessibility iconv"
+IUSE="+accessibility"
-DEPEND="~x11-libs/qt-gui-${PV}[accessibility=,aqua=,c++0x=,debug=,qpa=]"
+DEPEND="
+ sys-libs/zlib
+ ~x11-libs/qt-core-${PV}[aqua=,c++0x=,debug=,qpa=]
+ ~x11-libs/qt-gui-${PV}[accessibility=,aqua=,c++0x=,debug=,qpa=]
+"
RDEPEND="${DEPEND}"
pkg_setup() {
@@ -22,35 +27,35 @@ pkg_setup() {
src/svg
src/plugins/imageformats/svg
src/plugins/iconengines/svgiconengine"
- if [[ ${PV} != 4*9999 ]]; then
- QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
- include/QtSvg/
- include/Qt/
- include/QtGui/
- include/QtCore/
- include/QtXml/
- src/corelib/
- src/gui/
- src/plugins/
- src/xml
- src/3rdparty"
- fi
+
+ QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
+ include/QtSvg
+ include/Qt
+ include/QtGui
+ include/QtCore
+ include/QtXml
+ src/corelib
+ src/gui
+ src/plugins
+ src/xml
+ src/3rdparty"
QCONFIG_ADD="svg"
QCONFIG_DEFINE="QT_SVG"
- qt4-build-edge_pkg_setup
+ qt4-build_pkg_setup
}
src_configure() {
- myconf="${myconf} -svg
+ myconf+="
+ -svg
$(qt_use accessibility)
- $(qt_use iconv)
- -no-xkb -no-xrender
+ -no-xkb -no-xrender
-no-xrandr -no-xfixes -no-xcursor -no-xinerama -no-xshape -no-sm
-no-opengl -no-nas-sound -no-dbus -no-cups -no-nis -no-gif -no-libpng
-no-libmng -no-libjpeg -no-openssl -system-zlib -no-webkit -no-phonon
-no-qt3support -no-xmlpatterns -no-freetype -no-libtiff
-no-fontconfig -no-glib -no-gtkstyle"
- qt4-build-edge_src_configure
+
+ qt4-build_src_configure
}
diff --git a/x11-libs/qt-test/files/qt-4.6-master-nolibx11.patch b/x11-libs/qt-test/files/qt-4.6-master-nolibx11.patch
deleted file mode 100644
index 14e5fce..0000000
--- a/x11-libs/qt-test/files/qt-4.6-master-nolibx11.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Index: qt-everywhere-opensource-src-4.6.9999/configure
-===================================================================
---- qt-everywhere-opensource-src-4.6.9999.orig/configure
-+++ qt-everywhere-opensource-src-4.6.9999/configure
-@@ -5069,15 +5069,6 @@ if [ "$PLATFORM_X11" = "yes" ]; then
- X11TESTS_FLAGS="$X11TESTS_FLAGS -fpermissive"
- fi
-
-- # Check we actually have X11 :-)
-- "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/xlib "XLib" $L_FLAGS $I_FLAGS $l_FLAGS $X11TESTS_FLAGS
-- if [ $? != "0" ]; then
-- echo "Basic XLib functionality test failed!"
-- echo " You might need to modify the include and library search paths by editing"
-- echo " QMAKE_INCDIR_X11 and QMAKE_LIBDIR_X11 in ${XQMAKESPEC}."
-- exit 1
-- fi
--
- # auto-detect OpenGL support (es1 = OpenGL ES 1.x Common, es1cl = ES 1.x common lite, es2 = OpenGL ES 2.x)
- if [ "$CFG_OPENGL" = "auto" ] || [ "$CFG_OPENGL" = "yes" ]; then
- if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/opengl "OpenGL" $L_FLAGS $I_FLAGS $l_FLAGS $X11TESTS_FLAGS; then
diff --git a/x11-libs/qt-test/qt-test-4.8.9999.ebuild b/x11-libs/qt-test/qt-test-4.8.9999.ebuild
index 904ef58..3a781f8 100644
--- a/x11-libs/qt-test/qt-test-4.8.9999.ebuild
+++ b/x11-libs/qt-test/qt-test-4.8.9999.ebuild
@@ -1,39 +1,45 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-test/qt-test-4.7.4.ebuild,v 1.1 2011/09/08 09:22:28 wired Exp $
+# $Header: $
-EAPI="4"
-inherit qt4-build-edge
+EAPI=4
+
+inherit qt4-build
DESCRIPTION="The testing framework module for the Qt toolkit"
SLOT="4"
-if [[ ${PV} != 4*9999 ]]; then
- KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 -sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+if [[ ${QT4_BUILD_TYPE} == live ]]; then
KEYWORDS=""
+else
+ KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
fi
-IUSE="iconv"
+IUSE=""
-DEPEND="~x11-libs/qt-core-${PV}[aqua=,c++0x=,qpa=,debug=]"
+DEPEND="
+ ~x11-libs/qt-core-${PV}[aqua=,c++0x=,debug=,qpa=]
+"
RDEPEND="${DEPEND}"
pkg_setup() {
- QT4_TARGET_DIRECTORIES="src/testlib"
- if [[ ${PV} != 4*9999 ]]; then
- QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
- include/QtTest/
- include/QtCore/
- src/corelib/"
- fi
-
- qt4-build-edge_pkg_setup
+ QT4_TARGET_DIRECTORIES="
+ src/testlib"
+
+ QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
+ include/QtTest
+ include/QtCore
+ src/corelib"
+
+ qt4-build_pkg_setup
}
src_configure() {
- myconf="${myconf} $(qt_use iconv) -no-xkb -no-fontconfig -no-xrender
- -no-xrandr -no-xfixes -no-xcursor -no-xinerama -no-xshape -no-sm
- -no-opengl -no-nas-sound -no-dbus -no-cups -no-nis -no-gif -no-libpng
+ myconf+="
+ -no-xkb -no-fontconfig -no-xrender -no-xrandr -no-xfixes -no-xcursor
+ -no-xinerama -no-xshape -no-sm -no-opengl
+ -no-nas-sound -no-dbus -no-cups -no-nis -no-gif -no-libpng
-no-libmng -no-libjpeg -no-openssl -system-zlib -no-webkit -no-phonon
-no-qt3support -no-xmlpatterns -no-freetype -no-libtiff
- -no-accessibility -no-fontconfig -no-glib -no-opengl -no-svg"
- qt4-build-edge_src_configure
+ -no-accessibility -no-fontconfig -no-glib -no-svg"
+
+ qt4-build_src_configure
}
diff --git a/x11-libs/qt-webkit/files/qt-webkit-4.8.0-c++0x-fix.patch b/x11-libs/qt-webkit/files/qt-webkit-4.8.0-c++0x-fix.patch
new file mode 100644
index 0000000..8213da4
--- /dev/null
+++ b/x11-libs/qt-webkit/files/qt-webkit-4.8.0-c++0x-fix.patch
@@ -0,0 +1,101 @@
+All this is needed for qt-webkit to build if c++0x use is enabled
+while using gcc-4.6 ...
+
+you also need to append -fpermissive to the compiler flags
+--- src/3rdparty/javascriptcore/JavaScriptCore/wtf/TypeTraits.h
++++ src/3rdparty/javascriptcore/JavaScriptCore/wtf/TypeTraits.h
+@@ -23,6 +23,7 @@
+ #define TypeTraits_h
+
+ #include "Platform.h"
++#include <tr1/memory>
+
+ #if (defined(__GLIBCXX__) && (__GLIBCXX__ >= 20070724) && defined(__GXX_EXPERIMENTAL_CXX0X__)) || (defined(_MSC_VER) && (_MSC_VER >= 1600))
+ #include <type_traits>
+--- src/3rdparty/webkit/Source/JavaScriptCore/wtf/TypeTraits.h
++++ src/3rdparty/webkit/Source/JavaScriptCore/wtf/TypeTraits.h
+@@ -23,6 +23,7 @@
+ #define TypeTraits_h
+
+ #include "Platform.h"
++#include <tr1/memory>
+
+ #if (defined(__GLIBCXX__) && (__GLIBCXX__ >= 20070724) && defined(__GXX_EXPERIMENTAL_CXX0X__)) || (defined(_MSC_VER) && (_MSC_VER >= 1600))
+ #include <type_traits>
+--- src/3rdparty/webkit/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp
++++ src/3rdparty/webkit/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp
+@@ -1106,7 +1106,7 @@ RegisterID* BytecodeGenerator::emitLoad(RegisterID* dst, double number)
+ // FIXME: Our hash tables won't hold infinity, so we make a new JSValue each time.
+ // Later we can do the extra work to handle that like the other cases. They also don't
+ // work correctly with NaN as a key.
+- if (isnan(number) || number == HashTraits<double>::emptyValue() || HashTraits<double>::isDeletedValue(number))
++ if (std::isnan(number) || number == HashTraits<double>::emptyValue() || HashTraits<double>::isDeletedValue(number))
+ return emitLoad(dst, jsNumber(number));
+ JSValue& valueInMap = m_numberMap.add(number, JSValue()).first->second;
+ if (!valueInMap)
+--- src/3rdparty/webkit/Source/JavaScriptCore/wtf/MathExtras.h
++++ src/3rdparty/webkit/Source/JavaScriptCore/wtf/MathExtras.h
+@@ -137,8 +137,10 @@ inline double trunc(double num) { return num > 0 ? floor(num) : ceil(num); }
+ inline long long abs(long long num) { return _abs64(num); }
+ #endif
+
++#ifndef __GXX_EXPERIMENTAL_CXX0X__
+ inline bool isinf(double num) { return !_finite(num) && !_isnan(num); }
+ inline bool isnan(double num) { return !!_isnan(num); }
++#endif
+ inline bool signbit(double num) { return _copysign(1.0, num) < 0; }
+
+ inline double nextafter(double x, double y) { return _nextafter(x, y); }
+@@ -240,8 +242,10 @@ inline int clampToInteger(unsigned value)
+
+ #if !COMPILER(MSVC) && !(COMPILER(RVCT) && PLATFORM(BREWMP)) && !OS(SOLARIS) && !OS(SYMBIAN)
+ using std::isfinite;
++#ifndef __GXX_EXPERIMENTAL_CXX0X__
+ using std::isinf;
+ using std::isnan;
++#endif
+ using std::signbit;
+ #endif
+
+--- src/3rdparty/webkit/Source/WebCore/bindings/js/JSGeolocationCustom.cpp
++++ src/3rdparty/webkit/Source/WebCore/bindings/js/JSGeolocationCustom.cpp
+@@ -80,7 +80,7 @@ static PassRefPtr<PositionOptions> createPositionOptions(ExecState* exec, JSValu
+ if (exec->hadException())
+ return 0;
+ // If the value is positive infinity, there's nothing to do.
+- if (!(isinf(timeoutNumber) && (timeoutNumber > 0))) {
++ if (!(std::isinf(timeoutNumber) && (timeoutNumber > 0))) {
+ // Wrap to int32 and force non-negative to match behavior of window.setTimeout.
+ options->setTimeout(max(0, timeoutValue.toInt32(exec)));
+ if (exec->hadException())
+@@ -95,7 +95,7 @@ static PassRefPtr<PositionOptions> createPositionOptions(ExecState* exec, JSValu
+ double maximumAgeNumber = maximumAgeValue.toNumber(exec);
+ if (exec->hadException())
+ return 0;
+- if (isinf(maximumAgeNumber) && (maximumAgeNumber > 0)) {
++ if (std::isinf(maximumAgeNumber) && (maximumAgeNumber > 0)) {
+ // If the value is positive infinity, clear maximumAge.
+ options->clearMaximumAge();
+ } else {
+--- src/3rdparty/webkit/Source/WebCore/html/HTMLInputElement.cpp
++++ src/3rdparty/webkit/Source/WebCore/html/HTMLInputElement.cpp
+@@ -332,7 +332,7 @@ void HTMLInputElement::applyStep(double count, ExceptionCode& ec)
+ return;
+ }
+ double newValue = current + step * count;
+- if (isinf(newValue)) {
++ if (std::isinf(newValue)) {
+ ec = INVALID_STATE_ERR;
+ return;
+ }
+--- src/3rdparty/webkit/Source/WebCore/html/NumberInputType.cpp
++++ src/3rdparty/webkit/Source/WebCore/html/NumberInputType.cpp
+@@ -132,7 +132,7 @@ bool NumberInputType::stepMismatch(const String& value, double step) const
+ if (!parseToDoubleForNumberType(value, &doubleValue))
+ return false;
+ doubleValue = fabs(doubleValue - stepBase());
+- if (isinf(doubleValue))
++ if (std::isinf(doubleValue))
+ return false;
+ // double's fractional part size is DBL_MAN_DIG-bit. If the current value
+ // is greater than step*2^DBL_MANT_DIG, the following computation for
diff --git a/x11-libs/qt-webkit/qt-webkit-4.8.9999.ebuild b/x11-libs/qt-webkit/qt-webkit-4.8.9999.ebuild
index bfeebbe..5201820 100644
--- a/x11-libs/qt-webkit/qt-webkit-4.8.9999.ebuild
+++ b/x11-libs/qt-webkit/qt-webkit-4.8.9999.ebuild
@@ -2,29 +2,27 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-EAPI="4"
+EAPI=4
-if [[ ${PV} == 4*9999 ]]; then
- QT_ECLASS="-edge"
-fi
-inherit qt4-build${QT_ECLASS} flag-o-matic
+inherit qt4-build flag-o-matic
DESCRIPTION="The WebKit module for the Qt toolkit"
SLOT="4"
-if [[ ${PV} != 4*9999 ]]; then
- KEYWORDS="~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 -sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
-else
+if [[ ${QT4_BUILD_TYPE} == live ]]; then
KEYWORDS=""
+else
+ KEYWORDS="~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
fi
IUSE="+gstreamer +jit"
DEPEND="
dev-db/sqlite:3
dev-libs/icu
+ x11-libs/libX11
x11-libs/libXrender
- ~x11-libs/qt-core-${PV}[aqua=,c++0x=,qpa=,debug=,ssl]
- ~x11-libs/qt-gui-${PV}[aqua=,c++0x=,qpa=,debug=]
- ~x11-libs/qt-xmlpatterns-${PV}[aqua=,c++0x=,qpa=,debug=]
+ ~x11-libs/qt-core-${PV}[aqua=,c++0x=,debug=,ssl,qpa=]
+ ~x11-libs/qt-gui-${PV}[aqua=,c++0x=,debug=,qpa=]
+ ~x11-libs/qt-xmlpatterns-${PV}[aqua=,c++0x=,debug=,qpa=]
gstreamer? (
dev-libs/glib:2
media-libs/gstreamer:0.10
@@ -32,36 +30,44 @@ DEPEND="
)"
RDEPEND="${DEPEND}"
+PATCHES=(
+ "${FILESDIR}/${PN}-4.8.0-c++0x-fix.patch"
+)
+
pkg_setup() {
QT4_TARGET_DIRECTORIES="
src/3rdparty/webkit/Source/JavaScriptCore
src/3rdparty/webkit/Source/WebCore
src/3rdparty/webkit/Source/WebKit/qt
tools/designer/src/plugins/qwebview"
- if [[ ${PV} != 4*9999 ]]; then
- QT4_EXTRACT_DIRECTORIES="
- include/
- src/
- tools/"
- fi
+
+ QT4_EXTRACT_DIRECTORIES="
+ include
+ src
+ tools"
QCONFIG_ADD="webkit"
QCONFIG_DEFINE="QT_WEBKIT"
- qt4-build${QT_ECLASS}_pkg_setup
+ qt4-build_pkg_setup
}
src_prepare() {
use c++0x && append-cxxflags -fpermissive
+ # Fix version number in generated pkgconfig file, bug 406443
+ sed -i -e 's/^isEmpty(QT_BUILD_TREE)://' \
+ src/3rdparty/webkit/Source/WebKit/qt/QtWebKit.pro || die
+
# Always enable icu to avoid build failure, bug 407315
sed -i -e '/CONFIG\s*+=\s*text_breaking_with_icu/ s:^#\s*::' \
src/3rdparty/webkit/Source/JavaScriptCore/JavaScriptCore.pri || die
+ # Remove -Werror from CXXFLAGS
sed -i -e '/QMAKE_CXXFLAGS\s*+=/ s:-Werror::g' \
src/3rdparty/webkit/Source/WebKit.pri || die
- qt4-build${QT_ECLASS}_src_prepare
+ qt4-build_src_prepare
}
src_configure() {
@@ -69,7 +75,7 @@ src_configure() {
-webkit
-icu -system-sqlite
$(qt_use jit javascript-jit)
- $(use gstreamer || echo -DENABLE_VIDEO=0)
- "
- qt4-build${QT_ECLASS}_src_configure
+ $(use gstreamer || echo -DENABLE_VIDEO=0)"
+
+ qt4-build_src_configure
}
diff --git a/x11-libs/qt-xmlpatterns/files/qt-4.6-master-nolibx11.patch b/x11-libs/qt-xmlpatterns/files/qt-4.6-master-nolibx11.patch
deleted file mode 100644
index 14e5fce..0000000
--- a/x11-libs/qt-xmlpatterns/files/qt-4.6-master-nolibx11.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Index: qt-everywhere-opensource-src-4.6.9999/configure
-===================================================================
---- qt-everywhere-opensource-src-4.6.9999.orig/configure
-+++ qt-everywhere-opensource-src-4.6.9999/configure
-@@ -5069,15 +5069,6 @@ if [ "$PLATFORM_X11" = "yes" ]; then
- X11TESTS_FLAGS="$X11TESTS_FLAGS -fpermissive"
- fi
-
-- # Check we actually have X11 :-)
-- "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/xlib "XLib" $L_FLAGS $I_FLAGS $l_FLAGS $X11TESTS_FLAGS
-- if [ $? != "0" ]; then
-- echo "Basic XLib functionality test failed!"
-- echo " You might need to modify the include and library search paths by editing"
-- echo " QMAKE_INCDIR_X11 and QMAKE_LIBDIR_X11 in ${XQMAKESPEC}."
-- exit 1
-- fi
--
- # auto-detect OpenGL support (es1 = OpenGL ES 1.x Common, es1cl = ES 1.x common lite, es2 = OpenGL ES 2.x)
- if [ "$CFG_OPENGL" = "auto" ] || [ "$CFG_OPENGL" = "yes" ]; then
- if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/opengl "OpenGL" $L_FLAGS $I_FLAGS $l_FLAGS $X11TESTS_FLAGS; then
diff --git a/x11-libs/qt-xmlpatterns/qt-xmlpatterns-4.8.9999.ebuild b/x11-libs/qt-xmlpatterns/qt-xmlpatterns-4.8.9999.ebuild
index c280792..72da16e 100644
--- a/x11-libs/qt-xmlpatterns/qt-xmlpatterns-4.8.9999.ebuild
+++ b/x11-libs/qt-xmlpatterns/qt-xmlpatterns-4.8.9999.ebuild
@@ -1,19 +1,23 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-xmlpatterns/qt-xmlpatterns-4.7.4.ebuild,v 1.1 2011/09/08 09:23:04 wired Exp $
+# $Header: $
-EAPI="4"
-inherit qt4-build-edge
+EAPI=4
-DESCRIPTION="The patternist module for the Qt toolkit"
+inherit qt4-build
+
+DESCRIPTION="The XmlPatterns module for the Qt toolkit"
SLOT="4"
-if [[ ${PV} != 4*9999 ]]; then
- KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 -sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+if [[ ${QT4_BUILD_TYPE} == live ]]; then
KEYWORDS=""
+else
+ KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
fi
IUSE=""
-DEPEND="~x11-libs/qt-core-${PV}[aqua=,c++0x=,qpa=,debug=,exceptions]"
+DEPEND="
+ ~x11-libs/qt-core-${PV}[aqua=,c++0x=,debug=,exceptions,qpa=]
+"
RDEPEND="${DEPEND}"
pkg_setup() {
@@ -22,24 +26,23 @@ pkg_setup() {
tools/xmlpatterns
tools/xmlpatternsvalidator"
- if [[ ${PV} != 4*9999 ]]; then
- QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
- include/QtCore
- include/QtNetwork
- include/QtXml
- include/QtXmlPatterns
- src/network/
- src/xml/
- src/corelib/"
- fi
+ QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
+ include/QtCore
+ include/QtNetwork
+ include/QtXml
+ include/QtXmlPatterns
+ src/network
+ src/xml
+ src/corelib"
QCONFIG_ADD="xmlpatterns"
QCONFIG_DEFINE="QT_XMLPATTERNS"
- qt4-build-edge_pkg_setup
+ qt4-build_pkg_setup
}
src_configure() {
- myconf="${myconf} -xmlpatterns"
- qt4-build-edge_src_configure
+ myconf+=" -xmlpatterns"
+
+ qt4-build_src_configure
}
^ permalink raw reply related [flat|nested] 11+ messages in thread* [gentoo-commits] proj/qt:master commit in: x11-libs/qt-opengl/, x11-libs/qt-script/, x11-libs/qt-qt3support/, ...
@ 2012-05-14 22:05 Davide Pesavento
0 siblings, 0 replies; 11+ messages in thread
From: Davide Pesavento @ 2012-05-14 22:05 UTC (permalink / raw
To: gentoo-commits
commit: e88f0c2538166a6bd3285e12132d08ebc323ffbb
Author: Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Mon May 14 22:04:53 2012 +0000
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Mon May 14 22:04:53 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=e88f0c25
[x11-libs/qt-*] Synchronize keywords.
---
x11-libs/qt-bearer/qt-bearer-4.8.9999.ebuild | 2 +-
x11-libs/qt-core/qt-core-4.8.9999.ebuild | 6 +++++-
x11-libs/qt-dbus/qt-dbus-4.8.9999.ebuild | 6 +++++-
x11-libs/qt-declarative/metadata.xml | 2 --
.../qt-declarative/qt-declarative-4.8.9999.ebuild | 2 +-
x11-libs/qt-demo/qt-demo-4.8.9999.ebuild | 6 +++++-
x11-libs/qt-gui/qt-gui-4.8.9999.ebuild | 6 +++++-
x11-libs/qt-opengl/qt-opengl-4.8.9999.ebuild | 2 +-
x11-libs/qt-openvg/qt-openvg-4.8.9999.ebuild | 2 +-
x11-libs/qt-phonon/qt-phonon-4.8.9999.ebuild | 2 +-
.../qt-qt3support/qt-qt3support-4.8.9999.ebuild | 2 +-
x11-libs/qt-script/qt-script-4.8.9999.ebuild | 2 +-
x11-libs/qt-sql/qt-sql-4.8.9999.ebuild | 2 +-
x11-libs/qt-svg/qt-svg-4.8.9999.ebuild | 2 +-
x11-libs/qt-test/qt-test-4.8.9999.ebuild | 2 +-
x11-libs/qt-webkit/qt-webkit-4.8.9999.ebuild | 2 +-
.../qt-xmlpatterns/qt-xmlpatterns-4.8.9999.ebuild | 2 +-
17 files changed, 32 insertions(+), 18 deletions(-)
diff --git a/x11-libs/qt-bearer/qt-bearer-4.8.9999.ebuild b/x11-libs/qt-bearer/qt-bearer-4.8.9999.ebuild
index e5eb0ec..fcf6da4 100644
--- a/x11-libs/qt-bearer/qt-bearer-4.8.9999.ebuild
+++ b/x11-libs/qt-bearer/qt-bearer-4.8.9999.ebuild
@@ -11,7 +11,7 @@ SLOT="4"
if [[ ${QT4_BUILD_TYPE} == live ]]; then
KEYWORDS=""
else
- KEYWORDS="~amd64 ~x86"
+ KEYWORDS="~amd64 ~hppa ~x86"
fi
IUSE="connman networkmanager"
diff --git a/x11-libs/qt-core/qt-core-4.8.9999.ebuild b/x11-libs/qt-core/qt-core-4.8.9999.ebuild
index 99288ce..dbca485 100644
--- a/x11-libs/qt-core/qt-core-4.8.9999.ebuild
+++ b/x11-libs/qt-core/qt-core-4.8.9999.ebuild
@@ -8,7 +8,11 @@ inherit qt4-build
DESCRIPTION="The Qt toolkit is a comprehensive C++ application development framework"
SLOT="4"
-KEYWORDS=""
+if [[ ${QT4_BUILD_TYPE} == live ]]; then
+ KEYWORDS=""
+else
+ KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+fi
IUSE="+glib iconv optimized-qmake qt3support ssl"
DEPEND="
diff --git a/x11-libs/qt-dbus/qt-dbus-4.8.9999.ebuild b/x11-libs/qt-dbus/qt-dbus-4.8.9999.ebuild
index e6f1cc5..1e95ea2 100644
--- a/x11-libs/qt-dbus/qt-dbus-4.8.9999.ebuild
+++ b/x11-libs/qt-dbus/qt-dbus-4.8.9999.ebuild
@@ -8,7 +8,11 @@ inherit qt4-build
DESCRIPTION="The DBus module for the Qt toolkit"
SLOT="4"
-KEYWORDS=""
+if [[ ${QT4_BUILD_TYPE} == live ]]; then
+ KEYWORDS=""
+else
+ KEYWORDS="amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+fi
IUSE=""
DEPEND="
diff --git a/x11-libs/qt-declarative/metadata.xml b/x11-libs/qt-declarative/metadata.xml
index 64d2ee6..3c53abc 100644
--- a/x11-libs/qt-declarative/metadata.xml
+++ b/x11-libs/qt-declarative/metadata.xml
@@ -6,8 +6,6 @@
<flag name="c++0x">Build Qt using the C++11 standard</flag>
<flag name="exceptions">Add support for exceptions - like catching them
inside the event loop (recommended by Nokia)</flag>
- <flag name="private-headers">Install Qt declarative private headers required
- by Qt-creator QmlDesigner and QmlInspector plugins"</flag>
<flag name="qpa">Build a window system agnostic implementation of Qt</flag>
<flag name="qt3support">Enable the Qt3Support libraries for Qt4. Note that
this does not mean you can compile pure Qt3 programs with Qt4.</flag>
diff --git a/x11-libs/qt-declarative/qt-declarative-4.8.9999.ebuild b/x11-libs/qt-declarative/qt-declarative-4.8.9999.ebuild
index 10a1211..5b8d0bc 100644
--- a/x11-libs/qt-declarative/qt-declarative-4.8.9999.ebuild
+++ b/x11-libs/qt-declarative/qt-declarative-4.8.9999.ebuild
@@ -11,7 +11,7 @@ SLOT="4"
if [[ ${QT4_BUILD_TYPE} == live ]]; then
KEYWORDS=""
else
- KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+ KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
fi
IUSE="+accessibility qt3support webkit"
diff --git a/x11-libs/qt-demo/qt-demo-4.8.9999.ebuild b/x11-libs/qt-demo/qt-demo-4.8.9999.ebuild
index 103c1e6..84932bb 100644
--- a/x11-libs/qt-demo/qt-demo-4.8.9999.ebuild
+++ b/x11-libs/qt-demo/qt-demo-4.8.9999.ebuild
@@ -8,7 +8,11 @@ inherit qt4-build
DESCRIPTION="Demonstration module and examples for the Qt toolkit"
SLOT="4"
-KEYWORDS=""
+if [[ ${QT4_BUILD_TYPE} == live ]]; then
+ KEYWORDS=""
+else
+ KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x64-macos"
+fi
IUSE="dbus declarative kde multimedia opengl openvg qt3support webkit xmlpatterns"
DEPEND="
diff --git a/x11-libs/qt-gui/qt-gui-4.8.9999.ebuild b/x11-libs/qt-gui/qt-gui-4.8.9999.ebuild
index 2105011..02b3570 100644
--- a/x11-libs/qt-gui/qt-gui-4.8.9999.ebuild
+++ b/x11-libs/qt-gui/qt-gui-4.8.9999.ebuild
@@ -8,7 +8,11 @@ inherit qt4-build
DESCRIPTION="The GUI module for the Qt toolkit"
SLOT="4"
-KEYWORDS=""
+if [[ ${QT4_BUILD_TYPE} == live ]]; then
+ KEYWORDS=""
+else
+ KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+fi
IUSE="+accessibility cups dbus egl gif +glib gtkstyle mng nas nis qt3support tiff trace xinerama +xv"
REQUIRED_USE="
diff --git a/x11-libs/qt-opengl/qt-opengl-4.8.9999.ebuild b/x11-libs/qt-opengl/qt-opengl-4.8.9999.ebuild
index 83838d3..bb45b73 100644
--- a/x11-libs/qt-opengl/qt-opengl-4.8.9999.ebuild
+++ b/x11-libs/qt-opengl/qt-opengl-4.8.9999.ebuild
@@ -11,7 +11,7 @@ SLOT="4"
if [[ ${QT4_BUILD_TYPE} == live ]]; then
KEYWORDS=""
else
- KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+ KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
fi
IUSE="egl qt3support"
diff --git a/x11-libs/qt-openvg/qt-openvg-4.8.9999.ebuild b/x11-libs/qt-openvg/qt-openvg-4.8.9999.ebuild
index 1cd981c..37e93c1 100644
--- a/x11-libs/qt-openvg/qt-openvg-4.8.9999.ebuild
+++ b/x11-libs/qt-openvg/qt-openvg-4.8.9999.ebuild
@@ -11,7 +11,7 @@ SLOT="4"
if [[ ${QT4_BUILD_TYPE} == live ]]; then
KEYWORDS=""
else
- KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+ KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
fi
IUSE="qt3support"
diff --git a/x11-libs/qt-phonon/qt-phonon-4.8.9999.ebuild b/x11-libs/qt-phonon/qt-phonon-4.8.9999.ebuild
index efb3818..7e70270 100644
--- a/x11-libs/qt-phonon/qt-phonon-4.8.9999.ebuild
+++ b/x11-libs/qt-phonon/qt-phonon-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 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
+ KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
fi
IUSE="dbus qt3support"
diff --git a/x11-libs/qt-qt3support/qt-qt3support-4.8.9999.ebuild b/x11-libs/qt-qt3support/qt-qt3support-4.8.9999.ebuild
index 2978a7f..d12f42c 100644
--- a/x11-libs/qt-qt3support/qt-qt3support-4.8.9999.ebuild
+++ b/x11-libs/qt-qt3support/qt-qt3support-4.8.9999.ebuild
@@ -11,7 +11,7 @@ SLOT="4"
if [[ ${QT4_BUILD_TYPE} == live ]]; then
KEYWORDS=""
else
- KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
+ KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
fi
IUSE="+accessibility"
diff --git a/x11-libs/qt-script/qt-script-4.8.9999.ebuild b/x11-libs/qt-script/qt-script-4.8.9999.ebuild
index 0c84dda..250e557 100644
--- a/x11-libs/qt-script/qt-script-4.8.9999.ebuild
+++ b/x11-libs/qt-script/qt-script-4.8.9999.ebuild
@@ -11,7 +11,7 @@ SLOT="4"
if [[ ${QT4_BUILD_TYPE} == live ]]; then
KEYWORDS=""
else
- KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+ KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
fi
IUSE="iconv +jit"
diff --git a/x11-libs/qt-sql/qt-sql-4.8.9999.ebuild b/x11-libs/qt-sql/qt-sql-4.8.9999.ebuild
index a992e42..e798ca8 100644
--- a/x11-libs/qt-sql/qt-sql-4.8.9999.ebuild
+++ b/x11-libs/qt-sql/qt-sql-4.8.9999.ebuild
@@ -11,7 +11,7 @@ SLOT="4"
if [[ ${QT4_BUILD_TYPE} == live ]]; then
KEYWORDS=""
else
- KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
+ KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
fi
IUSE="firebird freetds mysql oci8 odbc postgres qt3support +sqlite"
diff --git a/x11-libs/qt-svg/qt-svg-4.8.9999.ebuild b/x11-libs/qt-svg/qt-svg-4.8.9999.ebuild
index 478df04..c7899fd 100644
--- a/x11-libs/qt-svg/qt-svg-4.8.9999.ebuild
+++ b/x11-libs/qt-svg/qt-svg-4.8.9999.ebuild
@@ -11,7 +11,7 @@ SLOT="4"
if [[ ${QT4_BUILD_TYPE} == live ]]; then
KEYWORDS=""
else
- KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+ KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
fi
IUSE="+accessibility"
diff --git a/x11-libs/qt-test/qt-test-4.8.9999.ebuild b/x11-libs/qt-test/qt-test-4.8.9999.ebuild
index 3a781f8..a4df3da 100644
--- a/x11-libs/qt-test/qt-test-4.8.9999.ebuild
+++ b/x11-libs/qt-test/qt-test-4.8.9999.ebuild
@@ -11,7 +11,7 @@ SLOT="4"
if [[ ${QT4_BUILD_TYPE} == live ]]; then
KEYWORDS=""
else
- KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+ KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
fi
IUSE=""
diff --git a/x11-libs/qt-webkit/qt-webkit-4.8.9999.ebuild b/x11-libs/qt-webkit/qt-webkit-4.8.9999.ebuild
index c5a1fe2..e1c3746 100644
--- a/x11-libs/qt-webkit/qt-webkit-4.8.9999.ebuild
+++ b/x11-libs/qt-webkit/qt-webkit-4.8.9999.ebuild
@@ -11,7 +11,7 @@ SLOT="4"
if [[ ${QT4_BUILD_TYPE} == live ]]; then
KEYWORDS=""
else
- KEYWORDS="~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
+ KEYWORDS="~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
fi
IUSE="+gstreamer +icu +jit"
diff --git a/x11-libs/qt-xmlpatterns/qt-xmlpatterns-4.8.9999.ebuild b/x11-libs/qt-xmlpatterns/qt-xmlpatterns-4.8.9999.ebuild
index 72da16e..cdc03ca 100644
--- a/x11-libs/qt-xmlpatterns/qt-xmlpatterns-4.8.9999.ebuild
+++ b/x11-libs/qt-xmlpatterns/qt-xmlpatterns-4.8.9999.ebuild
@@ -11,7 +11,7 @@ SLOT="4"
if [[ ${QT4_BUILD_TYPE} == live ]]; then
KEYWORDS=""
else
- KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+ KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
fi
IUSE=""
^ permalink raw reply related [flat|nested] 11+ messages in thread* [gentoo-commits] proj/qt:master commit in: x11-libs/qt-opengl/, x11-libs/qt-script/, x11-libs/qt-qt3support/, ...
@ 2012-06-17 21:23 Davide Pesavento
0 siblings, 0 replies; 11+ messages in thread
From: Davide Pesavento @ 2012-06-17 21:23 UTC (permalink / raw
To: gentoo-commits
commit: b703d4fab426a9b78bc536828dbfce1cdd1dc25e
Author: Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Sun Jun 17 19:36:34 2012 +0000
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sun Jun 17 19:39:38 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=b703d4fa
[x11-libs/qt-*] Remove c++0x USE dependencies.
Upstream confirmed they aren't needed.
---
x11-libs/qt-assistant/qt-assistant-4.8.9999.ebuild | 6 ++--
x11-libs/qt-bearer/qt-bearer-4.8.9999.ebuild | 6 ++--
x11-libs/qt-core/qt-core-4.8.9999.ebuild | 2 +-
x11-libs/qt-dbus/qt-dbus-4.8.9999.ebuild | 2 +-
.../qt-declarative/qt-declarative-4.8.9999.ebuild | 18 +++++-----
x11-libs/qt-demo/qt-demo-4.8.9999.ebuild | 32 ++++++++++----------
x11-libs/qt-gui/qt-gui-4.8.9999.ebuild | 8 ++--
.../qt-multimedia/qt-multimedia-4.8.9999.ebuild | 4 +-
x11-libs/qt-opengl/qt-opengl-4.8.9999.ebuild | 4 +-
x11-libs/qt-openvg/qt-openvg-4.8.9999.ebuild | 4 +-
x11-libs/qt-phonon/qt-phonon-4.8.9999.ebuild | 4 +-
.../qt-qt3support/qt-qt3support-4.8.9999.ebuild | 6 ++--
x11-libs/qt-script/qt-script-4.8.9999.ebuild | 2 +-
x11-libs/qt-sql/qt-sql-4.8.9999.ebuild | 2 +-
x11-libs/qt-svg/qt-svg-4.8.9999.ebuild | 4 +-
x11-libs/qt-test/qt-test-4.8.9999.ebuild | 2 +-
x11-libs/qt-webkit/qt-webkit-4.8.9999.ebuild | 6 ++--
.../qt-xmlpatterns/qt-xmlpatterns-4.8.9999.ebuild | 2 +-
18 files changed, 57 insertions(+), 57 deletions(-)
diff --git a/x11-libs/qt-assistant/qt-assistant-4.8.9999.ebuild b/x11-libs/qt-assistant/qt-assistant-4.8.9999.ebuild
index 9bdde59..ef51e9b 100644
--- a/x11-libs/qt-assistant/qt-assistant-4.8.9999.ebuild
+++ b/x11-libs/qt-assistant/qt-assistant-4.8.9999.ebuild
@@ -22,9 +22,9 @@ fi
IUSE="compat doc +glib qt3support trace webkit"
DEPEND="
- ~x11-libs/qt-gui-${PV}[aqua=,c++0x=,debug=,glib=,qpa=,qt3support=,trace?]
- ~x11-libs/qt-sql-${PV}[aqua=,c++0x=,debug=,qpa=,qt3support=,sqlite]
- webkit? ( ~x11-libs/qt-webkit-${PV}[aqua=,c++0x=,debug=,qpa=] )
+ ~x11-libs/qt-gui-${PV}[aqua=,debug=,glib=,qpa=,qt3support=,trace?]
+ ~x11-libs/qt-sql-${PV}[aqua=,debug=,qpa=,qt3support=,sqlite]
+ webkit? ( ~x11-libs/qt-webkit-${PV}[aqua=,debug=,qpa=] )
"
RDEPEND="${DEPEND}"
diff --git a/x11-libs/qt-bearer/qt-bearer-4.8.9999.ebuild b/x11-libs/qt-bearer/qt-bearer-4.8.9999.ebuild
index e260ed5..5b41866 100644
--- a/x11-libs/qt-bearer/qt-bearer-4.8.9999.ebuild
+++ b/x11-libs/qt-bearer/qt-bearer-4.8.9999.ebuild
@@ -16,9 +16,9 @@ fi
IUSE="connman networkmanager"
DEPEND="
- ~x11-libs/qt-core-${PV}[aqua=,c++0x=,debug=,qpa=]
- connman? ( ~x11-libs/qt-dbus-${PV}[aqua=,c++0x=,debug=,qpa=] )
- networkmanager? ( ~x11-libs/qt-dbus-${PV}[aqua=,c++0x=,debug=,qpa=] )
+ ~x11-libs/qt-core-${PV}[aqua=,debug=,qpa=]
+ connman? ( ~x11-libs/qt-dbus-${PV}[aqua=,debug=,qpa=] )
+ networkmanager? ( ~x11-libs/qt-dbus-${PV}[aqua=,debug=,qpa=] )
"
RDEPEND="${DEPEND}
connman? ( net-misc/connman )
diff --git a/x11-libs/qt-core/qt-core-4.8.9999.ebuild b/x11-libs/qt-core/qt-core-4.8.9999.ebuild
index 18b773a..24cc108 100644
--- a/x11-libs/qt-core/qt-core-4.8.9999.ebuild
+++ b/x11-libs/qt-core/qt-core-4.8.9999.ebuild
@@ -25,7 +25,7 @@ DEPEND="
"
RDEPEND="${DEPEND}"
PDEPEND="
- qt3support? ( ~x11-libs/qt-gui-${PV}[aqua=,c++0x=,debug=,glib=,qpa=,qt3support] )
+ qt3support? ( ~x11-libs/qt-gui-${PV}[aqua=,debug=,glib=,qpa=,qt3support] )
"
PATCHES=(
diff --git a/x11-libs/qt-dbus/qt-dbus-4.8.9999.ebuild b/x11-libs/qt-dbus/qt-dbus-4.8.9999.ebuild
index e21b2b9..78338d8 100644
--- a/x11-libs/qt-dbus/qt-dbus-4.8.9999.ebuild
+++ b/x11-libs/qt-dbus/qt-dbus-4.8.9999.ebuild
@@ -17,7 +17,7 @@ IUSE=""
DEPEND="
>=sys-apps/dbus-1.2
- ~x11-libs/qt-core-${PV}[aqua=,c++0x=,debug=,qpa=]
+ ~x11-libs/qt-core-${PV}[aqua=,debug=,qpa=]
"
RDEPEND="${DEPEND}"
diff --git a/x11-libs/qt-declarative/qt-declarative-4.8.9999.ebuild b/x11-libs/qt-declarative/qt-declarative-4.8.9999.ebuild
index 5b8d0bc..b749199 100644
--- a/x11-libs/qt-declarative/qt-declarative-4.8.9999.ebuild
+++ b/x11-libs/qt-declarative/qt-declarative-4.8.9999.ebuild
@@ -16,15 +16,15 @@ fi
IUSE="+accessibility qt3support webkit"
DEPEND="
- ~x11-libs/qt-core-${PV}[aqua=,c++0x=,debug=,qpa=,qt3support=]
- ~x11-libs/qt-gui-${PV}[accessibility=,aqua=,c++0x=,debug=,qpa=,qt3support=]
- ~x11-libs/qt-opengl-${PV}[aqua=,c++0x=,debug=,qpa=,qt3support=]
- ~x11-libs/qt-script-${PV}[aqua=,c++0x=,debug=,qpa=]
- ~x11-libs/qt-sql-${PV}[aqua=,c++0x=,debug=,qpa=,qt3support=]
- ~x11-libs/qt-svg-${PV}[accessibility=,aqua=,c++0x=,debug=,qpa=]
- ~x11-libs/qt-xmlpatterns-${PV}[aqua=,c++0x=,debug=,qpa=]
- qt3support? ( ~x11-libs/qt-qt3support-${PV}[accessibility=,aqua=,c++0x=,debug=,qpa=] )
- webkit? ( ~x11-libs/qt-webkit-${PV}[aqua=,c++0x=,debug=,qpa=] )
+ ~x11-libs/qt-core-${PV}[aqua=,debug=,qpa=,qt3support=]
+ ~x11-libs/qt-gui-${PV}[accessibility=,aqua=,debug=,qpa=,qt3support=]
+ ~x11-libs/qt-opengl-${PV}[aqua=,debug=,qpa=,qt3support=]
+ ~x11-libs/qt-script-${PV}[aqua=,debug=,qpa=]
+ ~x11-libs/qt-sql-${PV}[aqua=,debug=,qpa=,qt3support=]
+ ~x11-libs/qt-svg-${PV}[accessibility=,aqua=,debug=,qpa=]
+ ~x11-libs/qt-xmlpatterns-${PV}[aqua=,debug=,qpa=]
+ qt3support? ( ~x11-libs/qt-qt3support-${PV}[accessibility=,aqua=,debug=,qpa=] )
+ webkit? ( ~x11-libs/qt-webkit-${PV}[aqua=,debug=,qpa=] )
"
RDEPEND="${DEPEND}"
diff --git a/x11-libs/qt-demo/qt-demo-4.8.9999.ebuild b/x11-libs/qt-demo/qt-demo-4.8.9999.ebuild
index a9d79f8..b33f7f2 100644
--- a/x11-libs/qt-demo/qt-demo-4.8.9999.ebuild
+++ b/x11-libs/qt-demo/qt-demo-4.8.9999.ebuild
@@ -16,26 +16,26 @@ fi
IUSE="dbus declarative kde multimedia opengl openvg qt3support webkit xmlpatterns"
DEPEND="
- ~x11-libs/qt-assistant-${PV}:4[aqua=,c++0x=,debug=,qpa=]
- ~x11-libs/qt-core-${PV}:4[aqua=,c++0x=,debug=,qpa=,qt3support?]
- ~x11-libs/qt-gui-${PV}:4[aqua=,c++0x=,debug=,qpa=,qt3support?]
- ~x11-libs/qt-script-${PV}:4[aqua=,c++0x=,debug=,qpa=]
- ~x11-libs/qt-sql-${PV}:4[aqua=,c++0x=,debug=,qpa=,qt3support?]
- ~x11-libs/qt-svg-${PV}:4[aqua=,c++0x=,debug=,qpa=]
- ~x11-libs/qt-test-${PV}:4[aqua=,c++0x=,debug=,qpa=]
- dbus? ( ~x11-libs/qt-dbus-${PV}:4[aqua=,c++0x=,debug=,qpa=] )
- declarative? ( ~x11-libs/qt-declarative-${PV}:4[aqua=,c++0x=,debug=,qpa=,webkit?] )
+ ~x11-libs/qt-assistant-${PV}:4[aqua=,debug=,qpa=]
+ ~x11-libs/qt-core-${PV}:4[aqua=,debug=,qpa=,qt3support?]
+ ~x11-libs/qt-gui-${PV}:4[aqua=,debug=,qpa=,qt3support?]
+ ~x11-libs/qt-script-${PV}:4[aqua=,debug=,qpa=]
+ ~x11-libs/qt-sql-${PV}:4[aqua=,debug=,qpa=,qt3support?]
+ ~x11-libs/qt-svg-${PV}:4[aqua=,debug=,qpa=]
+ ~x11-libs/qt-test-${PV}:4[aqua=,debug=,qpa=]
+ dbus? ( ~x11-libs/qt-dbus-${PV}:4[aqua=,debug=,qpa=] )
+ declarative? ( ~x11-libs/qt-declarative-${PV}:4[aqua=,debug=,qpa=,webkit?] )
kde? ( media-libs/phonon[aqua=] )
!kde? ( || (
- ~x11-libs/qt-phonon-${PV}:4[aqua=,c++0x=,debug=,qpa=]
+ ~x11-libs/qt-phonon-${PV}:4[aqua=,debug=,qpa=]
media-libs/phonon[aqua=]
) )
- multimedia? ( ~x11-libs/qt-multimedia-${PV}:4[aqua=,c++0x=,debug=,qpa=] )
- opengl? ( ~x11-libs/qt-opengl-${PV}:4[aqua=,c++0x=,debug=,qpa=,qt3support?] )
- openvg? ( ~x11-libs/qt-openvg-${PV}:4[aqua=,c++0x=,debug=,qpa=,qt3support?] )
- qt3support? ( ~x11-libs/qt-qt3support-${PV}:4[aqua=,c++0x=,debug=,qpa=] )
- webkit? ( ~x11-libs/qt-webkit-${PV}:4[aqua=,c++0x=,debug=,qpa=] )
- xmlpatterns? ( ~x11-libs/qt-xmlpatterns-${PV}:4[aqua=,c++0x=,debug=,qpa=] )
+ multimedia? ( ~x11-libs/qt-multimedia-${PV}:4[aqua=,debug=,qpa=] )
+ opengl? ( ~x11-libs/qt-opengl-${PV}:4[aqua=,debug=,qpa=,qt3support?] )
+ openvg? ( ~x11-libs/qt-openvg-${PV}:4[aqua=,debug=,qpa=,qt3support?] )
+ qt3support? ( ~x11-libs/qt-qt3support-${PV}:4[aqua=,debug=,qpa=] )
+ webkit? ( ~x11-libs/qt-webkit-${PV}:4[aqua=,debug=,qpa=] )
+ xmlpatterns? ( ~x11-libs/qt-xmlpatterns-${PV}:4[aqua=,debug=,qpa=] )
"
RDEPEND="${DEPEND}"
diff --git a/x11-libs/qt-gui/qt-gui-4.8.9999.ebuild b/x11-libs/qt-gui/qt-gui-4.8.9999.ebuild
index aea8ad4..6d8ce1f 100644
--- a/x11-libs/qt-gui/qt-gui-4.8.9999.ebuild
+++ b/x11-libs/qt-gui/qt-gui-4.8.9999.ebuild
@@ -26,8 +26,8 @@ RDEPEND="
media-libs/libpng:0
sys-libs/zlib
virtual/jpeg
- ~x11-libs/qt-core-${PV}[aqua=,c++0x=,qpa=,debug=,glib=,qt3support=]
- ~x11-libs/qt-script-${PV}[aqua=,c++0x=,qpa=,debug=]
+ ~x11-libs/qt-core-${PV}[aqua=,qpa=,debug=,glib=,qt3support=]
+ ~x11-libs/qt-script-${PV}[aqua=,qpa=,debug=]
!aqua? (
x11-libs/libICE
x11-libs/libSM
@@ -41,7 +41,7 @@ RDEPEND="
xv? ( x11-libs/libXv )
)
cups? ( net-print/cups )
- dbus? ( ~x11-libs/qt-dbus-${PV}[aqua=,c++0x=,qpa=,debug=] )
+ dbus? ( ~x11-libs/qt-dbus-${PV}[aqua=,qpa=,debug=] )
egl? ( media-libs/mesa[egl] )
gtkstyle? ( x11-libs/gtk+:2[aqua=] )
mng? ( >=media-libs/libmng-1.0.9 )
@@ -56,7 +56,7 @@ DEPEND="${RDEPEND}
xv? ( x11-proto/videoproto )
)
"
-PDEPEND="qt3support? ( ~x11-libs/qt-qt3support-${PV}[aqua=,c++0x=,debug=,qpa=] )"
+PDEPEND="qt3support? ( ~x11-libs/qt-qt3support-${PV}[aqua=,debug=,qpa=] )"
PATCHES=(
"${FILESDIR}/${PN}-4.7.3-cups.patch"
diff --git a/x11-libs/qt-multimedia/qt-multimedia-4.8.9999.ebuild b/x11-libs/qt-multimedia/qt-multimedia-4.8.9999.ebuild
index a86bd6b..3647d84 100644
--- a/x11-libs/qt-multimedia/qt-multimedia-4.8.9999.ebuild
+++ b/x11-libs/qt-multimedia/qt-multimedia-4.8.9999.ebuild
@@ -16,8 +16,8 @@ fi
IUSE="alsa"
DEPEND="
- ~x11-libs/qt-core-${PV}[aqua=,c++0x=,debug=,qpa=]
- ~x11-libs/qt-gui-${PV}[aqua=,c++0x=,debug=,qpa=]
+ ~x11-libs/qt-core-${PV}[aqua=,debug=,qpa=]
+ ~x11-libs/qt-gui-${PV}[aqua=,debug=,qpa=]
alsa? ( media-libs/alsa-lib )
"
RDEPEND="${DEPEND}"
diff --git a/x11-libs/qt-opengl/qt-opengl-4.8.9999.ebuild b/x11-libs/qt-opengl/qt-opengl-4.8.9999.ebuild
index bb45b73..2c86a47 100644
--- a/x11-libs/qt-opengl/qt-opengl-4.8.9999.ebuild
+++ b/x11-libs/qt-opengl/qt-opengl-4.8.9999.ebuild
@@ -17,8 +17,8 @@ IUSE="egl qt3support"
DEPEND="
virtual/opengl
- ~x11-libs/qt-core-${PV}[aqua=,c++0x=,debug=,qpa=,qt3support=]
- ~x11-libs/qt-gui-${PV}[aqua=,c++0x=,debug=,egl=,qpa=,qt3support=]
+ ~x11-libs/qt-core-${PV}[aqua=,debug=,qpa=,qt3support=]
+ ~x11-libs/qt-gui-${PV}[aqua=,debug=,egl=,qpa=,qt3support=]
"
RDEPEND="${DEPEND}"
diff --git a/x11-libs/qt-openvg/qt-openvg-4.8.9999.ebuild b/x11-libs/qt-openvg/qt-openvg-4.8.9999.ebuild
index 37e93c1..ff2154a 100644
--- a/x11-libs/qt-openvg/qt-openvg-4.8.9999.ebuild
+++ b/x11-libs/qt-openvg/qt-openvg-4.8.9999.ebuild
@@ -17,8 +17,8 @@ IUSE="qt3support"
DEPEND="
media-libs/mesa[egl,openvg]
- ~x11-libs/qt-core-${PV}[aqua=,c++0x=,debug=,qpa=,qt3support=]
- ~x11-libs/qt-gui-${PV}[aqua=,c++0x=,debug=,egl,qpa=,qt3support=]
+ ~x11-libs/qt-core-${PV}[aqua=,debug=,qpa=,qt3support=]
+ ~x11-libs/qt-gui-${PV}[aqua=,debug=,egl,qpa=,qt3support=]
"
RDEPEND="${DEPEND}"
diff --git a/x11-libs/qt-phonon/qt-phonon-4.8.9999.ebuild b/x11-libs/qt-phonon/qt-phonon-4.8.9999.ebuild
index 7e70270..27d9dc5 100644
--- a/x11-libs/qt-phonon/qt-phonon-4.8.9999.ebuild
+++ b/x11-libs/qt-phonon/qt-phonon-4.8.9999.ebuild
@@ -16,7 +16,7 @@ fi
IUSE="dbus qt3support"
DEPEND="
- ~x11-libs/qt-gui-${PV}[aqua=,c++0x=,qpa=,debug=,qt3support=]
+ ~x11-libs/qt-gui-${PV}[aqua=,qpa=,debug=,qt3support=]
!kde-base/phonon-kde
!kde-base/phonon-xine
!media-libs/phonon
@@ -24,7 +24,7 @@ DEPEND="
!aqua? ( media-libs/gstreamer
media-plugins/gst-plugins-meta )
aqua? ( ~x11-libs/qt-opengl-${PV}[aqua,debug=,qt3support=] )
- dbus? ( ~x11-libs/qt-dbus-${PV}[aqua=,c++0x=,qpa=,debug=] )
+ dbus? ( ~x11-libs/qt-dbus-${PV}[aqua=,qpa=,debug=] )
"
RDEPEND="${DEPEND}"
diff --git a/x11-libs/qt-qt3support/qt-qt3support-4.8.9999.ebuild b/x11-libs/qt-qt3support/qt-qt3support-4.8.9999.ebuild
index d12f42c..4fab110 100644
--- a/x11-libs/qt-qt3support/qt-qt3support-4.8.9999.ebuild
+++ b/x11-libs/qt-qt3support/qt-qt3support-4.8.9999.ebuild
@@ -16,9 +16,9 @@ fi
IUSE="+accessibility"
DEPEND="
- ~x11-libs/qt-core-${PV}[aqua=,c++0x=,debug=,qpa=,qt3support]
- ~x11-libs/qt-gui-${PV}[accessibility=,aqua=,c++0x=,debug=,qpa=,qt3support]
- ~x11-libs/qt-sql-${PV}[aqua=,c++0x=,debug=,qpa=,qt3support]
+ ~x11-libs/qt-core-${PV}[aqua=,debug=,qpa=,qt3support]
+ ~x11-libs/qt-gui-${PV}[accessibility=,aqua=,debug=,qpa=,qt3support]
+ ~x11-libs/qt-sql-${PV}[aqua=,debug=,qpa=,qt3support]
"
RDEPEND="${DEPEND}"
diff --git a/x11-libs/qt-script/qt-script-4.8.9999.ebuild b/x11-libs/qt-script/qt-script-4.8.9999.ebuild
index 250e557..665738b 100644
--- a/x11-libs/qt-script/qt-script-4.8.9999.ebuild
+++ b/x11-libs/qt-script/qt-script-4.8.9999.ebuild
@@ -16,7 +16,7 @@ fi
IUSE="iconv +jit"
DEPEND="
- ~x11-libs/qt-core-${PV}[aqua=,c++0x=,debug=,qpa=]
+ ~x11-libs/qt-core-${PV}[aqua=,debug=,qpa=]
"
RDEPEND="${DEPEND}"
diff --git a/x11-libs/qt-sql/qt-sql-4.8.9999.ebuild b/x11-libs/qt-sql/qt-sql-4.8.9999.ebuild
index e798ca8..fe59e08 100644
--- a/x11-libs/qt-sql/qt-sql-4.8.9999.ebuild
+++ b/x11-libs/qt-sql/qt-sql-4.8.9999.ebuild
@@ -20,7 +20,7 @@ REQUIRED_USE="
"
DEPEND="
- ~x11-libs/qt-core-${PV}[aqua=,c++0x=,debug=,qpa=,qt3support=]
+ ~x11-libs/qt-core-${PV}[aqua=,debug=,qpa=,qt3support=]
firebird? ( dev-db/firebird )
freetds? ( dev-db/freetds )
mysql? ( virtual/mysql )
diff --git a/x11-libs/qt-svg/qt-svg-4.8.9999.ebuild b/x11-libs/qt-svg/qt-svg-4.8.9999.ebuild
index c7899fd..0031ee4 100644
--- a/x11-libs/qt-svg/qt-svg-4.8.9999.ebuild
+++ b/x11-libs/qt-svg/qt-svg-4.8.9999.ebuild
@@ -17,8 +17,8 @@ IUSE="+accessibility"
DEPEND="
sys-libs/zlib
- ~x11-libs/qt-core-${PV}[aqua=,c++0x=,debug=,qpa=]
- ~x11-libs/qt-gui-${PV}[accessibility=,aqua=,c++0x=,debug=,qpa=]
+ ~x11-libs/qt-core-${PV}[aqua=,debug=,qpa=]
+ ~x11-libs/qt-gui-${PV}[accessibility=,aqua=,debug=,qpa=]
"
RDEPEND="${DEPEND}"
diff --git a/x11-libs/qt-test/qt-test-4.8.9999.ebuild b/x11-libs/qt-test/qt-test-4.8.9999.ebuild
index a4df3da..b76dabd 100644
--- a/x11-libs/qt-test/qt-test-4.8.9999.ebuild
+++ b/x11-libs/qt-test/qt-test-4.8.9999.ebuild
@@ -16,7 +16,7 @@ fi
IUSE=""
DEPEND="
- ~x11-libs/qt-core-${PV}[aqua=,c++0x=,debug=,qpa=]
+ ~x11-libs/qt-core-${PV}[aqua=,debug=,qpa=]
"
RDEPEND="${DEPEND}"
diff --git a/x11-libs/qt-webkit/qt-webkit-4.8.9999.ebuild b/x11-libs/qt-webkit/qt-webkit-4.8.9999.ebuild
index 50b4a10..12ba243 100644
--- a/x11-libs/qt-webkit/qt-webkit-4.8.9999.ebuild
+++ b/x11-libs/qt-webkit/qt-webkit-4.8.9999.ebuild
@@ -20,9 +20,9 @@ DEPEND="
dev-db/sqlite:3
x11-libs/libX11
x11-libs/libXrender
- ~x11-libs/qt-core-${PV}[aqua=,c++0x=,debug=,ssl,qpa=]
- ~x11-libs/qt-gui-${PV}[aqua=,c++0x=,debug=,qpa=]
- ~x11-libs/qt-xmlpatterns-${PV}[aqua=,c++0x=,debug=,qpa=]
+ ~x11-libs/qt-core-${PV}[aqua=,debug=,ssl,qpa=]
+ ~x11-libs/qt-gui-${PV}[aqua=,debug=,qpa=]
+ ~x11-libs/qt-xmlpatterns-${PV}[aqua=,debug=,qpa=]
gstreamer? (
dev-libs/glib:2
dev-libs/libxml2:2[!icu?]
diff --git a/x11-libs/qt-xmlpatterns/qt-xmlpatterns-4.8.9999.ebuild b/x11-libs/qt-xmlpatterns/qt-xmlpatterns-4.8.9999.ebuild
index cdc03ca..8a83659 100644
--- a/x11-libs/qt-xmlpatterns/qt-xmlpatterns-4.8.9999.ebuild
+++ b/x11-libs/qt-xmlpatterns/qt-xmlpatterns-4.8.9999.ebuild
@@ -16,7 +16,7 @@ fi
IUSE=""
DEPEND="
- ~x11-libs/qt-core-${PV}[aqua=,c++0x=,debug=,exceptions,qpa=]
+ ~x11-libs/qt-core-${PV}[aqua=,debug=,exceptions,qpa=]
"
RDEPEND="${DEPEND}"
^ permalink raw reply related [flat|nested] 11+ messages in thread* [gentoo-commits] proj/qt:master commit in: x11-libs/qt-opengl/, x11-libs/qt-script/, x11-libs/qt-qt3support/, ...
@ 2012-06-17 21:23 Davide Pesavento
0 siblings, 0 replies; 11+ messages in thread
From: Davide Pesavento @ 2012-06-17 21:23 UTC (permalink / raw
To: gentoo-commits
commit: f2ed223393302a5cde4637831e70c51db17dd2f7
Author: Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Sun Jun 17 21:04:22 2012 +0000
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sun Jun 17 21:04:22 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=f2ed2233
[x11-libs/qt-*] Remove USE=qpa for Qt >= 4.8.3 (unreleased).
---
eclass/qt4-build.eclass | 2 +-
x11-libs/qt-assistant/qt-assistant-4.8.9999.ebuild | 6 ++--
x11-libs/qt-bearer/qt-bearer-4.8.9999.ebuild | 6 ++--
x11-libs/qt-core/qt-core-4.8.9999.ebuild | 2 +-
x11-libs/qt-dbus/qt-dbus-4.8.9999.ebuild | 2 +-
.../qt-declarative/qt-declarative-4.8.9999.ebuild | 18 +++++-----
x11-libs/qt-demo/qt-demo-4.8.9999.ebuild | 32 ++++++++++----------
x11-libs/qt-gui/qt-gui-4.8.9999.ebuild | 8 ++--
.../qt-multimedia/qt-multimedia-4.8.9999.ebuild | 4 +-
x11-libs/qt-opengl/qt-opengl-4.8.9999.ebuild | 4 +-
x11-libs/qt-openvg/qt-openvg-4.8.9999.ebuild | 4 +-
x11-libs/qt-phonon/qt-phonon-4.8.9999.ebuild | 4 +-
.../qt-qt3support/qt-qt3support-4.8.9999.ebuild | 6 ++--
x11-libs/qt-script/qt-script-4.8.9999.ebuild | 2 +-
x11-libs/qt-sql/qt-sql-4.8.9999.ebuild | 2 +-
x11-libs/qt-svg/qt-svg-4.8.9999.ebuild | 4 +-
x11-libs/qt-test/qt-test-4.8.9999.ebuild | 2 +-
x11-libs/qt-webkit/qt-webkit-4.8.9999.ebuild | 6 ++--
.../qt-xmlpatterns/qt-xmlpatterns-4.8.9999.ebuild | 2 +-
19 files changed, 58 insertions(+), 58 deletions(-)
diff --git a/eclass/qt4-build.eclass b/eclass/qt4-build.eclass
index 482309c..dd39ff4 100644
--- a/eclass/qt4-build.eclass
+++ b/eclass/qt4-build.eclass
@@ -48,7 +48,7 @@ IUSE="aqua debug pch"
[[ ${CATEGORY}/${PN} != x11-libs/qt-xmlpatterns ]] && IUSE+=" +exceptions"
if version_is_at_least 4.8; then
[[ ${CATEGORY}/${PN} != x11-libs/qt-webkit ]] && IUSE+=" c++0x"
- IUSE+=" qpa"
+ version_is_at_least 4.8.3 || IUSE+=" qpa"
fi
DEPEND="virtual/pkgconfig"
diff --git a/x11-libs/qt-assistant/qt-assistant-4.8.9999.ebuild b/x11-libs/qt-assistant/qt-assistant-4.8.9999.ebuild
index ef51e9b..ab62ce2 100644
--- a/x11-libs/qt-assistant/qt-assistant-4.8.9999.ebuild
+++ b/x11-libs/qt-assistant/qt-assistant-4.8.9999.ebuild
@@ -22,9 +22,9 @@ fi
IUSE="compat doc +glib qt3support trace webkit"
DEPEND="
- ~x11-libs/qt-gui-${PV}[aqua=,debug=,glib=,qpa=,qt3support=,trace?]
- ~x11-libs/qt-sql-${PV}[aqua=,debug=,qpa=,qt3support=,sqlite]
- webkit? ( ~x11-libs/qt-webkit-${PV}[aqua=,debug=,qpa=] )
+ ~x11-libs/qt-gui-${PV}[aqua=,debug=,glib=,qt3support=,trace?]
+ ~x11-libs/qt-sql-${PV}[aqua=,debug=,qt3support=,sqlite]
+ webkit? ( ~x11-libs/qt-webkit-${PV}[aqua=,debug=] )
"
RDEPEND="${DEPEND}"
diff --git a/x11-libs/qt-bearer/qt-bearer-4.8.9999.ebuild b/x11-libs/qt-bearer/qt-bearer-4.8.9999.ebuild
index 5b41866..b058fae 100644
--- a/x11-libs/qt-bearer/qt-bearer-4.8.9999.ebuild
+++ b/x11-libs/qt-bearer/qt-bearer-4.8.9999.ebuild
@@ -16,9 +16,9 @@ fi
IUSE="connman networkmanager"
DEPEND="
- ~x11-libs/qt-core-${PV}[aqua=,debug=,qpa=]
- connman? ( ~x11-libs/qt-dbus-${PV}[aqua=,debug=,qpa=] )
- networkmanager? ( ~x11-libs/qt-dbus-${PV}[aqua=,debug=,qpa=] )
+ ~x11-libs/qt-core-${PV}[aqua=,debug=]
+ connman? ( ~x11-libs/qt-dbus-${PV}[aqua=,debug=] )
+ networkmanager? ( ~x11-libs/qt-dbus-${PV}[aqua=,debug=] )
"
RDEPEND="${DEPEND}
connman? ( net-misc/connman )
diff --git a/x11-libs/qt-core/qt-core-4.8.9999.ebuild b/x11-libs/qt-core/qt-core-4.8.9999.ebuild
index 24cc108..29209dd 100644
--- a/x11-libs/qt-core/qt-core-4.8.9999.ebuild
+++ b/x11-libs/qt-core/qt-core-4.8.9999.ebuild
@@ -25,7 +25,7 @@ DEPEND="
"
RDEPEND="${DEPEND}"
PDEPEND="
- qt3support? ( ~x11-libs/qt-gui-${PV}[aqua=,debug=,glib=,qpa=,qt3support] )
+ qt3support? ( ~x11-libs/qt-gui-${PV}[aqua=,debug=,glib=,qt3support] )
"
PATCHES=(
diff --git a/x11-libs/qt-dbus/qt-dbus-4.8.9999.ebuild b/x11-libs/qt-dbus/qt-dbus-4.8.9999.ebuild
index 78338d8..a5ad50b 100644
--- a/x11-libs/qt-dbus/qt-dbus-4.8.9999.ebuild
+++ b/x11-libs/qt-dbus/qt-dbus-4.8.9999.ebuild
@@ -17,7 +17,7 @@ IUSE=""
DEPEND="
>=sys-apps/dbus-1.2
- ~x11-libs/qt-core-${PV}[aqua=,debug=,qpa=]
+ ~x11-libs/qt-core-${PV}[aqua=,debug=]
"
RDEPEND="${DEPEND}"
diff --git a/x11-libs/qt-declarative/qt-declarative-4.8.9999.ebuild b/x11-libs/qt-declarative/qt-declarative-4.8.9999.ebuild
index b749199..631eed7 100644
--- a/x11-libs/qt-declarative/qt-declarative-4.8.9999.ebuild
+++ b/x11-libs/qt-declarative/qt-declarative-4.8.9999.ebuild
@@ -16,15 +16,15 @@ fi
IUSE="+accessibility qt3support webkit"
DEPEND="
- ~x11-libs/qt-core-${PV}[aqua=,debug=,qpa=,qt3support=]
- ~x11-libs/qt-gui-${PV}[accessibility=,aqua=,debug=,qpa=,qt3support=]
- ~x11-libs/qt-opengl-${PV}[aqua=,debug=,qpa=,qt3support=]
- ~x11-libs/qt-script-${PV}[aqua=,debug=,qpa=]
- ~x11-libs/qt-sql-${PV}[aqua=,debug=,qpa=,qt3support=]
- ~x11-libs/qt-svg-${PV}[accessibility=,aqua=,debug=,qpa=]
- ~x11-libs/qt-xmlpatterns-${PV}[aqua=,debug=,qpa=]
- qt3support? ( ~x11-libs/qt-qt3support-${PV}[accessibility=,aqua=,debug=,qpa=] )
- webkit? ( ~x11-libs/qt-webkit-${PV}[aqua=,debug=,qpa=] )
+ ~x11-libs/qt-core-${PV}[aqua=,debug=,qt3support=]
+ ~x11-libs/qt-gui-${PV}[accessibility=,aqua=,debug=,qt3support=]
+ ~x11-libs/qt-opengl-${PV}[aqua=,debug=,qt3support=]
+ ~x11-libs/qt-script-${PV}[aqua=,debug=]
+ ~x11-libs/qt-sql-${PV}[aqua=,debug=,qt3support=]
+ ~x11-libs/qt-svg-${PV}[accessibility=,aqua=,debug=]
+ ~x11-libs/qt-xmlpatterns-${PV}[aqua=,debug=]
+ qt3support? ( ~x11-libs/qt-qt3support-${PV}[accessibility=,aqua=,debug=] )
+ webkit? ( ~x11-libs/qt-webkit-${PV}[aqua=,debug=] )
"
RDEPEND="${DEPEND}"
diff --git a/x11-libs/qt-demo/qt-demo-4.8.9999.ebuild b/x11-libs/qt-demo/qt-demo-4.8.9999.ebuild
index b33f7f2..9bb6a3c 100644
--- a/x11-libs/qt-demo/qt-demo-4.8.9999.ebuild
+++ b/x11-libs/qt-demo/qt-demo-4.8.9999.ebuild
@@ -16,26 +16,26 @@ fi
IUSE="dbus declarative kde multimedia opengl openvg qt3support webkit xmlpatterns"
DEPEND="
- ~x11-libs/qt-assistant-${PV}:4[aqua=,debug=,qpa=]
- ~x11-libs/qt-core-${PV}:4[aqua=,debug=,qpa=,qt3support?]
- ~x11-libs/qt-gui-${PV}:4[aqua=,debug=,qpa=,qt3support?]
- ~x11-libs/qt-script-${PV}:4[aqua=,debug=,qpa=]
- ~x11-libs/qt-sql-${PV}:4[aqua=,debug=,qpa=,qt3support?]
- ~x11-libs/qt-svg-${PV}:4[aqua=,debug=,qpa=]
- ~x11-libs/qt-test-${PV}:4[aqua=,debug=,qpa=]
- dbus? ( ~x11-libs/qt-dbus-${PV}:4[aqua=,debug=,qpa=] )
- declarative? ( ~x11-libs/qt-declarative-${PV}:4[aqua=,debug=,qpa=,webkit?] )
+ ~x11-libs/qt-assistant-${PV}:4[aqua=,debug=]
+ ~x11-libs/qt-core-${PV}:4[aqua=,debug=,qt3support?]
+ ~x11-libs/qt-gui-${PV}:4[aqua=,debug=,qt3support?]
+ ~x11-libs/qt-script-${PV}:4[aqua=,debug=]
+ ~x11-libs/qt-sql-${PV}:4[aqua=,debug=,qt3support?]
+ ~x11-libs/qt-svg-${PV}:4[aqua=,debug=]
+ ~x11-libs/qt-test-${PV}:4[aqua=,debug=]
+ dbus? ( ~x11-libs/qt-dbus-${PV}:4[aqua=,debug=] )
+ declarative? ( ~x11-libs/qt-declarative-${PV}:4[aqua=,debug=,webkit?] )
kde? ( media-libs/phonon[aqua=] )
!kde? ( || (
- ~x11-libs/qt-phonon-${PV}:4[aqua=,debug=,qpa=]
+ ~x11-libs/qt-phonon-${PV}:4[aqua=,debug=]
media-libs/phonon[aqua=]
) )
- multimedia? ( ~x11-libs/qt-multimedia-${PV}:4[aqua=,debug=,qpa=] )
- opengl? ( ~x11-libs/qt-opengl-${PV}:4[aqua=,debug=,qpa=,qt3support?] )
- openvg? ( ~x11-libs/qt-openvg-${PV}:4[aqua=,debug=,qpa=,qt3support?] )
- qt3support? ( ~x11-libs/qt-qt3support-${PV}:4[aqua=,debug=,qpa=] )
- webkit? ( ~x11-libs/qt-webkit-${PV}:4[aqua=,debug=,qpa=] )
- xmlpatterns? ( ~x11-libs/qt-xmlpatterns-${PV}:4[aqua=,debug=,qpa=] )
+ multimedia? ( ~x11-libs/qt-multimedia-${PV}:4[aqua=,debug=] )
+ opengl? ( ~x11-libs/qt-opengl-${PV}:4[aqua=,debug=,qt3support?] )
+ openvg? ( ~x11-libs/qt-openvg-${PV}:4[aqua=,debug=,qt3support?] )
+ qt3support? ( ~x11-libs/qt-qt3support-${PV}:4[aqua=,debug=] )
+ webkit? ( ~x11-libs/qt-webkit-${PV}:4[aqua=,debug=] )
+ xmlpatterns? ( ~x11-libs/qt-xmlpatterns-${PV}:4[aqua=,debug=] )
"
RDEPEND="${DEPEND}"
diff --git a/x11-libs/qt-gui/qt-gui-4.8.9999.ebuild b/x11-libs/qt-gui/qt-gui-4.8.9999.ebuild
index 6d8ce1f..e953e37 100644
--- a/x11-libs/qt-gui/qt-gui-4.8.9999.ebuild
+++ b/x11-libs/qt-gui/qt-gui-4.8.9999.ebuild
@@ -26,8 +26,8 @@ RDEPEND="
media-libs/libpng:0
sys-libs/zlib
virtual/jpeg
- ~x11-libs/qt-core-${PV}[aqua=,qpa=,debug=,glib=,qt3support=]
- ~x11-libs/qt-script-${PV}[aqua=,qpa=,debug=]
+ ~x11-libs/qt-core-${PV}[aqua=,debug=,glib=,qt3support=]
+ ~x11-libs/qt-script-${PV}[aqua=,debug=]
!aqua? (
x11-libs/libICE
x11-libs/libSM
@@ -41,7 +41,7 @@ RDEPEND="
xv? ( x11-libs/libXv )
)
cups? ( net-print/cups )
- dbus? ( ~x11-libs/qt-dbus-${PV}[aqua=,qpa=,debug=] )
+ dbus? ( ~x11-libs/qt-dbus-${PV}[aqua=,debug=] )
egl? ( media-libs/mesa[egl] )
gtkstyle? ( x11-libs/gtk+:2[aqua=] )
mng? ( >=media-libs/libmng-1.0.9 )
@@ -56,7 +56,7 @@ DEPEND="${RDEPEND}
xv? ( x11-proto/videoproto )
)
"
-PDEPEND="qt3support? ( ~x11-libs/qt-qt3support-${PV}[aqua=,debug=,qpa=] )"
+PDEPEND="qt3support? ( ~x11-libs/qt-qt3support-${PV}[aqua=,debug=] )"
PATCHES=(
"${FILESDIR}/${PN}-4.7.3-cups.patch"
diff --git a/x11-libs/qt-multimedia/qt-multimedia-4.8.9999.ebuild b/x11-libs/qt-multimedia/qt-multimedia-4.8.9999.ebuild
index 3647d84..82686fb 100644
--- a/x11-libs/qt-multimedia/qt-multimedia-4.8.9999.ebuild
+++ b/x11-libs/qt-multimedia/qt-multimedia-4.8.9999.ebuild
@@ -16,8 +16,8 @@ fi
IUSE="alsa"
DEPEND="
- ~x11-libs/qt-core-${PV}[aqua=,debug=,qpa=]
- ~x11-libs/qt-gui-${PV}[aqua=,debug=,qpa=]
+ ~x11-libs/qt-core-${PV}[aqua=,debug=]
+ ~x11-libs/qt-gui-${PV}[aqua=,debug=]
alsa? ( media-libs/alsa-lib )
"
RDEPEND="${DEPEND}"
diff --git a/x11-libs/qt-opengl/qt-opengl-4.8.9999.ebuild b/x11-libs/qt-opengl/qt-opengl-4.8.9999.ebuild
index 2c86a47..b5abade 100644
--- a/x11-libs/qt-opengl/qt-opengl-4.8.9999.ebuild
+++ b/x11-libs/qt-opengl/qt-opengl-4.8.9999.ebuild
@@ -17,8 +17,8 @@ IUSE="egl qt3support"
DEPEND="
virtual/opengl
- ~x11-libs/qt-core-${PV}[aqua=,debug=,qpa=,qt3support=]
- ~x11-libs/qt-gui-${PV}[aqua=,debug=,egl=,qpa=,qt3support=]
+ ~x11-libs/qt-core-${PV}[aqua=,debug=,qt3support=]
+ ~x11-libs/qt-gui-${PV}[aqua=,debug=,egl=,qt3support=]
"
RDEPEND="${DEPEND}"
diff --git a/x11-libs/qt-openvg/qt-openvg-4.8.9999.ebuild b/x11-libs/qt-openvg/qt-openvg-4.8.9999.ebuild
index ff2154a..29c8fea 100644
--- a/x11-libs/qt-openvg/qt-openvg-4.8.9999.ebuild
+++ b/x11-libs/qt-openvg/qt-openvg-4.8.9999.ebuild
@@ -17,8 +17,8 @@ IUSE="qt3support"
DEPEND="
media-libs/mesa[egl,openvg]
- ~x11-libs/qt-core-${PV}[aqua=,debug=,qpa=,qt3support=]
- ~x11-libs/qt-gui-${PV}[aqua=,debug=,egl,qpa=,qt3support=]
+ ~x11-libs/qt-core-${PV}[aqua=,debug=,qt3support=]
+ ~x11-libs/qt-gui-${PV}[aqua=,debug=,egl,qt3support=]
"
RDEPEND="${DEPEND}"
diff --git a/x11-libs/qt-phonon/qt-phonon-4.8.9999.ebuild b/x11-libs/qt-phonon/qt-phonon-4.8.9999.ebuild
index 27d9dc5..ed704f2 100644
--- a/x11-libs/qt-phonon/qt-phonon-4.8.9999.ebuild
+++ b/x11-libs/qt-phonon/qt-phonon-4.8.9999.ebuild
@@ -16,7 +16,7 @@ fi
IUSE="dbus qt3support"
DEPEND="
- ~x11-libs/qt-gui-${PV}[aqua=,qpa=,debug=,qt3support=]
+ ~x11-libs/qt-gui-${PV}[aqua=,debug=,qt3support=]
!kde-base/phonon-kde
!kde-base/phonon-xine
!media-libs/phonon
@@ -24,7 +24,7 @@ DEPEND="
!aqua? ( media-libs/gstreamer
media-plugins/gst-plugins-meta )
aqua? ( ~x11-libs/qt-opengl-${PV}[aqua,debug=,qt3support=] )
- dbus? ( ~x11-libs/qt-dbus-${PV}[aqua=,qpa=,debug=] )
+ dbus? ( ~x11-libs/qt-dbus-${PV}[aqua=,debug=] )
"
RDEPEND="${DEPEND}"
diff --git a/x11-libs/qt-qt3support/qt-qt3support-4.8.9999.ebuild b/x11-libs/qt-qt3support/qt-qt3support-4.8.9999.ebuild
index 4fab110..148e594 100644
--- a/x11-libs/qt-qt3support/qt-qt3support-4.8.9999.ebuild
+++ b/x11-libs/qt-qt3support/qt-qt3support-4.8.9999.ebuild
@@ -16,9 +16,9 @@ fi
IUSE="+accessibility"
DEPEND="
- ~x11-libs/qt-core-${PV}[aqua=,debug=,qpa=,qt3support]
- ~x11-libs/qt-gui-${PV}[accessibility=,aqua=,debug=,qpa=,qt3support]
- ~x11-libs/qt-sql-${PV}[aqua=,debug=,qpa=,qt3support]
+ ~x11-libs/qt-core-${PV}[aqua=,debug=,qt3support]
+ ~x11-libs/qt-gui-${PV}[accessibility=,aqua=,debug=,qt3support]
+ ~x11-libs/qt-sql-${PV}[aqua=,debug=,qt3support]
"
RDEPEND="${DEPEND}"
diff --git a/x11-libs/qt-script/qt-script-4.8.9999.ebuild b/x11-libs/qt-script/qt-script-4.8.9999.ebuild
index 665738b..8688312 100644
--- a/x11-libs/qt-script/qt-script-4.8.9999.ebuild
+++ b/x11-libs/qt-script/qt-script-4.8.9999.ebuild
@@ -16,7 +16,7 @@ fi
IUSE="iconv +jit"
DEPEND="
- ~x11-libs/qt-core-${PV}[aqua=,debug=,qpa=]
+ ~x11-libs/qt-core-${PV}[aqua=,debug=]
"
RDEPEND="${DEPEND}"
diff --git a/x11-libs/qt-sql/qt-sql-4.8.9999.ebuild b/x11-libs/qt-sql/qt-sql-4.8.9999.ebuild
index fe59e08..65ed9b0 100644
--- a/x11-libs/qt-sql/qt-sql-4.8.9999.ebuild
+++ b/x11-libs/qt-sql/qt-sql-4.8.9999.ebuild
@@ -20,7 +20,7 @@ REQUIRED_USE="
"
DEPEND="
- ~x11-libs/qt-core-${PV}[aqua=,debug=,qpa=,qt3support=]
+ ~x11-libs/qt-core-${PV}[aqua=,debug=,qt3support=]
firebird? ( dev-db/firebird )
freetds? ( dev-db/freetds )
mysql? ( virtual/mysql )
diff --git a/x11-libs/qt-svg/qt-svg-4.8.9999.ebuild b/x11-libs/qt-svg/qt-svg-4.8.9999.ebuild
index 0031ee4..be6839b 100644
--- a/x11-libs/qt-svg/qt-svg-4.8.9999.ebuild
+++ b/x11-libs/qt-svg/qt-svg-4.8.9999.ebuild
@@ -17,8 +17,8 @@ IUSE="+accessibility"
DEPEND="
sys-libs/zlib
- ~x11-libs/qt-core-${PV}[aqua=,debug=,qpa=]
- ~x11-libs/qt-gui-${PV}[accessibility=,aqua=,debug=,qpa=]
+ ~x11-libs/qt-core-${PV}[aqua=,debug=]
+ ~x11-libs/qt-gui-${PV}[accessibility=,aqua=,debug=]
"
RDEPEND="${DEPEND}"
diff --git a/x11-libs/qt-test/qt-test-4.8.9999.ebuild b/x11-libs/qt-test/qt-test-4.8.9999.ebuild
index b76dabd..3decc7f 100644
--- a/x11-libs/qt-test/qt-test-4.8.9999.ebuild
+++ b/x11-libs/qt-test/qt-test-4.8.9999.ebuild
@@ -16,7 +16,7 @@ fi
IUSE=""
DEPEND="
- ~x11-libs/qt-core-${PV}[aqua=,debug=,qpa=]
+ ~x11-libs/qt-core-${PV}[aqua=,debug=]
"
RDEPEND="${DEPEND}"
diff --git a/x11-libs/qt-webkit/qt-webkit-4.8.9999.ebuild b/x11-libs/qt-webkit/qt-webkit-4.8.9999.ebuild
index 15cbde2..d5f8b59 100644
--- a/x11-libs/qt-webkit/qt-webkit-4.8.9999.ebuild
+++ b/x11-libs/qt-webkit/qt-webkit-4.8.9999.ebuild
@@ -20,9 +20,9 @@ DEPEND="
dev-db/sqlite:3
x11-libs/libX11
x11-libs/libXrender
- ~x11-libs/qt-core-${PV}[aqua=,debug=,ssl,qpa=]
- ~x11-libs/qt-gui-${PV}[aqua=,debug=,qpa=]
- ~x11-libs/qt-xmlpatterns-${PV}[aqua=,debug=,qpa=]
+ ~x11-libs/qt-core-${PV}[aqua=,debug=,ssl]
+ ~x11-libs/qt-gui-${PV}[aqua=,debug=]
+ ~x11-libs/qt-xmlpatterns-${PV}[aqua=,debug=]
gstreamer? (
dev-libs/glib:2
dev-libs/libxml2:2[!icu?]
diff --git a/x11-libs/qt-xmlpatterns/qt-xmlpatterns-4.8.9999.ebuild b/x11-libs/qt-xmlpatterns/qt-xmlpatterns-4.8.9999.ebuild
index 8a83659..9cef10f 100644
--- a/x11-libs/qt-xmlpatterns/qt-xmlpatterns-4.8.9999.ebuild
+++ b/x11-libs/qt-xmlpatterns/qt-xmlpatterns-4.8.9999.ebuild
@@ -16,7 +16,7 @@ fi
IUSE=""
DEPEND="
- ~x11-libs/qt-core-${PV}[aqua=,debug=,exceptions,qpa=]
+ ~x11-libs/qt-core-${PV}[aqua=,debug=,exceptions]
"
RDEPEND="${DEPEND}"
^ permalink raw reply related [flat|nested] 11+ messages in thread* [gentoo-commits] proj/qt:master commit in: x11-libs/qt-opengl/, x11-libs/qt-script/, x11-libs/qt-qt3support/, ...
@ 2012-06-18 0:30 Davide Pesavento
0 siblings, 0 replies; 11+ messages in thread
From: Davide Pesavento @ 2012-06-18 0:30 UTC (permalink / raw
To: gentoo-commits
commit: 83bdbe693595d927bda3440508181da10941a3d1
Author: Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Mon Jun 18 00:29:21 2012 +0000
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Mon Jun 18 00:29:21 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=83bdbe69
[x11-libs/qt-*] Add <upstream> metadata tag.
---
x11-libs/qt-assistant/metadata.xml | 20 ++++++++++++--------
x11-libs/qt-bearer/metadata.xml | 4 ++++
x11-libs/qt-core/metadata.xml | 4 ++++
x11-libs/qt-dbus/metadata.xml | 4 ++++
x11-libs/qt-declarative/metadata.xml | 4 ++++
x11-libs/qt-demo/metadata.xml | 26 +++++++++++++++-----------
x11-libs/qt-gui/metadata.xml | 24 ++++++++++++++----------
x11-libs/qt-multimedia/metadata.xml | 10 +++++++---
x11-libs/qt-network/metadata.xml | 4 ++++
x11-libs/qt-opengl/metadata.xml | 16 ++++++++++------
x11-libs/qt-openvg/metadata.xml | 12 ++++++++----
x11-libs/qt-phonon/metadata.xml | 12 ++++++++----
x11-libs/qt-qt3support/metadata.xml | 4 ++++
x11-libs/qt-script/metadata.xml | 4 ++++
x11-libs/qt-sql/metadata.xml | 4 ++++
x11-libs/qt-svg/metadata.xml | 10 +++++++---
x11-libs/qt-test/metadata.xml | 4 ++++
x11-libs/qt-webkit/metadata.xml | 4 ++++
x11-libs/qt-xml/metadata.xml | 4 ++++
x11-libs/qt-xmlpatterns/metadata.xml | 8 ++++++--
20 files changed, 131 insertions(+), 51 deletions(-)
diff --git a/x11-libs/qt-assistant/metadata.xml b/x11-libs/qt-assistant/metadata.xml
index a173421..029c306 100644
--- a/x11-libs/qt-assistant/metadata.xml
+++ b/x11-libs/qt-assistant/metadata.xml
@@ -3,16 +3,20 @@
<pkgmetadata>
<herd>qt</herd>
<use>
- <flag name='compat'>Build the extra compatibility layer required by a few packages,
+ <flag name="c++0x">Build Qt using the C++11 standard</flag>
+ <flag name="compat">Build the extra compatibility layer required by a few packages,
see http://labs.qt.nokia.com/2010/06/22/qt-assistant-compat-version-available-as-extra-source-package/</flag>
- <flag name='exceptions'>Add support for exceptions - like catching them
+ <flag name="exceptions">Add support for exceptions - like catching them
inside the event loop (recommended by Nokia)</flag>
- <flag name='qt3support'>Enable the Qt3Support libraries for Qt4. Note that
+ <flag name="glib">Enable <pkg>dev-libs/glib</pkg> eventloop support</flag>
+ <flag name="qpa">Build a window system agnostic implementation of Qt</flag>
+ <flag name="qt3support">Enable the Qt3Support libraries for Qt4. Note that
this does not mean you can compile pure Qt3 programs with Qt4.</flag>
- <flag name='trace'>Build the qttracereplay utility which is required to
- play drawings recorded with the trace graphicssystem engine</flag>
- <flag name='glib'>Enable <pkg>dev-libs/glib</pkg> eventloop support</flag>
- <flag name='c++0x'>Build Qt using the C++11 standard</flag>
- <flag name='qpa'>Build a window system agnostic implementation of Qt</flag>
+ <flag name="trace">Build the 'qttracereplay' utility which is required to
+ play drawings recorded with the trace graphicssystem</flag>
</use>
+ <upstream>
+ <bugs-to>https://bugreports.qt-project.org/</bugs-to>
+ <doc>http://qt-project.org/doc/</doc>
+ </upstream>
</pkgmetadata>
diff --git a/x11-libs/qt-bearer/metadata.xml b/x11-libs/qt-bearer/metadata.xml
index 2da24f3..69f9a82 100644
--- a/x11-libs/qt-bearer/metadata.xml
+++ b/x11-libs/qt-bearer/metadata.xml
@@ -10,4 +10,8 @@
<flag name="networkmanager">Enable NetworkManager-based bearer plugin</flag>
<flag name="qpa">Build a window system agnostic implementation of Qt</flag>
</use>
+ <upstream>
+ <bugs-to>https://bugreports.qt-project.org/</bugs-to>
+ <doc>http://qt-project.org/doc/</doc>
+ </upstream>
</pkgmetadata>
diff --git a/x11-libs/qt-core/metadata.xml b/x11-libs/qt-core/metadata.xml
index a81a5bd..935305e 100644
--- a/x11-libs/qt-core/metadata.xml
+++ b/x11-libs/qt-core/metadata.xml
@@ -13,4 +13,8 @@
<flag name="qt3support">Enable the Qt3Support libraries for Qt4. Note that
this does not mean you can compile pure Qt3 programs with Qt4.</flag>
</use>
+ <upstream>
+ <bugs-to>https://bugreports.qt-project.org/</bugs-to>
+ <doc>http://qt-project.org/doc/</doc>
+ </upstream>
</pkgmetadata>
diff --git a/x11-libs/qt-dbus/metadata.xml b/x11-libs/qt-dbus/metadata.xml
index f0a4f62..858138f 100644
--- a/x11-libs/qt-dbus/metadata.xml
+++ b/x11-libs/qt-dbus/metadata.xml
@@ -9,4 +9,8 @@
inside the event loop (recommended by Nokia)</flag>
<flag name="qpa">Build a window system agnostic implementation of Qt</flag>
</use>
+ <upstream>
+ <bugs-to>https://bugreports.qt-project.org/</bugs-to>
+ <doc>http://qt-project.org/doc/</doc>
+ </upstream>
</pkgmetadata>
diff --git a/x11-libs/qt-declarative/metadata.xml b/x11-libs/qt-declarative/metadata.xml
index 3c53abc..d61b4f7 100644
--- a/x11-libs/qt-declarative/metadata.xml
+++ b/x11-libs/qt-declarative/metadata.xml
@@ -11,4 +11,8 @@
this does not mean you can compile pure Qt3 programs with Qt4.</flag>
<flag name="webkit">Build the WebView QML component</flag>
</use>
+ <upstream>
+ <bugs-to>https://bugreports.qt-project.org/</bugs-to>
+ <doc>http://qt-project.org/doc/</doc>
+ </upstream>
</pkgmetadata>
diff --git a/x11-libs/qt-demo/metadata.xml b/x11-libs/qt-demo/metadata.xml
index 9a353bd..2c71d08 100644
--- a/x11-libs/qt-demo/metadata.xml
+++ b/x11-libs/qt-demo/metadata.xml
@@ -3,17 +3,21 @@
<pkgmetadata>
<herd>qt</herd>
<use>
- <flag name='c++0x'>Build Qt using the C++11 standard</flag>
- <flag name='dbus'>Build QtDBus examples and demos</flag>
- <flag name='declarative'>Build QtDeclarative examples and demos</flag>
- <flag name='exceptions'>Add support for exceptions - like catching them
+ <flag name="c++0x">Build Qt using the C++11 standard</flag>
+ <flag name="dbus">Build QtDBus examples and demos</flag>
+ <flag name="declarative">Build QtDeclarative examples and demos</flag>
+ <flag name="exceptions">Add support for exceptions - like catching them
inside the event loop (recommended by Nokia)</flag>
- <flag name='multimedia'>Build QtMultimedia examples and demos</flag>
- <flag name='opengl'>Build QtOpenGL examples and demos</flag>
- <flag name='openvg'>Build QtOpenVG examples and demos</flag>
- <flag name='qpa'>Build a window system agnostic implementation of Qt</flag>
- <flag name='qt3support'>Build Qt3Support examples and demos</flag>
- <flag name='webkit'>Build QtWebKit examples and demos</flag>
- <flag name='xmlpatterns'>Build QtXmlPatterns examples and demos</flag>
+ <flag name="multimedia">Build QtMultimedia examples and demos</flag>
+ <flag name="opengl">Build QtOpenGL examples and demos</flag>
+ <flag name="openvg">Build QtOpenVG examples and demos</flag>
+ <flag name="qpa">Build a window system agnostic implementation of Qt</flag>
+ <flag name="qt3support">Build Qt3Support examples and demos</flag>
+ <flag name="webkit">Build QtWebKit examples and demos</flag>
+ <flag name="xmlpatterns">Build QtXmlPatterns examples and demos</flag>
</use>
+ <upstream>
+ <bugs-to>https://bugreports.qt-project.org/</bugs-to>
+ <doc>http://qt-project.org/doc/</doc>
+ </upstream>
</pkgmetadata>
diff --git a/x11-libs/qt-gui/metadata.xml b/x11-libs/qt-gui/metadata.xml
index 0216004..b22323c 100644
--- a/x11-libs/qt-gui/metadata.xml
+++ b/x11-libs/qt-gui/metadata.xml
@@ -3,22 +3,26 @@
<pkgmetadata>
<herd>qt</herd>
<use>
- <flag name='c++0x'>Build Qt using the C++11 standard</flag>
- <flag name='c++11'>Build Qt using the C++11 standard</flag>
- <flag name='egl'>Use EGL instead of default GLX to manage OpenGL
+ <flag name="c++0x">Build Qt using the C++11 standard</flag>
+ <flag name="c++11">Build Qt using the C++11 standard</flag>
+ <flag name="egl">Use EGL instead of default GLX to manage OpenGL
contexts on the desktop</flag>
- <flag name='exceptions'>Add support for exceptions - like catching them
+ <flag name="exceptions">Add support for exceptions - like catching them
inside the event loop (recommended by Nokia)</flag>
- <flag name='glib'>Enable <pkg>dev-libs/glib</pkg> eventloop support</flag>
- <flag name='gtkstyle'>Build a Qt style called GTK+ that mimics the active
+ <flag name="glib">Enable <pkg>dev-libs/glib</pkg> eventloop support</flag>
+ <flag name="gtkstyle">Build a Qt style called GTK+ that mimics the active
GTK+ theme</flag>
- <flag name='qt3support'>Enable the Qt3Support libraries for Qt4. Note that
+ <flag name="qpa">Build a window system agnostic implementation of Qt</flag>
+ <flag name="qt3support">Enable the Qt3Support libraries for Qt4. Note that
this does not mean you can compile pure Qt3 programs with Qt4.</flag>
- <flag name='trace'>
- Build the new 'trace' graphicsssytem engine which allows to record
+ <flag name="trace">
+ Build the 'trace' graphicssystem engine which allows to record
all drawing operations into a trace buffer. Later it can be replayed
with the qttracereplay utility
</flag>
- <flag name='qpa'>Build a window system agnostic implementation of Qt</flag>
</use>
+ <upstream>
+ <bugs-to>https://bugreports.qt-project.org/</bugs-to>
+ <doc>http://qt-project.org/doc/</doc>
+ </upstream>
</pkgmetadata>
diff --git a/x11-libs/qt-multimedia/metadata.xml b/x11-libs/qt-multimedia/metadata.xml
index e68817a..1698ebe 100644
--- a/x11-libs/qt-multimedia/metadata.xml
+++ b/x11-libs/qt-multimedia/metadata.xml
@@ -3,9 +3,13 @@
<pkgmetadata>
<herd>qt</herd>
<use>
- <flag name='exceptions'>Add support for exceptions - like catching them
+ <flag name="c++0x">Build Qt using the C++11 standard</flag>
+ <flag name="exceptions">Add support for exceptions - like catching them
inside the event loop (recommended by Nokia)</flag>
- <flag name='c++0x'>Build Qt using the C++11 standard</flag>
- <flag name='qpa'>Build a window system agnostic implementation of Qt</flag>
+ <flag name="qpa">Build a window system agnostic implementation of Qt</flag>
</use>
+ <upstream>
+ <bugs-to>https://bugreports.qt-project.org/</bugs-to>
+ <doc>http://qt-project.org/doc/</doc>
+ </upstream>
</pkgmetadata>
diff --git a/x11-libs/qt-network/metadata.xml b/x11-libs/qt-network/metadata.xml
index 97932fd..b4e62f8 100644
--- a/x11-libs/qt-network/metadata.xml
+++ b/x11-libs/qt-network/metadata.xml
@@ -7,4 +7,8 @@
<flag name="connman">Enable ConnMan-based bearer plugin</flag>
<flag name="networkmanager">Enable NetworkManager-based bearer plugin</flag>
</use>
+ <upstream>
+ <bugs-to>https://bugreports.qt-project.org/</bugs-to>
+ <doc>http://qt-project.org/doc/</doc>
+ </upstream>
</pkgmetadata>
diff --git a/x11-libs/qt-opengl/metadata.xml b/x11-libs/qt-opengl/metadata.xml
index 78a8bc0..e6b3406 100644
--- a/x11-libs/qt-opengl/metadata.xml
+++ b/x11-libs/qt-opengl/metadata.xml
@@ -3,12 +3,16 @@
<pkgmetadata>
<herd>qt</herd>
<use>
- <flag name='egl'>Use EGL instead of default GLX to manage OpenGL
- contexts on the desktop</flag>
- <flag name='exceptions'>Add support for exceptions - like catching them
+ <flag name="c++0x">Build Qt using the C++11 standard</flag>
+ <flag name="egl">Use EGL instead of default GLX to manage OpenGL
+ contexts on the desktop</flag>
+ <flag name="exceptions">Add support for exceptions - like catching them
inside the event loop (recommended by Nokia)</flag>
- <flag name='qt3support'>Enable the Qt3Support libraries for Qt4</flag>
- <flag name='c++0x'>Build Qt using the C++11 standard</flag>
- <flag name='qpa'>Build a window system agnostic implementation of Qt</flag>
+ <flag name="qpa">Build a window system agnostic implementation of Qt</flag>
+ <flag name="qt3support">Enable the Qt3Support libraries for Qt4</flag>
</use>
+ <upstream>
+ <bugs-to>https://bugreports.qt-project.org/</bugs-to>
+ <doc>http://qt-project.org/doc/</doc>
+ </upstream>
</pkgmetadata>
diff --git a/x11-libs/qt-openvg/metadata.xml b/x11-libs/qt-openvg/metadata.xml
index 573ce49..1346011 100644
--- a/x11-libs/qt-openvg/metadata.xml
+++ b/x11-libs/qt-openvg/metadata.xml
@@ -3,9 +3,13 @@
<pkgmetadata>
<herd>qt</herd>
<use>
- <flag name='exceptions'>Build with support for exceptions</flag>
- <flag name='qt3support'>Enable the Qt3Support libraries for Qt4</flag>
- <flag name='c++0x'>Build Qt using the C++11 standard</flag>
- <flag name='qpa'>Build a window system agnostic implementation of Qt</flag>
+ <flag name="c++0x">Build Qt using the C++11 standard</flag>
+ <flag name="exceptions">Build with support for exceptions</flag>
+ <flag name="qpa">Build a window system agnostic implementation of Qt</flag>
+ <flag name="qt3support">Enable the Qt3Support libraries for Qt4</flag>
</use>
+ <upstream>
+ <bugs-to>https://bugreports.qt-project.org/</bugs-to>
+ <doc>http://qt-project.org/doc/</doc>
+ </upstream>
</pkgmetadata>
diff --git a/x11-libs/qt-phonon/metadata.xml b/x11-libs/qt-phonon/metadata.xml
index 80ed182..5bab3ea 100644
--- a/x11-libs/qt-phonon/metadata.xml
+++ b/x11-libs/qt-phonon/metadata.xml
@@ -3,11 +3,15 @@
<pkgmetadata>
<herd>qt</herd>
<use>
- <flag name='exceptions'>Add support for exceptions - like catching them
+ <flag name="c++0x">Build Qt using the C++11 standard</flag>
+ <flag name="exceptions">Add support for exceptions - like catching them
inside the event loop (recommended by Nokia)</flag>
- <flag name='qt3support'>Enable the Qt3Support libraries for Qt4. Note that
+ <flag name="qpa">Build a window system agnostic implementation of Qt</flag>
+ <flag name="qt3support">Enable the Qt3Support libraries for Qt4. Note that
this does not mean you can compile pure Qt3 programs with Qt4.</flag>
- <flag name='c++0x'>Build Qt using the C++11 standard</flag>
- <flag name='qpa'>Build a window system agnostic implementation of Qt</flag>
</use>
+ <upstream>
+ <bugs-to>https://bugreports.qt-project.org/</bugs-to>
+ <doc>http://qt-project.org/doc/</doc>
+ </upstream>
</pkgmetadata>
diff --git a/x11-libs/qt-qt3support/metadata.xml b/x11-libs/qt-qt3support/metadata.xml
index 6f44153..da590b3 100644
--- a/x11-libs/qt-qt3support/metadata.xml
+++ b/x11-libs/qt-qt3support/metadata.xml
@@ -8,4 +8,8 @@
inside the event loop (recommended by Nokia)</flag>
<flag name="qpa">Build a window system agnostic implementation of Qt</flag>
</use>
+ <upstream>
+ <bugs-to>https://bugreports.qt-project.org/</bugs-to>
+ <doc>http://qt-project.org/doc/</doc>
+ </upstream>
</pkgmetadata>
diff --git a/x11-libs/qt-script/metadata.xml b/x11-libs/qt-script/metadata.xml
index 70e42b2..1698ebe 100644
--- a/x11-libs/qt-script/metadata.xml
+++ b/x11-libs/qt-script/metadata.xml
@@ -8,4 +8,8 @@
inside the event loop (recommended by Nokia)</flag>
<flag name="qpa">Build a window system agnostic implementation of Qt</flag>
</use>
+ <upstream>
+ <bugs-to>https://bugreports.qt-project.org/</bugs-to>
+ <doc>http://qt-project.org/doc/</doc>
+ </upstream>
</pkgmetadata>
diff --git a/x11-libs/qt-sql/metadata.xml b/x11-libs/qt-sql/metadata.xml
index 43757d1..6f66e67 100644
--- a/x11-libs/qt-sql/metadata.xml
+++ b/x11-libs/qt-sql/metadata.xml
@@ -10,4 +10,8 @@
<flag name="qpa">Build a window system agnostic implementation of Qt</flag>
<flag name="qt3support">Enable the Qt3Support libraries for Qt4</flag>
</use>
+ <upstream>
+ <bugs-to>https://bugreports.qt-project.org/</bugs-to>
+ <doc>http://qt-project.org/doc/</doc>
+ </upstream>
</pkgmetadata>
diff --git a/x11-libs/qt-svg/metadata.xml b/x11-libs/qt-svg/metadata.xml
index e68817a..1698ebe 100644
--- a/x11-libs/qt-svg/metadata.xml
+++ b/x11-libs/qt-svg/metadata.xml
@@ -3,9 +3,13 @@
<pkgmetadata>
<herd>qt</herd>
<use>
- <flag name='exceptions'>Add support for exceptions - like catching them
+ <flag name="c++0x">Build Qt using the C++11 standard</flag>
+ <flag name="exceptions">Add support for exceptions - like catching them
inside the event loop (recommended by Nokia)</flag>
- <flag name='c++0x'>Build Qt using the C++11 standard</flag>
- <flag name='qpa'>Build a window system agnostic implementation of Qt</flag>
+ <flag name="qpa">Build a window system agnostic implementation of Qt</flag>
</use>
+ <upstream>
+ <bugs-to>https://bugreports.qt-project.org/</bugs-to>
+ <doc>http://qt-project.org/doc/</doc>
+ </upstream>
</pkgmetadata>
diff --git a/x11-libs/qt-test/metadata.xml b/x11-libs/qt-test/metadata.xml
index f0a4f62..858138f 100644
--- a/x11-libs/qt-test/metadata.xml
+++ b/x11-libs/qt-test/metadata.xml
@@ -9,4 +9,8 @@
inside the event loop (recommended by Nokia)</flag>
<flag name="qpa">Build a window system agnostic implementation of Qt</flag>
</use>
+ <upstream>
+ <bugs-to>https://bugreports.qt-project.org/</bugs-to>
+ <doc>http://qt-project.org/doc/</doc>
+ </upstream>
</pkgmetadata>
diff --git a/x11-libs/qt-webkit/metadata.xml b/x11-libs/qt-webkit/metadata.xml
index c5b19ab..06f3ebe 100644
--- a/x11-libs/qt-webkit/metadata.xml
+++ b/x11-libs/qt-webkit/metadata.xml
@@ -8,4 +8,8 @@
<flag name="gstreamer">Enable HTML5 audio/video support via <pkg>media-libs/gstreamer</pkg></flag>
<flag name="qpa">Build a window system agnostic implementation of Qt</flag>
</use>
+ <upstream>
+ <bugs-to>https://bugreports.qt-project.org/</bugs-to>
+ <doc>http://qt-project.org/doc/</doc>
+ </upstream>
</pkgmetadata>
diff --git a/x11-libs/qt-xml/metadata.xml b/x11-libs/qt-xml/metadata.xml
index db4a2a9..8460eb9 100644
--- a/x11-libs/qt-xml/metadata.xml
+++ b/x11-libs/qt-xml/metadata.xml
@@ -5,4 +5,8 @@
<use>
<flag name="c++11">Build Qt using the C++11 standard</flag>
</use>
+ <upstream>
+ <bugs-to>https://bugreports.qt-project.org/</bugs-to>
+ <doc>http://qt-project.org/doc/</doc>
+ </upstream>
</pkgmetadata>
diff --git a/x11-libs/qt-xmlpatterns/metadata.xml b/x11-libs/qt-xmlpatterns/metadata.xml
index d92f00d..bcfbe03 100644
--- a/x11-libs/qt-xmlpatterns/metadata.xml
+++ b/x11-libs/qt-xmlpatterns/metadata.xml
@@ -3,7 +3,11 @@
<pkgmetadata>
<herd>qt</herd>
<use>
- <flag name='c++0x'>Build Qt using the C++11 standard</flag>
- <flag name='qpa'>Build a window system agnostic implementation of Qt</flag>
+ <flag name="c++0x">Build Qt using the C++11 standard</flag>
+ <flag name="qpa">Build a window system agnostic implementation of Qt</flag>
</use>
+ <upstream>
+ <bugs-to>https://bugreports.qt-project.org/</bugs-to>
+ <doc>http://qt-project.org/doc/</doc>
+ </upstream>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] proj/qt:master commit in: x11-libs/qt-opengl/, x11-libs/qt-script/, x11-libs/qt-qt3support/, ...
@ 2012-06-29 0:17 Davide Pesavento
0 siblings, 0 replies; 11+ messages in thread
From: Davide Pesavento @ 2012-06-29 0:17 UTC (permalink / raw
To: gentoo-commits
commit: 9009595295908dffc0480b68d3d588094bc7e519
Author: Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Fri Jun 29 00:16:46 2012 +0000
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Fri Jun 29 00:16:46 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=90095952
Delete unused "qpa" USE flag description from metadata.
---
x11-libs/qt-assistant/metadata.xml | 1 -
x11-libs/qt-bearer/metadata.xml | 1 -
x11-libs/qt-core/metadata.xml | 1 -
x11-libs/qt-dbus/metadata.xml | 1 -
x11-libs/qt-declarative/metadata.xml | 1 -
x11-libs/qt-demo/metadata.xml | 1 -
x11-libs/qt-gui/metadata.xml | 1 -
x11-libs/qt-multimedia/metadata.xml | 1 -
x11-libs/qt-opengl/metadata.xml | 1 -
x11-libs/qt-openvg/metadata.xml | 1 -
x11-libs/qt-phonon/metadata.xml | 1 -
x11-libs/qt-qt3support/metadata.xml | 1 -
x11-libs/qt-script/metadata.xml | 1 -
x11-libs/qt-sql/metadata.xml | 1 -
x11-libs/qt-svg/metadata.xml | 1 -
x11-libs/qt-test/metadata.xml | 1 -
x11-libs/qt-webkit/metadata.xml | 1 -
x11-libs/qt-xmlpatterns/metadata.xml | 1 -
18 files changed, 0 insertions(+), 18 deletions(-)
diff --git a/x11-libs/qt-assistant/metadata.xml b/x11-libs/qt-assistant/metadata.xml
index 029c306..5269010 100644
--- a/x11-libs/qt-assistant/metadata.xml
+++ b/x11-libs/qt-assistant/metadata.xml
@@ -9,7 +9,6 @@
<flag name="exceptions">Add support for exceptions - like catching them
inside the event loop (recommended by Nokia)</flag>
<flag name="glib">Enable <pkg>dev-libs/glib</pkg> eventloop support</flag>
- <flag name="qpa">Build a window system agnostic implementation of Qt</flag>
<flag name="qt3support">Enable the Qt3Support libraries for Qt4. Note that
this does not mean you can compile pure Qt3 programs with Qt4.</flag>
<flag name="trace">Build the 'qttracereplay' utility which is required to
diff --git a/x11-libs/qt-bearer/metadata.xml b/x11-libs/qt-bearer/metadata.xml
index 69f9a82..d86f5eb 100644
--- a/x11-libs/qt-bearer/metadata.xml
+++ b/x11-libs/qt-bearer/metadata.xml
@@ -8,7 +8,6 @@
<flag name="exceptions">Add support for exceptions - like catching them
inside the event loop (recommended by Nokia)</flag>
<flag name="networkmanager">Enable NetworkManager-based bearer plugin</flag>
- <flag name="qpa">Build a window system agnostic implementation of Qt</flag>
</use>
<upstream>
<bugs-to>https://bugreports.qt-project.org/</bugs-to>
diff --git a/x11-libs/qt-core/metadata.xml b/x11-libs/qt-core/metadata.xml
index 935305e..f0552c5 100644
--- a/x11-libs/qt-core/metadata.xml
+++ b/x11-libs/qt-core/metadata.xml
@@ -9,7 +9,6 @@
inside the event loop (recommended by Nokia)</flag>
<flag name="glib">Enable <pkg>dev-libs/glib</pkg> eventloop support</flag>
<flag name="optimized-qmake">Enable qmake optimization</flag>
- <flag name="qpa">Build a window system agnostic implementation of Qt</flag>
<flag name="qt3support">Enable the Qt3Support libraries for Qt4. Note that
this does not mean you can compile pure Qt3 programs with Qt4.</flag>
</use>
diff --git a/x11-libs/qt-dbus/metadata.xml b/x11-libs/qt-dbus/metadata.xml
index 858138f..5b42381 100644
--- a/x11-libs/qt-dbus/metadata.xml
+++ b/x11-libs/qt-dbus/metadata.xml
@@ -7,7 +7,6 @@
<flag name="c++11">Build Qt using the C++11 standard</flag>
<flag name="exceptions">Add support for exceptions - like catching them
inside the event loop (recommended by Nokia)</flag>
- <flag name="qpa">Build a window system agnostic implementation of Qt</flag>
</use>
<upstream>
<bugs-to>https://bugreports.qt-project.org/</bugs-to>
diff --git a/x11-libs/qt-declarative/metadata.xml b/x11-libs/qt-declarative/metadata.xml
index d61b4f7..da493d0 100644
--- a/x11-libs/qt-declarative/metadata.xml
+++ b/x11-libs/qt-declarative/metadata.xml
@@ -6,7 +6,6 @@
<flag name="c++0x">Build Qt using the C++11 standard</flag>
<flag name="exceptions">Add support for exceptions - like catching them
inside the event loop (recommended by Nokia)</flag>
- <flag name="qpa">Build a window system agnostic implementation of Qt</flag>
<flag name="qt3support">Enable the Qt3Support libraries for Qt4. Note that
this does not mean you can compile pure Qt3 programs with Qt4.</flag>
<flag name="webkit">Build the WebView QML component</flag>
diff --git a/x11-libs/qt-demo/metadata.xml b/x11-libs/qt-demo/metadata.xml
index 2c71d08..e7b551b 100644
--- a/x11-libs/qt-demo/metadata.xml
+++ b/x11-libs/qt-demo/metadata.xml
@@ -11,7 +11,6 @@
<flag name="multimedia">Build QtMultimedia examples and demos</flag>
<flag name="opengl">Build QtOpenGL examples and demos</flag>
<flag name="openvg">Build QtOpenVG examples and demos</flag>
- <flag name="qpa">Build a window system agnostic implementation of Qt</flag>
<flag name="qt3support">Build Qt3Support examples and demos</flag>
<flag name="webkit">Build QtWebKit examples and demos</flag>
<flag name="xmlpatterns">Build QtXmlPatterns examples and demos</flag>
diff --git a/x11-libs/qt-gui/metadata.xml b/x11-libs/qt-gui/metadata.xml
index b22323c..98454c7 100644
--- a/x11-libs/qt-gui/metadata.xml
+++ b/x11-libs/qt-gui/metadata.xml
@@ -12,7 +12,6 @@
<flag name="glib">Enable <pkg>dev-libs/glib</pkg> eventloop support</flag>
<flag name="gtkstyle">Build a Qt style called GTK+ that mimics the active
GTK+ theme</flag>
- <flag name="qpa">Build a window system agnostic implementation of Qt</flag>
<flag name="qt3support">Enable the Qt3Support libraries for Qt4. Note that
this does not mean you can compile pure Qt3 programs with Qt4.</flag>
<flag name="trace">
diff --git a/x11-libs/qt-multimedia/metadata.xml b/x11-libs/qt-multimedia/metadata.xml
index 1698ebe..93e5fd3 100644
--- a/x11-libs/qt-multimedia/metadata.xml
+++ b/x11-libs/qt-multimedia/metadata.xml
@@ -6,7 +6,6 @@
<flag name="c++0x">Build Qt using the C++11 standard</flag>
<flag name="exceptions">Add support for exceptions - like catching them
inside the event loop (recommended by Nokia)</flag>
- <flag name="qpa">Build a window system agnostic implementation of Qt</flag>
</use>
<upstream>
<bugs-to>https://bugreports.qt-project.org/</bugs-to>
diff --git a/x11-libs/qt-opengl/metadata.xml b/x11-libs/qt-opengl/metadata.xml
index e6b3406..6fb8805 100644
--- a/x11-libs/qt-opengl/metadata.xml
+++ b/x11-libs/qt-opengl/metadata.xml
@@ -8,7 +8,6 @@
contexts on the desktop</flag>
<flag name="exceptions">Add support for exceptions - like catching them
inside the event loop (recommended by Nokia)</flag>
- <flag name="qpa">Build a window system agnostic implementation of Qt</flag>
<flag name="qt3support">Enable the Qt3Support libraries for Qt4</flag>
</use>
<upstream>
diff --git a/x11-libs/qt-openvg/metadata.xml b/x11-libs/qt-openvg/metadata.xml
index 1346011..472a8cb 100644
--- a/x11-libs/qt-openvg/metadata.xml
+++ b/x11-libs/qt-openvg/metadata.xml
@@ -5,7 +5,6 @@
<use>
<flag name="c++0x">Build Qt using the C++11 standard</flag>
<flag name="exceptions">Build with support for exceptions</flag>
- <flag name="qpa">Build a window system agnostic implementation of Qt</flag>
<flag name="qt3support">Enable the Qt3Support libraries for Qt4</flag>
</use>
<upstream>
diff --git a/x11-libs/qt-phonon/metadata.xml b/x11-libs/qt-phonon/metadata.xml
index 5bab3ea..8f9551c 100644
--- a/x11-libs/qt-phonon/metadata.xml
+++ b/x11-libs/qt-phonon/metadata.xml
@@ -6,7 +6,6 @@
<flag name="c++0x">Build Qt using the C++11 standard</flag>
<flag name="exceptions">Add support for exceptions - like catching them
inside the event loop (recommended by Nokia)</flag>
- <flag name="qpa">Build a window system agnostic implementation of Qt</flag>
<flag name="qt3support">Enable the Qt3Support libraries for Qt4. Note that
this does not mean you can compile pure Qt3 programs with Qt4.</flag>
</use>
diff --git a/x11-libs/qt-qt3support/metadata.xml b/x11-libs/qt-qt3support/metadata.xml
index da590b3..782c134 100644
--- a/x11-libs/qt-qt3support/metadata.xml
+++ b/x11-libs/qt-qt3support/metadata.xml
@@ -6,7 +6,6 @@
<flag name="c++0x">Build Qt using the C++11 standard</flag>
<flag name="exceptions">Add support for exceptions - like catching them
inside the event loop (recommended by Nokia)</flag>
- <flag name="qpa">Build a window system agnostic implementation of Qt</flag>
</use>
<upstream>
<bugs-to>https://bugreports.qt-project.org/</bugs-to>
diff --git a/x11-libs/qt-script/metadata.xml b/x11-libs/qt-script/metadata.xml
index 1698ebe..93e5fd3 100644
--- a/x11-libs/qt-script/metadata.xml
+++ b/x11-libs/qt-script/metadata.xml
@@ -6,7 +6,6 @@
<flag name="c++0x">Build Qt using the C++11 standard</flag>
<flag name="exceptions">Add support for exceptions - like catching them
inside the event loop (recommended by Nokia)</flag>
- <flag name="qpa">Build a window system agnostic implementation of Qt</flag>
</use>
<upstream>
<bugs-to>https://bugreports.qt-project.org/</bugs-to>
diff --git a/x11-libs/qt-sql/metadata.xml b/x11-libs/qt-sql/metadata.xml
index 6f66e67..3e54c07 100644
--- a/x11-libs/qt-sql/metadata.xml
+++ b/x11-libs/qt-sql/metadata.xml
@@ -7,7 +7,6 @@
<flag name="c++11">Build Qt using the C++11 standard</flag>
<flag name="exceptions">Add support for exceptions - like catching them
inside the event loop (recommended by Nokia)</flag>
- <flag name="qpa">Build a window system agnostic implementation of Qt</flag>
<flag name="qt3support">Enable the Qt3Support libraries for Qt4</flag>
</use>
<upstream>
diff --git a/x11-libs/qt-svg/metadata.xml b/x11-libs/qt-svg/metadata.xml
index 1698ebe..93e5fd3 100644
--- a/x11-libs/qt-svg/metadata.xml
+++ b/x11-libs/qt-svg/metadata.xml
@@ -6,7 +6,6 @@
<flag name="c++0x">Build Qt using the C++11 standard</flag>
<flag name="exceptions">Add support for exceptions - like catching them
inside the event loop (recommended by Nokia)</flag>
- <flag name="qpa">Build a window system agnostic implementation of Qt</flag>
</use>
<upstream>
<bugs-to>https://bugreports.qt-project.org/</bugs-to>
diff --git a/x11-libs/qt-test/metadata.xml b/x11-libs/qt-test/metadata.xml
index 858138f..5b42381 100644
--- a/x11-libs/qt-test/metadata.xml
+++ b/x11-libs/qt-test/metadata.xml
@@ -7,7 +7,6 @@
<flag name="c++11">Build Qt using the C++11 standard</flag>
<flag name="exceptions">Add support for exceptions - like catching them
inside the event loop (recommended by Nokia)</flag>
- <flag name="qpa">Build a window system agnostic implementation of Qt</flag>
</use>
<upstream>
<bugs-to>https://bugreports.qt-project.org/</bugs-to>
diff --git a/x11-libs/qt-webkit/metadata.xml b/x11-libs/qt-webkit/metadata.xml
index 06f3ebe..62d0753 100644
--- a/x11-libs/qt-webkit/metadata.xml
+++ b/x11-libs/qt-webkit/metadata.xml
@@ -6,7 +6,6 @@
<flag name="exceptions">Add support for exceptions - like catching them
inside the event loop (recommended by Nokia)</flag>
<flag name="gstreamer">Enable HTML5 audio/video support via <pkg>media-libs/gstreamer</pkg></flag>
- <flag name="qpa">Build a window system agnostic implementation of Qt</flag>
</use>
<upstream>
<bugs-to>https://bugreports.qt-project.org/</bugs-to>
diff --git a/x11-libs/qt-xmlpatterns/metadata.xml b/x11-libs/qt-xmlpatterns/metadata.xml
index bcfbe03..ea23dae 100644
--- a/x11-libs/qt-xmlpatterns/metadata.xml
+++ b/x11-libs/qt-xmlpatterns/metadata.xml
@@ -4,7 +4,6 @@
<herd>qt</herd>
<use>
<flag name="c++0x">Build Qt using the C++11 standard</flag>
- <flag name="qpa">Build a window system agnostic implementation of Qt</flag>
</use>
<upstream>
<bugs-to>https://bugreports.qt-project.org/</bugs-to>
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] proj/qt:master commit in: x11-libs/qt-opengl/, x11-libs/qt-script/, x11-libs/qt-qt3support/, ...
@ 2012-11-30 14:54 Ben de Groot
0 siblings, 0 replies; 11+ messages in thread
From: Ben de Groot @ 2012-11-30 14:54 UTC (permalink / raw
To: gentoo-commits
commit: 06c3f54889243228658328f1fc82e5da25ee3477
Author: Ben de Groot <yngwin <AT> gmail <DOT> com>
AuthorDate: Fri Nov 30 14:54:29 2012 +0000
Commit: Ben de Groot <yngwin <AT> gentoo <DOT> org>
CommitDate: Fri Nov 30 14:54:29 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=06c3f548
x11-libs/qt-*: 4.8.4 initial bump - needs testing!
---
profiles/package.mask | 21 ++
x11-libs/qt-assistant/Manifest | 1 +
x11-libs/qt-assistant/qt-assistant-4.8.4.ebuild | 134 +++++++++++
x11-libs/qt-bearer/Manifest | 1 +
x11-libs/qt-bearer/qt-bearer-4.8.4.ebuild | 58 +++++
x11-libs/qt-core/Manifest | 1 +
x11-libs/qt-core/qt-core-4.8.4.ebuild | 180 ++++++++++++++
x11-libs/qt-dbus/Manifest | 1 +
x11-libs/qt-dbus/qt-dbus-4.8.4.ebuild | 52 ++++
x11-libs/qt-declarative/Manifest | 1 +
.../qt-declarative/qt-declarative-4.8.4.ebuild | 77 ++++++
x11-libs/qt-demo/Manifest | 1 +
x11-libs/qt-demo/qt-demo-4.8.4.ebuild | 114 +++++++++
x11-libs/qt-gui/Manifest | 1 +
x11-libs/qt-gui/qt-gui-4.8.4.ebuild | 252 ++++++++++++++++++++
x11-libs/qt-multimedia/Manifest | 1 +
x11-libs/qt-multimedia/qt-multimedia-4.8.4.ebuild | 60 +++++
x11-libs/qt-opengl/Manifest | 1 +
x11-libs/qt-opengl/qt-opengl-4.8.4.ebuild | 64 +++++
x11-libs/qt-openvg/Manifest | 1 +
x11-libs/qt-openvg/qt-openvg-4.8.4.ebuild | 62 +++++
x11-libs/qt-phonon/Manifest | 1 +
x11-libs/qt-phonon/qt-phonon-4.8.4.ebuild | 56 +++++
x11-libs/qt-qt3support/Manifest | 1 +
x11-libs/qt-qt3support/qt-qt3support-4.8.4.ebuild | 46 ++++
x11-libs/qt-script/Manifest | 1 +
x11-libs/qt-script/qt-script-4.8.4.ebuild | 60 +++++
x11-libs/qt-sql/Manifest | 1 +
x11-libs/qt-sql/qt-sql-4.8.4.ebuild | 73 ++++++
x11-libs/qt-svg/Manifest | 1 +
x11-libs/qt-svg/qt-svg-4.8.4.ebuild | 61 +++++
x11-libs/qt-test/Manifest | 1 +
x11-libs/qt-test/qt-test-4.8.4.ebuild | 45 ++++
x11-libs/qt-webkit/Manifest | 1 +
x11-libs/qt-webkit/qt-webkit-4.8.4.ebuild | 85 +++++++
x11-libs/qt-xmlpatterns/Manifest | 1 +
.../qt-xmlpatterns/qt-xmlpatterns-4.8.4.ebuild | 48 ++++
37 files changed, 1566 insertions(+), 0 deletions(-)
diff --git a/profiles/package.mask b/profiles/package.mask
index 58c4dff..019750d 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -5,3 +5,24 @@
# Markos Chandras <hwoarang@gentoo.org> (25 Jul 2009)
# Alpha versions are not for everybody :)
=app-emulation/qtemu-2.0_alpha*
+
+# Ben de Groot <yngwin@gentoo.org) (30 Nov 2012)
+# initial bump, masked for testing
+=x11-libs/qt-assistant-4.8.4
+=x11-libs/qt-bearer-4.8.4
+=x11-libs/qt-core-4.8.4
+=x11-libs/qt-dbus-4.8.4
+=x11-libs/qt-declarative-4.8.4
+=x11-libs/qt-demo-4.8.4
+=x11-libs/qt-gui-4.8.4
+=x11-libs/qt-multimedia-4.8.4
+=x11-libs/qt-opengl-4.8.4
+=x11-libs/qt-openvg-4.8.4
+=x11-libs/qt-phonon-4.8.4
+=x11-libs/qt-qt3support-4.8.4
+=x11-libs/qt-script-4.8.4
+=x11-libs/qt-sql-4.8.4
+=x11-libs/qt-svg-4.8.4
+=x11-libs/qt-test-4.8.4
+=x11-libs/qt-webkit-4.8.4
+=x11-libs/qt-xmlpatterns-4.8.4
diff --git a/x11-libs/qt-assistant/Manifest b/x11-libs/qt-assistant/Manifest
index 7abb861..46da1dc 100644
--- a/x11-libs/qt-assistant/Manifest
+++ b/x11-libs/qt-assistant/Manifest
@@ -1,2 +1,3 @@
DIST qt-assistant-compat-headers-4.7.tar.gz 448 SHA256 73ae604834cc89d6c67bafc65bb5d3cadaec23076d02711fc0c30a85df3d8580 SHA512 da14cb9904591f4389862cf1e1c96f923e72b7b904d57787d68feae2c90d52bf713e930442aa3abd4b457c3cc66c88b94e23df5fc25e33e01f1ed4d3093460bb WHIRLPOOL 26c42c101aab36a8d0355f1243226f6b8bd5a477c5aafece7e036f18a9fcfe98ae016042befe494fca0c42b825e29539825466c1ddb720102fa6c65e9cbaec61
DIST qt-assistant-qassistantclient-library-compat-src-4.6.3.tar.gz 329896 SHA256 e698be8fc0d32c5f0b5b46cafcb8f615accaed524b864e58b99b64b7b5549c2d SHA512 a4050d93e448d29004d71d5ea670e60242f1272399f65db084dd928150f26404d37544d011d75bbb1c62f227752f92b86a4f4382dc54f0681a3df6da738af106 WHIRLPOOL 9c2822ae2f1ee7c4f63236cc95eb0cb025f088e1f13e0a154fabdad5af6209b0e4cdda86d23061bf35fe5919a1909ed162bbc4835da79fdf1b187461aa948a1b
+DIST qt-everywhere-opensource-src-4.8.4.tar.gz 236593028 SHA256 33b0e38ba4c54a0cf8a4be8ca5a4584f1c2e0adfecb57b21d9d1d267b0093270 SHA512 472972b63b5cad83b4c4656b23e95b6d4923cc31a518138e25d5921982b14abc835883356c2b779a7972cb77cf73fe25b46630be7c6a86a917b364186aa17496 WHIRLPOOL 9d250ee9ddd0431eeabc22ea598eda2bc74ee7ee6c5329522c479143d6c38fa17ae545541b4e3220b05d493c1a5d407c70980d0d1ffa49d2f83dedc1774cfa79
diff --git a/x11-libs/qt-assistant/qt-assistant-4.8.4.ebuild b/x11-libs/qt-assistant/qt-assistant-4.8.4.ebuild
new file mode 100644
index 0000000..8d396a4
--- /dev/null
+++ b/x11-libs/qt-assistant/qt-assistant-4.8.4.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+inherit eutils qt4-build
+
+DESCRIPTION="The Help module and Assistant application for the Qt toolkit"
+SRC_URI+="
+ compat? (
+ ftp://ftp.qt.nokia.com/qt/source/${PN}-qassistantclient-library-compat-src-4.6.3.tar.gz
+ http://dev.gentoo.org/~pesa/distfiles/${PN}-compat-headers-4.7.tar.gz
+ )"
+
+SLOT="4"
+if [[ ${QT4_BUILD_TYPE} == live ]]; then
+ KEYWORDS=""
+else
+ KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos ~x64-macos"
+fi
+IUSE="compat doc +glib qt3support trace webkit"
+
+DEPEND="
+ ~x11-libs/qt-gui-${PV}[aqua=,debug=,glib=,qt3support=,trace?]
+ ~x11-libs/qt-sql-${PV}[aqua=,debug=,qt3support=,sqlite]
+ webkit? ( ~x11-libs/qt-webkit-${PV}[aqua=,debug=] )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-4.8.2+gcc-4.7.patch"
+)
+
+pkg_setup() {
+ # Pixeltool isn't really assistant related, but it relies on
+ # the assistant libraries.
+ QT4_TARGET_DIRECTORIES="
+ tools/assistant
+ tools/pixeltool
+ tools/qdoc3"
+ QT4_EXTRACT_DIRECTORIES="
+ tools
+ demos
+ examples
+ src
+ include
+ doc"
+
+ use trace && QT4_TARGET_DIRECTORIES+=" tools/qttracereplay"
+
+ QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
+ ${QT4_EXTRACT_DIRECTORIES}"
+
+ qt4-build_pkg_setup
+}
+
+src_unpack() {
+ qt4-build_src_unpack
+
+ # compat version
+ # http://labs.qt.nokia.com/2010/06/22/qt-assistant-compat-version-available-as-extra-source-package/
+ if use compat; then
+ unpack ${PN}-qassistantclient-library-compat-src-4.6.3.tar.gz \
+ ${PN}-compat-headers-4.7.tar.gz
+ mv "${WORKDIR}"/${PN}-qassistantclient-library-compat-version-4.6.3 \
+ "${S}"/tools/assistant/compat || die
+ mv "${WORKDIR}"/QtAssistant "${S}"/include/ || die
+ fi
+}
+
+src_prepare() {
+ qt4-build_src_prepare
+
+ use compat && epatch "${FILESDIR}"/${PN}-4.7-fix-compat.patch
+
+ # bug 401173
+ use webkit || epatch "${FILESDIR}"/disable-webkit.patch
+
+ # bug 348034
+ sed -i -e '/^sub-qdoc3\.depends/d' doc/doc.pri || die
+}
+
+src_configure() {
+ myconf+="
+ -no-xkb -no-fontconfig -no-xrandr
+ -no-xfixes -no-xcursor -no-xinerama -no-xshape -no-sm -no-opengl
+ -no-nas-sound -no-dbus -iconv -no-cups -no-nis -no-gif -no-libpng
+ -no-libmng -no-libjpeg -no-openssl -system-zlib -no-phonon
+ -no-xmlpatterns -no-freetype -no-libtiff -no-accessibility
+ -no-fontconfig -no-multimedia -no-svg
+ $(qt_use qt3support) $(qt_use webkit)"
+ use glib || myconf+=" -no-glib"
+
+ qt4-build_src_configure
+}
+
+src_compile() {
+ # help libQtHelp find freshly built libQtCLucene (bug #289811)
+ export LD_LIBRARY_PATH="${S}/lib:${QTLIBDIR}"
+ export DYLD_LIBRARY_PATH="${S}/lib:${S}/lib/QtHelp.framework"
+
+ qt4-build_src_compile
+
+ # ugly hack to build docs
+ qmake "LIBS+=-L${QTLIBDIR}" "CONFIG+=nostrip" projects.pro || die
+
+ if use doc; then
+ emake docs
+ elif [[ ${QT4_BUILD_TYPE} == release ]]; then
+ # live ebuild cannot build qch_docs, it will build them through emake docs
+ emake qch_docs
+ fi
+}
+
+src_install() {
+ qt4-build_src_install
+
+ emake INSTALL_ROOT="${D}" install_qchdocs
+ # do not compress .qch files
+ docompress -x "${QTDOCDIR}"/qch
+
+ if use doc; then
+ emake INSTALL_ROOT="${D}" install_htmldocs
+ fi
+
+ doicon tools/assistant/tools/assistant/images/assistant.png
+ make_desktop_entry assistant Assistant assistant 'Qt;Development'
+
+ if use compat; then
+ insinto /usr/share/qt4/mkspecs/features
+ doins tools/assistant/compat/features/assistant.prf
+ fi
+}
diff --git a/x11-libs/qt-bearer/Manifest b/x11-libs/qt-bearer/Manifest
new file mode 100644
index 0000000..1944fa7
--- /dev/null
+++ b/x11-libs/qt-bearer/Manifest
@@ -0,0 +1 @@
+DIST qt-everywhere-opensource-src-4.8.4.tar.gz 236593028 SHA256 33b0e38ba4c54a0cf8a4be8ca5a4584f1c2e0adfecb57b21d9d1d267b0093270 SHA512 472972b63b5cad83b4c4656b23e95b6d4923cc31a518138e25d5921982b14abc835883356c2b779a7972cb77cf73fe25b46630be7c6a86a917b364186aa17496 WHIRLPOOL 9d250ee9ddd0431eeabc22ea598eda2bc74ee7ee6c5329522c479143d6c38fa17ae545541b4e3220b05d493c1a5d407c70980d0d1ffa49d2f83dedc1774cfa79
diff --git a/x11-libs/qt-bearer/qt-bearer-4.8.4.ebuild b/x11-libs/qt-bearer/qt-bearer-4.8.4.ebuild
new file mode 100644
index 0000000..23f955a
--- /dev/null
+++ b/x11-libs/qt-bearer/qt-bearer-4.8.4.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+inherit qt4-build
+
+DESCRIPTION="The network bearer plugins for the Qt toolkit"
+SLOT="4"
+if [[ ${QT4_BUILD_TYPE} == live ]]; then
+ KEYWORDS=""
+else
+ KEYWORDS="~amd64 ~arm ~hppa ~x86 ~amd64-fbsd ~x86-fbsd"
+fi
+IUSE="connman networkmanager"
+
+DEPEND="
+ ~x11-libs/qt-core-${PV}[aqua=,debug=]
+ connman? ( ~x11-libs/qt-dbus-${PV}[aqua=,debug=] )
+ networkmanager? ( ~x11-libs/qt-dbus-${PV}[aqua=,debug=] )
+"
+RDEPEND="${DEPEND}
+ connman? ( net-misc/connman )
+ networkmanager? ( net-misc/networkmanager )
+"
+
+pkg_setup() {
+ QT4_EXTRACT_DIRECTORIES="
+ include/QtCore
+ include/QtDBus
+ include/QtNetwork
+ src/corelib
+ src/dbus
+ src/network
+ src/plugins/bearer
+ src/plugins/qpluginbase.pri"
+
+ QT4_TARGET_DIRECTORIES="
+ src/plugins/bearer/generic
+ $(use connman && echo src/plugins/bearer/connman)
+ $(use networkmanager && echo src/plugins/bearer/networkmanager)"
+
+ qt4-build_pkg_setup
+}
+
+src_configure() {
+ myconf+="
+ $(use connman || use networkmanager || echo -no-dbus)
+ -no-accessibility -no-xmlpatterns -no-multimedia -no-audio-backend -no-phonon
+ -no-phonon-backend -no-svg -no-webkit -no-script -no-scripttools -no-declarative
+ -system-zlib -no-gif -no-libtiff -no-libpng -no-libmng -no-libjpeg
+ -no-cups -no-gtkstyle -no-nas-sound -no-opengl
+ -no-sm -no-xshape -no-xvideo -no-xsync -no-xinerama -no-xcursor -no-xfixes
+ -no-xrandr -no-xrender -no-mitshm -no-fontconfig -no-freetype -no-xinput -no-xkb"
+
+ qt4-build_src_configure
+}
diff --git a/x11-libs/qt-core/Manifest b/x11-libs/qt-core/Manifest
new file mode 100644
index 0000000..1944fa7
--- /dev/null
+++ b/x11-libs/qt-core/Manifest
@@ -0,0 +1 @@
+DIST qt-everywhere-opensource-src-4.8.4.tar.gz 236593028 SHA256 33b0e38ba4c54a0cf8a4be8ca5a4584f1c2e0adfecb57b21d9d1d267b0093270 SHA512 472972b63b5cad83b4c4656b23e95b6d4923cc31a518138e25d5921982b14abc835883356c2b779a7972cb77cf73fe25b46630be7c6a86a917b364186aa17496 WHIRLPOOL 9d250ee9ddd0431eeabc22ea598eda2bc74ee7ee6c5329522c479143d6c38fa17ae545541b4e3220b05d493c1a5d407c70980d0d1ffa49d2f83dedc1774cfa79
diff --git a/x11-libs/qt-core/qt-core-4.8.4.ebuild b/x11-libs/qt-core/qt-core-4.8.4.ebuild
new file mode 100644
index 0000000..a1e330d
--- /dev/null
+++ b/x11-libs/qt-core/qt-core-4.8.4.ebuild
@@ -0,0 +1,180 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+inherit qt4-build
+
+DESCRIPTION="The Qt toolkit is a comprehensive C++ application development framework"
+SLOT="4"
+if [[ ${QT4_BUILD_TYPE} == live ]]; then
+ KEYWORDS=""
+else
+ 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="+glib iconv icu qt3support ssl"
+
+DEPEND="
+ sys-libs/zlib
+ glib? ( dev-libs/glib:2 )
+ icu? ( >=dev-libs/icu-49 )
+ ssl? ( dev-libs/openssl )
+ !<x11-libs/cairo-1.10.2-r2
+ !x11-libs/qt:4
+"
+RDEPEND="${DEPEND}"
+PDEPEND="
+ qt3support? ( ~x11-libs/qt-gui-${PV}[aqua=,debug=,glib=,qt3support] )
+"
+
+PATCHES=(
+ "${FILESDIR}/moc-workaround-for-boost-1.48.patch"
+)
+
+pkg_setup() {
+ QT4_TARGET_DIRECTORIES="
+ src/tools/bootstrap
+ src/tools/moc
+ src/tools/rcc
+ src/tools/uic
+ src/corelib
+ src/xml
+ src/network
+ src/plugins/codecs
+ tools/linguist/lconvert
+ tools/linguist/lrelease
+ tools/linguist/lupdate"
+
+ QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
+ include/Qt
+ include/QtCore
+ include/QtDeclarative
+ include/QtGui
+ include/QtNetwork
+ include/QtScript
+ include/QtXml
+ src/plugins/plugins.pro
+ src/plugins/qpluginbase.pri
+ src/src.pro
+ src/3rdparty/des
+ src/3rdparty/harfbuzz
+ src/3rdparty/md4
+ src/3rdparty/md5
+ src/3rdparty/sha1
+ src/3rdparty/easing
+ src/3rdparty/zlib_dependency.pri
+ src/declarative
+ src/gui
+ src/script
+ tools/shared
+ tools/linguist/shared
+ translations"
+
+ qt4-build_pkg_setup
+}
+
+src_prepare() {
+ # Don't pre-strip, bug 235026
+ for i in kr jp cn tw; do
+ echo "CONFIG+=nostrip" >> "${S}"/src/plugins/codecs/${i}/${i}.pro
+ done
+
+ qt4-build_src_prepare
+
+ # bug 172219
+ sed -i -e "s:CXXFLAGS.*=:CXXFLAGS=${CXXFLAGS} :" \
+ "${S}/qmake/Makefile.unix" || die "sed qmake/Makefile.unix CXXFLAGS failed"
+ sed -i -e "s:LFLAGS.*=:LFLAGS=${LDFLAGS} :" \
+ "${S}/qmake/Makefile.unix" || die "sed qmake/Makefile.unix LDFLAGS failed"
+
+ # bug 427782
+ sed -i -e "/^CPPFLAGS/s/-g//" \
+ "${S}/qmake/Makefile.unix" || die "sed qmake/Makefile.unix CPPFLAGS failed"
+ sed -i -e "s/setBootstrapVariable QMAKE_CFLAGS_RELEASE/QMakeVar set QMAKE_CFLAGS_RELEASE/" \
+ -e "s/setBootstrapVariable QMAKE_CXXFLAGS_RELEASE/QMakeVar set QMAKE_CXXFLAGS_RELEASE/" \
+ "${S}/configure" || die "sed configure setBootstrapVariable failed"
+}
+
+src_configure() {
+ myconf+="
+ -no-accessibility -no-xmlpatterns -no-multimedia -no-audio-backend -no-phonon
+ -no-phonon-backend -no-svg -no-webkit -no-script -no-scripttools -no-declarative
+ -system-zlib -no-gif -no-libtiff -no-libpng -no-libmng -no-libjpeg
+ -no-cups -no-dbus -no-gtkstyle -no-nas-sound -no-opengl -no-openvg
+ -no-sm -no-xshape -no-xvideo -no-xsync -no-xinerama -no-xcursor -no-xfixes
+ -no-xrandr -no-xrender -no-mitshm -no-fontconfig -no-freetype -no-xinput -no-xkb
+ $(qt_use glib)
+ $(qt_use iconv)
+ $(qt_use icu)
+ $(use ssl && echo -openssl-linked || echo -no-openssl)
+ $(qt_use qt3support)"
+
+ qt4-build_src_configure
+}
+
+src_install() {
+ dobin bin/{qmake,moc,rcc,uic,lconvert,lrelease,lupdate}
+
+ install_directories src/{corelib,xml,network,plugins/codecs}
+
+ emake INSTALL_ROOT="${D}" install_mkspecs
+
+ # install private headers
+ insinto "${QTHEADERDIR#${EPREFIX}}"/QtCore/private
+ find "${S}"/src/corelib -type f -name "*_p.h" -exec doins {} +
+
+ # use freshly built libraries
+ local DYLD_FPATH=
+ [[ -d "${S}"/lib/QtCore.framework ]] \
+ && DYLD_FPATH=$(for x in "${S}"/lib/*.framework; do echo -n ":$x"; done)
+ DYLD_LIBRARY_PATH="${S}/lib${DYLD_FPATH}" \
+ LD_LIBRARY_PATH="${S}/lib" \
+ "${S}"/bin/lrelease translations/*.ts \
+ || die "generating translations failed"
+ insinto "${QTTRANSDIR#${EPREFIX}}"
+ doins translations/*.qm
+
+ setqtenv
+ fix_library_files
+
+ # List all the multilib libdirs
+ local libdirs=
+ for libdir in $(get_all_libdirs); do
+ libdirs+=":${EPREFIX}/usr/${libdir}/qt4"
+ done
+
+ cat <<-EOF > "${T}"/44qt4
+ LDPATH="${libdirs:1}"
+ EOF
+ doenvd "${T}"/44qt4
+
+ dodir "${QTDATADIR#${EPREFIX}}"/mkspecs/gentoo
+ mv "${D}/${QTDATADIR}"/mkspecs/qconfig.pri "${D}${QTDATADIR}"/mkspecs/gentoo \
+ || die "failed to move qconfig.pri"
+
+ # Framework hacking
+ if use aqua && [[ ${CHOST#*-darwin} -ge 9 ]]; then
+ # TODO: do this better
+ sed -i -e '2a#include <QtCore/Gentoo/gentoo-qconfig.h>\n' \
+ "${D}${QTLIBDIR}"/QtCore.framework/Headers/qconfig.h \
+ || die "sed for qconfig.h failed."
+ dosym "${QTHEADERDIR#${EPREFIX}}"/Gentoo "${QTLIBDIR#${EPREFIX}}"/QtCore.framework/Headers/Gentoo
+ else
+ sed -i -e '2a#include <Gentoo/gentoo-qconfig.h>\n' \
+ "${D}${QTHEADERDIR}"/QtCore/qconfig.h \
+ "${D}${QTHEADERDIR}"/Qt/qconfig.h \
+ || die "sed for qconfig.h failed"
+ fi
+
+ QCONFIG_DEFINE="QT_ZLIB"
+ install_qconfigs
+
+ # remove .la files
+ prune_libtool_files
+
+ keepdir "${QTSYSCONFDIR#${EPREFIX}}"
+
+ # Framework magic
+ fix_includes
+}
diff --git a/x11-libs/qt-dbus/Manifest b/x11-libs/qt-dbus/Manifest
new file mode 100644
index 0000000..1944fa7
--- /dev/null
+++ b/x11-libs/qt-dbus/Manifest
@@ -0,0 +1 @@
+DIST qt-everywhere-opensource-src-4.8.4.tar.gz 236593028 SHA256 33b0e38ba4c54a0cf8a4be8ca5a4584f1c2e0adfecb57b21d9d1d267b0093270 SHA512 472972b63b5cad83b4c4656b23e95b6d4923cc31a518138e25d5921982b14abc835883356c2b779a7972cb77cf73fe25b46630be7c6a86a917b364186aa17496 WHIRLPOOL 9d250ee9ddd0431eeabc22ea598eda2bc74ee7ee6c5329522c479143d6c38fa17ae545541b4e3220b05d493c1a5d407c70980d0d1ffa49d2f83dedc1774cfa79
diff --git a/x11-libs/qt-dbus/qt-dbus-4.8.4.ebuild b/x11-libs/qt-dbus/qt-dbus-4.8.4.ebuild
new file mode 100644
index 0000000..03d78c5
--- /dev/null
+++ b/x11-libs/qt-dbus/qt-dbus-4.8.4.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+inherit qt4-build
+
+DESCRIPTION="The DBus module for the Qt toolkit"
+SLOT="4"
+if [[ ${QT4_BUILD_TYPE} == live ]]; then
+ KEYWORDS=""
+else
+ 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=""
+
+DEPEND="
+ >=sys-apps/dbus-1.2
+ ~x11-libs/qt-core-${PV}[aqua=,debug=]
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-4.7-qdbusintegrator-no-const.patch"
+)
+
+pkg_setup() {
+ QT4_TARGET_DIRECTORIES="
+ src/dbus
+ tools/qdbus/qdbus
+ tools/qdbus/qdbusxml2cpp
+ tools/qdbus/qdbuscpp2xml"
+
+ QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
+ include/QtCore
+ include/QtDBus
+ include/QtXml
+ src/corelib
+ src/xml"
+
+ QCONFIG_ADD="dbus dbus-linked"
+ QCONFIG_DEFINE="QT_DBUS"
+
+ qt4-build_pkg_setup
+}
+
+src_configure() {
+ myconf+=" -dbus-linked"
+
+ qt4-build_src_configure
+}
diff --git a/x11-libs/qt-declarative/Manifest b/x11-libs/qt-declarative/Manifest
new file mode 100644
index 0000000..1944fa7
--- /dev/null
+++ b/x11-libs/qt-declarative/Manifest
@@ -0,0 +1 @@
+DIST qt-everywhere-opensource-src-4.8.4.tar.gz 236593028 SHA256 33b0e38ba4c54a0cf8a4be8ca5a4584f1c2e0adfecb57b21d9d1d267b0093270 SHA512 472972b63b5cad83b4c4656b23e95b6d4923cc31a518138e25d5921982b14abc835883356c2b779a7972cb77cf73fe25b46630be7c6a86a917b364186aa17496 WHIRLPOOL 9d250ee9ddd0431eeabc22ea598eda2bc74ee7ee6c5329522c479143d6c38fa17ae545541b4e3220b05d493c1a5d407c70980d0d1ffa49d2f83dedc1774cfa79
diff --git a/x11-libs/qt-declarative/qt-declarative-4.8.4.ebuild b/x11-libs/qt-declarative/qt-declarative-4.8.4.ebuild
new file mode 100644
index 0000000..bf99884
--- /dev/null
+++ b/x11-libs/qt-declarative/qt-declarative-4.8.4.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+inherit qt4-build
+
+DESCRIPTION="The Declarative module for the Qt toolkit"
+SLOT="4"
+if [[ ${QT4_BUILD_TYPE} == live ]]; then
+ KEYWORDS=""
+else
+ KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+fi
+IUSE="+accessibility qt3support webkit"
+
+DEPEND="
+ ~x11-libs/qt-core-${PV}[aqua=,debug=,qt3support=]
+ ~x11-libs/qt-gui-${PV}[accessibility=,aqua=,debug=,qt3support=]
+ ~x11-libs/qt-opengl-${PV}[aqua=,debug=,qt3support=]
+ ~x11-libs/qt-script-${PV}[aqua=,debug=]
+ ~x11-libs/qt-sql-${PV}[aqua=,debug=,qt3support=]
+ ~x11-libs/qt-svg-${PV}[accessibility=,aqua=,debug=]
+ ~x11-libs/qt-xmlpatterns-${PV}[aqua=,debug=]
+ qt3support? ( ~x11-libs/qt-qt3support-${PV}[accessibility=,aqua=,debug=] )
+ webkit? ( ~x11-libs/qt-webkit-${PV}[aqua=,debug=] )
+"
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+ QT4_TARGET_DIRECTORIES="
+ src/declarative
+ src/imports
+ src/plugins/qmltooling
+ tools/designer/src/plugins/qdeclarativeview
+ tools/qml
+ tools/qmlplugindump"
+
+ if use webkit; then
+ QT4_TARGET_DIRECTORIES+=" src/3rdparty/webkit/Source/WebKit/qt/declarative"
+ fi
+
+ QT4_EXTRACT_DIRECTORIES="
+ include
+ src
+ tools
+ translations"
+
+ QCONFIG_ADD="declarative"
+ QCONFIG_DEFINE="QT_DECLARATIVE"
+
+ qt4-build_pkg_setup
+}
+
+src_configure() {
+ myconf+="
+ -declarative -no-gtkstyle
+ $(qt_use accessibility)
+ $(qt_use qt3support)
+ $(qt_use webkit)"
+ qt4-build_src_configure
+}
+
+src_install() {
+ qt4-build_src_install
+
+ # install private headers
+ if use aqua && [[ ${CHOST##*-darwin} -ge 9 ]]; then
+ insinto "${QTLIBDIR#${EPREFIX}}"/QtDeclarative.framework/Headers/private
+ # ran for the 2nd time, need it for the updated headers
+ fix_includes
+ else
+ insinto "${QTHEADERDIR#${EPREFIX}}"/QtDeclarative/private
+ fi
+ find "${S}"/src/declarative/ -type f -name "*_p.h" -exec doins {} +
+}
diff --git a/x11-libs/qt-demo/Manifest b/x11-libs/qt-demo/Manifest
new file mode 100644
index 0000000..1944fa7
--- /dev/null
+++ b/x11-libs/qt-demo/Manifest
@@ -0,0 +1 @@
+DIST qt-everywhere-opensource-src-4.8.4.tar.gz 236593028 SHA256 33b0e38ba4c54a0cf8a4be8ca5a4584f1c2e0adfecb57b21d9d1d267b0093270 SHA512 472972b63b5cad83b4c4656b23e95b6d4923cc31a518138e25d5921982b14abc835883356c2b779a7972cb77cf73fe25b46630be7c6a86a917b364186aa17496 WHIRLPOOL 9d250ee9ddd0431eeabc22ea598eda2bc74ee7ee6c5329522c479143d6c38fa17ae545541b4e3220b05d493c1a5d407c70980d0d1ffa49d2f83dedc1774cfa79
diff --git a/x11-libs/qt-demo/qt-demo-4.8.4.ebuild b/x11-libs/qt-demo/qt-demo-4.8.4.ebuild
new file mode 100644
index 0000000..9bb6a3c
--- /dev/null
+++ b/x11-libs/qt-demo/qt-demo-4.8.4.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+inherit qt4-build
+
+DESCRIPTION="Demonstration module and examples for the Qt toolkit"
+SLOT="4"
+if [[ ${QT4_BUILD_TYPE} == live ]]; then
+ KEYWORDS=""
+else
+ KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x64-macos"
+fi
+IUSE="dbus declarative kde multimedia opengl openvg qt3support webkit xmlpatterns"
+
+DEPEND="
+ ~x11-libs/qt-assistant-${PV}:4[aqua=,debug=]
+ ~x11-libs/qt-core-${PV}:4[aqua=,debug=,qt3support?]
+ ~x11-libs/qt-gui-${PV}:4[aqua=,debug=,qt3support?]
+ ~x11-libs/qt-script-${PV}:4[aqua=,debug=]
+ ~x11-libs/qt-sql-${PV}:4[aqua=,debug=,qt3support?]
+ ~x11-libs/qt-svg-${PV}:4[aqua=,debug=]
+ ~x11-libs/qt-test-${PV}:4[aqua=,debug=]
+ dbus? ( ~x11-libs/qt-dbus-${PV}:4[aqua=,debug=] )
+ declarative? ( ~x11-libs/qt-declarative-${PV}:4[aqua=,debug=,webkit?] )
+ kde? ( media-libs/phonon[aqua=] )
+ !kde? ( || (
+ ~x11-libs/qt-phonon-${PV}:4[aqua=,debug=]
+ media-libs/phonon[aqua=]
+ ) )
+ multimedia? ( ~x11-libs/qt-multimedia-${PV}:4[aqua=,debug=] )
+ opengl? ( ~x11-libs/qt-opengl-${PV}:4[aqua=,debug=,qt3support?] )
+ openvg? ( ~x11-libs/qt-openvg-${PV}:4[aqua=,debug=,qt3support?] )
+ qt3support? ( ~x11-libs/qt-qt3support-${PV}:4[aqua=,debug=] )
+ webkit? ( ~x11-libs/qt-webkit-${PV}:4[aqua=,debug=] )
+ xmlpatterns? ( ~x11-libs/qt-xmlpatterns-${PV}:4[aqua=,debug=] )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-4.6-plugandpaint.patch"
+)
+
+pkg_setup() {
+ QT4_TARGET_DIRECTORIES="
+ demos
+ examples"
+ QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
+ doc/src/images
+ src
+ include
+ tools"
+
+ qt4-build_pkg_setup
+}
+
+src_prepare() {
+ qt4-build_src_prepare
+
+ # Array mapping USE flags to subdirs
+ local flags_subdirs_map=(
+ 'dbus'
+ 'declarative:declarative'
+ 'multimedia:spectrum'
+ 'opengl:boxes|glhypnotizer'
+ 'openvg'
+ 'webkit:browser'
+ 'xmlpatterns'
+ )
+
+ # Disable unwanted examples/demos
+ for flag in "${flags_subdirs_map[@]}"; do
+ if ! use ${flag%:*}; then
+ einfo "Disabling ${flag%:*} examples"
+ sed -i -e "/SUBDIRS += ${flag%:*}/d" \
+ examples/examples.pro || die
+
+ if [[ ${flag} == *:* ]]; then
+ einfo "Disabling ${flag%:*} demos"
+ sed -i -re "/SUBDIRS \+= demos_(${flag#*:})/d" \
+ demos/demos.pro || die
+ fi
+ fi
+ done
+
+ if ! use qt3support; then
+ einfo "Disabling qt3support examples"
+ sed -i -e '/QT_CONFIG, qt3support/d' \
+ examples/graphicsview/graphicsview.pro || die
+ fi
+}
+
+src_configure() {
+ myconf+="
+ $(qt_use dbus)
+ $(qt_use declarative)
+ $(qt_use multimedia)
+ $(qt_use opengl)
+ $(qt_use openvg)
+ $(qt_use qt3support)
+ $(qt_use webkit)
+ $(qt_use xmlpatterns)"
+
+ qt4-build_src_configure
+}
+
+src_install() {
+ insinto "${QTDOCDIR#${EPREFIX}}"/src
+ doins -r doc/src/images
+
+ qt4-build_src_install
+}
diff --git a/x11-libs/qt-gui/Manifest b/x11-libs/qt-gui/Manifest
new file mode 100644
index 0000000..1944fa7
--- /dev/null
+++ b/x11-libs/qt-gui/Manifest
@@ -0,0 +1 @@
+DIST qt-everywhere-opensource-src-4.8.4.tar.gz 236593028 SHA256 33b0e38ba4c54a0cf8a4be8ca5a4584f1c2e0adfecb57b21d9d1d267b0093270 SHA512 472972b63b5cad83b4c4656b23e95b6d4923cc31a518138e25d5921982b14abc835883356c2b779a7972cb77cf73fe25b46630be7c6a86a917b364186aa17496 WHIRLPOOL 9d250ee9ddd0431eeabc22ea598eda2bc74ee7ee6c5329522c479143d6c38fa17ae545541b4e3220b05d493c1a5d407c70980d0d1ffa49d2f83dedc1774cfa79
diff --git a/x11-libs/qt-gui/qt-gui-4.8.4.ebuild b/x11-libs/qt-gui/qt-gui-4.8.4.ebuild
new file mode 100644
index 0000000..c21b719
--- /dev/null
+++ b/x11-libs/qt-gui/qt-gui-4.8.4.ebuild
@@ -0,0 +1,252 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+inherit eutils qt4-build
+
+DESCRIPTION="The GUI module for the Qt toolkit"
+SLOT="4"
+if [[ ${QT4_BUILD_TYPE} == live ]]; then
+ KEYWORDS=""
+else
+ 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="+accessibility cups dbus egl gif +glib gtkstyle mng nas nis qt3support tiff trace xinerama +xv"
+
+REQUIRED_USE="
+ gtkstyle? ( glib )
+"
+
+RDEPEND="
+ app-admin/eselect-qtgraphicssystem
+ media-libs/fontconfig
+ media-libs/freetype:2
+ media-libs/libpng:0
+ sys-libs/zlib
+ virtual/jpeg
+ ~x11-libs/qt-core-${PV}[aqua=,debug=,glib=,qt3support=]
+ ~x11-libs/qt-script-${PV}[aqua=,debug=]
+ !aqua? (
+ x11-libs/libICE
+ x11-libs/libSM
+ x11-libs/libX11
+ x11-libs/libXcursor
+ x11-libs/libXext
+ x11-libs/libXi
+ x11-libs/libXrandr
+ x11-libs/libXrender
+ xinerama? ( x11-libs/libXinerama )
+ xv? ( x11-libs/libXv )
+ )
+ cups? ( net-print/cups )
+ dbus? ( ~x11-libs/qt-dbus-${PV}[aqua=,debug=] )
+ egl? ( media-libs/mesa[egl] )
+ gtkstyle? ( x11-libs/gtk+:2[aqua=] )
+ mng? ( >=media-libs/libmng-1.0.9 )
+ nas? ( >=media-libs/nas-1.5 )
+ tiff? ( media-libs/tiff:0 )
+"
+DEPEND="${RDEPEND}
+ !aqua? (
+ x11-proto/inputproto
+ x11-proto/xextproto
+ xinerama? ( x11-proto/xineramaproto )
+ xv? ( x11-proto/videoproto )
+ )
+"
+PDEPEND="qt3support? ( ~x11-libs/qt-qt3support-${PV}[aqua=,debug=] )"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-4.7.3-cups.patch"
+)
+
+pkg_setup() {
+ # this belongs to pkg_pretend, we have to upgrade to EAPI 4 :)
+ # was planning to use a dep, but to reproduce this you have to
+ # clean-emerge qt-gui[gtkstyle] while having cairo[qt4] installed.
+ # no need to restrict normal first time users for that :)
+ if use gtkstyle && ! has_version x11-libs/qt-gui && has_version x11-libs/cairo[qt4]; then
+ echo
+ eerror "When building qt-gui[gtkstyle] from scratch with cairo present,"
+ eerror "cairo must have the qt4 use flag disabled, otherwise the gtk"
+ eerror "style cannot be built."
+ ewarn
+ eerror "You have the following options:"
+ eerror " - rebuild cairo with -qt4 USE"
+ eerror " - build qt-gui with -gtkstyle USE"
+ ewarn
+ eerror "After you successfully install qt-gui, you'll be able to"
+ eerror "re-enable the disabled use flag and/or reinstall cairo."
+ ewarn
+ echo
+ die "can't build ${PN} with USE=gtkstyle if cairo has 'qt4' USE flag enabled"
+ fi
+
+ QT4_TARGET_DIRECTORIES="
+ src/gui
+ src/scripttools
+ tools/designer
+ tools/linguist/linguist
+ src/plugins/imageformats/gif
+ src/plugins/imageformats/ico
+ src/plugins/imageformats/jpeg
+ src/plugins/inputmethods"
+
+ QT4_EXTRACT_DIRECTORIES="
+ include
+ src
+ tools"
+
+ use accessibility && QT4_TARGET_DIRECTORIES="${QT4_TARGET_DIRECTORIES} src/plugins/accessible/widgets"
+ use dbus && QT4_TARGET_DIRECTORIES="${QT4_TARGET_DIRECTORIES} tools/qdbus/qdbusviewer"
+ use mng && QT4_TARGET_DIRECTORIES="${QT4_TARGET_DIRECTORIES} src/plugins/imageformats/mng"
+ use tiff && QT4_TARGET_DIRECTORIES="${QT4_TARGET_DIRECTORIES} src/plugins/imageformats/tiff"
+ use trace && QT4_TARGET_DIRECTORIES="${QT4_TARGET_DIRECTORIES} src/plugins/graphicssystems/trace"
+
+ # mac version does not contain qtconfig?
+ [[ ${CHOST} == *-darwin* ]] || QT4_TARGET_DIRECTORIES+=" tools/qtconfig"
+
+ QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES} ${QT4_EXTRACT_DIRECTORIES}"
+
+ qt4-build_pkg_setup
+}
+
+src_prepare() {
+ qt4-build_src_prepare
+
+ # Add -xvideo to the list of accepted configure options
+ sed -i -e 's:|-xinerama|:&-xvideo|:' configure
+
+ # Don't build plugins this go around, because they depend on qt3support lib
+ sed -i -e 's:CONFIG(shared:# &:g' tools/designer/src/src.pro
+}
+
+src_configure() {
+ export PATH="${S}/bin:${PATH}"
+ export LD_LIBRARY_PATH="${S}/lib:${LD_LIBRARY_PATH}"
+
+ myconf="$(qt_use accessibility)
+ $(qt_use cups)
+ $(use gif || echo -no-gif)
+ $(qt_use glib)
+ $(qt_use mng libmng system)
+ $(qt_use nas nas-sound system)
+ $(qt_use nis)
+ $(qt_use tiff libtiff system)
+ $(qt_use dbus qdbus)
+ $(qt_use dbus)
+ $(qt_use egl)
+ $(qt_use qt3support)
+ $(qt_use gtkstyle)
+ $(qt_use xinerama)
+ $(qt_use xv xvideo)"
+
+ myconf+="
+ -system-libpng -system-libjpeg
+ -no-sql-mysql -no-sql-psql -no-sql-ibase -no-sql-sqlite -no-sql-sqlite2 -no-sql-odbc
+ -sm -xshape -xsync -xcursor -xfixes -xrandr -xrender -mitshm -xinput -xkb
+ -fontconfig -no-svg -no-webkit -no-phonon -no-opengl"
+
+ [[ ${CHOST} == *86*-apple-darwin* ]] && myconf+=" -no-ssse3" #367045
+
+ qt4-build_src_configure
+
+ if use gtkstyle; then
+ einfo "patching the Makefile to fix qgtkstyle compilation"
+ sed "s:-I/usr/include/qt4 ::" -i src/gui/Makefile ||
+ die "sed failed"
+ fi
+ sed -i -e "s:-I/usr/include/qt4/QtGui ::" src/gui/Makefile || die "sed failed"
+}
+
+src_install() {
+ QCONFIG_ADD="
+ mitshm x11sm xcursor xfixes xinput xkb xrandr xrender xshape xsync
+ fontconfig gif png system-png jpeg system-jpeg
+ $(usev accessibility)
+ $(usev cups)
+ $(use mng && echo system-mng)
+ $(usev nas)
+ $(usev nis)
+ $(use tiff && echo system-tiff)
+ $(usev xinerama)
+ $(use xv && echo xvideo)"
+ QCONFIG_REMOVE="no-gif no-jpeg no-png"
+ QCONFIG_DEFINE="$(use accessibility && echo QT_ACCESSIBILITY)
+ $(use cups && echo QT_CUPS)
+ $(use egl && echo QT_EGL)
+ QT_FONTCONFIG
+ $(use gtkstyle && echo QT_STYLE_GTK)
+ QT_IMAGEFORMAT_JPEG QT_IMAGEFORMAT_PNG
+ $(use mng && echo QT_IMAGEFORMAT_MNG)
+ $(use nas && echo QT_NAS)
+ $(use nis && echo QT_NIS)
+ $(use tiff && echo QT_IMAGEFORMAT_TIFF)
+ QT_SESSIONMANAGER QT_SHAPE QT_XCURSOR QT_XFIXES
+ $(use xinerama && echo QT_XINERAMA)
+ QT_XINPUT QT_XKB QT_XRANDR QT_XRENDER QT_XSYNC
+ $(use xv && echo QT_XVIDEO)"
+
+ qt4-build_src_install
+
+ # qt-creator
+ # some qt-creator headers are located
+ # under /usr/include/qt4/QtDesigner/private.
+ # those headers are just includes of the headers
+ # which are located under tools/designer/src/lib/*
+ # So instead of installing both, we create the private folder
+ # and drop tools/designer/src/lib/* headers in it.
+ if use aqua && [[ ${CHOST##*-darwin} -ge 9 ]]; then
+ insinto "${QTLIBDIR#${EPREFIX}}"/QtDesigner.framework/Headers/private/
+ else
+ insinto "${QTHEADERDIR#${EPREFIX}}"/QtDesigner/private/
+ fi
+ doins "${S}"/tools/designer/src/lib/shared/*
+ doins "${S}"/tools/designer/src/lib/sdk/*
+
+ # install private headers
+ if use aqua && [[ ${CHOST##*-darwin} -ge 9 ]]; then
+ insinto "${QTLIBDIR#${EPREFIX}}"/QtGui.framework/Headers/private/
+ else
+ insinto "${QTHEADERDIR#${EPREFIX}}"/QtGui/private
+ fi
+ find "${S}"/src/gui -type f -name '*_p.h' -exec doins {} +
+
+ if use aqua && [[ ${CHOST##*-darwin} -ge 9 ]]; then
+ # rerun to get links to headers right
+ fix_includes
+ fi
+
+ # touch the available graphics systems
+ dodir /usr/share/qt4/graphicssystems
+ echo "default" > "${ED}"/usr/share/qt4/graphicssystems/raster || die
+ touch "${ED}"/usr/share/qt4/graphicssystems/native || die
+
+ doicon tools/designer/src/designer/images/designer.png
+ newicon tools/linguist/linguist/images/icons/linguist-128-32.png linguist.png
+ newicon tools/qtconfig/images/appicon.png qtconfig.png
+ use dbus && newicon tools/qdbus/qdbusviewer/images/qdbusviewer-128.png qdbusviewer.png
+ make_desktop_entry designer Designer designer 'Qt;Development;GUIDesigner'
+ make_desktop_entry linguist Linguist linguist 'Qt;Development;Translation'
+ make_desktop_entry qtconfig 'Qt Configuration Tool' qtconfig 'Qt;Settings;DesktopSettings'
+}
+
+pkg_postinst() {
+ # raster is the default graphicssystems, set it on first install
+ eselect qtgraphicssystem set raster --use-old
+
+ elog "Starting with Qt 4.8, you may choose the active Qt Graphics System"
+ elog "by using a new eselect module called qtgraphicssystem."
+ elog "Run \`eselect qtgraphicssystem\` for more information."
+
+ if use gtkstyle; then
+ # see bug 388551
+ elog
+ elog "For Qt's GTK style to work, you need to either export"
+ elog "the following variable into your environment:"
+ elog ' GTK2_RC_FILES="$HOME/.gtkrc-2.0"'
+ elog "or alternatively install gnome-base/libgnomeui"
+ fi
+}
diff --git a/x11-libs/qt-multimedia/Manifest b/x11-libs/qt-multimedia/Manifest
new file mode 100644
index 0000000..1944fa7
--- /dev/null
+++ b/x11-libs/qt-multimedia/Manifest
@@ -0,0 +1 @@
+DIST qt-everywhere-opensource-src-4.8.4.tar.gz 236593028 SHA256 33b0e38ba4c54a0cf8a4be8ca5a4584f1c2e0adfecb57b21d9d1d267b0093270 SHA512 472972b63b5cad83b4c4656b23e95b6d4923cc31a518138e25d5921982b14abc835883356c2b779a7972cb77cf73fe25b46630be7c6a86a917b364186aa17496 WHIRLPOOL 9d250ee9ddd0431eeabc22ea598eda2bc74ee7ee6c5329522c479143d6c38fa17ae545541b4e3220b05d493c1a5d407c70980d0d1ffa49d2f83dedc1774cfa79
diff --git a/x11-libs/qt-multimedia/qt-multimedia-4.8.4.ebuild b/x11-libs/qt-multimedia/qt-multimedia-4.8.4.ebuild
new file mode 100644
index 0000000..82686fb
--- /dev/null
+++ b/x11-libs/qt-multimedia/qt-multimedia-4.8.4.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+inherit qt4-build
+
+DESCRIPTION="The Multimedia module for the Qt toolkit"
+SLOT="4"
+if [[ ${QT4_BUILD_TYPE} == live ]]; then
+ KEYWORDS=""
+else
+ KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+fi
+IUSE="alsa"
+
+DEPEND="
+ ~x11-libs/qt-core-${PV}[aqua=,debug=]
+ ~x11-libs/qt-gui-${PV}[aqua=,debug=]
+ alsa? ( media-libs/alsa-lib )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-4.8.0-alsa.patch"
+)
+
+pkg_setup() {
+ QT4_TARGET_DIRECTORIES="
+ src/multimedia"
+
+ QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
+ include/Qt
+ include/QtCore
+ include/QtGui
+ include/QtMultimedia
+ src/src.pro
+ src/corelib
+ src/gui"
+
+ QCONFIG_ADD="multimedia"
+ QCONFIG_DEFINE="QT_MULTIMEDIA"
+
+ qt4-build_pkg_setup
+}
+
+src_configure() {
+ myconf+="
+ -multimedia -audio-backend
+ $(qt_use alsa)
+ -no-accessibility -no-qt3support -no-xmlpatterns -no-phonon -no-phonon-backend
+ -no-svg -no-webkit -no-script -no-scripttools -no-declarative
+ -system-zlib -no-gif -no-libtiff -no-libpng -no-libmng -no-libjpeg -no-openssl
+ -no-cups -no-dbus -no-gtkstyle -no-nas-sound -no-opengl
+ -no-sm -no-xshape -no-xvideo -no-xsync -no-xinerama -no-xcursor -no-xfixes
+ -no-xrandr -no-xrender -no-mitshm -no-fontconfig -no-freetype -no-xinput -no-xkb"
+
+ qt4-build_src_configure
+}
diff --git a/x11-libs/qt-opengl/Manifest b/x11-libs/qt-opengl/Manifest
new file mode 100644
index 0000000..1944fa7
--- /dev/null
+++ b/x11-libs/qt-opengl/Manifest
@@ -0,0 +1 @@
+DIST qt-everywhere-opensource-src-4.8.4.tar.gz 236593028 SHA256 33b0e38ba4c54a0cf8a4be8ca5a4584f1c2e0adfecb57b21d9d1d267b0093270 SHA512 472972b63b5cad83b4c4656b23e95b6d4923cc31a518138e25d5921982b14abc835883356c2b779a7972cb77cf73fe25b46630be7c6a86a917b364186aa17496 WHIRLPOOL 9d250ee9ddd0431eeabc22ea598eda2bc74ee7ee6c5329522c479143d6c38fa17ae545541b4e3220b05d493c1a5d407c70980d0d1ffa49d2f83dedc1774cfa79
diff --git a/x11-libs/qt-opengl/qt-opengl-4.8.4.ebuild b/x11-libs/qt-opengl/qt-opengl-4.8.4.ebuild
new file mode 100644
index 0000000..e6acd91
--- /dev/null
+++ b/x11-libs/qt-opengl/qt-opengl-4.8.4.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+inherit qt4-build
+
+DESCRIPTION="The OpenGL module for the Qt toolkit"
+SLOT="4"
+if [[ ${QT4_BUILD_TYPE} == live ]]; then
+ KEYWORDS=""
+else
+ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+fi
+IUSE="egl qt3support"
+
+DEPEND="
+ virtual/opengl
+ ~x11-libs/qt-core-${PV}[aqua=,debug=,qt3support=]
+ ~x11-libs/qt-gui-${PV}[aqua=,debug=,egl=,qt3support=]
+"
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+ QT4_TARGET_DIRECTORIES="
+ src/opengl
+ src/plugins/graphicssystems/opengl"
+
+ QT4_EXTRACT_DIRECTORIES="
+ include/QtCore
+ include/QtGui
+ include/QtOpenGL
+ src/corelib
+ src/gui
+ src/opengl
+ src/plugins
+ src/3rdparty"
+
+ QCONFIG_ADD="opengl"
+ QCONFIG_DEFINE="QT_OPENGL"
+
+ qt4-build_pkg_setup
+}
+
+src_configure() {
+ myconf+="
+ -opengl
+ $(qt_use qt3support)
+ $(qt_use egl)"
+
+ qt4-build_src_configure
+
+ # Not building tools/designer/src/plugins/tools/view3d as it's
+ # commented out of the build in the source
+}
+
+src_install() {
+ qt4-build_src_install
+
+ # touch the available graphics systems
+ dodir /usr/share/qt4/graphicssystems
+ echo "experimental" > "${ED}"/usr/share/qt4/graphicssystems/opengl || die
+}
diff --git a/x11-libs/qt-openvg/Manifest b/x11-libs/qt-openvg/Manifest
new file mode 100644
index 0000000..1944fa7
--- /dev/null
+++ b/x11-libs/qt-openvg/Manifest
@@ -0,0 +1 @@
+DIST qt-everywhere-opensource-src-4.8.4.tar.gz 236593028 SHA256 33b0e38ba4c54a0cf8a4be8ca5a4584f1c2e0adfecb57b21d9d1d267b0093270 SHA512 472972b63b5cad83b4c4656b23e95b6d4923cc31a518138e25d5921982b14abc835883356c2b779a7972cb77cf73fe25b46630be7c6a86a917b364186aa17496 WHIRLPOOL 9d250ee9ddd0431eeabc22ea598eda2bc74ee7ee6c5329522c479143d6c38fa17ae545541b4e3220b05d493c1a5d407c70980d0d1ffa49d2f83dedc1774cfa79
diff --git a/x11-libs/qt-openvg/qt-openvg-4.8.4.ebuild b/x11-libs/qt-openvg/qt-openvg-4.8.4.ebuild
new file mode 100644
index 0000000..29c8fea
--- /dev/null
+++ b/x11-libs/qt-openvg/qt-openvg-4.8.4.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+inherit qt4-build
+
+DESCRIPTION="The OpenVG module for the Qt toolkit"
+SLOT="4"
+if [[ ${QT4_BUILD_TYPE} == live ]]; then
+ KEYWORDS=""
+else
+ KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+fi
+IUSE="qt3support"
+
+DEPEND="
+ media-libs/mesa[egl,openvg]
+ ~x11-libs/qt-core-${PV}[aqua=,debug=,qt3support=]
+ ~x11-libs/qt-gui-${PV}[aqua=,debug=,egl,qt3support=]
+"
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+ QT4_TARGET_DIRECTORIES="
+ src/openvg
+ src/plugins/graphicssystems/openvg"
+
+ QT4_EXTRACT_DIRECTORIES="
+ include/QtCore
+ include/QtGui
+ include/QtOpenVG
+ src/corelib
+ src/gui
+ src/openvg
+ src/plugins
+ src/3rdparty"
+
+ QCONFIG_ADD="openvg"
+ QCONFIG_DEFINE="QT_OPENVG"
+
+ qt4-build_pkg_setup
+}
+
+src_configure() {
+ gltype="desktop"
+
+ myconf+="
+ -openvg -egl
+ $(qt_use qt3support)"
+
+ qt4-build_src_configure
+}
+
+src_install() {
+ qt4-build_src_install
+
+ # touch the available graphics systems
+ dodir /usr/share/qt4/graphicssystems
+ echo "experimental" > "${ED}"/usr/share/qt4/graphicssystems/openvg || die
+}
diff --git a/x11-libs/qt-phonon/Manifest b/x11-libs/qt-phonon/Manifest
new file mode 100644
index 0000000..1944fa7
--- /dev/null
+++ b/x11-libs/qt-phonon/Manifest
@@ -0,0 +1 @@
+DIST qt-everywhere-opensource-src-4.8.4.tar.gz 236593028 SHA256 33b0e38ba4c54a0cf8a4be8ca5a4584f1c2e0adfecb57b21d9d1d267b0093270 SHA512 472972b63b5cad83b4c4656b23e95b6d4923cc31a518138e25d5921982b14abc835883356c2b779a7972cb77cf73fe25b46630be7c6a86a917b364186aa17496 WHIRLPOOL 9d250ee9ddd0431eeabc22ea598eda2bc74ee7ee6c5329522c479143d6c38fa17ae545541b4e3220b05d493c1a5d407c70980d0d1ffa49d2f83dedc1774cfa79
diff --git a/x11-libs/qt-phonon/qt-phonon-4.8.4.ebuild b/x11-libs/qt-phonon/qt-phonon-4.8.4.ebuild
new file mode 100644
index 0000000..9ad26b1
--- /dev/null
+++ b/x11-libs/qt-phonon/qt-phonon-4.8.4.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+inherit qt4-build
+
+DESCRIPTION="The Phonon module for the Qt toolkit"
+SLOT="4"
+if [[ ${QT4_BUILD_TYPE} == live ]]; then
+ KEYWORDS=""
+else
+ KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+fi
+IUSE="dbus qt3support"
+
+DEPEND="
+ ~x11-libs/qt-gui-${PV}[aqua=,debug=,qt3support=]
+ !kde-base/phonon-kde
+ !kde-base/phonon-xine
+ !media-libs/phonon
+ !media-sound/phonon
+ !aqua? ( media-libs/gstreamer:0.10
+ media-plugins/gst-plugins-meta:0.10 )
+ aqua? ( ~x11-libs/qt-opengl-${PV}[aqua,debug=,qt3support=] )
+ dbus? ( ~x11-libs/qt-dbus-${PV}[aqua=,debug=] )
+"
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+ QT4_TARGET_DIRECTORIES="
+ src/phonon
+ src/plugins/phonon
+ tools/designer/src/plugins/phononwidgets"
+
+ QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
+ include
+ src
+ tools"
+
+ QCONFIG_ADD="phonon"
+ QCONFIG_DEFINE="QT_PHONON
+ $(use !aqua && echo QT_GSTREAMER)"
+
+ qt4-build_pkg_setup
+}
+
+src_configure() {
+ myconf+="
+ -phonon -phonon-backend -no-opengl -no-svg
+ $(qt_use dbus qdbus)
+ $(qt_use qt3support)"
+
+ qt4-build_src_configure
+}
diff --git a/x11-libs/qt-qt3support/Manifest b/x11-libs/qt-qt3support/Manifest
new file mode 100644
index 0000000..1944fa7
--- /dev/null
+++ b/x11-libs/qt-qt3support/Manifest
@@ -0,0 +1 @@
+DIST qt-everywhere-opensource-src-4.8.4.tar.gz 236593028 SHA256 33b0e38ba4c54a0cf8a4be8ca5a4584f1c2e0adfecb57b21d9d1d267b0093270 SHA512 472972b63b5cad83b4c4656b23e95b6d4923cc31a518138e25d5921982b14abc835883356c2b779a7972cb77cf73fe25b46630be7c6a86a917b364186aa17496 WHIRLPOOL 9d250ee9ddd0431eeabc22ea598eda2bc74ee7ee6c5329522c479143d6c38fa17ae545541b4e3220b05d493c1a5d407c70980d0d1ffa49d2f83dedc1774cfa79
diff --git a/x11-libs/qt-qt3support/qt-qt3support-4.8.4.ebuild b/x11-libs/qt-qt3support/qt-qt3support-4.8.4.ebuild
new file mode 100644
index 0000000..8514a36
--- /dev/null
+++ b/x11-libs/qt-qt3support/qt-qt3support-4.8.4.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+inherit qt4-build
+
+DESCRIPTION="The Qt3 support module for the Qt toolkit"
+SLOT="4"
+if [[ ${QT4_BUILD_TYPE} == live ]]; then
+ KEYWORDS=""
+else
+ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
+fi
+IUSE="+accessibility"
+
+DEPEND="
+ ~x11-libs/qt-core-${PV}[aqua=,debug=,qt3support]
+ ~x11-libs/qt-gui-${PV}[accessibility=,aqua=,debug=,qt3support]
+ ~x11-libs/qt-sql-${PV}[aqua=,debug=,qt3support]
+"
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+ QT4_TARGET_DIRECTORIES="
+ src/qt3support
+ src/tools/uic3
+ tools/designer/src/plugins/widgets
+ tools/porting"
+
+ QT4_EXTRACT_DIRECTORIES="
+ src
+ include
+ tools"
+
+ qt4-build_pkg_setup
+}
+
+src_configure() {
+ myconf+="
+ -qt3support
+ $(qt_use accessibility)"
+
+ qt4-build_src_configure
+}
diff --git a/x11-libs/qt-script/Manifest b/x11-libs/qt-script/Manifest
new file mode 100644
index 0000000..1944fa7
--- /dev/null
+++ b/x11-libs/qt-script/Manifest
@@ -0,0 +1 @@
+DIST qt-everywhere-opensource-src-4.8.4.tar.gz 236593028 SHA256 33b0e38ba4c54a0cf8a4be8ca5a4584f1c2e0adfecb57b21d9d1d267b0093270 SHA512 472972b63b5cad83b4c4656b23e95b6d4923cc31a518138e25d5921982b14abc835883356c2b779a7972cb77cf73fe25b46630be7c6a86a917b364186aa17496 WHIRLPOOL 9d250ee9ddd0431eeabc22ea598eda2bc74ee7ee6c5329522c479143d6c38fa17ae545541b4e3220b05d493c1a5d407c70980d0d1ffa49d2f83dedc1774cfa79
diff --git a/x11-libs/qt-script/qt-script-4.8.4.ebuild b/x11-libs/qt-script/qt-script-4.8.4.ebuild
new file mode 100644
index 0000000..12e78c9
--- /dev/null
+++ b/x11-libs/qt-script/qt-script-4.8.4.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+inherit qt4-build
+
+DESCRIPTION="The ECMAScript module for the Qt toolkit"
+SLOT="4"
+if [[ ${QT4_BUILD_TYPE} == live ]]; then
+ KEYWORDS=""
+else
+ 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="iconv +jit"
+
+DEPEND="
+ ~x11-libs/qt-core-${PV}[aqua=,debug=]
+"
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+ QT4_TARGET_DIRECTORIES="
+ src/script"
+
+ QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
+ include/Qt
+ include/QtCore
+ include/QtScript
+ src/3rdparty/javascriptcore
+ src/corelib"
+
+ QCONFIG_ADD="script"
+ QCONFIG_DEFINE="QT_SCRIPT"
+
+ qt4-build_pkg_setup
+}
+
+src_configure() {
+ myconf+="
+ $(qt_use iconv)
+ $(qt_use jit javascript-jit)
+ -no-xkb -no-fontconfig -no-xrender -no-xrandr -no-xfixes -no-xcursor -no-xinerama
+ -no-xshape -no-sm -no-opengl -no-nas-sound -no-dbus -no-cups -no-nis -no-gif
+ -no-libpng -no-libmng -no-libjpeg -no-openssl -system-zlib -no-webkit -no-phonon
+ -no-qt3support -no-xmlpatterns -no-freetype -no-libtiff
+ -no-accessibility -no-fontconfig -no-glib -no-opengl -no-svg
+ -no-gtkstyle"
+
+ qt4-build_src_configure
+}
+
+src_install() {
+ qt4-build_src_install
+
+ # install private headers
+ insinto "${QTHEADERDIR#${EPREFIX}}"/QtScript/private
+ find "${S}"/src/script -type f -name "*_p.h" -exec doins {} +
+}
diff --git a/x11-libs/qt-sql/Manifest b/x11-libs/qt-sql/Manifest
new file mode 100644
index 0000000..1944fa7
--- /dev/null
+++ b/x11-libs/qt-sql/Manifest
@@ -0,0 +1 @@
+DIST qt-everywhere-opensource-src-4.8.4.tar.gz 236593028 SHA256 33b0e38ba4c54a0cf8a4be8ca5a4584f1c2e0adfecb57b21d9d1d267b0093270 SHA512 472972b63b5cad83b4c4656b23e95b6d4923cc31a518138e25d5921982b14abc835883356c2b779a7972cb77cf73fe25b46630be7c6a86a917b364186aa17496 WHIRLPOOL 9d250ee9ddd0431eeabc22ea598eda2bc74ee7ee6c5329522c479143d6c38fa17ae545541b4e3220b05d493c1a5d407c70980d0d1ffa49d2f83dedc1774cfa79
diff --git a/x11-libs/qt-sql/qt-sql-4.8.4.ebuild b/x11-libs/qt-sql/qt-sql-4.8.4.ebuild
new file mode 100644
index 0000000..302fc1d
--- /dev/null
+++ b/x11-libs/qt-sql/qt-sql-4.8.4.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+inherit multilib qt4-build
+
+DESCRIPTION="The SQL module for the Qt toolkit"
+SLOT="4"
+if [[ ${QT4_BUILD_TYPE} == live ]]; then
+ KEYWORDS=""
+else
+ 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="firebird freetds mysql oci8 odbc postgres qt3support +sqlite"
+
+REQUIRED_USE="
+ || ( firebird freetds mysql oci8 odbc postgres sqlite )
+"
+
+DEPEND="
+ ~x11-libs/qt-core-${PV}[aqua=,debug=,qt3support=]
+ firebird? ( dev-db/firebird )
+ freetds? ( dev-db/freetds )
+ mysql? ( virtual/mysql )
+ oci8? ( dev-db/oracle-instantclient-basic )
+ odbc? ( || ( dev-db/unixODBC dev-db/libiodbc ) )
+ postgres? ( dev-db/postgresql-base )
+ sqlite? ( dev-db/sqlite:3 )
+"
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+ QT4_TARGET_DIRECTORIES="
+ src/sql
+ src/plugins/sqldrivers"
+
+ QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
+ include/Qt
+ include/QtCore
+ include/QtSql
+ src/src.pro
+ src/corelib
+ src/plugins
+ src/tools/tools.pro"
+
+ qt4-build_pkg_setup
+}
+
+src_configure() {
+ myconf+="
+ $(qt_use firebird sql-ibase plugin)
+ $(qt_use freetds sql-tds plugin)
+ $(qt_use mysql sql-mysql plugin) $(use mysql && echo "-I${EPREFIX}/usr/include/mysql -L${EPREFIX}/usr/$(get_libdir)/mysql")
+ $(qt_use oci8 sql-oci plugin) $(use oci8 && echo "-I${ORACLE_HOME}/include -L${ORACLE_HOME}/$(get_libdir)")
+ $(qt_use odbc sql-odbc plugin) $(use odbc && echo "-I${EPREFIX}/usr/include/iodbc")
+ $(qt_use postgres sql-psql plugin) $(use postgres && echo "-I${EPREFIX}/usr/include/postgresql/pgsql")
+ $(qt_use sqlite sql-sqlite plugin) $(use sqlite && echo -system-sqlite)
+ -no-sql-db2
+ -no-sql-sqlite2
+ -no-sql-symsql
+ $(qt_use qt3support)
+ -no-accessibility -no-xmlpatterns -no-multimedia -no-audio-backend -no-phonon
+ -no-phonon-backend -no-svg -no-webkit -no-script -no-scripttools -no-declarative
+ -system-zlib -no-gif -no-libtiff -no-libpng -no-libmng -no-libjpeg -no-openssl
+ -no-cups -no-dbus -no-gtkstyle -no-nas-sound -no-opengl
+ -no-sm -no-xshape -no-xvideo -no-xsync -no-xinerama -no-xcursor -no-xfixes
+ -no-xrandr -no-xrender -no-mitshm -no-fontconfig -no-freetype -no-xinput -no-xkb
+ -no-glib"
+
+ qt4-build_src_configure
+}
diff --git a/x11-libs/qt-svg/Manifest b/x11-libs/qt-svg/Manifest
new file mode 100644
index 0000000..1944fa7
--- /dev/null
+++ b/x11-libs/qt-svg/Manifest
@@ -0,0 +1 @@
+DIST qt-everywhere-opensource-src-4.8.4.tar.gz 236593028 SHA256 33b0e38ba4c54a0cf8a4be8ca5a4584f1c2e0adfecb57b21d9d1d267b0093270 SHA512 472972b63b5cad83b4c4656b23e95b6d4923cc31a518138e25d5921982b14abc835883356c2b779a7972cb77cf73fe25b46630be7c6a86a917b364186aa17496 WHIRLPOOL 9d250ee9ddd0431eeabc22ea598eda2bc74ee7ee6c5329522c479143d6c38fa17ae545541b4e3220b05d493c1a5d407c70980d0d1ffa49d2f83dedc1774cfa79
diff --git a/x11-libs/qt-svg/qt-svg-4.8.4.ebuild b/x11-libs/qt-svg/qt-svg-4.8.4.ebuild
new file mode 100644
index 0000000..ba330f3
--- /dev/null
+++ b/x11-libs/qt-svg/qt-svg-4.8.4.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+inherit qt4-build
+
+DESCRIPTION="The SVG module for the Qt toolkit"
+SLOT="4"
+if [[ ${QT4_BUILD_TYPE} == live ]]; then
+ KEYWORDS=""
+else
+ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+fi
+IUSE="+accessibility"
+
+DEPEND="
+ sys-libs/zlib
+ ~x11-libs/qt-core-${PV}[aqua=,debug=]
+ ~x11-libs/qt-gui-${PV}[accessibility=,aqua=,debug=]
+"
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+ QT4_TARGET_DIRECTORIES="
+ src/svg
+ src/plugins/imageformats/svg
+ src/plugins/iconengines/svgiconengine"
+
+ QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
+ include/QtSvg
+ include/Qt
+ include/QtGui
+ include/QtCore
+ include/QtXml
+ src/corelib
+ src/gui
+ src/plugins
+ src/xml
+ src/3rdparty"
+
+ QCONFIG_ADD="svg"
+ QCONFIG_DEFINE="QT_SVG"
+
+ qt4-build_pkg_setup
+}
+
+src_configure() {
+ myconf+="
+ -svg
+ $(qt_use accessibility)
+ -no-xkb -no-xrender
+ -no-xrandr -no-xfixes -no-xcursor -no-xinerama -no-xshape -no-sm
+ -no-opengl -no-nas-sound -no-dbus -no-cups -no-nis -no-gif -no-libpng
+ -no-libmng -no-libjpeg -no-openssl -system-zlib -no-webkit -no-phonon
+ -no-qt3support -no-xmlpatterns -no-freetype -no-libtiff
+ -no-fontconfig -no-glib -no-gtkstyle"
+
+ qt4-build_src_configure
+}
diff --git a/x11-libs/qt-test/Manifest b/x11-libs/qt-test/Manifest
new file mode 100644
index 0000000..1944fa7
--- /dev/null
+++ b/x11-libs/qt-test/Manifest
@@ -0,0 +1 @@
+DIST qt-everywhere-opensource-src-4.8.4.tar.gz 236593028 SHA256 33b0e38ba4c54a0cf8a4be8ca5a4584f1c2e0adfecb57b21d9d1d267b0093270 SHA512 472972b63b5cad83b4c4656b23e95b6d4923cc31a518138e25d5921982b14abc835883356c2b779a7972cb77cf73fe25b46630be7c6a86a917b364186aa17496 WHIRLPOOL 9d250ee9ddd0431eeabc22ea598eda2bc74ee7ee6c5329522c479143d6c38fa17ae545541b4e3220b05d493c1a5d407c70980d0d1ffa49d2f83dedc1774cfa79
diff --git a/x11-libs/qt-test/qt-test-4.8.4.ebuild b/x11-libs/qt-test/qt-test-4.8.4.ebuild
new file mode 100644
index 0000000..74f21fb
--- /dev/null
+++ b/x11-libs/qt-test/qt-test-4.8.4.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+inherit qt4-build
+
+DESCRIPTION="The testing framework module for the Qt toolkit"
+SLOT="4"
+if [[ ${QT4_BUILD_TYPE} == live ]]; then
+ KEYWORDS=""
+else
+ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+fi
+IUSE=""
+
+DEPEND="
+ ~x11-libs/qt-core-${PV}[aqua=,debug=]
+"
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+ QT4_TARGET_DIRECTORIES="
+ src/testlib"
+
+ QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
+ include/QtTest
+ include/QtCore
+ src/corelib"
+
+ qt4-build_pkg_setup
+}
+
+src_configure() {
+ myconf+="
+ -no-xkb -no-fontconfig -no-xrender -no-xrandr -no-xfixes -no-xcursor
+ -no-xinerama -no-xshape -no-sm -no-opengl
+ -no-nas-sound -no-dbus -no-cups -no-nis -no-gif -no-libpng
+ -no-libmng -no-libjpeg -no-openssl -system-zlib -no-webkit -no-phonon
+ -no-qt3support -no-xmlpatterns -no-freetype -no-libtiff
+ -no-accessibility -no-fontconfig -no-glib -no-svg"
+
+ qt4-build_src_configure
+}
diff --git a/x11-libs/qt-webkit/Manifest b/x11-libs/qt-webkit/Manifest
new file mode 100644
index 0000000..1944fa7
--- /dev/null
+++ b/x11-libs/qt-webkit/Manifest
@@ -0,0 +1 @@
+DIST qt-everywhere-opensource-src-4.8.4.tar.gz 236593028 SHA256 33b0e38ba4c54a0cf8a4be8ca5a4584f1c2e0adfecb57b21d9d1d267b0093270 SHA512 472972b63b5cad83b4c4656b23e95b6d4923cc31a518138e25d5921982b14abc835883356c2b779a7972cb77cf73fe25b46630be7c6a86a917b364186aa17496 WHIRLPOOL 9d250ee9ddd0431eeabc22ea598eda2bc74ee7ee6c5329522c479143d6c38fa17ae545541b4e3220b05d493c1a5d407c70980d0d1ffa49d2f83dedc1774cfa79
diff --git a/x11-libs/qt-webkit/qt-webkit-4.8.4.ebuild b/x11-libs/qt-webkit/qt-webkit-4.8.4.ebuild
new file mode 100644
index 0000000..50d54f1
--- /dev/null
+++ b/x11-libs/qt-webkit/qt-webkit-4.8.4.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+inherit qt4-build flag-o-matic
+
+DESCRIPTION="The WebKit module for the Qt toolkit"
+SLOT="4"
+if [[ ${QT4_BUILD_TYPE} == live ]]; then
+ KEYWORDS=""
+else
+ KEYWORDS="~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
+fi
+IUSE="+gstreamer icu +jit"
+
+# libxml2[!icu?] is needed for bugs 407315 and 411091
+DEPEND="
+ dev-db/sqlite:3
+ x11-libs/libX11
+ x11-libs/libXrender
+ ~x11-libs/qt-core-${PV}[aqua=,debug=,ssl]
+ ~x11-libs/qt-gui-${PV}[aqua=,debug=]
+ ~x11-libs/qt-xmlpatterns-${PV}[aqua=,debug=]
+ gstreamer? (
+ dev-libs/glib:2
+ dev-libs/libxml2:2[!icu?]
+ media-libs/gstreamer:0.10
+ media-libs/gst-plugins-base:0.10
+ )
+ icu? ( dev-libs/icu )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-4.8.1-no-use-ld-gold.patch"
+ "${FILESDIR}/4.8.2-javascriptcore-x32.patch"
+)
+
+pkg_setup() {
+ QT4_TARGET_DIRECTORIES="
+ src/3rdparty/webkit/Source/JavaScriptCore
+ src/3rdparty/webkit/Source/WebCore
+ src/3rdparty/webkit/Source/WebKit/qt
+ tools/designer/src/plugins/qwebview"
+
+ QT4_EXTRACT_DIRECTORIES="
+ include
+ src
+ tools"
+
+ QCONFIG_ADD="webkit"
+ QCONFIG_DEFINE="QT_WEBKIT"
+
+ qt4-build_pkg_setup
+}
+
+src_prepare() {
+ # Fix version number in generated pkgconfig file, bug 406443
+ sed -i -e 's/^isEmpty(QT_BUILD_TREE)://' \
+ src/3rdparty/webkit/Source/WebKit/qt/QtWebKit.pro || die
+
+ # Remove -Werror from CXXFLAGS
+ sed -i -e '/QMAKE_CXXFLAGS\s*+=/ s:-Werror::g' \
+ src/3rdparty/webkit/Source/WebKit.pri || die
+
+ if use icu; then
+ sed -i -e '/CONFIG\s*+=\s*text_breaking_with_icu/ s:^#\s*::' \
+ src/3rdparty/webkit/Source/JavaScriptCore/JavaScriptCore.pri || die
+ fi
+
+ qt4-build_src_prepare
+}
+
+src_configure() {
+ myconf+="
+ -webkit
+ -system-sqlite
+ $(qt_use icu)
+ $(qt_use jit javascript-jit)
+ $(use gstreamer || echo -DENABLE_VIDEO=0)"
+
+ qt4-build_src_configure
+}
diff --git a/x11-libs/qt-xmlpatterns/Manifest b/x11-libs/qt-xmlpatterns/Manifest
new file mode 100644
index 0000000..1944fa7
--- /dev/null
+++ b/x11-libs/qt-xmlpatterns/Manifest
@@ -0,0 +1 @@
+DIST qt-everywhere-opensource-src-4.8.4.tar.gz 236593028 SHA256 33b0e38ba4c54a0cf8a4be8ca5a4584f1c2e0adfecb57b21d9d1d267b0093270 SHA512 472972b63b5cad83b4c4656b23e95b6d4923cc31a518138e25d5921982b14abc835883356c2b779a7972cb77cf73fe25b46630be7c6a86a917b364186aa17496 WHIRLPOOL 9d250ee9ddd0431eeabc22ea598eda2bc74ee7ee6c5329522c479143d6c38fa17ae545541b4e3220b05d493c1a5d407c70980d0d1ffa49d2f83dedc1774cfa79
diff --git a/x11-libs/qt-xmlpatterns/qt-xmlpatterns-4.8.4.ebuild b/x11-libs/qt-xmlpatterns/qt-xmlpatterns-4.8.4.ebuild
new file mode 100644
index 0000000..0e6a0b1
--- /dev/null
+++ b/x11-libs/qt-xmlpatterns/qt-xmlpatterns-4.8.4.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+inherit qt4-build
+
+DESCRIPTION="The XmlPatterns module for the Qt toolkit"
+SLOT="4"
+if [[ ${QT4_BUILD_TYPE} == live ]]; then
+ KEYWORDS=""
+else
+ 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=""
+
+DEPEND="
+ ~x11-libs/qt-core-${PV}[aqua=,debug=]
+"
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+ QT4_TARGET_DIRECTORIES="
+ src/xmlpatterns
+ tools/xmlpatterns
+ tools/xmlpatternsvalidator"
+
+ QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
+ include/QtCore
+ include/QtNetwork
+ include/QtXml
+ include/QtXmlPatterns
+ src/network
+ src/xml
+ src/corelib"
+
+ QCONFIG_ADD="xmlpatterns"
+ QCONFIG_DEFINE="QT_XMLPATTERNS"
+
+ qt4-build_pkg_setup
+}
+
+src_configure() {
+ myconf+=" -xmlpatterns"
+
+ qt4-build_src_configure
+}
^ permalink raw reply related [flat|nested] 11+ messages in thread* [gentoo-commits] proj/qt:master commit in: x11-libs/qt-opengl/, x11-libs/qt-script/, x11-libs/qt-qt3support/, ...
@ 2012-12-05 9:23 Michael Palimaka
0 siblings, 0 replies; 11+ messages in thread
From: Michael Palimaka @ 2012-12-05 9:23 UTC (permalink / raw
To: gentoo-commits
commit: 98aef5f521c04a1cd009fbaa8ccbb4599f07fc31
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 5 09:19:52 2012 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Dec 5 09:20:45 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=98aef5f5
[x11-libs/qt-*] 4.8.4 has been moved to the main tree.
---
profiles/package.mask | 21 --
x11-libs/qt-assistant/Manifest | 1 -
x11-libs/qt-assistant/qt-assistant-4.8.4.ebuild | 134 -----------
x11-libs/qt-bearer/Manifest | 1 -
x11-libs/qt-bearer/qt-bearer-4.8.4.ebuild | 58 -----
x11-libs/qt-core/Manifest | 1 -
x11-libs/qt-core/qt-core-4.8.4.ebuild | 180 --------------
x11-libs/qt-dbus/Manifest | 1 -
x11-libs/qt-dbus/qt-dbus-4.8.4.ebuild | 52 ----
x11-libs/qt-declarative/Manifest | 1 -
.../qt-declarative/qt-declarative-4.8.4.ebuild | 77 ------
x11-libs/qt-demo/Manifest | 1 -
x11-libs/qt-demo/qt-demo-4.8.4.ebuild | 114 ---------
x11-libs/qt-gui/Manifest | 1 -
x11-libs/qt-gui/qt-gui-4.8.4.ebuild | 252 --------------------
x11-libs/qt-multimedia/Manifest | 1 -
x11-libs/qt-multimedia/qt-multimedia-4.8.4.ebuild | 60 -----
x11-libs/qt-opengl/Manifest | 1 -
x11-libs/qt-opengl/qt-opengl-4.8.4.ebuild | 64 -----
x11-libs/qt-openvg/Manifest | 1 -
x11-libs/qt-openvg/qt-openvg-4.8.4.ebuild | 62 -----
x11-libs/qt-phonon/Manifest | 1 -
x11-libs/qt-phonon/qt-phonon-4.8.4.ebuild | 56 -----
x11-libs/qt-qt3support/Manifest | 1 -
x11-libs/qt-qt3support/qt-qt3support-4.8.4.ebuild | 46 ----
x11-libs/qt-script/Manifest | 1 -
x11-libs/qt-script/qt-script-4.8.4.ebuild | 60 -----
x11-libs/qt-sql/Manifest | 1 -
x11-libs/qt-sql/qt-sql-4.8.4.ebuild | 73 ------
x11-libs/qt-svg/Manifest | 1 -
x11-libs/qt-svg/qt-svg-4.8.4.ebuild | 61 -----
x11-libs/qt-test/Manifest | 1 -
x11-libs/qt-test/qt-test-4.8.4.ebuild | 45 ----
x11-libs/qt-webkit/Manifest | 1 -
x11-libs/qt-webkit/qt-webkit-4.8.4.ebuild | 85 -------
x11-libs/qt-xmlpatterns/Manifest | 1 -
.../qt-xmlpatterns/qt-xmlpatterns-4.8.4.ebuild | 48 ----
37 files changed, 0 insertions(+), 1566 deletions(-)
diff --git a/profiles/package.mask b/profiles/package.mask
index 019750d..58c4dff 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -5,24 +5,3 @@
# Markos Chandras <hwoarang@gentoo.org> (25 Jul 2009)
# Alpha versions are not for everybody :)
=app-emulation/qtemu-2.0_alpha*
-
-# Ben de Groot <yngwin@gentoo.org) (30 Nov 2012)
-# initial bump, masked for testing
-=x11-libs/qt-assistant-4.8.4
-=x11-libs/qt-bearer-4.8.4
-=x11-libs/qt-core-4.8.4
-=x11-libs/qt-dbus-4.8.4
-=x11-libs/qt-declarative-4.8.4
-=x11-libs/qt-demo-4.8.4
-=x11-libs/qt-gui-4.8.4
-=x11-libs/qt-multimedia-4.8.4
-=x11-libs/qt-opengl-4.8.4
-=x11-libs/qt-openvg-4.8.4
-=x11-libs/qt-phonon-4.8.4
-=x11-libs/qt-qt3support-4.8.4
-=x11-libs/qt-script-4.8.4
-=x11-libs/qt-sql-4.8.4
-=x11-libs/qt-svg-4.8.4
-=x11-libs/qt-test-4.8.4
-=x11-libs/qt-webkit-4.8.4
-=x11-libs/qt-xmlpatterns-4.8.4
diff --git a/x11-libs/qt-assistant/Manifest b/x11-libs/qt-assistant/Manifest
index 46da1dc..7abb861 100644
--- a/x11-libs/qt-assistant/Manifest
+++ b/x11-libs/qt-assistant/Manifest
@@ -1,3 +1,2 @@
DIST qt-assistant-compat-headers-4.7.tar.gz 448 SHA256 73ae604834cc89d6c67bafc65bb5d3cadaec23076d02711fc0c30a85df3d8580 SHA512 da14cb9904591f4389862cf1e1c96f923e72b7b904d57787d68feae2c90d52bf713e930442aa3abd4b457c3cc66c88b94e23df5fc25e33e01f1ed4d3093460bb WHIRLPOOL 26c42c101aab36a8d0355f1243226f6b8bd5a477c5aafece7e036f18a9fcfe98ae016042befe494fca0c42b825e29539825466c1ddb720102fa6c65e9cbaec61
DIST qt-assistant-qassistantclient-library-compat-src-4.6.3.tar.gz 329896 SHA256 e698be8fc0d32c5f0b5b46cafcb8f615accaed524b864e58b99b64b7b5549c2d SHA512 a4050d93e448d29004d71d5ea670e60242f1272399f65db084dd928150f26404d37544d011d75bbb1c62f227752f92b86a4f4382dc54f0681a3df6da738af106 WHIRLPOOL 9c2822ae2f1ee7c4f63236cc95eb0cb025f088e1f13e0a154fabdad5af6209b0e4cdda86d23061bf35fe5919a1909ed162bbc4835da79fdf1b187461aa948a1b
-DIST qt-everywhere-opensource-src-4.8.4.tar.gz 236593028 SHA256 33b0e38ba4c54a0cf8a4be8ca5a4584f1c2e0adfecb57b21d9d1d267b0093270 SHA512 472972b63b5cad83b4c4656b23e95b6d4923cc31a518138e25d5921982b14abc835883356c2b779a7972cb77cf73fe25b46630be7c6a86a917b364186aa17496 WHIRLPOOL 9d250ee9ddd0431eeabc22ea598eda2bc74ee7ee6c5329522c479143d6c38fa17ae545541b4e3220b05d493c1a5d407c70980d0d1ffa49d2f83dedc1774cfa79
diff --git a/x11-libs/qt-assistant/qt-assistant-4.8.4.ebuild b/x11-libs/qt-assistant/qt-assistant-4.8.4.ebuild
deleted file mode 100644
index 8d396a4..0000000
--- a/x11-libs/qt-assistant/qt-assistant-4.8.4.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-inherit eutils qt4-build
-
-DESCRIPTION="The Help module and Assistant application for the Qt toolkit"
-SRC_URI+="
- compat? (
- ftp://ftp.qt.nokia.com/qt/source/${PN}-qassistantclient-library-compat-src-4.6.3.tar.gz
- http://dev.gentoo.org/~pesa/distfiles/${PN}-compat-headers-4.7.tar.gz
- )"
-
-SLOT="4"
-if [[ ${QT4_BUILD_TYPE} == live ]]; then
- KEYWORDS=""
-else
- KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos ~x64-macos"
-fi
-IUSE="compat doc +glib qt3support trace webkit"
-
-DEPEND="
- ~x11-libs/qt-gui-${PV}[aqua=,debug=,glib=,qt3support=,trace?]
- ~x11-libs/qt-sql-${PV}[aqua=,debug=,qt3support=,sqlite]
- webkit? ( ~x11-libs/qt-webkit-${PV}[aqua=,debug=] )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
- "${FILESDIR}/${PN}-4.8.2+gcc-4.7.patch"
-)
-
-pkg_setup() {
- # Pixeltool isn't really assistant related, but it relies on
- # the assistant libraries.
- QT4_TARGET_DIRECTORIES="
- tools/assistant
- tools/pixeltool
- tools/qdoc3"
- QT4_EXTRACT_DIRECTORIES="
- tools
- demos
- examples
- src
- include
- doc"
-
- use trace && QT4_TARGET_DIRECTORIES+=" tools/qttracereplay"
-
- QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
- ${QT4_EXTRACT_DIRECTORIES}"
-
- qt4-build_pkg_setup
-}
-
-src_unpack() {
- qt4-build_src_unpack
-
- # compat version
- # http://labs.qt.nokia.com/2010/06/22/qt-assistant-compat-version-available-as-extra-source-package/
- if use compat; then
- unpack ${PN}-qassistantclient-library-compat-src-4.6.3.tar.gz \
- ${PN}-compat-headers-4.7.tar.gz
- mv "${WORKDIR}"/${PN}-qassistantclient-library-compat-version-4.6.3 \
- "${S}"/tools/assistant/compat || die
- mv "${WORKDIR}"/QtAssistant "${S}"/include/ || die
- fi
-}
-
-src_prepare() {
- qt4-build_src_prepare
-
- use compat && epatch "${FILESDIR}"/${PN}-4.7-fix-compat.patch
-
- # bug 401173
- use webkit || epatch "${FILESDIR}"/disable-webkit.patch
-
- # bug 348034
- sed -i -e '/^sub-qdoc3\.depends/d' doc/doc.pri || die
-}
-
-src_configure() {
- myconf+="
- -no-xkb -no-fontconfig -no-xrandr
- -no-xfixes -no-xcursor -no-xinerama -no-xshape -no-sm -no-opengl
- -no-nas-sound -no-dbus -iconv -no-cups -no-nis -no-gif -no-libpng
- -no-libmng -no-libjpeg -no-openssl -system-zlib -no-phonon
- -no-xmlpatterns -no-freetype -no-libtiff -no-accessibility
- -no-fontconfig -no-multimedia -no-svg
- $(qt_use qt3support) $(qt_use webkit)"
- use glib || myconf+=" -no-glib"
-
- qt4-build_src_configure
-}
-
-src_compile() {
- # help libQtHelp find freshly built libQtCLucene (bug #289811)
- export LD_LIBRARY_PATH="${S}/lib:${QTLIBDIR}"
- export DYLD_LIBRARY_PATH="${S}/lib:${S}/lib/QtHelp.framework"
-
- qt4-build_src_compile
-
- # ugly hack to build docs
- qmake "LIBS+=-L${QTLIBDIR}" "CONFIG+=nostrip" projects.pro || die
-
- if use doc; then
- emake docs
- elif [[ ${QT4_BUILD_TYPE} == release ]]; then
- # live ebuild cannot build qch_docs, it will build them through emake docs
- emake qch_docs
- fi
-}
-
-src_install() {
- qt4-build_src_install
-
- emake INSTALL_ROOT="${D}" install_qchdocs
- # do not compress .qch files
- docompress -x "${QTDOCDIR}"/qch
-
- if use doc; then
- emake INSTALL_ROOT="${D}" install_htmldocs
- fi
-
- doicon tools/assistant/tools/assistant/images/assistant.png
- make_desktop_entry assistant Assistant assistant 'Qt;Development'
-
- if use compat; then
- insinto /usr/share/qt4/mkspecs/features
- doins tools/assistant/compat/features/assistant.prf
- fi
-}
diff --git a/x11-libs/qt-bearer/Manifest b/x11-libs/qt-bearer/Manifest
deleted file mode 100644
index 1944fa7..0000000
--- a/x11-libs/qt-bearer/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST qt-everywhere-opensource-src-4.8.4.tar.gz 236593028 SHA256 33b0e38ba4c54a0cf8a4be8ca5a4584f1c2e0adfecb57b21d9d1d267b0093270 SHA512 472972b63b5cad83b4c4656b23e95b6d4923cc31a518138e25d5921982b14abc835883356c2b779a7972cb77cf73fe25b46630be7c6a86a917b364186aa17496 WHIRLPOOL 9d250ee9ddd0431eeabc22ea598eda2bc74ee7ee6c5329522c479143d6c38fa17ae545541b4e3220b05d493c1a5d407c70980d0d1ffa49d2f83dedc1774cfa79
diff --git a/x11-libs/qt-bearer/qt-bearer-4.8.4.ebuild b/x11-libs/qt-bearer/qt-bearer-4.8.4.ebuild
deleted file mode 100644
index 23f955a..0000000
--- a/x11-libs/qt-bearer/qt-bearer-4.8.4.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-inherit qt4-build
-
-DESCRIPTION="The network bearer plugins for the Qt toolkit"
-SLOT="4"
-if [[ ${QT4_BUILD_TYPE} == live ]]; then
- KEYWORDS=""
-else
- KEYWORDS="~amd64 ~arm ~hppa ~x86 ~amd64-fbsd ~x86-fbsd"
-fi
-IUSE="connman networkmanager"
-
-DEPEND="
- ~x11-libs/qt-core-${PV}[aqua=,debug=]
- connman? ( ~x11-libs/qt-dbus-${PV}[aqua=,debug=] )
- networkmanager? ( ~x11-libs/qt-dbus-${PV}[aqua=,debug=] )
-"
-RDEPEND="${DEPEND}
- connman? ( net-misc/connman )
- networkmanager? ( net-misc/networkmanager )
-"
-
-pkg_setup() {
- QT4_EXTRACT_DIRECTORIES="
- include/QtCore
- include/QtDBus
- include/QtNetwork
- src/corelib
- src/dbus
- src/network
- src/plugins/bearer
- src/plugins/qpluginbase.pri"
-
- QT4_TARGET_DIRECTORIES="
- src/plugins/bearer/generic
- $(use connman && echo src/plugins/bearer/connman)
- $(use networkmanager && echo src/plugins/bearer/networkmanager)"
-
- qt4-build_pkg_setup
-}
-
-src_configure() {
- myconf+="
- $(use connman || use networkmanager || echo -no-dbus)
- -no-accessibility -no-xmlpatterns -no-multimedia -no-audio-backend -no-phonon
- -no-phonon-backend -no-svg -no-webkit -no-script -no-scripttools -no-declarative
- -system-zlib -no-gif -no-libtiff -no-libpng -no-libmng -no-libjpeg
- -no-cups -no-gtkstyle -no-nas-sound -no-opengl
- -no-sm -no-xshape -no-xvideo -no-xsync -no-xinerama -no-xcursor -no-xfixes
- -no-xrandr -no-xrender -no-mitshm -no-fontconfig -no-freetype -no-xinput -no-xkb"
-
- qt4-build_src_configure
-}
diff --git a/x11-libs/qt-core/Manifest b/x11-libs/qt-core/Manifest
deleted file mode 100644
index 1944fa7..0000000
--- a/x11-libs/qt-core/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST qt-everywhere-opensource-src-4.8.4.tar.gz 236593028 SHA256 33b0e38ba4c54a0cf8a4be8ca5a4584f1c2e0adfecb57b21d9d1d267b0093270 SHA512 472972b63b5cad83b4c4656b23e95b6d4923cc31a518138e25d5921982b14abc835883356c2b779a7972cb77cf73fe25b46630be7c6a86a917b364186aa17496 WHIRLPOOL 9d250ee9ddd0431eeabc22ea598eda2bc74ee7ee6c5329522c479143d6c38fa17ae545541b4e3220b05d493c1a5d407c70980d0d1ffa49d2f83dedc1774cfa79
diff --git a/x11-libs/qt-core/qt-core-4.8.4.ebuild b/x11-libs/qt-core/qt-core-4.8.4.ebuild
deleted file mode 100644
index a1e330d..0000000
--- a/x11-libs/qt-core/qt-core-4.8.4.ebuild
+++ /dev/null
@@ -1,180 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-inherit qt4-build
-
-DESCRIPTION="The Qt toolkit is a comprehensive C++ application development framework"
-SLOT="4"
-if [[ ${QT4_BUILD_TYPE} == live ]]; then
- KEYWORDS=""
-else
- 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="+glib iconv icu qt3support ssl"
-
-DEPEND="
- sys-libs/zlib
- glib? ( dev-libs/glib:2 )
- icu? ( >=dev-libs/icu-49 )
- ssl? ( dev-libs/openssl )
- !<x11-libs/cairo-1.10.2-r2
- !x11-libs/qt:4
-"
-RDEPEND="${DEPEND}"
-PDEPEND="
- qt3support? ( ~x11-libs/qt-gui-${PV}[aqua=,debug=,glib=,qt3support] )
-"
-
-PATCHES=(
- "${FILESDIR}/moc-workaround-for-boost-1.48.patch"
-)
-
-pkg_setup() {
- QT4_TARGET_DIRECTORIES="
- src/tools/bootstrap
- src/tools/moc
- src/tools/rcc
- src/tools/uic
- src/corelib
- src/xml
- src/network
- src/plugins/codecs
- tools/linguist/lconvert
- tools/linguist/lrelease
- tools/linguist/lupdate"
-
- QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
- include/Qt
- include/QtCore
- include/QtDeclarative
- include/QtGui
- include/QtNetwork
- include/QtScript
- include/QtXml
- src/plugins/plugins.pro
- src/plugins/qpluginbase.pri
- src/src.pro
- src/3rdparty/des
- src/3rdparty/harfbuzz
- src/3rdparty/md4
- src/3rdparty/md5
- src/3rdparty/sha1
- src/3rdparty/easing
- src/3rdparty/zlib_dependency.pri
- src/declarative
- src/gui
- src/script
- tools/shared
- tools/linguist/shared
- translations"
-
- qt4-build_pkg_setup
-}
-
-src_prepare() {
- # Don't pre-strip, bug 235026
- for i in kr jp cn tw; do
- echo "CONFIG+=nostrip" >> "${S}"/src/plugins/codecs/${i}/${i}.pro
- done
-
- qt4-build_src_prepare
-
- # bug 172219
- sed -i -e "s:CXXFLAGS.*=:CXXFLAGS=${CXXFLAGS} :" \
- "${S}/qmake/Makefile.unix" || die "sed qmake/Makefile.unix CXXFLAGS failed"
- sed -i -e "s:LFLAGS.*=:LFLAGS=${LDFLAGS} :" \
- "${S}/qmake/Makefile.unix" || die "sed qmake/Makefile.unix LDFLAGS failed"
-
- # bug 427782
- sed -i -e "/^CPPFLAGS/s/-g//" \
- "${S}/qmake/Makefile.unix" || die "sed qmake/Makefile.unix CPPFLAGS failed"
- sed -i -e "s/setBootstrapVariable QMAKE_CFLAGS_RELEASE/QMakeVar set QMAKE_CFLAGS_RELEASE/" \
- -e "s/setBootstrapVariable QMAKE_CXXFLAGS_RELEASE/QMakeVar set QMAKE_CXXFLAGS_RELEASE/" \
- "${S}/configure" || die "sed configure setBootstrapVariable failed"
-}
-
-src_configure() {
- myconf+="
- -no-accessibility -no-xmlpatterns -no-multimedia -no-audio-backend -no-phonon
- -no-phonon-backend -no-svg -no-webkit -no-script -no-scripttools -no-declarative
- -system-zlib -no-gif -no-libtiff -no-libpng -no-libmng -no-libjpeg
- -no-cups -no-dbus -no-gtkstyle -no-nas-sound -no-opengl -no-openvg
- -no-sm -no-xshape -no-xvideo -no-xsync -no-xinerama -no-xcursor -no-xfixes
- -no-xrandr -no-xrender -no-mitshm -no-fontconfig -no-freetype -no-xinput -no-xkb
- $(qt_use glib)
- $(qt_use iconv)
- $(qt_use icu)
- $(use ssl && echo -openssl-linked || echo -no-openssl)
- $(qt_use qt3support)"
-
- qt4-build_src_configure
-}
-
-src_install() {
- dobin bin/{qmake,moc,rcc,uic,lconvert,lrelease,lupdate}
-
- install_directories src/{corelib,xml,network,plugins/codecs}
-
- emake INSTALL_ROOT="${D}" install_mkspecs
-
- # install private headers
- insinto "${QTHEADERDIR#${EPREFIX}}"/QtCore/private
- find "${S}"/src/corelib -type f -name "*_p.h" -exec doins {} +
-
- # use freshly built libraries
- local DYLD_FPATH=
- [[ -d "${S}"/lib/QtCore.framework ]] \
- && DYLD_FPATH=$(for x in "${S}"/lib/*.framework; do echo -n ":$x"; done)
- DYLD_LIBRARY_PATH="${S}/lib${DYLD_FPATH}" \
- LD_LIBRARY_PATH="${S}/lib" \
- "${S}"/bin/lrelease translations/*.ts \
- || die "generating translations failed"
- insinto "${QTTRANSDIR#${EPREFIX}}"
- doins translations/*.qm
-
- setqtenv
- fix_library_files
-
- # List all the multilib libdirs
- local libdirs=
- for libdir in $(get_all_libdirs); do
- libdirs+=":${EPREFIX}/usr/${libdir}/qt4"
- done
-
- cat <<-EOF > "${T}"/44qt4
- LDPATH="${libdirs:1}"
- EOF
- doenvd "${T}"/44qt4
-
- dodir "${QTDATADIR#${EPREFIX}}"/mkspecs/gentoo
- mv "${D}/${QTDATADIR}"/mkspecs/qconfig.pri "${D}${QTDATADIR}"/mkspecs/gentoo \
- || die "failed to move qconfig.pri"
-
- # Framework hacking
- if use aqua && [[ ${CHOST#*-darwin} -ge 9 ]]; then
- # TODO: do this better
- sed -i -e '2a#include <QtCore/Gentoo/gentoo-qconfig.h>\n' \
- "${D}${QTLIBDIR}"/QtCore.framework/Headers/qconfig.h \
- || die "sed for qconfig.h failed."
- dosym "${QTHEADERDIR#${EPREFIX}}"/Gentoo "${QTLIBDIR#${EPREFIX}}"/QtCore.framework/Headers/Gentoo
- else
- sed -i -e '2a#include <Gentoo/gentoo-qconfig.h>\n' \
- "${D}${QTHEADERDIR}"/QtCore/qconfig.h \
- "${D}${QTHEADERDIR}"/Qt/qconfig.h \
- || die "sed for qconfig.h failed"
- fi
-
- QCONFIG_DEFINE="QT_ZLIB"
- install_qconfigs
-
- # remove .la files
- prune_libtool_files
-
- keepdir "${QTSYSCONFDIR#${EPREFIX}}"
-
- # Framework magic
- fix_includes
-}
diff --git a/x11-libs/qt-dbus/Manifest b/x11-libs/qt-dbus/Manifest
deleted file mode 100644
index 1944fa7..0000000
--- a/x11-libs/qt-dbus/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST qt-everywhere-opensource-src-4.8.4.tar.gz 236593028 SHA256 33b0e38ba4c54a0cf8a4be8ca5a4584f1c2e0adfecb57b21d9d1d267b0093270 SHA512 472972b63b5cad83b4c4656b23e95b6d4923cc31a518138e25d5921982b14abc835883356c2b779a7972cb77cf73fe25b46630be7c6a86a917b364186aa17496 WHIRLPOOL 9d250ee9ddd0431eeabc22ea598eda2bc74ee7ee6c5329522c479143d6c38fa17ae545541b4e3220b05d493c1a5d407c70980d0d1ffa49d2f83dedc1774cfa79
diff --git a/x11-libs/qt-dbus/qt-dbus-4.8.4.ebuild b/x11-libs/qt-dbus/qt-dbus-4.8.4.ebuild
deleted file mode 100644
index 03d78c5..0000000
--- a/x11-libs/qt-dbus/qt-dbus-4.8.4.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-inherit qt4-build
-
-DESCRIPTION="The DBus module for the Qt toolkit"
-SLOT="4"
-if [[ ${QT4_BUILD_TYPE} == live ]]; then
- KEYWORDS=""
-else
- 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=""
-
-DEPEND="
- >=sys-apps/dbus-1.2
- ~x11-libs/qt-core-${PV}[aqua=,debug=]
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
- "${FILESDIR}/${PN}-4.7-qdbusintegrator-no-const.patch"
-)
-
-pkg_setup() {
- QT4_TARGET_DIRECTORIES="
- src/dbus
- tools/qdbus/qdbus
- tools/qdbus/qdbusxml2cpp
- tools/qdbus/qdbuscpp2xml"
-
- QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
- include/QtCore
- include/QtDBus
- include/QtXml
- src/corelib
- src/xml"
-
- QCONFIG_ADD="dbus dbus-linked"
- QCONFIG_DEFINE="QT_DBUS"
-
- qt4-build_pkg_setup
-}
-
-src_configure() {
- myconf+=" -dbus-linked"
-
- qt4-build_src_configure
-}
diff --git a/x11-libs/qt-declarative/Manifest b/x11-libs/qt-declarative/Manifest
deleted file mode 100644
index 1944fa7..0000000
--- a/x11-libs/qt-declarative/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST qt-everywhere-opensource-src-4.8.4.tar.gz 236593028 SHA256 33b0e38ba4c54a0cf8a4be8ca5a4584f1c2e0adfecb57b21d9d1d267b0093270 SHA512 472972b63b5cad83b4c4656b23e95b6d4923cc31a518138e25d5921982b14abc835883356c2b779a7972cb77cf73fe25b46630be7c6a86a917b364186aa17496 WHIRLPOOL 9d250ee9ddd0431eeabc22ea598eda2bc74ee7ee6c5329522c479143d6c38fa17ae545541b4e3220b05d493c1a5d407c70980d0d1ffa49d2f83dedc1774cfa79
diff --git a/x11-libs/qt-declarative/qt-declarative-4.8.4.ebuild b/x11-libs/qt-declarative/qt-declarative-4.8.4.ebuild
deleted file mode 100644
index bf99884..0000000
--- a/x11-libs/qt-declarative/qt-declarative-4.8.4.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-inherit qt4-build
-
-DESCRIPTION="The Declarative module for the Qt toolkit"
-SLOT="4"
-if [[ ${QT4_BUILD_TYPE} == live ]]; then
- KEYWORDS=""
-else
- KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
-fi
-IUSE="+accessibility qt3support webkit"
-
-DEPEND="
- ~x11-libs/qt-core-${PV}[aqua=,debug=,qt3support=]
- ~x11-libs/qt-gui-${PV}[accessibility=,aqua=,debug=,qt3support=]
- ~x11-libs/qt-opengl-${PV}[aqua=,debug=,qt3support=]
- ~x11-libs/qt-script-${PV}[aqua=,debug=]
- ~x11-libs/qt-sql-${PV}[aqua=,debug=,qt3support=]
- ~x11-libs/qt-svg-${PV}[accessibility=,aqua=,debug=]
- ~x11-libs/qt-xmlpatterns-${PV}[aqua=,debug=]
- qt3support? ( ~x11-libs/qt-qt3support-${PV}[accessibility=,aqua=,debug=] )
- webkit? ( ~x11-libs/qt-webkit-${PV}[aqua=,debug=] )
-"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
- QT4_TARGET_DIRECTORIES="
- src/declarative
- src/imports
- src/plugins/qmltooling
- tools/designer/src/plugins/qdeclarativeview
- tools/qml
- tools/qmlplugindump"
-
- if use webkit; then
- QT4_TARGET_DIRECTORIES+=" src/3rdparty/webkit/Source/WebKit/qt/declarative"
- fi
-
- QT4_EXTRACT_DIRECTORIES="
- include
- src
- tools
- translations"
-
- QCONFIG_ADD="declarative"
- QCONFIG_DEFINE="QT_DECLARATIVE"
-
- qt4-build_pkg_setup
-}
-
-src_configure() {
- myconf+="
- -declarative -no-gtkstyle
- $(qt_use accessibility)
- $(qt_use qt3support)
- $(qt_use webkit)"
- qt4-build_src_configure
-}
-
-src_install() {
- qt4-build_src_install
-
- # install private headers
- if use aqua && [[ ${CHOST##*-darwin} -ge 9 ]]; then
- insinto "${QTLIBDIR#${EPREFIX}}"/QtDeclarative.framework/Headers/private
- # ran for the 2nd time, need it for the updated headers
- fix_includes
- else
- insinto "${QTHEADERDIR#${EPREFIX}}"/QtDeclarative/private
- fi
- find "${S}"/src/declarative/ -type f -name "*_p.h" -exec doins {} +
-}
diff --git a/x11-libs/qt-demo/Manifest b/x11-libs/qt-demo/Manifest
deleted file mode 100644
index 1944fa7..0000000
--- a/x11-libs/qt-demo/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST qt-everywhere-opensource-src-4.8.4.tar.gz 236593028 SHA256 33b0e38ba4c54a0cf8a4be8ca5a4584f1c2e0adfecb57b21d9d1d267b0093270 SHA512 472972b63b5cad83b4c4656b23e95b6d4923cc31a518138e25d5921982b14abc835883356c2b779a7972cb77cf73fe25b46630be7c6a86a917b364186aa17496 WHIRLPOOL 9d250ee9ddd0431eeabc22ea598eda2bc74ee7ee6c5329522c479143d6c38fa17ae545541b4e3220b05d493c1a5d407c70980d0d1ffa49d2f83dedc1774cfa79
diff --git a/x11-libs/qt-demo/qt-demo-4.8.4.ebuild b/x11-libs/qt-demo/qt-demo-4.8.4.ebuild
deleted file mode 100644
index 9bb6a3c..0000000
--- a/x11-libs/qt-demo/qt-demo-4.8.4.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-inherit qt4-build
-
-DESCRIPTION="Demonstration module and examples for the Qt toolkit"
-SLOT="4"
-if [[ ${QT4_BUILD_TYPE} == live ]]; then
- KEYWORDS=""
-else
- KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x64-macos"
-fi
-IUSE="dbus declarative kde multimedia opengl openvg qt3support webkit xmlpatterns"
-
-DEPEND="
- ~x11-libs/qt-assistant-${PV}:4[aqua=,debug=]
- ~x11-libs/qt-core-${PV}:4[aqua=,debug=,qt3support?]
- ~x11-libs/qt-gui-${PV}:4[aqua=,debug=,qt3support?]
- ~x11-libs/qt-script-${PV}:4[aqua=,debug=]
- ~x11-libs/qt-sql-${PV}:4[aqua=,debug=,qt3support?]
- ~x11-libs/qt-svg-${PV}:4[aqua=,debug=]
- ~x11-libs/qt-test-${PV}:4[aqua=,debug=]
- dbus? ( ~x11-libs/qt-dbus-${PV}:4[aqua=,debug=] )
- declarative? ( ~x11-libs/qt-declarative-${PV}:4[aqua=,debug=,webkit?] )
- kde? ( media-libs/phonon[aqua=] )
- !kde? ( || (
- ~x11-libs/qt-phonon-${PV}:4[aqua=,debug=]
- media-libs/phonon[aqua=]
- ) )
- multimedia? ( ~x11-libs/qt-multimedia-${PV}:4[aqua=,debug=] )
- opengl? ( ~x11-libs/qt-opengl-${PV}:4[aqua=,debug=,qt3support?] )
- openvg? ( ~x11-libs/qt-openvg-${PV}:4[aqua=,debug=,qt3support?] )
- qt3support? ( ~x11-libs/qt-qt3support-${PV}:4[aqua=,debug=] )
- webkit? ( ~x11-libs/qt-webkit-${PV}:4[aqua=,debug=] )
- xmlpatterns? ( ~x11-libs/qt-xmlpatterns-${PV}:4[aqua=,debug=] )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
- "${FILESDIR}/${PN}-4.6-plugandpaint.patch"
-)
-
-pkg_setup() {
- QT4_TARGET_DIRECTORIES="
- demos
- examples"
- QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
- doc/src/images
- src
- include
- tools"
-
- qt4-build_pkg_setup
-}
-
-src_prepare() {
- qt4-build_src_prepare
-
- # Array mapping USE flags to subdirs
- local flags_subdirs_map=(
- 'dbus'
- 'declarative:declarative'
- 'multimedia:spectrum'
- 'opengl:boxes|glhypnotizer'
- 'openvg'
- 'webkit:browser'
- 'xmlpatterns'
- )
-
- # Disable unwanted examples/demos
- for flag in "${flags_subdirs_map[@]}"; do
- if ! use ${flag%:*}; then
- einfo "Disabling ${flag%:*} examples"
- sed -i -e "/SUBDIRS += ${flag%:*}/d" \
- examples/examples.pro || die
-
- if [[ ${flag} == *:* ]]; then
- einfo "Disabling ${flag%:*} demos"
- sed -i -re "/SUBDIRS \+= demos_(${flag#*:})/d" \
- demos/demos.pro || die
- fi
- fi
- done
-
- if ! use qt3support; then
- einfo "Disabling qt3support examples"
- sed -i -e '/QT_CONFIG, qt3support/d' \
- examples/graphicsview/graphicsview.pro || die
- fi
-}
-
-src_configure() {
- myconf+="
- $(qt_use dbus)
- $(qt_use declarative)
- $(qt_use multimedia)
- $(qt_use opengl)
- $(qt_use openvg)
- $(qt_use qt3support)
- $(qt_use webkit)
- $(qt_use xmlpatterns)"
-
- qt4-build_src_configure
-}
-
-src_install() {
- insinto "${QTDOCDIR#${EPREFIX}}"/src
- doins -r doc/src/images
-
- qt4-build_src_install
-}
diff --git a/x11-libs/qt-gui/Manifest b/x11-libs/qt-gui/Manifest
deleted file mode 100644
index 1944fa7..0000000
--- a/x11-libs/qt-gui/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST qt-everywhere-opensource-src-4.8.4.tar.gz 236593028 SHA256 33b0e38ba4c54a0cf8a4be8ca5a4584f1c2e0adfecb57b21d9d1d267b0093270 SHA512 472972b63b5cad83b4c4656b23e95b6d4923cc31a518138e25d5921982b14abc835883356c2b779a7972cb77cf73fe25b46630be7c6a86a917b364186aa17496 WHIRLPOOL 9d250ee9ddd0431eeabc22ea598eda2bc74ee7ee6c5329522c479143d6c38fa17ae545541b4e3220b05d493c1a5d407c70980d0d1ffa49d2f83dedc1774cfa79
diff --git a/x11-libs/qt-gui/qt-gui-4.8.4.ebuild b/x11-libs/qt-gui/qt-gui-4.8.4.ebuild
deleted file mode 100644
index c21b719..0000000
--- a/x11-libs/qt-gui/qt-gui-4.8.4.ebuild
+++ /dev/null
@@ -1,252 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-inherit eutils qt4-build
-
-DESCRIPTION="The GUI module for the Qt toolkit"
-SLOT="4"
-if [[ ${QT4_BUILD_TYPE} == live ]]; then
- KEYWORDS=""
-else
- 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="+accessibility cups dbus egl gif +glib gtkstyle mng nas nis qt3support tiff trace xinerama +xv"
-
-REQUIRED_USE="
- gtkstyle? ( glib )
-"
-
-RDEPEND="
- app-admin/eselect-qtgraphicssystem
- media-libs/fontconfig
- media-libs/freetype:2
- media-libs/libpng:0
- sys-libs/zlib
- virtual/jpeg
- ~x11-libs/qt-core-${PV}[aqua=,debug=,glib=,qt3support=]
- ~x11-libs/qt-script-${PV}[aqua=,debug=]
- !aqua? (
- x11-libs/libICE
- x11-libs/libSM
- x11-libs/libX11
- x11-libs/libXcursor
- x11-libs/libXext
- x11-libs/libXi
- x11-libs/libXrandr
- x11-libs/libXrender
- xinerama? ( x11-libs/libXinerama )
- xv? ( x11-libs/libXv )
- )
- cups? ( net-print/cups )
- dbus? ( ~x11-libs/qt-dbus-${PV}[aqua=,debug=] )
- egl? ( media-libs/mesa[egl] )
- gtkstyle? ( x11-libs/gtk+:2[aqua=] )
- mng? ( >=media-libs/libmng-1.0.9 )
- nas? ( >=media-libs/nas-1.5 )
- tiff? ( media-libs/tiff:0 )
-"
-DEPEND="${RDEPEND}
- !aqua? (
- x11-proto/inputproto
- x11-proto/xextproto
- xinerama? ( x11-proto/xineramaproto )
- xv? ( x11-proto/videoproto )
- )
-"
-PDEPEND="qt3support? ( ~x11-libs/qt-qt3support-${PV}[aqua=,debug=] )"
-
-PATCHES=(
- "${FILESDIR}/${PN}-4.7.3-cups.patch"
-)
-
-pkg_setup() {
- # this belongs to pkg_pretend, we have to upgrade to EAPI 4 :)
- # was planning to use a dep, but to reproduce this you have to
- # clean-emerge qt-gui[gtkstyle] while having cairo[qt4] installed.
- # no need to restrict normal first time users for that :)
- if use gtkstyle && ! has_version x11-libs/qt-gui && has_version x11-libs/cairo[qt4]; then
- echo
- eerror "When building qt-gui[gtkstyle] from scratch with cairo present,"
- eerror "cairo must have the qt4 use flag disabled, otherwise the gtk"
- eerror "style cannot be built."
- ewarn
- eerror "You have the following options:"
- eerror " - rebuild cairo with -qt4 USE"
- eerror " - build qt-gui with -gtkstyle USE"
- ewarn
- eerror "After you successfully install qt-gui, you'll be able to"
- eerror "re-enable the disabled use flag and/or reinstall cairo."
- ewarn
- echo
- die "can't build ${PN} with USE=gtkstyle if cairo has 'qt4' USE flag enabled"
- fi
-
- QT4_TARGET_DIRECTORIES="
- src/gui
- src/scripttools
- tools/designer
- tools/linguist/linguist
- src/plugins/imageformats/gif
- src/plugins/imageformats/ico
- src/plugins/imageformats/jpeg
- src/plugins/inputmethods"
-
- QT4_EXTRACT_DIRECTORIES="
- include
- src
- tools"
-
- use accessibility && QT4_TARGET_DIRECTORIES="${QT4_TARGET_DIRECTORIES} src/plugins/accessible/widgets"
- use dbus && QT4_TARGET_DIRECTORIES="${QT4_TARGET_DIRECTORIES} tools/qdbus/qdbusviewer"
- use mng && QT4_TARGET_DIRECTORIES="${QT4_TARGET_DIRECTORIES} src/plugins/imageformats/mng"
- use tiff && QT4_TARGET_DIRECTORIES="${QT4_TARGET_DIRECTORIES} src/plugins/imageformats/tiff"
- use trace && QT4_TARGET_DIRECTORIES="${QT4_TARGET_DIRECTORIES} src/plugins/graphicssystems/trace"
-
- # mac version does not contain qtconfig?
- [[ ${CHOST} == *-darwin* ]] || QT4_TARGET_DIRECTORIES+=" tools/qtconfig"
-
- QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES} ${QT4_EXTRACT_DIRECTORIES}"
-
- qt4-build_pkg_setup
-}
-
-src_prepare() {
- qt4-build_src_prepare
-
- # Add -xvideo to the list of accepted configure options
- sed -i -e 's:|-xinerama|:&-xvideo|:' configure
-
- # Don't build plugins this go around, because they depend on qt3support lib
- sed -i -e 's:CONFIG(shared:# &:g' tools/designer/src/src.pro
-}
-
-src_configure() {
- export PATH="${S}/bin:${PATH}"
- export LD_LIBRARY_PATH="${S}/lib:${LD_LIBRARY_PATH}"
-
- myconf="$(qt_use accessibility)
- $(qt_use cups)
- $(use gif || echo -no-gif)
- $(qt_use glib)
- $(qt_use mng libmng system)
- $(qt_use nas nas-sound system)
- $(qt_use nis)
- $(qt_use tiff libtiff system)
- $(qt_use dbus qdbus)
- $(qt_use dbus)
- $(qt_use egl)
- $(qt_use qt3support)
- $(qt_use gtkstyle)
- $(qt_use xinerama)
- $(qt_use xv xvideo)"
-
- myconf+="
- -system-libpng -system-libjpeg
- -no-sql-mysql -no-sql-psql -no-sql-ibase -no-sql-sqlite -no-sql-sqlite2 -no-sql-odbc
- -sm -xshape -xsync -xcursor -xfixes -xrandr -xrender -mitshm -xinput -xkb
- -fontconfig -no-svg -no-webkit -no-phonon -no-opengl"
-
- [[ ${CHOST} == *86*-apple-darwin* ]] && myconf+=" -no-ssse3" #367045
-
- qt4-build_src_configure
-
- if use gtkstyle; then
- einfo "patching the Makefile to fix qgtkstyle compilation"
- sed "s:-I/usr/include/qt4 ::" -i src/gui/Makefile ||
- die "sed failed"
- fi
- sed -i -e "s:-I/usr/include/qt4/QtGui ::" src/gui/Makefile || die "sed failed"
-}
-
-src_install() {
- QCONFIG_ADD="
- mitshm x11sm xcursor xfixes xinput xkb xrandr xrender xshape xsync
- fontconfig gif png system-png jpeg system-jpeg
- $(usev accessibility)
- $(usev cups)
- $(use mng && echo system-mng)
- $(usev nas)
- $(usev nis)
- $(use tiff && echo system-tiff)
- $(usev xinerama)
- $(use xv && echo xvideo)"
- QCONFIG_REMOVE="no-gif no-jpeg no-png"
- QCONFIG_DEFINE="$(use accessibility && echo QT_ACCESSIBILITY)
- $(use cups && echo QT_CUPS)
- $(use egl && echo QT_EGL)
- QT_FONTCONFIG
- $(use gtkstyle && echo QT_STYLE_GTK)
- QT_IMAGEFORMAT_JPEG QT_IMAGEFORMAT_PNG
- $(use mng && echo QT_IMAGEFORMAT_MNG)
- $(use nas && echo QT_NAS)
- $(use nis && echo QT_NIS)
- $(use tiff && echo QT_IMAGEFORMAT_TIFF)
- QT_SESSIONMANAGER QT_SHAPE QT_XCURSOR QT_XFIXES
- $(use xinerama && echo QT_XINERAMA)
- QT_XINPUT QT_XKB QT_XRANDR QT_XRENDER QT_XSYNC
- $(use xv && echo QT_XVIDEO)"
-
- qt4-build_src_install
-
- # qt-creator
- # some qt-creator headers are located
- # under /usr/include/qt4/QtDesigner/private.
- # those headers are just includes of the headers
- # which are located under tools/designer/src/lib/*
- # So instead of installing both, we create the private folder
- # and drop tools/designer/src/lib/* headers in it.
- if use aqua && [[ ${CHOST##*-darwin} -ge 9 ]]; then
- insinto "${QTLIBDIR#${EPREFIX}}"/QtDesigner.framework/Headers/private/
- else
- insinto "${QTHEADERDIR#${EPREFIX}}"/QtDesigner/private/
- fi
- doins "${S}"/tools/designer/src/lib/shared/*
- doins "${S}"/tools/designer/src/lib/sdk/*
-
- # install private headers
- if use aqua && [[ ${CHOST##*-darwin} -ge 9 ]]; then
- insinto "${QTLIBDIR#${EPREFIX}}"/QtGui.framework/Headers/private/
- else
- insinto "${QTHEADERDIR#${EPREFIX}}"/QtGui/private
- fi
- find "${S}"/src/gui -type f -name '*_p.h' -exec doins {} +
-
- if use aqua && [[ ${CHOST##*-darwin} -ge 9 ]]; then
- # rerun to get links to headers right
- fix_includes
- fi
-
- # touch the available graphics systems
- dodir /usr/share/qt4/graphicssystems
- echo "default" > "${ED}"/usr/share/qt4/graphicssystems/raster || die
- touch "${ED}"/usr/share/qt4/graphicssystems/native || die
-
- doicon tools/designer/src/designer/images/designer.png
- newicon tools/linguist/linguist/images/icons/linguist-128-32.png linguist.png
- newicon tools/qtconfig/images/appicon.png qtconfig.png
- use dbus && newicon tools/qdbus/qdbusviewer/images/qdbusviewer-128.png qdbusviewer.png
- make_desktop_entry designer Designer designer 'Qt;Development;GUIDesigner'
- make_desktop_entry linguist Linguist linguist 'Qt;Development;Translation'
- make_desktop_entry qtconfig 'Qt Configuration Tool' qtconfig 'Qt;Settings;DesktopSettings'
-}
-
-pkg_postinst() {
- # raster is the default graphicssystems, set it on first install
- eselect qtgraphicssystem set raster --use-old
-
- elog "Starting with Qt 4.8, you may choose the active Qt Graphics System"
- elog "by using a new eselect module called qtgraphicssystem."
- elog "Run \`eselect qtgraphicssystem\` for more information."
-
- if use gtkstyle; then
- # see bug 388551
- elog
- elog "For Qt's GTK style to work, you need to either export"
- elog "the following variable into your environment:"
- elog ' GTK2_RC_FILES="$HOME/.gtkrc-2.0"'
- elog "or alternatively install gnome-base/libgnomeui"
- fi
-}
diff --git a/x11-libs/qt-multimedia/Manifest b/x11-libs/qt-multimedia/Manifest
deleted file mode 100644
index 1944fa7..0000000
--- a/x11-libs/qt-multimedia/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST qt-everywhere-opensource-src-4.8.4.tar.gz 236593028 SHA256 33b0e38ba4c54a0cf8a4be8ca5a4584f1c2e0adfecb57b21d9d1d267b0093270 SHA512 472972b63b5cad83b4c4656b23e95b6d4923cc31a518138e25d5921982b14abc835883356c2b779a7972cb77cf73fe25b46630be7c6a86a917b364186aa17496 WHIRLPOOL 9d250ee9ddd0431eeabc22ea598eda2bc74ee7ee6c5329522c479143d6c38fa17ae545541b4e3220b05d493c1a5d407c70980d0d1ffa49d2f83dedc1774cfa79
diff --git a/x11-libs/qt-multimedia/qt-multimedia-4.8.4.ebuild b/x11-libs/qt-multimedia/qt-multimedia-4.8.4.ebuild
deleted file mode 100644
index 82686fb..0000000
--- a/x11-libs/qt-multimedia/qt-multimedia-4.8.4.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-inherit qt4-build
-
-DESCRIPTION="The Multimedia module for the Qt toolkit"
-SLOT="4"
-if [[ ${QT4_BUILD_TYPE} == live ]]; then
- KEYWORDS=""
-else
- KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-fi
-IUSE="alsa"
-
-DEPEND="
- ~x11-libs/qt-core-${PV}[aqua=,debug=]
- ~x11-libs/qt-gui-${PV}[aqua=,debug=]
- alsa? ( media-libs/alsa-lib )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
- "${FILESDIR}/${PN}-4.8.0-alsa.patch"
-)
-
-pkg_setup() {
- QT4_TARGET_DIRECTORIES="
- src/multimedia"
-
- QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
- include/Qt
- include/QtCore
- include/QtGui
- include/QtMultimedia
- src/src.pro
- src/corelib
- src/gui"
-
- QCONFIG_ADD="multimedia"
- QCONFIG_DEFINE="QT_MULTIMEDIA"
-
- qt4-build_pkg_setup
-}
-
-src_configure() {
- myconf+="
- -multimedia -audio-backend
- $(qt_use alsa)
- -no-accessibility -no-qt3support -no-xmlpatterns -no-phonon -no-phonon-backend
- -no-svg -no-webkit -no-script -no-scripttools -no-declarative
- -system-zlib -no-gif -no-libtiff -no-libpng -no-libmng -no-libjpeg -no-openssl
- -no-cups -no-dbus -no-gtkstyle -no-nas-sound -no-opengl
- -no-sm -no-xshape -no-xvideo -no-xsync -no-xinerama -no-xcursor -no-xfixes
- -no-xrandr -no-xrender -no-mitshm -no-fontconfig -no-freetype -no-xinput -no-xkb"
-
- qt4-build_src_configure
-}
diff --git a/x11-libs/qt-opengl/Manifest b/x11-libs/qt-opengl/Manifest
deleted file mode 100644
index 1944fa7..0000000
--- a/x11-libs/qt-opengl/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST qt-everywhere-opensource-src-4.8.4.tar.gz 236593028 SHA256 33b0e38ba4c54a0cf8a4be8ca5a4584f1c2e0adfecb57b21d9d1d267b0093270 SHA512 472972b63b5cad83b4c4656b23e95b6d4923cc31a518138e25d5921982b14abc835883356c2b779a7972cb77cf73fe25b46630be7c6a86a917b364186aa17496 WHIRLPOOL 9d250ee9ddd0431eeabc22ea598eda2bc74ee7ee6c5329522c479143d6c38fa17ae545541b4e3220b05d493c1a5d407c70980d0d1ffa49d2f83dedc1774cfa79
diff --git a/x11-libs/qt-opengl/qt-opengl-4.8.4.ebuild b/x11-libs/qt-opengl/qt-opengl-4.8.4.ebuild
deleted file mode 100644
index e6acd91..0000000
--- a/x11-libs/qt-opengl/qt-opengl-4.8.4.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-inherit qt4-build
-
-DESCRIPTION="The OpenGL module for the Qt toolkit"
-SLOT="4"
-if [[ ${QT4_BUILD_TYPE} == live ]]; then
- KEYWORDS=""
-else
- KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-fi
-IUSE="egl qt3support"
-
-DEPEND="
- virtual/opengl
- ~x11-libs/qt-core-${PV}[aqua=,debug=,qt3support=]
- ~x11-libs/qt-gui-${PV}[aqua=,debug=,egl=,qt3support=]
-"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
- QT4_TARGET_DIRECTORIES="
- src/opengl
- src/plugins/graphicssystems/opengl"
-
- QT4_EXTRACT_DIRECTORIES="
- include/QtCore
- include/QtGui
- include/QtOpenGL
- src/corelib
- src/gui
- src/opengl
- src/plugins
- src/3rdparty"
-
- QCONFIG_ADD="opengl"
- QCONFIG_DEFINE="QT_OPENGL"
-
- qt4-build_pkg_setup
-}
-
-src_configure() {
- myconf+="
- -opengl
- $(qt_use qt3support)
- $(qt_use egl)"
-
- qt4-build_src_configure
-
- # Not building tools/designer/src/plugins/tools/view3d as it's
- # commented out of the build in the source
-}
-
-src_install() {
- qt4-build_src_install
-
- # touch the available graphics systems
- dodir /usr/share/qt4/graphicssystems
- echo "experimental" > "${ED}"/usr/share/qt4/graphicssystems/opengl || die
-}
diff --git a/x11-libs/qt-openvg/Manifest b/x11-libs/qt-openvg/Manifest
deleted file mode 100644
index 1944fa7..0000000
--- a/x11-libs/qt-openvg/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST qt-everywhere-opensource-src-4.8.4.tar.gz 236593028 SHA256 33b0e38ba4c54a0cf8a4be8ca5a4584f1c2e0adfecb57b21d9d1d267b0093270 SHA512 472972b63b5cad83b4c4656b23e95b6d4923cc31a518138e25d5921982b14abc835883356c2b779a7972cb77cf73fe25b46630be7c6a86a917b364186aa17496 WHIRLPOOL 9d250ee9ddd0431eeabc22ea598eda2bc74ee7ee6c5329522c479143d6c38fa17ae545541b4e3220b05d493c1a5d407c70980d0d1ffa49d2f83dedc1774cfa79
diff --git a/x11-libs/qt-openvg/qt-openvg-4.8.4.ebuild b/x11-libs/qt-openvg/qt-openvg-4.8.4.ebuild
deleted file mode 100644
index 29c8fea..0000000
--- a/x11-libs/qt-openvg/qt-openvg-4.8.4.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-inherit qt4-build
-
-DESCRIPTION="The OpenVG module for the Qt toolkit"
-SLOT="4"
-if [[ ${QT4_BUILD_TYPE} == live ]]; then
- KEYWORDS=""
-else
- KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-fi
-IUSE="qt3support"
-
-DEPEND="
- media-libs/mesa[egl,openvg]
- ~x11-libs/qt-core-${PV}[aqua=,debug=,qt3support=]
- ~x11-libs/qt-gui-${PV}[aqua=,debug=,egl,qt3support=]
-"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
- QT4_TARGET_DIRECTORIES="
- src/openvg
- src/plugins/graphicssystems/openvg"
-
- QT4_EXTRACT_DIRECTORIES="
- include/QtCore
- include/QtGui
- include/QtOpenVG
- src/corelib
- src/gui
- src/openvg
- src/plugins
- src/3rdparty"
-
- QCONFIG_ADD="openvg"
- QCONFIG_DEFINE="QT_OPENVG"
-
- qt4-build_pkg_setup
-}
-
-src_configure() {
- gltype="desktop"
-
- myconf+="
- -openvg -egl
- $(qt_use qt3support)"
-
- qt4-build_src_configure
-}
-
-src_install() {
- qt4-build_src_install
-
- # touch the available graphics systems
- dodir /usr/share/qt4/graphicssystems
- echo "experimental" > "${ED}"/usr/share/qt4/graphicssystems/openvg || die
-}
diff --git a/x11-libs/qt-phonon/Manifest b/x11-libs/qt-phonon/Manifest
deleted file mode 100644
index 1944fa7..0000000
--- a/x11-libs/qt-phonon/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST qt-everywhere-opensource-src-4.8.4.tar.gz 236593028 SHA256 33b0e38ba4c54a0cf8a4be8ca5a4584f1c2e0adfecb57b21d9d1d267b0093270 SHA512 472972b63b5cad83b4c4656b23e95b6d4923cc31a518138e25d5921982b14abc835883356c2b779a7972cb77cf73fe25b46630be7c6a86a917b364186aa17496 WHIRLPOOL 9d250ee9ddd0431eeabc22ea598eda2bc74ee7ee6c5329522c479143d6c38fa17ae545541b4e3220b05d493c1a5d407c70980d0d1ffa49d2f83dedc1774cfa79
diff --git a/x11-libs/qt-phonon/qt-phonon-4.8.4.ebuild b/x11-libs/qt-phonon/qt-phonon-4.8.4.ebuild
deleted file mode 100644
index 9ad26b1..0000000
--- a/x11-libs/qt-phonon/qt-phonon-4.8.4.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-inherit qt4-build
-
-DESCRIPTION="The Phonon module for the Qt toolkit"
-SLOT="4"
-if [[ ${QT4_BUILD_TYPE} == live ]]; then
- KEYWORDS=""
-else
- KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-fi
-IUSE="dbus qt3support"
-
-DEPEND="
- ~x11-libs/qt-gui-${PV}[aqua=,debug=,qt3support=]
- !kde-base/phonon-kde
- !kde-base/phonon-xine
- !media-libs/phonon
- !media-sound/phonon
- !aqua? ( media-libs/gstreamer:0.10
- media-plugins/gst-plugins-meta:0.10 )
- aqua? ( ~x11-libs/qt-opengl-${PV}[aqua,debug=,qt3support=] )
- dbus? ( ~x11-libs/qt-dbus-${PV}[aqua=,debug=] )
-"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
- QT4_TARGET_DIRECTORIES="
- src/phonon
- src/plugins/phonon
- tools/designer/src/plugins/phononwidgets"
-
- QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
- include
- src
- tools"
-
- QCONFIG_ADD="phonon"
- QCONFIG_DEFINE="QT_PHONON
- $(use !aqua && echo QT_GSTREAMER)"
-
- qt4-build_pkg_setup
-}
-
-src_configure() {
- myconf+="
- -phonon -phonon-backend -no-opengl -no-svg
- $(qt_use dbus qdbus)
- $(qt_use qt3support)"
-
- qt4-build_src_configure
-}
diff --git a/x11-libs/qt-qt3support/Manifest b/x11-libs/qt-qt3support/Manifest
deleted file mode 100644
index 1944fa7..0000000
--- a/x11-libs/qt-qt3support/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST qt-everywhere-opensource-src-4.8.4.tar.gz 236593028 SHA256 33b0e38ba4c54a0cf8a4be8ca5a4584f1c2e0adfecb57b21d9d1d267b0093270 SHA512 472972b63b5cad83b4c4656b23e95b6d4923cc31a518138e25d5921982b14abc835883356c2b779a7972cb77cf73fe25b46630be7c6a86a917b364186aa17496 WHIRLPOOL 9d250ee9ddd0431eeabc22ea598eda2bc74ee7ee6c5329522c479143d6c38fa17ae545541b4e3220b05d493c1a5d407c70980d0d1ffa49d2f83dedc1774cfa79
diff --git a/x11-libs/qt-qt3support/qt-qt3support-4.8.4.ebuild b/x11-libs/qt-qt3support/qt-qt3support-4.8.4.ebuild
deleted file mode 100644
index 8514a36..0000000
--- a/x11-libs/qt-qt3support/qt-qt3support-4.8.4.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-inherit qt4-build
-
-DESCRIPTION="The Qt3 support module for the Qt toolkit"
-SLOT="4"
-if [[ ${QT4_BUILD_TYPE} == live ]]; then
- KEYWORDS=""
-else
- KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
-fi
-IUSE="+accessibility"
-
-DEPEND="
- ~x11-libs/qt-core-${PV}[aqua=,debug=,qt3support]
- ~x11-libs/qt-gui-${PV}[accessibility=,aqua=,debug=,qt3support]
- ~x11-libs/qt-sql-${PV}[aqua=,debug=,qt3support]
-"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
- QT4_TARGET_DIRECTORIES="
- src/qt3support
- src/tools/uic3
- tools/designer/src/plugins/widgets
- tools/porting"
-
- QT4_EXTRACT_DIRECTORIES="
- src
- include
- tools"
-
- qt4-build_pkg_setup
-}
-
-src_configure() {
- myconf+="
- -qt3support
- $(qt_use accessibility)"
-
- qt4-build_src_configure
-}
diff --git a/x11-libs/qt-script/Manifest b/x11-libs/qt-script/Manifest
deleted file mode 100644
index 1944fa7..0000000
--- a/x11-libs/qt-script/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST qt-everywhere-opensource-src-4.8.4.tar.gz 236593028 SHA256 33b0e38ba4c54a0cf8a4be8ca5a4584f1c2e0adfecb57b21d9d1d267b0093270 SHA512 472972b63b5cad83b4c4656b23e95b6d4923cc31a518138e25d5921982b14abc835883356c2b779a7972cb77cf73fe25b46630be7c6a86a917b364186aa17496 WHIRLPOOL 9d250ee9ddd0431eeabc22ea598eda2bc74ee7ee6c5329522c479143d6c38fa17ae545541b4e3220b05d493c1a5d407c70980d0d1ffa49d2f83dedc1774cfa79
diff --git a/x11-libs/qt-script/qt-script-4.8.4.ebuild b/x11-libs/qt-script/qt-script-4.8.4.ebuild
deleted file mode 100644
index 12e78c9..0000000
--- a/x11-libs/qt-script/qt-script-4.8.4.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-inherit qt4-build
-
-DESCRIPTION="The ECMAScript module for the Qt toolkit"
-SLOT="4"
-if [[ ${QT4_BUILD_TYPE} == live ]]; then
- KEYWORDS=""
-else
- 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="iconv +jit"
-
-DEPEND="
- ~x11-libs/qt-core-${PV}[aqua=,debug=]
-"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
- QT4_TARGET_DIRECTORIES="
- src/script"
-
- QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
- include/Qt
- include/QtCore
- include/QtScript
- src/3rdparty/javascriptcore
- src/corelib"
-
- QCONFIG_ADD="script"
- QCONFIG_DEFINE="QT_SCRIPT"
-
- qt4-build_pkg_setup
-}
-
-src_configure() {
- myconf+="
- $(qt_use iconv)
- $(qt_use jit javascript-jit)
- -no-xkb -no-fontconfig -no-xrender -no-xrandr -no-xfixes -no-xcursor -no-xinerama
- -no-xshape -no-sm -no-opengl -no-nas-sound -no-dbus -no-cups -no-nis -no-gif
- -no-libpng -no-libmng -no-libjpeg -no-openssl -system-zlib -no-webkit -no-phonon
- -no-qt3support -no-xmlpatterns -no-freetype -no-libtiff
- -no-accessibility -no-fontconfig -no-glib -no-opengl -no-svg
- -no-gtkstyle"
-
- qt4-build_src_configure
-}
-
-src_install() {
- qt4-build_src_install
-
- # install private headers
- insinto "${QTHEADERDIR#${EPREFIX}}"/QtScript/private
- find "${S}"/src/script -type f -name "*_p.h" -exec doins {} +
-}
diff --git a/x11-libs/qt-sql/Manifest b/x11-libs/qt-sql/Manifest
deleted file mode 100644
index 1944fa7..0000000
--- a/x11-libs/qt-sql/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST qt-everywhere-opensource-src-4.8.4.tar.gz 236593028 SHA256 33b0e38ba4c54a0cf8a4be8ca5a4584f1c2e0adfecb57b21d9d1d267b0093270 SHA512 472972b63b5cad83b4c4656b23e95b6d4923cc31a518138e25d5921982b14abc835883356c2b779a7972cb77cf73fe25b46630be7c6a86a917b364186aa17496 WHIRLPOOL 9d250ee9ddd0431eeabc22ea598eda2bc74ee7ee6c5329522c479143d6c38fa17ae545541b4e3220b05d493c1a5d407c70980d0d1ffa49d2f83dedc1774cfa79
diff --git a/x11-libs/qt-sql/qt-sql-4.8.4.ebuild b/x11-libs/qt-sql/qt-sql-4.8.4.ebuild
deleted file mode 100644
index 302fc1d..0000000
--- a/x11-libs/qt-sql/qt-sql-4.8.4.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-inherit multilib qt4-build
-
-DESCRIPTION="The SQL module for the Qt toolkit"
-SLOT="4"
-if [[ ${QT4_BUILD_TYPE} == live ]]; then
- KEYWORDS=""
-else
- 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="firebird freetds mysql oci8 odbc postgres qt3support +sqlite"
-
-REQUIRED_USE="
- || ( firebird freetds mysql oci8 odbc postgres sqlite )
-"
-
-DEPEND="
- ~x11-libs/qt-core-${PV}[aqua=,debug=,qt3support=]
- firebird? ( dev-db/firebird )
- freetds? ( dev-db/freetds )
- mysql? ( virtual/mysql )
- oci8? ( dev-db/oracle-instantclient-basic )
- odbc? ( || ( dev-db/unixODBC dev-db/libiodbc ) )
- postgres? ( dev-db/postgresql-base )
- sqlite? ( dev-db/sqlite:3 )
-"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
- QT4_TARGET_DIRECTORIES="
- src/sql
- src/plugins/sqldrivers"
-
- QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
- include/Qt
- include/QtCore
- include/QtSql
- src/src.pro
- src/corelib
- src/plugins
- src/tools/tools.pro"
-
- qt4-build_pkg_setup
-}
-
-src_configure() {
- myconf+="
- $(qt_use firebird sql-ibase plugin)
- $(qt_use freetds sql-tds plugin)
- $(qt_use mysql sql-mysql plugin) $(use mysql && echo "-I${EPREFIX}/usr/include/mysql -L${EPREFIX}/usr/$(get_libdir)/mysql")
- $(qt_use oci8 sql-oci plugin) $(use oci8 && echo "-I${ORACLE_HOME}/include -L${ORACLE_HOME}/$(get_libdir)")
- $(qt_use odbc sql-odbc plugin) $(use odbc && echo "-I${EPREFIX}/usr/include/iodbc")
- $(qt_use postgres sql-psql plugin) $(use postgres && echo "-I${EPREFIX}/usr/include/postgresql/pgsql")
- $(qt_use sqlite sql-sqlite plugin) $(use sqlite && echo -system-sqlite)
- -no-sql-db2
- -no-sql-sqlite2
- -no-sql-symsql
- $(qt_use qt3support)
- -no-accessibility -no-xmlpatterns -no-multimedia -no-audio-backend -no-phonon
- -no-phonon-backend -no-svg -no-webkit -no-script -no-scripttools -no-declarative
- -system-zlib -no-gif -no-libtiff -no-libpng -no-libmng -no-libjpeg -no-openssl
- -no-cups -no-dbus -no-gtkstyle -no-nas-sound -no-opengl
- -no-sm -no-xshape -no-xvideo -no-xsync -no-xinerama -no-xcursor -no-xfixes
- -no-xrandr -no-xrender -no-mitshm -no-fontconfig -no-freetype -no-xinput -no-xkb
- -no-glib"
-
- qt4-build_src_configure
-}
diff --git a/x11-libs/qt-svg/Manifest b/x11-libs/qt-svg/Manifest
deleted file mode 100644
index 1944fa7..0000000
--- a/x11-libs/qt-svg/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST qt-everywhere-opensource-src-4.8.4.tar.gz 236593028 SHA256 33b0e38ba4c54a0cf8a4be8ca5a4584f1c2e0adfecb57b21d9d1d267b0093270 SHA512 472972b63b5cad83b4c4656b23e95b6d4923cc31a518138e25d5921982b14abc835883356c2b779a7972cb77cf73fe25b46630be7c6a86a917b364186aa17496 WHIRLPOOL 9d250ee9ddd0431eeabc22ea598eda2bc74ee7ee6c5329522c479143d6c38fa17ae545541b4e3220b05d493c1a5d407c70980d0d1ffa49d2f83dedc1774cfa79
diff --git a/x11-libs/qt-svg/qt-svg-4.8.4.ebuild b/x11-libs/qt-svg/qt-svg-4.8.4.ebuild
deleted file mode 100644
index ba330f3..0000000
--- a/x11-libs/qt-svg/qt-svg-4.8.4.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-inherit qt4-build
-
-DESCRIPTION="The SVG module for the Qt toolkit"
-SLOT="4"
-if [[ ${QT4_BUILD_TYPE} == live ]]; then
- KEYWORDS=""
-else
- KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-fi
-IUSE="+accessibility"
-
-DEPEND="
- sys-libs/zlib
- ~x11-libs/qt-core-${PV}[aqua=,debug=]
- ~x11-libs/qt-gui-${PV}[accessibility=,aqua=,debug=]
-"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
- QT4_TARGET_DIRECTORIES="
- src/svg
- src/plugins/imageformats/svg
- src/plugins/iconengines/svgiconengine"
-
- QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
- include/QtSvg
- include/Qt
- include/QtGui
- include/QtCore
- include/QtXml
- src/corelib
- src/gui
- src/plugins
- src/xml
- src/3rdparty"
-
- QCONFIG_ADD="svg"
- QCONFIG_DEFINE="QT_SVG"
-
- qt4-build_pkg_setup
-}
-
-src_configure() {
- myconf+="
- -svg
- $(qt_use accessibility)
- -no-xkb -no-xrender
- -no-xrandr -no-xfixes -no-xcursor -no-xinerama -no-xshape -no-sm
- -no-opengl -no-nas-sound -no-dbus -no-cups -no-nis -no-gif -no-libpng
- -no-libmng -no-libjpeg -no-openssl -system-zlib -no-webkit -no-phonon
- -no-qt3support -no-xmlpatterns -no-freetype -no-libtiff
- -no-fontconfig -no-glib -no-gtkstyle"
-
- qt4-build_src_configure
-}
diff --git a/x11-libs/qt-test/Manifest b/x11-libs/qt-test/Manifest
deleted file mode 100644
index 1944fa7..0000000
--- a/x11-libs/qt-test/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST qt-everywhere-opensource-src-4.8.4.tar.gz 236593028 SHA256 33b0e38ba4c54a0cf8a4be8ca5a4584f1c2e0adfecb57b21d9d1d267b0093270 SHA512 472972b63b5cad83b4c4656b23e95b6d4923cc31a518138e25d5921982b14abc835883356c2b779a7972cb77cf73fe25b46630be7c6a86a917b364186aa17496 WHIRLPOOL 9d250ee9ddd0431eeabc22ea598eda2bc74ee7ee6c5329522c479143d6c38fa17ae545541b4e3220b05d493c1a5d407c70980d0d1ffa49d2f83dedc1774cfa79
diff --git a/x11-libs/qt-test/qt-test-4.8.4.ebuild b/x11-libs/qt-test/qt-test-4.8.4.ebuild
deleted file mode 100644
index 74f21fb..0000000
--- a/x11-libs/qt-test/qt-test-4.8.4.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-inherit qt4-build
-
-DESCRIPTION="The testing framework module for the Qt toolkit"
-SLOT="4"
-if [[ ${QT4_BUILD_TYPE} == live ]]; then
- KEYWORDS=""
-else
- KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-fi
-IUSE=""
-
-DEPEND="
- ~x11-libs/qt-core-${PV}[aqua=,debug=]
-"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
- QT4_TARGET_DIRECTORIES="
- src/testlib"
-
- QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
- include/QtTest
- include/QtCore
- src/corelib"
-
- qt4-build_pkg_setup
-}
-
-src_configure() {
- myconf+="
- -no-xkb -no-fontconfig -no-xrender -no-xrandr -no-xfixes -no-xcursor
- -no-xinerama -no-xshape -no-sm -no-opengl
- -no-nas-sound -no-dbus -no-cups -no-nis -no-gif -no-libpng
- -no-libmng -no-libjpeg -no-openssl -system-zlib -no-webkit -no-phonon
- -no-qt3support -no-xmlpatterns -no-freetype -no-libtiff
- -no-accessibility -no-fontconfig -no-glib -no-svg"
-
- qt4-build_src_configure
-}
diff --git a/x11-libs/qt-webkit/Manifest b/x11-libs/qt-webkit/Manifest
deleted file mode 100644
index 1944fa7..0000000
--- a/x11-libs/qt-webkit/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST qt-everywhere-opensource-src-4.8.4.tar.gz 236593028 SHA256 33b0e38ba4c54a0cf8a4be8ca5a4584f1c2e0adfecb57b21d9d1d267b0093270 SHA512 472972b63b5cad83b4c4656b23e95b6d4923cc31a518138e25d5921982b14abc835883356c2b779a7972cb77cf73fe25b46630be7c6a86a917b364186aa17496 WHIRLPOOL 9d250ee9ddd0431eeabc22ea598eda2bc74ee7ee6c5329522c479143d6c38fa17ae545541b4e3220b05d493c1a5d407c70980d0d1ffa49d2f83dedc1774cfa79
diff --git a/x11-libs/qt-webkit/qt-webkit-4.8.4.ebuild b/x11-libs/qt-webkit/qt-webkit-4.8.4.ebuild
deleted file mode 100644
index 50d54f1..0000000
--- a/x11-libs/qt-webkit/qt-webkit-4.8.4.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-inherit qt4-build flag-o-matic
-
-DESCRIPTION="The WebKit module for the Qt toolkit"
-SLOT="4"
-if [[ ${QT4_BUILD_TYPE} == live ]]; then
- KEYWORDS=""
-else
- KEYWORDS="~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
-fi
-IUSE="+gstreamer icu +jit"
-
-# libxml2[!icu?] is needed for bugs 407315 and 411091
-DEPEND="
- dev-db/sqlite:3
- x11-libs/libX11
- x11-libs/libXrender
- ~x11-libs/qt-core-${PV}[aqua=,debug=,ssl]
- ~x11-libs/qt-gui-${PV}[aqua=,debug=]
- ~x11-libs/qt-xmlpatterns-${PV}[aqua=,debug=]
- gstreamer? (
- dev-libs/glib:2
- dev-libs/libxml2:2[!icu?]
- media-libs/gstreamer:0.10
- media-libs/gst-plugins-base:0.10
- )
- icu? ( dev-libs/icu )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
- "${FILESDIR}/${PN}-4.8.1-no-use-ld-gold.patch"
- "${FILESDIR}/4.8.2-javascriptcore-x32.patch"
-)
-
-pkg_setup() {
- QT4_TARGET_DIRECTORIES="
- src/3rdparty/webkit/Source/JavaScriptCore
- src/3rdparty/webkit/Source/WebCore
- src/3rdparty/webkit/Source/WebKit/qt
- tools/designer/src/plugins/qwebview"
-
- QT4_EXTRACT_DIRECTORIES="
- include
- src
- tools"
-
- QCONFIG_ADD="webkit"
- QCONFIG_DEFINE="QT_WEBKIT"
-
- qt4-build_pkg_setup
-}
-
-src_prepare() {
- # Fix version number in generated pkgconfig file, bug 406443
- sed -i -e 's/^isEmpty(QT_BUILD_TREE)://' \
- src/3rdparty/webkit/Source/WebKit/qt/QtWebKit.pro || die
-
- # Remove -Werror from CXXFLAGS
- sed -i -e '/QMAKE_CXXFLAGS\s*+=/ s:-Werror::g' \
- src/3rdparty/webkit/Source/WebKit.pri || die
-
- if use icu; then
- sed -i -e '/CONFIG\s*+=\s*text_breaking_with_icu/ s:^#\s*::' \
- src/3rdparty/webkit/Source/JavaScriptCore/JavaScriptCore.pri || die
- fi
-
- qt4-build_src_prepare
-}
-
-src_configure() {
- myconf+="
- -webkit
- -system-sqlite
- $(qt_use icu)
- $(qt_use jit javascript-jit)
- $(use gstreamer || echo -DENABLE_VIDEO=0)"
-
- qt4-build_src_configure
-}
diff --git a/x11-libs/qt-xmlpatterns/Manifest b/x11-libs/qt-xmlpatterns/Manifest
deleted file mode 100644
index 1944fa7..0000000
--- a/x11-libs/qt-xmlpatterns/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST qt-everywhere-opensource-src-4.8.4.tar.gz 236593028 SHA256 33b0e38ba4c54a0cf8a4be8ca5a4584f1c2e0adfecb57b21d9d1d267b0093270 SHA512 472972b63b5cad83b4c4656b23e95b6d4923cc31a518138e25d5921982b14abc835883356c2b779a7972cb77cf73fe25b46630be7c6a86a917b364186aa17496 WHIRLPOOL 9d250ee9ddd0431eeabc22ea598eda2bc74ee7ee6c5329522c479143d6c38fa17ae545541b4e3220b05d493c1a5d407c70980d0d1ffa49d2f83dedc1774cfa79
diff --git a/x11-libs/qt-xmlpatterns/qt-xmlpatterns-4.8.4.ebuild b/x11-libs/qt-xmlpatterns/qt-xmlpatterns-4.8.4.ebuild
deleted file mode 100644
index 0e6a0b1..0000000
--- a/x11-libs/qt-xmlpatterns/qt-xmlpatterns-4.8.4.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-inherit qt4-build
-
-DESCRIPTION="The XmlPatterns module for the Qt toolkit"
-SLOT="4"
-if [[ ${QT4_BUILD_TYPE} == live ]]; then
- KEYWORDS=""
-else
- 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=""
-
-DEPEND="
- ~x11-libs/qt-core-${PV}[aqua=,debug=]
-"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
- QT4_TARGET_DIRECTORIES="
- src/xmlpatterns
- tools/xmlpatterns
- tools/xmlpatternsvalidator"
-
- QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
- include/QtCore
- include/QtNetwork
- include/QtXml
- include/QtXmlPatterns
- src/network
- src/xml
- src/corelib"
-
- QCONFIG_ADD="xmlpatterns"
- QCONFIG_DEFINE="QT_XMLPATTERNS"
-
- qt4-build_pkg_setup
-}
-
-src_configure() {
- myconf+=" -xmlpatterns"
-
- qt4-build_src_configure
-}
^ permalink raw reply related [flat|nested] 11+ messages in thread
end of thread, other threads:[~2012-12-05 9:23 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-02-01 20:04 [gentoo-commits] proj/qt:master commit in: x11-libs/qt-opengl/, x11-libs/qt-script/, x11-libs/qt-qt3support/, Markos Chandras
-- strict thread matches above, loose matches on Subject: below --
2012-02-04 9:14 Markos Chandras
2012-03-30 15:20 Davide Pesavento
2012-03-31 18:12 Michael Palimaka
2012-05-14 22:05 Davide Pesavento
2012-06-17 21:23 Davide Pesavento
2012-06-17 21:23 Davide Pesavento
2012-06-18 0:30 Davide Pesavento
2012-06-29 0:17 Davide Pesavento
2012-11-30 14:54 Ben de Groot
2012-12-05 9:23 Michael Palimaka
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox