[gentoo-commits] proj/musl:master commit in: dev-qt/qtcore/ - 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:	Thu, 25 Jan 2018 00:57:32
Message-Id:	`1516841836.969d367b2bc13e8be5773b283fece463f654511c.blueness@gentoo`

1

commit:     969d367b2bc13e8be5773b283fece463f654511c

2

Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>

3

AuthorDate: Thu Jan 25 00:57:16 2018 +0000

4

Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>

5

CommitDate: Thu Jan 25 00:57:16 2018 +0000

6

URL:        https://gitweb.gentoo.org/proj/musl.git/commit/?id=969d367b

7

8

dev-qt/qtcore: drop libcxx libcxxabi as it breaks the dep tree

9

10

Package-Manager: Portage-2.3.13, Repoman-2.3.3

11

12

 dev-qt/qtcore/Manifest            |  1 -

13

 dev-qt/qtcore/metadata.xml        |  2 --

14

 dev-qt/qtcore/qtcore-5.9.2.ebuild | 68 ---------------------------------------

15

 dev-qt/qtcore/qtcore-5.9.3.ebuild | 14 ++------

16

 4 files changed, 2 insertions(+), 83 deletions(-)

17

18

diff --git a/dev-qt/qtcore/Manifest b/dev-qt/qtcore/Manifest

19

index 99146f9..ae9d169 100644

20

--- a/dev-qt/qtcore/Manifest

21

+++ b/dev-qt/qtcore/Manifest

22

@@ -1,4 +1,3 @@

23

 DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 SHA256 e2882295097e47fe089f8ac741a95fef47e0a73a3f3cdf21b56990638f626ea0 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125 WHIRLPOOL ad8f01172f5bdb3a3a69fe7b03862c4c411bc8d95211053ad66ed1d60a3c0577d073d1075a1e0a80b25d9b2721addda55a2967e6ccf5e194cec8d08770ac5fc2

24

 DIST qtbase-opensource-src-5.7.1.tar.xz 44992616 SHA256 edcdf549d94d98aff08e201dcb3ca25bc3628a37b1309e320d5f556b6b66557e SHA512 0506a3a856f76e5ba182e3382a515282b6096f3900fbdc14cd5aec425105ab61922e0ada0361234387335ceb80b3c69e39cd34d75476c2946c4371e7b8c0827f WHIRLPOOL de5ff1380b3fd9cbcca741d212ac516e3f8a31366219605730cf5525a04e4efc9965a9b3cf8e99f50a2912bc7add83f61e7f90a85e176ad2830e4c1422b5d682

25

-DIST qtbase-opensource-src-5.9.2.tar.xz 45148744 SHA256 7fe2bb468955f633c71b3ddd3c269e68a2c4137a4e5b8dd12dcdb34cbc6d609b SHA512 a2f965871645256f3d019f71f3febb875455a29d03fccc7a3371ddfeb193b0af12394e779df05adf69fd10fe7b0d966f3915a24528ec7eb3bc36c2db6af2b6e7 WHIRLPOOL aed0b8aac590fad17b4f9067b46097e81d9991307b296428a9592d66a7c11967ee3e9a50b1d05afdeb7503470e658b016ec5af5c71e71059bd4c0d391b845f95

26

 DIST qtbase-opensource-src-5.9.3.tar.xz 45160080 SHA256 9e7c44005e7691dc7c85165bd4510282c47f0163521f4973eab71dbdb39a9982 SHA512 256ffb8760e94c0f87790ed35e210d0c9613e14314ff442dd763cc93fbd5caa6c11c95f5d44b12a7687fb93c9f857878132cf6d76e5933f647ca7beb54b18c7c WHIRLPOOL 08ee846bcc99fe1af47febc8436c5c6772cb1dbb096fd1cd7126e708efbf53251ddff66f1d6ea2ac9091e75f38ce784d209c3c94130e7c48b9adedd01a59b7ed

27

28

diff --git a/dev-qt/qtcore/metadata.xml b/dev-qt/qtcore/metadata.xml

