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

Collapse All | Expand All

(-)/usr/portage/app-emulation/wine/wine-1.7.28.ebuild (-15 / +50 lines)
Lines 39-46 Link Here
39
	http://dev.gentoo.org/~tetromino/distfiles/${PN}/${WINE_GENTOO}.tar.bz2"
39
	http://dev.gentoo.org/~tetromino/distfiles/${PN}/${WINE_GENTOO}.tar.bz2"
40
40
41
LICENSE="LGPL-2.1"
41
LICENSE="LGPL-2.1"
42
SLOT="0"
42
SLOT=${PV}
43
IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +fontconfig +gecko gphoto2 gsm gstreamer +jpeg lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pipelight +png +prelink pulseaudio +realtime +run-exes samba scanner selinux +ssl test +threads +truetype +udisks v4l +X xcomposite xinerama +xml"
43
IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +fontconfig +gecko gphoto2 gsm gstreamer +jpeg lcms ldap +mono mp3 +multislot ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pipelight +png +prelink pulseaudio +realtime +run-exes samba scanner selinux +ssl test +threads +truetype +udisks v4l +X xcomposite xinerama +xml"
44
REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
44
REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
45
	test? ( abi_x86_32 )
45
	test? ( abi_x86_32 )
46
	elibc_glibc? ( threads )
46
	elibc_glibc? ( threads )
Lines 232-237 Link Here
232
	)"
232
	)"
233
233
234
RDEPEND="${COMMON_DEPEND}
234
RDEPEND="${COMMON_DEPEND}
235
	multislot? ( >=app-admin/eselect-wine-0.2
236
		app-emulation/wine-gentoo )
237
	!multislot? ( !<${CATEGORY}/${PF}
238
		!>${CATEGORY}/${PF} )
235
	dos? ( games-emulation/dosbox )
239
	dos? ( games-emulation/dosbox )
236
	perl? ( dev-lang/perl dev-perl/XML-Simple )
240
	perl? ( dev-lang/perl dev-perl/XML-Simple )
237
	samba? ( >=net-fs/samba-3.0.25 )
241
	samba? ( >=net-fs/samba-3.0.25 )
Lines 282-287 Link Here
282
}
286
}
283
287
284
pkg_setup() {
288
pkg_setup() {
289
	if use multislot; then
290
		MY_PREFIX=/usr/lib/wine-${SLOT}
291
		MY_DATADIR=${MY_PREFIX}
292
	else
293
		MY_PREFIX=/usr
294
		MY_DATADIR=${MY_PREFIX}/share
295
	fi
285
	wine_build_environment_check || die
296
	wine_build_environment_check || die
286
}
297
}
287
298
Lines 352-357 Link Here
352
		sed -i '/^MimeType/d' tools/wine.desktop || die #117785
363
		sed -i '/^MimeType/d' tools/wine.desktop || die #117785
353
	fi
364
	fi
354
365
366
	if use multislot; then
367
		sed -e "/^Exec=/s/wine /wine-${SLOT} /" \
368
			-i tools/wine.desktop || die
369
	fi
370
355
	# hi-res default icon, #472990, http://bugs.winehq.org/show_bug.cgi?id=24652
371
	# hi-res default icon, #472990, http://bugs.winehq.org/show_bug.cgi?id=24652
356
	cp "${WORKDIR}"/${WINE_GENTOO}/icons/oic_winlogo.ico dlls/user32/resources/ || die
372
	cp "${WORKDIR}"/${WINE_GENTOO}/icons/oic_winlogo.ico dlls/user32/resources/ || die
