commit:     b7f7c3e9a5fac116dd9be0a6dbe1646da1cffc6c
Author:     NP-Hardass <NP-Hardass <AT> gentoo <DOT> org>
AuthorDate: Wed May 31 23:36:16 2017 +0000
Commit:     NP Hardass <np-hardass <AT> gentoo <DOT> org>
CommitDate: Thu Jun  1 01:19:06 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b7f7c3e9

app-emulation/wine-any: Bump to 2.8

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 app-emulation/wine-any/Manifest            |   3 +
 app-emulation/wine-any/wine-any-2.8.ebuild | 615 +++++++++++++++++++++++++++++
 2 files changed, 618 insertions(+)

diff --git a/app-emulation/wine-any/Manifest b/app-emulation/wine-any/Manifest
index 193dfe702e1..7d3891ad495 100644
--- a/app-emulation/wine-any/Manifest
+++ b/app-emulation/wine-any/Manifest
@@ -6,6 +6,7 @@ DIST wine-2.4.tar.xz 18953748 SHA256 
87b5df07e4781fecce2f92415a4717208ea253a20a0
 DIST wine-2.5.tar.xz 18993176 SHA256 
13f92b7ab483323aaabbc6519851e688ad4372ea30569961c831d40d6d3bccd2 SHA512 
7b6faf6d8aa3d41465ad93ebae055581136f736c7eb8b4c61682e5a05589c83a0ff2c85e0f9abbca016f31b6f1c1435617c4994f1913f715a8707ebee3f28467
 WHIRLPOOL 
5acd2ac65df5dee1c860ddca72b8df8e021a0b95a3a1870d15468ce4591d569fa15bf8a0a6d341bcd3a624d13d0affe5b0263e67f9dfcbbf3ae7b59218dcded9
 DIST wine-2.6.tar.xz 19023352 SHA256 
e6ff64758f437647e99a36c1275e41adf54f0432907172d3bba22b070a97aac0 SHA512 
2aa55413ac090e011725566d004e42ee46323cd4c6961b9faa63e3de422ba60bb657bf224a4d7e8aa712a8e26e11977d07acb7c088ffeef8c37310e8cc698970
 WHIRLPOOL 
82e6a06cc342c7d6eace64a97bae10cc39c120c5776170b059700542b8b6fef56be9a697f05b3bc21ae82621f4bf50f3ab478311c9a3a55d86ed7c0a009766b0
 DIST wine-2.7.tar.xz 19101108 SHA256 
e55a43088e313c45f7ab49272b7cb441c06f5659fb4220b2325dc060db0ee14c SHA512 
1e61b9a4aa1f5f42fb27d11d5254a9ba90f348ad9c4d1ddd4b5da47cd7de638290a20accf7447db9c0e4ced4c2144497cdf5fc906a5eac60e923dabb61f65d3a
 WHIRLPOOL 
133426a0313facc856eebad3d16d199948b780ce4c4561e5784845c119fe462b8942ed86fa5e823e729a997d704bd3c70f44a64ce3eef965b4f3eb92587dfa4d
+DIST wine-2.8.tar.xz 19120740 SHA256 
83e9607af66d86020dc27a368ebba28fa7e8ffecfdf8f149da06b3531ac3e579 SHA512 
4d0b167b1e5add31ed0ed05b328d16fc13cd268285c03a9100e7ddc53864aa07f6b216a555ef0c2e51dee550e3f4abf0c7c20db2cbca177bb38e8c3e11f05b97
 WHIRLPOOL 
568cf46caf7322eb5e26b364bd15f9e80c41a65340952a1ee0fa80514bbee3c5adfa72af40809a978a5d4202f5e8d3da3e4581767bab9fa08ab441cdd5d1da31
 DIST wine-d3d9-2.0.tar.gz 48373 SHA256 
7bfac23706723c6d51a7a95e416e47fb2678cd4d0945b990f74eba2b059e6206 SHA512 
a9e2d1c9f2784128e4c53a8dc923070a5057b5ff3d83c2b536a2d2df0bc8433ac92b8ab1c3cdf34158c0e7bfe497ddb5974605fbc1736a92307639d59450c7a1
 WHIRLPOOL 
53044c0a4b7159c3af75fc935d1ac45030e80dbfd70d787f64885ddc025cfcd62f724c3256e389a7fde680670e594101955f52301cf6b9bbf23ebc64552790c2
 DIST wine-d3d9-2.1.tar.gz 48385 SHA256 
9fd80e3e2ea905272c42dbc14679e94c8e2f955101ae098c84060d4c62ffc9c6 SHA512 
9234d8227412d940a6befcf79433f1d5ab0634d5e829f3771ffeea235af05be29ffc40438818b1976c77d1e2e79da8a67c4dab2b7d2e822b502fb6e4a1a7f8b7
 WHIRLPOOL 
790e482850a13c5bf0967e900620c36d71c4d6673106f8f5c2848550ed574d326d3945d9906de88d847bb5644a520aab7fe6d460b3c3afd49a396798dd253392
 DIST wine-d3d9-2.2.tar.gz 48387 SHA256 
