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

Collapse All | Expand All

(-)qt4.eclass.orig (-3 / +35 lines)
Lines 54-64 Link Here
54
}
54
}
55
55
56
qt4_pkg_setup() {
56
qt4_pkg_setup() {
57
	local requiredflags=""
57
	for x in ${QT4_BUILT_WITH_USE_CHECK}; do
58
	for x in ${QT4_BUILT_WITH_USE_CHECK}; do
58
		if ! built_with_use =x11-libs/qt-4* $x; then
59
		if ! built_with_use =x11-libs/qt-4* $x; then
59
			die "This package requires Qt4 to be built with the '${x}' use flag."
60
			requiredflags="${requiredflags} $x"
60
		fi
61
		fi
61
	done
62
	done
63
64
	local optionalflags=""
65
	for x in ${QT4_OPTIONAL_BUILT_WITH_USE_CHECK}; do
66
		if ! built_with_use =x11-libs/qt-4* $x; then
67
			optionalflags="${optionalflags} $x"
68
		fi
69
	done
70
71
	local diemessage=""
72
	if [[ ${requiredflags} != "" ]]; then
73
		eerror
74
		eerror "(1) In order to compile ${PN} package first you need to build qt4"
75
		eerror "with USE=\"${requiredflags}\" flag(s)"
76
		eerror
77
		diemessage="(1) recompile qt4 with${requiredflags} USE flag(s) ; "
78
	fi
79
	if [[ ${optionalflags} != "" ]]; then
80
		eerror
81
		eerror "(2) You are trying to compile ${PN} package with"
82
		eerror "USE=\"${optionalflags}\""
83
		eerror "while qt4 is built without this particular flag(s): it will"
84
		eerror "not work."
85
		eerror
86
		eerror "Possible solutions to this problem are:"
87
		eerror "a) install package ${PN} without ${optionalflags}USE flag(s)"
88
		eerror "b) re-emerge qt4 with ${optionalflags} USE flag(s)"
89
		eerror
90
		diemessage="${diemessage}(2) recompile qt4 with${optionalflags} USE flag(s) or disable them for ${PN} package\n"
91
	fi
92
93
	[[ ${diemessage} != "" ]] && die "can't emerge ${PN}: ${diemessage}"
62
}
94
}
63
95
64
eqmake4() {
96
eqmake4() {
Lines 86-94 Link Here
86
118
87
	# as a workaround for broken qmake, put everything into file
119
	# as a workaround for broken qmake, put everything into file
88
	if has debug ${IUSE} && use debug; then
120
	if has debug ${IUSE} && use debug; then
89
		echo -e "$CONFIG -= release\nCONFIG += no_fixpath debug" >> ${projprofile}
121
		echo -e "\nCONFIG -= release\nCONFIG += no_fixpath debug" >> ${projprofile}
90
	else
122
	else
91
		echo -e "$CONFIG -= debug\nCONFIG += no_fixpath release" >> ${projprofile}
123
		echo -e "\nCONFIG -= debug\nCONFIG += no_fixpath release" >> ${projprofile}
92
	fi
124
	fi
93
125
94
	/usr/bin/qmake ${projprofile} \
126
	/usr/bin/qmake ${projprofile} \

Return to bug 201772