app-emulation/wine-vanilla: Clean old up
authorMichał Górny <mgorny@gentoo.org>
Tue, 28 Nov 2017 15:38:18 +0000 (16:38 +0100)
committerNP-Hardass <NP-Hardass@gentoo.org>
Tue, 28 Nov 2017 16:24:12 +0000 (11:24 -0500)
Closes: https://bugs.gentoo.org/638064

Signed-off-by: NP-Hardass <NP-Hardass@gentoo.org>
24 files changed:
app-emulation/wine-vanilla/Manifest
app-emulation/wine-vanilla/wine-vanilla-2.0-r1.ebuild [deleted file]
app-emulation/wine-vanilla/wine-vanilla-2.0.1-r1.ebuild [deleted file]
app-emulation/wine-vanilla/wine-vanilla-2.0.1.ebuild [deleted file]
app-emulation/wine-vanilla/wine-vanilla-2.0.2-r1.ebuild [deleted file]
app-emulation/wine-vanilla/wine-vanilla-2.0.3.ebuild [deleted file]
app-emulation/wine-vanilla/wine-vanilla-2.0.ebuild [deleted file]
app-emulation/wine-vanilla/wine-vanilla-2.1-r1.ebuild [deleted file]
app-emulation/wine-vanilla/wine-vanilla-2.10-r1.ebuild [deleted file]
app-emulation/wine-vanilla/wine-vanilla-2.11-r1.ebuild [deleted file]
app-emulation/wine-vanilla/wine-vanilla-2.12-r1.ebuild [deleted file]
app-emulation/wine-vanilla/wine-vanilla-2.13-r1.ebuild [deleted file]
app-emulation/wine-vanilla/wine-vanilla-2.14-r1.ebuild [deleted file]
app-emulation/wine-vanilla/wine-vanilla-2.15-r1.ebuild [deleted file]
app-emulation/wine-vanilla/wine-vanilla-2.16-r1.ebuild [deleted file]
app-emulation/wine-vanilla/wine-vanilla-2.17-r1.ebuild [deleted file]
app-emulation/wine-vanilla/wine-vanilla-2.2-r1.ebuild [deleted file]
app-emulation/wine-vanilla/wine-vanilla-2.3-r1.ebuild [deleted file]
app-emulation/wine-vanilla/wine-vanilla-2.4-r1.ebuild [deleted file]
app-emulation/wine-vanilla/wine-vanilla-2.5-r1.ebuild [deleted file]
app-emulation/wine-vanilla/wine-vanilla-2.6-r1.ebuild [deleted file]
app-emulation/wine-vanilla/wine-vanilla-2.7-r1.ebuild [deleted file]
app-emulation/wine-vanilla/wine-vanilla-2.8-r1.ebuild [deleted file]
app-emulation/wine-vanilla/wine-vanilla-2.9-r1.ebuild [deleted file]

index 3fac2e2874c019a22100893977d7bf26a24e6912..d179e68e660372ef16e6750a7d1f84b85d7d69a2 100644 (file)
@@ -1,25 +1,5 @@
-DIST gentoo-wine-patches-20170830.tar.xz 58456 SHA256 fb7781d0ae360cbc3860c2d2e81527a1b903da824c01f5d5040e95aaf99a3970 SHA512 5e5159e3252b246bba0ef7fdba345db3ab1071c5b8b8b625f98eda18779d4024c5b76bdbf49ce7bd5c6b01b422807adf76820beddb2b4a6ee9e67d13052cc575 WHIRLPOOL a79be264bab3fcdeee06fef47efd28e6e1125254ac7f82300cb6ba2591ef69cd76b5fed8f778b1849a0659e680e9fc785f0273d55cb2ed95648a74dffa5e22d2
-DIST wine-2.0.1.tar.xz 18845444 SHA256 6cfb4eaae566dc7afb7ac0f1f2db2c0d69969952acab0debf084ee8f7b071583 SHA512 b32d07443655898768383b7409c21093b60c028fef166a596dad5dfab5a329b9fce4552e612c6d182e4f67eb1f28ed497fe2ed6af55d0000d3e96a124547722d WHIRLPOOL 0fbaf53504e4e40db6227f45f5b92ac388c2bf23d4f573e4d3b60ccaaadeeccb5a696226d1bd4aa8b245f21c8d6a13aac423ead3f4692ebc1e8e613714168501
+DIST gentoo-wine-patches-20170830.tar.xz 58456 BLAKE2B 86445a6d91d9981d069ff2fb3b64a47e166c76b4721ef877c74cd60e359ee5bdbe36ebf37cf796a18e9cf42dbc69ce1496777144fc28b072f47c965173bf48b4 SHA512 5e5159e3252b246bba0ef7fdba345db3ab1071c5b8b8b625f98eda18779d4024c5b76bdbf49ce7bd5c6b01b422807adf76820beddb2b4a6ee9e67d13052cc575
 DIST wine-2.0.2.tar.xz 18854952 SHA256 f71884f539928877f4b415309f582825d3d3c9976104e43d566944c710713c9a SHA512 3f37080a951819304cd3475f6012f1d6b5a94879b137cdf816cac4c8fde68ddc777905e92277ec5dce96437d8c32c43d55d3750b582781a9f9774b118f1a5b90 WHIRLPOOL cf21a899c60749c37353abc4ba974b3d6cc369769ace70fde899ff1cb5ac8a97828165cf2dbfbcf0915f5196ac58974948fe3e5b2c9854296a5eea75f8023ae5
-DIST wine-2.0.3.tar.xz 18864648 SHA256 a811c664f870a3a01449443a93a6fcee41aea2e912e58f72742eb7924962be56 SHA512 e20dbcb3a48ecb3526eba075d4baebab2529dfc50b7a6d5e18294704470f61db386013f457118c270274b911f9643d203110f46558d23e84e6a6c2d78e237dbb WHIRLPOOL 36928e816b6e4dec2173c424042c3e9da83be4a8fb3847bc90606d92858c66d4f1f41d4e1477d797e19d955d21a01710f1c3149f72da7011fae186705529f29c
-DIST wine-2.0.tar.bz2 23662707 SHA256 9756f5a2129b6a83ba701e546173cbff86caa671b0af73eb8f72c03b20c066c6 SHA512 b0a57ba8202d9fc396e5bfb7a7718d6bababbed8f3351e7fdc36afa37f35a871e04903757618f73427aeb71a52b2d323977d79e48f8b38d636f23fd404441186 WHIRLPOOL fa9f774d87dae73c7d1f3b86dc3b03ea27065eb6140f1cac13c82fe16f7ebff8f8365ed447220cf5c2788b9f4aae7c482e4f9e2e69f47e5435209e148f5dbdfe
-DIST wine-2.1.tar.xz 18887032 SHA256 bfb9abf63691c93df28d9599aaa866dc2b4e27209b3b7b546df8a37d7d9d1e6e SHA512 03d678ee6e89c2804813f2827255fcf59e96ca9a45b7d8ac441cfc84f835e5e5689c70a79a41a04c631e1add7807fa4a5758acef3bd7aadfb2e92e68958c6ef6 WHIRLPOOL 063d935f1ff0922100641f2f53cdac23d2993a83182d45e028e485fd7d0a13bc5cfb77bca76550b1537b3f42fecacef7fd64785adbf6425af823f56f96973b54
-DIST wine-2.10.tar.xz 19209580 SHA256 488df7ffd2e81da455bf428fc9eb784bb4273a890334500895665711bd52f179 SHA512 8807e16a571bf45d99097ad5fdfb9fe755f6dbe84010a330fed82f1d48c76b7f19589bfc0e5dde0b9e49a608fd0501db3f7e3e129e4d9d34bcae03bc51a73139 WHIRLPOOL e9a8248aac31593fbac28a3d8d4e62bfce14a7c41cc416ebfca8606518d28efd31b32196133da211f75f48bd228bd5d21fcbbc0479293e813ed99b258b37126e
-DIST wine-2.11.tar.xz 19251116 SHA256 efa96dade206aa21accf0da195335a805d38209d6a14320607c6308ebde4cc3c SHA512 691f329c47af5e51498287029988b8ca0777bfc3902ed80fd315004aba2337a938e79177e752efe86423c9b34544df3952b8c443bf43149356575fac75a779ac WHIRLPOOL 4933e1ce640b0abeebccd6969b5eaf4eec76cd135d9cfc1d904a902219f776a68f72e2bd1ae9019d69f0d0d81fd8ead0084785d1b9710590349365977f9c1817
-DIST wine-2.12.tar.xz 19301968 SHA256 496c11af841487e6ec4e1953ac19b05a7f48e397da502653ffbd9fe9004213a7 SHA512 d44c1937d7d2d797150381f70317b810616d61355a59be096366d3507f59b678cffaf6d841cecf02bf9d2afa3dbf4d19270f80fb1d3ba5f0f93787d40c328f62 WHIRLPOOL 6f4b9baa6fcfe86f3d195fe603c2b9450a72a593c8f7042959b42a76880cb4ae680fde7beb70a8e823150849fda36c42985035de891ebf0088c8ffc2bceb15bf
-DIST wine-2.13.tar.xz 19439328 SHA256 6fbca3ddd19b061ce65a267639efae93cf38cfabbe4a9c148a17a44703587ef8 SHA512 71873b9ec1605dd5f7502b87b0f3429c3d14a4196543d7304df455854b58ef82b8fafdcea91450cbfc01434a44886a0e0c4c4cf289ffb53167dde0f969cddc48 WHIRLPOOL 6faf1e6aeea2ab7ccc496ed85834f98eb25111c8f541c24d4876a142ad4acf7d9a4c08c2716e11fb6c92fe7aad29980cab912eb9dbb6759bdbdeca2f2f8e78a7
-DIST wine-2.14.tar.xz 19447812 SHA256 03f934d95181f728600ca04d395f10e821ee38cfa31655e872e4d27d2a8795c6 SHA512 ff43d386d46c0c74449e667b61d8cebd5fa768c88e6220aa2f13df03d80b71b6c0bdf8cbab023aed96f7c88b9787a3be4989da892fa1778412534ae82a7279bb WHIRLPOOL 2d2784e1b2ddeac39a3cea4cb08a62d99d1d062d8d801874e8bf4f56d2538a4cb019418c60299556548028e2362dd533d9ea0956014a65ac7a367ed489c0c392
-DIST wine-2.15.tar.xz 19463720 SHA256 d82d500cbf81fb08c711d3619bd52373138a05574d044f089af89707274868b3 SHA512 a52a42dd1f20fe68213c55a07ac5b2455150806e534f0ab77a8e9ae3d2f12840983fa92290dac569207d3640c7f45cda83801e9f2e80294863ffa854c6c89171 WHIRLPOOL 99c9497a44859ce310c764b3cd172d83ca1a2dce13633fee930ddbf1c40651ee4470f6bc9cfcb407ce65298a2afd73dc9edc536c2ba6f076631e5cf2085b8e61
-DIST wine-2.16.tar.xz 19484716 SHA256 a561edcabecd6c44948e5b2ef11941b2ba047275240418fa2c98c1fdceda2c21 SHA512 749a36b536506c4b63ff7512e316f44503cdb0db46e38a124da86df638f3e8ff9c404b034ece5cbb95cf20c09bc46be9a38f2ee66480aa6a4f2385e2a7a7eea4 WHIRLPOOL 92ae0a427d89b24d41d4565e333cf3b7499c1dfedb6d2a204f934975c35cb589d38b4f669890c1fd6a37b9fe8f34d98be3e7d0986e9ff99516fe00a004574520
-DIST wine-2.17.tar.xz 19505528 SHA256 7edc95739043ccc55957af663fb910318283dc5d1db42cd7f0224e30acfcea69 SHA512 cb10c876e689aa601c68673aab32c0514dd174692a01bdb3afc78d5e6079b0e77f48783af2f54245f397c762da3b4e5f2c1d39d2ce7fdb3b117d338b95c24810 WHIRLPOOL 196427a68ab3b1261cb63bafd7f82b7a688ad439fa82ae3fc04b18c9da14cc8e95b827ca8ddd07124e1179c55ed0e0aba3bdcb4639b724a6dacf4952e8827e16
 DIST wine-2.18.tar.xz 19546360 SHA256 9f0931129878157d717cb39f16cd33bf49f40aac77331c93d0ad30f2ccac4f50 SHA512 61cc39fa3d2b0a0ab3c5d17579865e6aea76dd9513a4b3c45975a2d5c05f2b4ba952b97eef547131a014763c7f692a08df29bc2ebf7e4ac7e2616e6a7822ddb9 WHIRLPOOL e864dd1705c0480d3f3095aa02ab1e7bc5b41693cd6b791cdf05e636c7099562020ac3adcba6421653efdf5dbe232b5abe9071792785e008ea30dedbb63e080e