203ed60980ec584c09b413266728e3a93e2d980dbff9b4f65375a4e9744b5042 SHA512 
6e9e031b51afc8ec200bbd252ff0d768c29af23907f782409834de593f896afb128f86fe012c95dc18e5f3c7267f170eb343d2a2c53d639933a337f0c1e04fab
 WHIRLPOOL 
6b32c0dfd3068e87d94bbcd83718dd75a14b36d69b151e9257e04793d2d3ae78ce7da10b80cbc824ccefb6c11666241593f91963ddee6a58301f95bbde35285d
@@ -14,6 +15,7 @@ DIST wine-d3d9-2.4.tar.gz 48502 SHA256 
4c7084e733d95545b894b152b2c6c9564dfb8df59
 DIST wine-d3d9-2.5.tar.gz 48692 SHA256 
8b28c16701ec1cefab11d41d00954a92a5ced9a63f1ede81e96f247d2f498f94 SHA512 
8b5ebec6341f70ec977aabee35decbe2d22fe43e111c1fd6015066a2b0e4fd259cd964fdb79306a489be4406078cb1e241d90ed636222174ed4abcc8026e7d03
 WHIRLPOOL 
d5fcc5fbea4c4a4900235d33cb5de8f2a7cbf2b51b1a5c47d75ab765aa88ce1f8f81a61eefe0a742a55bb2ca210747b345589628fd1020430e4d962319b1c6fe
 DIST wine-d3d9-2.6.tar.gz 48702 SHA256 
06ed18f2d5fff04613ea1401c37ad70e163135c159528745ff1063d617f31e2d SHA512 
17df692df8ff3c1419258a3faf9ddacde67f185a797dce76cd07c07e6f4fa2040b981662d311329a80921c039bfba0da5fed3ee53f8c36e34eeaa92af1c7b755
 WHIRLPOOL 
e614b4af0f3c92113617f533255fd67a4b322bdaf0939fb98e09bf77e3b0437cb2b813032e33300e45294a60d5c3586a302669c28c293e180c775666cddc2581
 DIST wine-d3d9-2.7.tar.gz 48708 SHA256 
df6ed1e50d8af0624b8f4f658705f75102094f6e17fec53ec8461991ce5dca2a SHA512 
d258e81a942f905255a637aa80dd647878691caa79adc52fd79f66ce1320d42d7d36ea776876d6a26a2c711a168da4c64f27fa8744ca6d8318c5526f8a8af75a
 WHIRLPOOL 
2d62cab5e3b14eaf29ecc96ac97555f48845a78c751040a850750d3b19fbc64efb3f3589dd3475a03cb1e3dff3e200528dabd2952b1ee8d0520a5db0d7db154b
+DIST wine-d3d9-2.8.tar.gz 48700 SHA256 
c67de9fee6e97859896aa2326fbc245e8b0f7393a1c6341126607b03afebc964 SHA512 
bb933b51d0022ce616331f2550faedeff3058007525b4519833b925c57999ab08b08380b8967d48ad7c56458e812342428388a5eac2ed8fcdd8cfbfee74a8e8c
 WHIRLPOOL 
52c8538e3f4b3be3412ee544efebae69c3de781255e12298d544f47523aba3afaadbffa8dedc463c207b0ae8a0a92599beca17017f266648b9b229847990ae2e
 DIST wine-desktop-common-20150204.tar.gz 99491 SHA256 
444ad6b52b5290ec7d160e2cc40e4ba0910b4c4983dba1ceb054b81b09b24b5e SHA512 
1f3d7022c5cff87ed3b8fd3b7cd14397c6f23b98fe6a7c583ac0d2f439ff29d943f57375f23687aa6519ff1d84ff07624a9a712d6f19fa207fd26d01edcb6688
 WHIRLPOOL 
e9810b2952d25c05d831000e00e423de86809ec31b9a033fd4c64a70709da7338a9afc9e632e678f49c789a8a3702fbd0113226770cdb806623f2de371a16f54
 DIST wine-staging-2.0.tar.gz 10182575 SHA256 
22a43cb50c1fff9c6f233a965247056e3321533aa73a6419aa34a22de7180039 SHA512 
51412299259d6e92c8993543d5fdb3239ebe31e0d1d715e0a9e8ce94b3139c0567b08ff1600d41be94f12427cbfccc2f6b6b2ed030535445c95618aaf6578580
 WHIRLPOOL 
9879174bc3a7c8ece156c822b7a7b870908e51335702a78e6f04ea1496125a2018a879bfc53d1302e4825138d22af526308ba7f656d683a535be44d4515f1bac
 DIST wine-staging-2.1.tar.gz 10101781 SHA256 
1d193be2734ea495df2cae1dc54ce89204ca68699979174b0bd726d2e5e0576b SHA512 
c64c48b265f0779c621a643ddbd2d12aaa548e4bff3b2b728280cdb9613214989911ee8ba5e46c7770f5f6430014a5da1c98e95d5008c1174bd14bf9ce5250db
 WHIRLPOOL 
