commit: 64b330281fb8a8863b2d5d38d0d260756d3f894c
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 2 00:43:40 2017 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Thu Nov 2 00:43:50 2017 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=64b33028
dev-qt/qtcore: sync up with the tree
Package-Manager: Portage-2.3.8, Repoman-2.3.3
dev-qt/qtcore/Manifest | 8 +---
dev-qt/qtcore/qtcore-4.8.6-r2.ebuild | 87 ------------------------------------
dev-qt/qtcore/qtcore-4.8.7-r2.ebuild | 2 +-
dev-qt/qtcore/qtcore-5.6.2-r1.ebuild | 45 -------------------
dev-qt/qtcore/qtcore-5.7.1-r3.ebuild | 2 +-
5 files changed, 4 insertions(+), 140 deletions(-)
diff --git a/dev-qt/qtcore/Manifest b/dev-qt/qtcore/Manifest
index ca7b459..7deaf10 100644
--- a/dev-qt/qtcore/Manifest
+++ b/dev-qt/qtcore/Manifest
@@ -9,12 +9,8 @@ AUX qtcore-5.6.2-plugins.patch 3264 SHA256
2e0e863830f457d597e608815e92c25e4e092
AUX qtcore-5.7.1-qipm.patch 5915 SHA256
a5fb3bee98d797ac5e34bec02bcc1b5b0834fa1092fa6d1e1ea3d490975ae42f SHA512
807c030c2059cddcd159cb537ba2e4be68d6f612f45e1e7b844fc045f661739aea7bc35743735cee364d692d51774e17edced1aac8d444abaa4e4435117a5b3d
WHIRLPOOL
e13e1a24b750fe7729b1d86214491358937344b7a39c6c2941d372f5ce9077ecc1c320a0be2e5a9c772e1b01d786e55176cdad252c317bc62215c9c7acfe0d6b
AUX qtcore-5.7.1-qsfpm-1.patch 8922 SHA256
3376b4564d793e0bf3770a8ebcc474a03e7aa49a8a578c136bbcb1fa6e9e136a SHA512
3854fffa1181cebe4683c54d5e774301a8710bf784dcc18367d04d193a7ce76fc6f634096b6986af41c3f5e4432b702873181a8900fd18e7617ea472d23d6d92
WHIRLPOOL
0ae27f2596e8601a4717bf76d06a2c452f4a0f087355766e7ca9483c8959ddd2c0765a6154ee1dde612347fb69ddc28581121c64cfa6f97a3067b1112bdb86c3
AUX qtcore-5.7.1-qsfpm-2.patch 7812 SHA256
a2bb1a42df644906cacb084e579166e8229c774e2f678b8b523215d4bbffe1e7 SHA512
38b141aa7d30011d71ed9044c69f79b56698320600a64ed3cc37e8dd9d22bb9ec2f33f8348d074552a5046c2855e948e325d5421384cb4c66c0bbd566500174d
WHIRLPOOL
3e65f1413ce3b3800d694b731d74026ac5d5f08f9af20b257c2b7424ec954cb1fa28067496b028c3e66680ae88e59d8ccf8c080b049fa05f31162705db1a0898
-DIST qt-everywhere-opensource-src-4.8.6.tar.gz 241623667 SHA256
8b14dd91b52862e09b8e6a963507b74bc2580787d171feda197badfa7034032c SHA512
c2d07c3cf9d687cb9b93e337c89df3f0055bd02bc8aa5ecd55d3ffb238b31a4308aeabc3c51a4f94ac76a1b00796f047513d02e427ed93ae8dd99f836fff7692
WHIRLPOOL
473566814a77237dbdd37a47980c1085f6cf39599c4d6b0120959fe80dadf65c4eaafd5f528dd86cea8815562faa204bedfe3b766c2ca4f2d2c99efc21dbca84
DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 SHA256
e2882295097e47fe089f8ac741a95fef47e0a73a3f3cdf21b56990638f626ea0 SHA512
f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125
WHIRLPOOL
ad8f01172f5bdb3a3a69fe7b03862c4c411bc8d95211053ad66ed1d60a3c0577d073d1075a1e0a80b25d9b2721addda55a2967e6ccf5e194cec8d08770ac5fc2
-DIST qtbase-opensource-src-5.6.2.tar.xz 46825164 SHA256
2f6eae93c5d982fe0a387a01aeb3435571433e23e9d9d9246741faf51f1ee787 SHA512
ff55204e6f0b046ccb03430ac6a22bd743bc2f3822625f0c23a481a8a7acb5d93f5b8e900815c70f10554887fbe26b3ee79f6d702acfa5c370e4e3cbd1f2b321
WHIRLPOOL
4a68aae4e471b0cfac3abf3652bb18cac8ffce17c941c8589a154bf07eb8d26945fab535f2e1acb866a584584c1811e953aa19fb1b3709831d85a620f0b6dc5a
DIST qtbase-opensource-src-5.7.1.tar.xz 44992616 SHA256
edcdf549d94d98aff08e201dcb3ca25bc3628a37b1309e320d5f556b6b66557e SHA512
0506a3a856f76e5ba182e3382a515282b6096f3900fbdc14cd5aec425105ab61922e0ada0361234387335ceb80b3c69e39cd34d75476c2946c4371e7b8c0827f
WHIRLPOOL
de5ff1380b3fd9cbcca741d212ac516e3f8a31366219605730cf5525a04e4efc9965a9b3cf8e99f50a2912bc7add83f61e7f90a85e176ad2830e4c1422b5d682
-EBUILD qtcore-4.8.6-r2.ebuild 2799 SHA256
7c971b11ea1f2eaadd8b512194825c9b20476b87a4fb30bc4aa26972e3ea22fe SHA512
f6c99ecff25ae7feba10d2290a4358cd41364b16f8a7eb816e3f7fa5c264712b0b19db1a96a136919d58ba522e2a914e521780be08b8277ddc61148ff490a536
WHIRLPOOL
774e63fb9c6feb60a7206a5e1761f1b5198c287403daa95f7324ed88ed700aab0bd109b77f8c2c73999cd2fad47c640bcc10383ff3cee9a7e527955617b12f51
-EBUILD qtcore-4.8.7-r2.ebuild 2927 SHA256
6c9f674bf2dcc0d13f3bc7c224f6f890143e05adf650abdced3ff2334994b6dd SHA512
1d92977590e437e00be5590c9e438d455dd7b5067fc3af299e8ee7a12579d7fb9aaae1ed1b90846bfabf7deccd47c433804d93bcf850a5e9c20135077203fb34
WHIRLPOOL
75eef81f20c32aa8d4f0ee1c90bd7ec7c8e5c8c6c84bbe8d682ade309c5bc42d51e430fdb7476798dc025682b8c081434563d99605ac627c202f193c783970a5
-EBUILD qtcore-5.6.2-r1.ebuild 828 SHA256
08ad65af7dfc460978f2df70e221f1c57e27ceaf7b2c44eb9782bd90c5825771 SHA512
0ce08466d7764f84f3d1c65d0f3020e62929d4021a83e7b8db1132a6b16458ee364bb74af1842b9f7b047afdba65c344b00bfa4d8a8c7231b078b278f42fc639
WHIRLPOOL
6fa267b5bf378de902c336b06ae2f28c79642ee8c707040dd3fdfea059e246bce634df6c469fa1dbedbef707d44b7e23900375635183496a3e2735a4fd686fee
-EBUILD qtcore-5.7.1-r3.ebuild 940 SHA256
48fe9f7ae4caa65ce95ba06dd859dd8317e0dfb6b14b8d82d79e6bc3385897d8 SHA512
7cdd93ba0530a895ad07fdf59f7b5c514f646c347d1b9fa5df4099da18dd4f7c3d48c806ded544b039ecac599a2a5a5f41a82df7e990574ddaf8028e9a2e9814
WHIRLPOOL
67fd69d21597d643356afeaafdf3650f45f741fe1b04347f848e5cdd2974dd47352393b624871f55b668f7f15b4c4ff92ddbbe9dc7e194a1bc96466dc2e18864
+EBUILD qtcore-4.8.7-r2.ebuild 2862 SHA256
e888c594fc32a78f88958a62c9133df2142ef96aee2d68d653f960214ac633bb SHA512
56056bd63f63aadc1ce18c8b124ec3d2dd333f3233d2e4abefa8a580919321580b3c125dcf63c5897239fd46fd7b8e94c51233debb3814a7367fbe28c0c1b8f4
WHIRLPOOL
8922704b9e599f12ee632b2b43792a45f1fa91ee9464b911826a3586b2f3daefa4c8c5b612c3b66c5f25df4e0d3c14b3035fae15812b91087be8e2d70385c606
+EBUILD qtcore-5.7.1-r3.ebuild 927 SHA256
f2dd1d08d498def28ab9ea45de01cde57278c9677da917bed87b12df19ef1969 SHA512
bfa4daab88fdd67918ccc784a69bf140e9fa6ef77d129cc049c9965be747212da6494a4ad8520353cd6ab9f06c91030693aae4f5986146416dd7d6fae0f8a0cd
WHIRLPOOL
ad1b670ee90975306b038f20abff6c2836b09fe2098943ec0db82e4bce548e682c2e8ad316fd3c5fe5398f21caf4ff82d181b253286944def98868ab06e0ffb6
MISC metadata.xml 923 SHA256
22b0c054608f0f06da6d5e08acca625e153346ef3c0281dd93a89bc3f9efc7e1 SHA512
c3cc5ea943e59fd44ffded076df311a62dd5fb7ff2ab197f6118604a0e26e30f44377e0b8bb3edcddbda19ea52c0a26cf6451625dd17185c511d5d051e3ad915
WHIRLPOOL
7061ff30ae1b083e1328c0080d08631a3e9ffc1986f729f9e1ae269d7ba243345859a87cdb020a3eaabd40c78c9fcaa159adfc53a3729e87ae82bf49d7530f59
diff --git a/dev-qt/qtcore/qtcore-4.8.6-r2.ebuild
b/dev-qt/qtcore/qtcore-4.8.6-r2.ebuild
deleted file mode 100644
index b32adcb..0000000
--- a/dev-qt/qtcore/qtcore-4.8.6-r2.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit qt4-build-multilib
-
-DESCRIPTION="Cross-platform application development framework"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86
~amd64-fbsd ~x86-fbsd"
-IUSE="+glib iconv icu qt3support ssl"
-
-DEPEND="
- >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
- glib? ( dev-libs/glib:2[${MULTILIB_USEDEP}] )
- iconv? ( >=virtual/libiconv-0-r2[${MULTILIB_USEDEP}] )
- icu? ( dev-libs/icu:=[${MULTILIB_USEDEP}] )
- ssl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] )
-"
-RDEPEND="${DEPEND}"
-PDEPEND="
- ~dev-qt/qttranslations-${PV}
- qt3support? (
~dev-qt/qtgui-${PV}[aqua=,debug=,glib=,qt3support,${MULTILIB_USEDEP}] )
-"
-
-MULTILIB_WRAPPED_HEADERS=(
- /usr/include/qt4/Qt/qconfig.h
- /usr/include/qt4/QtCore/qconfig.h
-)
-
-PATCHES=(
-
"${FILESDIR}/${PN}-4.8.5-honor-ExcludeSocketNotifiers-in-glib-event-loop.patch"
# bug 514968
- "${FILESDIR}/${PN}-4.8.5-qeventdispatcher-recursive.patch" # bug 514968
- "${FILESDIR}/${PN}-4.8.6-QNAM-corruptions-fix.patch" # bug 548622
- "${FILESDIR}/${PN}-4.8.6-moc-boost-1.60.patch" # bug 556104
- "${FILESDIR}/${PN}-4.8.7-fix-socklent-for-musl.patch"
-)
-
-QT4_TARGET_DIRECTORIES="
- src/tools/bootstrap
- src/tools/moc
- src/tools/rcc
- src/tools/uic
- src/corelib
- src/network
- src/xml
- src/plugins/codecs/cn
- src/plugins/codecs/jp
- src/plugins/codecs/kr
- src/plugins/codecs/tw
- tools/linguist/lconvert
- tools/linguist/lrelease
- tools/linguist/lupdate"
-
-QCONFIG_DEFINE="QT_ZLIB"
-
-src_prepare() {
- qt4-build-multilib_src_prepare
-
- # bug 172219
- sed -i -e "s:CXXFLAGS.*=:CXXFLAGS=${CXXFLAGS} :" \
- -e "s:LFLAGS.*=:LFLAGS=${LDFLAGS} :" \
- qmake/Makefile.unix || die "sed qmake/Makefile.unix failed"
-
- # bug 427782
- sed -i -e '/^CPPFLAGS\s*=/ s/-g //' \
- qmake/Makefile.unix || die "sed CPPFLAGS in qmake/Makefile.unix
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/' \
- configure || die "sed configure setBootstrapVariable failed"
-}
-
-multilib_src_configure() {
- local 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_multilib_src_configure
-}
diff --git a/dev-qt/qtcore/qtcore-4.8.7-r2.ebuild
b/dev-qt/qtcore/qtcore-4.8.7-r2.ebuild
index ea6aa16..8312d9f 100644
--- a/dev-qt/qtcore/qtcore-4.8.7-r2.ebuild
+++ b/dev-qt/qtcore/qtcore-4.8.7-r2.ebuild
@@ -7,7 +7,7 @@ inherit qt4-build-multilib
DESCRIPTION="Cross-platform application development framework"
if [[ ${QT4_BUILD_TYPE} == release ]]; then
- KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc
~x86 ~amd64-fbsd ~x86-fbsd"
+ KEYWORDS="amd64 arm ~mips ppc x86"
fi
IUSE="+glib iconv icu libressl qt3support ssl"
diff --git a/dev-qt/qtcore/qtcore-5.6.2-r1.ebuild
b/dev-qt/qtcore/qtcore-5.6.2-r1.ebuild
deleted file mode 100644
index 1b1e8cd..0000000
--- a/dev-qt/qtcore/qtcore-5.6.2-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-QT5_MODULE="qtbase"
-inherit qt5-build
-
-DESCRIPTION="Cross-platform application development framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="amd64 arm ~arm64 hppa ppc ppc64 x86"
-fi
-
-IUSE="icu systemd"
-
-DEPEND="
- dev-libs/glib:2
- >=dev-libs/libpcre-8.38[pcre16,unicode]
- >=sys-libs/zlib-1.2.5
- virtual/libiconv
- icu? ( dev-libs/icu:= )
- systemd? ( sys-apps/systemd:= )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
- "${FILESDIR}/${P}-plugins.patch"
- "${FILESDIR}/${PN}-5.5.1-musl-iconv.patch"
-)
-
-QT5_TARGET_SUBDIRS=(
- src/tools/bootstrap
- src/tools/moc
- src/tools/rcc
- src/corelib
- src/tools/qlalr
-)
-
-src_configure() {
- local myconf=(
- $(qt_use icu)
- $(qt_use systemd journald)
- )
- qt5-build_src_configure
-}
diff --git a/dev-qt/qtcore/qtcore-5.7.1-r3.ebuild
b/dev-qt/qtcore/qtcore-5.7.1-r3.ebuild
index a12aacd..c4f32fd 100644
--- a/dev-qt/qtcore/qtcore-5.7.1-r3.ebuild
+++ b/dev-qt/qtcore/qtcore-5.7.1-r3.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
DESCRIPTION="Cross-platform application development framework"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="amd64 arm ~arm64 ~hppa ppc ppc64 x86"
+ KEYWORDS="amd64 arm ~mips ppc x86"
fi
IUSE="icu systemd"
