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.21.ebuild (-15 / +53 lines)
Lines 41-48 Link Here
41
	http://dev.gentoo.org/~tetromino/distfiles/${PN}/${WINE_GENTOO}.tar.bz2"
41
	http://dev.gentoo.org/~tetromino/distfiles/${PN}/${WINE_GENTOO}.tar.bz2"
42
42
43
LICENSE="LGPL-2.1"
43
LICENSE="LGPL-2.1"
44
SLOT="0"
44
SLOT=${PV}
45
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"
45
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"
46
REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
46
REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
47
	test? ( abi_x86_32 )
47
	test? ( abi_x86_32 )
48
	elibc_glibc? ( threads )
48
	elibc_glibc? ( threads )
Lines 235-240 Link Here
235
	)"
235
	)"
236
236
237
RDEPEND="${COMMON_DEPEND}
237
RDEPEND="${COMMON_DEPEND}
238
	multislot? ( >=app-admin/eselect-wine-0.2
239
		app-emulation/wine-gentoo )
240
	!multislot? ( !<${CATEGORY}/${PF}
241
		!>${CATEGORY}/${PF} )
238
	dos? ( games-emulation/dosbox )
242
	dos? ( games-emulation/dosbox )
239
	perl? ( dev-lang/perl dev-perl/XML-Simple )
243
	perl? ( dev-lang/perl dev-perl/XML-Simple )
240
	samba? ( >=net-fs/samba-3.0.25 )
244
	samba? ( >=net-fs/samba-3.0.25 )
Lines 285-290 Link Here
285
}
289
}
286
290
287
pkg_setup() {
291
pkg_setup() {
292
	if use multislot; then
293
		MY_PREFIX=/usr/lib/wine-${SLOT}
294
		MY_DATADIR=${MY_PREFIX}
295
	else
296
		MY_PREFIX=/usr
297
		MY_DATADIR=${MY_PREFIX}/share
298
	fi
288
	wine_build_environment_check || die
299
	wine_build_environment_check || die
289
}
300
}
290
301
Lines 354-359 Link Here
354
		sed -i '/^MimeType/d' tools/wine.desktop || die #117785
365
		sed -i '/^MimeType/d' tools/wine.desktop || die #117785
355
	fi
366
	fi
356
367
368
	if use multislot; then
369
		sed -e "/^Exec=/s/wine /wine-${SLOT} /" \
370
			-i tools/wine.desktop || die
371
	fi
372
357
	# hi-res default icon, #472990, http://bugs.winehq.org/show_bug.cgi?id=24652
373
	# hi-res default icon, #472990, http://bugs.winehq.org/show_bug.cgi?id=24652
358
	cp "${WORKDIR}"/${WINE_GENTOO}/icons/oic_winlogo.ico dlls/user32/resources/ || die
374
	cp "${WORKDIR}"/${WINE_GENTOO}/icons/oic_winlogo.ico dlls/user32/resources/ || die