ecf970ef436089bbcd0088e1608b22e808d54560e905c7d8046b3e21508166a595c3ef7b69819c45e4b13183bd9134a2bd7016d29c4da52985701d392eb35a0a
@@ -23,3 +25,4 @@ DIST wine-staging-2.4.tar.gz 10067020 SHA256 
709cab12c0ebf7cf9504fd4a67eb8512723
 DIST wine-staging-2.5.tar.gz 10062025 SHA256 
b5cf6fa38151ff47ab6d725077693b02b37bb07b2ab7fda55290bb1f63ac54ad SHA512 
6ab981886776f624c6478230aad18870f55b7252f1c6df90bfe1a248f7ea76cbb181f8e0780fdd4bb5e3c589a785baa7cf126a2c838adf65db2a67f873ed1698
 WHIRLPOOL 
7045b1642a3b14e5a507854cb8bf910c7cfb3c64ada4ee3534175c75b03cd604206617a55fb870e47fb248a4db8a9ca2abc0b4688005c1c0de0d542fec8cbc57
 DIST wine-staging-2.6.tar.gz 10034709 SHA256 
ff86ddcceb7f6857bd415db3842ddf216a5cb301452e2a08053a9378cbf5580a SHA512 
dc199b5345985d261b708ac811b02253ab9fbc4966889f2382ce518d991fe43b7c771c1d56d055c6234c9329d5c571cd9cf0b16587b77124b9c46917ddd066d2
 WHIRLPOOL 
375f484c6c50645c605994eb08c38c649ca6c8b47430e2f2f285a63fc24eca81588d0496a8c32074f90e4ea8f4330f76854bf8874f042e27581a7eee19aedf98
 DIST wine-staging-2.7.tar.gz 10018082 SHA256 
3095f9c634f00b143c2407dce8c3f29c629ec95074cf14c8e8dc2e0cdba45b6d SHA512 
0abc89af701ae1b95c0eb08e72894c7bc40bdfe792e05b8af9282eab8407bb90b7dfcd4eb3a193a88759ce5d6ea6c2aa9696cac2d744f543c92529bb0d2636ee
 WHIRLPOOL 
6cc666f702ef1bd574ede54a7f6755e07d768c9fa549b9bdb9b5416288619347e0c1b9c70893b6300800d8e6c94e8d2396937f639d1e821945ba9fe144b32c95
+DIST wine-staging-2.8.tar.gz 10043842 SHA256 
8680614be6c3b01c7c577eb6924fc05cc3de92394384939dd5b2e12e08235fff SHA512 
af1707fe3119664a0d97d94fc4c955612d80cb76eae8c4248a268c0f6be9e659fccf7c26899c9e9ae5822f74474c0db5283b598dd4d9d69a3b108f947653217a
 WHIRLPOOL 
7e9aa61a7666404475abb442304e63c76c2e6df26479711b7c08ebe7c15b9b53017e7a1d2dca4f9f8aeba78290df03f06076c99ac06c30d5ed893cfc3842107a

