commit: 0b0376221263f6f336d4c087c6509569f7208a57
Author: Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 18 16:43:37 2015 +0000
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Wed Feb 18 16:43:37 2015 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=0b037622
[dev-qt/qtnetwork:5] Add libproxy support.
---
dev-qt/qtnetwork/metadata.xml | 7 +++++--
dev-qt/qtnetwork/qtnetwork-5.5.9999.ebuild | 5 ++++-
dev-qt/qtnetwork/qtnetwork-5.9999.ebuild | 5 ++++-
eclass/qt5-build.eclass | 2 +-
4 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/dev-qt/qtnetwork/metadata.xml b/dev-qt/qtnetwork/metadata.xml
index cacd1fa..8ca635f 100644
--- a/dev-qt/qtnetwork/metadata.xml
+++ b/dev-qt/qtnetwork/metadata.xml
@@ -3,8 +3,11 @@
<pkgmetadata>
<herd>qt</herd>
<use>
- <flag name="connman">Enable ConnMan-based bearer plugin</flag>
- <flag name="networkmanager">Enable NetworkManager-based bearer
plugin</flag>
+ <flag name="connman">Enable <pkg>net-misc/connman</pkg>-based
bearer plugin</flag>
+ <flag name="libproxy">Use <pkg>net-libs/libproxy</pkg> for
automatic
+ HTTP/SOCKS proxy configuration</flag>
+ <flag name="networkmanager">Enable
<pkg>net-misc/networkmanager</pkg>-based
+ bearer plugin</flag>
</use>
<upstream>
<bugs-to>https://bugreports.qt.io/</bugs-to>
diff --git a/dev-qt/qtnetwork/qtnetwork-5.5.9999.ebuild
b/dev-qt/qtnetwork/qtnetwork-5.5.9999.ebuild
index 0cd874a..d23d45a 100644
--- a/dev-qt/qtnetwork/qtnetwork-5.5.9999.ebuild
+++ b/dev-qt/qtnetwork/qtnetwork-5.5.9999.ebuild
@@ -16,12 +16,13 @@ else
KEYWORDS="~amd64 ~x86"
fi
-IUSE="connman networkmanager +ssl"
+IUSE="connman libproxy networkmanager +ssl"
DEPEND="
~dev-qt/qtcore-${PV}[debug=]
sys-libs/zlib
connman? ( ~dev-qt/qtdbus-${PV}[debug=] )
+ libproxy? ( net-libs/libproxy )
networkmanager? ( ~dev-qt/qtdbus-${PV}[debug=] )
ssl? ( dev-libs/openssl:0[-bindist] )
"
@@ -36,6 +37,7 @@ QT5_TARGET_SUBDIRS=(
)
QT5_GENTOO_CONFIG=(
+ libproxy
ssl::SSL
ssl::OPENSSL
ssl:openssl-linked:LINKED_OPENSSL
@@ -49,6 +51,7 @@ pkg_setup() {
src_configure() {
local myconf=(
$(use connman || use networkmanager && echo -dbus-linked)
+ $(qt_use libproxy)
$(use ssl && echo -openssl-linked)
)
qt5-build_src_configure
diff --git a/dev-qt/qtnetwork/qtnetwork-5.9999.ebuild
b/dev-qt/qtnetwork/qtnetwork-5.9999.ebuild
index 0cd874a..d23d45a 100644
--- a/dev-qt/qtnetwork/qtnetwork-5.9999.ebuild
+++ b/dev-qt/qtnetwork/qtnetwork-5.9999.ebuild
@@ -16,12 +16,13 @@ else
KEYWORDS="~amd64 ~x86"
fi
-IUSE="connman networkmanager +ssl"
+IUSE="connman libproxy networkmanager +ssl"
DEPEND="
~dev-qt/qtcore-${PV}[debug=]
sys-libs/zlib
connman? ( ~dev-qt/qtdbus-${PV}[debug=] )
+ libproxy? ( net-libs/libproxy )
networkmanager? ( ~dev-qt/qtdbus-${PV}[debug=] )
ssl? ( dev-libs/openssl:0[-bindist] )
"
@@ -36,6 +37,7 @@ QT5_TARGET_SUBDIRS=(
)
QT5_GENTOO_CONFIG=(
+ libproxy
ssl::SSL
ssl::OPENSSL
ssl:openssl-linked:LINKED_OPENSSL
@@ -49,6 +51,7 @@ pkg_setup() {
src_configure() {
local myconf=(
$(use connman || use networkmanager && echo -dbus-linked)
+ $(qt_use libproxy)
$(use ssl && echo -openssl-linked)
)
qt5-build_src_configure
diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index f4bb2b2..7a6e693 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -532,7 +532,7 @@ qt5_base_configure() {
-no-journald
-no-libpng -no-libjpeg
-no-freetype -no-harfbuzz
- -no-openssl
+ -no-openssl -no-libproxy
-no-xinput2 -no-xcb-xlib
# always enable glib event loop support