359
375
Lines 368-374 Link Here
368
}
384
}
369
385
370
multilib_src_configure() {
386
multilib_src_configure() {
371
	local myconf=(
387
	local myconf=()
388
	if use multislot; then
389
		myconf+=(
390
			--prefix="${MY_PREFIX}"
391
			--datadir="${MY_DATADIR}"
392
			--mandir="${MY_DATADIR}"/man
393
		)
394
	fi
395
	myconf+=(
372
		--sysconfdir=/etc/wine
396
		--sysconfdir=/etc/wine
373
		$(use_with alsa)
397
		$(use_with alsa)
374
		$(use_with capi)
398
		$(use_with capi)
Lines 444-449 Link Here
444
}
468
}
445
469
446
multilib_src_install_all() {
470
multilib_src_install_all() {
471
	# Prefixed installation double-installs libwine
472
	use multislot && rm -rf "${D}"usr/lib{32,64} || die
473
447
	local DOCS=( ANNOUNCE AUTHORS README )
474
	local DOCS=( ANNOUNCE AUTHORS README )
448
	local l
475
	local l
449
	add_locale_docs() {
476
	add_locale_docs() {
Lines 455-498 Link Here
455
	einstalldocs
482
	einstalldocs
456
	prune_libtool_files --all
483
	prune_libtool_files --all
457
484
458
	emake -C "../${WINE_GENTOO}" install DESTDIR="${D}" EPREFIX="${EPREFIX}"
485
	# Moved to wine-gentoo for multislot
486
	if ! use multislot; then
487
		emake -C "../${WINE_GENTOO}" install DESTDIR="${D}" EPREFIX="${EPREFIX}"
488
	fi
459
	if use gecko ; then
489
	if use gecko ; then
460
		insinto /usr/share/wine/gecko
490
		insinto "${MY_DATADIR}"/wine/gecko
461
		use abi_x86_32 && doins "${DISTDIR}"/wine_gecko-${GV}-x86.msi
491
		use abi_x86_32 && doins "${DISTDIR}"/wine_gecko-${GV}-x86.msi
462
		use abi_x86_64 && doins "${DISTDIR}"/wine_gecko-${GV}-x86_64.msi
492
		use abi_x86_64 && doins "${DISTDIR}"/wine_gecko-${GV}-x86_64.msi
463
	fi
493
	fi
464
	if use mono ; then
494
	if use mono ; then
465
		insinto /usr/share/wine/mono
495
		insinto "${MY_DATADIR}"/wine/mono
466
		doins "${DISTDIR}"/wine-mono-${MV}.msi
496
		doins "${DISTDIR}"/wine-mono-${MV}.msi
467
	fi
497
	fi
468
	if ! use perl ; then
498
	if ! use perl ; then
469
		rm "${D}"usr/bin/{wine{dump,maker},function_grep.pl} "${D}"usr/share/man/man1/wine{dump,maker}.1 || die
499
		rm "${D%/}${MY_PREFIX}"/bin/{wine{dump,maker},function_grep.pl} "${D%/}${MY_DATADIR}"/man/man1/wine{dump,maker}.1 || die
470
	fi
500
	fi
471
501
472
	use abi_x86_32 && pax-mark psmr "${D}"usr/bin/wine{,-preloader} #255055
502
	use abi_x86_32 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine{,-preloader} #255055
473
	use abi_x86_64 && pax-mark psmr "${D}"usr/bin/wine64{,-preloader}
503
	use abi_x86_64 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine64{,-preloader}
474
504
475
	if use abi_x86_64 && ! use abi_x86_32; then
505
	if use abi_x86_64 && ! use abi_x86_32; then
476
		dosym /usr/bin/wine{64,} # 404331
506
		dosym "${MY_PREFIX}"/bin/wine{64,} # 404331
477
		dosym /usr/bin/wine{64,}-preloader
507
		dosym "${MY_PREFIX}"/bin/wine{64,}-preloader
508
	fi
509
510
	if use multislot; then
511
		for b in "${D%/}${MY_PREFIX}"/bin/*; do
512
			make_wrapper ${b##*/}-${SLOT} "${MY_PREFIX}"/bin/${b##*/}
513
		done
478
	fi
514
	fi
479
515
480
	# respect LINGUAS when installing man pages, #469418
516
	# respect LINGUAS when installing man pages, #469418
481
	for l in de fr pl; do
517
	for l in de fr pl; do
482
		use linguas_${l} || rm -r "${D}"usr/share/man/${l}*
518
		use linguas_${l} || rm -r "${D%/}${MY_DATADIR}"/man/${l}*
483
	done
519
	done
484
}
520
}
485
521
486
pkg_preinst() {
522
pkg_preinst() {
487
	gnome2_icon_savelist
523
	! use multislot && gnome2_icon_savelist
488
}
524
}
489
525
490
pkg_postinst() {
526
pkg_postinst() {
491
	gnome2_icon_cache_update
527
	! use multislot && gnome2_icon_cache_update
492
	fdo-mime_desktop_database_update
528
	fdo-mime_desktop_database_update
529
	use multislot && eselect wine update --if-unset
493
}
530
}
494
531
495
pkg_postrm() {
532
pkg_postrm() {
496
	gnome2_icon_cache_update
533
	! use multislot && gnome2_icon_cache_update
497
	fdo-mime_desktop_database_update
534
	fdo-mime_desktop_database_update
535
	use multislot && eselect wine update --if-unset
498
}
536
}

Return to bug 310611