29

index cbf4db3..34c0121 100644

30

--- a/dev-qt/qtcore/metadata.xml

31

+++ b/dev-qt/qtcore/metadata.xml

32

@@ -9,8 +9,6 @@

33

 		<flag name="exceptions">Add support for exceptions - like catching them

34

 			inside the event loop (recommended by upstream)</flag>

35

 		<flag name="glib">Enable <pkg>dev-libs/glib</pkg> eventloop support</flag>

36

-		<flag name="libcxx">Link with <pkg>sys-libs/libcxx</pkg> to avoid dependency on gcc.</flag>

37

-		<flag name="libcxxabi">Build on top of <pkg>sys-libs/libcxxabi</pkg> instead of gcc's libsupc++ (avoids depending on gcc).</flag>

38

 		<flag name="qt3support">Enable the Qt3Support libraries for Qt4. Note that

39

 			this does not mean you can compile pure Qt3 programs with Qt4.</flag>

40

 		<flag name="systemd">Enable native journald logging support</flag>

41

42

diff --git a/dev-qt/qtcore/qtcore-5.9.2.ebuild b/dev-qt/qtcore/qtcore-5.9.2.ebuild

43

deleted file mode 100644

44

index 80da91a..0000000

45

--- a/dev-qt/qtcore/qtcore-5.9.2.ebuild

46

+++ /dev/null

47

@@ -1,68 +0,0 @@

48

-# Copyright 1999-2017 Gentoo Foundation

49

-# Distributed under the terms of the GNU General Public License v2

50

-

51

-EAPI=6

52

-QT5_MODULE="qtbase"

53

-inherit qt5-build

54

-

55

-DESCRIPTION="Cross-platform application development framework"

56

-

57

-if [[ ${QT5_BUILD_TYPE} == release ]]; then

58

-	KEYWORDS="~amd64 ~arm ~ppc ~x86"

59

-fi

60

-

61

-IUSE="icu systemd"

62

-

63

-DEPEND="

64

-	dev-libs/double-conversion:=

65

-	dev-libs/glib:2

66

-	dev-libs/libpcre2[pcre16,unicode]

67

-	sys-libs/zlib

68

-	icu? ( dev-libs/icu:= )

69

-	!icu? ( virtual/libiconv )

70

-	systemd? ( sys-apps/systemd:= )

71

-"

72

-RDEPEND="${DEPEND}"

73

-

74

-PATCHES=( "${FILESDIR}/${PN}-5.9.3-musl-iconv.patch" )

75

-

76

-QT5_TARGET_SUBDIRS=(

77

-	src/tools/bootstrap

78

-	src/tools/moc

79

-	src/tools/rcc

80

-	src/tools/qfloat16-tables

81

-	src/corelib

82

-	src/tools/qlalr

83

-	doc

84

-)

85

-

86

-src_configure() {

87

-	local myconf=(

88

-		$(qt_use icu)

89

-		$(qt_use !icu iconv)

90

-		$(qt_use systemd journald)

91

-	)

92

-	qt5-build_src_configure

93

-}

94

-

95

-src_install() {

96

-	qt5-build_src_install

97

-

98

-	local flags=(

99

-		ALSA CUPS DBUS EGL EGLFS EGL_X11 EVDEV FONTCONFIG FREETYPE

100

-		HARFBUZZ IMAGEFORMAT_JPEG IMAGEFORMAT_PNG LIBPROXY MITSHM

101

-		OPENGL OPENSSL OPENVG PULSEAUDIO SHAPE SSL TSLIB XCURSOR

102

-		XFIXES XKB XRANDR XRENDER XSYNC ZLIB

103

-	)

104

-

105

-	for flag in ${flags[@]}; do

106

-		cat >> "${D%/}"/${QT5_HEADERDIR}/QtCore/qconfig.h <<- _EOF_ || die

107

-

108

-			#if defined(QT_NO_${flag}) && defined(QT_${flag})

109

-			# undef QT_NO_${flag}

110

-			#elif !defined(QT_NO_${flag}) && !defined(QT_${flag})

111

-			# define QT_NO_${flag}

112

-			#endif

113

-		_EOF_

114

-	done

115

-}

