commit: 0d51cee952688efdbc0df14dc6bb84d0ea26bdea
Author: Aric Belsito <lluixhi <AT> gmail <DOT> com>
AuthorDate: Thu May 18 16:24:07 2017 +0000
Commit: Aric Belsito <lluixhi <AT> gmail <DOT> com>
CommitDate: Thu May 18 16:24:07 2017 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=0d51cee9
dev-qt/qtwebengine: appease repoman
remove 5.6.1, sync with upstream.
dev-qt/qtwebengine/Manifest | 6 +-
dev-qt/qtwebengine/qtwebengine-5.6.1.ebuild | 103 -------------------------
dev-qt/qtwebengine/qtwebengine-5.6.2.ebuild | 3 +-
dev-qt/qtwebengine/qtwebengine-5.7.1-r1.ebuild | 1 -
4 files changed, 3 insertions(+), 110 deletions(-)
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index c441af2..6aaa024 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -14,10 +14,8 @@ AUX qtwebengine-5.7.0-musl-resolver.patch 2568 SHA256
07a3ee87d509e8dc963b8d60c5
AUX qtwebengine-5.7.0-musl-sandbox.patch 3185 SHA256
b4e616a6159a237e4ee0455e45e75c95702314f1ae42bfd3068a92ba1575ac01 SHA512
80a3c5eddf29cdf9beac3cd4e0c3d450ab32d85dbe794d2055d0abe0e1242db0fc69a44df7cf250d3ecf9a93a7e1d15d460a1d2409e65ceae1ac5c189f055918
WHIRLPOOL
6d4e1b055ce739e5b9f7d0235a7b628a52aebe03014e8f09e83968b2d1ddbb614ee00e4f8ffa792c6305822e759bd24265f1b63c5fae78834da6c1dcbb123305
AUX qtwebengine-5.7.1-fix-audio-detection.patch 802 SHA256
3cc298a3fdeecf4a339bad39ac9bc63201c02b87fceb32e4c06e3004a6197103 SHA512
d461dc066eda63d9cc7131852d12f2a0ed0abdaf849f9d7ec0e1da20098e031877c07ae37ebd3ba47af1ef1d7cf4d909ef594bcb4682f9e4f69d7deeaeb01f2c
WHIRLPOOL
41dd2c3b574939d2a3b25f1758502cb473dd29f3046360c4ff38098246c959f95d6628ab832b318874d7cbe3a088ca119e2c03cd1dd04009fab75ec3bb1f51c0
AUX qtwebengine-paxmark-mksnapshot.patch 1478 SHA256
540ab83071df14d5fc6881dcf6fc28a2daaa46584e9b0c3ad45b584c612f16af SHA512
3ad5312be5d0a1e08df9d5f25256678c12373d64a99f0d7fb0f96b711f719775328feb554144ac5cde22f8226a7b8d62bd07287270da613db09a1ed3c3303019
WHIRLPOOL
d70127c7ef2e2262557b62aa0fd8709c90aed5e0143e43c8c53dd817378dd7accefe2dccdc9b90a740fa3d49f40a3438a4a1438f51995da86bdfba816aa319bb
-DIST qtwebengine-opensource-src-5.6.1-1.tar.xz 143729228 SHA256
c80e90237bb7bd52a3fa843415c17a8e8e6d779b65efd1393472f24f8642e04c SHA512
4612221fafd16c2d5ce38965bb264d2577b20b1c342792f34729e8a26978e9e430dc1425291530dfad254be5b3b42ebdafdec084c5d25edb23fc61bb3f71ac6f
WHIRLPOOL
dc05495c1afe755e51961c314b3305b43add7eee149816a0be3ab22b9a2ae10b54ebf5ca2861eaf8768e619c44533b35bd94645e12f94eb39cb5b9c8b19c1667
DIST qtwebengine-opensource-src-5.6.2.tar.xz 143752452 SHA256
2f0a1648e1a8b22bad0134f2b37d69d185074393c398c1a3c6a83b910ff39740 SHA512
c30a270bfb254a18d4b89af8ae28789912d6157cd58010b6838461c332c32c667c15b683d290fd14615b9f0be20aca9957bd8657c4abaa8d77c28278c58f7282
WHIRLPOOL
94e627c369cfa18a7c878f75007698839aa1cd1b10df4de8e42b2f393dcd2dedec33930c1fa41c50bfa39e63089d66c7c5d0861ea7093356b1cc2e93a605893e
DIST qtwebengine-opensource-src-5.7.1.tar.xz 163782564 SHA256
2101883e3d632b50133a14e3bbdc1d4d649e405c9618f2eef1b72a7b821ccc2b SHA512
4f53e51141d8e3479d22062a80af0359d3d7ab6bc0d2d6530c6af2d3e5b625f7192cda2a9eb85c657864ec3b30bdc797d3bff57db4c71211e71bb4ee5ac9c71a
WHIRLPOOL
cebf17fc3e5c75406789c36e12dd32b0b6e6111dad6bf8f48bb07fd5d8ea76d78cd2cc5c3ad3021c8de9b91974afd7688ea384626d7e308dedd67664f1eec104
-EBUILD qtwebengine-5.6.1.ebuild 2399 SHA256
cf87e113dd9b731ab1a2c7ab6e2b94bf54a041d0d890725a7c48c0073447442c SHA512
f31ea3257a6153bfbd9a3ab9ed2ad7b4703ab7c76305be6b41451123b02537aaab07ca13967c586cbb76e1c9f989c03ec50c774443be8a6acd6d0ac37ea6fa32
WHIRLPOOL
14f86450d5c323d12592876bd9e7fc9c8cdfced1473415c41e17e15c89a3ed43818aa9db9ec49486bfbfb600c8ab03bf4a7333445a359b124ece4fcd6146f1a5
-EBUILD qtwebengine-5.6.2.ebuild 2777 SHA256
07361fec84110219e75705e7ff956c3af2b00d2c8497a5abe1bb3b120d39b713 SHA512
b05bc93a46830581ce6b4ad7a37186211ba60fd1a54419fadab1918ebd4e988cc0caf68f2bd48f4fc3d6967a9665663453e644ee3d7e8cfff7f4ccc6063ac482
WHIRLPOOL
0664cab57e74c79688899c91e8d682161199ae74c266b17f3ecc94df56e6954ae45808c773259c9e1d9feaa4858627c3c8a0827fbcea8627ffab0538d1c66c68
-EBUILD qtwebengine-5.7.1-r1.ebuild 3187 SHA256
6c44469f721ae0bfe2aebff143b647cbf3cbab19d26136e41f8373a4bfa51858 SHA512
b4685c605b30d5b6848edd800bea0dc7da2f23e5c6d479a936beb58142c30a7098e365996e73564be96dff40d0e6369a597562e4a782f4c4320831542ad86475
WHIRLPOOL
4aebc905fd19e37c9b58dffe384221e571387e723e1646e5d30a28fc80405fc2eecb3ebd28b40be4f8f8b3cd8c017d09d124aab803b996e62db607647ecb9bf8
+EBUILD qtwebengine-5.6.2.ebuild 2769 SHA256
b37258d0fd827741dcd440ac7e5499ac09bab5c54afc4cb8fc61538570d65281 SHA512
16b4d1bca9132e8139487ba8639d728e010822ec21dbb856648d9586323362a98e67b9432085de301ba3991054232e9c5ba97773d43a9e778e80293f16fcbcc1
WHIRLPOOL
6d9c9d8f6ea2d51d33345c19e65e75a94fe72cd6bfcb828dcd97cb3a62625dc5210f6c2c2a15b5c8b78c408ebb474ffff9ce7538c046f49daa91eddbafa12617
+EBUILD qtwebengine-5.7.1-r1.ebuild 3180 SHA256
c79803b89c0a813eca261ee44d605b3d99a0a3382bed45b53f1b35c329b35956 SHA512
8498888beb3d1691670e93b6149d96284c0d0c9a0c309b5939352cab582db88f4e960eb7c780f4482c1bd81d59c5d7cede109fb8598ae7da6aa4fa9e3aaad1ae
WHIRLPOOL
061476907b87c5943d6691858e62209bfd3e7735133e823e0a87057974233fbc3b34a03f8e28648f8d88ab8776c44b19895c707b943fa60677349d85a02406a4
MISC metadata.xml 947 SHA256
15083351c49bbcf033829248688471002ca7990644535e1228c5f29396839026 SHA512
a53fa56d2922b8abb2b10193ebc3cb61923697d9c1ddbb583f0d06886dc357604c192cbbbc2849a976be189a41473069b1931434d057b9c9d5b91c7333680224
WHIRLPOOL
7db472885a977071531059312cb171ceffe119900e68bf20a6de6aca9d90336b21067a47e71e80e2d79fc54193b0aa276d74e96b98d3001e58be3c7d0840f8a8
diff --git a/dev-qt/qtwebengine/qtwebengine-5.6.1.ebuild
b/dev-qt/qtwebengine/qtwebengine-5.6.1.ebuild
deleted file mode 100644
index 0e2c4e8..0000000
--- a/dev-qt/qtwebengine/qtwebengine-5.6.1.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-inherit python-any-r1 qt5-build
-
-DESCRIPTION="Library for rendering dynamic web content in Qt5 C++ and QML
applications"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="amd64 x86"
-fi
-
-IUSE="bindist geolocation +system-ffmpeg +system-icu widgets"
-
-RDEPEND="
- app-arch/snappy
- dev-libs/glib:2
- dev-libs/nspr
- dev-libs/nss
- ~dev-qt/qtcore-${PV}
- ~dev-qt/qtdeclarative-${PV}
- ~dev-qt/qtgui-${PV}
- ~dev-qt/qtnetwork-${PV}
- ~dev-qt/qtwebchannel-${PV}[qml]
- dev-libs/expat
- dev-libs/jsoncpp:=
- dev-libs/libevent:=
- dev-libs/libxml2
- dev-libs/libxslt
- media-libs/alsa-lib
- media-libs/flac
- media-libs/fontconfig
- media-libs/freetype
- media-libs/harfbuzz:=
- media-libs/libpng:0=
- >=media-libs/libvpx-1.4:=
- media-libs/libwebp:=
- media-libs/mesa
- media-libs/opus
- media-libs/speex
- net-libs/libsrtp:=
- sys-apps/dbus
- sys-apps/pciutils
- sys-libs/libcap
- sys-libs/zlib[minizip]
- x11-libs/libdrm
- x11-libs/libX11
- x11-libs/libXcomposite
- x11-libs/libXcursor
- x11-libs/libXdamage
- x11-libs/libXext
- x11-libs/libXfixes
- x11-libs/libXi
- x11-libs/libXrandr
- x11-libs/libXrender
- x11-libs/libXScrnSaver
- x11-libs/libXtst
- geolocation? ( ~dev-qt/qtpositioning-${PV} )
- system-ffmpeg? ( =media-video/ffmpeg-2*:0= )
- system-icu? ( dev-libs/icu:= )
- widgets? ( ~dev-qt/qtwidgets-${PV} )
-"
-DEPEND="${RDEPEND}
- ${PYTHON_DEPS}
- dev-util/gperf
- dev-util/ninja
- dev-util/re2c
- sys-devel/bison
-"
-
-PATCHES=(
- "${FILESDIR}/${PN}-5.6.0-musl-execinfo.patch"
- "${FILESDIR}/${PN}-5.6.0-musl-mallinfo.patch"
- "${FILESDIR}/${PN}-5.6.0-musl-off_t.patch"
- "${FILESDIR}/${PN}-5.6.0-musl-resolver.patch"
- "${FILESDIR}/${PN}-5.6.0-musl-sandbox.patch"
- "${FILESDIR}/${PN}-5.6.0-musl-siginfo.patch"
- "${FILESDIR}/${PN}-5.6.0-musl-stack.patch"
- "${FILESDIR}/${PN}-5.6.0-musl-sysctl.patch"
-)
-
-src_prepare() {
- qt_use_disable_mod geolocation positioning \
- src/core/core_common.pri \
- src/core/core_gyp_generator.pro
-
- qt_use_disable_mod widgets widgets src/src.pro
-
- qt5-build_src_prepare
-}
-
-src_configure() {
- export NINJA_PATH=/usr/bin/ninja
-
- local myqmakeargs=(
- $(usex bindist '' 'WEBENGINE_CONFIG+=use_proprietary_codecs')
- $(usex system-ffmpeg 'WEBENGINE_CONFIG+=use_system_ffmpeg' '')
- $(usex system-icu 'WEBENGINE_CONFIG+=use_system_icu' '')
- )
- qt5-build_src_configure
-}
diff --git a/dev-qt/qtwebengine/qtwebengine-5.6.2.ebuild
b/dev-qt/qtwebengine/qtwebengine-5.6.2.ebuild
index 37d4b0e..8b5c4a4 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.6.2.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.6.2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
PYTHON_COMPAT=( python2_7 )
@@ -86,7 +85,7 @@ src_prepare() {
use pax_kernel && PATCHES+=(
"${FILESDIR}/${PN}-paxmark-mksnapshot.patch" )
if use system-icu; then
- # ensuire build against system headers - bug #601264
+ # ensure build against system headers - bug #601264
rm -r src/3rdparty/chromium/third_party/icu/source || die
fi
diff --git a/dev-qt/qtwebengine/qtwebengine-5.7.1-r1.ebuild
b/dev-qt/qtwebengine/qtwebengine-5.7.1-r1.ebuild
index 60a818c..395f174 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.7.1-r1.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.7.1-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
PYTHON_COMPAT=( python2_7 )
