Gentoo Archives: gentoo-commits

From: "Anthony G. Basile" <blueness@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/musl:master commit in: dev-qt/qtcore/
Date: Wed, 21 Feb 2018 08:59:08
Message-Id: 1519203474.0fdf9f8397f9a397c72e8818981518d2bdd171e8.blueness@gentoo
1 commit: 0fdf9f8397f9a397c72e8818981518d2bdd171e8
2 Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
3 AuthorDate: Wed Feb 21 08:57:54 2018 +0000
4 Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
5 CommitDate: Wed Feb 21 08:57:54 2018 +0000
6 URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=0fdf9f83
7
8 dev-qt/qtcore: in tree version 5.9.4-r1 works
9
10 Package-Manager: Portage-2.3.19, Repoman-2.3.6
11
12 dev-qt/qtcore/Manifest | 3 +-
13 dev-qt/qtcore/qtcore-5.9.3.ebuild | 71 ---------------------------------------
14 2 files changed, 1 insertion(+), 73 deletions(-)
15
16 diff --git a/dev-qt/qtcore/Manifest b/dev-qt/qtcore/Manifest
17 index ae9d169..9eb3023 100644
18 --- a/dev-qt/qtcore/Manifest
19 +++ b/dev-qt/qtcore/Manifest
20 @@ -1,3 +1,2 @@
21 DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 SHA256 e2882295097e47fe089f8ac741a95fef47e0a73a3f3cdf21b56990638f626ea0 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125 WHIRLPOOL ad8f01172f5bdb3a3a69fe7b03862c4c411bc8d95211053ad66ed1d60a3c0577d073d1075a1e0a80b25d9b2721addda55a2967e6ccf5e194cec8d08770ac5fc2
22 -DIST qtbase-opensource-src-5.7.1.tar.xz 44992616 SHA256 edcdf549d94d98aff08e201dcb3ca25bc3628a37b1309e320d5f556b6b66557e SHA512 0506a3a856f76e5ba182e3382a515282b6096f3900fbdc14cd5aec425105ab61922e0ada0361234387335ceb80b3c69e39cd34d75476c2946c4371e7b8c0827f WHIRLPOOL de5ff1380b3fd9cbcca741d212ac516e3f8a31366219605730cf5525a04e4efc9965a9b3cf8e99f50a2912bc7add83f61e7f90a85e176ad2830e4c1422b5d682
23 -DIST qtbase-opensource-src-5.9.3.tar.xz 45160080 SHA256 9e7c44005e7691dc7c85165bd4510282c47f0163521f4973eab71dbdb39a9982 SHA512 256ffb8760e94c0f87790ed35e210d0c9613e14314ff442dd763cc93fbd5caa6c11c95f5d44b12a7687fb93c9f857878132cf6d76e5933f647ca7beb54b18c7c WHIRLPOOL 08ee846bcc99fe1af47febc8436c5c6772cb1dbb096fd1cd7126e708efbf53251ddff66f1d6ea2ac9091e75f38ce784d209c3c94130e7c48b9adedd01a59b7ed
24 +DIST qtbase-opensource-src-5.7.1.tar.xz 44992616 BLAKE2B d845ff8316f6f91089e23b74c025ad8e6160eb7ba75017cba34c2ad2f7b475fc4e36d337b945935bc2850bd140d743b9a5e3d23399b6d3151b85109da9f56ba8 SHA512 0506a3a856f76e5ba182e3382a515282b6096f3900fbdc14cd5aec425105ab61922e0ada0361234387335ceb80b3c69e39cd34d75476c2946c4371e7b8c0827f
25
26 diff --git a/dev-qt/qtcore/qtcore-5.9.3.ebuild b/dev-qt/qtcore/qtcore-5.9.3.ebuild
27 deleted file mode 100644
28 index c210c68..0000000
29 --- a/dev-qt/qtcore/qtcore-5.9.3.ebuild
30 +++ /dev/null
31 @@ -1,71 +0,0 @@
32 -# Copyright 1999-2018 Gentoo Foundation
33 -# Distributed under the terms of the GNU General Public License v2
34 -
35 -EAPI=6
36 -QT5_MODULE="qtbase"
37 -inherit qt5-build
38 -
39 -DESCRIPTION="Cross-platform application development framework"
40 -
41 -if [[ ${QT5_BUILD_TYPE} == release ]]; then
42 - KEYWORDS="~amd64 ~arm ~ppc ~x86"
43 -fi
44 -
45 -IUSE="icu systemd"
46 -
47 -DEPEND="
48 - dev-libs/double-conversion:=
49 - dev-libs/glib:2
50 - dev-libs/libpcre2[pcre16,unicode]
51 - sys-libs/zlib
52 - icu? ( dev-libs/icu:= )
53 - !icu? ( virtual/libiconv )
54 - systemd? ( sys-apps/systemd:= )
55 -"
56 -RDEPEND="${DEPEND}"
57 -
58 -PATCHES=(
59 - "${FILESDIR}/${P}-avx.patch"
60 - "${FILESDIR}/${PN}-5.9.3-musl-iconv.patch"
61 -)
62 -
63 -QT5_TARGET_SUBDIRS=(
64 - src/tools/bootstrap
65 - src/tools/moc
66 - src/tools/rcc
67 - src/tools/qfloat16-tables
68 - src/corelib
69 - src/tools/qlalr
70 - doc
71 -)
72 -
73 -src_configure() {
74 - local myconf=(
75 - $(qt_use icu)
76 - $(qt_use !icu iconv)
77 - $(qt_use systemd journald)
78 - )
79 - qt5-build_src_configure
80 -}
81 -
82 -src_install() {
83 - qt5-build_src_install
84 -
85 - local flags=(
86 - ALSA CUPS DBUS EGL EGLFS EGL_X11 EVDEV FONTCONFIG FREETYPE
87 - HARFBUZZ IMAGEFORMAT_JPEG IMAGEFORMAT_PNG LIBPROXY MITSHM
88 - OPENGL OPENSSL OPENVG PULSEAUDIO SHAPE SSL TSLIB XCURSOR
89 - XFIXES XKB XRANDR XRENDER XSYNC ZLIB
90 - )
91 -
92 - for flag in ${flags[@]}; do
93 - cat >> "${D%/}"/${QT5_HEADERDIR}/QtCore/qconfig.h <<- _EOF_ || die
94 -
95 - #if defined(QT_NO_${flag}) && defined(QT_${flag})
96 - # undef QT_NO_${flag}
97 - #elif !defined(QT_NO_${flag}) && !defined(QT_${flag})
98 - # define QT_NO_${flag}
99 - #endif
100 - _EOF_
101 - done
102 -}