-DIST wine-2.19.tar.xz 19549464 SHA256 487131e69875ae9c2d042798f954160146e603e449c3c97981f29b42f4a66095 SHA512 83558231bdc592b1f69cfedf6c689063df7bd9fecdfafba6fb7f6a2c7fa7783973efb85a6a49305afc18b1aa268209ee5b9c0655756e05d7550468698dfa51ae WHIRLPOOL 123aec3a367e67353655d940ba2ffe9386a583afbd0961dd3f446a00b0cf82ad4ed590508e03bf2a4e60b11753f8f430e748e6614f476675423f3bdaf7089288
-DIST wine-2.2.tar.xz 18916364 SHA256 64cb57e1d8aa07f5c89ef26743b494f2d3ef9c0f4e50d3ee896a93535f7751f4 SHA512 0700868244d397c1442948716321e5ff030c667edce464570f76aa4340199489a422872aa3975bc0a57b8285c9d59fc04e223a4bde094169fc6db460acb626c4 WHIRLPOOL ffc3d357a76592651b589c6ac6608720d0258474890faf8fe3e20ac29cdd1496d569721256f9389d347bf2734a556099154fd18ef1b56f45bb46c4c15771d6ca
-DIST wine-2.20.tar.xz 19597556 SHA256 b444826c69048932fd51ac00b791d18528a4d4abd4c397e5bd51ac60eda455a5 SHA512 d8d374d1e690ce9d3964fc81054fb7f4cd56cbae6bc44ebbf80b7dc7f04524baa2bd831e0be8f00de4cb0e14c1cb71780d424f5dcb9851fcaed9fb22f5ce5d23 WHIRLPOOL c5cfc20efdbb2a43433e93ffde8fe28507b1ad255d54cae36bf0268b18a629876b306127610bce298a47fa3fb8884ee902fd2ae41e22897d954383f0c5cd5bae
-DIST wine-2.3.tar.xz 18931732 SHA256 afc95c7a87cc8f0730b462c50a5dfc9c462eb02c6bf5874b4fa99946f49e067e SHA512 bea78e8468555ff9e08dedf3918da5ea82721549c43984869989bbdafeea00e454820ff9558aa29925c97a165a9b01e5cd1fd397f133833c58824984a6686171 WHIRLPOOL 1f5ec8e5c32d124277e4c71d95726d3a5337575757c3029567c77165d65fcfec2ddf33d3863b4bf55c9eff7c3582c1ec7dbd76d84ed8bbbe89dd16db6b0128c1
-DIST wine-2.4.tar.xz 18953748 SHA256 87b5df07e4781fecce2f92415a4717208ea253a20a0df8b36b9f90b69b72748e SHA512 15ae7e97dc72a8636b2c15c93803ed430fa456d673add61457cf3e479e769559c682b40949b5d38828f6681f13183e560fcb4a2eb0f0ba25e6eade46f7d3d7c0 WHIRLPOOL 558ab7b7517ad5e03366b4db974047eba776585e958a5b71bb2e93993e21bc725ea7a8bcf2a4354f34ca38c94ba99ccd15f2f8b5e4b58066bf339d3517eec56c
-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-2.9.tar.xz 19154668 SHA256 ac46f7bbbbc1dc135c95e4f98d28bf6e3d7a78fb7f9ba6caa7354a3e8786545f SHA512 6d06e511d8f338297ed0ddb7bf2ffb501f528209eaecbbee3d4e5d53db649dd5ea0aeb78bba661a9bcfda5f97e170ca10eb8fab355e229bfe7db6a5feb7ec4e8 WHIRLPOOL 7355166aeaac54abb6e1d25da6f87a4814d37764044e95462bc2a83f8d5a9b7a3bb10730bb5506516e130a4fc9ee35e3656d1106939bbbc1310c6aff0d798a1c
+DIST wine-2.19.tar.xz 19549464 BLAKE2B 86d130cc43d7d674d2f478365952962b2792fd585b8d074564108bc7e9f4f7690337e4758b9a24e54fe8fd60187d3a96496a5ffc454ba674b02ecdde68efd3bb SHA512 83558231bdc592b1f69cfedf6c689063df7bd9fecdfafba6fb7f6a2c7fa7783973efb85a6a49305afc18b1aa268209ee5b9c0655756e05d7550468698dfa51ae
+DIST wine-2.20.tar.xz 19597556 BLAKE2B 80a9886fa77e5788b143521288f7d83c92754610c9426e58c759d2c33767bd23f7d2a44a17ceeec0bfe9065264393e0aa1087a0827ea7d438ffd938ba2eb2fb5 SHA512 d8d374d1e690ce9d3964fc81054fb7f4cd56cbae6bc44ebbf80b7dc7f04524baa2bd831e0be8f00de4cb0e14c1cb71780d424f5dcb9851fcaed9fb22f5ce5d23
diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.0-r1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.0-r1.ebuild
deleted file mode 100644 (file)
index d9e20be..0000000
+++ /dev/null
@@ -1,527 +0,0 @@
-# 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 flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx versionator xdg-utils
-
-MY_PN="${PN%%-*}"
-MY_P="${MY_PN}-${PV}"
-
-if [[ ${PV} == "9999" ]] ; then
-       EGIT_REPO_URI="https://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}.0/${MY_P}.tar.bz2"
-       KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
-fi
-S="${WORKDIR}/${MY_P}"
-
-GWP_V="20170830"
-PATCHDIR="${WORKDIR}/gentoo-wine-patches"
-
-DESCRIPTION="Free implementation of Windows(tm) on Unix, without external patchsets"
-HOMEPAGE="https://www.winehq.org/"
-SRC_URI="${SRC_URI}
-       https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-${GWP_V}.tar.xz
-"
-
-LICENSE="LGPL-2.1"
-SLOT="${PV}"
-IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags 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 +png prelink pulseaudio +realtime +run-exes samba scanner selinux +ssl test +threads +truetype udev +udisks v4l +X +xcomposite xinerama +xml"
-REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
-       X? ( truetype )
-       elibc_glibc? ( threads )
-       osmesa? ( opengl )
-       test? ( abi_x86_32 )" # 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}] )
-       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}] )
-       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}] )
-       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.6.4 )
-       perl? (
-               dev-lang/perl
-               dev-perl/XML-Simple
-       )
-       pulseaudio? (
-               realtime? ( sys-auth/rtkit )
-       )
-       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 )
-       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"
-
-PATCHES=(
-       "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726
-       "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
-       "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
-       "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch"
-       "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676
-       "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376
-)
-PATCHES_BIN=(
-       "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376
-)
-
-# https://bugs.gentoo.org/show_bug.cgi?id=635222
-if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then
-       DEPEND+=" dev-util/patchbin"
-fi
-
-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 "${PATCHDIR}/files/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 "${PATCHDIR}/files/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 "${PATCHDIR}/files/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 ${EGIT_COMMIT} ]]; then
-               eerror "Commits must now be specified using the environmental variables"
-               eerror "WINE_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
-       fi
-
-       default
-
-       l10n_find_plocales_changes "${S}/po" "" ".po"
-}
-
-src_prepare() {
-
-       eapply_bin(){
-               local patch
-               for patch in ${PATCHES_BIN[@]}; do
-                       patchbin --nogit < "${patch}" || die
-               done
-       }
-
-       local md5="$(md5sum server/protocol.def)"
-
-       default
-       eapply_bin
-       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, https://bugs.winehq.org/show_bug.cgi?id=24652
-       cp "${PATCHDIR}/files/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)
-       )
-
-       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 wine64 "${MY_PREFIX}"/bin/wine # 404331
-               dosym wine64-preloader "${MY_PREFIX}"/bin/wine-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
-       fi
-
-       eselect wine update --all --if-unset || die
-
-       xdg_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
-       fi
-
-       eselect wine update --all --if-unset || die
-}
-
-pkg_postrm() {
-       xdg_desktop_database_update
-}
diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.0.1-r1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.0.1-r1.ebuild
deleted file mode 100644 (file)
index 0a29750..0000000
+++ /dev/null
@@ -1,527 +0,0 @@
-# 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 flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx versionator xdg-utils
-
-MY_PN="${PN%%-*}"
-MY_P="${MY_PN}-${PV}"
-
-if [[ ${PV} == "9999" ]] ; then
-       EGIT_REPO_URI="https://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}.0/${MY_P}.tar.xz"
-       KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
-fi
-S="${WORKDIR}/${MY_P}"
-
-GWP_V="20170830"
-PATCHDIR="${WORKDIR}/gentoo-wine-patches"
-
-DESCRIPTION="Free implementation of Windows(tm) on Unix, without external patchsets"
-HOMEPAGE="https://www.winehq.org/"
-SRC_URI="${SRC_URI}
-       https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-${GWP_V}.tar.xz
-"
-
-LICENSE="LGPL-2.1"
-SLOT="${PV}"
-IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags 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 +png prelink pulseaudio +realtime +run-exes samba scanner selinux +ssl test +threads +truetype udev +udisks v4l +X +xcomposite xinerama +xml"
-REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
-       X? ( truetype )
-       elibc_glibc? ( threads )
-       osmesa? ( opengl )
-       test? ( abi_x86_32 )" # 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}] )
-       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}] )
-       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}] )
-       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.6.4 )
-       perl? (
-               dev-lang/perl
-               dev-perl/XML-Simple
-       )
-       pulseaudio? (
-               realtime? ( sys-auth/rtkit )
-       )
-       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 )
-       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"
-
-PATCHES=(
-       "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726
-       "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
-       "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
-       "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch"
-       "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676
-       "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376
-)
-PATCHES_BIN=(
-       "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376
-)
-
-# https://bugs.gentoo.org/show_bug.cgi?id=635222
-if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then
-       DEPEND+=" dev-util/patchbin"
-fi
-
-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 "${PATCHDIR}/files/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 "${PATCHDIR}/files/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 "${PATCHDIR}/files/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 ${EGIT_COMMIT} ]]; then
-               eerror "Commits must now be specified using the environmental variables"
-               eerror "WINE_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
-       fi
-
-       default
-
-       l10n_find_plocales_changes "${S}/po" "" ".po"
-}
-
-src_prepare() {
-
-       eapply_bin(){
-               local patch
-               for patch in ${PATCHES_BIN[@]}; do
-                       patchbin --nogit < "${patch}" || die
-               done
-       }
-
-       local md5="$(md5sum server/protocol.def)"
-
-       default
-       eapply_bin
-       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, https://bugs.winehq.org/show_bug.cgi?id=24652
-       cp "${PATCHDIR}/files/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)
-       )
-
-       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 wine64 "${MY_PREFIX}"/bin/wine # 404331
-               dosym wine64-preloader "${MY_PREFIX}"/bin/wine-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
-       fi
-
-       eselect wine update --all --if-unset || die
-
-       xdg_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
-       fi
-
-       eselect wine update --all --if-unset || die
-}
-
-pkg_postrm() {
-       xdg_desktop_database_update
-}
diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.0.1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.0.1.ebuild
deleted file mode 100644 (file)
index 4024b47..0000000
+++ /dev/null
@@ -1,518 +0,0 @@
-# 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 flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx versionator xdg-utils
-
-MY_PN="${PN%%-*}"
-MY_P="${MY_PN}-${PV}"
-
-if [[ ${PV} == "9999" ]] ; then
-       EGIT_REPO_URI="https://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}.0/${MY_P}.tar.xz"
-       KEYWORDS="-* amd64 x86 ~x86-fbsd"
-fi
-S="${WORKDIR}/${MY_P}"
-
-GWP_V="20170830"
-PATCHDIR="${WORKDIR}/gentoo-wine-patches"
-
-DESCRIPTION="Free implementation of Windows(tm) on Unix, without external patchsets"
-HOMEPAGE="https://www.winehq.org/"
-SRC_URI="${SRC_URI}
-       https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-${GWP_V}.tar.xz
-"
-
-LICENSE="LGPL-2.1"
-SLOT="${PV}"
-IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags 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 +png prelink pulseaudio +realtime +run-exes samba scanner selinux +ssl test +threads +truetype udev +udisks v4l +X +xcomposite xinerama +xml"
-REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
-       X? ( truetype )
-       elibc_glibc? ( threads )
-       osmesa? ( opengl )
-       test? ( abi_x86_32 )" # 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}] )
-       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}] )
-       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}] )
-       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.6.4 )
-       perl? (
-               dev-lang/perl
-               dev-perl/XML-Simple
-       )
-       pulseaudio? (
-               realtime? ( sys-auth/rtkit )
-       )
-       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 )
-       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 "${PATCHDIR}/files/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 "${PATCHDIR}/files/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 "${PATCHDIR}/files/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 ${EGIT_COMMIT} ]]; then
-               eerror "Commits must now be specified using the environmental variables"
-               eerror "WINE_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
-       fi
-
-       default
-
-       l10n_find_plocales_changes "${S}/po" "" ".po"
-}
-
-src_prepare() {
-
-       eapply_bin(){
-               local patch
-               for patch in ${PATCHES_BIN[@]}; do
-                       patchbin --nogit < "${patch}" || die
-               done
-       }
-
-       local md5="$(md5sum server/protocol.def)"
-       local PATCHES=(
-               "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726
-               "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
-               "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
-               "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch"
-       )
-       local PATCHES_BIN=(
-       )
-
-       default
-       eapply_bin
-       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, https://bugs.winehq.org/show_bug.cgi?id=24652
-       cp "${PATCHDIR}/files/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)
-       )
-
-       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 wine64 "${MY_PREFIX}"/bin/wine # 404331
-               dosym wine64-preloader "${MY_PREFIX}"/bin/wine-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
-       fi
-
-       eselect wine update --all --if-unset || die
-
-       xdg_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
-       fi
-
-       eselect wine update --all --if-unset || die
-}
-
-pkg_postrm() {
-       xdg_desktop_database_update
-}
diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.0.2-r1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.0.2-r1.ebuild
deleted file mode 100644 (file)
index 0a29750..0000000
+++ /dev/null
@@ -1,527 +0,0 @@
-# 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 flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx versionator xdg-utils
-
-MY_PN="${PN%%-*}"
-MY_P="${MY_PN}-${PV}"
-
-if [[ ${PV} == "9999" ]] ; then
-       EGIT_REPO_URI="https://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}.0/${MY_P}.tar.xz"
-       KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
-fi
-S="${WORKDIR}/${MY_P}"
-
-GWP_V="20170830"
-PATCHDIR="${WORKDIR}/gentoo-wine-patches"
-
-DESCRIPTION="Free implementation of Windows(tm) on Unix, without external patchsets"
-HOMEPAGE="https://www.winehq.org/"
-SRC_URI="${SRC_URI}
-       https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-${GWP_V}.tar.xz
-"
-
-LICENSE="LGPL-2.1"
-SLOT="${PV}"
-IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags 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 +png prelink pulseaudio +realtime +run-exes samba scanner selinux +ssl test +threads +truetype udev +udisks v4l +X +xcomposite xinerama +xml"
-REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
-       X? ( truetype )
-       elibc_glibc? ( threads )
-       osmesa? ( opengl )
-       test? ( abi_x86_32 )" # 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}] )
-       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}] )
-       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}] )
-       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.6.4 )
-       perl? (
-               dev-lang/perl
-               dev-perl/XML-Simple
-       )
-       pulseaudio? (
-               realtime? ( sys-auth/rtkit )
-       )
-       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 )
-       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"
-
-PATCHES=(
-       "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726
-       "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
-       "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
-       "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch"
-       "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676
-       "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376
-)
-PATCHES_BIN=(
-       "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376
-)
-
-# https://bugs.gentoo.org/show_bug.cgi?id=635222
-if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then
-       DEPEND+=" dev-util/patchbin"
-fi
-
-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 "${PATCHDIR}/files/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 "${PATCHDIR}/files/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 "${PATCHDIR}/files/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 ${EGIT_COMMIT} ]]; then
-               eerror "Commits must now be specified using the environmental variables"
-               eerror "WINE_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
-       fi
-
-       default
-
-       l10n_find_plocales_changes "${S}/po" "" ".po"
-}
-
-src_prepare() {
-
-       eapply_bin(){
-               local patch
-               for patch in ${PATCHES_BIN[@]}; do
-                       patchbin --nogit < "${patch}" || die
-               done
-       }
-
-       local md5="$(md5sum server/protocol.def)"
-
-       default
-       eapply_bin
-       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, https://bugs.winehq.org/show_bug.cgi?id=24652
-       cp "${PATCHDIR}/files/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)
-       )
-
-       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 wine64 "${MY_PREFIX}"/bin/wine # 404331
-               dosym wine64-preloader "${MY_PREFIX}"/bin/wine-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
-       fi
-
-       eselect wine update --all --if-unset || die
-
-       xdg_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
-       fi
-
-       eselect wine update --all --if-unset || die
-}
-
-pkg_postrm() {
-       xdg_desktop_database_update
-}
diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.0.3.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.0.3.ebuild
deleted file mode 100644 (file)
index ffa8712..0000000
+++ /dev/null
@@ -1,523 +0,0 @@
-# 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 flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx versionator xdg-utils
-
-MY_PN="${PN%%-*}"
-MY_P="${MY_PN}-${PV}"
-
-if [[ ${PV} == "9999" ]] ; then
-       EGIT_REPO_URI="https://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}.0/${MY_P}.tar.xz"
-       KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
-fi
-S="${WORKDIR}/${MY_P}"
-
-GWP_V="20170830"
-PATCHDIR="${WORKDIR}/gentoo-wine-patches"
-
-DESCRIPTION="Free implementation of Windows(tm) on Unix, without external patchsets"
-HOMEPAGE="https://www.winehq.org/"
-SRC_URI="${SRC_URI}
-       https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-${GWP_V}.tar.xz
-"
-
-LICENSE="LGPL-2.1"
-SLOT="${PV}"
-IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags 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 +png prelink pulseaudio +realtime +run-exes samba scanner selinux +ssl test +threads +truetype udev +udisks v4l +X +xcomposite xinerama +xml"
-REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
-       X? ( truetype )
-       elibc_glibc? ( threads )
-       osmesa? ( opengl )
-       test? ( abi_x86_32 )" # 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}] )
-       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}] )
-       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}] )
-       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.6.4 )
-       perl? (
-               dev-lang/perl
-               dev-perl/XML-Simple
-       )
-       pulseaudio? (
-               realtime? ( sys-auth/rtkit )
-       )
-       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 )
-       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"
-
-PATCHES=(
-       "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726
-       "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
-       "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
-       "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch"
-)
-PATCHES_BIN=()
-
-# https://bugs.gentoo.org/show_bug.cgi?id=635222
-if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then
-       DEPEND+=" dev-util/patchbin"
-fi
-
-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 "${PATCHDIR}/files/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 "${PATCHDIR}/files/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 "${PATCHDIR}/files/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 ${EGIT_COMMIT} ]]; then
-               eerror "Commits must now be specified using the environmental variables"
-               eerror "WINE_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
-       fi
-
-       default
-
-       l10n_find_plocales_changes "${S}/po" "" ".po"
-}
-
-src_prepare() {
-
-       eapply_bin(){
-               local patch
-               for patch in ${PATCHES_BIN[@]}; do
-                       patchbin --nogit < "${patch}" || die
-               done
-       }
-
-       local md5="$(md5sum server/protocol.def)"
-
-       default
-       eapply_bin
-       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, https://bugs.winehq.org/show_bug.cgi?id=24652
-       cp "${PATCHDIR}/files/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)
-       )
-
-       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 wine64 "${MY_PREFIX}"/bin/wine # 404331
-               dosym wine64-preloader "${MY_PREFIX}"/bin/wine-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
-       fi
-
-       eselect wine update --all --if-unset || die
-
-       xdg_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
-       fi
-
-       eselect wine update --all --if-unset || die
-}
-
-pkg_postrm() {
-       xdg_desktop_database_update
-}
diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.0.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.0.ebuild
deleted file mode 100644 (file)
index fec5b93..0000000
+++ /dev/null
@@ -1,518 +0,0 @@
-# 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 flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx versionator xdg-utils
-
-MY_PN="${PN%%-*}"
-MY_P="${MY_PN}-${PV}"
-
-if [[ ${PV} == "9999" ]] ; then
-       EGIT_REPO_URI="https://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}.0/${MY_P}.tar.bz2"
-       KEYWORDS="-* amd64 x86 ~x86-fbsd"
-fi
-S="${WORKDIR}/${MY_P}"
-
-GWP_V="20170830"
-PATCHDIR="${WORKDIR}/gentoo-wine-patches"
-
-DESCRIPTION="Free implementation of Windows(tm) on Unix, without external patchsets"
-HOMEPAGE="https://www.winehq.org/"
-SRC_URI="${SRC_URI}
-       https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-${GWP_V}.tar.xz
-"
-
-LICENSE="LGPL-2.1"
-SLOT="${PV}"
-IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags 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 +png prelink pulseaudio +realtime +run-exes samba scanner selinux +ssl test +threads +truetype udev +udisks v4l +X +xcomposite xinerama +xml"
-REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
-       X? ( truetype )
-       elibc_glibc? ( threads )
-       osmesa? ( opengl )
-       test? ( abi_x86_32 )" # 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}] )
-       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}] )
-       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}] )
-       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.6.4 )
-       perl? (
-               dev-lang/perl
-               dev-perl/XML-Simple
-       )
-       pulseaudio? (
-               realtime? ( sys-auth/rtkit )
-       )
-       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 )
-       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 "${PATCHDIR}/files/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 "${PATCHDIR}/files/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 "${PATCHDIR}/files/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 ${EGIT_COMMIT} ]]; then
-               eerror "Commits must now be specified using the environmental variables"
-               eerror "WINE_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
-       fi
-
-       default
-
-       l10n_find_plocales_changes "${S}/po" "" ".po"
-}
-
-src_prepare() {
-
-       eapply_bin(){
-               local patch
-               for patch in ${PATCHES_BIN[@]}; do
-                       patchbin --nogit < "${patch}" || die
-               done
-       }
-
-       local md5="$(md5sum server/protocol.def)"
-       local PATCHES=(
-               "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726
-               "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
-               "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
-               "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch"
-       )
-       local PATCHES_BIN=(
-       )
-
-       default
-       eapply_bin
-       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, https://bugs.winehq.org/show_bug.cgi?id=24652
-       cp "${PATCHDIR}/files/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)
-       )
-
-       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 wine64 "${MY_PREFIX}"/bin/wine # 404331
-               dosym wine64-preloader "${MY_PREFIX}"/bin/wine-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
-       fi
-
-       eselect wine update --all --if-unset || die
-
-       xdg_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
-       fi
-
-       eselect wine update --all --if-unset || die
-}
-
-pkg_postrm() {
-       xdg_desktop_database_update
-}
diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.1-r1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.1-r1.ebuild
deleted file mode 100644 (file)
index c94a6cc..0000000
+++ /dev/null
@@ -1,527 +0,0 @@
-# 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 flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx versionator xdg-utils
-
-MY_PN="${PN%%-*}"
-MY_P="${MY_PN}-${PV}"
-
-if [[ ${PV} == "9999" ]] ; then
-       EGIT_REPO_URI="https://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}"
-
-GWP_V="20170830"
-PATCHDIR="${WORKDIR}/gentoo-wine-patches"
-
-DESCRIPTION="Free implementation of Windows(tm) on Unix, without external patchsets"
-HOMEPAGE="https://www.winehq.org/"
-SRC_URI="${SRC_URI}
-       https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-${GWP_V}.tar.xz
-"
-
-LICENSE="LGPL-2.1"
-SLOT="${PV}"
-IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags 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 +png prelink pulseaudio +realtime +run-exes samba scanner selinux +ssl test +threads +truetype udev +udisks v4l +X +xcomposite xinerama +xml"
-REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
-       X? ( truetype )
-       elibc_glibc? ( threads )
-       osmesa? ( opengl )
-       test? ( abi_x86_32 )" # 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}] )
-       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}] )
-       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}] )
-       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.6.4 )
-       perl? (
-               dev-lang/perl
-               dev-perl/XML-Simple
-       )
-       pulseaudio? (
-               realtime? ( sys-auth/rtkit )
-       )
-       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 )
-       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"
-
-PATCHES=(
-       "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726
-       "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
-       "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
-       "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch"
-       "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676
-       "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376
-)
-PATCHES_BIN=(
-       "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376
-)
-
-# https://bugs.gentoo.org/show_bug.cgi?id=635222
-if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then
-       DEPEND+=" dev-util/patchbin"
-fi
-
-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 "${PATCHDIR}/files/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 "${PATCHDIR}/files/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 "${PATCHDIR}/files/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 ${EGIT_COMMIT} ]]; then
-               eerror "Commits must now be specified using the environmental variables"
-               eerror "WINE_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
-       fi
-
-       default
-
-       l10n_find_plocales_changes "${S}/po" "" ".po"
-}
-
-src_prepare() {
-
-       eapply_bin(){
-               local patch
-               for patch in ${PATCHES_BIN[@]}; do
-                       patchbin --nogit < "${patch}" || die
-               done
-       }
-
-       local md5="$(md5sum server/protocol.def)"
-
-       default
-       eapply_bin
-       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, https://bugs.winehq.org/show_bug.cgi?id=24652
-       cp "${PATCHDIR}/files/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)
-       )
-
-       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 wine64 "${MY_PREFIX}"/bin/wine # 404331
-               dosym wine64-preloader "${MY_PREFIX}"/bin/wine-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
-       fi
-
-       eselect wine update --all --if-unset || die
-
-       xdg_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
-       fi
-
-       eselect wine update --all --if-unset || die
-}
-
-pkg_postrm() {
-       xdg_desktop_database_update
-}
diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.10-r1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.10-r1.ebuild
deleted file mode 100644 (file)
index 0cbbf7c..0000000
+++ /dev/null
@@ -1,529 +0,0 @@
-# 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 flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx versionator xdg-utils
-
-MY_PN="${PN%%-*}"
-MY_P="${MY_PN}-${PV}"
-
-if [[ ${PV} == "9999" ]] ; then
-       EGIT_REPO_URI="https://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}"
-
-GWP_V="20170830"
-PATCHDIR="${WORKDIR}/gentoo-wine-patches"
-
-DESCRIPTION="Free implementation of Windows(tm) on Unix, without external patchsets"
-HOMEPAGE="https://www.winehq.org/"
-SRC_URI="${SRC_URI}
-       https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-${GWP_V}.tar.xz
-"
-
-LICENSE="LGPL-2.1"
-SLOT="${PV}"
-IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags 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 +png prelink pulseaudio +realtime +run-exes samba scanner selinux +ssl test +threads +truetype udev +udisks v4l +X +xcomposite xinerama +xml"
-REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
-       X? ( truetype )
-       elibc_glibc? ( threads )
-       osmesa? ( opengl )
-       test? ( abi_x86_32 )" # 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/libXfixes[${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}] )
-       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}] )
-       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}] )
-       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 )
-       )
-       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 )
-       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"
-
-PATCHES=(
-       "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726
-       "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
-       "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
-       "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch"
-       "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676
-       "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376
-)
-PATCHES_BIN=(
-       "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376
-)
-
-# https://bugs.gentoo.org/show_bug.cgi?id=635222
-if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then
-       DEPEND+=" dev-util/patchbin"
-fi
-
-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 "${PATCHDIR}/files/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 "${PATCHDIR}/files/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 "${PATCHDIR}/files/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 ${EGIT_COMMIT} ]]; then
-               eerror "Commits must now be specified using the environmental variables"
-               eerror "WINE_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
-       fi
-
-       default
-
-       l10n_find_plocales_changes "${S}/po" "" ".po"
-}
-
-src_prepare() {
-
-       eapply_bin(){
-               local patch
-               for patch in ${PATCHES_BIN[@]}; do
-                       patchbin --nogit < "${patch}" || die
-               done
-       }
-
-       local md5="$(md5sum server/protocol.def)"
-
-       default
-       eapply_bin
-       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, https://bugs.winehq.org/show_bug.cgi?id=24652
-       cp "${PATCHDIR}/files/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 X xfixes)
-               $(use_with xcomposite)
-               $(use_with xinerama)
-               $(use_with xml)
-               $(use_with xml xslt)
-       )
-
-       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 wine64 "${MY_PREFIX}"/bin/wine # 404331
-               dosym wine64-preloader "${MY_PREFIX}"/bin/wine-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
-       fi
-
-       eselect wine update --all --if-unset || die
-
-       xdg_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
-       fi
-
-       eselect wine update --all --if-unset || die
-}
-
-pkg_postrm() {
-       xdg_desktop_database_update
-}
diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.11-r1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.11-r1.ebuild
deleted file mode 100644 (file)
index 0cbbf7c..0000000
+++ /dev/null
@@ -1,529 +0,0 @@
-# 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 flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx versionator xdg-utils
-
-MY_PN="${PN%%-*}"
-MY_P="${MY_PN}-${PV}"
-
-if [[ ${PV} == "9999" ]] ; then
-       EGIT_REPO_URI="https://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}"
-
-GWP_V="20170830"
-PATCHDIR="${WORKDIR}/gentoo-wine-patches"
-
-DESCRIPTION="Free implementation of Windows(tm) on Unix, without external patchsets"
-HOMEPAGE="https://www.winehq.org/"
-SRC_URI="${SRC_URI}
-       https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-${GWP_V}.tar.xz
-"
-
-LICENSE="LGPL-2.1"
-SLOT="${PV}"
-IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags 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 +png prelink pulseaudio +realtime +run-exes samba scanner selinux +ssl test +threads +truetype udev +udisks v4l +X +xcomposite xinerama +xml"
-REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
-       X? ( truetype )
-       elibc_glibc? ( threads )
-       osmesa? ( opengl )
-       test? ( abi_x86_32 )" # 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/libXfixes[${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}] )
-       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}] )
-       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}] )
-       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 )
-       )
-       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 )
-       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"
-
-PATCHES=(
-       "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726
-       "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
-       "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
-       "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch"
-       "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676
-       "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376
-)
-PATCHES_BIN=(
-       "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376
-)
-
-# https://bugs.gentoo.org/show_bug.cgi?id=635222
-if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then
-       DEPEND+=" dev-util/patchbin"
-fi
-
-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 "${PATCHDIR}/files/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 "${PATCHDIR}/files/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 "${PATCHDIR}/files/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 ${EGIT_COMMIT} ]]; then
-               eerror "Commits must now be specified using the environmental variables"
-               eerror "WINE_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
-       fi
-
-       default
-
-       l10n_find_plocales_changes "${S}/po" "" ".po"
-}
-
-src_prepare() {
-
-       eapply_bin(){
-               local patch
-               for patch in ${PATCHES_BIN[@]}; do
-                       patchbin --nogit < "${patch}" || die
-               done
-       }
-
-       local md5="$(md5sum server/protocol.def)"
-
-       default
-       eapply_bin
-       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, https://bugs.winehq.org/show_bug.cgi?id=24652
-       cp "${PATCHDIR}/files/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 X xfixes)
-               $(use_with xcomposite)
-               $(use_with xinerama)
-               $(use_with xml)
-               $(use_with xml xslt)
-       )
-
-       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 wine64 "${MY_PREFIX}"/bin/wine # 404331
-               dosym wine64-preloader "${MY_PREFIX}"/bin/wine-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
-       fi
-
-       eselect wine update --all --if-unset || die
-
-       xdg_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
-       fi
-
-       eselect wine update --all --if-unset || die
-}
-
-pkg_postrm() {
-       xdg_desktop_database_update
-}
diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.12-r1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.12-r1.ebuild
deleted file mode 100644 (file)
index 0cbbf7c..0000000
+++ /dev/null
@@ -1,529 +0,0 @@
-# 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 flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx versionator xdg-utils
-
-MY_PN="${PN%%-*}"
-MY_P="${MY_PN}-${PV}"
-
-if [[ ${PV} == "9999" ]] ; then
-       EGIT_REPO_URI="https://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}"
-
-GWP_V="20170830"
-PATCHDIR="${WORKDIR}/gentoo-wine-patches"
-
-DESCRIPTION="Free implementation of Windows(tm) on Unix, without external patchsets"
-HOMEPAGE="https://www.winehq.org/"
-SRC_URI="${SRC_URI}
-       https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-${GWP_V}.tar.xz
-"
-
-LICENSE="LGPL-2.1"
-SLOT="${PV}"
-IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags 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 +png prelink pulseaudio +realtime +run-exes samba scanner selinux +ssl test +threads +truetype udev +udisks v4l +X +xcomposite xinerama +xml"
-REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
-       X? ( truetype )
-       elibc_glibc? ( threads )
-       osmesa? ( opengl )
-       test? ( abi_x86_32 )" # 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/libXfixes[${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}] )
-       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}] )
-       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}] )
-       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 )
-       )
-       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 )
-       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"
-
-PATCHES=(
-       "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726
-       "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
-       "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
-       "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch"
-       "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676
-       "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376
-)
-PATCHES_BIN=(
-       "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376
-)
-
-# https://bugs.gentoo.org/show_bug.cgi?id=635222
-if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then
-       DEPEND+=" dev-util/patchbin"
-fi
-
-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 "${PATCHDIR}/files/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 "${PATCHDIR}/files/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 "${PATCHDIR}/files/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 ${EGIT_COMMIT} ]]; then
-               eerror "Commits must now be specified using the environmental variables"
-               eerror "WINE_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
-       fi
-
-       default
-
-       l10n_find_plocales_changes "${S}/po" "" ".po"
-}
-
-src_prepare() {
-
-       eapply_bin(){
-               local patch
-               for patch in ${PATCHES_BIN[@]}; do
-                       patchbin --nogit < "${patch}" || die
-               done
-       }
-
-       local md5="$(md5sum server/protocol.def)"
-
-       default
-       eapply_bin
-       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, https://bugs.winehq.org/show_bug.cgi?id=24652
-       cp "${PATCHDIR}/files/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 X xfixes)
-               $(use_with xcomposite)
-               $(use_with xinerama)
-               $(use_with xml)
-               $(use_with xml xslt)
-       )
-
-       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 wine64 "${MY_PREFIX}"/bin/wine # 404331
-               dosym wine64-preloader "${MY_PREFIX}"/bin/wine-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
-       fi
-
-       eselect wine update --all --if-unset || die
-
-       xdg_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
-       fi
-
-       eselect wine update --all --if-unset || die
-}
-
-pkg_postrm() {
-       xdg_desktop_database_update
-}
diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.13-r1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.13-r1.ebuild
deleted file mode 100644 (file)
index 0cbbf7c..0000000
+++ /dev/null
@@ -1,529 +0,0 @@
-# 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 flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx versionator xdg-utils
-
-MY_PN="${PN%%-*}"
-MY_P="${MY_PN}-${PV}"
-
-if [[ ${PV} == "9999" ]] ; then
-       EGIT_REPO_URI="https://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}"
-
-GWP_V="20170830"
-PATCHDIR="${WORKDIR}/gentoo-wine-patches"
-
-DESCRIPTION="Free implementation of Windows(tm) on Unix, without external patchsets"
-HOMEPAGE="https://www.winehq.org/"
-SRC_URI="${SRC_URI}
-       https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-${GWP_V}.tar.xz
-"
-
-LICENSE="LGPL-2.1"
-SLOT="${PV}"
-IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags 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 +png prelink pulseaudio +realtime +run-exes samba scanner selinux +ssl test +threads +truetype udev +udisks v4l +X +xcomposite xinerama +xml"
-REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
-       X? ( truetype )
-       elibc_glibc? ( threads )
-       osmesa? ( opengl )
-       test? ( abi_x86_32 )" # 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/libXfixes[${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}] )
-       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}] )
-       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}] )
-       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 )
-       )
-       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 )
-       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"
-
-PATCHES=(
-       "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726
-       "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
-       "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
-       "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch"
-       "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676
-       "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376
-)
-PATCHES_BIN=(
-       "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376
-)
-
-# https://bugs.gentoo.org/show_bug.cgi?id=635222
-if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then
-       DEPEND+=" dev-util/patchbin"
-fi
-
-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 "${PATCHDIR}/files/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 "${PATCHDIR}/files/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 "${PATCHDIR}/files/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 ${EGIT_COMMIT} ]]; then
-               eerror "Commits must now be specified using the environmental variables"
-               eerror "WINE_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
-       fi
-
-       default
-
-       l10n_find_plocales_changes "${S}/po" "" ".po"
-}
-
-src_prepare() {
-
-       eapply_bin(){
-               local patch
-               for patch in ${PATCHES_BIN[@]}; do
-                       patchbin --nogit < "${patch}" || die
-               done
-       }
-
-       local md5="$(md5sum server/protocol.def)"
-
-       default
-       eapply_bin
-       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, https://bugs.winehq.org/show_bug.cgi?id=24652
-       cp "${PATCHDIR}/files/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 X xfixes)
-               $(use_with xcomposite)
-               $(use_with xinerama)
-               $(use_with xml)
-               $(use_with xml xslt)
-       )
-
-       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 wine64 "${MY_PREFIX}"/bin/wine # 404331
-               dosym wine64-preloader "${MY_PREFIX}"/bin/wine-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
-       fi
-
-       eselect wine update --all --if-unset || die
-
-       xdg_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
-       fi
-
-       eselect wine update --all --if-unset || die
-}
-
-pkg_postrm() {
-       xdg_desktop_database_update
-}
diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.14-r1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.14-r1.ebuild
deleted file mode 100644 (file)
index 7a67404..0000000
+++ /dev/null
@@ -1,529 +0,0 @@
-# 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 flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx versionator xdg-utils
-
-MY_PN="${PN%%-*}"
-MY_P="${MY_PN}-${PV}"
-
-if [[ ${PV} == "9999" ]] ; then
-       EGIT_REPO_URI="https://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}"
-
-GWP_V="20170830"
-PATCHDIR="${WORKDIR}/gentoo-wine-patches"
-
-DESCRIPTION="Free implementation of Windows(tm) on Unix, without external patchsets"
-HOMEPAGE="https://www.winehq.org/"
-SRC_URI="${SRC_URI}
-       https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-${GWP_V}.tar.xz
-"
-
-LICENSE="LGPL-2.1"
-SLOT="${PV}"
-IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags 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 +png prelink pulseaudio +realtime +run-exes samba scanner selinux +ssl test +threads +truetype udev +udisks v4l +X +xcomposite xinerama +xml"
-REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
-       X? ( truetype )
-       elibc_glibc? ( threads )
-       osmesa? ( opengl )
-       test? ( abi_x86_32 )" # 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/libXfixes[${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}] )
-       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}] )
-       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}] )
-       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.1 )
-       perl? (
-               dev-lang/perl
-               dev-perl/XML-Simple
-       )
-       pulseaudio? (
-               realtime? ( sys-auth/rtkit )
-       )
-       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 )
-       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"
-
-PATCHES=(
-       "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726
-       "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
-       "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
-       "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch"
-       "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676
-       "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376
-)
-PATCHES_BIN=(
-       "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376
-)
-
-# https://bugs.gentoo.org/show_bug.cgi?id=635222
-if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then
-       DEPEND+=" dev-util/patchbin"
-fi
-
-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 "${PATCHDIR}/files/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 "${PATCHDIR}/files/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 "${PATCHDIR}/files/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 ${EGIT_COMMIT} ]]; then
-               eerror "Commits must now be specified using the environmental variables"
-               eerror "WINE_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
-       fi
-
-       default
-
-       l10n_find_plocales_changes "${S}/po" "" ".po"
-}
-
-src_prepare() {
-
-       eapply_bin(){
-               local patch
-               for patch in ${PATCHES_BIN[@]}; do
-                       patchbin --nogit < "${patch}" || die
-               done
-       }
-
-       local md5="$(md5sum server/protocol.def)"
-
-       default
-       eapply_bin
-       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, https://bugs.winehq.org/show_bug.cgi?id=24652
-       cp "${PATCHDIR}/files/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 X xfixes)
-               $(use_with xcomposite)
-               $(use_with xinerama)
-               $(use_with xml)
-               $(use_with xml xslt)
-       )
-
-       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 wine64 "${MY_PREFIX}"/bin/wine # 404331
-               dosym wine64-preloader "${MY_PREFIX}"/bin/wine-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
-       fi
-
-       eselect wine update --all --if-unset || die
-
-       xdg_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
-       fi
-
-       eselect wine update --all --if-unset || die
-}
-
-pkg_postrm() {
-       xdg_desktop_database_update
-}
diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.15-r1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.15-r1.ebuild
deleted file mode 100644 (file)
index 7a67404..0000000
+++ /dev/null
@@ -1,529 +0,0 @@
-# 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 flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx versionator xdg-utils
-
-MY_PN="${PN%%-*}"
-MY_P="${MY_PN}-${PV}"
-
-if [[ ${PV} == "9999" ]] ; then
-       EGIT_REPO_URI="https://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}"
-
-GWP_V="20170830"
-PATCHDIR="${WORKDIR}/gentoo-wine-patches"
-
-DESCRIPTION="Free implementation of Windows(tm) on Unix, without external patchsets"
-HOMEPAGE="https://www.winehq.org/"
-SRC_URI="${SRC_URI}
-       https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-${GWP_V}.tar.xz
-"
-
-LICENSE="LGPL-2.1"
-SLOT="${PV}"
-IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags 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 +png prelink pulseaudio +realtime +run-exes samba scanner selinux +ssl test +threads +truetype udev +udisks v4l +X +xcomposite xinerama +xml"
-REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
-       X? ( truetype )
-       elibc_glibc? ( threads )
-       osmesa? ( opengl )
-       test? ( abi_x86_32 )" # 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/libXfixes[${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}] )
-       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}] )
-       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}] )
-       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.1 )
-       perl? (
-               dev-lang/perl
-               dev-perl/XML-Simple
-       )
-       pulseaudio? (
-               realtime? ( sys-auth/rtkit )
-       )
-       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 )
-       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"
-
-PATCHES=(
-       "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726
-       "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
-       "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
-       "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch"
-       "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676
-       "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376
-)
-PATCHES_BIN=(
-       "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376
-)
-
-# https://bugs.gentoo.org/show_bug.cgi?id=635222
-if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then
-       DEPEND+=" dev-util/patchbin"
-fi
-
-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 "${PATCHDIR}/files/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 "${PATCHDIR}/files/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 "${PATCHDIR}/files/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 ${EGIT_COMMIT} ]]; then
-               eerror "Commits must now be specified using the environmental variables"
-               eerror "WINE_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
-       fi
-
-       default
-
-       l10n_find_plocales_changes "${S}/po" "" ".po"
-}
-
-src_prepare() {
-
-       eapply_bin(){
-               local patch
-               for patch in ${PATCHES_BIN[@]}; do
-                       patchbin --nogit < "${patch}" || die
-               done
-       }
-
-       local md5="$(md5sum server/protocol.def)"
-
-       default
-       eapply_bin
-       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, https://bugs.winehq.org/show_bug.cgi?id=24652
-       cp "${PATCHDIR}/files/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 X xfixes)
-               $(use_with xcomposite)
-               $(use_with xinerama)
-               $(use_with xml)
-               $(use_with xml xslt)
-       )
-
-       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 wine64 "${MY_PREFIX}"/bin/wine # 404331
-               dosym wine64-preloader "${MY_PREFIX}"/bin/wine-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
-       fi
-
-       eselect wine update --all --if-unset || die
-
-       xdg_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
-       fi
-
-       eselect wine update --all --if-unset || die
-}
-
-pkg_postrm() {
-       xdg_desktop_database_update
-}
diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.16-r1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.16-r1.ebuild
deleted file mode 100644 (file)
index 7a67404..0000000
+++ /dev/null
@@ -1,529 +0,0 @@
-# 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 flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx versionator xdg-utils
-
-MY_PN="${PN%%-*}"
-MY_P="${MY_PN}-${PV}"
-
-if [[ ${PV} == "9999" ]] ; then
-       EGIT_REPO_URI="https://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}"
-
-GWP_V="20170830"
-PATCHDIR="${WORKDIR}/gentoo-wine-patches"
-
-DESCRIPTION="Free implementation of Windows(tm) on Unix, without external patchsets"
-HOMEPAGE="https://www.winehq.org/"
-SRC_URI="${SRC_URI}
-       https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-${GWP_V}.tar.xz
-"
-
-LICENSE="LGPL-2.1"
-SLOT="${PV}"
-IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags 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 +png prelink pulseaudio +realtime +run-exes samba scanner selinux +ssl test +threads +truetype udev +udisks v4l +X +xcomposite xinerama +xml"
-REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
-       X? ( truetype )
-       elibc_glibc? ( threads )
-       osmesa? ( opengl )
-       test? ( abi_x86_32 )" # 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/libXfixes[${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}] )
-       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}] )
-       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}] )
-       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.1 )
-       perl? (
-               dev-lang/perl
-               dev-perl/XML-Simple
-       )
-       pulseaudio? (
-               realtime? ( sys-auth/rtkit )
-       )
-       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 )
-       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"
-
-PATCHES=(
-       "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726
-       "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
-       "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
-       "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch"
-       "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676
-       "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376
-)
-PATCHES_BIN=(
-       "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376
-)
-
-# https://bugs.gentoo.org/show_bug.cgi?id=635222
-if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then
-       DEPEND+=" dev-util/patchbin"
-fi
-
-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 "${PATCHDIR}/files/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 "${PATCHDIR}/files/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 "${PATCHDIR}/files/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 ${EGIT_COMMIT} ]]; then
-               eerror "Commits must now be specified using the environmental variables"
-               eerror "WINE_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
-       fi
-
-       default
-
-       l10n_find_plocales_changes "${S}/po" "" ".po"
-}
-
-src_prepare() {
-
-       eapply_bin(){
-               local patch
-               for patch in ${PATCHES_BIN[@]}; do
-                       patchbin --nogit < "${patch}" || die
-               done
-       }
-
-       local md5="$(md5sum server/protocol.def)"
-
-       default
-       eapply_bin
-       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, https://bugs.winehq.org/show_bug.cgi?id=24652
-       cp "${PATCHDIR}/files/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 X xfixes)
-               $(use_with xcomposite)
-               $(use_with xinerama)
-               $(use_with xml)
-               $(use_with xml xslt)
-       )
-
-       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 wine64 "${MY_PREFIX}"/bin/wine # 404331
-               dosym wine64-preloader "${MY_PREFIX}"/bin/wine-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
-       fi
-
-       eselect wine update --all --if-unset || die
-
-       xdg_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
-       fi
-
-       eselect wine update --all --if-unset || die
-}
-
-pkg_postrm() {
-       xdg_desktop_database_update
-}
diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.17-r1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.17-r1.ebuild
deleted file mode 100644 (file)
index 7a67404..0000000
+++ /dev/null
@@ -1,529 +0,0 @@
-# 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 flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx versionator xdg-utils
-
-MY_PN="${PN%%-*}"
-MY_P="${MY_PN}-${PV}"
-
-if [[ ${PV} == "9999" ]] ; then
-       EGIT_REPO_URI="https://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}"
-
-GWP_V="20170830"
-PATCHDIR="${WORKDIR}/gentoo-wine-patches"
-
-DESCRIPTION="Free implementation of Windows(tm) on Unix, without external patchsets"
-HOMEPAGE="https://www.winehq.org/"
-SRC_URI="${SRC_URI}
-       https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-${GWP_V}.tar.xz
-"
-
-LICENSE="LGPL-2.1"
-SLOT="${PV}"
-IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags 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 +png prelink pulseaudio +realtime +run-exes samba scanner selinux +ssl test +threads +truetype udev +udisks v4l +X +xcomposite xinerama +xml"
-REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
-       X? ( truetype )
-       elibc_glibc? ( threads )
-       osmesa? ( opengl )
-       test? ( abi_x86_32 )" # 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/libXfixes[${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}] )
-       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}] )
-       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}] )
-       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.1 )
-       perl? (
-               dev-lang/perl
-               dev-perl/XML-Simple
-       )
-       pulseaudio? (
-               realtime? ( sys-auth/rtkit )
-       )
-       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 )
-       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"
-
-PATCHES=(
-       "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726
-       "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
-       "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
-       "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch"
-       "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676
-       "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376
-)
-PATCHES_BIN=(
-       "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376
-)
-
-# https://bugs.gentoo.org/show_bug.cgi?id=635222
-if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then
-       DEPEND+=" dev-util/patchbin"
-fi
-
-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 "${PATCHDIR}/files/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 "${PATCHDIR}/files/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 "${PATCHDIR}/files/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 ${EGIT_COMMIT} ]]; then
-               eerror "Commits must now be specified using the environmental variables"
-               eerror "WINE_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
-       fi
-
-       default
-
-       l10n_find_plocales_changes "${S}/po" "" ".po"
-}
-
-src_prepare() {
-
-       eapply_bin(){
-               local patch
-               for patch in ${PATCHES_BIN[@]}; do
-                       patchbin --nogit < "${patch}" || die
-               done
-       }
-
-       local md5="$(md5sum server/protocol.def)"
-
-       default
-       eapply_bin
-       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, https://bugs.winehq.org/show_bug.cgi?id=24652
-       cp "${PATCHDIR}/files/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 X xfixes)
-               $(use_with xcomposite)
-               $(use_with xinerama)
-               $(use_with xml)
-               $(use_with xml xslt)
-       )
-
-       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 wine64 "${MY_PREFIX}"/bin/wine # 404331
-               dosym wine64-preloader "${MY_PREFIX}"/bin/wine-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
-       fi
-
-       eselect wine update --all --if-unset || die
-
-       xdg_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
-       fi
-
-       eselect wine update --all --if-unset || die
-}
-
-pkg_postrm() {
-       xdg_desktop_database_update
-}
diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.2-r1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.2-r1.ebuild
deleted file mode 100644 (file)
index c94a6cc..0000000
+++ /dev/null
@@ -1,527 +0,0 @@
-# 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 flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx versionator xdg-utils
-
-MY_PN="${PN%%-*}"
-MY_P="${MY_PN}-${PV}"
-
-if [[ ${PV} == "9999" ]] ; then
-       EGIT_REPO_URI="https://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}"
-
-GWP_V="20170830"
-PATCHDIR="${WORKDIR}/gentoo-wine-patches"
-
-DESCRIPTION="Free implementation of Windows(tm) on Unix, without external patchsets"
-HOMEPAGE="https://www.winehq.org/"
-SRC_URI="${SRC_URI}
-       https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-${GWP_V}.tar.xz
-"
-
-LICENSE="LGPL-2.1"
-SLOT="${PV}"
-IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags 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 +png prelink pulseaudio +realtime +run-exes samba scanner selinux +ssl test +threads +truetype udev +udisks v4l +X +xcomposite xinerama +xml"
-REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
-       X? ( truetype )
-       elibc_glibc? ( threads )
-       osmesa? ( opengl )
-       test? ( abi_x86_32 )" # 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}] )
-       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}] )
-       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}] )
-       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.6.4 )
-       perl? (
-               dev-lang/perl
-               dev-perl/XML-Simple
-       )
-       pulseaudio? (
-               realtime? ( sys-auth/rtkit )
-       )
-       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 )
-       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"
-
-PATCHES=(
-       "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726
-       "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
-       "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
-       "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch"
-       "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676
-       "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376
-)
-PATCHES_BIN=(
-       "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376
-)
-
-# https://bugs.gentoo.org/show_bug.cgi?id=635222
-if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then
-       DEPEND+=" dev-util/patchbin"
-fi
-
-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 "${PATCHDIR}/files/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 "${PATCHDIR}/files/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 "${PATCHDIR}/files/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 ${EGIT_COMMIT} ]]; then
-               eerror "Commits must now be specified using the environmental variables"
-               eerror "WINE_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
-       fi
-
-       default
-
-       l10n_find_plocales_changes "${S}/po" "" ".po"
-}
-
-src_prepare() {
-
-       eapply_bin(){
-               local patch
-               for patch in ${PATCHES_BIN[@]}; do
-                       patchbin --nogit < "${patch}" || die
-               done
-       }
-
-       local md5="$(md5sum server/protocol.def)"
-
-       default
-       eapply_bin
-       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, https://bugs.winehq.org/show_bug.cgi?id=24652
-       cp "${PATCHDIR}/files/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)
-       )
-
-       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 wine64 "${MY_PREFIX}"/bin/wine # 404331
-               dosym wine64-preloader "${MY_PREFIX}"/bin/wine-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
-       fi
-
-       eselect wine update --all --if-unset || die
-
-       xdg_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
-       fi
-
-       eselect wine update --all --if-unset || die
-}
-
-pkg_postrm() {
-       xdg_desktop_database_update
-}
diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.3-r1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.3-r1.ebuild
deleted file mode 100644 (file)
index c94a6cc..0000000
+++ /dev/null
@@ -1,527 +0,0 @@
-# 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 flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx versionator xdg-utils
-
-MY_PN="${PN%%-*}"
-MY_P="${MY_PN}-${PV}"
-
-if [[ ${PV} == "9999" ]] ; then
-       EGIT_REPO_URI="https://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}"
-
-GWP_V="20170830"
-PATCHDIR="${WORKDIR}/gentoo-wine-patches"
-
-DESCRIPTION="Free implementation of Windows(tm) on Unix, without external patchsets"
-HOMEPAGE="https://www.winehq.org/"
-SRC_URI="${SRC_URI}
-       https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-${GWP_V}.tar.xz
-"
-
-LICENSE="LGPL-2.1"
-SLOT="${PV}"
-IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags 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 +png prelink pulseaudio +realtime +run-exes samba scanner selinux +ssl test +threads +truetype udev +udisks v4l +X +xcomposite xinerama +xml"
-REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
-       X? ( truetype )
-       elibc_glibc? ( threads )
-       osmesa? ( opengl )
-       test? ( abi_x86_32 )" # 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}] )
-       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}] )
-       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}] )
-       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.6.4 )
-       perl? (
-               dev-lang/perl
-               dev-perl/XML-Simple
-       )
-       pulseaudio? (
-               realtime? ( sys-auth/rtkit )
-       )
-       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 )
-       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"
-
-PATCHES=(
-       "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726
-       "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
-       "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
-       "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch"
-       "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676
-       "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376
-)
-PATCHES_BIN=(
-       "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376
-)
-
-# https://bugs.gentoo.org/show_bug.cgi?id=635222
-if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then
-       DEPEND+=" dev-util/patchbin"
-fi
-
-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 "${PATCHDIR}/files/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 "${PATCHDIR}/files/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 "${PATCHDIR}/files/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 ${EGIT_COMMIT} ]]; then
-               eerror "Commits must now be specified using the environmental variables"
-               eerror "WINE_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
-       fi
-
-       default
-
-       l10n_find_plocales_changes "${S}/po" "" ".po"
-}
-
-src_prepare() {
-
-       eapply_bin(){
-               local patch
-               for patch in ${PATCHES_BIN[@]}; do
-                       patchbin --nogit < "${patch}" || die
-               done
-       }
-
-       local md5="$(md5sum server/protocol.def)"
-
-       default
-       eapply_bin
-       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, https://bugs.winehq.org/show_bug.cgi?id=24652
-       cp "${PATCHDIR}/files/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)
-       )
-
-       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 wine64 "${MY_PREFIX}"/bin/wine # 404331
-               dosym wine64-preloader "${MY_PREFIX}"/bin/wine-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
-       fi
-
-       eselect wine update --all --if-unset || die
-
-       xdg_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
-       fi
-
-       eselect wine update --all --if-unset || die
-}
-
-pkg_postrm() {
-       xdg_desktop_database_update
-}
diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.4-r1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.4-r1.ebuild
deleted file mode 100644 (file)
index a69e75d..0000000
+++ /dev/null
@@ -1,527 +0,0 @@
-# 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 flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx versionator xdg-utils
-
-MY_PN="${PN%%-*}"
-MY_P="${MY_PN}-${PV}"
-
-if [[ ${PV} == "9999" ]] ; then
-       EGIT_REPO_URI="https://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}"
-
-GWP_V="20170830"
-PATCHDIR="${WORKDIR}/gentoo-wine-patches"
-
-DESCRIPTION="Free implementation of Windows(tm) on Unix, without external patchsets"
-HOMEPAGE="https://www.winehq.org/"
-SRC_URI="${SRC_URI}
-       https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-${GWP_V}.tar.xz
-"
-
-LICENSE="LGPL-2.1"
-SLOT="${PV}"
-IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags 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 +png prelink pulseaudio +realtime +run-exes samba scanner selinux +ssl test +threads +truetype udev +udisks v4l +X +xcomposite xinerama +xml"
-REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
-       X? ( truetype )
-       elibc_glibc? ( threads )
-       osmesa? ( opengl )
-       test? ( abi_x86_32 )" # 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}] )
-       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}] )
-       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}] )
-       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 )
-       )
-       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 )
-       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"
-
-PATCHES=(
-       "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726
-       "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
-       "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
-       "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch"
-       "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676
-       "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376
-)
-PATCHES_BIN=(
-       "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376
-)
-
-# https://bugs.gentoo.org/show_bug.cgi?id=635222
-if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then
-       DEPEND+=" dev-util/patchbin"
-fi
-
-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 "${PATCHDIR}/files/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 "${PATCHDIR}/files/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 "${PATCHDIR}/files/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 ${EGIT_COMMIT} ]]; then
-               eerror "Commits must now be specified using the environmental variables"
-               eerror "WINE_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
-       fi
-
-       default
-
-       l10n_find_plocales_changes "${S}/po" "" ".po"
-}
-
-src_prepare() {
-
-       eapply_bin(){
-               local patch
-               for patch in ${PATCHES_BIN[@]}; do
-                       patchbin --nogit < "${patch}" || die
-               done
-       }
-
-       local md5="$(md5sum server/protocol.def)"
-
-       default
-       eapply_bin
-       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, https://bugs.winehq.org/show_bug.cgi?id=24652
-       cp "${PATCHDIR}/files/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)
-       )
-
-       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 wine64 "${MY_PREFIX}"/bin/wine # 404331
-               dosym wine64-preloader "${MY_PREFIX}"/bin/wine-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
-       fi
-
-       eselect wine update --all --if-unset || die
-
-       xdg_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
-       fi
-
-       eselect wine update --all --if-unset || die
-}
-
-pkg_postrm() {
-       xdg_desktop_database_update
-}
diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.5-r1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.5-r1.ebuild
deleted file mode 100644 (file)
index a69e75d..0000000
+++ /dev/null
@@ -1,527 +0,0 @@
-# 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 flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx versionator xdg-utils
-
-MY_PN="${PN%%-*}"
-MY_P="${MY_PN}-${PV}"
-
-if [[ ${PV} == "9999" ]] ; then
-       EGIT_REPO_URI="https://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}"
-
-GWP_V="20170830"
-PATCHDIR="${WORKDIR}/gentoo-wine-patches"
-
-DESCRIPTION="Free implementation of Windows(tm) on Unix, without external patchsets"
-HOMEPAGE="https://www.winehq.org/"
-SRC_URI="${SRC_URI}
-       https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-${GWP_V}.tar.xz
-"
-
-LICENSE="LGPL-2.1"
-SLOT="${PV}"
-IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags 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 +png prelink pulseaudio +realtime +run-exes samba scanner selinux +ssl test +threads +truetype udev +udisks v4l +X +xcomposite xinerama +xml"
-REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
-       X? ( truetype )
-       elibc_glibc? ( threads )
-       osmesa? ( opengl )
-       test? ( abi_x86_32 )" # 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}] )
-       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}] )
-       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}] )
-       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 )
-       )
-       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 )
-       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"
-
-PATCHES=(
-       "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726
-       "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
-       "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
-       "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch"
-       "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676
-       "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376
-)
-PATCHES_BIN=(
-       "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376
-)
-
-# https://bugs.gentoo.org/show_bug.cgi?id=635222
-if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then
-       DEPEND+=" dev-util/patchbin"
-fi
-
-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 "${PATCHDIR}/files/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 "${PATCHDIR}/files/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 "${PATCHDIR}/files/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 ${EGIT_COMMIT} ]]; then
-               eerror "Commits must now be specified using the environmental variables"
-               eerror "WINE_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
-       fi
-
-       default
-
-       l10n_find_plocales_changes "${S}/po" "" ".po"
-}
-
-src_prepare() {
-
-       eapply_bin(){
-               local patch
-               for patch in ${PATCHES_BIN[@]}; do
-                       patchbin --nogit < "${patch}" || die
-               done
-       }
-
-       local md5="$(md5sum server/protocol.def)"
-
-       default
-       eapply_bin
-       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, https://bugs.winehq.org/show_bug.cgi?id=24652
-       cp "${PATCHDIR}/files/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)
-       )
-
-       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 wine64 "${MY_PREFIX}"/bin/wine # 404331
-               dosym wine64-preloader "${MY_PREFIX}"/bin/wine-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
-       fi
-
-       eselect wine update --all --if-unset || die
-
-       xdg_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
-       fi
-
-       eselect wine update --all --if-unset || die
-}
-
-pkg_postrm() {
-       xdg_desktop_database_update
-}
diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.6-r1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.6-r1.ebuild
deleted file mode 100644 (file)
index a69e75d..0000000
+++ /dev/null
@@ -1,527 +0,0 @@
-# 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 flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx versionator xdg-utils
-
-MY_PN="${PN%%-*}"
-MY_P="${MY_PN}-${PV}"
-
-if [[ ${PV} == "9999" ]] ; then
-       EGIT_REPO_URI="https://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}"
-
-GWP_V="20170830"
-PATCHDIR="${WORKDIR}/gentoo-wine-patches"
-
-DESCRIPTION="Free implementation of Windows(tm) on Unix, without external patchsets"
-HOMEPAGE="https://www.winehq.org/"
-SRC_URI="${SRC_URI}
-       https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-${GWP_V}.tar.xz
-"
-
-LICENSE="LGPL-2.1"
-SLOT="${PV}"
-IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags 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 +png prelink pulseaudio +realtime +run-exes samba scanner selinux +ssl test +threads +truetype udev +udisks v4l +X +xcomposite xinerama +xml"
-REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
-       X? ( truetype )
-       elibc_glibc? ( threads )
-       osmesa? ( opengl )
-       test? ( abi_x86_32 )" # 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}] )
-       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}] )
-       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}] )
-       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 )
-       )
-       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 )
-       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"
-
-PATCHES=(
-       "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726
-       "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
-       "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
-       "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch"
-       "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676
-       "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376
-)
-PATCHES_BIN=(
-       "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376
-)
-
-# https://bugs.gentoo.org/show_bug.cgi?id=635222
-if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then
-       DEPEND+=" dev-util/patchbin"
-fi
-
-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 "${PATCHDIR}/files/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 "${PATCHDIR}/files/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 "${PATCHDIR}/files/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 ${EGIT_COMMIT} ]]; then
-               eerror "Commits must now be specified using the environmental variables"
-               eerror "WINE_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
-       fi
-
-       default
-
-       l10n_find_plocales_changes "${S}/po" "" ".po"
-}
-
-src_prepare() {
-
-       eapply_bin(){
-               local patch
-               for patch in ${PATCHES_BIN[@]}; do
-                       patchbin --nogit < "${patch}" || die
-               done
-       }
-
-       local md5="$(md5sum server/protocol.def)"
-
-       default
-       eapply_bin
-       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, https://bugs.winehq.org/show_bug.cgi?id=24652
-       cp "${PATCHDIR}/files/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)
-       )
-
-       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 wine64 "${MY_PREFIX}"/bin/wine # 404331
-               dosym wine64-preloader "${MY_PREFIX}"/bin/wine-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
-       fi
-
-       eselect wine update --all --if-unset || die
-
-       xdg_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
-       fi
-
-       eselect wine update --all --if-unset || die
-}
-
-pkg_postrm() {
-       xdg_desktop_database_update
-}
diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.7-r1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.7-r1.ebuild
deleted file mode 100644 (file)
index a69e75d..0000000
+++ /dev/null
@@ -1,527 +0,0 @@
-# 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 flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx versionator xdg-utils
-
-MY_PN="${PN%%-*}"
-MY_P="${MY_PN}-${PV}"
-
-if [[ ${PV} == "9999" ]] ; then
-       EGIT_REPO_URI="https://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}"
-
-GWP_V="20170830"
-PATCHDIR="${WORKDIR}/gentoo-wine-patches"
-
-DESCRIPTION="Free implementation of Windows(tm) on Unix, without external patchsets"
-HOMEPAGE="https://www.winehq.org/"
-SRC_URI="${SRC_URI}
-       https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-${GWP_V}.tar.xz
-"
-
-LICENSE="LGPL-2.1"
-SLOT="${PV}"
-IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags 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 +png prelink pulseaudio +realtime +run-exes samba scanner selinux +ssl test +threads +truetype udev +udisks v4l +X +xcomposite xinerama +xml"
-REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
-       X? ( truetype )
-       elibc_glibc? ( threads )
-       osmesa? ( opengl )
-       test? ( abi_x86_32 )" # 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}] )
-       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}] )
-       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}] )
-       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 )
-       )
-       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 )
-       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"
-
-PATCHES=(
-       "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726
-       "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
-       "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
-       "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch"
-       "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676
-       "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376
-)
-PATCHES_BIN=(
-       "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376
-)
-
-# https://bugs.gentoo.org/show_bug.cgi?id=635222
-if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then
-       DEPEND+=" dev-util/patchbin"
-fi
-
-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 "${PATCHDIR}/files/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 "${PATCHDIR}/files/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 "${PATCHDIR}/files/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 ${EGIT_COMMIT} ]]; then
-               eerror "Commits must now be specified using the environmental variables"
-               eerror "WINE_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
-       fi
-
-       default
-
-       l10n_find_plocales_changes "${S}/po" "" ".po"
-}
-
-src_prepare() {
-
-       eapply_bin(){
-               local patch
-               for patch in ${PATCHES_BIN[@]}; do
-                       patchbin --nogit < "${patch}" || die
-               done
-       }
-
-       local md5="$(md5sum server/protocol.def)"
-
-       default
-       eapply_bin
-       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, https://bugs.winehq.org/show_bug.cgi?id=24652
-       cp "${PATCHDIR}/files/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)
-       )
-
-       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 wine64 "${MY_PREFIX}"/bin/wine # 404331
-               dosym wine64-preloader "${MY_PREFIX}"/bin/wine-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
-       fi
-
-       eselect wine update --all --if-unset || die
-
-       xdg_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
-       fi
-
-       eselect wine update --all --if-unset || die
-}
-
-pkg_postrm() {
-       xdg_desktop_database_update
-}
diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.8-r1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.8-r1.ebuild
deleted file mode 100644 (file)
index a69e75d..0000000
+++ /dev/null
@@ -1,527 +0,0 @@
-# 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 flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx versionator xdg-utils
-
-MY_PN="${PN%%-*}"
-MY_P="${MY_PN}-${PV}"
-
-if [[ ${PV} == "9999" ]] ; then
-       EGIT_REPO_URI="https://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}"
-
-GWP_V="20170830"
-PATCHDIR="${WORKDIR}/gentoo-wine-patches"
-
-DESCRIPTION="Free implementation of Windows(tm) on Unix, without external patchsets"
-HOMEPAGE="https://www.winehq.org/"
-SRC_URI="${SRC_URI}
-       https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-${GWP_V}.tar.xz
-"
-
-LICENSE="LGPL-2.1"
-SLOT="${PV}"
-IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags 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 +png prelink pulseaudio +realtime +run-exes samba scanner selinux +ssl test +threads +truetype udev +udisks v4l +X +xcomposite xinerama +xml"
-REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
-       X? ( truetype )
-       elibc_glibc? ( threads )
-       osmesa? ( opengl )
-       test? ( abi_x86_32 )" # 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}] )
-       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}] )
-       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}] )
-       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 )
-       )
-       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 )
-       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"
-
-PATCHES=(
-       "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726
-       "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
-       "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
-       "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch"
-       "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676
-       "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376
-)
-PATCHES_BIN=(
-       "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376
-)
-
-# https://bugs.gentoo.org/show_bug.cgi?id=635222
-if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then
-       DEPEND+=" dev-util/patchbin"
-fi
-
-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 "${PATCHDIR}/files/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 "${PATCHDIR}/files/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 "${PATCHDIR}/files/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 ${EGIT_COMMIT} ]]; then
-               eerror "Commits must now be specified using the environmental variables"
-               eerror "WINE_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
-       fi
-
-       default
-
-       l10n_find_plocales_changes "${S}/po" "" ".po"
-}
-
-src_prepare() {
-
-       eapply_bin(){
-               local patch
-               for patch in ${PATCHES_BIN[@]}; do
-                       patchbin --nogit < "${patch}" || die
-               done
-       }
-
-       local md5="$(md5sum server/protocol.def)"
-
-       default
-       eapply_bin
-       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, https://bugs.winehq.org/show_bug.cgi?id=24652
-       cp "${PATCHDIR}/files/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)
-       )
-
-       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 wine64 "${MY_PREFIX}"/bin/wine # 404331
-               dosym wine64-preloader "${MY_PREFIX}"/bin/wine-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
-       fi
-
-       eselect wine update --all --if-unset || die
-
-       xdg_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
-       fi
-
-       eselect wine update --all --if-unset || die
-}
-
-pkg_postrm() {
-       xdg_desktop_database_update
-}
diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.9-r1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.9-r1.ebuild
deleted file mode 100644 (file)
index 0cbbf7c..0000000
+++ /dev/null
@@ -1,529 +0,0 @@
-# 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 flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx versionator xdg-utils
-
-MY_PN="${PN%%-*}"
-MY_P="${MY_PN}-${PV}"
-
-if [[ ${PV} == "9999" ]] ; then
-       EGIT_REPO_URI="https://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}"
-
-GWP_V="20170830"
-PATCHDIR="${WORKDIR}/gentoo-wine-patches"
-
-DESCRIPTION="Free implementation of Windows(tm) on Unix, without external patchsets"
-HOMEPAGE="https://www.winehq.org/"
-SRC_URI="${SRC_URI}
-       https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-${GWP_V}.tar.xz
-"
-
-LICENSE="LGPL-2.1"
-SLOT="${PV}"
-IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags 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 +png prelink pulseaudio +realtime +run-exes samba scanner selinux +ssl test +threads +truetype udev +udisks v4l +X +xcomposite xinerama +xml"
-REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
-       X? ( truetype )
-       elibc_glibc? ( threads )
-       osmesa? ( opengl )
-       test? ( abi_x86_32 )" # 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/libXfixes[${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}] )
-       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}] )
-       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}] )
-       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 )
-       )
-       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 )
-       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"
-
-PATCHES=(
-       "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726
-       "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
-       "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
-       "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch"
-       "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676
-       "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376
-)
-PATCHES_BIN=(
-       "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376
-)
-
-# https://bugs.gentoo.org/show_bug.cgi?id=635222
-if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then
-       DEPEND+=" dev-util/patchbin"
-fi
-
-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 "${PATCHDIR}/files/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 "${PATCHDIR}/files/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 "${PATCHDIR}/files/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 ${EGIT_COMMIT} ]]; then
-               eerror "Commits must now be specified using the environmental variables"
-               eerror "WINE_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
-       fi
-
-       default
-
-       l10n_find_plocales_changes "${S}/po" "" ".po"
-}
-
-src_prepare() {
-
-       eapply_bin(){
-               local patch
-               for patch in ${PATCHES_BIN[@]}; do
-                       patchbin --nogit < "${patch}" || die
-               done
-       }
-
-       local md5="$(md5sum server/protocol.def)"
-
-       default
-       eapply_bin
-       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, https://bugs.winehq.org/show_bug.cgi?id=24652
-       cp "${PATCHDIR}/files/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 X xfixes)
-               $(use_with xcomposite)
-               $(use_with xinerama)
-               $(use_with xml)
-               $(use_with xml xslt)
-       )
-
-       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 wine64 "${MY_PREFIX}"/bin/wine # 404331
-               dosym wine64-preloader "${MY_PREFIX}"/bin/wine-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
-       fi
-
-       eselect wine update --all --if-unset || die
-
-       xdg_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
-       fi
-
-       eselect wine update --all --if-unset || die
-}
-
-pkg_postrm() {
-       xdg_desktop_database_update
-}