Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 384422 Details for
Bug 310611
app-emulation/wine would be nice to be slotted
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
wine-1.7.21.ebuild USE=multislot patch
file_310611.txt (text/plain), 4.03 KB, created by
eroen
on 2014-09-08 22:01:45 UTC
(
hide
)
Description:
wine-1.7.21.ebuild USE=multislot patch
Filename:
MIME Type:
Creator:
eroen
Created:
2014-09-08 22:01:45 UTC
Size:
4.03 KB
patch
obsolete
>--- a/app-emulation/wine/wine-1.7.21.ebuild >+++ b/app-emulation/wine/wine-1.7.21-r1.ebuild >@@ -41,8 +41,8 @@ > http://dev.gentoo.org/~tetromino/distfiles/${PN}/${WINE_GENTOO}.tar.bz2" > > LICENSE="LGPL-2.1" >-SLOT="0" >-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" >+SLOT=${PV} >+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" > REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 ) > test? ( abi_x86_32 ) > elibc_glibc? ( threads ) >@@ -235,6 +235,9 @@ > )" > > RDEPEND="${COMMON_DEPEND} >+ multislot? ( app-admin/eselect-wine ) >+ !multislot? ( !<${CATEGORY}/${PF} >+ !>${CATEGORY}/${PF} ) > dos? ( games-emulation/dosbox ) > perl? ( dev-lang/perl dev-perl/XML-Simple ) > samba? ( >=net-fs/samba-3.0.25 ) >@@ -285,6 +288,13 @@ > } > > pkg_setup() { >+ if use multislot; then >+ MY_PREFIX=/usr/lib/wine-${SLOT} >+ MY_DATADIR=${MY_PREFIX} >+ else >+ MY_PREFIX=/usr >+ MY_DATADIR=${MY_PREFIX}/share >+ fi > wine_build_environment_check || die > } > >@@ -354,6 +364,11 @@ > sed -i '/^MimeType/d' tools/wine.desktop || die #117785 > fi > >+ if use multislot; then >+ sed -e "/^Exec=/s/wine /wine-${SLOT} /" \ >+ -i tools/wine.desktop || die >+ fi >+ > # hi-res default icon, #472990, http://bugs.winehq.org/show_bug.cgi?id=24652 > cp "${WORKDIR}"/${WINE_GENTOO}/icons/oic_winlogo.ico dlls/user32/resources/ || die > >@@ -368,7 +383,15 @@ > } > > multilib_src_configure() { >- local myconf=( >+ local myconf=() >+ if use multislot; then >+ myconf+=( >+ --prefix="${MY_PREFIX}" >+ --datadir="${MY_DATADIR}" >+ --mandir="${MY_DATADIR}"/man >+ ) >+ fi >+ myconf+=( > --sysconfdir=/etc/wine > $(use_with alsa) > $(use_with capi) >@@ -455,31 +478,40 @@ > einstalldocs > prune_libtool_files --all > >- emake -C "../${WINE_GENTOO}" install DESTDIR="${D}" EPREFIX="${EPREFIX}" >+ # Broken for slotted install >+ if ! use multislot; then >+ emake -C "../${WINE_GENTOO}" install DESTDIR="${D}" EPREFIX="${EPREFIX}" >+ fi > if use gecko ; then >- insinto /usr/share/wine/gecko >+ insinto "${MY_DATADIR}"/wine/gecko > use abi_x86_32 && doins "${DISTDIR}"/wine_gecko-${GV}-x86.msi > use abi_x86_64 && doins "${DISTDIR}"/wine_gecko-${GV}-x86_64.msi > fi > if use mono ; then >- insinto /usr/share/wine/mono >+ insinto "${MY_DATADIR}"/wine/mono > doins "${DISTDIR}"/wine-mono-${MV}.msi > fi > if ! use perl ; then >- rm "${D}"usr/bin/{wine{dump,maker},function_grep.pl} "${D}"usr/share/man/man1/wine{dump,maker}.1 || die >+ rm "${D%/}${MY_PREFIX}"/bin/{wine{dump,maker},function_grep.pl} "${D%/}${MY_DATADIR}"/man/man1/wine{dump,maker}.1 || die > fi > >- use abi_x86_32 && pax-mark psmr "${D}"usr/bin/wine{,-preloader} #255055 >- use abi_x86_64 && pax-mark psmr "${D}"usr/bin/wine64{,-preloader} >+ use abi_x86_32 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine{,-preloader} #255055 >+ use abi_x86_64 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine64{,-preloader} > > if use abi_x86_64 && ! use abi_x86_32; then >- dosym /usr/bin/wine{64,} # 404331 >- dosym /usr/bin/wine{64,}-preloader >+ dosym "${MY_PREFIX}"/bin/wine{64,} # 404331 >+ dosym "${MY_PREFIX}"/bin/wine{64,}-preloader >+ fi >+ >+ if use multislot; then >+ for b in "${D%/}${MY_PREFIX}"/bin/*; do >+ make_wrapper ${b##*/}-${SLOT} "${MY_PREFIX}"/bin/${b##*/} >+ done > fi > > # respect LINGUAS when installing man pages, #469418 > for l in de fr pl; do >- use linguas_${l} || rm -r "${D}"usr/share/man/${l}* >+ use linguas_${l} || rm -r "${D%/}${MY_DATADIR}"/man/${l}* > done > } >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 310611
:
384422
|
384424
|
384432
|
384582
|
384584
|
384586
|
384588
|
386100