diff options
| author |   Patrick Lauer <patrick@gentoo.org> | 2014-04-23 07:24:45 +0000 |
|---|---|---|
| committer | Patrick Lauer <patrick@gentoo.org> | 2014-04-23 07:24:45 +0000 |
| commit | 1d64f40b81d3bbb22c739a1e7bcc8c673a2890a6 (patch) | |
| tree | df4dea663659cedb0365297f488a2f6540d06e95 /dev-qt | |
| parent | Import qt5 from qt overlay (diff) | |
| download | historical-1d64f40b81d3bbb22c739a1e7bcc8c673a2890a6.tar.gz historical-1d64f40b81d3bbb22c739a1e7bcc8c673a2890a6.tar.bz2 historical-1d64f40b81d3bbb22c739a1e7bcc8c673a2890a6.zip | |
Revert webkit useflag removal
Package-Manager: portage-2.2.10/cvs/Linux x86_64
Diffstat (limited to 'dev-qt')
| -rw-r--r-- | dev-qt/qtquick1/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-qt/qtquick1/Manifest | 6 | ||||
| -rw-r--r-- | dev-qt/qtquick1/metadata.xml | 1 | ||||
| -rw-r--r-- | dev-qt/qtquick1/qtquick1-5.2.1.ebuild | 7 |
4 files changed, 12 insertions, 8 deletions
diff --git a/dev-qt/qtquick1/ChangeLog b/dev-qt/qtquick1/ChangeLog index 08b942c65d1e..9d814e270207 100644 --- a/dev-qt/qtquick1/ChangeLog +++ b/dev-qt/qtquick1/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-qt/qtquick1 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtquick1/ChangeLog,v 1.1 2014/04/23 07:11:44 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtquick1/ChangeLog,v 1.2 2014/04/23 07:24:33 patrick Exp $ + + 23 Apr 2014; Patrick Lauer <patrick@gentoo.org> metadata.xml, + qtquick1-5.2.1.ebuild: + Revert webkit useflag removal *qtquick1-5.2.1 (23 Apr 2014) diff --git a/dev-qt/qtquick1/Manifest b/dev-qt/qtquick1/Manifest index 4294003ee0f8..1e80738bff77 100644 --- a/dev-qt/qtquick1/Manifest +++ b/dev-qt/qtquick1/Manifest @@ -1,4 +1,4 @@ DIST qtquick1-opensource-src-5.2.1.tar.xz 15989344 SHA256 8b2bb3250b9e09a4c568069bc4c7cfeddbdcda50b24f0bfecc7f85df3120ff65 SHA512 e5c30df44a184e6df9475eb6616cb75c459000de1190e2ddd00e151afaef1130c6ddcc18be955919e9d85dc4644f4cb63ffd844ac73c024e5212ce47ab1c382d WHIRLPOOL d29c85d991b5f45f0cce4d7694cfef058c6c73075fba9d888884c0fd19b0a59a41cb6f4cad15441f80f19c37dc7cc86c49e8580114a383df434574405224f000 -EBUILD qtquick1-5.2.1.ebuild 1240 SHA256 2530fd1a1b8ff97a03a154deda060c95cb642295a19b0fc997ede39ae1657aa2 SHA512 ba2ca7cf4556a1c45adfe52ed72aa1cb896f1508609e86c0618deeea8f1af6ec4d08e7da0ea8bd7100cf31cb13d1d4591bb5531e0f418d234280dfc74f150b28 WHIRLPOOL a3169568438e51c15500cbf09773b45e7079bed6cd36575a46607f52d5f426cf1c5c6b3181d32f8bb491af5724db54d42521deb7593855933488c0855de3c922 -MISC ChangeLog 355 SHA256 8737f705b4697a001a84ab6c9d1fdc7065b350b1e237a4f964054dec085a975f SHA512 c475bd188cf4eabdc22cbb61ec225dec0bcca4e5b0e7ca97d2d7f6b7424e2d416296b1ff71c3039d70fd1e0f679fcd259774d5a8afa87f3878a5ed1783a81e96 WHIRLPOOL 30b66ac3c754eead0a3829b4f1c59ab06585b396031a7c8bffe6592482b6cd4645dd689acca361597e4e6bc658bb10a093943e047a2d265d3aed92516d644419 -MISC metadata.xml 385 SHA256 c303cdf1bddc5998b5259eb3509c3b78210554808dd145c844a836c6b8c1aba7 SHA512 582849d9e26067b314a46a8d3735765b9f1ab00157b1add9a869cbcbd4e415bdfb1197b7be6ae00c9180afeb098da3d799456142058fa60444a5744af8cb9b15 WHIRLPOOL 34e300de627b50c311ff0636114f42d7b6b7eeead344fa6da93f98cf98b1646356ebfda7531e55955dbb65dfb7191d570a8401dc2b84a3ff4cd6764aa72af6f3 +EBUILD qtquick1-5.2.1.ebuild 1192 SHA256 2d7b101522ef41886004a1af87ad3bf05e46a61cbdf696e245f9f88f3cee3c11 SHA512 9ed7b9385ba72ac10455529d0d10269a312e738852b4d7bd4a802518066fcd4faf12e976366a51132e87530fd3fd4cd50ed7752419304363a4a508b800290be1 WHIRLPOOL 7e07c0c02a5857e561fd9682fe2f244cb3096c91b05a2fffac1ed3b288694e775e170655908f6ad26f8acd6fa36d63735fd20b8908d6d9da1207503b079e4d3b +MISC ChangeLog 477 SHA256 03e894c74115843a6ba13822236fbe41b1329016f183a5e5e219291d1c49cf16 SHA512 29140e2aa96d20e2473016e38f012e9120e8e1b6887851c6b2f1a2d82e02d17d60b28f9dca56a90cdfa4b28baf1df502d0523d37798d12638f75b508934a49e0 WHIRLPOOL 3742c99760bb4947945987b49d08c632bf3f2be5f074ac4c0ef443d6977924dfeb66fb917369748ff31b9e42a698fbd247d968bd63614c0f55660ffd18ea385d +MISC metadata.xml 471 SHA256 d9e32c9086d202bbabbdce43962f157da35c78a004108db951bcf336f06e4e9e SHA512 253adffc2eaac2b1d06222db097b5ad306157d0008a7b103d75fb06f40a725081c3ec085c833fc7b1590dfa1e4ebbe49fc13449267f45e999071483bdde61b71 WHIRLPOOL 960a54435297a79723ce5110f1562d610f245ed2d142c5255a0cb91c1c0c40d8e15616f9f2d9ccc4ce804857972f25e9ffb6f45d941fe3624da274d9e324d69b diff --git a/dev-qt/qtquick1/metadata.xml b/dev-qt/qtquick1/metadata.xml index d084bf33728c..81b3a08b3969 100644 --- a/dev-qt/qtquick1/metadata.xml +++ b/dev-qt/qtquick1/metadata.xml @@ -3,6 +3,7 @@ <pkgmetadata> <herd>qt</herd> <use> + <flag name="webkit">Build the WebView import for QtQuick1 (requires QtWebKit)</flag> <flag name="xml">Build the XmlListModel import for QtQuick1 (requires QtXmlPatterns)</flag> </use> <upstream> diff --git a/dev-qt/qtquick1/qtquick1-5.2.1.ebuild b/dev-qt/qtquick1/qtquick1-5.2.1.ebuild index 24004ba729a8..c0512980e8be 100644 --- a/dev-qt/qtquick1/qtquick1-5.2.1.ebuild +++ b/dev-qt/qtquick1/qtquick1-5.2.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtquick1/qtquick1-5.2.1.ebuild,v 1.1 2014/04/23 07:11:44 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtquick1/qtquick1-5.2.1.ebuild,v 1.2 2014/04/23 07:24:33 patrick Exp $ EAPI=5 @@ -15,9 +15,8 @@ else fi # FIXME: qdeclarativeview designer plugin is automagic -# FIXME: webkit useflag removed until qtwebkit builds -IUSE="+opengl +xml" +IUSE="+opengl webkit +xml" DEPEND=" >=dev-qt/qtcore-${PV}:5[debug=] @@ -27,9 +26,9 @@ DEPEND=" >=dev-qt/qtsql-${PV}:5[debug=] >=dev-qt/qtwidgets-${PV}:5[debug=] opengl? ( >=dev-qt/qtopengl-${PV}:5[debug=] ) + webkit? ( >=dev-qt/qtwebkit-${PV}:5[debug=,widgets] ) xml? ( >=dev-qt/qtxmlpatterns-${PV}:5[debug=] ) " -# webkit? ( >=dev-qt/qtwebkit-${PV}:5[debug=,widgets] ) RDEPEND="${DEPEND}" |