Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 304077
Collapse All | Expand All

(-)kde4-base.eclass.orig (-2 / +9 lines)
Lines 233-239 Link Here
233
233
234
# KDE dependencies
234
# KDE dependencies
235
kdecommondepend="
235
kdecommondepend="
236
	dev-lang/perl
237
	>=x11-libs/qt-core-${QT_MINIMAL}:4[qt3support,ssl]
236
	>=x11-libs/qt-core-${QT_MINIMAL}:4[qt3support,ssl]
238
	>=x11-libs/qt-gui-${QT_MINIMAL}:4[accessibility,dbus]
237
	>=x11-libs/qt-gui-${QT_MINIMAL}:4[accessibility,dbus]
239
	>=x11-libs/qt-qt3support-${QT_MINIMAL}:4[accessibility,kde]
238
	>=x11-libs/qt-qt3support-${QT_MINIMAL}:4[accessibility,kde]
Lines 247-252 Link Here
247
		x11-libs/libXxf86vm
246
		x11-libs/libXxf86vm
248
	)
247
	)
249
"
248
"
249
#perl is not needed on host (+ difficult crosscompilation)
250
tc-is-cross-compiler || kdecommondepend="$kdecommondepend dev-lang/perl"
251
250
if [[ ${PN} != kdelibs ]]; then
252
if [[ ${PN} != kdelibs ]]; then
251
	if [[ ${KDEBASE} = kde-base ]]; then
253
	if [[ ${KDEBASE} = kde-base ]]; then
252
		kdecommondepend+=" $(add_kdebase_dep kdelibs)"
254
		kdecommondepend+=" $(add_kdebase_dep kdelibs)"
Lines 578-584 Link Here
578
	[[ ${PN} = kdelibs ]] && cmakeargs+=(-DKDE_DISTRIBUTION_TEXT=Gentoo)
580
	[[ ${PN} = kdelibs ]] && cmakeargs+=(-DKDE_DISTRIBUTION_TEXT=Gentoo)
579
581
580
	# Here we set the install prefix
582
	# Here we set the install prefix
581
	cmakeargs+=(-DCMAKE_INSTALL_PREFIX="${EPREFIX}${PREFIX}")
583
	tc-is-cross-compiler || cmakeargs+=(-DCMAKE_INSTALL_PREFIX="${EPREFIX}${PREFIX}")
582
584
583
	# Use colors
585
	# Use colors
584
	QTEST_COLORED=1
586
	QTEST_COLORED=1
Lines 601-606 Link Here
601
		cmakeargs+=(-DCMAKE_SYSTEM_PREFIX_PATH="${EKDEDIR}")
603
		cmakeargs+=(-DCMAKE_SYSTEM_PREFIX_PATH="${EKDEDIR}")
602
	fi
604
	fi
603
605
606
	#qmake -query QT_INSTALL_LIBS unavailable when cross-compiling
607
	tc-is-cross-compiler && cmakeargs+=(-DQT_LIBRARY_DIR=${ROOT}/usr/lib/qt4)
608
	#kde-config -path data unavailable when cross-compiling
609
	tc-is-cross-compiler && cmakeargs+=(-DKDE4_DATA_DIR=${ROOT}/usr/share/apps/)
610
604
	# Handle kdeprefix in application itself
611
	# Handle kdeprefix in application itself
605
	if ! has kdeprefix ${IUSE//+} || ! use kdeprefix; then
612
	if ! has kdeprefix ${IUSE//+} || ! use kdeprefix; then
606
		# If prefix is /usr, sysconf needs to be /etc, not /usr/etc
613
		# If prefix is /usr, sysconf needs to be /etc, not /usr/etc

Return to bug 304077