116

117

diff --git a/dev-qt/qtcore/qtcore-5.9.3.ebuild b/dev-qt/qtcore/qtcore-5.9.3.ebuild

118

index a52f1b1..c210c68 100644

119

--- a/dev-qt/qtcore/qtcore-5.9.3.ebuild

120

+++ b/dev-qt/qtcore/qtcore-5.9.3.ebuild

121

@@ -1,4 +1,4 @@

122

-# Copyright 1999-2017 Gentoo Foundation

123

+# Copyright 1999-2018 Gentoo Foundation

124

 # Distributed under the terms of the GNU General Public License v2

125

126

 EAPI=6

127

@@ -11,7 +11,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then

128

 	KEYWORDS="~amd64 ~arm ~ppc ~x86"

129

fi

130

131

-IUSE="icu libcxx libcxxabi systemd"

132

+IUSE="icu systemd"

133

134

 DEPEND="

135

 	dev-libs/double-conversion:=

136

@@ -21,11 +21,6 @@ DEPEND="

137

 	icu? ( dev-libs/icu:= )

138

 	!icu? ( virtual/libiconv )

139

 	systemd? ( sys-apps/systemd:= )

140

-	libcxx? (

141

-		sys-devel/clang:=

142

-		sys-libs/libcxx:=

143

-		libcxxabi? ( sys-libs/libcxxabi:= )

144

-	)

145

"

146

 RDEPEND="${DEPEND}"

147

148

@@ -45,15 +40,10 @@ QT5_TARGET_SUBDIRS=(

149

)

150

151

 src_configure() {

152

-	if use libcxxabi; then

153

-		eapply "${FILESDIR}/${PN}-clang-libc++abi.patch"

154

-	fi

155

-

156

 	local myconf=(

157

 		$(qt_use icu)

158

 		$(qt_use !icu iconv)

159

 		$(qt_use systemd journald)

160

-		$(if use libcxx ; then echo "-platform linux-clang-libc++" ; fi)

161

)

162

 	qt5-build_src_configure

163

}