357
373
Lines 366-372 Link Here
366
}
382
}
367
383
368
multilib_src_configure() {
384
multilib_src_configure() {
369
	local myconf=(
385
	local myconf=()
386
	if use multislot; then
387
		myconf+=(
388
			--prefix="${MY_PREFIX}"
389
			--datadir="${MY_DATADIR}"
390
			--mandir="${MY_DATADIR}"/man
391
		)
392
	fi
393
	myconf+=(
370
		--sysconfdir=/etc/wine
394
		--sysconfdir=/etc/wine
371
		$(use_with alsa)
395
		$(use_with alsa)
372
		$(use_with capi)
396
		$(use_with capi)
Lines 454-497 Link Here
454
	einstalldocs
478
	einstalldocs
455
	prune_libtool_files --all
479
	prune_libtool_files --all
456
480
457
	emake -C "../${WINE_GENTOO}" install DESTDIR="${D}" EPREFIX="${EPREFIX}"
481
	# Moved to wine-gentoo for multislot
482
	if ! use multislot; then
483
		emake -C "../${WINE_GENTOO}" install DESTDIR="${D}" EPREFIX="${EPREFIX}"
484
	fi
458
	if use gecko ; then
485
	if use gecko ; then
459
		insinto /usr/share/wine/gecko
486
		insinto "${MY_DATADIR}"/wine/gecko
460
		use abi_x86_32 && doins "${DISTDIR}"/wine_gecko-${GV}-x86.msi
487
		use abi_x86_32 && doins "${DISTDIR}"/wine_gecko-${GV}-x86.msi
461
		use abi_x86_64 && doins "${DISTDIR}"/wine_gecko-${GV}-x86_64.msi
488
		use abi_x86_64 && doins "${DISTDIR}"/wine_gecko-${GV}-x86_64.msi
462
	fi
489
	fi
463
	if use mono ; then
490
	if use mono ; then
464
		insinto /usr/share/wine/mono
491
		insinto "${MY_DATADIR}"/wine/mono
465
		doins "${DISTDIR}"/wine-mono-${MV}.msi
492
		doins "${DISTDIR}"/wine-mono-${MV}.msi
466
	fi
493
	fi
467
	if ! use perl ; then
494
	if ! use perl ; then
468
		rm "${D}"usr/bin/{wine{dump,maker},function_grep.pl} "${D}"usr/share/man/man1/wine{dump,maker}.1 || die
495
		rm "${D%/}${MY_PREFIX}"/bin/{wine{dump,maker},function_grep.pl} "${D%/}${MY_DATADIR}"/man/man1/wine{dump,maker}.1 || die
469
	fi
496
	fi
470
497
471
	use abi_x86_32 && pax-mark psmr "${D}"usr/bin/wine{,-preloader} #255055
498
	use abi_x86_32 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine{,-preloader} #255055
472
	use abi_x86_64 && pax-mark psmr "${D}"usr/bin/wine64{,-preloader}
499
	use abi_x86_64 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine64{,-preloader}
473
500
474
	if use abi_x86_64 && ! use abi_x86_32; then
501
	if use abi_x86_64 && ! use abi_x86_32; then
475
		dosym /usr/bin/wine{64,} # 404331
502
		dosym "${MY_PREFIX}"/bin/wine{64,} # 404331
476
		dosym /usr/bin/wine{64,}-preloader
503
		dosym "${MY_PREFIX}"/bin/wine{64,}-preloader
504
	fi
505
506
	if use multislot; then
507
		for b in "${D%/}${MY_PREFIX}"/bin/*; do
508
			make_wrapper ${b##*/}-${SLOT} "${MY_PREFIX}"/bin/${b##*/}
509
		done
477
	fi
510
	fi
478
511
479
	# respect LINGUAS when installing man pages, #469418
512
	# respect LINGUAS when installing man pages, #469418
480
	for l in de fr pl; do
513
	for l in de fr pl; do
481
		use linguas_${l} || rm -r "${D}"usr/share/man/${l}*
514
		use linguas_${l} || rm -r "${D%/}${MY_DATADIR}"/man/${l}*
482
	done
515
	done
483
}
516
}
484
517
485
pkg_preinst() {
518
pkg_preinst() {
486
	gnome2_icon_savelist
519
	! use multislot && gnome2_icon_savelist
487
}
520
}
488
521
489
pkg_postinst() {
522
pkg_postinst() {
490
	gnome2_icon_cache_update
523
	! use multislot && gnome2_icon_cache_update
491
	fdo-mime_desktop_database_update
524
	fdo-mime_desktop_database_update
525
	use multislot && eselect wine update --if-unset
492
}
526
}
493
527
494
pkg_postrm() {
528
pkg_postrm() {
495
	gnome2_icon_cache_update
529
	! use multislot && gnome2_icon_cache_update
496
	fdo-mime_desktop_database_update
530
	fdo-mime_desktop_database_update
531
	use multislot && eselect wine update --if-unset
497
}
532
}

Return to bug 310611