diff --git a/app-emulation/wine-any/wine-any-2.8.ebuild 
b/app-emulation/wine-any/wine-any-2.8.ebuild
new file mode 100644
index 00000000000..62bce18f5a7
--- /dev/null
+++ b/app-emulation/wine-any/wine-any-2.8.ebuild
@@ -0,0 +1,615 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt 
ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv 
te th tr uk wa zh_CN zh_TW"
+PLOCALE_BACKUP="en"
+
+inherit autotools eutils fdo-mime flag-o-matic gnome2-utils l10n multilib 
multilib-minimal pax-utils toolchain-funcs virtualx versionator
+
+MY_PN="${PN%%-*}"
+MY_P="${MY_PN}-${PV}"
+
+if [[ ${PV} == "9999" ]] ; then
+       EGIT_REPO_URI="git://source.winehq.org/git/wine.git 
http://source.winehq.org/git/wine.git";
+       EGIT_BRANCH="master"
+       inherit git-r3
+       SRC_URI=""
+       #KEYWORDS=""
+else
+       MAJOR_V=$(get_version_component_range 1)
+       SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.x/${MY_P}.tar.xz";
+       KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
+fi
+S="${WORKDIR}/${MY_P}"
+
+STAGING_P="wine-staging-${PV}"
+STAGING_DIR="${WORKDIR}/${STAGING_P}"
+D3D9_P="wine-d3d9-${PV}"
+D3D9_DIR="${WORKDIR}/wine-d3d9-patches-${D3D9_P}"
+WDC_V="20150204"
+WINE_DESKTOP_COMMON_P="wine-desktop-common-${WDC_V}"
+
+DESCRIPTION="Free implementation of Windows(tm) on Unix, with optional 
external patchsets"
+HOMEPAGE="http://www.winehq.org/";
+SRC_URI="${SRC_URI}
+       
https://github.com/NP-Hardass/wine-desktop-common/archive/${WDC_V}.tar.gz -> 
${WINE_DESKTOP_COMMON_P}.tar.gz
+"
+
+if [[ ${PV} == "9999" ]] ; then
+       STAGING_EGIT_REPO_URI="git://github.com/wine-compholio/wine-staging.git"
+       D3D9_EGIT_REPO_URI="git://github.com/sarnex/wine-d3d9-patches.git"
+else
+       SRC_URI="${SRC_URI}
+       staging? ( 
https://github.com/wine-compholio/wine-staging/archive/v${PV}.tar.gz -> 
${STAGING_P}.tar.gz )
+       d3d9? ( 
https://github.com/sarnex/wine-d3d9-patches/archive/${D3D9_P}.tar.gz )"
+fi
+
+LICENSE="LGPL-2.1"
+SLOT="${PV}"
+IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags d3d9 dos 
elibc_glibc +fontconfig +gecko gphoto2 gsm gstreamer +jpeg kernel_FreeBSD +lcms 
ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl 
pcap pipelight +png prelink pulseaudio +realtime +run-exes s3tc samba scanner 
selinux +ssl staging test themes +threads +truetype udev +udisks v4l vaapi +X 
+xcomposite xinerama +xml"
+REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
+       X? ( truetype )
+       elibc_glibc? ( threads )
+       osmesa? ( opengl )
+       pipelight? ( staging )
+       s3tc? ( staging )
+       test? ( abi_x86_32 )
+       themes? ( staging )
+       vaapi? ( staging )" # osmesa-opengl #286560 # X-truetype #551124
+
+# FIXME: the test suite is unsuitable for us; many tests require net access
+# or fail due to Xvfb's opengl limitations.
+RESTRICT="test"
+
+COMMON_DEPEND="
+       X? (
+               x11-libs/libXcursor[${MULTILIB_USEDEP}]
+               x11-libs/libXext[${MULTILIB_USEDEP}]
+               x11-libs/libXrandr[${MULTILIB_USEDEP}]
+               x11-libs/libXi[${MULTILIB_USEDEP}]
+               x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
+       )
+       alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
+       capi? ( net-libs/libcapi[${MULTILIB_USEDEP}] )
+       cups? ( net-print/cups:=[${MULTILIB_USEDEP}] )
+       d3d9? (
+               media-libs/mesa[d3d9,egl,${MULTILIB_USEDEP}]
+               x11-libs/libX11[${MULTILIB_USEDEP}]
+               x11-libs/libXext[${MULTILIB_USEDEP}]
+               x11-libs/libxcb[${MULTILIB_USEDEP}]
+       )
+       fontconfig? ( media-libs/fontconfig:=[${MULTILIB_USEDEP}] )
+       gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] )
+       gsm? ( media-sound/gsm:=[${MULTILIB_USEDEP}] )
+       gstreamer? (
+               media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
+               media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}]
+       )
+       jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] )
+       lcms? ( media-libs/lcms:2=[${MULTILIB_USEDEP}] )
+       ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] )
+       mp3? ( >=media-sound/mpg123-1.5.0[${MULTILIB_USEDEP}] )
+       ncurses? ( >=sys-libs/ncurses-5.2:0=[${MULTILIB_USEDEP}] )
+       netapi? ( net-fs/samba[netapi(+),${MULTILIB_USEDEP}] )
+       nls? ( sys-devel/gettext[${MULTILIB_USEDEP}] )
+       odbc? ( dev-db/unixODBC:=[${MULTILIB_USEDEP}] )
+       openal? ( media-libs/openal:=[${MULTILIB_USEDEP}] )
+       opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
+       opengl? (
+               virtual/glu[${MULTILIB_USEDEP}]
+               virtual/opengl[${MULTILIB_USEDEP}]
+       )
+       osmesa? ( >=media-libs/mesa-13[osmesa,${MULTILIB_USEDEP}] )
+       pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] )
+       png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] )
+       pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )
+       scanner? ( media-gfx/sane-backends:=[${MULTILIB_USEDEP}] )
+       ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] )
+       staging? ( sys-apps/attr[${MULTILIB_USEDEP}] )
+       themes? (
+               dev-libs/glib:2[${MULTILIB_USEDEP}]
+               x11-libs/cairo[${MULTILIB_USEDEP}]
+               x11-libs/gtk+:3[${MULTILIB_USEDEP}]
+       )
+       truetype? ( >=media-libs/freetype-2.0.0[${MULTILIB_USEDEP}] )
+       udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] )
+       udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
+       v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
+       vaapi? ( x11-libs/libva[X,${MULTILIB_USEDEP}] )
+       xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
+       xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
+       xml? (
+               dev-libs/libxml2[${MULTILIB_USEDEP}]
+               dev-libs/libxslt[${MULTILIB_USEDEP}]
+       )
+       abi_x86_32? (
+               !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+               !<app-emulation/emul-linux-x86-baselibs-20140508-r14
+               !app-emulation/emul-linux-x86-db[-abi_x86_32(-)]
+               !<app-emulation/emul-linux-x86-db-20140508-r3
+               !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)]
+               !<app-emulation/emul-linux-x86-medialibs-20140508-r6
+               !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)]
+               !<app-emulation/emul-linux-x86-opengl-20140508-r1
+               !app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)]
+               !<app-emulation/emul-linux-x86-sdl-20140508-r1
+               !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)]
+               !<app-emulation/emul-linux-x86-soundlibs-20140508
+               !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
+               !<app-emulation/emul-linux-x86-xlibs-20140508
+       )"
+
+RDEPEND="${COMMON_DEPEND}
+       app-emulation/wine-desktop-common
+       >app-eselect/eselect-wine-0.3
+       !app-emulation/wine:0
+       dos? ( >=games-emulation/dosbox-0.74_p20160629 )
+       gecko? ( app-emulation/wine-gecko:2.47[abi_x86_32?,abi_x86_64?] )
+       mono? ( app-emulation/wine-mono:4.7.0 )
+       perl? (
+               dev-lang/perl
+               dev-perl/XML-Simple
+       )
+       pulseaudio? (
+               realtime? ( sys-auth/rtkit )
+       )
+       s3tc? ( >=media-libs/libtxc_dxtn-1.0.1-r1[${MULTILIB_USEDEP}] )
+       samba? ( >=net-fs/samba-3.0.25[winbind] )
+       selinux? ( sec-policy/selinux-wine )
+       udisks? ( sys-fs/udisks:2 )"
+
+# tools/make_requests requires perl
+DEPEND="${COMMON_DEPEND}
+       sys-devel/flex
+       >=sys-kernel/linux-headers-2.6
+       virtual/pkgconfig
+       virtual/yacc
+       X? (
+               x11-proto/inputproto
+               x11-proto/xextproto
+               x11-proto/xf86vidmodeproto
+       )
+       prelink? ( sys-devel/prelink )
+       staging? (
+               dev-lang/perl
+               dev-perl/XML-Simple
+       )
+       xinerama? ( x11-proto/xineramaproto )"
+
+# These use a non-standard "Wine" category, which is provided by
+# /etc/xdg/applications-merged/wine.menu
+QA_DESKTOP_FILE="usr/share/applications/wine-browsedrive.desktop
+usr/share/applications/wine-notepad.desktop
+usr/share/applications/wine-uninstaller.desktop
+usr/share/applications/wine-winecfg.desktop"
+
+wine_compiler_check() {
+       [[ ${MERGE_TYPE} = "binary" ]] && return 0
+
+       # GCC-specific bugs
+       if tc-is-gcc; then
+               # bug #549768
+               if use abi_x86_64 && [[ $(gcc-major-version) = 5 && 
$(gcc-minor-version) -le 2 ]]; then
+                       ebegin "Checking for gcc-5 ms_abi compiler bug"
+                       $(tc-getCC) -O2 "${FILESDIR}"/pr66838.c -o 
"${T}"/pr66838 || die
+                       # Run in subshell to prevent "Aborted" message
+                       ( "${T}"/pr66838 || false ) >/dev/null 2>&1
+                       if ! eend $?; then
+                               eerror "64-bit wine cannot be built with 
gcc-5.1 or initial patchset of 5.2.0"
+                               eerror "due to compiler bugs; please re-emerge 
the latest gcc-5.2.x ebuild,"
+                               eerror "or use gcc-config to select a different 
compiler version."
+                               eerror "See https://bugs.gentoo.org/549768";
+                               eerror
+                               return 1
+                       fi
+               fi
+               # bug #574044
+               if use abi_x86_64 && [[ $(gcc-major-version) = 5 && 
$(gcc-minor-version) = 3 ]]; then
+                       ebegin "Checking for gcc-5-3 stack realignment compiler 
bug"
+                       # Compile in subshell to prevent "Aborted" message
+                       ( $(tc-getCC) -O2 -mincoming-stack-boundary=3 
"${FILESDIR}"/pr69140.c -o "${T}"/pr69140 ) >/dev/null 2>&1
+                       if ! eend $?; then
+                               eerror "Wine cannot be built with this version 
of gcc-5.3"
+                               eerror "due to compiler bugs; please re-emerge 
the latest gcc-5.3.x ebuild,"
+                               eerror "or use gcc-config to select a different 
compiler version."
+                               eerror "See https://bugs.gentoo.org/574044";
+                               eerror
+                               return 1
+                       fi
+               fi
+       fi
+
+       # Ensure compiler support
+       if use abi_x86_64; then
+               ebegin "Checking for 64-bit compiler with builtin_ms_va_list 
support"
+               # Compile in subshell to prevent "Aborted" message
+               ( $(tc-getCC) -O2 "${FILESDIR}"/builtin_ms_va_list.c -o 
"${T}"/builtin_ms_va_list >/dev/null 2>&1)
+               if ! eend $?; then
+                       eerror "This version of $(tc-getCC) does not support 
builtin_ms_va_list, can't enable 64-bit wine"
+                       eerror
+                       eerror "You need gcc-4.4+ or clang 3.8+ to build 64-bit 
wine"
+                       eerror
+                       return 1
+               fi
+       fi
+}
+
+wine_build_environment_check() {
+       [[ ${MERGE_TYPE} = "binary" ]] && return 0
+
+       if use abi_x86_64; then
+               if tc-is-gcc && [[ $(gcc-major-version) -lt 4 || ( 
$(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 4 ) ]]; then
+                       eerror "You need gcc-4.4+ to compile 64-bit wine"
+                       die
+               elif tc-is-clang && [[ $(clang-major-version) -lt 3 || ( 
$(clang-major-version) -eq 3 && $(clang-minor-version) -lt 8 ) ]]; then
+                       eerror "You need clang-3.8+ to compile 64-bit wine"
+                       die
+               fi
+       fi
+       if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) 
-le 3 ]]; then
+               ewarn "GCC-5.0-5.3 suffered from compiler bugs and are no 
longer supported by"
+               ewarn "Gentoo's Toolchain Team. If your ebuild fails the 
compiler checks in"
+               ewarn "the configure phase, either update your compiler or 
switch to <5.0 || >=5.4"
+       fi
+       if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) 
-eq 4 ]]; then
+               if has "-march=i686" ${CFLAGS} && ! has "-mtune=generic" 
${CFLAGS}; then
+                       ewarn "Compilation can hang with 
CFLAGS=\"-march=i686\".  You can temporarily work"
+                       ewarn "around this by adding \"-mtune=generic\" to your 
CFLAGS for wine."
+                       ewarn "See package.env in man 5 portage for more 
information on how to do this."
+                       ewarn "See 
https://bugs.gentoo.org/show_bug.cgi?id=613128 for more details"
+               fi
+       fi
+
+       if use abi_x86_32 && use opencl && [[ "$(eselect opencl show 2> 
/dev/null)" == "intel" ]]; then
+               eerror "You cannot build wine with USE=opencl because 
intel-ocl-sdk is 64-bit only."
+               eerror "See https://bugs.gentoo.org/487864 for more details."
+               eerror
+               return 1
+       fi
+}
+
+wine_env_vcs_vars() {
+       local pn_live_var="${PN//[-+]/_}_LIVE_COMMIT"
+       local pn_live_val="${pn_live_var}"
+       eval pn_live_val='$'${pn_live_val}
+       if [[ ! -z ${pn_live_val} ]]; then
+               if use staging || use d3d9; then
+                       eerror "Because of the multi-repo nature of ${MY_PN}, 
${pn_live_var}"
+                       eerror "cannot be used to set the commit. Instead, you 
may use the"
+                       eerror "environmental variables WINE_COMMIT, 
STAGING_COMMIT, and D3D9_COMMIT."
+                       eerror
+                       return 1
+               fi
+       fi
+       if [[ ! -z ${EGIT_COMMIT} ]]; then
+               eerror "Commits must now be specified using the environmental 
variables"
+               eerror "WINE_COMMIT, STAGING_COMMIT, and D3D9_COMMIT"
+               eerror
+               return 1
+       fi
+}
+
+pkg_pretend() {
+       wine_build_environment_check || die
+
+       # Verify OSS support
+       if use oss && ! use kernel_FreeBSD; then
+               if ! has_version ">=media-sound/oss-4"; then
+                       eerror "You cannot build wine with USE=oss without 
having support from a"
+                       eerror "FreeBSD kernel or >=media-sound/oss-4 (only 
available through external repos)"
+                       eerror
+                       die
+               fi
+       fi
+}
+
+pkg_setup() {
+       wine_build_environment_check || die
+       wine_env_vcs_vars || die
+
+       WINE_VARIANT="${PN#wine}-${PV}"
+       WINE_VARIANT="${WINE_VARIANT#-}"
+
+       MY_PREFIX="${EPREFIX}/usr/lib/wine-${WINE_VARIANT}"
+       MY_DATAROOTDIR="${EPREFIX}/usr/share/wine-${WINE_VARIANT}"
+       MY_DATADIR="${MY_DATAROOTDIR}"
+       MY_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
+       MY_INCLUDEDIR="${EPREFIX}/usr/include/wine-${WINE_VARIANT}"
+       MY_LIBEXECDIR="${EPREFIX}/usr/libexec/wine-${WINE_VARIANT}"
+       MY_LOCALSTATEDIR="${EPREFIX}/var/wine-${WINE_VARIANT}"
+       MY_MANDIR="${MY_DATADIR}/man"
+}
+
+src_unpack() {
+       if [[ ${PV} == "9999" ]] ; then
+               EGIT_CHECKOUT_DIR="${S}" EGIT_COMMIT="${WINE_COMMIT}" 
git-r3_src_unpack
+               if use staging; then
+                       local CURRENT_WINE_COMMIT=${EGIT_VERSION}
+
+                       git-r3_fetch "${STAGING_EGIT_REPO_URI}" 
"${STAGING_COMMIT}"
+                       git-r3_checkout "${STAGING_EGIT_REPO_URI}" 
"${STAGING_DIR}"
+
+                       local 
COMPAT_WINE_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh" 
--upstream-commit) || die
+
+                       if [[ "${CURRENT_WINE_COMMIT}" != 
"${COMPAT_WINE_COMMIT}" ]]; then
+                               einfo "The current Staging patchset is not 
guaranteed to apply on this WINE commit."
+                               einfo "If src_prepare fails, try emerging with 
the env var WINE_COMMIT."
+                               einfo "Example: 
WINE_COMMIT=${COMPAT_WINE_COMMIT} emerge -1 wine"
+                       fi
+               fi
+               if use d3d9; then
+                       git-r3_fetch "${D3D9_EGIT_REPO_URI}" "${D3D9_COMMIT}"
+                       git-r3_checkout "${D3D9_EGIT_REPO_URI}" "${D3D9_DIR}"
+               fi
+       fi
+
+       default
+
+       l10n_find_plocales_changes "${S}/po" "" ".po"
+}
+
+src_prepare() {
+       local md5="$(md5sum server/protocol.def)"
+       local PATCHES=(
+               "${FILESDIR}"/${MY_PN}-1.5.26-winegcc.patch #260726
+               "${FILESDIR}"/${MY_PN}-1.9.5-multilib-portage.patch #395615
+               "${FILESDIR}"/${MY_PN}-1.6-memset-O3.patch #480508
+               "${FILESDIR}"/${MY_PN}-2.0-multislot-apploader.patch
+       )
+       if use staging; then
+               ewarn "Applying the Wine-Staging patchset. Any bug reports to 
the"
+               ewarn "Wine bugzilla should explicitly state that staging was 
used."
+
+               local STAGING_EXCLUDE=""
+               STAGING_EXCLUDE="${STAGING_EXCLUDE} -W 
winhlp32-Flex_Workaround" # Avoid double patching 
https://bugs.winehq.org/show_bug.cgi?id=42132
+               use pipelight || STAGING_EXCLUDE="${STAGING_EXCLUDE} -W 
Pipelight"
+
+               # Launch wine-staging patcher in a subshell, using eapply as a 
backend, and gitapply.sh as a backend for binary patches
+               ebegin "Running Wine-Staging patch installer"
+               (
+                       set -- DESTDIR="${S}" --backend=eapply --no-autoconf 
--all ${STAGING_EXCLUDE}
+                       cd "${STAGING_DIR}/patches"
+                       source "${STAGING_DIR}/patches/patchinstall.sh"
+               )
+               eend $? || die "Failed to apply Wine-Staging patches"
+       fi
+       if use d3d9; then
+               if use staging; then
+                       PATCHES+=( "${D3D9_DIR}/staging-helper.patch" )
+               else
+                       PATCHES+=( "${D3D9_DIR}/d3d9-helper.patch" )
+               fi
+               PATCHES+=( "${D3D9_DIR}/wine-d3d9.patch" )
+       fi
+
+       default
+       eautoreconf
+
+       # Modification of the server protocol requires regenerating the server 
requests
+       if [[ "$(md5sum server/protocol.def)" != "${md5}" ]]; then
+               einfo "server/protocol.def was patched; running 
tools/make_requests"
+               tools/make_requests || die #432348
+       fi
+       sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
+       if ! use run-exes; then
+               sed -i '/^MimeType/d' loader/wine.desktop || die #117785
+       fi
+
+       # Edit wine.desktop to work for specific variant
+       sed -e "/^Exec=/s/wine /wine-${WINE_VARIANT} /" -i loader/wine.desktop 
|| die
+
+       # hi-res default icon, #472990, 
http://bugs.winehq.org/show_bug.cgi?id=24652
+       cp "${WORKDIR}/${WINE_DESKTOP_COMMON_P}/icons/oic_winlogo.ico" 
dlls/user32/resources/ || die
+
+       l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect 
LINGUAS
+}
+
+src_configure() {
+       wine_compiler_check || die
+
+       export LDCONFIG=/bin/true
+       use custom-cflags || strip-flags
+
+       multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+       local myconf=(
+               --prefix="${MY_PREFIX}"
+               --datarootdir="${MY_DATAROOTDIR}"
+               --datadir="${MY_DATADIR}"
+               --docdir="${MY_DOCDIR}"
+               --includedir="${MY_INCLUDEDIR}"
+               --libdir="${EPREFIX}/usr/$(get_libdir)/wine-${WINE_VARIANT}"
+               --libexecdir="${MY_LIBEXECDIR}"
+               --localstatedir="${MY_LOCALSTATEDIR}"
+               --mandir="${MY_MANDIR}"
+               --sysconfdir=/etc/wine
+               $(use_with alsa)
+               $(use_with capi)
+               $(use_with lcms cms)
+               $(use_with cups)
+               $(use_with ncurses curses)
+               $(use_with udisks dbus)
+               $(use_with fontconfig)
+               $(use_with ssl gnutls)
+               $(use_enable gecko mshtml)
+               $(use_with gphoto2 gphoto)
+               $(use_with gsm)
+               $(use_with gstreamer)
+               --without-hal
+               $(use_with jpeg)
+               $(use_with ldap)
+               $(use_enable mono mscoree)
+               $(use_with mp3 mpg123)
+               $(use_with netapi)
+               $(use_with nls gettext)
+               $(use_with openal)
+               $(use_with opencl)
+               $(use_with opengl)
+               $(use_with osmesa)
+               $(use_with oss)
+               $(use_with pcap)
+               $(use_with png)
+               $(use_with pulseaudio pulse)
+               $(use_with threads pthread)
+               $(use_with scanner sane)
+               $(use_enable test tests)
+               $(use_with truetype freetype)
+               $(use_with udev)
+               $(use_with v4l)
+               $(use_with X x)
+               $(use_with xcomposite)
+               $(use_with xinerama)
+               $(use_with xml)
+               $(use_with xml xslt)
+       )
+
+       use staging && myconf+=(
+               --with-xattr
+               $(use_with themes gtk3)
+               $(use_with vaapi va)
+       )
+       use d3d9 && myconf+=( $(use_with d3d9 d3d9-nine) )
+
+       local PKG_CONFIG AR RANLIB
+       # Avoid crossdev's i686-pc-linux-gnu-pkg-config if building wine32 on 
amd64; #472038
+       # set AR and RANLIB to make QA scripts happy; #483342
+       tc-export PKG_CONFIG AR RANLIB
+
+       if use amd64; then
+               if [[ ${ABI} == amd64 ]]; then
+                       myconf+=( --enable-win64 )
+               else
+                       myconf+=( --disable-win64 )
+               fi
+
+               # Note: using --with-wine64 results in problems with 
multilib.eclass
+               # CC/LD hackery. We're using separate tools instead.
+       fi
+
+       ECONF_SOURCE=${S} \
+       econf "${myconf[@]}"
+       emake depend
+}
+
+multilib_src_test() {
+       # FIXME: win32-only; wine64 tests fail with "could not find the Wine 
loader"
+       if [[ ${ABI} == x86 ]]; then
+               if [[ $(id -u) == 0 ]]; then
+                       ewarn "Skipping tests since they cannot be run under 
the root user."
+                       ewarn "To run the test ${MY_PN} suite, add userpriv to 
FEATURES in make.conf"
+                       return
+               fi
+
+               WINEPREFIX="${T}/.wine-${ABI}" \
+               Xemake test
+       fi
+}
+
+multilib_src_install_all() {
+       local DOCS=( ANNOUNCE AUTHORS README )
+       add_locale_docs() {
+               local locale_doc="documentation/README.$1"
+               [[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
+       }
+       l10n_for_each_locale_do add_locale_docs
+
+       einstalldocs
+       prune_libtool_files --all
+
+       if ! use perl ; then # winedump calls function_grep.pl, and winemaker 
is a perl script
+               rm "${D%/}${MY_PREFIX}"/bin/{wine{dump,maker},function_grep.pl} 
\
+                       "${D%/}${MY_MANDIR}"/man1/wine{dump,maker}.1 || die
+       fi
+
+       # Remove wineconsole if neither backend is installed #551124
+       if ! use X && ! use ncurses; then
+               rm "${D%/}${MY_PREFIX}"/bin/wineconsole* || die
+               rm "${D%/}${MY_MANDIR}"/man1/wineconsole* || die
+               rm_wineconsole() {
+                       rm 
"${D%/}${MY_PREFIX}/$(get_libdir)"/wine/{,fakedlls/}wineconsole.exe* || die
+               }
+               multilib_foreach_abi rm_wineconsole
+       fi
+
+       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 "${MY_PREFIX}"/bin/wine{64,} # 404331
+               dosym "${MY_PREFIX}"/bin/wine{64,}-preloader
+       fi
+
+       # Failglob for bin and man loops
+       local glob_state=$(shopt -p failglob)
+       shopt -s failglob
+
+       # Make wrappers for binaries for handling multiple variants
+       # Note: wrappers instead of symlinks because some are shell which use 
basename
+       local b
+       for b in "${D%/}${MY_PREFIX}"/bin/*; do
+               make_wrapper "${b##*/}-${WINE_VARIANT}" 
"${MY_PREFIX}/bin/${b##*/}"
+       done
+
+       # respect LINGUAS when installing man pages, #469418
+       local l
+       for l in de fr pl; do
+               use linguas_${l} || rm -r "${D%/}${MY_MANDIR}"/${l}*
+       done
+
+       eval "${glob_state}"
+}
+
+pkg_postinst() {
+       eselect wine register ${P}
+       if [[ ${PN} == "wine-vanilla" ]]; then
+               eselect wine register --vanilla ${P} || die
+       else
+               if use staging; then
+                       eselect wine register --staging ${P} || die
+               fi
+               if use d3d9; then
+                       eselect wine register --d3d9 ${P} || die
+               fi
+       fi
+
+       eselect wine update --all --if-unset || die
+
+       fdo-mime_desktop_database_update
+
+       if ! use gecko; then
+               ewarn "Without Wine Gecko, wine prefixes will not have a 
default"
+               ewarn "implementation of iexplore.  Many older windows 
applications"
+               ewarn "rely upon the existence of an iexplore implementation, 
so"
+               ewarn "you will likely need to install an external one, like 
via winetricks"
+       fi
+       if ! use mono; then
+               ewarn "Without Wine Mono, wine prefixes will not have a default"
+               ewarn "implementation of .NET.  Many windows applications rely 
upon"
+               ewarn "the existence of a .NET implementation, so you will 
likely need"
+               ewarn "to install an external one, like via winetricks"
+       fi
+}
+
+pkg_prerm() {
+       eselect wine deregister ${P}
+       if [[ ${PN} == "wine-vanilla" ]]; then
+               eselect wine deregister --vanilla ${P} || die
+       else
+               if use staging; then
+                       eselect wine deregister --staging ${P} || die
+               fi
+               if use d3d9; then
+                       eselect wine deregister --d3d9 ${P} || die
+               fi
+       fi
+
+       eselect wine update --all --if-unset || die
+}
+
+pkg_postrm() {
+       fdo-mime_desktop_database_update
+}

Reply via email to