1	commit: 969d367b2bc13e8be5773b283fece463f654511c
2	Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
3	AuthorDate: Thu Jan 25 00:57:16 2018 +0000
4	Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
5	CommitDate: Thu Jan 25 00:57:16 2018 +0000
6	URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=969d367b
7
8	dev-qt/qtcore: drop libcxx libcxxabi as it breaks the dep tree
9
10	Package-Manager: Portage-2.3.13, Repoman-2.3.3
11
12	dev-qt/qtcore/Manifest \| 1 -
13	dev-qt/qtcore/metadata.xml \| 2 --
14	dev-qt/qtcore/qtcore-5.9.2.ebuild \| 68 ---------------------------------------
15	dev-qt/qtcore/qtcore-5.9.3.ebuild \| 14 ++------
16	4 files changed, 2 insertions(+), 83 deletions(-)
17
18	diff --git a/dev-qt/qtcore/Manifest b/dev-qt/qtcore/Manifest
19	index 99146f9..ae9d169 100644
20	--- a/dev-qt/qtcore/Manifest
21	+++ b/dev-qt/qtcore/Manifest
22	@@ -1,4 +1,3 @@
23	DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 SHA256 e2882295097e47fe089f8ac741a95fef47e0a73a3f3cdf21b56990638f626ea0 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125 WHIRLPOOL ad8f01172f5bdb3a3a69fe7b03862c4c411bc8d95211053ad66ed1d60a3c0577d073d1075a1e0a80b25d9b2721addda55a2967e6ccf5e194cec8d08770ac5fc2
24	DIST qtbase-opensource-src-5.7.1.tar.xz 44992616 SHA256 edcdf549d94d98aff08e201dcb3ca25bc3628a37b1309e320d5f556b6b66557e SHA512 0506a3a856f76e5ba182e3382a515282b6096f3900fbdc14cd5aec425105ab61922e0ada0361234387335ceb80b3c69e39cd34d75476c2946c4371e7b8c0827f WHIRLPOOL de5ff1380b3fd9cbcca741d212ac516e3f8a31366219605730cf5525a04e4efc9965a9b3cf8e99f50a2912bc7add83f61e7f90a85e176ad2830e4c1422b5d682
25	-DIST qtbase-opensource-src-5.9.2.tar.xz 45148744 SHA256 7fe2bb468955f633c71b3ddd3c269e68a2c4137a4e5b8dd12dcdb34cbc6d609b SHA512 a2f965871645256f3d019f71f3febb875455a29d03fccc7a3371ddfeb193b0af12394e779df05adf69fd10fe7b0d966f3915a24528ec7eb3bc36c2db6af2b6e7 WHIRLPOOL aed0b8aac590fad17b4f9067b46097e81d9991307b296428a9592d66a7c11967ee3e9a50b1d05afdeb7503470e658b016ec5af5c71e71059bd4c0d391b845f95
26	DIST qtbase-opensource-src-5.9.3.tar.xz 45160080 SHA256 9e7c44005e7691dc7c85165bd4510282c47f0163521f4973eab71dbdb39a9982 SHA512 256ffb8760e94c0f87790ed35e210d0c9613e14314ff442dd763cc93fbd5caa6c11c95f5d44b12a7687fb93c9f857878132cf6d76e5933f647ca7beb54b18c7c WHIRLPOOL 08ee846bcc99fe1af47febc8436c5c6772cb1dbb096fd1cd7126e708efbf53251ddff66f1d6ea2ac9091e75f38ce784d209c3c94130e7c48b9adedd01a59b7ed
27
28	diff --git a/dev-qt/qtcore/metadata.xml b/dev-qt/qtcore/metadata.xml
29	index cbf4db3..34c0121 100644
30	--- a/dev-qt/qtcore/metadata.xml
31	+++ b/dev-qt/qtcore/metadata.xml
32	@@ -9,8 +9,6 @@
33	<flag name="exceptions">Add support for exceptions - like catching them
34	inside the event loop (recommended by upstream)</flag>
35	<flag name="glib">Enable <pkg>dev-libs/glib</pkg> eventloop support</flag>
36	- <flag name="libcxx">Link with <pkg>sys-libs/libcxx</pkg> to avoid dependency on gcc.</flag>
37	- <flag name="libcxxabi">Build on top of <pkg>sys-libs/libcxxabi</pkg> instead of gcc's libsupc++ (avoids depending on gcc).</flag>
38	<flag name="qt3support">Enable the Qt3Support libraries for Qt4. Note that
39	this does not mean you can compile pure Qt3 programs with Qt4.</flag>
40	<flag name="systemd">Enable native journald logging support</flag>
41
42	diff --git a/dev-qt/qtcore/qtcore-5.9.2.ebuild b/dev-qt/qtcore/qtcore-5.9.2.ebuild
43	deleted file mode 100644
44	index 80da91a..0000000
45	--- a/dev-qt/qtcore/qtcore-5.9.2.ebuild
46	+++ /dev/null
47	@@ -1,68 +0,0 @@
48	-# Copyright 1999-2017 Gentoo Foundation
49	-# Distributed under the terms of the GNU General Public License v2
50	-
51	-EAPI=6
52	-QT5_MODULE="qtbase"
53	-inherit qt5-build
54	-
55	-DESCRIPTION="Cross-platform application development framework"
56	-
57	-if [[ ${QT5_BUILD_TYPE} == release ]]; then
58	- KEYWORDS="~amd64 ~arm ~ppc ~x86"
59	-fi
60	-
61	-IUSE="icu systemd"
62	-
63	-DEPEND="
64	- dev-libs/double-conversion:=
65	- dev-libs/glib:2
66	- dev-libs/libpcre2[pcre16,unicode]
67	- sys-libs/zlib
68	- icu? ( dev-libs/icu:= )
69	- !icu? ( virtual/libiconv )
70	- systemd? ( sys-apps/systemd:= )
71	-"
72	-RDEPEND="${DEPEND}"
73	-
74	-PATCHES=( "${FILESDIR}/${PN}-5.9.3-musl-iconv.patch" )
75	-
76	-QT5_TARGET_SUBDIRS=(
77	- src/tools/bootstrap
78	- src/tools/moc
79	- src/tools/rcc
80	- src/tools/qfloat16-tables
81	- src/corelib
82	- src/tools/qlalr
83	- doc
84	-)
85	-
86	-src_configure() {
87	- local myconf=(
88	- $(qt_use icu)
89	- $(qt_use !icu iconv)
90	- $(qt_use systemd journald)
91	- )
92	- qt5-build_src_configure
93	-}
94	-
95	-src_install() {
96	- qt5-build_src_install
97	-
98	- local flags=(
99	- ALSA CUPS DBUS EGL EGLFS EGL_X11 EVDEV FONTCONFIG FREETYPE
100	- HARFBUZZ IMAGEFORMAT_JPEG IMAGEFORMAT_PNG LIBPROXY MITSHM
101	- OPENGL OPENSSL OPENVG PULSEAUDIO SHAPE SSL TSLIB XCURSOR
102	- XFIXES XKB XRANDR XRENDER XSYNC ZLIB
103	- )
104	-
105	- for flag in ${flags[@]}; do
106	- cat >> "${D%/}"/${QT5_HEADERDIR}/QtCore/qconfig.h <<- _EOF_ \|\| die
107	-
108	- #if defined(QT_NO_${flag}) && defined(QT_${flag})
109	- # undef QT_NO_${flag}
110	- #elif !defined(QT_NO_${flag}) && !defined(QT_${flag})
111	- # define QT_NO_${flag}
112	- #endif
113	- _EOF_
114	- done
115	-}
116
117	diff --git a/dev-qt/qtcore/qtcore-5.9.3.ebuild b/dev-qt/qtcore/qtcore-5.9.3.ebuild
118	index a52f1b1..c210c68 100644
119	--- a/dev-qt/qtcore/qtcore-5.9.3.ebuild
120	+++ b/dev-qt/qtcore/qtcore-5.9.3.ebuild
121	@@ -1,4 +1,4 @@
122	-# Copyright 1999-2017 Gentoo Foundation
123	+# Copyright 1999-2018 Gentoo Foundation
124	# Distributed under the terms of the GNU General Public License v2
125
126	EAPI=6
127	@@ -11,7 +11,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
128	KEYWORDS="~amd64 ~arm ~ppc ~x86"
129	fi
130
131	-IUSE="icu libcxx libcxxabi systemd"
132	+IUSE="icu systemd"
133
134	DEPEND="
135	dev-libs/double-conversion:=
136	@@ -21,11 +21,6 @@ DEPEND="
137	icu? ( dev-libs/icu:= )
138	!icu? ( virtual/libiconv )
139	systemd? ( sys-apps/systemd:= )
140	- libcxx? (
141	- sys-devel/clang:=
142	- sys-libs/libcxx:=
143	- libcxxabi? ( sys-libs/libcxxabi:= )
144	- )
145	"
146	RDEPEND="${DEPEND}"
147
148	@@ -45,15 +40,10 @@ QT5_TARGET_SUBDIRS=(
149	)
150
151	src_configure() {
152	- if use libcxxabi; then
153	- eapply "${FILESDIR}/${PN}-clang-libc++abi.patch"
154	- fi
155	-
156	local myconf=(
157	$(qt_use icu)
158	$(qt_use !icu iconv)
159	$(qt_use systemd journald)
160	- $(if use libcxx ; then echo "-platform linux-clang-libc++" ; fi)
161	)
162	qt5-build_src_configure
163	}

Gentoo Archives: gentoo-commits