| 1 |
commit: 10720006140dd6e68b99302d281eaa5857ae00cd |
| 2 |
Author: Davide Pesavento <davidepesa <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Fri Jun 8 16:31:10 2012 +0000 |
| 4 |
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Jun 8 16:31:10 2012 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=10720006 |
| 7 |
|
| 8 |
Move QtNetwork module from qt-core to a separate package; merge qt-bearer into qt-network. |
| 9 |
|
| 10 |
--- |
| 11 |
eclass/qt5-build.eclass | 2 +- |
| 12 |
x11-libs/qt-bearer/metadata.xml | 1 - |
| 13 |
x11-libs/qt-core/qt-core-5.9999.ebuild | 5 +---- |
| 14 |
x11-libs/{qt-bearer => qt-network}/metadata.xml | 4 ---- |
| 15 |
.../qt-network-5.9999.ebuild} | 14 ++++++-------- |
| 16 |
5 files changed, 8 insertions(+), 18 deletions(-) |
| 17 |
|
| 18 |
diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass |
| 19 |
index 80e0c9c..8fd8e84 100644 |
| 20 |
--- a/eclass/qt5-build.eclass |
| 21 |
+++ b/eclass/qt5-build.eclass |
| 22 |
@@ -32,7 +32,7 @@ LICENSE="|| ( LGPL-2.1 GPL-3 )" |
| 23 |
SLOT="5" |
| 24 |
|
| 25 |
case ${PN#qt-} in |
| 26 |
- bearer|core|dbus|gui|sql|test|xml) EGIT_PROJECT="qtbase" ;; |
| 27 |
+ core|dbus|gui|network|sql|test|xml) EGIT_PROJECT="qtbase" ;; |
| 28 |
3d|jsbackend|script|svg|xmlpatterns) EGIT_PROJECT="${PN/-}" ;; |
| 29 |
*) die "qt5-build.eclass: unknown module ${PN}" ;; |
| 30 |
esac |
| 31 |
|
| 32 |
diff --git a/x11-libs/qt-bearer/metadata.xml b/x11-libs/qt-bearer/metadata.xml |
| 33 |
index 9911f48..2da24f3 100644 |
| 34 |
--- a/x11-libs/qt-bearer/metadata.xml |
| 35 |
+++ b/x11-libs/qt-bearer/metadata.xml |
| 36 |
@@ -4,7 +4,6 @@ |
| 37 |
<herd>qt</herd> |
| 38 |
<use> |
| 39 |
<flag name="c++0x">Build Qt using the C++11 standard</flag> |
| 40 |
- <flag name="c++11">Build Qt using the C++11 standard</flag> |
| 41 |
<flag name="connman">Enable ConnMan-based bearer plugin</flag> |
| 42 |
<flag name="exceptions">Add support for exceptions - like catching them |
| 43 |
inside the event loop (recommended by Nokia)</flag> |
| 44 |
|
| 45 |
diff --git a/x11-libs/qt-core/qt-core-5.9999.ebuild b/x11-libs/qt-core/qt-core-5.9999.ebuild |
| 46 |
index eb950f1..c0d8fb2 100644 |
| 47 |
--- a/x11-libs/qt-core/qt-core-5.9999.ebuild |
| 48 |
+++ b/x11-libs/qt-core/qt-core-5.9999.ebuild |
| 49 |
@@ -14,7 +14,7 @@ else |
| 50 |
KEYWORDS="~amd64" |
| 51 |
fi |
| 52 |
|
| 53 |
-IUSE="+glib icu ssl" |
| 54 |
+IUSE="+glib icu" |
| 55 |
|
| 56 |
DEPEND=" |
| 57 |
>=dev-libs/libpcre-8.30[pcre16] |
| 58 |
@@ -22,7 +22,6 @@ DEPEND=" |
| 59 |
virtual/libiconv |
| 60 |
glib? ( dev-libs/glib:2 ) |
| 61 |
icu? ( >=dev-libs/icu-49 ) |
| 62 |
- ssl? ( dev-libs/openssl:0 ) |
| 63 |
" |
| 64 |
RDEPEND="${DEPEND}" |
| 65 |
|
| 66 |
@@ -32,7 +31,6 @@ QT5_TARGET_SUBDIRS=( |
| 67 |
src/tools/rcc |
| 68 |
src/tools/qdoc |
| 69 |
src/corelib |
| 70 |
- src/network |
| 71 |
src/concurrent |
| 72 |
) |
| 73 |
|
| 74 |
@@ -41,7 +39,6 @@ src_configure() { |
| 75 |
$(qt_use glib) |
| 76 |
-iconv |
| 77 |
$(qt_use icu) |
| 78 |
- $(use ssl && echo -openssl-linked || echo -no-openssl) |
| 79 |
-no-accessibility -no-gui -no-cups -no-dbus |
| 80 |
-no-xcb -no-eglfs -no-directfb -no-opengl |
| 81 |
) |
| 82 |
|
| 83 |
diff --git a/x11-libs/qt-bearer/metadata.xml b/x11-libs/qt-network/metadata.xml |
| 84 |
similarity index 58% |
| 85 |
copy from x11-libs/qt-bearer/metadata.xml |
| 86 |
copy to x11-libs/qt-network/metadata.xml |
| 87 |
index 9911f48..97932fd 100644 |
| 88 |
--- a/x11-libs/qt-bearer/metadata.xml |
| 89 |
+++ b/x11-libs/qt-network/metadata.xml |
| 90 |
@@ -3,12 +3,8 @@ |
| 91 |
<pkgmetadata> |
| 92 |
<herd>qt</herd> |
| 93 |
<use> |
| 94 |
- <flag name="c++0x">Build Qt using the C++11 standard</flag> |
| 95 |
<flag name="c++11">Build Qt using the C++11 standard</flag> |
| 96 |
<flag name="connman">Enable ConnMan-based bearer plugin</flag> |
| 97 |
- <flag name="exceptions">Add support for exceptions - like catching them |
| 98 |
- inside the event loop (recommended by Nokia)</flag> |
| 99 |
<flag name="networkmanager">Enable NetworkManager-based bearer plugin</flag> |
| 100 |
- <flag name="qpa">Build a window system agnostic implementation of Qt</flag> |
| 101 |
</use> |
| 102 |
</pkgmetadata> |
| 103 |
|
| 104 |
diff --git a/x11-libs/qt-bearer/qt-bearer-5.9999.ebuild b/x11-libs/qt-network/qt-network-5.9999.ebuild |
| 105 |
similarity index 80% |
| 106 |
rename from x11-libs/qt-bearer/qt-bearer-5.9999.ebuild |
| 107 |
rename to x11-libs/qt-network/qt-network-5.9999.ebuild |
| 108 |
index 95179f6..a3d0921 100644 |
| 109 |
--- a/x11-libs/qt-bearer/qt-bearer-5.9999.ebuild |
| 110 |
+++ b/x11-libs/qt-network/qt-network-5.9999.ebuild |
| 111 |
@@ -14,12 +14,14 @@ else |
| 112 |
KEYWORDS="~amd64" |
| 113 |
fi |
| 114 |
|
| 115 |
-IUSE="connman networkmanager" |
| 116 |
+IUSE="connman networkmanager +ssl" |
| 117 |
|
| 118 |
DEPEND=" |
| 119 |
+ sys-libs/zlib |
| 120 |
~x11-libs/qt-core-${PV}[debug=] |
| 121 |
connman? ( ~x11-libs/qt-dbus-${PV}[debug=] ) |
| 122 |
networkmanager? ( ~x11-libs/qt-dbus-${PV}[debug=] ) |
| 123 |
+ ssl? ( dev-libs/openssl:0 ) |
| 124 |
" |
| 125 |
RDEPEND="${DEPEND} |
| 126 |
connman? ( net-misc/connman ) |
| 127 |
@@ -27,6 +29,7 @@ RDEPEND="${DEPEND} |
| 128 |
" |
| 129 |
|
| 130 |
QT5_TARGET_SUBDIRS=( |
| 131 |
+ src/network |
| 132 |
src/plugins/bearer/generic |
| 133 |
) |
| 134 |
|
| 135 |
@@ -39,15 +42,10 @@ pkg_setup() { |
| 136 |
|
| 137 |
src_configure() { |
| 138 |
local myconf=( |
| 139 |
+ $(use connman || use networkmanager && echo -dbus-linked || echo -no-dbus) |
| 140 |
+ $(use ssl && echo -openssl-linked || echo -no-openssl) |
| 141 |
-no-accessibility -no-gui -no-cups |
| 142 |
-no-xcb -no-eglfs -no-directfb -no-opengl |
| 143 |
) |
| 144 |
- |
| 145 |
- if use connman || use networkmanager; then |
| 146 |
- myconf+=(-dbus-linked) |
| 147 |
- else |
| 148 |
- myconf+=(-no-dbus) |
| 149 |
- fi |
| 150 |
- |
| 151 |
qt5-build_src_configure |
| 152 |
} |
Archives