|
Line
Link Here
|
| 0 |
-- a/app-emulation/wine/wine-1.7.21.ebuild |
0 |
++ b/app-emulation/wine/wine-1.7.21-r1.ebuild |
|
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 ) |
| 239 |
!multislot? ( !<${CATEGORY}/${PF} |
| 240 |
!>${CATEGORY}/${PF} ) |
| 238 |
dos? ( games-emulation/dosbox ) |
241 |
dos? ( games-emulation/dosbox ) |
| 239 |
perl? ( dev-lang/perl dev-perl/XML-Simple ) |
242 |
perl? ( dev-lang/perl dev-perl/XML-Simple ) |
| 240 |
samba? ( >=net-fs/samba-3.0.25 ) |
243 |
samba? ( >=net-fs/samba-3.0.25 ) |
|
Lines 285-290
Link Here
|
| 285 |
} |
288 |
} |
| 286 |
|
289 |
|
| 287 |
pkg_setup() { |
290 |
pkg_setup() { |
|
|
291 |
if use multislot; then |
| 292 |
MY_PREFIX=/usr/lib/wine-${SLOT} |
| 293 |
MY_DATADIR=${MY_PREFIX} |
| 294 |
else |
| 295 |
MY_PREFIX=/usr |
| 296 |
MY_DATADIR=${MY_PREFIX}/share |
| 297 |
fi |
| 288 |
wine_build_environment_check || die |
298 |
wine_build_environment_check || die |
| 289 |
} |
299 |
} |
| 290 |
|
300 |
|
|
Lines 354-359
Link Here
|
| 354 |
sed -i '/^MimeType/d' tools/wine.desktop || die #117785 |
364 |
sed -i '/^MimeType/d' tools/wine.desktop || die #117785 |
| 355 |
fi |
365 |
fi |
| 356 |
|
366 |
|
|
|
367 |
if use multislot; then |
| 368 |
sed -e "/^Exec=/s/wine /wine-${SLOT} /" \ |
| 369 |
-i tools/wine.desktop || die |
| 370 |
fi |
| 371 |
|
| 357 |
# hi-res default icon, #472990, http://bugs.winehq.org/show_bug.cgi?id=24652 |
372 |
# 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 |
373 |
cp "${WORKDIR}"/${WINE_GENTOO}/icons/oic_winlogo.ico dlls/user32/resources/ || die |
| 359 |
|
374 |
|
|
Lines 368-374
Link Here
|
| 368 |
} |
383 |
} |
| 369 |
|
384 |
|
| 370 |
multilib_src_configure() { |
385 |
multilib_src_configure() { |
| 371 |
local myconf=( |
386 |
local myconf=() |
|
|
387 |
if use multislot; then |
| 388 |
myconf+=( |
| 389 |
--prefix="${MY_PREFIX}" |
| 390 |
--datadir="${MY_DATADIR}" |
| 391 |
--mandir="${MY_DATADIR}"/man |
| 392 |
) |
| 393 |
fi |
| 394 |
myconf+=( |
| 372 |
--sysconfdir=/etc/wine |
395 |
--sysconfdir=/etc/wine |
| 373 |
$(use_with alsa) |
396 |
$(use_with alsa) |
| 374 |
$(use_with capi) |
397 |
$(use_with capi) |
|
Lines 455-485
Link Here
|
| 455 |
einstalldocs |
478 |
einstalldocs |
| 456 |
prune_libtool_files --all |
479 |
prune_libtool_files --all |
| 457 |
|
480 |
|
| 458 |
emake -C "../${WINE_GENTOO}" install DESTDIR="${D}" EPREFIX="${EPREFIX}" |
481 |
# Broken for slotted install |
|
|
482 |
if ! use multislot; then |
| 483 |
emake -C "../${WINE_GENTOO}" install DESTDIR="${D}" EPREFIX="${EPREFIX}" |
| 484 |
fi |
| 459 |
if use gecko ; then |
485 |
if use gecko ; then |
| 460 |
insinto /usr/share/wine/gecko |
486 |
insinto "${MY_DATADIR}"/wine/gecko |
| 461 |
use abi_x86_32 && doins "${DISTDIR}"/wine_gecko-${GV}-x86.msi |
487 |
use abi_x86_32 && doins "${DISTDIR}"/wine_gecko-${GV}-x86.msi |
| 462 |
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 |
| 463 |
fi |
489 |
fi |
| 464 |
if use mono ; then |
490 |
if use mono ; then |
| 465 |
insinto /usr/share/wine/mono |
491 |
insinto "${MY_DATADIR}"/wine/mono |
| 466 |
doins "${DISTDIR}"/wine-mono-${MV}.msi |
492 |
doins "${DISTDIR}"/wine-mono-${MV}.msi |
| 467 |
fi |
493 |
fi |
| 468 |
if ! use perl ; then |
494 |
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 |
495 |
rm "${D%/}${MY_PREFIX}"/bin/{wine{dump,maker},function_grep.pl} "${D%/}${MY_DATADIR}"/man/man1/wine{dump,maker}.1 || die |
| 470 |
fi |
496 |
fi |
| 471 |
|
497 |
|
| 472 |
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 |
| 473 |
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} |
| 474 |
|
500 |
|
| 475 |
if use abi_x86_64 && ! use abi_x86_32; then |
501 |
if use abi_x86_64 && ! use abi_x86_32; then |
| 476 |
dosym /usr/bin/wine{64,} # 404331 |
502 |
dosym "${MY_PREFIX}"/bin/wine{64,} # 404331 |
| 477 |
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 |
| 478 |
fi |
510 |
fi |
| 479 |
|
511 |
|
| 480 |
# respect LINGUAS when installing man pages, #469418 |
512 |
# respect LINGUAS when installing man pages, #469418 |
| 481 |
for l in de fr pl; do |
513 |
for l in de fr pl; do |
| 482 |
use linguas_${l} || rm -r "${D}"usr/share/man/${l}* |
514 |
use linguas_${l} || rm -r "${D%/}${MY_DATADIR}"/man/${l}* |
| 483 |
done |
515 |
done |
| 484 |
} |
516 |
} |
| 485 |
|
517 |
|
