Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 511184 - app-emulation/wine: ebuild switch to multilib-minimal
Summary: app-emulation/wine: ebuild switch to multilib-minimal
Status: RESOLVED FIXED
Alias: None
Product: Gentoo Linux
Classification: Unclassified
Component: Current packages (show other bugs)
Hardware: All Linux
: Normal normal (vote)
Assignee: Wine Maintainers
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2014-05-24 09:45 UTC by Michał Górny
Modified: 2014-06-16 12:09 UTC (History)
1 user (show)

See Also:
Package list:
Runtime testing required: ---


Attachments
Ebuild diff (wine-1.7.19-r1.ebuild.diff,4.79 KB, patch)
2014-05-24 09:45 UTC, Michał Górny
Details | Diff
Ebuil diff, partial autotools-utils (wine-1.7.19-r1.ebuild.diff,4.58 KB, patch)
2014-05-24 21:57 UTC, Michał Górny
Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Michał Górny archtester Gentoo Infrastructure gentoo-dev Security 2014-05-24 09:45:45 UTC
Created attachment 377560 [details, diff]
Ebuild diff

Please review those changes to the ebuild. It should be somewhat simpler after the change, plus more flexible. I've killed use of autotools-multilib/-utils entirely since this eclass is pretty much like base.eclass now :). I've also fixed tests to be executed only when 32bit is enabled.

If it's fine, please either ping me or apply it. Preferably to 9999 now, and to release on next bump.
Comment 1 Alexandre Rostovtsev (RETIRED) gentoo-dev 2014-05-24 16:58:59 UTC
I would prefer to continue using autotools-utils_src_prepare so that if we ever get a wine ebuild that doesn't need to run eautoreconf, but a user patch modifies configure.ac (user patching of wine is quite common), eautoreconf will still be run.

In fact, for gnome, it would also be good if autotools-utils_src_prepare could be decoupled from the rest of autotools-*.eclass - we could then call it in gnome2_src_prepare :)
Comment 2 Julian Ospald 2014-05-24 17:38:47 UTC
The automagic autoreconf logic in autotools-utils_src_prepare should be moved to eutils or autotools anyway.

Besides that, you can do it yourself in the ebuild. It's a simple checksum check.
Comment 3 Alexandre Rostovtsev (RETIRED) gentoo-dev 2014-05-24 18:04:02 UTC
(In reply to Julian Ospald (hasufell) from comment #2)
> Besides that, you can do it yourself in the ebuild. It's a simple checksum
> check.

The wine ebuild is already too large; if someone implemented the functionality in an eclass, I don't want to add another 8 lines for checksum calculation to every wine ebuild version (we have to keep lots of historical versions due to user request), and then to fix it in all the versions if I got the logic wrong.
Comment 4 Michał Górny archtester Gentoo Infrastructure gentoo-dev Security 2014-05-24 21:57:16 UTC
Created attachment 377580 [details, diff]
Ebuil diff, partial autotools-utils

Ok, here's my another proposal then. This one uses autotools-utils + multilib-minimal.

I didn't use autotools-multilib because it's just a wrapper on top of the above two, and in this case it wouldn't make any real difference except for adding another layer of indirection.
Comment 5 Alexandre Rostovtsev (RETIRED) gentoo-dev 2014-05-24 22:26:11 UTC
(In reply to Michał Górny from comment #4)
> Created attachment 377580 [details, diff] [details, diff]
> Ebuil diff, partial autotools-utils
> 
> Ok, here's my another proposal then. This one uses autotools-utils +
> multilib-minimal.
> 
> I didn't use autotools-multilib because it's just a wrapper on top of the
> above two, and in this case it wouldn't make any real difference except for
> adding another layer of indirection.

Thanks, I will probably apply this next weekend when 1.7.20 will be released.
Comment 6 Michał Górny archtester Gentoo Infrastructure gentoo-dev Security 2014-06-12 14:26:57 UTC
FYI: =samba-3* is multilib now, so while at it you may also enable netapi for 32-bit.
Comment 7 Alexandre Rostovtsev (RETIRED) gentoo-dev 2014-06-16 12:09:20 UTC
+*wine-1.7.20 (16 Jun 2014)
+
+  16 Jun 2014; Alexandre Rostovtsev <tetromino@gentoo.org> +wine-1.7.20.ebuild,
+  wine-9999.ebuild:
+  Version bump, see http://www.winehq.org/announce/1.7.20 for the announcement.
+  Use samba with ABI_X86="32 64" for win32 netapi support; note that there is
+  no emul-linux-x86-* alternative for netapi. Switch to multilib-minimal.eclass
+  (bugs #494394 and #511184, thanks to Michał Górny). Enable experimental
+  pthreads patch from winepulse patchset, otherwise gstreamer support is simply
+  broken with any version of dev-libs/glib we have in portage.