Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 229193 | Differences between
and this patch

Collapse All | Expand All

(-)/usr/portage/eclass/qt4.eclass (-8 / +39 lines)
Lines 95-102 Link Here
95
		# The use flags are different in 4.4 and above, and it's a split package, so this is used to catch
95
		# The use flags are different in 4.4 and above, and it's a split package, so this is used to catch
96
		# the various use flag combos specified in the ebuilds to make sure we don't error out.
96
		# the various use flag combos specified in the ebuilds to make sure we don't error out.
97
97
98
			if [[ ${x} == zlib || ${x} == png ]]; then
98
			if [[ ${x} == zlib || ${x} == png || ${x} == gif ]]; then
99
				# Qt 4.4+ is built with zlib and png by default, so the use flags aren't needed
99
				# Qt 4.4+ is built with zlib, gif and png by default, so the use flags aren't needed
100
				continue;
100
				continue;
101
			elif [[ ${x} == opengl || ${x} == dbus || ${x} == qt3support ]]; then
101
			elif [[ ${x} == opengl || ${x} == dbus || ${x} == qt3support ]]; then
102
				# Make sure the qt-${x} package has been already installed
102
				# Make sure the qt-${x} package has been already installed
Lines 122-133 Link Here
122
	done
122
	done
123
123
124
	local optionalflags=""
124
	local optionalflags=""
125
	local optionalerrormessage=""
125
	for x in ${QT4_OPTIONAL_BUILT_WITH_USE_CHECK}; do
126
	for x in ${QT4_OPTIONAL_BUILT_WITH_USE_CHECK}; do
126
		if use ${x} && ! built_with_use =x11-libs/qt-4* ${x}; then
127
		if use ${x}; then
127
			optionalflags="${optionalflags} ${x}"
128
			if [[ "${QT4_MINOR_VERSION}" -ge 4 ]]; then
128
		fi
129
			# The use flags are different in 4.4 and above, and it's a split package, so this is used to catch
130
			# the various use flag combos specified in the ebuilds to make sure we don't error out.
131
132
				if [[ ${x} == zlib || ${x} == png || ${x} == gif ]]; then
133
					# Qt 4.4+ is built with zlib, gif and png by default, so the use flags aren't needed
134
					continue;
135
				elif [[ ${x} == opengl || ${x} == dbus || ${x} == qt3support ]]; then
136
				# Make sure the qt-${x} package has been already installed
137
138
					if ! has_version x11-libs/qt-${x}; then
139
						optionalerrormessage="${optionalerrormessage} install the x11-libs/qt-${x} package."
140
						continue;
141
					fi
142
				elif [[ ${x} == ssl ]]; then
143
					if ! has_version x11-libs/qt-core || ! built_with_use x11-libs/qt-core ssl; then
144
						optionalerrormessage="${optionalerrormessage} install the x11-libs/qt-core package with the ssl flag enabled."
145
						continue;
146
					fi
147
				elif [[ ${x} == sqlite3 ]]; then
148
					if ! has_version x11-libs/qt-sql || ! built_with_use x11-libs/qt-sql sqlite; then
149
						optionalerrormessage="${optionalerrormessage} install the x11-libs/qt-sql package with the sqlite flag enabled."
150
						continue;
151
					fi
152
				fi
153
			elif ! built_with_use =x11-libs/qt-4* ${x}; then
154
				optionalflags="${optionalflags} ${x}"
155
			fi
129
	done
156
	done
130
157
158
	if [ "${optionalflags}" != "" ]; then 
159
		optionalerrormessage="${optionalerrormessage} recompile qt4 with \"${optionalflags}\" USE flag(s)"
160
	fi
161
131
	local diemessage=""
162
	local diemessage=""
132
	if [[ ${requiredflags} != "" ]]; then
163
	if [[ ${requiredflags} != "" ]]; then
133
		eerror
164
		eerror
Lines 136-142 Link Here
136
		eerror
167
		eerror
137
		diemessage="(1) recompile qt4 with \"${requiredflags}\" USE flag(s) ; "
168
		diemessage="(1) recompile qt4 with \"${requiredflags}\" USE flag(s) ; "
138
	fi
169
	fi
139
	if [[ ${optionalflags} != "" ]]; then
170
	if [[ ${optionalerrormessage} != "" ]]; then
140
		eerror
171
		eerror
141
		eerror "(2) You are trying to compile ${CATEGORY}/${PN} package with"
172
		eerror "(2) You are trying to compile ${CATEGORY}/${PN} package with"
142
		eerror "USE=\"${optionalflags}\""
173
		eerror "USE=\"${optionalflags}\""
Lines 145-153 Link Here
145
		eerror
176
		eerror
146
		eerror "Possible solutions to this problem are:"
177
		eerror "Possible solutions to this problem are:"
147
		eerror "a) install package ${CATEGORY}/${PN} without \"${optionalflags}\" USE flag(s)"
178
		eerror "a) install package ${CATEGORY}/${PN} without \"${optionalflags}\" USE flag(s)"
148
		eerror "b) re-emerge qt4 with \"${optionalflags}\" USE flag(s)"
179
		eerror "b) ${optionalerrormessage}"
149
		eerror
180
		eerror
150
		diemessage="${diemessage}(2) recompile qt4 with \"${optionalflags}\" USE flag(s) or disable them for ${PN} package\n"
181
		diemessage="${diemessage}(2) ${optionalerrormessage} or disable them for ${PN} package\n"
151
	fi
182
	fi
152
183
153
	[[ ${diemessage} != "" ]] && die "can't emerge ${CATEGORY}/${PN}: ${diemessage}"
184
	[[ ${diemessage} != "" ]] && die "can't emerge ${CATEGORY}/${PN}: ${diemessage}"

Return to bug 229193