diff options
Diffstat (limited to 'app-emulation')
124 files changed, 5650 insertions, 1672 deletions
diff --git a/app-emulation/containerd/Manifest b/app-emulation/containerd/Manifest index b67aa75a9c62..fd3c3dc4d543 100644 --- a/app-emulation/containerd/Manifest +++ b/app-emulation/containerd/Manifest @@ -1,8 +1,6 @@ -DIST containerd-0.2.5_p20170308.tar.gz 1021631 SHA256 d08d3d0758b76f7de0e8f503b74e1562d8c0a1014cb4baf4cd34e246751cec4c SHA512 8b00862a7b54490a8342bcc0eddaa7e8c86d1e05c02f5173b9f4a08321425f8d75d1fb0665e86bc79249294354977693c21d6a4d8405866ff8058da9772e2ecc WHIRLPOOL ed658d10f927fff4d9591930bdf855fc0ed259ca538d4361ce3cffcc5943dcfe39121242f1c9ef950897761016a8450b3a2117c0be0b8b0ebffeab330fe30b5d DIST containerd-0.2.9_p20170605.tar.gz 1229549 SHA256 c506121c49e3bfea27018aa77e09e4734067f84ae85b6ef75ec31b488a91ae54 SHA512 900cf9c251c4de0f9848fb5bf26537226c1361d1a64a0fba853bda3805cb141fc2a849442fe885f0ee228b3e3a7018440af18898b484a54a7b75b4a86538aaa9 WHIRLPOOL 880f19a994f623b7cd8c3f771b5c56468681de349ae4196e60ffcb5a34d42ef423d8eefc82c07134c9e50c33bc0ecbfc1a9e47c3df987050d8dcb82da0178d80 DIST containerd-0.2.9_p20170917.tar.gz 1140788 SHA256 4d2b6e30bcc6c4bb901d6b9f19b5ac1d4a2d9b17075a9b1f110102920d01f64a SHA512 c749bda691197ec8a7603db9ad92f2800a3f065143430a660333b7862518deb4c158a1c1fd01671dff438b40988d4a64d8f06bab05496b8728c6e2f57cd7da0a WHIRLPOOL 75cb3467a94af50bef52377f309d7c85386475789fab3d2758679f022b516735728a1ac2c54307954a14100c4f84059d8fd5e8376270fdd69e572cff43453fa0 DIST containerd-1.0.0_beta2.tar.gz 3681494 SHA256 3130384a814bc0a43fe3b76e2bbb2db2372fdc96490b76f8b278362ebc0d3fb1 SHA512 cecb4d2e0dccbc27c1e59f3e49f8fd5b08445988e49aa4b8a2a5910851509d51e001b5295905288c29fee2d91eadf2180a6b86947e130abe1b33a9a01416a286 WHIRLPOOL 4d526904a146971d57adbde6102e4fe42e0d303b102e721e34aaea3f54ef3176586dedf31a347f52d95a6e5c1850454b31ab3e5c6195b868929d32fde6218eb3 -EBUILD containerd-0.2.5_p20170308.ebuild 971 SHA256 357c0c0c8399ca40b0222d95cd467b595a0877fdf694429329d8a9f299b6e5e9 SHA512 f519a8755010a178a1c96e266e86d4b2177d1d60498f68d51394bb4546fd33d4ac281480d0daf43a8adc0784e5057e8789f05aa77ed28e79197e7b2483671ab7 WHIRLPOOL 95af6f5c16e68ebebebad4d494d1bd9844d38a9073c0ecd522684c30fb6a06ad6b0417837cb6c053e9dbd137c56155e4955ab5e7575fe63dc92564bc93dc7016 EBUILD containerd-0.2.9_p20170605.ebuild 1000 SHA256 d8b66bb902a1e5ca6c58efc0c1b534832457bda08825f55ae6c177458761c9c8 SHA512 adec8a0e7d4d2e4dc200d470c1cbd2dbd38daf2ae2b931c9d32f5cd1b7c580cc1222c628c2e9b22fb64098c800c956a636e6167d6c7a6f391ec280b77a438a04 WHIRLPOOL 744713fcdd4726983c9cd4c1959446d9631d523e62aa28ee47b5ca679609d59701bc0f7c122c58e65325fa24917e68752e882ee4d9a0998328e88b717920070f EBUILD containerd-0.2.9_p20170917.ebuild 1001 SHA256 e05ed2f3fabbd8d0466506292b0a75e607ca3de9d3e799681eee9754ad5e1313 SHA512 d206822a85e56f2226b1099b98605800bb3f1aad7aac1846ece87c75b740e6e6aacee0def14925c96ea8ff86cf21622e5821e6112a39ea75edef1dfbeaf71b1f WHIRLPOOL 0eff2136f756f39b09dd1205052d3e6f5efa6d9f6dd5fc2ce8eef8e8b539946cab211812b6682275a79bbbb31a32c63a203cdeb62381ad309c39336512170c97 EBUILD containerd-1.0.0_beta2.ebuild 1228 SHA256 036490a9b30c448eb8912f7eb1e2630dc21b7751e31fdab757d7a9424eba7c36 SHA512 77a154a7a0d4f10e247e9f2b4a1f3c0b44f7cfad18c59f86afe25e77fccd3686a1e96d34603aae24889ad422037aa7cda8c80822f7168544bd2af0b6e828e9ed WHIRLPOOL 9a3162aec6cdac742c3aeabda449ad0934a1ff7dc8aa3a45fa8cbac252595081dd809c4712dacf389653ff47bf7eb3be27d918a6f48fad18c4ba320a437f480f diff --git a/app-emulation/containerd/containerd-0.2.5_p20170308.ebuild b/app-emulation/containerd/containerd-0.2.5_p20170308.ebuild deleted file mode 100644 index 485c86e83d98..000000000000 --- a/app-emulation/containerd/containerd-0.2.5_p20170308.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -EGO_PN="github.com/docker/${PN}" - -inherit toolchain-funcs - -if [[ ${PV} == *9999 ]]; then - inherit golang-vcs -else - MY_PV="${PV/_/-}" - EGIT_COMMIT="595e75c212d19a81d2b808a518fe1afc1391dad5" - SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" - KEYWORDS="amd64 ~arm ~ppc64" - inherit golang-vcs-snapshot -fi - -DESCRIPTION="A daemon to control runC" -HOMEPAGE="https://containerd.tools" - -LICENSE="Apache-2.0" -SLOT="0" -IUSE="hardened +seccomp" - -DEPEND="" -RDEPEND=">=app-emulation/docker-runc-1.0.0_rc2 - seccomp? ( sys-libs/libseccomp )" - -S=${WORKDIR}/${P}/src/${EGO_PN} - -src_compile() { - local options=( $(usex seccomp "seccomp") ) - export GOPATH="${WORKDIR}/${P}" # ${PWD}/vendor - LDFLAGS=$(usex hardened '-extldflags -fno-PIC' '') emake GIT_COMMIT="$EGIT_COMMIT" BUILDTAGS="${options[@]}" -} - -src_install() { - dobin bin/containerd* bin/ctr -} diff --git a/app-emulation/docker-compose/Manifest b/app-emulation/docker-compose/Manifest index 10df28aacf55..22bbe84de934 100644 --- a/app-emulation/docker-compose/Manifest +++ b/app-emulation/docker-compose/Manifest @@ -1,7 +1,7 @@ -DIST docker-compose-1.15.0.tar.gz 210455 SHA256 af569f676c7a04a32d3fc4a72c739cb52d8b6305040295178c5388394b45e579 SHA512 98de68db089754eb73a6f65971fca393703680241bce02e13fdbc88cbcdab93a3dbf3b94f359f8a9ff296535f001f06baee238d174e1555b39bd581d46328f42 WHIRLPOOL 7e13fceca7142f1e4ac80893faeb85bd4e935329c041a04c75e11b4c353520db748ad3e6c20fdc4ba1070bc130cc993e5a122758e6cb9b703fe889a1ee4f649c DIST docker-compose-1.16.1.tar.gz 212167 SHA256 fb46a6a2c4d193a3ff1e4d7208eea920b629c81dc92257c87f3f93095cfb0bdf SHA512 add6aa5647352b993e5eba81c41815467cea82d39643a755c9f24ffeeb482e2b22423a9e3facdd94f41b382b2726cb65433516881971a8f373c79bce44923c4a WHIRLPOOL 144c8905fc06d11a2ed9583acb8d2dbf739771f2b90f60b6d90bce64a27d705b449a9df9e79754be094e3d1fec15993f88eecebc3647af32b7e54050338e39ca -EBUILD docker-compose-1.15.0.ebuild 2515 SHA256 722d611d8dce801bbd11cdf54f2b296fb44d18ab0ee331497be09974eff6818c SHA512 fb97e138a02bad5dead9534bb7718e6f245a49f83826cb39fc55aee85ae1379a81e321ece9974d8b0ac4f7211049012c2b4499ae1362a2ba091a14cec4a8b95e WHIRLPOOL 438920e2b967fb1b7e3dcc4332f4d8a3a85ef557d27b4ffbd11a46bbcc95339368591af235cec2fccfb7669899c8e17fdcdde15a413d9cdb74a40184622aa9ec +DIST docker-compose-1.17.1.tar.gz 219947 SHA256 e29469dbd78457c82ddad674c0fa0b7afed065b2c73858d332dd6d20d92a8541 SHA512 711c0a73546f0b396a920d3310b92fc15e3c13f93439eeda363124c9bd971aa942395b2405ad7441df8982384be367c20a767fe5b9e3e150690b63deda58f553 WHIRLPOOL e4f6fc72ad186aff590e96a8205d519a92e4aa0e0672483b18aa1c65f9765ae553c59b8ab51334db0b937c23073096436ef2308ddab172b08ff75dc8b9c8e665 EBUILD docker-compose-1.16.1-r1.ebuild 2423 SHA256 1e15f65aa047ab6b5128699ef337bfff123c6c9bd98a7bb556c95826cc668836 SHA512 0906703570ef80c4bf8283c3700ee63925a15d587b2f5fe67a09787dc4f2ff7727c5533c7a811843398e9dcc256da771e4958f7babc76b0e46b99c3d85fe3d25 WHIRLPOOL 182af342af3250bfa8d60c23967d595657ecdcbceee06e8ebbcee9ea1ccfddee2fb1d0fb57a5f7f6262b9c183f9aa15c7d388b85a117ea87a58af480b329f084 +EBUILD docker-compose-1.17.1.ebuild 2423 SHA256 1e15f65aa047ab6b5128699ef337bfff123c6c9bd98a7bb556c95826cc668836 SHA512 0906703570ef80c4bf8283c3700ee63925a15d587b2f5fe67a09787dc4f2ff7727c5533c7a811843398e9dcc256da771e4958f7babc76b0e46b99c3d85fe3d25 WHIRLPOOL 182af342af3250bfa8d60c23967d595657ecdcbceee06e8ebbcee9ea1ccfddee2fb1d0fb57a5f7f6262b9c183f9aa15c7d388b85a117ea87a58af480b329f084 MISC ChangeLog 7390 SHA256 ae21930aa14aceeee5431fcc8a56fac3dee8669d40870ae270bbb0aee996a5c2 SHA512 a9b25e64464a89185b62acdd2de8dd1cb923734612ba9ce2c9fb67b8daea9a9cd31f84c1f963d4c7ceac39b16b19e32cd1b0e5792b94aab8e486c485d9818c05 WHIRLPOOL e51fcce39afe9e0e8837e6cf5ba5a37a2010dc99866e62a48c1abaa4e85a5219208d59497014bb30b6fc76b497910adad25060b3dd78194129e3f030e6e066f1 MISC ChangeLog-2015 2025 SHA256 99d6e79498f6ded8f176505dc856af7ebdd6438420ba91eb9b5595c347c51660 SHA512 4a37f3d9387d314439e7a67b0faae778694b3acda4bf3dcdf62b2a46d71ef1f9391211c92e277188b5056504cf66fca6cc2c7b3d0ef119681485461dcec4e29a WHIRLPOOL 6151151ad2fde1389fbeeab773696918ed5957f015f7346a1a7c6547ced6423ecbe8494e48961c0dab905a63ad4b8801da0da8d8d84f9e0d679813f2d4ee495f MISC metadata.xml 429 SHA256 a7486939ab3ddff40707d3aac83cd7e7ac305b522fc690dace4ec981babf2e74 SHA512 f6a0d1a934d1f825144fadbee8ab0fccceaf40af59cc44a90caed059a503672b18a1c16fee9bb045a9ab272ad5553b1d49fff67d43c7a8ff97dc5c31cdea37b6 WHIRLPOOL 842336716a3ee12427d7fa33a3b38cffa9f25a7ee474d0587924e81dc7265115ced4c3338930e2199701058140bc46bc133caece3467678b92ecd81b5b9988e3 diff --git a/app-emulation/docker-compose/docker-compose-1.15.0.ebuild b/app-emulation/docker-compose/docker-compose-1.17.1.ebuild index 45aaac787d92..e3bff20d7e04 100644 --- a/app-emulation/docker-compose/docker-compose-1.15.0.ebuild +++ b/app-emulation/docker-compose/docker-compose-1.17.1.ebuild @@ -21,11 +21,9 @@ CDEPEND=" dev-python/setuptools[${PYTHON_USEDEP}] >=dev-python/cached-property-1.2.0[${PYTHON_USEDEP}] <dev-python/cached-property-2[${PYTHON_USEDEP}] - >=dev-python/colorama-0.3.7[${PYTHON_USEDEP}] - <dev-python/colorama-0.4[${PYTHON_USEDEP}] >=dev-python/dockerpty-0.4.1[${PYTHON_USEDEP}] <dev-python/dockerpty-0.5[${PYTHON_USEDEP}] - >=dev-python/docker-py-2.4.2[${PYTHON_USEDEP}] + >=dev-python/docker-py-2.5.1[${PYTHON_USEDEP}] <dev-python/docker-py-3.0[${PYTHON_USEDEP}] >=dev-python/docopt-0.6.1[${PYTHON_USEDEP}] <dev-python/docopt-0.7[${PYTHON_USEDEP}] @@ -41,8 +39,8 @@ CDEPEND=" >=dev-python/requests-2.6.1[${PYTHON_USEDEP}] >=dev-python/six-1.3.0[${PYTHON_USEDEP}] <dev-python/six-2[${PYTHON_USEDEP}] - >=dev-python/texttable-0.8.1[${PYTHON_USEDEP}] - <dev-python/texttable-0.9[${PYTHON_USEDEP}] + >=dev-python/texttable-0.9[${PYTHON_USEDEP}] + <dev-python/texttable-0.10[${PYTHON_USEDEP}] >=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}] <dev-python/websocket-client-1.0[${PYTHON_USEDEP}] $(python_gen_cond_dep '>=dev-python/enum34-1.0.4[${PYTHON_USEDEP}]' 'python2_7' ) diff --git a/app-emulation/docker-runc/Manifest b/app-emulation/docker-runc/Manifest index 5aa79068090f..c68ab19a167a 100644 --- a/app-emulation/docker-runc/Manifest +++ b/app-emulation/docker-runc/Manifest @@ -1,7 +1,5 @@ -DIST docker-runc-1.0.0_rc2_p20170308.tar.gz 561400 SHA256 bdd0fc0b5db42bb1fc439d5a5d6347d97b285e676559afb620ffd9f62fc1de26 SHA512 f17c7ff09578573a161f14616446e74d92d66039c1462bce23ea507b151eb66ede12d2ca583d3dace21d186a80bdadf222fc180bf1123e29c68e43f2f2d949c8 WHIRLPOOL f6853ccdd09ca1481828b20e64403151cd9c5d46ceb81c50e884d47e18f8594c21bf53102b252852b259b6b0186f54f070fb7f3c7e4447123cbf05aa69233035 DIST docker-runc-1.0.0_rc3_p20170706.tar.gz 1042839 SHA256 d09b31b9a5adf0a3295d10b20e5f65ec8e1c52a371d463218694c37e075829e9 SHA512 8e937e8ccaa114913d61a450b030496668c1e2d80eecccf5e4914c5685d7dde9a0d50bc2aef9be844dc69eab81621aa1c043abbc72ba28ab6bdb9db5e86daeaf WHIRLPOOL bec7b506a6b2522d401733b32a9f500aec69920dc6d8072ab434c7bfbb1c88a6fb00afa1d2728f78fbaac1d58f890a2b5932fdbe2b0e87b749293f2b48ed2e8a DIST docker-runc-1.0.0_rc4_p20170917.tar.gz 1094599 SHA256 d5820f1c655061be79441bd57efea4e5b60b25b6a451214b64172395b9fda383 SHA512 0cb0748812296294a87dda257dbf0947897a1ada2aa861ff3e65309a6bbecebbe798929845fca6f23b66fd0dc019bca0a032737c7192fe20618d8e1849866f3d WHIRLPOOL ed34894a3878c0cae50888c936eba1dad8d58da8d7042d5e421f06e4e98c1d7701a5c877baaba14a46d588b2ee3354e19d72bb141d5d8e7f6c0bed2d3a6b71b6 -EBUILD docker-runc-1.0.0_rc2_p20170308.ebuild 1369 SHA256 30437a9a1b5c4a0887ed57f81193fc10aa5859dbfebe5494019e0b3f3f61721f SHA512 7ca6bdaa6b7935c1b1b094fcdb94be734f9d5f1cd5f4e53afa9e8acde8fbc417e7a8d2d7957e50d26b32c613457b6d45907225e51db37ce22efc6746cb2e0cc3 WHIRLPOOL f6ee74ece4cf5514685b69fba0d5710815546647e2120249b7f0630dc2e119fff1f0d3a0af27c6e68b46b4a3d7247a42a1766015bb5325dd6942d68e940462a3 EBUILD docker-runc-1.0.0_rc3_p20170706.ebuild 1383 SHA256 c70b72fae7ba1ef8f9f7b0fec7f573b20289e1a1fb4f62aaf78f7092e1bb3ede SHA512 e06eafdf1d1f6af0b6c994bdf7cd278b6f7d1f0a9e649a0dcbf2a41c79c5b298418cfde46a47db85105140012871c9ba57d0dbf8c1d6d3f191da7547ec911b0c WHIRLPOOL d2736eddc18e69bc6160a380d8f389166862dd2d6a7720d8348f243f87ed8a9988ae7f60e86116a36011a579f14003988934fb45a552813da6975743d3750ad8 EBUILD docker-runc-1.0.0_rc4_p20170917.ebuild 1386 SHA256 cf3dd55eba4360b1a49fe5bd460366741490dbb118c17a7599dfef1b32350b7b SHA512 06d41f7d5a6a1fc20e4a6d2a284a00131d5290fd9b305cf7bdf7ffbb9878449a3a9316ec70ebb0e5eef7df57d976fe6774b4ee4e768d491b08572e2fbce95133 WHIRLPOOL da0bec13658a2d919fbea058c0619314a335abf146845ba5bde0dd8d76aaf33ff359c2b2c4879361252598b194305a109a46cfdfb681cb94b67d4b0ca65e70f6 MISC metadata.xml 627 SHA256 36fac17c0d0f354ffc9dcf5d8154f3a6c70b7b92cc2161c8b2f13e0e589e2167 SHA512 1038519441e238a48dafd9a0827d931cc3ca2618e57f7f1300bdc138e6bc2b768ae47f936456bf2aa5c434e617b628344aa4071fe805e698671d5f74ffb10163 WHIRLPOOL 5c90aaef62b5c3905f1f82a5923dd0b965e5f7335665f5d583a3d3992504b0a1c611fdd12e54f6a0278193b277378b8c2fda18d91d01c895dc5abece21fb70fd diff --git a/app-emulation/docker-runc/docker-runc-1.0.0_rc2_p20170308.ebuild b/app-emulation/docker-runc/docker-runc-1.0.0_rc2_p20170308.ebuild deleted file mode 100644 index 0026a2692717..000000000000 --- a/app-emulation/docker-runc/docker-runc-1.0.0_rc2_p20170308.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -EGO_PN="github.com/docker/${PN/docker-}" - -if [[ ${PV} == *9999 ]]; then - inherit golang-vcs -else - MY_PV="${PV/_/-}" - EGIT_COMMIT="54296cf40ad8143b62dbcaa1d90e520a2136ddfe" - RUNC_COMMIT="54296cf" # Change this when you update the ebuild - SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" - KEYWORDS="amd64 ~arm ~ppc64" - inherit golang-vcs-snapshot -fi - -DESCRIPTION="runc container cli tools (docker fork)" -HOMEPAGE="http://runc.io" - -LICENSE="Apache-2.0" -SLOT="0" -IUSE="apparmor hardened +seccomp" - -RDEPEND=" - apparmor? ( sys-libs/libapparmor ) - seccomp? ( sys-libs/libseccomp ) - !app-emulation/runc -" - -S=${WORKDIR}/${P}/src/${EGO_PN} - -RESTRICT="test" - -src_compile() { - # Taken from app-emulation/docker-1.7.0-r1 - export CGO_CFLAGS="-I${ROOT}/usr/include" - export CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '') - -L${ROOT}/usr/$(get_libdir)" - - # Setup GOPATH so things build - rm -rf .gopath - mkdir -p .gopath/src/"$(dirname "${GITHUB_URI}")" - ln -sf ../../../.. .gopath/src/"${GITHUB_URI}" - export GOPATH="${PWD}/.gopath:${PWD}/vendor" - - # build up optional flags - local options=( - $(usex apparmor 'apparmor') - $(usex seccomp 'seccomp') - ) - - emake BUILDTAGS="${options[*]}" \ - COMMIT="${RUNC_COMMIT}" -} - -src_install() { - dobin runc -} diff --git a/app-emulation/docker/Manifest b/app-emulation/docker/Manifest index d7d675cf7c40..0c7400bffff3 100644 --- a/app-emulation/docker/Manifest +++ b/app-emulation/docker/Manifest @@ -1,9 +1,6 @@ -AUX 1.13.1-split-openrc-log.patch 2008 SHA256 5c0f6d4424f0d6e6ddbc5db20c3cc6d44ad61e08e04bef927adc635a847a148b SHA512 fcbfd67d078aae6e1f02d0db9924cb3d3ed9b64b634e3e19835c9644341d319d1df5da292548892d00e7d38ae6164659deb3cbd3a3b1d6d1f838a69fb22098de WHIRLPOOL 9210eb1974f3029d46f220aa7e6863f9667f6203c6d2599a0c84ecdb593e03228c1ad56ba5aa850cd49b83a87151586f4c1016a7396c3f40c79efa299fff77b2 -DIST docker-17.03.2.tar.gz 7783969 SHA256 171a65c44340c7b5710da6948b0afb9306b126b36c531ddab1a3653fd2980aaa SHA512 9fad6c1fa38f9a14208547ca2d3d6a11a565fe4cebd7b432ccad9e2a57ab4a005df20415d1c797f747a99d309b07d8ec97bb45c67644554622aafe0bf1893e04 WHIRLPOOL e34f04698e4a510ed26c9e8f87510878a940d77dc7558df40173a8ea452a2843327196dea3099844dc389a051e23294671b3bc835120af3ca1f4c9c758de44a3 DIST docker-17.06.2.tar.gz 9684548 SHA256 cfcb5646db32f52c4c394bc688fff405e585beab4ded64251958804a102a5269 SHA512 0a9b7b122aadef911141ec1f606759e892c0673821ddf5f3247a5b2d4476a20018add84a22c5aca32f0f91c1046e5be6d8d3f9ce65c3e4244896bf061b1eac6b WHIRLPOOL d0cc166319dbf735d67796df3836f79b24b9108327276ca0ba272398cdc70d6fae4649d9097b6dd29e62633ee636a216343e0d3ffd781cf63ef4c7a7c8cea259 DIST docker-17.09.0.tar.gz 10132253 SHA256 ef1d7f2c48824495e4109426ba85b75c09cc9463b9ba92703e25ffcbe14536ae SHA512 d96570825fb3dc24516b3b9666e935d5277674221452d8a23e6bcd1116f0bb3a2b8b315f47b98f52e681ab79309c099bb3b5c437af942539708ff3126c993638 WHIRLPOOL ca96166ff3573138713d3d45fcfc42cfed99a70e9db17a1763a9e157e6ce3f301fd01ab3c579aacfcbcab7639986e97bbbbc680fbc65edd76047aee079239b6b DIST docker-17.10.0.tar.gz 10252333 SHA256 90f54b988d5241ee0472800e139e0628ae8a58dac168bb32fdb031383f3b46be SHA512 4ec5dae379ecda36b9af7066432507947142631efea471cd7f447677f9db1fe1522fe81ef68b28d3e63b5e759535a1c518ce1ef71f4de0e9dd32c957c682098c WHIRLPOOL 5e8278c663f0a0e793c2f439ce84e541371a45e605f78194a86ab3da4922400d8ef7101b5534ac35927381a658a88929c9a83a8ffee0f984488edb5a3c993eae -EBUILD docker-17.03.2.ebuild 8320 SHA256 7a83f7993f61edb28427d1864db270483682e21f1ee3498d12c98a316eb0ca6a SHA512 f6f1115d0ef9a55e92fdd927731cd4011a0c69fa38f3a57e96c54d481a86e99c4fe856a2c2931d1fb87077b6a69ebc751157efd6e9402518e6e8862a4534b302 WHIRLPOOL 38e30777580017ddf31af256ab612f2236dbd9c839f6c4e1e2be054fd2c4f39e3f222cec838f1d38fe6f3af0998f52cc3a4dfacbf14122e3585688a7aeb1f48c EBUILD docker-17.06.2.ebuild 8711 SHA256 b7bc73cd441558c353e31e5ab5025d41a8b3d2537de1254e0c898a788e23d72f SHA512 6037ebc36e28e89905a3e15b4816114c16c624fc0072bdbda628fccfff5574509099923c15cc33cc7a39d0b67eabfb1511d7650ead4d5fcd360c7ac9b97408c4 WHIRLPOOL e460ce19a3fe9299011f611ec60b9cb22db2b1089426997b99fd7bf6a260a5f4dbcd4f39c754aba2b7eed17903e633440d287e7011de9e94d3560008d3c89e5b EBUILD docker-17.09.0.ebuild 8767 SHA256 5e1ee06656f94a6b7ebee013c2ca7404535ef1eace7f727ed99102dcd19ce699 SHA512 5455e549fbcfa75082e1e0f4211d75439d26b028306ebc9bbecfec36fa951e52d7014e78d8893043194047ddcecbcb0b7fa1c4e2ad947373b1945576b270279f WHIRLPOOL 93f75fd8c11a0700b32aedc3abf90fcdae4c894ae5e0c3077c2bfd838f3cce47508a2277ad0f560ed48828c105b1ea703b18e012429775498402660e7d578863 EBUILD docker-17.10.0.ebuild 8766 SHA256 1f12a633572fbd9dec5bb9c875fc5b872de6229494c27910fc94f2c912f7199f SHA512 b6ed073a46053c9b0dad42888062890aee6186871f72802e56a131bf1a1b123b0f778307c647c24ddd2be3710b357c56279e7fd2e5894c165b8fd940b8b75ac4 WHIRLPOOL e8a7f8aaaf7804e0669353d94f7d4241876a2bd926156cf586deaad1db8f7f21a831a87f9a345c27cf081ca1254cc953556a6adfa363fe2c3473e6fe305b2b8e diff --git a/app-emulation/docker/docker-17.03.2.ebuild b/app-emulation/docker/docker-17.03.2.ebuild deleted file mode 100644 index d74e50ededca..000000000000 --- a/app-emulation/docker/docker-17.03.2.ebuild +++ /dev/null @@ -1,292 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -EGO_PN="github.com/docker/docker" - -if [[ ${PV} = *9999* ]]; then - # Docker cannot be fetched via "go get", thanks to autogenerated code - EGIT_REPO_URI="https://${EGO_PN}.git" - EGIT_CHECKOUT_DIR="${WORKDIR}/${P}/src/${EGO_PN}" - inherit git-r3 -else - MY_PV="${PV/_/-}" - DOCKER_GITCOMMIT="f5ec1e2" - EGIT_COMMIT="v${MY_PV}-ce" - SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" - KEYWORDS="amd64 ~arm" - [ "$DOCKER_GITCOMMIT" ] || die "DOCKER_GITCOMMIT must be added manually for each bump!" - inherit golang-vcs-snapshot -fi -inherit bash-completion-r1 golang-base linux-info systemd udev user - -DESCRIPTION="The core functions you need to create Docker images and run Docker containers" -HOMEPAGE="https://dockerproject.org" -LICENSE="Apache-2.0" -SLOT="0" -IUSE="apparmor aufs btrfs +container-init +device-mapper hardened overlay pkcs11 seccomp" - -# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#build-dependencies -CDEPEND=" - >=dev-db/sqlite-3.7.9:3 - device-mapper? ( - >=sys-fs/lvm2-2.02.89[thin] - ) - seccomp? ( >=sys-libs/libseccomp-2.2.1 ) - apparmor? ( sys-libs/libapparmor ) -" - -DEPEND=" - ${CDEPEND} - - dev-go/go-md2man - - btrfs? ( - >=sys-fs/btrfs-progs-3.16.1 - ) -" - -# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#runtime-dependencies -# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#optional-dependencies -# Runc/Containerd: Unfortunately docker does not version the releases, in order to avoid -# incompatiblities we depend on snapshots -RDEPEND=" - ${CDEPEND} - - !app-emulation/docker-bin - >=net-firewall/iptables-1.4 - sys-process/procps - >=dev-vcs/git-1.7 - >=app-arch/xz-utils-4.9 - - >=app-emulation/containerd-0.2.5_p20170308 - ~app-emulation/docker-runc-1.0.0_rc2_p20170308[apparmor?,seccomp?] - app-emulation/docker-proxy - container-init? ( >=sys-process/tini-0.13.0[static] ) -" - -RESTRICT="installsources strip" - -S="${WORKDIR}/${P}/src/${EGO_PN}" - -# see "contrib/check-config.sh" from upstream's sources -CONFIG_CHECK=" - ~NAMESPACES ~NET_NS ~PID_NS ~IPC_NS ~UTS_NS - ~CGROUPS ~CGROUP_CPUACCT ~CGROUP_DEVICE ~CGROUP_FREEZER ~CGROUP_SCHED ~CPUSETS ~MEMCG - ~KEYS - ~VETH ~BRIDGE ~BRIDGE_NETFILTER - ~NF_NAT_IPV4 ~IP_NF_FILTER ~IP_NF_TARGET_MASQUERADE - ~NETFILTER_XT_MATCH_ADDRTYPE ~NETFILTER_XT_MATCH_CONNTRACK - ~NF_NAT ~NF_NAT_NEEDED - ~POSIX_MQUEUE - - ~USER_NS - ~SECCOMP - ~CGROUP_PIDS - ~MEMCG_SWAP ~MEMCG_SWAP_ENABLED - - ~BLK_CGROUP ~BLK_DEV_THROTTLING ~IOSCHED_CFQ ~CFQ_GROUP_IOSCHED - ~CGROUP_PERF - ~CGROUP_HUGETLB - ~NET_CLS_CGROUP - ~CFS_BANDWIDTH ~FAIR_GROUP_SCHED ~RT_GROUP_SCHED - ~IP_VS ~IP_VS_PROTO_TCP ~IP_VS_PROTO_UDP ~IP_VS_NFCT ~IP_VS_RR - - ~VXLAN - ~XFRM_ALGO ~XFRM_USER - ~IPVLAN - ~MACVLAN ~DUMMY -" - -ERROR_KEYS="CONFIG_KEYS: is mandatory" -ERROR_MEMCG_SWAP="CONFIG_MEMCG_SWAP: is required if you wish to limit swap usage of containers" -ERROR_RESOURCE_COUNTERS="CONFIG_RESOURCE_COUNTERS: is optional for container statistics gathering" - -ERROR_BLK_CGROUP="CONFIG_BLK_CGROUP: is optional for container statistics gathering" -ERROR_IOSCHED_CFQ="CONFIG_IOSCHED_CFQ: is optional for container statistics gathering" -ERROR_CGROUP_PERF="CONFIG_CGROUP_PERF: is optional for container statistics gathering" -ERROR_CFS_BANDWIDTH="CONFIG_CFS_BANDWIDTH: is optional for container statistics gathering" -ERROR_XFRM_ALGO="CONFIG_XFRM_ALGO: is optional for secure networks" -ERROR_XFRM_USER="CONFIG_XFRM_USER: is optional for secure networks" - -PATCHES=( - "${FILESDIR}"/1.13.1-split-openrc-log.patch -) - -pkg_setup() { - if kernel_is lt 3 10; then - ewarn "" - ewarn "Using Docker with kernels older than 3.10 is unstable and unsupported." - ewarn " - http://docs.docker.com/engine/installation/binaries/#check-kernel-dependencies" - fi - - # for where these kernel versions come from, see: - # https://www.google.com/search?q=945b2b2d259d1a4364a2799e80e8ff32f8c6ee6f+site%3Akernel.org%2Fpub%2Flinux%2Fkernel+file%3AChangeLog* - if ! { - kernel_is ge 3 16 \ - || { kernel_is 3 15 && kernel_is ge 3 15 5; } \ - || { kernel_is 3 14 && kernel_is ge 3 14 12; } \ - || { kernel_is 3 12 && kernel_is ge 3 12 25; } - }; then - ewarn "" - ewarn "There is a serious Docker-related kernel panic that has been fixed in 3.16+" - ewarn " (and was backported to 3.15.5+, 3.14.12+, and 3.12.25+)" - ewarn "" - ewarn "See also https://github.com/docker/docker/issues/2960" - fi - - if kernel_is le 3 18; then - CONFIG_CHECK+=" - ~RESOURCE_COUNTERS - " - fi - - if kernel_is le 3 13; then - CONFIG_CHECK+=" - ~NETPRIO_CGROUP - " - else - CONFIG_CHECK+=" - ~CGROUP_NET_PRIO - " - fi - - if kernel_is lt 4 5; then - CONFIG_CHECK+=" - ~MEMCG_KMEM - " - ERROR_MEMCG_KMEM="CONFIG_MEMCG_KMEM: is optional" - fi - - if kernel_is lt 4 7; then - CONFIG_CHECK+=" - ~DEVPTS_MULTIPLE_INSTANCES - " - fi - - if use aufs; then - CONFIG_CHECK+=" - ~AUFS_FS - ~EXT4_FS_POSIX_ACL ~EXT4_FS_SECURITY - " - ERROR_AUFS_FS="CONFIG_AUFS_FS: is required to be set if and only if aufs-sources are used instead of aufs4/aufs3" - fi - - if use btrfs; then - CONFIG_CHECK+=" - ~BTRFS_FS - ~BTRFS_FS_POSIX_ACL - " - fi - - if use device-mapper; then - CONFIG_CHECK+=" - ~BLK_DEV_DM ~DM_THIN_PROVISIONING ~EXT4_FS ~EXT4_FS_POSIX_ACL ~EXT4_FS_SECURITY - " - fi - - if use overlay; then - CONFIG_CHECK+=" - ~OVERLAY_FS ~EXT4_FS_SECURITY ~EXT4_FS_POSIX_ACL - " - fi - - linux-info_pkg_setup - - # create docker group for the code checking for it in /etc/group - enewgroup docker -} - -src_compile() { - export GOPATH="${WORKDIR}/${P}:${PWD}/vendor" - - # setup CFLAGS and LDFLAGS for separate build target - # see https://github.com/tianon/docker-overlay/pull/10 - export CGO_CFLAGS="-I${ROOT}/usr/include" - export CGO_LDFLAGS="-L${ROOT}/usr/$(get_libdir)" - - # if we're building from a tarball, we need the GITCOMMIT value - [ "$DOCKER_GITCOMMIT" ] && export DOCKER_GITCOMMIT - - if use hardened; then - sed -i "s/EXTLDFLAGS_STATIC='/&-fno-PIC /" hack/make.sh || die - grep -q -- '-fno-PIC' hack/make.sh || die 'hardened sed failed' - - sed "s/LDFLAGS_STATIC_DOCKER='/&-extldflags -fno-PIC /" \ - -i hack/make/dynbinary-client || die - sed "s/LDFLAGS_STATIC_DOCKER='/&-extldflags -fno-PIC /" \ - -i hack/make/dynbinary-daemon || die - grep -q -- '-fno-PIC' hack/make/dynbinary-daemon || die 'hardened sed failed' - grep -q -- '-fno-PIC' hack/make/dynbinary-client || die 'hardened sed failed' - fi - - # let's set up some optional features :) - export DOCKER_BUILDTAGS='' - for gd in aufs btrfs device-mapper overlay; do - if ! use $gd; then - DOCKER_BUILDTAGS+=" exclude_graphdriver_${gd//-/}" - fi - done - - for tag in apparmor pkcs11 seccomp; do - if use $tag; then - DOCKER_BUILDTAGS+=" $tag" - fi - done - - # time to build! - ./hack/make.sh dynbinary || die 'dynbinary failed' - - # build the man pages too - ./man/md2man-all.sh || die "unable to generate man pages" -} - -src_install() { - VERSION="$(cat VERSION)" - newbin "bundles/$VERSION/dynbinary-client/docker-$VERSION" docker - newbin "bundles/$VERSION/dynbinary-daemon/dockerd-$VERSION" dockerd - dosym containerd /usr/bin/docker-containerd - dosym containerd-shim /usr/bin/docker-containerd-shim - dosym runc /usr/bin/docker-runc - use container-init && dosym tini /usr/bin/docker-init - - newinitd contrib/init/openrc/docker.initd docker - newconfd contrib/init/openrc/docker.confd docker - - systemd_dounit contrib/init/systemd/docker.{service,socket} - - udev_dorules contrib/udev/*.rules - - dodoc AUTHORS CONTRIBUTING.md CHANGELOG.md NOTICE README.md - dodoc -r docs/* - doman man/man*/* - - dobashcomp contrib/completion/bash/* - - insinto /usr/share/zsh/site-functions - doins contrib/completion/zsh/_* - - insinto /usr/share/vim/vimfiles - doins -r contrib/syntax/vim/ftdetect - doins -r contrib/syntax/vim/syntax - - # note: intentionally not using "doins" so that we preserve +x bits - dodir /usr/share/${PN}/contrib - cp -R contrib/* "${ED}/usr/share/${PN}/contrib" -} - -pkg_postinst() { - udev_reload - - elog - elog "To use Docker, the Docker daemon must be running as root. To automatically" - elog "start the Docker daemon at boot, add Docker to the default runlevel:" - elog " rc-update add docker default" - elog "Similarly for systemd:" - elog " systemctl enable docker.service" - elog - elog "To use Docker as a non-root user, add yourself to the 'docker' group:" - elog " usermod -aG docker youruser" - elog -} diff --git a/app-emulation/docker/files/1.13.1-split-openrc-log.patch b/app-emulation/docker/files/1.13.1-split-openrc-log.patch deleted file mode 100644 index c7cdd224dcd8..000000000000 --- a/app-emulation/docker/files/1.13.1-split-openrc-log.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 65c1a3be5bf748f95edc45f1391c869bf4ff4a52 Mon Sep 17 00:00:00 2001 -From: William Hubbs <w.d.hubbs@gmail.com> -Date: Thu, 23 Feb 2017 17:07:26 -0600 -Subject: [PATCH] contrib/init/openrc: allow separate logs for stdout and - stderr - -Signed-off-by: William Hubbs <w.d.hubbs@gmail.com> ---- - contrib/init/openrc/docker.confd | 10 ++++++++++ - contrib/init/openrc/docker.initd | 4 +++- - 2 files changed, 13 insertions(+), 1 deletion(-) - -diff --git a/contrib/init/openrc/docker.confd b/contrib/init/openrc/docker.confd -index 2444031..89183de 100644 ---- a/contrib/init/openrc/docker.confd -+++ b/contrib/init/openrc/docker.confd -@@ -1,8 +1,18 @@ - # /etc/conf.d/docker: config file for /etc/init.d/docker - - # where the docker daemon output gets piped -+# this contains both stdout and stderr. If you need to separate them, -+# see the settings below - #DOCKER_LOGFILE="/var/log/docker.log" - -+# where the docker daemon stdout gets piped -+# if this is not set, DOCKER_LOGFILE is used -+#DOCKER_OUTFILE="/var/log/docker-out.log" -+ -+# where the docker daemon stderr gets piped -+# if this is not set, DOCKER_LOGFILE is used -+#DOCKER_ERRFILE="/var/log/docker-err.log" -+ - # where docker's pid get stored - #DOCKER_PIDFILE="/run/docker.pid" - -diff --git a/contrib/init/openrc/docker.initd b/contrib/init/openrc/docker.initd -index 5d31603..6c968f6 100644 ---- a/contrib/init/openrc/docker.initd -+++ b/contrib/init/openrc/docker.initd -@@ -6,8 +6,10 @@ command="${DOCKERD_BINARY:-/usr/bin/dockerd}" - pidfile="${DOCKER_PIDFILE:-/run/${RC_SVCNAME}.pid}" - command_args="-p \"${pidfile}\" ${DOCKER_OPTS}" - DOCKER_LOGFILE="${DOCKER_LOGFILE:-/var/log/${RC_SVCNAME}.log}" -+DOCKER_ERRFILE="${DOCKER_ERRFILE:-${DOCKER_LOGFILE}}" -+DOCKER_OUTFILE="${DOCKER_OUTFILE:-${DOCKER_LOGFILE}}" - start_stop_daemon_args="--background \ -- --stderr \"${DOCKER_LOGFILE}\" --stdout \"${DOCKER_LOGFILE}\"" -+ --stderr \"${DOCKER_ERRFILE}\" --stdout \"${DOCKER_OUTFILE}\"" - - start_pre() { - checkpath -f -m 0644 -o root:docker "$DOCKER_LOGFILE" --- -2.10.2 - diff --git a/app-emulation/dosemu/Manifest b/app-emulation/dosemu/Manifest index dceaed73e9ef..62a5b4e44690 100644 --- a/app-emulation/dosemu/Manifest +++ b/app-emulation/dosemu/Manifest @@ -2,11 +2,11 @@ AUX dosemu-1.4.1_pre20091009-dash.patch 395 SHA256 75581a12062da86b199ae9b3a4a24 AUX dosemu-1.4.1_pre20130107-fix-inline.patch 560 SHA256 4579c5dfbe7b535e1596dc48facd436c400a39ffb1767b867aef617a2ebfabc1 SHA512 66f3e9a119fb0f80d311d46af6e980ce2f519f389317391746805b875eaecf2f0f714f726e2d6306345c7f68c3e2b2432f8adb16a72a51faf49067ac618e1424 WHIRLPOOL 8b708af81f446820349a4dadc7fe92367cfdfca7d3e5603de847e0b7248d7cfca4808350b79455cee92b4ddc091e7bd67a3fc77534b168810440922c5f3cbd3e AUX dosemu-1.4.1_pre20130107-flex-2.6.3.patch 463 SHA256 8ebcc3b50a6128e1401f7d05ec44c05fef2435b2d7e307356970ef9ccf40ac21 SHA512 51674b60fb341f56c7120a9349c9890a9770cdef524ae3ccf6795769fde31823b2b57aaaafd6111c236550c16caf53246773dda1cd71639887ffaa7093d95cc0 WHIRLPOOL 95ee2eb2ae5d15b1837de1aa463ffc25607436d0e6580323cb77094f8ec73dc8dc010ae7ca0eb0b217e67bcaf158cac85ba4614bb3d180f9f12593b3f78f31ca AUX dosemu-1.4.1_pre20130107-fortify.patch 1961 SHA256 fdb67267e5fc45de64567605078a29738ad507a16716ae0d77a70a1815166790 SHA512 90a5dbc6b00d2b13086c15997cf056e1a54721518a76a85425c7adb6d859782e26391c28386e847fd914a01f0c243615c21c1317a58c19ed9603133e0256971a WHIRLPOOL 62bbfb3de8d26101b220757af27d1c80c0401e270aaf545b2be9fe0002d38062b81517e49a809b88bfb3e82e14691c0693f556b272c630a05e59e2bdf4dd93d5 -AUX dosemu-1.4.1_pre20130107-ia16-ldflags.patch 1688 SHA256 5fdc3975d0c764204369697f1099451f58ba6acc16f61fd70be5782e69de95a3 SHA512 7f88cfb8719061ead6fd7200c768263346bb7b1f8ce7a8f091607e445b53c468edc1bfc55d30c44513ba8361acad8c05d161774fdc90dae01ebc09a567e02bab WHIRLPOOL e5fa1b8108a6723a9dbb3c79eb8d6908ada248d9f6215a29e805cddaf604550d1c3251b0679dbba67e44983250425ff3f637419be11aa6618ddce31c7077c789 +AUX dosemu-1.4.1_pre20130107-ia16-ldflags.patch 1787 SHA256 73c4ab3b9d6793eb4982030e5c1dead6d0336d3919d819cde5fe12d919b6c3b3 SHA512 53fe8b40bc57a2459dcd16d3fba9d81d1cdab498232afe0c19f612737861f88b2f98c584d4fa1a4548e273a38fc17d254f890a64f3112cb0433d7679e7afcdb3 WHIRLPOOL d29b2d29403aed96d10e68516717a512706c63edeb687b121753e34e1d75c0ed0bdef5cf109ff6295114a1e06b38eda63eca456fcd3584380dae82659fb29d99 AUX dosemu-1.4.1_pre20130107-no-glibc.patch 559 SHA256 29e59d4049e0af0ff8d97478a1e06091bea5ec700503877c4814d538fdaf70b7 SHA512 c53e3f7ed1b7a74e1112ea5507d0912ef1d16ff657aa5a03132f6b4c35ddb638ecde40ef554254f429316ffd74fc2d8afb59548d97547eeed231c80c0c057eed WHIRLPOOL 1a08dafc08d01bc168a8bcc760966246c34003ebf271fc7b13a44afaabcff8fc8efa7d4a6b4fb72a67ea9800618adae75573ee2a602bd1d08cd26c5789d73fd5 DIST dosemu-1.4.1_pre20130107.zip 2767256 SHA256 072e1d8ea9c574b02e556d926a287c9c55b82384ed652bb8dd6f3488801901aa SHA512 eb8dcb914a74b235f2b37ff4dd5c1c84b4916ff195c7bf76cdbe6a4d5e6247c57297eef0c579f219ff7f475e727d66fa5a0f314da46d79cc97a0d794e9ad5864 WHIRLPOOL d2835f82515e40d3c85c1ee53c7add5ba055637864ee63997ec912f53862006e33b4139a253b98cb76ca3cdbd7bdca6614609d9e8e716b074283e77cd8105e3c DIST dosemu-freedos-1.0-bin.tgz 1205628 SHA256 080c306a1b611e1861fd64466062f268eb44d2bf38082b8a57efadb5a9c0ebc7 SHA512 d0c4235ceac55de63ce5f72e51b7d57a82b8104f4bf2df6f4dc25c9889d3337b40d75665c2dfc98492ec7123e0959a725f5c7579e145895024bd80a07036e3bd WHIRLPOOL 9e6acf38dc8fafe95a49baaaac2a97fdd02c508b7c30c60823f8af7f44aa62b8d82c92661640b4cef05fcdbea401fafea752ec4a0e439a8eff361dd41aa392d3 -EBUILD dosemu-1.4.1_pre20130107-r4.ebuild 2526 SHA256 bd2402537d7061191ecc5b46b65d135f68631b2ee8e07712a23e8b32eb4a821d SHA512 bb92985c30a089cd06bcb5221e5f6e7ade17b98e7a98fdbb51a18ac6fdcbc412cd4ab834dfebfb2b8f16097796fbe8c56f3c4abda902bb2a1a4e0a8463ac4c02 WHIRLPOOL ae783002547bd3244c465e57505e54caa396aae8c1060e1b909b43b209112ac56ed3b43017e23c4ef4b5907fd4345a27f3c51a81393216eee3f85345708accd5 +EBUILD dosemu-1.4.1_pre20130107-r5.ebuild 2526 SHA256 bd2402537d7061191ecc5b46b65d135f68631b2ee8e07712a23e8b32eb4a821d SHA512 bb92985c30a089cd06bcb5221e5f6e7ade17b98e7a98fdbb51a18ac6fdcbc412cd4ab834dfebfb2b8f16097796fbe8c56f3c4abda902bb2a1a4e0a8463ac4c02 WHIRLPOOL ae783002547bd3244c465e57505e54caa396aae8c1060e1b909b43b209112ac56ed3b43017e23c4ef4b5907fd4345a27f3c51a81393216eee3f85345708accd5 MISC ChangeLog 4068 SHA256 b2fbf8843568f1ac97c02c178d3299d7e15a72c4d30e52162d741cac620e5f42 SHA512 37e3c8d1f247d2b7a54ce1537ad70f46fe97d53a0acacdba3f8c53c455a365d5feada5c0fa5f9195898a6876e665d6316bb592381dbc0891c828d2d0529933bc WHIRLPOOL 7bd2a2608b06a0a14152102d9a286fdfca527b807824c65f7d50c99502dc56952f281b0880f3d85d3052d8d6de3a36413bf9edbaeb1c405b441baf0bf7cc8aee MISC ChangeLog-2015 9124 SHA256 29bdd1f0271a8d9bb3cb211565ce34d27738229d11c12c4a52e54906d9ede5ac SHA512 9b70931aed528f1279c4e9e726fae2fad45b5fc6c8c6c28e46ca2048fae1b089fab8f36dc0bb285fa85f2b445d52620e38c16337a58b08571ccae5e4705b50a3 WHIRLPOOL 344e78ca239fd94b030fa076ed23395f01c09be31825caf89c7c558ab4a43ef49e134ddd4ebd124a1a8fd070f00766f8f25365fe38c1d98a831c246befc36fab MISC metadata.xml 432 SHA256 eee767a8db09c9f12d83195219073e5895d157b096d59308ea31c2d9313a93bc SHA512 da0538836dc326d714141ab6c7b9f00bc1604fa5b51df7d9d548a8e3d889072b3ee8890a25705e2a7c2c1c31645c0b9af85ce6a2d1e4aa142a4d83a08fd6f9d8 WHIRLPOOL 70837a0b55b4b70b260844cb6f5a69e4e12994d3aa7533c7f4638ee09caad18ccbaf02a2c51503c68a1982b89a803b6a0b1017ef59db1ced562b6b51c1c6e4b4 diff --git a/app-emulation/dosemu/dosemu-1.4.1_pre20130107-r4.ebuild b/app-emulation/dosemu/dosemu-1.4.1_pre20130107-r5.ebuild index 8b5fcdc0a693..8b5fcdc0a693 100644 --- a/app-emulation/dosemu/dosemu-1.4.1_pre20130107-r4.ebuild +++ b/app-emulation/dosemu/dosemu-1.4.1_pre20130107-r5.ebuild diff --git a/app-emulation/dosemu/files/dosemu-1.4.1_pre20130107-ia16-ldflags.patch b/app-emulation/dosemu/files/dosemu-1.4.1_pre20130107-ia16-ldflags.patch index 0e2393cc2741..f8c05622571c 100644 --- a/app-emulation/dosemu/files/dosemu-1.4.1_pre20130107-ia16-ldflags.patch +++ b/app-emulation/dosemu/files/dosemu-1.4.1_pre20130107-ia16-ldflags.patch @@ -7,10 +7,9 @@ diff --git a/Makefile.conf.in b/Makefile.conf.in index cd4b34d..cc29931 100644 --- a/Makefile.conf.in +++ b/Makefile.conf.in -@@ -55,2 +55,4 @@ ALL_LDFLAGS:=@DOSEMU_LDFLAGS@ ${LDFLAGS} +@@ -55,2 +55,3 @@ ALL_LDFLAGS:=@DOSEMU_LDFLAGS@ ${LDFLAGS} DOSBIN_LDFLAGS:=@DOSBIN_LDFLAGS@ -+# flags to "link" 16-bit .com files -+IA16_LDFLAGS:=-Wl,-Ttext,0x100,-e,_start16,--oformat,binary -nostdlib -s @IA16_LDFLAGS_EXTRA@ ++IA16_LDFLAGS_EXTRA:=@IA16_LDFLAGS_EXTRA@ LIBS:=@LIBS@ diff --git a/configure.ac b/configure.ac index 0f06f57..a86208e 100644 @@ -27,12 +26,12 @@ index 3139b85..c5c4607 100644 @@ -56,3 +56,3 @@ dosbin: $(COM1) $(COM2) $(SYS) $(D)/%.sys: %.o - $(LD) $(ALL_LDFLAGS) -Wl,-Ttext,0,-e,_start16,--oformat,binary -nostdlib -s -o $@ $< -+ $(LD) $(ALL_LDFLAGS) $(IA16_LDFLAGS) -o $@ $< ++ $(LD) $(ALL_LDFLAGS) -Wl,-Ttext,0,-e,_start16,--oformat,binary -nostdlib -s $(IA16_LDFLAGS_EXTRA) -o $@ $< chmod -x $@ @@ -60,3 +60,3 @@ $(D)/%.sys: %.o $(D)/%.com: %.o - $(LD) $(ALL_LDFLAGS) -Wl,-Ttext,100,-e,_start16,--oformat,binary -nostdlib -s -o $@ $< -+ $(LD) $(ALL_LDFLAGS) $(IA16_LDFLAGS) -o $@ $< ++ $(LD) $(ALL_LDFLAGS) -Wl,-Ttext,100,-e,_start16,--oformat,binary -nostdlib -s $(IA16_LDFLAGS_EXTRA) -o $@ $< chmod -x $@ diff --git a/src/plugin/commands/Makefile b/src/plugin/commands/Makefile index 48f49d5..d3a5667 100644 @@ -41,5 +40,5 @@ index 48f49d5..d3a5667 100644 @@ -57,3 +57,3 @@ $(STUBFULL): $(D)/generic.com ./mkcomstub $(D)/%.com: %.o - $(LD) $(ALL_LDFLAGS) -Wl,-Ttext,0x100,-e,_start16,--oformat,binary -nostdlib -s -o $@ $< -+ $(LD) $(ALL_LDFLAGS) $(IA16_LDFLAGS) -o $@ $< ++ $(LD) $(ALL_LDFLAGS) -Wl,-Ttext,0x100,-e,_start16,--oformat,binary -nostdlib -s $(IA16_LDFLAGS_EXTRA) -o $@ $< chmod -x $@ diff --git a/app-emulation/free42/Manifest b/app-emulation/free42/Manifest index b557b930dc3a..5f1b7631aa38 100644 --- a/app-emulation/free42/Manifest +++ b/app-emulation/free42/Manifest @@ -5,7 +5,7 @@ AUX free42-2.0.6-fix-makefile.patch 1742 SHA256 6736d62ecfd328a1c00771f550bcd1ec DIST free42-1.5.15.tgz 22683600 SHA256 2dda0558141cd26d4b04aa96608c85eadb0770c4f2b660889d4b2a6f3a880c21 SHA512 fc09fcb0efaa6502776517b22cd0015ea7ac7d128b80bd740f64272b6c7aa41f5509dd7e0166dc18043790b4bef725a37a6a7210308a67aeaed02622f9e6daef WHIRLPOOL 5f6f5b33ccb2c320515fbc4e67ee52c6bc6c25fdbc8cf24c05772a90be87fed03f48dfa363b195071c4bc722428fb116d246e9df2eaddba20742648891ad7769 DIST free42-nologo-2.0.6.tgz 7348647 SHA256 862135da3066576d71dbfedc1e41e97230e656ef2f0db3a5b87ba96650c12b9a SHA512 078a79cc4dfa36ae7342be5b90350f4b7269f4e71777f2620c2043510d6313acbc1fa9415b75f8b01bebb2de747b9af8a26738f877c34a4d82a1fdd52c75a61d WHIRLPOOL 5740055edfbafc6f91ba9d3a8b1dc259511dc99b1e5d06a78cf03976b71928c5423d57cd023c9d878108394f3b0992a3bf532f06e69089b976a8ca789dcae9ed EBUILD free42-1.5.15.ebuild 985 SHA256 2c7bdde9a7719969d4beeefc37991ccd9ab11ed528cd8800e892b3f62cce67ae SHA512 58c18f521601fbe863cc90dec6954a41e26d7f3aa1d0b12c549e84675f17be153f10014b223d46275a0438c240a356caccca41bd7dc85457d7ea2448624cf201 WHIRLPOOL 10d92d850276e84353ce3a946ba2badaef5cbe3faa9dc39ad45bfb1a8cac833033ad910f008eef2e748b81726004f981c7ee15864f187c55d98c162e49169b22 -EBUILD free42-2.0.6.ebuild 1044 SHA256 e6a36c327a13bc79fc73900917f32b49e8ce7b821d8ba1bbf6d88ecafb51366c SHA512 0cb13769bb6dacd1bdfc4e675d57579b440d575ef679fdbf6fbf575832014b2bc5d0d31501c299e0ffc049299c72d64ccc146936d5d5158a37c6e61c23caa920 WHIRLPOOL 936737111d4cd3e29b37e9f68090e004cc12d79539bf05aed1dc91aa700be3f94ac93d95fc588a1e89cf7d9551fd068b3fb3170e567880fcaa838c5c9f7f8eed +EBUILD free42-2.0.6.ebuild 1043 SHA256 fd8360c7b7d8d274d9fd8801077423d132f45b679a8ed1df67d875c6fefe0441 SHA512 fd74b7b6fc40bf7e72e6af0cbc5e376dc08d2b687c751f899dad78a62783463d23b917a27ab663d5c94dc063b8910d5e3f992b7d0847b0434db15f70ce68c900 WHIRLPOOL 7183c18479576a62a9e9756e2c78e63bde0ad360048f55eb5236fdfd8ece0a3d2dcd333c05034d81bfa9d4d8d7c2dd1e542d037784a652ba4e3d218a82fb24cf MISC ChangeLog 4309 SHA256 ff56171f5a0b3d9cebe3608d4ba414d3ed6f64c7d780c3833fc9214f2d59b2e5 SHA512 271749df206b6e5523c1af2ed2d27d2dcb24c4db48c3eeb20ccb8d4619793b31abc1b85d9259a8444224db12e22f54b70eb5c2f4a84c964aea60161f0b4e554f WHIRLPOOL 0e0be69e14aae1d3f117f2bd100dc57c3948f03fa475fb214b772e0da705219c4bbb55755674d443ae44b45280f400a90fdb96a36cb637219bc9b8e2d07268ef MISC ChangeLog-2015 4257 SHA256 d76539bb1c895cfd7cd2dc8db0227070ae9b095c19370e59bfff7077b9601672 SHA512 8786752ccb9203b31f629cb48d17eb854aa0c6d1f55d286eeab31a6757c7c81d340b88ee34021f4269e093ea15c1d5fd464955f14f1df981f08f3a4d57031d0b WHIRLPOOL 45a1d888198cff6778e93f99dd330289ac0926b016f51608d15f124aee024b8ac691895a2e10a155dffd5194792392fd2ae5325ca686a0bd0db6ae86fec34486 MISC metadata.xml 554 SHA256 678bba466793d567beef67661d467532c6c15bbfea57d1fe222a32da7f6c9c67 SHA512 f1035a6c26c5168022e623c83784da4585fa16edd71889bc5b608494eedcb0f34c4a6f478648784f1a30fb64bfdf48b95e31d01213fbe29754b7208ed43e1579 WHIRLPOOL cf8ae24b3e284e8b3c99150d573190bf51cba61dd0361c38021170d99cf619f496ce4149db9108713374db0d8009ebecd7f4da81ab173b47a0cfa217859667fb diff --git a/app-emulation/free42/free42-2.0.6.ebuild b/app-emulation/free42/free42-2.0.6.ebuild index deb8bf3bcab7..e46232096899 100644 --- a/app-emulation/free42/free42-2.0.6.ebuild +++ b/app-emulation/free42/free42-2.0.6.ebuild @@ -13,7 +13,7 @@ SRC_URI="http://thomasokken.com/free42/upstream/${MY_PV}.tgz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 x86" +KEYWORDS="amd64 x86" IUSE="alsa" DEPEND="dev-libs/atk diff --git a/app-emulation/hercules/Manifest b/app-emulation/hercules/Manifest index 344cba98b3e5..c95b6800a7e6 100644 --- a/app-emulation/hercules/Manifest +++ b/app-emulation/hercules/Manifest @@ -1,8 +1,8 @@ AUX hercules-3.09-aliasing.patch 1721 SHA256 b41280adbe08d6619af7ead87dfcea7937648cbaad1c9b8e0eadc0e75f48566a SHA512 6f623193d126e6dcf21f6d93bff1a3b949236e2a10c71ca3c4fbdc2ad816894b673551b4dad65205f8b70a75f5c280ed0aa02d4ce0969592a31705e14e42d6e7 WHIRLPOOL fb90f3a9784160097e54996c3d6251ad4ecd4f35e99fe4a40239a0bb86e5e178b0fac8e1f80f53d8a198364ade01bb099bf26d0be8d568bd98b5f459cfcabf6c DIST hercules-3.10.tar.gz 2608321 SHA256 26264569b7d78bbc3b6221926051ac3761c4a792dfc84d591d3230de40aa46fa SHA512 de8b3e2e90fdb745dea9c8ce4dbe506de2aba3bf08b3e937605798e6a8020576a949d6ea3496b7c42bd23d617fc96648d2d8ec05a66e8ed174ce46a3bc31c5d1 WHIRLPOOL 5233ededd4ef42e201216a11b2a09ee6c59a678771aaa9bc78ab4b87f459addc5c0b4ffd4bd2ec98d15a461565db6a354cc1ac846f800b98e86e93e51b263b4a DIST hercules-3.12.tar.gz 2569617 SHA256 aefbe9d2f09372a530c17c177b7d2a0f4bcf8cfd28474672935b067e5f9ee373 SHA512 81d6e151c1c8534753f2db532a0a7bd36fb3806c1ffbab5d6e4a9af3eecea46b95105c37574910714dcfc0fe9b74a72140d573099c24fd44021159ce697414ef WHIRLPOOL 03817954f281b545a1e431e3b2cbc11c97c2c636a63a8ca5a22b9a046ee9f286ec922798e38b7874c5b5b9a8f8fcfe59d8e7cac7f03bf880265937a53f43f4ef -EBUILD hercules-3.10.ebuild 1285 SHA256 d8b5f187c943729dcdc9f132a0768df9eaaaf73f846112a5cc012284372c5f2d SHA512 5dc8b940afff17f0b465c7737175459237a42eca2977066680bf0236dae4dc1318f003dac787fff96f09680d90784e9b0c839c1b609f5bcfab51c5841953085a WHIRLPOOL 51d7b6b2cf52fd1d17e88a3f554712c383c3e03f80c9192510bff1db1471da972c296a25f88c8c156c485966960f6b67395b384eb09878c21977ee760824d0e2 -EBUILD hercules-3.12.ebuild 1290 SHA256 d2df3085ab8299f0b9d5b01f84162c9c1156c38529de6747457705858f5c738c SHA512 e9d92146f89f00c16ba86b292ed20dabe027ddf00156e9b651955fbea1120281904d5339ce2d09f8327a768e3b78b9245e29782d998ea342162cc603b52f6b65 WHIRLPOOL 991c26239bd37cc6d46851c81a78e501bfdc6f57c078ffbd7933d36fb3535a10fd168db43d50e31f29f4a7d714b42a6387c674e95c692c25ed93db8e13cd5028 +EBUILD hercules-3.10.ebuild 1304 SHA256 3ca89ed8b5272bbebc6cc6afdbdaacaf8c961b1fab4b093b9fdd37b0e72416db SHA512 85357103014b806170df030f3464fe293c81e09542238f918f24d59810d53895c33631fc840092c135f9d097ffac4a1e1eff2377abb6e633497bdb0c06d7c8d7 WHIRLPOOL 9aafc224c4154f1818d3db85f174b1556f9b37997f894465f99b5dafcfb76bd9e10e032bc206e55b9ec743d85afe9cf585d08dec52050b8048c640d9762eb957 +EBUILD hercules-3.12.ebuild 1310 SHA256 17de0f1b18fb2270a2b05c1ef60891387d6dffcad87da2cb8f728fb008afbef0 SHA512 58c6e557e0a1a2961af9b0941aa5c1486abaea72179900e22dc680bbad9969ab2d26487bd41e943e2dbc8fc23229de410a81f37aa2eb347fdd32550720458978 WHIRLPOOL da6a2d13f08191f101fb1ab9bb9fb566bc8d58c2ad1d82b431f35ded825f19a47d1639ff36d2fcfd7010f5484f66efeacf50ca1bb345fb449e288259eff314b3 MISC ChangeLog 3256 SHA256 3d4fe36169b93dc900306cbc786276840baee38adb900e905ddacba7adc2396d SHA512 6c8c05d8733bb14fb4ac13cf4566b08cf6ee1beec189ebcd14405131560ee86a9aacecc1264e031d1d62587844f80c05166bab75befe609e2e407533f998f16e WHIRLPOOL 0742d6395e17b492f21abb7e0280d49ff5e90f8115fe92018f34105852471d169129076fadb6bb10441ba12ff6c0783f43db3f77bbdebc136bbe61f52012b378 MISC ChangeLog-2015 4495 SHA256 063754f5f82b24e91bca6aea2813c13f21841fa2f6295342a6f4dbc1824875f9 SHA512 2581e1f5170d764905fd1d9e007d69fa7e67ae207f8ed1436689a5a5de4a4878b377806e8bffa407c34b393e50ae014b9b88fe6a86f611fd0d99db18673aa5de WHIRLPOOL b0cf97db798de962d73bc3d96bd3c53a0da8b3b128a95ef16212b612fd3c20fe3434cdeaea3b04e2b766c4d21f79f9f8783f6bc97ea47360d829db5cdfec5ef0 MISC metadata.xml 574 SHA256 331d546141e450925b6d70085578de88c34159283a798ae1a4b11fad6ade0567 SHA512 cdc09ee487574bb26eca2eacc6c72a3017eaa6d107f3d649984619e61d304d656dd3bb9afbcc52a3542e75f5a58e2bc17b2ebb5e6a822aed93550b495304aa85 WHIRLPOOL d6bf5ce1b8912fb8faec79aab53dd48413ccb7e2344c27c15ee8121d8f34060663e97dab08f3a43225244818d8d71fea57794fbde3e7da1350717739ef8d0e7e diff --git a/app-emulation/hercules/hercules-3.10.ebuild b/app-emulation/hercules/hercules-3.10.ebuild index 332b50e1fa09..605f69a08dbb 100644 --- a/app-emulation/hercules/hercules-3.10.ebuild +++ b/app-emulation/hercules/hercules-3.10.ebuild @@ -15,6 +15,7 @@ KEYWORDS="alpha amd64 ppc sparc x86 ~x64-macos ~x86-macos" IUSE="bzip2 custom-cflags +suid" RDEPEND="bzip2? ( app-arch/bzip2 ) + net-libs/libnsl:0 sys-libs/zlib" DEPEND="${RDEPEND}" diff --git a/app-emulation/hercules/hercules-3.12.ebuild b/app-emulation/hercules/hercules-3.12.ebuild index 14e2e8a5fe40..b9b49d82dbf8 100644 --- a/app-emulation/hercules/hercules-3.12.ebuild +++ b/app-emulation/hercules/hercules-3.12.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI="5" @@ -15,6 +15,7 @@ KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~x64-macos ~x86-macos" IUSE="bzip2 custom-cflags +suid" RDEPEND="bzip2? ( app-arch/bzip2 ) + net-libs/libnsl:0= sys-libs/zlib" DEPEND="${RDEPEND}" diff --git a/app-emulation/runc/Manifest b/app-emulation/runc/Manifest index 3f06cddd36bf..52926de6a0d1 100644 --- a/app-emulation/runc/Manifest +++ b/app-emulation/runc/Manifest @@ -1,11 +1,7 @@ AUX runc-1.0.0_rc2-init-non-dumpable.patch 4016 SHA256 d26ab99d557547312a3c9d069c188392204536bedeb8b22762cc1f2bb2e66159 SHA512 2e10cc4ea85f0a95c53a4de6922b8a20395b6225f06449b9f3a994a79113f476563bb6acf365ba12de7896fc537141130790e14de1c612b97e283eeb82877139 WHIRLPOOL d43754d5ab03a5c56a62cd8128184aa55aa1cc23604cece4ca9810a4051f32f3970f09f4dc73265c4ccc4ed1855e3d7e5bbc74f1affe97384741d91b0e107580 DIST runc-1.0.0_rc2.tar.gz 550449 SHA256 638742c48426b9a3281aeb619e27513d972de228bdbd43b478baea99c186d491 SHA512 83a3d45efbb86d3d583b96062202b9e60121d250af2c0dd37d07fda574b642aa6f05e29cac6644ad3d624647400db694082e280383e41ca9f31dc0a33b87ed76 WHIRLPOOL 990a45739689db80bbeed43b0fd3a4ce4d0563ea833361b9112e750782313f19e638c4bfbd455f5dd1882d64c724dcf0213701322029c2c9f98f624863c744f3 -DIST runc-1.0.0_rc2_p20170222.tar.gz 576999 SHA256 1ee6491b9c14e0ce9e0546ed92e3eb4bdc60cf4b5e58b6de0455dbe3b03145cb SHA512 fe293057f55eee4f3821004af730ad57f512d610d7cf3693b26e69ffa068c8c28da5426b9f4988627c0803ecd1d46b6e427db8f1703649f5861859d61cd24bbd WHIRLPOOL 561c09ffc7d3e0f1dd73f3711adb85b74d5fea265181cdd1535a83d23a164c1e4cb884053c0b46c968b0b582feeb2ccc9eb99e3e086b1fcbcce0813f4444172c -DIST runc-1.0.0_rc3.tar.gz 453694 SHA256 77dc6c48704da4005896acf369d0ee306f8af684c54a815f589fd87043221380 SHA512 298a176db119a02c1dbe5c095897f34955d6d0d7ea3cb21496258a23225bae35603a818c13f7adc4be1c1f4e2b3a8a540fb2fc1b2828a59f29a53e3c8b13c354 WHIRLPOOL 649aba93a24eff37042cc08d55cff0d97d6e4fe6b2c35053b36a4a186040e8772b8f63be488f3cb8d75e7daa61193669a79b2ed1f04a13ae47695c98dccb17ec DIST runc-1.0.0_rc4.tar.gz 1090513 SHA256 3ffefd293932d2ad509701878dd7dd6ef498c3667198a33e8e5d5a3cbce0eeaa SHA512 cc2ae38b96f3f3355d9ba26f7af15c57975276aeaf58dcfe7fe5f0f0411ece8584a7cb51ae7fdd2f4109366f55ac8dfb86f225e26377fe07b685bbc56a2518ed WHIRLPOOL 298e3ad3561c6d0de3f0517458da47f04389d4cf2686aba96cdf70966b1121e6a7997f0419159a4390dd276fd6cba41b08c6152aea66816a7bb760ebc5e46e32 EBUILD runc-1.0.0_rc2-r2.ebuild 1365 SHA256 26c208b727a67fbfc7c0b67fbfc7196726d9deb2db2eb52f683c5c5eaa5f4696 SHA512 6e5d05c224d4851c3b92b9da5fa4cc3934093bc74742c1b8cb3b50652014aaef46bdfbd17abd7fab4729b37cb7a8c3c9fa0e98ddd3725ae4c4e3ac5b1ae22c1b WHIRLPOOL 567e8b88ebb376f0d6ef249d3751eb0eb50eefba34d8e6d405d54bdbf7e881e19f781decc5e7d1d8ec0b6b90c3071ef84c3f8595263f467b3e28b3782adf6cfb -EBUILD runc-1.0.0_rc2_p20170222.ebuild 1340 SHA256 d6502a88b2dd0819346a907bb8869a0b8bf430722d5d6bb4490a465a52f268a1 SHA512 a15a9e312132aca2df78ac1c1e33f013656d2ddf1f4a75dcbf48c62f69444aa2390c91365869127f257eb09cca380e130342991f7c81859bf69a3eae7965ad15 WHIRLPOOL 2a5ddb35c8847bfdf598d861b792b2bce35e66293029e887c0c61ab1b68d05b31ee5bb2a7c0b0ec9b9e5910a42deabb1f7a19a6f17517b12c139f71c6504f6d4 -EBUILD runc-1.0.0_rc3.ebuild 1266 SHA256 2df82c9436c85fb07bde1e4747533ad021b8afd4c0f2f21e05e91945e9e35a1d SHA512 9ef8329dbb95720807c54fb9f4569393dd2b820a3bd9420c4327a68e8fcfd258dc8cb78def5cde66a9d1519fbd20b7baed7b566ed76630b301856901980e2436 WHIRLPOOL 2896faf66f077ce0e6e2832fe6443619ead207a73d5306eb14fc35237229f6eafdc8042f5b60d2da1e0fbd91a5122ee99df1e4e69c9d885ef148372ccac7dbfe EBUILD runc-1.0.0_rc4.ebuild 1257 SHA256 ffbd14455c22a6e8b91ad1b50084770198caa1e290843d8424fe3b597188b25b SHA512 8187b832cc7793f4914f6684077f223a855ddb16b962bb8a8b7cdee9e9db36dd7b87864e30ecf6e226279d32c9b4c9fbc00c2fd037dd74c27bf0578e78a7672b WHIRLPOOL a2d70d7de9c701a3c64dcd5f203fca51d406a70d8e3e43136d90c17d0926821961deaa90382c222f07fe8d9a58e70a7ae4d5349d88dbf40e374a418eab39854f EBUILD runc-9999.ebuild 1080 SHA256 63705ef8690e9a2ca0775fff05eeaf2ce5689fb00ec49b5b76ee3a9f91cc7d28 SHA512 b026b5cbfd44e110a2c2cd72125c757c6b957137fe9491b85e1f25014b564226a3e76c23ea463fd4d7ad742228b2b7bc533aa6b2539b43ca5c37aa2dd07218e3 WHIRLPOOL 07a121e9e56a48ec91f6151004bc542281fcd286835dbfb1f7ce8bbb66539675dac95ef5a1f12ed9e89ecb23cb1ea2a287bbe95a5133c629abbca6ee6caacd4d MISC ChangeLog 4964 SHA256 075febec76fb540580034cddb4ad5b0f728e5161acafef2854ef90feee89f620 SHA512 475232c13b479d2922cf85103be0dc423d1a577224f2a3ffb802f549af0a707155d9f3ca84176faa9b535e7b52ccaa5790333e6a037046331a95a3cefbf35362 WHIRLPOOL 76f2787b04bfe485fbde81470d5f75ccf5c2acb0cd83e4ff2fde77d8cbcfd32963246f90a9432d7e0b08c8bcb089ae6303d8c57943d753198a0319f72e303ed1 diff --git a/app-emulation/runc/runc-1.0.0_rc2_p20170222.ebuild b/app-emulation/runc/runc-1.0.0_rc2_p20170222.ebuild deleted file mode 100644 index 50ad9ca1ac32..000000000000 --- a/app-emulation/runc/runc-1.0.0_rc2_p20170222.ebuild +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -EGO_PN="github.com/opencontainers/${PN}" - -if [[ ${PV} == *9999 ]]; then - inherit golang-vcs -else - MY_PV="${PV/_/-}" - EGIT_COMMIT="bd2f9c52cd3b766d993924ae6eba72b82998f3bd" - RUNC_COMMIT="bd2f9c" # Change this when you update the ebuild - SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~ppc64" - inherit golang-vcs-snapshot -fi - -DESCRIPTION="runc container cli tools" -HOMEPAGE="http://runc.io" - -LICENSE="Apache-2.0" -SLOT="0" -IUSE="apparmor hardened +seccomp" - -RDEPEND=" - apparmor? ( sys-libs/libapparmor ) - seccomp? ( sys-libs/libseccomp ) - !app-emulation/docker-runc -" - -S=${WORKDIR}/${P}/src/${EGO_PN} - -src_compile() { - # Taken from app-emulation/docker-1.7.0-r1 - export CGO_CFLAGS="-I${ROOT}/usr/include" - export CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '') - -L${ROOT}/usr/$(get_libdir)" - - # Setup GOPATH so things build - rm -rf .gopath - mkdir -p .gopath/src/"$(dirname "${GITHUB_URI}")" - ln -sf ../../../.. .gopath/src/"${GITHUB_URI}" - export GOPATH="${PWD}/.gopath:${PWD}/vendor" - - # build up optional flags - local options=( - $(usex apparmor 'apparmor') - $(usex seccomp 'seccomp') - ) - - emake BUILDTAGS="${options[*]}" \ - COMMIT="${RUNC_COMMIT}" -} - -src_install() { - dobin runc -} diff --git a/app-emulation/runc/runc-1.0.0_rc3.ebuild b/app-emulation/runc/runc-1.0.0_rc3.ebuild deleted file mode 100644 index ed12e14ff1bd..000000000000 --- a/app-emulation/runc/runc-1.0.0_rc3.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -EGO_PN="github.com/opencontainers/${PN}/..." - -if [[ ${PV} == *9999 ]]; then - inherit golang-build golang-vcs -else - MY_PV="${PV/_/-}" - EGIT_COMMIT="v${MY_PV}" - RUNC_COMMIT="75f8da7" # Change this when you update the ebuild - SRC_URI="https://${EGO_PN%/*}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~ppc64" - inherit golang-build golang-vcs-snapshot -fi - -DESCRIPTION="runc container cli tools" -HOMEPAGE="http://runc.io" - -LICENSE="Apache-2.0" -SLOT="0" -IUSE="+ambient apparmor hardened +seccomp" - -RDEPEND=" - apparmor? ( sys-libs/libapparmor ) - seccomp? ( sys-libs/libseccomp ) - !app-emulation/docker-runc -" - -src_compile() { - # Taken from app-emulation/docker-1.7.0-r1 - export CGO_CFLAGS="-I${ROOT}/usr/include" - export CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '') - -L${ROOT}/usr/$(get_libdir)" - - # build up optional flags - local options=( - $(usex ambient 'ambient') - $(usex apparmor 'apparmor') - $(usex seccomp 'seccomp') - ) - - GOPATH="${S}"\ - emake BUILDTAGS="${options[*]}" \ - COMMIT="${RUNC_COMMIT}" -C src/${EGO_PN%/*} -} - -src_install() { - pushd src/${EGO_PN%/*} || die - dobin runc - dodoc README.md PRINCIPLES.md - popd || die - -} diff --git a/app-emulation/vagrant/Manifest b/app-emulation/vagrant/Manifest index e218d8dab737..fa2157c17828 100644 --- a/app-emulation/vagrant/Manifest +++ b/app-emulation/vagrant/Manifest @@ -1,13 +1,12 @@ AUX vagrant-1.8.1-disable-embedded-cacert.patch 742 SHA256 564864e3b8fa7b16439bf074736836c3fbd61d61d9850c3f0c0716be106d3637 SHA512 a3c791490f2b34965a3f3303ce064be76c86a6321d3d5616837b104e2db9a318c57ded7c59a925de7c79e6a5dce9a35ca0d90ef37cf8012d257f3e4e03d84508 WHIRLPOOL baf540cda2633286b38e585a365881c1fa52d4222982a96d976dbcf8c95169b713db20fd838bf7bf1b22aa5a4ea0a0b8c52b075ba5117d48923520c51c8757c5 -AUX vagrant-1.8.1-rvm.patch 302 SHA256 00fbfe62a4985ccc2015423e893b738a4bc674fa5a983e7c6f696287ce989a9f SHA512 23178e36c808fb240236d6fb3c86df738fa5d2aedfc1d64bc7669f0807645863b8571818e58bb59160541f81141cbf124f2aeb2113225b094e19a5a852e2784c WHIRLPOOL 75809426fee843220e9ce3f56e0b36822bf9d58f5c6603780dc4e7626fb2016ffc96147c377791c8df178d617a1073287fe9b99c0f3680e74596dc97ddc8bec8 -AUX vagrant-1.9.6 1564 SHA256 e83061cd295206997c000677e222c9e53faf65e0e615f84267b96c9e2626b462 SHA512 4a4ed00d90a24919a6528b8fa10b309c31e5d5bd83ab43ddf042b9afcc814895a2259faf46e9d186da65d0b825ba4a848d2421e98e2e9616b67d3f4ff5d99ff2 WHIRLPOOL 6774119816f24bed3bcac49e22ba20ff6a22e8067cbe6339211a4356f0176ad0fda90a92901c0df6dc54d2aa8739deab243adb0d7aeb07fe1bfad4d552cbcdfa AUX vagrant.in 1541 SHA256 c09cc8ed50c9b770101563b73c1791c5ad2185385aeded6aa341719a2f7a8de6 SHA512 05b6c08eab0f4d5f523cfb4231db673ed66052fc72c27e97228be06a5f881da301538b8ff2e4872e8190ca996b994820a468c54b26759e2ca4036da409ca1a82 WHIRLPOOL e987e9b0565d752859904e60a30b76c8aa27b3873ccdeb455961717a8dd03a1a1dbeb7aba957bba7736b5c356282a9802c2b5d8185f28972502911243fa5626e -DIST vagrant-1.9.7.tar.gz 1119024 SHA256 194de72442a2d08f6e04fbed8698a99d190a0e7203d35b49e80d4ddfcb71fb1b SHA512 062921070ace7ce93145981b5b768dc9dc447559fc12c52c8da323d1e3523fbff2a8e7afca0e2f751e232aae822c969b5d166b3b0f01a0744ca20c4e4e33567f WHIRLPOOL ef0331781cf6a71dca9eb485943c459a5360f55b1db45b4f23b413b848eeac1700afe3ea51b6dd2e0da1a7c1ba6ad456bd9fcb7a7b3532145e95a38fc997dd99 +AUX vagrant.in-r1 1703 SHA256 b718eba95bbfc806bfab8985979cd33650c50b2fc1c87bb786e4393b4799ba14 SHA512 44ec9c2a18c336baf152ea812d30b8413fc6d3e2a63004563f2becda9487212f3f17ee13e9d54486654f06c2d8ea9a3c778f9ed38f185923eb1f17a41ad20b6d WHIRLPOOL 92eea16c78ce4c5b12705fb33e03b25f076f99625999990ba61bbab5260f9c44ff1c8b32c5fe6b5360485210946c1915b3a249b2c8e2dccf14d60f234f627a23 DIST vagrant-1.9.8.tar.gz 1127560 SHA256 59c1d50437d2f50eeae219bc03c90d397fe8d8c974cce7c51b017b8ceeaefb54 SHA512 d22cc0a6800aa5ef84085c750f5ec8729f7b3adefd9a5df1a1fcaf60d1219e781869ede4f57ce4fdeb269224603dfc3a8024545a0250ebd9e144745ce9aa670b WHIRLPOOL d9c199322798e792a895aef03f729b4db8bb5eb3eaab960092d5aa2831032106a9f55ac3957b43378cceea2d27cf53f8ecf6ff38ff54ff2f8c4451c0238029ee DIST vagrant-2.0.0.tar.gz 1142850 SHA256 c25d3a5f18abdf349047f4d80bb74e6cb526959536e4bef5aa771de9d39cb260 SHA512 ee9059dfd205253d6f978fd225d85eef5a281532a1992bc9382eb713c95a0280d4b6518460106227237ae4e93cf5e2eaf670bd378627c3e9696b0fe9a2427ac1 WHIRLPOOL 8337800f6c5cc88081dc6f8630de60ecba8c851687d14143f34dc41b62cbd67b1e463f7351ecc0e1c764742004fdba389bc33c0bb2a5c043d1fbf6dde352171c -EBUILD vagrant-1.9.7.ebuild 2245 SHA256 5e97589630d665e2dcc26db5bf1705e7c4bf806fda8787f5aabe6a5bb114858c SHA512 1ce490a033e9afc4f56ff266f066c9e5d348b89ef957e64aaf749338d68635989504f803840b707bc4ffbf8f7352ce603246c39a9c8e0226c594908bb4e492b1 WHIRLPOOL d359ed94862b957cdfc8f27a9cba698e2b1ff6b37669961d80ec6945ca49ca32d05f8cfd10c547d2b048eb7c162a2aec65fafcbdcf2d5f92e386996d79df2e25 +DIST vagrant-2.0.1.tar.gz 1153702 SHA256 212b91c45f60a825fcfc656424021e2550833778a6d4ebe13458676201a04eba SHA512 4458fd819cfcbf732dcbb5e334986afc986e3da4f4ea883260ed9b7ff8dd90ef9b0078c067a1bf7fbf51562f235ab447234762a38aa0ac539974f6205f6d9cfd WHIRLPOOL 7c66469b1fc0078524b62dd62dd66ae45f6527602df650dbe755bbbe12d4d4b04d6e0964606705a2c9ef4113d5b6abdc5619d223f4913cb9425d4032921ec0d9 EBUILD vagrant-1.9.8.ebuild 2169 SHA256 85dac8cc6a0fc46541c6ac55cc1600f2d4f1db6106f45ad7bc4b97b8bdc45e24 SHA512 ece9364b5437f22a2f441408c0811d14dd93138e7d9cce5ed785847b9e38982c880c808a1ba7668ca24fdeadfdd59a77a931461897eb54266aec4c834549f6b2 WHIRLPOOL 3c9521dfdcda46b7f28fa24a16bb975122eec57fd013c273b3a831551585a4899b829af40da7ea3bc629f87d8d429e0d73b7293cfa6ebd08800fd7200876b7c1 EBUILD vagrant-2.0.0.ebuild 2162 SHA256 a306f15d034fb2dc1d280efdea71fc74fd9934aaaf3509781e7ea204efdd913d SHA512 149763cc4f924a7879e0ad2da42f1d8dd74ff2679b44ad4fc3f16be588dab3794a7415decb089a73c15f4a86d44102d4fa58198c49106dc1e58dead8ba8bdea4 WHIRLPOOL 071ce0a575507a9598b20b8e4e9ab9829a655f4ba8963c634422ea31341541cbe141334d4ced98bfbbdcbcf097e679da70fe524a207a3fd00e46074ae0de0a04 +EBUILD vagrant-2.0.1.ebuild 2051 SHA256 9b3fd88afc9617b84988fd372ef0ef2ea08ea31bd97e3bf93e1942149312e24e SHA512 c3557a23b98e652ab5f9d37d50f29ed119f4e172d056c749c7f30507322cf334f8a0287b3c8db49b438d70ac125c8048e15d137546486f57133823959d9c5e39 WHIRLPOOL 796fcfd52c5b7896d5ef37a7b3f41f2309d82a41938b8a47164c178edc7ba8bf58cce6254cf18899795666d219f48169237f19a69e013e2115c1120a47625c8b MISC ChangeLog 6375 SHA256 28dba9e48cdcb83898cdf4ab42121ea70fafc2aad540ce1f32cee1ee175706e3 SHA512 b72a0c371ba71fb0338b87b6d9e57c401672a422012670a7fede13f4a6bcc4ff8ac3270f844880a75b3fa792cf9d47c2845a8cbc6093a0f737a0907cfeebea89 WHIRLPOOL fda114ad8209f062e240d88dcc592af434ca678780550c8612f2b7d34b19aa2a9611fd9277d13f56ff92ca1671116a1251bee68db842ff9b1637625b7279cceb MISC ChangeLog-2015 5872 SHA256 e34883a45cf43c4dc5f1e70fe05237c1b2dfd516c521d1ef1133d2a85250d610 SHA512 28e0390fb222950479e87991ed877731aff7d1fe78177bdf1043036af7f792d44114ab86d8af947f9c80bd539f275a6516b1f9894cd140f4658aa3f05641506d WHIRLPOOL 55c00413ec85340e8fbf7f7b86550a1de8dcba1f2cfe6b0813e57a3f84c67a77fdc2b90ae4bfef37335e4ec86d028413bc00798d1c7bd8221f9b767759c3ac65 MISC metadata.xml 572 SHA256 68069b04e6eb7838158806e4163fcf8c9fd885d20d2a1c5f3078ad321cbf5fd0 SHA512 37ddaa8e7b99b2b9e1487254af11c2201db8469da1a63e26c64b4cb3499867bd3d15b6e2c8871a1550a92722e76c0509408b148e993592b733fd8d14299aeddc WHIRLPOOL 7f744885f8f48ee98e53552454ef90a8e036819676e71a8c3ced62cb2ecfd7cf12c48b7c7107bc81c39d522531b6c6c45958fc4da286f2226a64e270bced3dcf diff --git a/app-emulation/vagrant/files/vagrant-1.8.1-rvm.patch b/app-emulation/vagrant/files/vagrant-1.8.1-rvm.patch deleted file mode 100644 index 81d17be010e3..000000000000 --- a/app-emulation/vagrant/files/vagrant-1.8.1-rvm.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- vagrant-1.8.1/bin/vagrant -+++ vagrant-1.8.1/bin/vagrant -@@ -5,6 +5,8 @@ - # initializing which have historically resulted in stack traces. - Signal.trap("INT") { abort } - -+ENV.delete('GEM_PATH') -+ - # Split arguments by "--" if its there, we'll recombine them later - argv = ARGV.dup - argv_extra = [] diff --git a/app-emulation/vagrant/files/vagrant-1.9.6 b/app-emulation/vagrant/files/vagrant.in-r1 index ef264888f3ff..7c0405e8a835 100644 --- a/app-emulation/vagrant/files/vagrant-1.9.6 +++ b/app-emulation/vagrant/files/vagrant.in-r1 @@ -4,16 +4,25 @@ # Vagrant installation directory. This sets up proper environmental variables # so that everything loads and compiles to proper directories. -VAGRANT_DIR="$( ruby -e 'print Gem::default_path[-1] + "/gems/vagrant-1.9.6"' )" +for r in ruby24 ruby23 ruby22; do + VAGRANT_DIR="$( "${r}" -e 'print Gem::default_path[-1] + "/gems/vagrant-@VAGRANT_VERSION@"' )" + # Export the VAGRANT_EXECUTABLE so that pre-rubygems can optimize a bit + export VAGRANT_EXECUTABLE="${VAGRANT_DIR}/bin/vagrant" + "${r}" "${VAGRANT_EXECUTABLE}" "version" &> /dev/null + if [ $? -eq 0 ]; then + ruby="${r}" + break + fi +done # Export GEM_HOME based on VAGRANT_HOME # # This needs to be set because Bundler includes gem paths # from RubyGems' Gem.paths. -if [ -z $VAGRANT_HOME ]; then - VAGRANT_HOME=$(eval echo "~/.vagrant.d") +if [ -z ${VAGRANT_HOME} ]; then + VAGRANT_HOME="~/.vagrant.d" fi -export GEM_HOME="$VAGRANT_HOME/gems" +export GEM_HOME="${VAGRANT_HOME}/gems" # SSL certs export SSL_CERT_FILE="/etc/ssl/certs/ca-certificates.crt" @@ -25,21 +34,17 @@ export VAGRANT_INSTALLER_ENV=1 # This is currently used only in Vagrant::Plugin::Manager.system_plugins_file # to locate plugins configuration file. export VAGRANT_INSTALLER_EMBEDDED_DIR="/var/lib/vagrant" -export VAGRANT_INSTALLER_VERSION="2" - -# Determine the OS that we're on, which is used in some later checks. -# It is very important we do this _before_ setting the PATH below -# because uname dependencies can conflict on some platforms. -OS=$(uname -s 2>/dev/null) +export VAGRANT_INSTALLER_VERSION=2 # Export the OS as an environmental variable that Vagrant can access # so that it can behave better. -export VAGRANT_DETECTED_OS="${OS}" +export VAGRANT_DETECTED_OS="$(uname -s 2>/dev/null)" -VAGRANT_EXECUTABLE="${VAGRANT_DIR}/bin/vagrant" +# Allow to install plugins even with deps in different slots (Bug #628648) +export VAGRANT_DISABLE_STRICT_DEPENDENCY_ENFORCEMENT=1 -# Export the VAGRANT_EXECUTABLE so that pre-rubygems can optimize a bit -export VAGRANT_EXECUTABLE +# Make it work with rvm (Bugs #474476 #628648) +unset GEM_HOME GEM_PATH # Call the actual Vagrant bin with our arguments -exec ruby "${VAGRANT_EXECUTABLE}" "$@" +exec "${ruby}" "${VAGRANT_EXECUTABLE}" "$@" diff --git a/app-emulation/vagrant/vagrant-1.9.7.ebuild b/app-emulation/vagrant/vagrant-2.0.1.ebuild index b6b67db26be1..a496014e0f41 100644 --- a/app-emulation/vagrant/vagrant-1.9.7.ebuild +++ b/app-emulation/vagrant/vagrant-2.0.1.ebuild @@ -9,7 +9,7 @@ RUBY_FAKEGEM_GEMSPEC="vagrant.gemspec" RUBY_FAKEGEM_EXTRAINSTALL="keys plugins templates version.txt" RUBY_FAKEGEM_TASK_DOC="" -inherit bash-completion-r1 ruby-fakegem eutils +inherit bash-completion-r1 ruby-fakegem DESCRIPTION="A tool for building and distributing development environments" HOMEPAGE="http://vagrantup.com/" @@ -41,7 +41,7 @@ ruby_add_rdepend " " ruby_add_bdepend " - >=dev-ruby/rake-11.3.0 + >=dev-ruby/rake-12.0.0 " all_ruby_prepare() { @@ -62,13 +62,7 @@ all_ruby_prepare() { sed -e '/rb-kqueue/d' \ -i ${PN}.gemspec || die - # disable embedded CA certs and use system ones - epatch "${FILESDIR}"/${PN}-1.8.1-disable-embedded-cacert.patch - - # fix rvm issue (bug #474476) - epatch "${FILESDIR}"/${PN}-1.8.1-rvm.patch - - sed -e "s/@VAGRANT_VERSION@/${PV}/g" "${FILESDIR}/${PN}.in" > "${PN}" || die + sed -e "s/@VAGRANT_VERSION@/${PV}/g" "${FILESDIR}/${PN}.in-r1" > "${PN}" || die } all_ruby_install() { diff --git a/app-emulation/wine-any/Manifest b/app-emulation/wine-any/Manifest index 677188482ccb..a888ab6d76c5 100644 --- a/app-emulation/wine-any/Manifest +++ b/app-emulation/wine-any/Manifest @@ -9,6 +9,8 @@ DIST wine-2.14.tar.xz 19447812 SHA256 03f934d95181f728600ca04d395f10e821ee38cfa3 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.3.tar.xz 18931732 SHA256 afc95c7a87cc8f0730b462c50a5dfc9c462eb02c6bf5874b4fa99946f49e067e SHA512 bea78e8468555ff9e08dedf3918da5ea82721549c43984869989bbdafeea00e454820ff9558aa29925c97a165a9b01e5cd1fd397f133833c58824984a6686171 WHIRLPOOL 1f5ec8e5c32d124277e4c71d95726d3a5337575757c3029567c77165d65fcfec2ddf33d3863b4bf55c9eff7c3582c1ec7dbd76d84ed8bbbe89dd16db6b0128c1 DIST wine-2.4.tar.xz 18953748 SHA256 87b5df07e4781fecce2f92415a4717208ea253a20a0df8b36b9f90b69b72748e SHA512 15ae7e97dc72a8636b2c15c93803ed430fa456d673add61457cf3e479e769559c682b40949b5d38828f6681f13183e560fcb4a2eb0f0ba25e6eade46f7d3d7c0 WHIRLPOOL 558ab7b7517ad5e03366b4db974047eba776585e958a5b71bb2e93993e21bc725ea7a8bcf2a4354f34ca38c94ba99ccd15f2f8b5e4b58066bf339d3517eec56c @@ -27,6 +29,8 @@ DIST wine-d3d9-2.14.tar.gz 48718 SHA256 71a3aff0b348f033d4ca610e34ce6faa02eb2b5c DIST wine-d3d9-2.15.tar.gz 48717 SHA256 c0aa58e7fa3b595c38cf06fe72b54a096e43e526142a7576f839ed8aaa85cabf SHA512 5298de273fc95f65ee481416f8ed16059f244e3781058cb76ee60b6a85aaf8d977a619c75cccd08aadeac9aae9ad2e08b49c5b52ab141cbff351a4b001e7c434 WHIRLPOOL 63337e2c86be5ff2fc16ff0817719ed668360ad2258b095e88b98b1f31e382593b14cabdcb8be58a6dc0cc047cd67a3eb1f14d3ecb806ba2ac9c6f7102368c94 DIST wine-d3d9-2.16.tar.gz 48728 SHA256 2a681d28a4e042437c32ecf3f92c7abaadc862feba6aacf0df76469acab98f3e SHA512 f3950d7e34ec537b95b963fb3b35ee3729c1b3f9d8c225e96ae9ab9cf8011571ba22105a17309c481f3a504a8aa4d5ae04270691c49098924aa2f72463b79e08 WHIRLPOOL c1f3cb0922cb381f6e2aa7fd54538b98dbd04daa7f36f66742af4c544c80e894e33ebf4866520af35faec27519f0015cd5cc1139fe191bb0b3192cb2134035c3 DIST wine-d3d9-2.17.tar.gz 48722 SHA256 557ae75a68529f282f1f5e7e9991892d7d994f199060ced43db22291ec66fe71 SHA512 530d44a968a68e06449da2286b8c9740a80b681ff610f6ddc87e6fb569e6c29181341266a04238965a7bfc209e20c1521847b70daa8d3532c2a269db0d200154 WHIRLPOOL 0c70a88949eaa27ebbc28a6951651e4b55166c1d54a8db6d9fdfe3f516d2f4e24ba0f08defddf637b9c2ed0702b250af4d41146684b79e90d84aefe284351059 +DIST wine-d3d9-2.18.tar.gz 48722 SHA256 d1b5210d4228ddcc60f76b4a8694d5feb4e3c68ca4436666ee182c8b14f25356 SHA512 0e66c51e1957b27ccb9f326b0aaf2b0d09b7bbc9d03e1d321aa1789d2560b8e60fd83c4e86999d96a03aa73a37c96f34d93245763969a314150900741aa03933 WHIRLPOOL c879d7ca20e2b339ab1ad862274320ceced84693311dfc02652a83304d0beb263a59e8978fae65ad50bbb51eaac51988ab2a0105c50dafa9176caf1baa791506 +DIST wine-d3d9-2.19.tar.gz 48818 SHA256 54b5fbda45585304e65665e5b2da96a8dc30398c3f8ee12b77a613970b5af9f9 SHA512 be43435cd53f367ca57080c08218db302a90bf85ec6e917e89375904c456b585b61fb6053f9b4366b7e844f8246cabe83460a9866f614dbb5df3edfb43b2f54a WHIRLPOOL bec78732ad8b0036999c4e481e2d6f50d2ec4002590f15fbebab740bbddbc5069f77853993a122ccc03b24cf2b6c76b80117b000648a97fec09eba988c792f57 DIST wine-d3d9-2.2.tar.gz 48387 SHA256 203ed60980ec584c09b413266728e3a93e2d980dbff9b4f65375a4e9744b5042 SHA512 6e9e031b51afc8ec200bbd252ff0d768c29af23907f782409834de593f896afb128f86fe012c95dc18e5f3c7267f170eb343d2a2c53d639933a337f0c1e04fab WHIRLPOOL 6b32c0dfd3068e87d94bbcd83718dd75a14b36d69b151e9257e04793d2d3ae78ce7da10b80cbc824ccefb6c11666241593f91963ddee6a58301f95bbde35285d DIST wine-d3d9-2.3.tar.gz 48510 SHA256 fc17488a782def19fc02bf967128ab43236db49509e31771361a60fa3d17dd60 SHA512 58449f6b7ed7fd8182e2cce92e1d1195bf64a567c1cc92fd3f46af195e7e4039c3b2a128be9d3572d9067be6c1bb020f417c6d558bb551c60096c107067177b8 WHIRLPOOL f648a921cf4cd257a3a7dfbd3abf45d58c07782f329ec11c3a1eff3afe32e8040adb351d4a60e1b1f78c7cae0379f23468764ad162a101179d0f5b0e2c6d9413 DIST wine-d3d9-2.4.tar.gz 48502 SHA256 4c7084e733d95545b894b152b2c6c9564dfb8df594cfeb1512dad80743b39ae0 SHA512 623b1720b8cd79ab6ad2a177b9beb174f31e6fc402d6885fa2006223c855919c6f5d4267c64212ecf8cf1746430c9715c506343fb740828fc99910f916b10ebe WHIRLPOOL 9c0ea34dedc2e39ce36f1539a6d761ba07429b316a1f7fad49067eec5c28a5c60b33b3d2473cbf66b009d9772c1fb123414bfa201eb8df3e61f8efc38aa1f3fa @@ -45,6 +49,8 @@ DIST wine-staging-2.14.tar.gz 10179829 SHA256 cd4c8e400a808cbfa5c5cf088ea874c761 DIST wine-staging-2.15.tar.gz 10190900 SHA256 f2b5c43fbc185a6fd6399f4c351b83a172737977b2ebb1cbdeddd1838d044bc2 SHA512 75d64d103839da2daed6e5b2400185c0a5274d0e50b675283bbadff70cafe712e573701207d80c8e8af7f68d1d273efec3c0d705dc982c74b8574929daadecfa WHIRLPOOL 13239aa636fc102fb374ab8724b7dbce8e9b95f16797a4f5faf8a5e7789d60e6b485c7495ccef4568edbbb0549d657a6758642de2e98b449b0ced2725136e444 DIST wine-staging-2.16.tar.gz 10220855 SHA256 da0ef4b0eafe9cd1b9cf26a5b950088adf1308e17a0d6f4ae62516b6ee64248e SHA512 96585caf77569a31f516aefe230a8907ef91db29759f75075593b751985f294bf292a1c146d287a3f0859a6b6273560670c4bc734ef0fbecb0809574eb3f09ba WHIRLPOOL 66128c8d59593243e95d6765b9fd8ace59e85e365a5e8a41eeb17d370464005aef060ddf3d862d0a3638048fd92189860e69a3cbf7d24d3ce1e420200d4b3cf5 DIST wine-staging-2.17.tar.gz 10211107 SHA256 f511bf3438dc418b4f667513bf1ae419255e4ee62229e9205c0c64b047222183 SHA512 b652f6a852a1382c1b8275e172b7ac7608749c34aef5c0c5387cf262bf0da8db67a77ce397d49e53f3e2a8f210a3dbea1a9b3f3feb15c7d5bad8952b6fb7b53c WHIRLPOOL c45dc5fc91bc774f9f28bb06dff959391829fafac398bef198755395afe5a65bb2d32ba3ce157607a6040481955926866ed8f0760850bfca821be8599f4d7b64 +DIST wine-staging-2.18.tar.gz 10243957 SHA256 69c75d3ca17b1c3617cd0934a9e9ad6fca37c6679900d2cb63f6981aa1026cc8 SHA512 fe18b53d4160596d134ceed392f6459e9c183381f4712add43d8422e77d7d5d89ff34a3bb3afbd7740f250d85dfda0f3501e9600a41270790ae02138ed6d7dc7 WHIRLPOOL 2dc1429a7a4f13ee01b1317f1937ef7ec6b42c3cfdd78ff78bb8273e1056751edb2ac119904ba48ab645b430f269a9361a6d42bcbb5dfb46bd15a129569d3194 +DIST wine-staging-2.19.tar.gz 10241240 SHA256 2fdb083a484708362433000f92b54a5d648df190b2ab084647c45f5624063bd2 SHA512 90916cb096bbfec35514eff4c1b6e2090b6e68e3e7af1164715f5abb1d255c5cfd6411f53c27cb277adcf0982fa6d6e508a7cdbc1404dcca6c2700b05c2c5483 WHIRLPOOL 3ed1a5d39d0ec186538e04ca09e4fa2729f356385523177b753e7c7183416f666f336bec7d4b606f29266cd227cf5e72f707c79adf510bc3899adb76ce3df84f DIST wine-staging-2.2.tar.gz 10078327 SHA256 9d3cbf7e5f12c623d275457b910a158e0b176fcf50c09a5f8425864de604bc1d SHA512 8ad3f8ba4c6439a9ec4884a55018a67c9e2c2384830074646aac7b70cb9f4f5a20f760247ab42dc3d2f697cdac7ea5322be8ed12c435cb0bc185ac08fdd4dd91 WHIRLPOOL a34c19aaace64307de56d935cb0cef17d7c066c39b83c51e70ea76a20083f928bea55fe38d62b7a8250b0a9e8f00e0d2b744f43fcab433069ffb96625d955303 DIST wine-staging-2.3.tar.gz 10071742 SHA256 9a81be606836fab6203857f7937ff97575947f75d52c80fb5489418efb8b87e1 SHA512 8e8af1e36cc69c63ec3542f0ec4db18b6d8c16b5c9077eb211297f3a886519da71bcf72934bf8d6d72e44c7c9f765e1d00203d0d75cab8544f69f9b0c10a7133 WHIRLPOOL 50738a6e20890748d7eb01152244d34b259759f61b3587ba39815dc066fc8e2b66ce182e1ddbc912f50076a3599aa060ec6a94eeaab4513ce3a776711929b9b1 DIST wine-staging-2.4.tar.gz 10067020 SHA256 709cab12c0ebf7cf9504fd4a67eb851272309e00066ad81f184b0f55c63e9deb SHA512 55d11851697836b582ba54696cadc812ef6b14872440f5c3ed6fbe30a05abcb8abe2ab31a11ea4daeb354854c7c0e6549401d4b26b26621808bdeb89aeb206f9 WHIRLPOOL 8d344b7e6e89322c8dbbe6fd211851c90a45a33b514c182609cc60dc21939f791abc71d8665cd66e5c5161f159fe24c4772b99405833e3d11985a644e1335eaf @@ -53,23 +59,25 @@ DIST wine-staging-2.6.tar.gz 10034709 SHA256 ff86ddcceb7f6857bd415db3842ddf216a5 DIST wine-staging-2.7.tar.gz 10018082 SHA256 3095f9c634f00b143c2407dce8c3f29c629ec95074cf14c8e8dc2e0cdba45b6d SHA512 0abc89af701ae1b95c0eb08e72894c7bc40bdfe792e05b8af9282eab8407bb90b7dfcd4eb3a193a88759ce5d6ea6c2aa9696cac2d744f543c92529bb0d2636ee WHIRLPOOL 6cc666f702ef1bd574ede54a7f6755e07d768c9fa549b9bdb9b5416288619347e0c1b9c70893b6300800d8e6c94e8d2396937f639d1e821945ba9fe144b32c95 DIST wine-staging-2.8.tar.gz 10043842 SHA256 8680614be6c3b01c7c577eb6924fc05cc3de92394384939dd5b2e12e08235fff SHA512 af1707fe3119664a0d97d94fc4c955612d80cb76eae8c4248a268c0f6be9e659fccf7c26899c9e9ae5822f74474c0db5283b598dd4d9d69a3b108f947653217a WHIRLPOOL 7e9aa61a7666404475abb442304e63c76c2e6df26479711b7c08ebe7c15b9b53017e7a1d2dca4f9f8aeba78290df03f06076c99ac06c30d5ed893cfc3842107a DIST wine-staging-2.9.tar.gz 10062408 SHA256 cde0895142c0ca0be5b532560ec0546d6e4f655615572d80cfcce663f92c57f6 SHA512 7862a403817791c54c5c1b8f233b06a850500305c46283bccb9026fb6db041a8fba619d145ab21fe2fdc5f25ed3bbb75fde05245fbbbd67139a5f64b547b1196 WHIRLPOOL 52c0b9065cfa54f6b86b74f9a98c9d232e3a88aa9d61d06c6e01044122fab8b01a567e99f93014042031e9eb991fd9234c4a02ebe3d2aa8c042e5e769269095c -EBUILD wine-any-2.0-r1.ebuild 20951 SHA256 ccaa96577b014a72eb36be6919d5c675afd0992421530162ea0c9e5d2a0d9eb8 SHA512 bd56011f1aeace0b3c2ffd24f27b567fc4fec87f9326e1a07d11560061ce2980b7af136b2a61b851e560fe6e078c0d97b43a72f3a258b922c226a88439a3943e WHIRLPOOL 55971cc6e783ccaf0318d1a109d4c6c2f84324cf4dc6e759a640678d395a939fb7b71216d6240194c920e8b1b3f64ad0701a3c468eb6757b76219636b315eec5 -EBUILD wine-any-2.1-r1.ebuild 20950 SHA256 d26b4e9c49a541b062aeb4d2cf6cf196e0122dea8c5db0443fa5b3e6d88a7871 SHA512 bda7351dd4e281cecdebbaa38bd5c02b7a7b5181e9649d405d29b64e91491d3bb70230730524611683f4f32aad07ad5f89dc5b5fadce0b87934901fc7e1e78d4 WHIRLPOOL 6d90e01f4c60faa12102f4d33524df6ab370198fd6ceb210f132e0625069e0c208302842634934a4a62c6792c867e34d883ec49e2f6376c0dbada040fc37a0c2 -EBUILD wine-any-2.10-r1.ebuild 21014 SHA256 252ecc3001073b316c9c97f267a2708d55efa26b19ab2614951e4d775ed1ec72 SHA512 7ed9ef5667b166b904d0ba9228864399059ca41b78c17dc6e5c2b551b7d2d41b3a72b7540ef0f4f6fc4969f83d4435b43730d088c641e1733c6b80d6a6865f15 WHIRLPOOL d26ac9f5bb0fb971b7b64c246a846d523262750b9b14ee08d35d0089d3c2ce563fe5101983f181afbccf69be1e395da4aa098d672be37e5575bea2dfa1215e24 -EBUILD wine-any-2.11-r1.ebuild 21014 SHA256 252ecc3001073b316c9c97f267a2708d55efa26b19ab2614951e4d775ed1ec72 SHA512 7ed9ef5667b166b904d0ba9228864399059ca41b78c17dc6e5c2b551b7d2d41b3a72b7540ef0f4f6fc4969f83d4435b43730d088c641e1733c6b80d6a6865f15 WHIRLPOOL d26ac9f5bb0fb971b7b64c246a846d523262750b9b14ee08d35d0089d3c2ce563fe5101983f181afbccf69be1e395da4aa098d672be37e5575bea2dfa1215e24 -EBUILD wine-any-2.12-r1.ebuild 21014 SHA256 252ecc3001073b316c9c97f267a2708d55efa26b19ab2614951e4d775ed1ec72 SHA512 7ed9ef5667b166b904d0ba9228864399059ca41b78c17dc6e5c2b551b7d2d41b3a72b7540ef0f4f6fc4969f83d4435b43730d088c641e1733c6b80d6a6865f15 WHIRLPOOL d26ac9f5bb0fb971b7b64c246a846d523262750b9b14ee08d35d0089d3c2ce563fe5101983f181afbccf69be1e395da4aa098d672be37e5575bea2dfa1215e24 -EBUILD wine-any-2.13-r1.ebuild 21014 SHA256 252ecc3001073b316c9c97f267a2708d55efa26b19ab2614951e4d775ed1ec72 SHA512 7ed9ef5667b166b904d0ba9228864399059ca41b78c17dc6e5c2b551b7d2d41b3a72b7540ef0f4f6fc4969f83d4435b43730d088c641e1733c6b80d6a6865f15 WHIRLPOOL d26ac9f5bb0fb971b7b64c246a846d523262750b9b14ee08d35d0089d3c2ce563fe5101983f181afbccf69be1e395da4aa098d672be37e5575bea2dfa1215e24 -EBUILD wine-any-2.14-r1.ebuild 21014 SHA256 b58918414ec5754ecb0352dde467ebbf1e974061fdc5eba53dfae01b887eca65 SHA512 e9e530c29304fe0fa64724d2081566dbc36c75b95d676b70ba459828c2af2d94108254e4866bb30ca7876442df92f076bb454bdae63afa4b9c9e29046ff3e791 WHIRLPOOL 8b10894cd93e19ebe9b9d795e44a8ce086193797b91ac3c8caacff5f15670e27f6f0a6fc06a01a623d30a20c46bfd56a955a1c74d23f421198e6cff0cd8c9bca -EBUILD wine-any-2.15-r1.ebuild 21014 SHA256 b58918414ec5754ecb0352dde467ebbf1e974061fdc5eba53dfae01b887eca65 SHA512 e9e530c29304fe0fa64724d2081566dbc36c75b95d676b70ba459828c2af2d94108254e4866bb30ca7876442df92f076bb454bdae63afa4b9c9e29046ff3e791 WHIRLPOOL 8b10894cd93e19ebe9b9d795e44a8ce086193797b91ac3c8caacff5f15670e27f6f0a6fc06a01a623d30a20c46bfd56a955a1c74d23f421198e6cff0cd8c9bca -EBUILD wine-any-2.16-r1.ebuild 21014 SHA256 b58918414ec5754ecb0352dde467ebbf1e974061fdc5eba53dfae01b887eca65 SHA512 e9e530c29304fe0fa64724d2081566dbc36c75b95d676b70ba459828c2af2d94108254e4866bb30ca7876442df92f076bb454bdae63afa4b9c9e29046ff3e791 WHIRLPOOL 8b10894cd93e19ebe9b9d795e44a8ce086193797b91ac3c8caacff5f15670e27f6f0a6fc06a01a623d30a20c46bfd56a955a1c74d23f421198e6cff0cd8c9bca -EBUILD wine-any-2.17-r1.ebuild 21014 SHA256 b58918414ec5754ecb0352dde467ebbf1e974061fdc5eba53dfae01b887eca65 SHA512 e9e530c29304fe0fa64724d2081566dbc36c75b95d676b70ba459828c2af2d94108254e4866bb30ca7876442df92f076bb454bdae63afa4b9c9e29046ff3e791 WHIRLPOOL 8b10894cd93e19ebe9b9d795e44a8ce086193797b91ac3c8caacff5f15670e27f6f0a6fc06a01a623d30a20c46bfd56a955a1c74d23f421198e6cff0cd8c9bca -EBUILD wine-any-2.2-r1.ebuild 20950 SHA256 d26b4e9c49a541b062aeb4d2cf6cf196e0122dea8c5db0443fa5b3e6d88a7871 SHA512 bda7351dd4e281cecdebbaa38bd5c02b7a7b5181e9649d405d29b64e91491d3bb70230730524611683f4f32aad07ad5f89dc5b5fadce0b87934901fc7e1e78d4 WHIRLPOOL 6d90e01f4c60faa12102f4d33524df6ab370198fd6ceb210f132e0625069e0c208302842634934a4a62c6792c867e34d883ec49e2f6376c0dbada040fc37a0c2 -EBUILD wine-any-2.3-r1.ebuild 20950 SHA256 d26b4e9c49a541b062aeb4d2cf6cf196e0122dea8c5db0443fa5b3e6d88a7871 SHA512 bda7351dd4e281cecdebbaa38bd5c02b7a7b5181e9649d405d29b64e91491d3bb70230730524611683f4f32aad07ad5f89dc5b5fadce0b87934901fc7e1e78d4 WHIRLPOOL 6d90e01f4c60faa12102f4d33524df6ab370198fd6ceb210f132e0625069e0c208302842634934a4a62c6792c867e34d883ec49e2f6376c0dbada040fc37a0c2 -EBUILD wine-any-2.4-r1.ebuild 20950 SHA256 168932d20430032eb5a3d93c6e1456f11a12baf8b2d05b6c12b6cdcccb8b398e SHA512 a9eec2a1e0e3fafbae03ce389520f34aa67d582a0b29ea3fcdcc233eb29b18f85c210fa39d9015fdc999fa98f2fb9fee2dbadf82a9344069082f00f739456f90 WHIRLPOOL 1564780dd2ecdc25276a0f82d3ffc6db5acc04a3f750b3b724c8370dfd51e8e47085bac727cc5f6b0d4644e65ed2bfb9243dca9110c3b25aea1b24b914b30ca2 -EBUILD wine-any-2.5-r1.ebuild 20950 SHA256 168932d20430032eb5a3d93c6e1456f11a12baf8b2d05b6c12b6cdcccb8b398e SHA512 a9eec2a1e0e3fafbae03ce389520f34aa67d582a0b29ea3fcdcc233eb29b18f85c210fa39d9015fdc999fa98f2fb9fee2dbadf82a9344069082f00f739456f90 WHIRLPOOL 1564780dd2ecdc25276a0f82d3ffc6db5acc04a3f750b3b724c8370dfd51e8e47085bac727cc5f6b0d4644e65ed2bfb9243dca9110c3b25aea1b24b914b30ca2 -EBUILD wine-any-2.6-r1.ebuild 20950 SHA256 168932d20430032eb5a3d93c6e1456f11a12baf8b2d05b6c12b6cdcccb8b398e SHA512 a9eec2a1e0e3fafbae03ce389520f34aa67d582a0b29ea3fcdcc233eb29b18f85c210fa39d9015fdc999fa98f2fb9fee2dbadf82a9344069082f00f739456f90 WHIRLPOOL 1564780dd2ecdc25276a0f82d3ffc6db5acc04a3f750b3b724c8370dfd51e8e47085bac727cc5f6b0d4644e65ed2bfb9243dca9110c3b25aea1b24b914b30ca2 -EBUILD wine-any-2.7-r1.ebuild 20950 SHA256 168932d20430032eb5a3d93c6e1456f11a12baf8b2d05b6c12b6cdcccb8b398e SHA512 a9eec2a1e0e3fafbae03ce389520f34aa67d582a0b29ea3fcdcc233eb29b18f85c210fa39d9015fdc999fa98f2fb9fee2dbadf82a9344069082f00f739456f90 WHIRLPOOL 1564780dd2ecdc25276a0f82d3ffc6db5acc04a3f750b3b724c8370dfd51e8e47085bac727cc5f6b0d4644e65ed2bfb9243dca9110c3b25aea1b24b914b30ca2 -EBUILD wine-any-2.8-r1.ebuild 20950 SHA256 168932d20430032eb5a3d93c6e1456f11a12baf8b2d05b6c12b6cdcccb8b398e SHA512 a9eec2a1e0e3fafbae03ce389520f34aa67d582a0b29ea3fcdcc233eb29b18f85c210fa39d9015fdc999fa98f2fb9fee2dbadf82a9344069082f00f739456f90 WHIRLPOOL 1564780dd2ecdc25276a0f82d3ffc6db5acc04a3f750b3b724c8370dfd51e8e47085bac727cc5f6b0d4644e65ed2bfb9243dca9110c3b25aea1b24b914b30ca2 -EBUILD wine-any-2.9-r1.ebuild 21014 SHA256 252ecc3001073b316c9c97f267a2708d55efa26b19ab2614951e4d775ed1ec72 SHA512 7ed9ef5667b166b904d0ba9228864399059ca41b78c17dc6e5c2b551b7d2d41b3a72b7540ef0f4f6fc4969f83d4435b43730d088c641e1733c6b80d6a6865f15 WHIRLPOOL d26ac9f5bb0fb971b7b64c246a846d523262750b9b14ee08d35d0089d3c2ce563fe5101983f181afbccf69be1e395da4aa098d672be37e5575bea2dfa1215e24 -EBUILD wine-any-9999.ebuild 20822 SHA256 06afd73bebbce01cd0dd2a6bd3c4eec684bf29e31016bc7f1003dc58ff9dda12 SHA512 15c3d25e65c9caa41bb62afe2ab242cafca87d97801fc528ca66735ded46443bcea46f4125789ab8e90b7fce45912cf6ea70b5d3fb8e4b20920a441bf3bab555 WHIRLPOOL b0d3cf76515c0899201263be209a82efe140786285e734865bbf17436299340957f3a6b931484db8c75cf7decd08af17a1ba825bb92367d2cb75d878dbc584fb +EBUILD wine-any-2.0-r1.ebuild 21057 SHA256 f0e0716af21d1826d6b631c56f2aaef13b707ba10a3e446c34205ce4b8482c81 SHA512 6bd030ef81c30b5ec71a9b33cea563c5f72d432676ee42b628aada0232f7c1b7dca44e0d973c8d85cd1bfc468ce9cf02a2ba568196728cc6b476b4d9dfb4fca7 WHIRLPOOL 4ea9f4dbf6a4d383d1923d1f8e6ad0299a2224368cd9b59e85812d7f3488f05d4748d4cc7ef6038ed6b1e801d62a94bd4b536a0c98d79235e919b9f772e2842d +EBUILD wine-any-2.1-r1.ebuild 21056 SHA256 635aa5e0d626ce1282220f38fd92df4e1d6f53f31916dfb90f8926218af955c5 SHA512 3ab2d79fc4567249e5ea78b7d61841b8be92cd1a653eb9fe6649999cfbc20edfc08ebf69c1fcfede9f7f5196297427e1250a8f2948874305dbb32b2da5b80a8b WHIRLPOOL 255044ca2da20999d8b781a38ce085333acef3854e8521078440224c32d64dd9d893e1ab78c963e4b1d67ba9b4fa2cf6119b19af369c730e72c8b5572e3ec59c +EBUILD wine-any-2.10-r1.ebuild 21120 SHA256 f9e05c79da90b282c586bc2465080e7703cd7c8adf7bd78e1a3a4c1d5fcf95a2 SHA512 b2035195fa58d7684dbb42df77df615a32d98588911771f82d0408d2bee0cd931f7861482abf32ad9e7f22c09de95a4ee194662300e0c5e66e722bbe624eb0dc WHIRLPOOL 16540739c2bbf77b384d0f5a0e2f9423165ae0ccbd677b1b33eb9a91efa0a9d1b070d0c32c28bbefc76b542a0b0c8380d952ac6ec873405358d819986978891d +EBUILD wine-any-2.11-r1.ebuild 21120 SHA256 f9e05c79da90b282c586bc2465080e7703cd7c8adf7bd78e1a3a4c1d5fcf95a2 SHA512 b2035195fa58d7684dbb42df77df615a32d98588911771f82d0408d2bee0cd931f7861482abf32ad9e7f22c09de95a4ee194662300e0c5e66e722bbe624eb0dc WHIRLPOOL 16540739c2bbf77b384d0f5a0e2f9423165ae0ccbd677b1b33eb9a91efa0a9d1b070d0c32c28bbefc76b542a0b0c8380d952ac6ec873405358d819986978891d +EBUILD wine-any-2.12-r1.ebuild 21120 SHA256 f9e05c79da90b282c586bc2465080e7703cd7c8adf7bd78e1a3a4c1d5fcf95a2 SHA512 b2035195fa58d7684dbb42df77df615a32d98588911771f82d0408d2bee0cd931f7861482abf32ad9e7f22c09de95a4ee194662300e0c5e66e722bbe624eb0dc WHIRLPOOL 16540739c2bbf77b384d0f5a0e2f9423165ae0ccbd677b1b33eb9a91efa0a9d1b070d0c32c28bbefc76b542a0b0c8380d952ac6ec873405358d819986978891d +EBUILD wine-any-2.13-r1.ebuild 21120 SHA256 f9e05c79da90b282c586bc2465080e7703cd7c8adf7bd78e1a3a4c1d5fcf95a2 SHA512 b2035195fa58d7684dbb42df77df615a32d98588911771f82d0408d2bee0cd931f7861482abf32ad9e7f22c09de95a4ee194662300e0c5e66e722bbe624eb0dc WHIRLPOOL 16540739c2bbf77b384d0f5a0e2f9423165ae0ccbd677b1b33eb9a91efa0a9d1b070d0c32c28bbefc76b542a0b0c8380d952ac6ec873405358d819986978891d +EBUILD wine-any-2.14-r1.ebuild 21120 SHA256 db1f915e8361c5a459048ae2c27a336dd9f1850c9081c0afa6daa74c7a197c05 SHA512 5e2353d57c43a14a090928e648c2ad49b6af2e42e4e209a36ea9d14742778534419fd5e6836d08d441b0c9b7d09ac3a5b55324c68914340c358e9fa3c1e88b8d WHIRLPOOL 747c72d41f753813654a12ac497ee7d567cb6b919351d56e8a36573dcbf2bb5fc0a46702b626b1d0816b35ea05661c7bda4eb9e88b134d980cfca04eff7e40ad +EBUILD wine-any-2.15-r1.ebuild 21120 SHA256 db1f915e8361c5a459048ae2c27a336dd9f1850c9081c0afa6daa74c7a197c05 SHA512 5e2353d57c43a14a090928e648c2ad49b6af2e42e4e209a36ea9d14742778534419fd5e6836d08d441b0c9b7d09ac3a5b55324c68914340c358e9fa3c1e88b8d WHIRLPOOL 747c72d41f753813654a12ac497ee7d567cb6b919351d56e8a36573dcbf2bb5fc0a46702b626b1d0816b35ea05661c7bda4eb9e88b134d980cfca04eff7e40ad +EBUILD wine-any-2.16-r1.ebuild 21120 SHA256 db1f915e8361c5a459048ae2c27a336dd9f1850c9081c0afa6daa74c7a197c05 SHA512 5e2353d57c43a14a090928e648c2ad49b6af2e42e4e209a36ea9d14742778534419fd5e6836d08d441b0c9b7d09ac3a5b55324c68914340c358e9fa3c1e88b8d WHIRLPOOL 747c72d41f753813654a12ac497ee7d567cb6b919351d56e8a36573dcbf2bb5fc0a46702b626b1d0816b35ea05661c7bda4eb9e88b134d980cfca04eff7e40ad +EBUILD wine-any-2.17-r1.ebuild 21120 SHA256 db1f915e8361c5a459048ae2c27a336dd9f1850c9081c0afa6daa74c7a197c05 SHA512 5e2353d57c43a14a090928e648c2ad49b6af2e42e4e209a36ea9d14742778534419fd5e6836d08d441b0c9b7d09ac3a5b55324c68914340c358e9fa3c1e88b8d WHIRLPOOL 747c72d41f753813654a12ac497ee7d567cb6b919351d56e8a36573dcbf2bb5fc0a46702b626b1d0816b35ea05661c7bda4eb9e88b134d980cfca04eff7e40ad +EBUILD wine-any-2.18.ebuild 20930 SHA256 c636066ce6eb6e562655a5d60281741b5f42ceb5ff921ef091ac4025ea645e8f SHA512 9b04a9ac2afda0d091707633059d709554f5a2b99c8dfe01938ed4b384d21631064f19bf05c3f727ef776424f2417717ae39c77d03c0ee82b9b325b9612f1dfb WHIRLPOOL ef38b78f4ba380abe57b5360b9b409d0916ef5839b5e93a7e6f42b166e026683565398ebfe5488941610512fdb95230702fc8461cc969c8945f2e0b6b1700dc4 +EBUILD wine-any-2.19.ebuild 20930 SHA256 c636066ce6eb6e562655a5d60281741b5f42ceb5ff921ef091ac4025ea645e8f SHA512 9b04a9ac2afda0d091707633059d709554f5a2b99c8dfe01938ed4b384d21631064f19bf05c3f727ef776424f2417717ae39c77d03c0ee82b9b325b9612f1dfb WHIRLPOOL ef38b78f4ba380abe57b5360b9b409d0916ef5839b5e93a7e6f42b166e026683565398ebfe5488941610512fdb95230702fc8461cc969c8945f2e0b6b1700dc4 +EBUILD wine-any-2.2-r1.ebuild 21056 SHA256 635aa5e0d626ce1282220f38fd92df4e1d6f53f31916dfb90f8926218af955c5 SHA512 3ab2d79fc4567249e5ea78b7d61841b8be92cd1a653eb9fe6649999cfbc20edfc08ebf69c1fcfede9f7f5196297427e1250a8f2948874305dbb32b2da5b80a8b WHIRLPOOL 255044ca2da20999d8b781a38ce085333acef3854e8521078440224c32d64dd9d893e1ab78c963e4b1d67ba9b4fa2cf6119b19af369c730e72c8b5572e3ec59c +EBUILD wine-any-2.3-r1.ebuild 21056 SHA256 635aa5e0d626ce1282220f38fd92df4e1d6f53f31916dfb90f8926218af955c5 SHA512 3ab2d79fc4567249e5ea78b7d61841b8be92cd1a653eb9fe6649999cfbc20edfc08ebf69c1fcfede9f7f5196297427e1250a8f2948874305dbb32b2da5b80a8b WHIRLPOOL 255044ca2da20999d8b781a38ce085333acef3854e8521078440224c32d64dd9d893e1ab78c963e4b1d67ba9b4fa2cf6119b19af369c730e72c8b5572e3ec59c +EBUILD wine-any-2.4-r1.ebuild 21056 SHA256 9c47b95d81b72c7919bb48eb063d3a7ddc4a6497bd0a5a8101fe4dfb7368bf76 SHA512 8bfa45fa1181feaefebebb159f4d8f1be419688d618740c0e3e18346fd6dbd7cfec4cd4d7d5a6ec8c15a3e9ed74ba5e7730a1486b11837e5ee6d1af9a82bef62 WHIRLPOOL 568c557dccc2f89b7b0a386473a72d4889d0e2845d9bfb6e1dd6c457146d49406014b2268b6560fc0e8473dff2e86e492d59daf5468fca4c31a060c5814982b0 +EBUILD wine-any-2.5-r1.ebuild 21056 SHA256 9c47b95d81b72c7919bb48eb063d3a7ddc4a6497bd0a5a8101fe4dfb7368bf76 SHA512 8bfa45fa1181feaefebebb159f4d8f1be419688d618740c0e3e18346fd6dbd7cfec4cd4d7d5a6ec8c15a3e9ed74ba5e7730a1486b11837e5ee6d1af9a82bef62 WHIRLPOOL 568c557dccc2f89b7b0a386473a72d4889d0e2845d9bfb6e1dd6c457146d49406014b2268b6560fc0e8473dff2e86e492d59daf5468fca4c31a060c5814982b0 +EBUILD wine-any-2.6-r1.ebuild 21056 SHA256 9c47b95d81b72c7919bb48eb063d3a7ddc4a6497bd0a5a8101fe4dfb7368bf76 SHA512 8bfa45fa1181feaefebebb159f4d8f1be419688d618740c0e3e18346fd6dbd7cfec4cd4d7d5a6ec8c15a3e9ed74ba5e7730a1486b11837e5ee6d1af9a82bef62 WHIRLPOOL 568c557dccc2f89b7b0a386473a72d4889d0e2845d9bfb6e1dd6c457146d49406014b2268b6560fc0e8473dff2e86e492d59daf5468fca4c31a060c5814982b0 +EBUILD wine-any-2.7-r1.ebuild 21056 SHA256 9c47b95d81b72c7919bb48eb063d3a7ddc4a6497bd0a5a8101fe4dfb7368bf76 SHA512 8bfa45fa1181feaefebebb159f4d8f1be419688d618740c0e3e18346fd6dbd7cfec4cd4d7d5a6ec8c15a3e9ed74ba5e7730a1486b11837e5ee6d1af9a82bef62 WHIRLPOOL 568c557dccc2f89b7b0a386473a72d4889d0e2845d9bfb6e1dd6c457146d49406014b2268b6560fc0e8473dff2e86e492d59daf5468fca4c31a060c5814982b0 +EBUILD wine-any-2.8-r1.ebuild 21056 SHA256 9c47b95d81b72c7919bb48eb063d3a7ddc4a6497bd0a5a8101fe4dfb7368bf76 SHA512 8bfa45fa1181feaefebebb159f4d8f1be419688d618740c0e3e18346fd6dbd7cfec4cd4d7d5a6ec8c15a3e9ed74ba5e7730a1486b11837e5ee6d1af9a82bef62 WHIRLPOOL 568c557dccc2f89b7b0a386473a72d4889d0e2845d9bfb6e1dd6c457146d49406014b2268b6560fc0e8473dff2e86e492d59daf5468fca4c31a060c5814982b0 +EBUILD wine-any-2.9-r1.ebuild 21120 SHA256 f9e05c79da90b282c586bc2465080e7703cd7c8adf7bd78e1a3a4c1d5fcf95a2 SHA512 b2035195fa58d7684dbb42df77df615a32d98588911771f82d0408d2bee0cd931f7861482abf32ad9e7f22c09de95a4ee194662300e0c5e66e722bbe624eb0dc WHIRLPOOL 16540739c2bbf77b384d0f5a0e2f9423165ae0ccbd677b1b33eb9a91efa0a9d1b070d0c32c28bbefc76b542a0b0c8380d952ac6ec873405358d819986978891d +EBUILD wine-any-9999.ebuild 20930 SHA256 c636066ce6eb6e562655a5d60281741b5f42ceb5ff921ef091ac4025ea645e8f SHA512 9b04a9ac2afda0d091707633059d709554f5a2b99c8dfe01938ed4b384d21631064f19bf05c3f727ef776424f2417717ae39c77d03c0ee82b9b325b9612f1dfb WHIRLPOOL ef38b78f4ba380abe57b5360b9b409d0916ef5839b5e93a7e6f42b166e026683565398ebfe5488941610512fdb95230702fc8461cc969c8945f2e0b6b1700dc4 MISC metadata.xml 3380 SHA256 68a9492f5ee5d3abf979b75106a978d2350b50b0491b78799ef4243e983715de SHA512 eb5d7e8b3e996b32c86de67c317211cf9cf7b4e97aaff69b2c2343de4401e0a83240084c5ad461e4b96a2cd09315a97ecd5ea62bc75f1803d99f3bea722af4e1 WHIRLPOOL 24a035e916a0e825cf3cf177a8a7bb1adbddc25bd59e61b13e54cff174683d624463c55495181ad6f6867d959ac473e21b9cf74d5dcc3a2079d7939fe54c0c39 diff --git a/app-emulation/wine-any/wine-any-2.0-r1.ebuild b/app-emulation/wine-any/wine-any-2.0-r1.ebuild index 1f852d129338..dc51b1c096de 100644 --- a/app-emulation/wine-any/wine-any-2.0-r1.ebuild +++ b/app-emulation/wine-any/wine-any-2.0-r1.ebuild @@ -162,7 +162,6 @@ RDEPEND="${COMMON_DEPEND} # tools/make_requests requires perl DEPEND="${COMMON_DEPEND} - dev-util/patchbin sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig @@ -186,6 +185,23 @@ 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 @@ -361,17 +377,7 @@ src_prepare() { } 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" - "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676 - "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376 - ) - local PATCHES_BIN=( - "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376 - ) + if use staging; then ewarn "Applying the Wine-Staging patchset. Any bug reports to the" ewarn "Wine bugzilla should explicitly state that staging was used." diff --git a/app-emulation/wine-any/wine-any-2.1-r1.ebuild b/app-emulation/wine-any/wine-any-2.1-r1.ebuild index a3ff004af122..046c4b34f309 100644 --- a/app-emulation/wine-any/wine-any-2.1-r1.ebuild +++ b/app-emulation/wine-any/wine-any-2.1-r1.ebuild @@ -162,7 +162,6 @@ RDEPEND="${COMMON_DEPEND} # tools/make_requests requires perl DEPEND="${COMMON_DEPEND} - dev-util/patchbin sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig @@ -186,6 +185,23 @@ 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 @@ -361,17 +377,7 @@ src_prepare() { } 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" - "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676 - "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376 - ) - local PATCHES_BIN=( - "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376 - ) + if use staging; then ewarn "Applying the Wine-Staging patchset. Any bug reports to the" ewarn "Wine bugzilla should explicitly state that staging was used." diff --git a/app-emulation/wine-any/wine-any-2.10-r1.ebuild b/app-emulation/wine-any/wine-any-2.10-r1.ebuild index fa9d38ad8f39..61c306c39f63 100644 --- a/app-emulation/wine-any/wine-any-2.10-r1.ebuild +++ b/app-emulation/wine-any/wine-any-2.10-r1.ebuild @@ -163,7 +163,6 @@ RDEPEND="${COMMON_DEPEND} # tools/make_requests requires perl DEPEND="${COMMON_DEPEND} - dev-util/patchbin sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig @@ -187,6 +186,23 @@ 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 @@ -362,17 +378,7 @@ src_prepare() { } 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" - "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676 - "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376 - ) - local PATCHES_BIN=( - "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376 - ) + if use staging; then ewarn "Applying the Wine-Staging patchset. Any bug reports to the" ewarn "Wine bugzilla should explicitly state that staging was used." diff --git a/app-emulation/wine-any/wine-any-2.11-r1.ebuild b/app-emulation/wine-any/wine-any-2.11-r1.ebuild index fa9d38ad8f39..61c306c39f63 100644 --- a/app-emulation/wine-any/wine-any-2.11-r1.ebuild +++ b/app-emulation/wine-any/wine-any-2.11-r1.ebuild @@ -163,7 +163,6 @@ RDEPEND="${COMMON_DEPEND} # tools/make_requests requires perl DEPEND="${COMMON_DEPEND} - dev-util/patchbin sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig @@ -187,6 +186,23 @@ 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 @@ -362,17 +378,7 @@ src_prepare() { } 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" - "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676 - "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376 - ) - local PATCHES_BIN=( - "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376 - ) + if use staging; then ewarn "Applying the Wine-Staging patchset. Any bug reports to the" ewarn "Wine bugzilla should explicitly state that staging was used." diff --git a/app-emulation/wine-any/wine-any-2.12-r1.ebuild b/app-emulation/wine-any/wine-any-2.12-r1.ebuild index fa9d38ad8f39..61c306c39f63 100644 --- a/app-emulation/wine-any/wine-any-2.12-r1.ebuild +++ b/app-emulation/wine-any/wine-any-2.12-r1.ebuild @@ -163,7 +163,6 @@ RDEPEND="${COMMON_DEPEND} # tools/make_requests requires perl DEPEND="${COMMON_DEPEND} - dev-util/patchbin sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig @@ -187,6 +186,23 @@ 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 @@ -362,17 +378,7 @@ src_prepare() { } 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" - "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676 - "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376 - ) - local PATCHES_BIN=( - "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376 - ) + if use staging; then ewarn "Applying the Wine-Staging patchset. Any bug reports to the" ewarn "Wine bugzilla should explicitly state that staging was used." diff --git a/app-emulation/wine-any/wine-any-2.13-r1.ebuild b/app-emulation/wine-any/wine-any-2.13-r1.ebuild index fa9d38ad8f39..61c306c39f63 100644 --- a/app-emulation/wine-any/wine-any-2.13-r1.ebuild +++ b/app-emulation/wine-any/wine-any-2.13-r1.ebuild @@ -163,7 +163,6 @@ RDEPEND="${COMMON_DEPEND} # tools/make_requests requires perl DEPEND="${COMMON_DEPEND} - dev-util/patchbin sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig @@ -187,6 +186,23 @@ 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 @@ -362,17 +378,7 @@ src_prepare() { } 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" - "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676 - "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376 - ) - local PATCHES_BIN=( - "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376 - ) + if use staging; then ewarn "Applying the Wine-Staging patchset. Any bug reports to the" ewarn "Wine bugzilla should explicitly state that staging was used." diff --git a/app-emulation/wine-any/wine-any-2.14-r1.ebuild b/app-emulation/wine-any/wine-any-2.14-r1.ebuild index 9c433244fe92..759f602d1745 100644 --- a/app-emulation/wine-any/wine-any-2.14-r1.ebuild +++ b/app-emulation/wine-any/wine-any-2.14-r1.ebuild @@ -163,7 +163,6 @@ RDEPEND="${COMMON_DEPEND} # tools/make_requests requires perl DEPEND="${COMMON_DEPEND} - dev-util/patchbin sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig @@ -187,6 +186,23 @@ 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 @@ -362,17 +378,7 @@ src_prepare() { } 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" - "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676 - "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376 - ) - local PATCHES_BIN=( - "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376 - ) + if use staging; then ewarn "Applying the Wine-Staging patchset. Any bug reports to the" ewarn "Wine bugzilla should explicitly state that staging was used." diff --git a/app-emulation/wine-any/wine-any-2.15-r1.ebuild b/app-emulation/wine-any/wine-any-2.15-r1.ebuild index 9c433244fe92..759f602d1745 100644 --- a/app-emulation/wine-any/wine-any-2.15-r1.ebuild +++ b/app-emulation/wine-any/wine-any-2.15-r1.ebuild @@ -163,7 +163,6 @@ RDEPEND="${COMMON_DEPEND} # tools/make_requests requires perl DEPEND="${COMMON_DEPEND} - dev-util/patchbin sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig @@ -187,6 +186,23 @@ 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 @@ -362,17 +378,7 @@ src_prepare() { } 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" - "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676 - "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376 - ) - local PATCHES_BIN=( - "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376 - ) + if use staging; then ewarn "Applying the Wine-Staging patchset. Any bug reports to the" ewarn "Wine bugzilla should explicitly state that staging was used." diff --git a/app-emulation/wine-any/wine-any-2.16-r1.ebuild b/app-emulation/wine-any/wine-any-2.16-r1.ebuild index 9c433244fe92..759f602d1745 100644 --- a/app-emulation/wine-any/wine-any-2.16-r1.ebuild +++ b/app-emulation/wine-any/wine-any-2.16-r1.ebuild @@ -163,7 +163,6 @@ RDEPEND="${COMMON_DEPEND} # tools/make_requests requires perl DEPEND="${COMMON_DEPEND} - dev-util/patchbin sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig @@ -187,6 +186,23 @@ 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 @@ -362,17 +378,7 @@ src_prepare() { } 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" - "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676 - "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376 - ) - local PATCHES_BIN=( - "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376 - ) + if use staging; then ewarn "Applying the Wine-Staging patchset. Any bug reports to the" ewarn "Wine bugzilla should explicitly state that staging was used." diff --git a/app-emulation/wine-any/wine-any-2.17-r1.ebuild b/app-emulation/wine-any/wine-any-2.17-r1.ebuild index 9c433244fe92..759f602d1745 100644 --- a/app-emulation/wine-any/wine-any-2.17-r1.ebuild +++ b/app-emulation/wine-any/wine-any-2.17-r1.ebuild @@ -163,7 +163,6 @@ RDEPEND="${COMMON_DEPEND} # tools/make_requests requires perl DEPEND="${COMMON_DEPEND} - dev-util/patchbin sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig @@ -187,6 +186,23 @@ 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 @@ -362,17 +378,7 @@ src_prepare() { } 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" - "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676 - "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376 - ) - local PATCHES_BIN=( - "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376 - ) + if use staging; then ewarn "Applying the Wine-Staging patchset. Any bug reports to the" ewarn "Wine bugzilla should explicitly state that staging was used." diff --git a/app-emulation/wine-any/wine-any-2.18.ebuild b/app-emulation/wine-any/wine-any-2.18.ebuild new file mode 100644 index 000000000000..5fb96a29e62c --- /dev/null +++ b/app-emulation/wine-any/wine-any-2.18.ebuild @@ -0,0 +1,634 @@ +# 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}" + +STAGING_P="wine-staging-${PV}" +STAGING_DIR="${WORKDIR}/${STAGING_P}" +D3D9_P="wine-d3d9-${PV}" +D3D9_DIR="${WORKDIR}/wine-d3d9-patches-${D3D9_P}" +GWP_V="20170830" +PATCHDIR="${WORKDIR}/gentoo-wine-patches" + +DESCRIPTION="Free implementation of Windows(tm) on Unix, with optional 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 +" + +if [[ ${PV} == "9999" ]] ; then + STAGING_EGIT_REPO_URI="https://github.com/wine-compholio/wine-staging.git" + D3D9_EGIT_REPO_URI="https://github.com/sarnex/wine-d3d9-patches.git" +else + SRC_URI="${SRC_URI} + staging? ( https://github.com/wine-compholio/wine-staging/archive/v${PV}.tar.gz -> ${STAGING_P}.tar.gz ) + d3d9? ( https://github.com/sarnex/wine-d3d9-patches/archive/${D3D9_P}.tar.gz )" +fi + +LICENSE="LGPL-2.1" +SLOT="${PV}" +IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags d3d9 dos elibc_glibc +fontconfig +gecko gphoto2 gsm gstreamer +jpeg kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pipelight +png prelink pulseaudio +realtime +run-exes s3tc samba scanner selinux +ssl staging test themes +threads +truetype udev +udisks v4l vaapi +X +xcomposite xinerama +xml" +REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 ) + X? ( truetype ) + elibc_glibc? ( threads ) + osmesa? ( opengl ) + pipelight? ( staging ) + s3tc? ( staging ) + test? ( abi_x86_32 ) + themes? ( staging ) + vaapi? ( staging )" # osmesa-opengl #286560 # X-truetype #551124 + +# FIXME: the test suite is unsuitable for us; many tests require net access +# or fail due to Xvfb's opengl limitations. +RESTRICT="test" + +COMMON_DEPEND=" + X? ( + x11-libs/libXcursor[${MULTILIB_USEDEP}] + x11-libs/libXext[${MULTILIB_USEDEP}] + x11-libs/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}] ) + d3d9? ( + media-libs/mesa[d3d9,egl,${MULTILIB_USEDEP}] + x11-libs/libX11[${MULTILIB_USEDEP}] + x11-libs/libXext[${MULTILIB_USEDEP}] + x11-libs/libxcb[${MULTILIB_USEDEP}] + ) + fontconfig? ( media-libs/fontconfig:=[${MULTILIB_USEDEP}] ) + gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] ) + gsm? ( media-sound/gsm:=[${MULTILIB_USEDEP}] ) + gstreamer? ( + media-libs/gstreamer:1.0[${MULTILIB_USEDEP}] + media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}] + ) + jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] ) + lcms? ( media-libs/lcms:2=[${MULTILIB_USEDEP}] ) + ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] ) + mp3? ( >=media-sound/mpg123-1.5.0[${MULTILIB_USEDEP}] ) + ncurses? ( >=sys-libs/ncurses-5.2:0=[${MULTILIB_USEDEP}] ) + netapi? ( net-fs/samba[netapi(+),${MULTILIB_USEDEP}] ) + nls? ( sys-devel/gettext[${MULTILIB_USEDEP}] ) + odbc? ( dev-db/unixODBC:=[${MULTILIB_USEDEP}] ) + openal? ( media-libs/openal:=[${MULTILIB_USEDEP}] ) + opencl? ( virtual/opencl[${MULTILIB_USEDEP}] ) + opengl? ( + virtual/glu[${MULTILIB_USEDEP}] + virtual/opengl[${MULTILIB_USEDEP}] + ) + osmesa? ( >=media-libs/mesa-13[osmesa,${MULTILIB_USEDEP}] ) + pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] ) + png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] ) + pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] ) + scanner? ( media-gfx/sane-backends:=[${MULTILIB_USEDEP}] ) + ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] ) + staging? ( sys-apps/attr[${MULTILIB_USEDEP}] ) + themes? ( + dev-libs/glib:2[${MULTILIB_USEDEP}] + x11-libs/cairo[${MULTILIB_USEDEP}] + x11-libs/gtk+:3[${MULTILIB_USEDEP}] + ) + truetype? ( >=media-libs/freetype-2.0.0[${MULTILIB_USEDEP}] ) + udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] ) + udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] ) + v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] ) + vaapi? ( x11-libs/libva[X,${MULTILIB_USEDEP}] ) + xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] ) + xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] ) + xml? ( + dev-libs/libxml2[${MULTILIB_USEDEP}] + dev-libs/libxslt[${MULTILIB_USEDEP}] + ) + abi_x86_32? ( + !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] + !<app-emulation/emul-linux-x86-baselibs-20140508-r14 + !app-emulation/emul-linux-x86-db[-abi_x86_32(-)] + !<app-emulation/emul-linux-x86-db-20140508-r3 + !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] + !<app-emulation/emul-linux-x86-medialibs-20140508-r6 + !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] + !<app-emulation/emul-linux-x86-opengl-20140508-r1 + !app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)] + !<app-emulation/emul-linux-x86-sdl-20140508-r1 + !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] + !<app-emulation/emul-linux-x86-soundlibs-20140508 + !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] + !<app-emulation/emul-linux-x86-xlibs-20140508 + )" + +RDEPEND="${COMMON_DEPEND} + app-emulation/wine-desktop-common + >app-eselect/eselect-wine-0.3 + !app-emulation/wine:0 + dos? ( >=games-emulation/dosbox-0.74_p20160629 ) + gecko? ( app-emulation/wine-gecko:2.47[abi_x86_32?,abi_x86_64?] ) + mono? ( app-emulation/wine-mono:4.7.1 ) + perl? ( + dev-lang/perl + dev-perl/XML-Simple + ) + pulseaudio? ( + realtime? ( sys-auth/rtkit ) + ) + s3tc? ( >=media-libs/libtxc_dxtn-1.0.1-r1[${MULTILIB_USEDEP}] ) + samba? ( >=net-fs/samba-3.0.25[winbind] ) + selinux? ( sec-policy/selinux-wine ) + udisks? ( sys-fs/udisks:2 )" + +# tools/make_requests requires perl +DEPEND="${COMMON_DEPEND} + sys-devel/flex + >=sys-kernel/linux-headers-2.6 + virtual/pkgconfig + virtual/yacc + X? ( + x11-proto/inputproto + x11-proto/xextproto + x11-proto/xf86vidmodeproto + ) + prelink? ( sys-devel/prelink ) + staging? ( + dev-lang/perl + dev-perl/XML-Simple + ) + xinerama? ( x11-proto/xineramaproto )" + +# These use a non-standard "Wine" category, which is provided by +# /etc/xdg/applications-merged/wine.menu +QA_DESKTOP_FILE="usr/share/applications/wine-browsedrive.desktop +usr/share/applications/wine-notepad.desktop +usr/share/applications/wine-uninstaller.desktop +usr/share/applications/wine-winecfg.desktop" + +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 ${pn_live_val} ]]; then + if use staging || use d3d9; then + eerror "Because of the multi-repo nature of ${MY_PN}, ${pn_live_var}" + eerror "cannot be used to set the commit. Instead, you may use the" + eerror "environmental variables WINE_COMMIT, STAGING_COMMIT, and D3D9_COMMIT." + eerror + return 1 + fi + fi + if [[ ! -z ${EGIT_COMMIT} ]]; then + eerror "Commits must now be specified using the environmental variables" + eerror "WINE_COMMIT, STAGING_COMMIT, and D3D9_COMMIT" + eerror + return 1 + fi +} + +pkg_pretend() { + wine_build_environment_check || die + + # Verify OSS support + if use oss && ! use kernel_FreeBSD; then + if ! has_version ">=media-sound/oss-4"; then + eerror "You cannot build wine with USE=oss without having support from a" + eerror "FreeBSD kernel or >=media-sound/oss-4 (only available through external repos)" + eerror + die + fi + fi +} + +pkg_setup() { + wine_build_environment_check || die + wine_env_vcs_vars || die + + WINE_VARIANT="${PN#wine}-${PV}" + WINE_VARIANT="${WINE_VARIANT#-}" + + MY_PREFIX="${EPREFIX}/usr/lib/wine-${WINE_VARIANT}" + MY_DATAROOTDIR="${EPREFIX}/usr/share/wine-${WINE_VARIANT}" + MY_DATADIR="${MY_DATAROOTDIR}" + MY_DOCDIR="${EPREFIX}/usr/share/doc/${PF}" + MY_INCLUDEDIR="${EPREFIX}/usr/include/wine-${WINE_VARIANT}" + MY_LIBEXECDIR="${EPREFIX}/usr/libexec/wine-${WINE_VARIANT}" + MY_LOCALSTATEDIR="${EPREFIX}/var/wine-${WINE_VARIANT}" + MY_MANDIR="${MY_DATADIR}/man" +} + +src_unpack() { + if [[ ${PV} == "9999" ]] ; then + EGIT_CHECKOUT_DIR="${S}" EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack + if use staging; then + local CURRENT_WINE_COMMIT=${EGIT_VERSION} + + git-r3_fetch "${STAGING_EGIT_REPO_URI}" "${STAGING_COMMIT}" + git-r3_checkout "${STAGING_EGIT_REPO_URI}" "${STAGING_DIR}" + + local COMPAT_WINE_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die + + if [[ "${CURRENT_WINE_COMMIT}" != "${COMPAT_WINE_COMMIT}" ]]; then + einfo "The current Staging patchset is not guaranteed to apply on this WINE commit." + einfo "If src_prepare fails, try emerging with the env var WINE_COMMIT." + einfo "Example: WINE_COMMIT=${COMPAT_WINE_COMMIT} emerge -1 wine" + fi + fi + if use d3d9; then + git-r3_fetch "${D3D9_EGIT_REPO_URI}" "${D3D9_COMMIT}" + git-r3_checkout "${D3D9_EGIT_REPO_URI}" "${D3D9_DIR}" + fi + fi + + default + + l10n_find_plocales_changes "${S}/po" "" ".po" +} + +src_prepare() { + + eapply_bin(){ + local patch + for patch in ${PATCHES_BIN[@]}; do + patchbin --nogit < "${patch}" || die + done + } + + local md5="$(md5sum server/protocol.def)" + + if use staging; then + ewarn "Applying the Wine-Staging patchset. Any bug reports to the" + ewarn "Wine bugzilla should explicitly state that staging was used." + + local STAGING_EXCLUDE="" + STAGING_EXCLUDE="${STAGING_EXCLUDE} -W winhlp32-Flex_Workaround" # Avoid double patching https://bugs.winehq.org/show_bug.cgi?id=42132 + use pipelight || STAGING_EXCLUDE="${STAGING_EXCLUDE} -W Pipelight" + + # Launch wine-staging patcher in a subshell, using eapply as a backend, and gitapply.sh as a backend for binary patches + ebegin "Running Wine-Staging patch installer" + ( + set -- DESTDIR="${S}" --backend=eapply --no-autoconf --all ${STAGING_EXCLUDE} + cd "${STAGING_DIR}/patches" + source "${STAGING_DIR}/patches/patchinstall.sh" + ) + eend $? || die "Failed to apply Wine-Staging patches" + fi + if use d3d9; then + if use staging; then + PATCHES+=( "${D3D9_DIR}/staging-helper.patch" ) + else + PATCHES+=( "${D3D9_DIR}/d3d9-helper.patch" ) + fi + PATCHES+=( "${D3D9_DIR}/wine-d3d9.patch" ) + fi + + default + 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) + ) + + use staging && myconf+=( + --with-xattr + $(use_with themes gtk3) + $(use_with vaapi va) + ) + use d3d9 && myconf+=( $(use_with d3d9 d3d9-nine) ) + + local PKG_CONFIG AR RANLIB + # Avoid crossdev's i686-pc-linux-gnu-pkg-config if building wine32 on amd64; #472038 + # set AR and RANLIB to make QA scripts happy; #483342 + tc-export PKG_CONFIG AR RANLIB + + if use amd64; then + if [[ ${ABI} == amd64 ]]; then + myconf+=( --enable-win64 ) + else + myconf+=( --disable-win64 ) + fi + + # Note: using --with-wine64 results in problems with multilib.eclass + # CC/LD hackery. We're using separate tools instead. + fi + + ECONF_SOURCE=${S} \ + econf "${myconf[@]}" + emake depend +} + +multilib_src_test() { + # FIXME: win32-only; wine64 tests fail with "could not find the Wine loader" + if [[ ${ABI} == x86 ]]; then + if [[ $(id -u) == 0 ]]; then + ewarn "Skipping tests since they cannot be run under the root user." + ewarn "To run the test ${MY_PN} suite, add userpriv to FEATURES in make.conf" + return + fi + + WINEPREFIX="${T}/.wine-${ABI}" \ + Xemake test + fi +} + +multilib_src_install_all() { + local DOCS=( ANNOUNCE AUTHORS README ) + add_locale_docs() { + local locale_doc="documentation/README.$1" + [[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} ) + } + l10n_for_each_locale_do add_locale_docs + + einstalldocs + prune_libtool_files --all + + if ! use perl ; then # winedump calls function_grep.pl, and winemaker is a perl script + rm "${D%/}${MY_PREFIX}"/bin/{wine{dump,maker},function_grep.pl} \ + "${D%/}${MY_MANDIR}"/man1/wine{dump,maker}.1 || die + fi + + # Remove wineconsole if neither backend is installed #551124 + if ! use X && ! use ncurses; then + rm "${D%/}${MY_PREFIX}"/bin/wineconsole* || die + rm "${D%/}${MY_MANDIR}"/man1/wineconsole* || die + rm_wineconsole() { + rm "${D%/}${MY_PREFIX}/$(get_libdir)"/wine/{,fakedlls/}wineconsole.exe* || die + } + multilib_foreach_abi rm_wineconsole + fi + + use abi_x86_32 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine{,-preloader} #255055 + use abi_x86_64 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine64{,-preloader} + + if use abi_x86_64 && ! use abi_x86_32; then + dosym 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 + else + if use staging; then + eselect wine register --staging ${P} || die + fi + if use d3d9; then + eselect wine register --d3d9 ${P} || die + fi + fi + + eselect wine update --all --if-unset || die + + 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 + else + if use staging; then + eselect wine deregister --staging ${P} || die + fi + if use d3d9; then + eselect wine deregister --d3d9 ${P} || die + fi + fi + + eselect wine update --all --if-unset || die +} + +pkg_postrm() { + xdg_desktop_database_update +} diff --git a/app-emulation/wine-any/wine-any-2.19.ebuild b/app-emulation/wine-any/wine-any-2.19.ebuild new file mode 100644 index 000000000000..5fb96a29e62c --- /dev/null +++ b/app-emulation/wine-any/wine-any-2.19.ebuild @@ -0,0 +1,634 @@ +# 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}" + +STAGING_P="wine-staging-${PV}" +STAGING_DIR="${WORKDIR}/${STAGING_P}" +D3D9_P="wine-d3d9-${PV}" +D3D9_DIR="${WORKDIR}/wine-d3d9-patches-${D3D9_P}" +GWP_V="20170830" +PATCHDIR="${WORKDIR}/gentoo-wine-patches" + +DESCRIPTION="Free implementation of Windows(tm) on Unix, with optional 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 +" + +if [[ ${PV} == "9999" ]] ; then + STAGING_EGIT_REPO_URI="https://github.com/wine-compholio/wine-staging.git" + D3D9_EGIT_REPO_URI="https://github.com/sarnex/wine-d3d9-patches.git" +else + SRC_URI="${SRC_URI} + staging? ( https://github.com/wine-compholio/wine-staging/archive/v${PV}.tar.gz -> ${STAGING_P}.tar.gz ) + d3d9? ( https://github.com/sarnex/wine-d3d9-patches/archive/${D3D9_P}.tar.gz )" +fi + +LICENSE="LGPL-2.1" +SLOT="${PV}" +IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags d3d9 dos elibc_glibc +fontconfig +gecko gphoto2 gsm gstreamer +jpeg kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pipelight +png prelink pulseaudio +realtime +run-exes s3tc samba scanner selinux +ssl staging test themes +threads +truetype udev +udisks v4l vaapi +X +xcomposite xinerama +xml" +REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 ) + X? ( truetype ) + elibc_glibc? ( threads ) + osmesa? ( opengl ) + pipelight? ( staging ) + s3tc? ( staging ) + test? ( abi_x86_32 ) + themes? ( staging ) + vaapi? ( staging )" # osmesa-opengl #286560 # X-truetype #551124 + +# FIXME: the test suite is unsuitable for us; many tests require net access +# or fail due to Xvfb's opengl limitations. +RESTRICT="test" + +COMMON_DEPEND=" + X? ( + x11-libs/libXcursor[${MULTILIB_USEDEP}] + x11-libs/libXext[${MULTILIB_USEDEP}] + x11-libs/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}] ) + d3d9? ( + media-libs/mesa[d3d9,egl,${MULTILIB_USEDEP}] + x11-libs/libX11[${MULTILIB_USEDEP}] + x11-libs/libXext[${MULTILIB_USEDEP}] + x11-libs/libxcb[${MULTILIB_USEDEP}] + ) + fontconfig? ( media-libs/fontconfig:=[${MULTILIB_USEDEP}] ) + gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] ) + gsm? ( media-sound/gsm:=[${MULTILIB_USEDEP}] ) + gstreamer? ( + media-libs/gstreamer:1.0[${MULTILIB_USEDEP}] + media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}] + ) + jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] ) + lcms? ( media-libs/lcms:2=[${MULTILIB_USEDEP}] ) + ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] ) + mp3? ( >=media-sound/mpg123-1.5.0[${MULTILIB_USEDEP}] ) + ncurses? ( >=sys-libs/ncurses-5.2:0=[${MULTILIB_USEDEP}] ) + netapi? ( net-fs/samba[netapi(+),${MULTILIB_USEDEP}] ) + nls? ( sys-devel/gettext[${MULTILIB_USEDEP}] ) + odbc? ( dev-db/unixODBC:=[${MULTILIB_USEDEP}] ) + openal? ( media-libs/openal:=[${MULTILIB_USEDEP}] ) + opencl? ( virtual/opencl[${MULTILIB_USEDEP}] ) + opengl? ( + virtual/glu[${MULTILIB_USEDEP}] + virtual/opengl[${MULTILIB_USEDEP}] + ) + osmesa? ( >=media-libs/mesa-13[osmesa,${MULTILIB_USEDEP}] ) + pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] ) + png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] ) + pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] ) + scanner? ( media-gfx/sane-backends:=[${MULTILIB_USEDEP}] ) + ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] ) + staging? ( sys-apps/attr[${MULTILIB_USEDEP}] ) + themes? ( + dev-libs/glib:2[${MULTILIB_USEDEP}] + x11-libs/cairo[${MULTILIB_USEDEP}] + x11-libs/gtk+:3[${MULTILIB_USEDEP}] + ) + truetype? ( >=media-libs/freetype-2.0.0[${MULTILIB_USEDEP}] ) + udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] ) + udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] ) + v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] ) + vaapi? ( x11-libs/libva[X,${MULTILIB_USEDEP}] ) + xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] ) + xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] ) + xml? ( + dev-libs/libxml2[${MULTILIB_USEDEP}] + dev-libs/libxslt[${MULTILIB_USEDEP}] + ) + abi_x86_32? ( + !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] + !<app-emulation/emul-linux-x86-baselibs-20140508-r14 + !app-emulation/emul-linux-x86-db[-abi_x86_32(-)] + !<app-emulation/emul-linux-x86-db-20140508-r3 + !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] + !<app-emulation/emul-linux-x86-medialibs-20140508-r6 + !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] + !<app-emulation/emul-linux-x86-opengl-20140508-r1 + !app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)] + !<app-emulation/emul-linux-x86-sdl-20140508-r1 + !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] + !<app-emulation/emul-linux-x86-soundlibs-20140508 + !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] + !<app-emulation/emul-linux-x86-xlibs-20140508 + )" + +RDEPEND="${COMMON_DEPEND} + app-emulation/wine-desktop-common + >app-eselect/eselect-wine-0.3 + !app-emulation/wine:0 + dos? ( >=games-emulation/dosbox-0.74_p20160629 ) + gecko? ( app-emulation/wine-gecko:2.47[abi_x86_32?,abi_x86_64?] ) + mono? ( app-emulation/wine-mono:4.7.1 ) + perl? ( + dev-lang/perl + dev-perl/XML-Simple + ) + pulseaudio? ( + realtime? ( sys-auth/rtkit ) + ) + s3tc? ( >=media-libs/libtxc_dxtn-1.0.1-r1[${MULTILIB_USEDEP}] ) + samba? ( >=net-fs/samba-3.0.25[winbind] ) + selinux? ( sec-policy/selinux-wine ) + udisks? ( sys-fs/udisks:2 )" + +# tools/make_requests requires perl +DEPEND="${COMMON_DEPEND} + sys-devel/flex + >=sys-kernel/linux-headers-2.6 + virtual/pkgconfig + virtual/yacc + X? ( + x11-proto/inputproto + x11-proto/xextproto + x11-proto/xf86vidmodeproto + ) + prelink? ( sys-devel/prelink ) + staging? ( + dev-lang/perl + dev-perl/XML-Simple + ) + xinerama? ( x11-proto/xineramaproto )" + +# These use a non-standard "Wine" category, which is provided by +# /etc/xdg/applications-merged/wine.menu +QA_DESKTOP_FILE="usr/share/applications/wine-browsedrive.desktop +usr/share/applications/wine-notepad.desktop +usr/share/applications/wine-uninstaller.desktop +usr/share/applications/wine-winecfg.desktop" + +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 ${pn_live_val} ]]; then + if use staging || use d3d9; then + eerror "Because of the multi-repo nature of ${MY_PN}, ${pn_live_var}" + eerror "cannot be used to set the commit. Instead, you may use the" + eerror "environmental variables WINE_COMMIT, STAGING_COMMIT, and D3D9_COMMIT." + eerror + return 1 + fi + fi + if [[ ! -z ${EGIT_COMMIT} ]]; then + eerror "Commits must now be specified using the environmental variables" + eerror "WINE_COMMIT, STAGING_COMMIT, and D3D9_COMMIT" + eerror + return 1 + fi +} + +pkg_pretend() { + wine_build_environment_check || die + + # Verify OSS support + if use oss && ! use kernel_FreeBSD; then + if ! has_version ">=media-sound/oss-4"; then + eerror "You cannot build wine with USE=oss without having support from a" + eerror "FreeBSD kernel or >=media-sound/oss-4 (only available through external repos)" + eerror + die + fi + fi +} + +pkg_setup() { + wine_build_environment_check || die + wine_env_vcs_vars || die + + WINE_VARIANT="${PN#wine}-${PV}" + WINE_VARIANT="${WINE_VARIANT#-}" + + MY_PREFIX="${EPREFIX}/usr/lib/wine-${WINE_VARIANT}" + MY_DATAROOTDIR="${EPREFIX}/usr/share/wine-${WINE_VARIANT}" + MY_DATADIR="${MY_DATAROOTDIR}" + MY_DOCDIR="${EPREFIX}/usr/share/doc/${PF}" + MY_INCLUDEDIR="${EPREFIX}/usr/include/wine-${WINE_VARIANT}" + MY_LIBEXECDIR="${EPREFIX}/usr/libexec/wine-${WINE_VARIANT}" + MY_LOCALSTATEDIR="${EPREFIX}/var/wine-${WINE_VARIANT}" + MY_MANDIR="${MY_DATADIR}/man" +} + +src_unpack() { + if [[ ${PV} == "9999" ]] ; then + EGIT_CHECKOUT_DIR="${S}" EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack + if use staging; then + local CURRENT_WINE_COMMIT=${EGIT_VERSION} + + git-r3_fetch "${STAGING_EGIT_REPO_URI}" "${STAGING_COMMIT}" + git-r3_checkout "${STAGING_EGIT_REPO_URI}" "${STAGING_DIR}" + + local COMPAT_WINE_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die + + if [[ "${CURRENT_WINE_COMMIT}" != "${COMPAT_WINE_COMMIT}" ]]; then + einfo "The current Staging patchset is not guaranteed to apply on this WINE commit." + einfo "If src_prepare fails, try emerging with the env var WINE_COMMIT." + einfo "Example: WINE_COMMIT=${COMPAT_WINE_COMMIT} emerge -1 wine" + fi + fi + if use d3d9; then + git-r3_fetch "${D3D9_EGIT_REPO_URI}" "${D3D9_COMMIT}" + git-r3_checkout "${D3D9_EGIT_REPO_URI}" "${D3D9_DIR}" + fi + fi + + default + + l10n_find_plocales_changes "${S}/po" "" ".po" +} + +src_prepare() { + + eapply_bin(){ + local patch + for patch in ${PATCHES_BIN[@]}; do + patchbin --nogit < "${patch}" || die + done + } + + local md5="$(md5sum server/protocol.def)" + + if use staging; then + ewarn "Applying the Wine-Staging patchset. Any bug reports to the" + ewarn "Wine bugzilla should explicitly state that staging was used." + + local STAGING_EXCLUDE="" + STAGING_EXCLUDE="${STAGING_EXCLUDE} -W winhlp32-Flex_Workaround" # Avoid double patching https://bugs.winehq.org/show_bug.cgi?id=42132 + use pipelight || STAGING_EXCLUDE="${STAGING_EXCLUDE} -W Pipelight" + + # Launch wine-staging patcher in a subshell, using eapply as a backend, and gitapply.sh as a backend for binary patches + ebegin "Running Wine-Staging patch installer" + ( + set -- DESTDIR="${S}" --backend=eapply --no-autoconf --all ${STAGING_EXCLUDE} + cd "${STAGING_DIR}/patches" + source "${STAGING_DIR}/patches/patchinstall.sh" + ) + eend $? || die "Failed to apply Wine-Staging patches" + fi + if use d3d9; then + if use staging; then + PATCHES+=( "${D3D9_DIR}/staging-helper.patch" ) + else + PATCHES+=( "${D3D9_DIR}/d3d9-helper.patch" ) + fi + PATCHES+=( "${D3D9_DIR}/wine-d3d9.patch" ) + fi + + default + 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) + ) + + use staging && myconf+=( + --with-xattr + $(use_with themes gtk3) + $(use_with vaapi va) + ) + use d3d9 && myconf+=( $(use_with d3d9 d3d9-nine) ) + + local PKG_CONFIG AR RANLIB + # Avoid crossdev's i686-pc-linux-gnu-pkg-config if building wine32 on amd64; #472038 + # set AR and RANLIB to make QA scripts happy; #483342 + tc-export PKG_CONFIG AR RANLIB + + if use amd64; then + if [[ ${ABI} == amd64 ]]; then + myconf+=( --enable-win64 ) + else + myconf+=( --disable-win64 ) + fi + + # Note: using --with-wine64 results in problems with multilib.eclass + # CC/LD hackery. We're using separate tools instead. + fi + + ECONF_SOURCE=${S} \ + econf "${myconf[@]}" + emake depend +} + +multilib_src_test() { + # FIXME: win32-only; wine64 tests fail with "could not find the Wine loader" + if [[ ${ABI} == x86 ]]; then + if [[ $(id -u) == 0 ]]; then + ewarn "Skipping tests since they cannot be run under the root user." + ewarn "To run the test ${MY_PN} suite, add userpriv to FEATURES in make.conf" + return + fi + + WINEPREFIX="${T}/.wine-${ABI}" \ + Xemake test + fi +} + +multilib_src_install_all() { + local DOCS=( ANNOUNCE AUTHORS README ) + add_locale_docs() { + local locale_doc="documentation/README.$1" + [[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} ) + } + l10n_for_each_locale_do add_locale_docs + + einstalldocs + prune_libtool_files --all + + if ! use perl ; then # winedump calls function_grep.pl, and winemaker is a perl script + rm "${D%/}${MY_PREFIX}"/bin/{wine{dump,maker},function_grep.pl} \ + "${D%/}${MY_MANDIR}"/man1/wine{dump,maker}.1 || die + fi + + # Remove wineconsole if neither backend is installed #551124 + if ! use X && ! use ncurses; then + rm "${D%/}${MY_PREFIX}"/bin/wineconsole* || die + rm "${D%/}${MY_MANDIR}"/man1/wineconsole* || die + rm_wineconsole() { + rm "${D%/}${MY_PREFIX}/$(get_libdir)"/wine/{,fakedlls/}wineconsole.exe* || die + } + multilib_foreach_abi rm_wineconsole + fi + + use abi_x86_32 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine{,-preloader} #255055 + use abi_x86_64 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine64{,-preloader} + + if use abi_x86_64 && ! use abi_x86_32; then + dosym 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 + else + if use staging; then + eselect wine register --staging ${P} || die + fi + if use d3d9; then + eselect wine register --d3d9 ${P} || die + fi + fi + + eselect wine update --all --if-unset || die + + 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 + else + if use staging; then + eselect wine deregister --staging ${P} || die + fi + if use d3d9; then + eselect wine deregister --d3d9 ${P} || die + fi + fi + + eselect wine update --all --if-unset || die +} + +pkg_postrm() { + xdg_desktop_database_update +} diff --git a/app-emulation/wine-any/wine-any-2.2-r1.ebuild b/app-emulation/wine-any/wine-any-2.2-r1.ebuild index a3ff004af122..046c4b34f309 100644 --- a/app-emulation/wine-any/wine-any-2.2-r1.ebuild +++ b/app-emulation/wine-any/wine-any-2.2-r1.ebuild @@ -162,7 +162,6 @@ RDEPEND="${COMMON_DEPEND} # tools/make_requests requires perl DEPEND="${COMMON_DEPEND} - dev-util/patchbin sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig @@ -186,6 +185,23 @@ 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 @@ -361,17 +377,7 @@ src_prepare() { } 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" - "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676 - "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376 - ) - local PATCHES_BIN=( - "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376 - ) + if use staging; then ewarn "Applying the Wine-Staging patchset. Any bug reports to the" ewarn "Wine bugzilla should explicitly state that staging was used." diff --git a/app-emulation/wine-any/wine-any-2.3-r1.ebuild b/app-emulation/wine-any/wine-any-2.3-r1.ebuild index a3ff004af122..046c4b34f309 100644 --- a/app-emulation/wine-any/wine-any-2.3-r1.ebuild +++ b/app-emulation/wine-any/wine-any-2.3-r1.ebuild @@ -162,7 +162,6 @@ RDEPEND="${COMMON_DEPEND} # tools/make_requests requires perl DEPEND="${COMMON_DEPEND} - dev-util/patchbin sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig @@ -186,6 +185,23 @@ 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 @@ -361,17 +377,7 @@ src_prepare() { } 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" - "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676 - "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376 - ) - local PATCHES_BIN=( - "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376 - ) + if use staging; then ewarn "Applying the Wine-Staging patchset. Any bug reports to the" ewarn "Wine bugzilla should explicitly state that staging was used." diff --git a/app-emulation/wine-any/wine-any-2.4-r1.ebuild b/app-emulation/wine-any/wine-any-2.4-r1.ebuild index d088dfeca61a..26addaa023db 100644 --- a/app-emulation/wine-any/wine-any-2.4-r1.ebuild +++ b/app-emulation/wine-any/wine-any-2.4-r1.ebuild @@ -162,7 +162,6 @@ RDEPEND="${COMMON_DEPEND} # tools/make_requests requires perl DEPEND="${COMMON_DEPEND} - dev-util/patchbin sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig @@ -186,6 +185,23 @@ 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 @@ -361,17 +377,7 @@ src_prepare() { } 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" - "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676 - "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376 - ) - local PATCHES_BIN=( - "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376 - ) + if use staging; then ewarn "Applying the Wine-Staging patchset. Any bug reports to the" ewarn "Wine bugzilla should explicitly state that staging was used." diff --git a/app-emulation/wine-any/wine-any-2.5-r1.ebuild b/app-emulation/wine-any/wine-any-2.5-r1.ebuild index d088dfeca61a..26addaa023db 100644 --- a/app-emulation/wine-any/wine-any-2.5-r1.ebuild +++ b/app-emulation/wine-any/wine-any-2.5-r1.ebuild @@ -162,7 +162,6 @@ RDEPEND="${COMMON_DEPEND} # tools/make_requests requires perl DEPEND="${COMMON_DEPEND} - dev-util/patchbin sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig @@ -186,6 +185,23 @@ 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 @@ -361,17 +377,7 @@ src_prepare() { } 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" - "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676 - "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376 - ) - local PATCHES_BIN=( - "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376 - ) + if use staging; then ewarn "Applying the Wine-Staging patchset. Any bug reports to the" ewarn "Wine bugzilla should explicitly state that staging was used." diff --git a/app-emulation/wine-any/wine-any-2.6-r1.ebuild b/app-emulation/wine-any/wine-any-2.6-r1.ebuild index d088dfeca61a..26addaa023db 100644 --- a/app-emulation/wine-any/wine-any-2.6-r1.ebuild +++ b/app-emulation/wine-any/wine-any-2.6-r1.ebuild @@ -162,7 +162,6 @@ RDEPEND="${COMMON_DEPEND} # tools/make_requests requires perl DEPEND="${COMMON_DEPEND} - dev-util/patchbin sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig @@ -186,6 +185,23 @@ 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 @@ -361,17 +377,7 @@ src_prepare() { } 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" - "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676 - "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376 - ) - local PATCHES_BIN=( - "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376 - ) + if use staging; then ewarn "Applying the Wine-Staging patchset. Any bug reports to the" ewarn "Wine bugzilla should explicitly state that staging was used." diff --git a/app-emulation/wine-any/wine-any-2.7-r1.ebuild b/app-emulation/wine-any/wine-any-2.7-r1.ebuild index d088dfeca61a..26addaa023db 100644 --- a/app-emulation/wine-any/wine-any-2.7-r1.ebuild +++ b/app-emulation/wine-any/wine-any-2.7-r1.ebuild @@ -162,7 +162,6 @@ RDEPEND="${COMMON_DEPEND} # tools/make_requests requires perl DEPEND="${COMMON_DEPEND} - dev-util/patchbin sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig @@ -186,6 +185,23 @@ 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 @@ -361,17 +377,7 @@ src_prepare() { } 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" - "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676 - "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376 - ) - local PATCHES_BIN=( - "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376 - ) + if use staging; then ewarn "Applying the Wine-Staging patchset. Any bug reports to the" ewarn "Wine bugzilla should explicitly state that staging was used." diff --git a/app-emulation/wine-any/wine-any-2.8-r1.ebuild b/app-emulation/wine-any/wine-any-2.8-r1.ebuild index d088dfeca61a..26addaa023db 100644 --- a/app-emulation/wine-any/wine-any-2.8-r1.ebuild +++ b/app-emulation/wine-any/wine-any-2.8-r1.ebuild @@ -162,7 +162,6 @@ RDEPEND="${COMMON_DEPEND} # tools/make_requests requires perl DEPEND="${COMMON_DEPEND} - dev-util/patchbin sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig @@ -186,6 +185,23 @@ 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 @@ -361,17 +377,7 @@ src_prepare() { } 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" - "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676 - "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376 - ) - local PATCHES_BIN=( - "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376 - ) + if use staging; then ewarn "Applying the Wine-Staging patchset. Any bug reports to the" ewarn "Wine bugzilla should explicitly state that staging was used." diff --git a/app-emulation/wine-any/wine-any-2.9-r1.ebuild b/app-emulation/wine-any/wine-any-2.9-r1.ebuild index fa9d38ad8f39..61c306c39f63 100644 --- a/app-emulation/wine-any/wine-any-2.9-r1.ebuild +++ b/app-emulation/wine-any/wine-any-2.9-r1.ebuild @@ -163,7 +163,6 @@ RDEPEND="${COMMON_DEPEND} # tools/make_requests requires perl DEPEND="${COMMON_DEPEND} - dev-util/patchbin sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig @@ -187,6 +186,23 @@ 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 @@ -362,17 +378,7 @@ src_prepare() { } 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" - "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676 - "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376 - ) - local PATCHES_BIN=( - "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376 - ) + if use staging; then ewarn "Applying the Wine-Staging patchset. Any bug reports to the" ewarn "Wine bugzilla should explicitly state that staging was used." diff --git a/app-emulation/wine-any/wine-any-9999.ebuild b/app-emulation/wine-any/wine-any-9999.ebuild index 028bc0199d43..5fb96a29e62c 100644 --- a/app-emulation/wine-any/wine-any-9999.ebuild +++ b/app-emulation/wine-any/wine-any-9999.ebuild @@ -163,7 +163,6 @@ RDEPEND="${COMMON_DEPEND} # tools/make_requests requires perl DEPEND="${COMMON_DEPEND} - dev-util/patchbin sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig @@ -187,6 +186,19 @@ 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 @@ -362,14 +374,7 @@ src_prepare() { } 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=( - ) + if use staging; then ewarn "Applying the Wine-Staging patchset. Any bug reports to the" ewarn "Wine bugzilla should explicitly state that staging was used." diff --git a/app-emulation/wine-d3d9/Manifest b/app-emulation/wine-d3d9/Manifest index 3a2de1bc641e..0de3d8c3199d 100644 --- a/app-emulation/wine-d3d9/Manifest +++ b/app-emulation/wine-d3d9/Manifest @@ -9,6 +9,8 @@ DIST wine-2.14.tar.xz 19447812 SHA256 03f934d95181f728600ca04d395f10e821ee38cfa3 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.3.tar.xz 18931732 SHA256 afc95c7a87cc8f0730b462c50a5dfc9c462eb02c6bf5874b4fa99946f49e067e SHA512 bea78e8468555ff9e08dedf3918da5ea82721549c43984869989bbdafeea00e454820ff9558aa29925c97a165a9b01e5cd1fd397f133833c58824984a6686171 WHIRLPOOL 1f5ec8e5c32d124277e4c71d95726d3a5337575757c3029567c77165d65fcfec2ddf33d3863b4bf55c9eff7c3582c1ec7dbd76d84ed8bbbe89dd16db6b0128c1 DIST wine-2.4.tar.xz 18953748 SHA256 87b5df07e4781fecce2f92415a4717208ea253a20a0df8b36b9f90b69b72748e SHA512 15ae7e97dc72a8636b2c15c93803ed430fa456d673add61457cf3e479e769559c682b40949b5d38828f6681f13183e560fcb4a2eb0f0ba25e6eade46f7d3d7c0 WHIRLPOOL 558ab7b7517ad5e03366b4db974047eba776585e958a5b71bb2e93993e21bc725ea7a8bcf2a4354f34ca38c94ba99ccd15f2f8b5e4b58066bf339d3517eec56c @@ -27,6 +29,8 @@ DIST wine-d3d9-2.14.tar.gz 48718 SHA256 71a3aff0b348f033d4ca610e34ce6faa02eb2b5c DIST wine-d3d9-2.15.tar.gz 48717 SHA256 c0aa58e7fa3b595c38cf06fe72b54a096e43e526142a7576f839ed8aaa85cabf SHA512 5298de273fc95f65ee481416f8ed16059f244e3781058cb76ee60b6a85aaf8d977a619c75cccd08aadeac9aae9ad2e08b49c5b52ab141cbff351a4b001e7c434 WHIRLPOOL 63337e2c86be5ff2fc16ff0817719ed668360ad2258b095e88b98b1f31e382593b14cabdcb8be58a6dc0cc047cd67a3eb1f14d3ecb806ba2ac9c6f7102368c94 DIST wine-d3d9-2.16.tar.gz 48728 SHA256 2a681d28a4e042437c32ecf3f92c7abaadc862feba6aacf0df76469acab98f3e SHA512 f3950d7e34ec537b95b963fb3b35ee3729c1b3f9d8c225e96ae9ab9cf8011571ba22105a17309c481f3a504a8aa4d5ae04270691c49098924aa2f72463b79e08 WHIRLPOOL c1f3cb0922cb381f6e2aa7fd54538b98dbd04daa7f36f66742af4c544c80e894e33ebf4866520af35faec27519f0015cd5cc1139fe191bb0b3192cb2134035c3 DIST wine-d3d9-2.17.tar.gz 48722 SHA256 557ae75a68529f282f1f5e7e9991892d7d994f199060ced43db22291ec66fe71 SHA512 530d44a968a68e06449da2286b8c9740a80b681ff610f6ddc87e6fb569e6c29181341266a04238965a7bfc209e20c1521847b70daa8d3532c2a269db0d200154 WHIRLPOOL 0c70a88949eaa27ebbc28a6951651e4b55166c1d54a8db6d9fdfe3f516d2f4e24ba0f08defddf637b9c2ed0702b250af4d41146684b79e90d84aefe284351059 +DIST wine-d3d9-2.18.tar.gz 48722 SHA256 d1b5210d4228ddcc60f76b4a8694d5feb4e3c68ca4436666ee182c8b14f25356 SHA512 0e66c51e1957b27ccb9f326b0aaf2b0d09b7bbc9d03e1d321aa1789d2560b8e60fd83c4e86999d96a03aa73a37c96f34d93245763969a314150900741aa03933 WHIRLPOOL c879d7ca20e2b339ab1ad862274320ceced84693311dfc02652a83304d0beb263a59e8978fae65ad50bbb51eaac51988ab2a0105c50dafa9176caf1baa791506 +DIST wine-d3d9-2.19.tar.gz 48818 SHA256 54b5fbda45585304e65665e5b2da96a8dc30398c3f8ee12b77a613970b5af9f9 SHA512 be43435cd53f367ca57080c08218db302a90bf85ec6e917e89375904c456b585b61fb6053f9b4366b7e844f8246cabe83460a9866f614dbb5df3edfb43b2f54a WHIRLPOOL bec78732ad8b0036999c4e481e2d6f50d2ec4002590f15fbebab740bbddbc5069f77853993a122ccc03b24cf2b6c76b80117b000648a97fec09eba988c792f57 DIST wine-d3d9-2.2.tar.gz 48387 SHA256 203ed60980ec584c09b413266728e3a93e2d980dbff9b4f65375a4e9744b5042 SHA512 6e9e031b51afc8ec200bbd252ff0d768c29af23907f782409834de593f896afb128f86fe012c95dc18e5f3c7267f170eb343d2a2c53d639933a337f0c1e04fab WHIRLPOOL 6b32c0dfd3068e87d94bbcd83718dd75a14b36d69b151e9257e04793d2d3ae78ce7da10b80cbc824ccefb6c11666241593f91963ddee6a58301f95bbde35285d DIST wine-d3d9-2.3.tar.gz 48510 SHA256 fc17488a782def19fc02bf967128ab43236db49509e31771361a60fa3d17dd60 SHA512 58449f6b7ed7fd8182e2cce92e1d1195bf64a567c1cc92fd3f46af195e7e4039c3b2a128be9d3572d9067be6c1bb020f417c6d558bb551c60096c107067177b8 WHIRLPOOL f648a921cf4cd257a3a7dfbd3abf45d58c07782f329ec11c3a1eff3afe32e8040adb351d4a60e1b1f78c7cae0379f23468764ad162a101179d0f5b0e2c6d9413 DIST wine-d3d9-2.4.tar.gz 48502 SHA256 4c7084e733d95545b894b152b2c6c9564dfb8df594cfeb1512dad80743b39ae0 SHA512 623b1720b8cd79ab6ad2a177b9beb174f31e6fc402d6885fa2006223c855919c6f5d4267c64212ecf8cf1746430c9715c506343fb740828fc99910f916b10ebe WHIRLPOOL 9c0ea34dedc2e39ce36f1539a6d761ba07429b316a1f7fad49067eec5c28a5c60b33b3d2473cbf66b009d9772c1fb123414bfa201eb8df3e61f8efc38aa1f3fa @@ -35,23 +39,25 @@ DIST wine-d3d9-2.6.tar.gz 48702 SHA256 06ed18f2d5fff04613ea1401c37ad70e163135c15 DIST wine-d3d9-2.7.tar.gz 48708 SHA256 df6ed1e50d8af0624b8f4f658705f75102094f6e17fec53ec8461991ce5dca2a SHA512 d258e81a942f905255a637aa80dd647878691caa79adc52fd79f66ce1320d42d7d36ea776876d6a26a2c711a168da4c64f27fa8744ca6d8318c5526f8a8af75a WHIRLPOOL 2d62cab5e3b14eaf29ecc96ac97555f48845a78c751040a850750d3b19fbc64efb3f3589dd3475a03cb1e3dff3e200528dabd2952b1ee8d0520a5db0d7db154b DIST wine-d3d9-2.8.tar.gz 48700 SHA256 c67de9fee6e97859896aa2326fbc245e8b0f7393a1c6341126607b03afebc964 SHA512 bb933b51d0022ce616331f2550faedeff3058007525b4519833b925c57999ab08b08380b8967d48ad7c56458e812342428388a5eac2ed8fcdd8cfbfee74a8e8c WHIRLPOOL 52c8538e3f4b3be3412ee544efebae69c3de781255e12298d544f47523aba3afaadbffa8dedc463c207b0ae8a0a92599beca17017f266648b9b229847990ae2e DIST wine-d3d9-2.9.tar.gz 48693 SHA256 32b847adf74c293e858800248aa1b164688f98cde89ca4d2cd0808fae7f94340 SHA512 89d06587481f7702b6884c83627a27c7b38a078e2b333bea2612a58840695211c19ab4ca02669c983580f95ae42ef114020f6b6bbb1a17d72449c0ed2212dc49 WHIRLPOOL e32b261f6e87580eec2c2ee57848b08b2487d1f280b8b257403e0722ec1b44cb31dcb240d89757599be2c3c6d958c48f92510bc625e5c05fc08116d13c303168 -EBUILD wine-d3d9-2.0-r1.ebuild 18444 SHA256 418108eb7a3ecefc20bed1bbb42876f94a099ed9e2d4111c163abee0ed559018 SHA512 f6240b958c0badc4214b7a08d2e2ad577b1c182d20da330f6e5910615526bc4822a933bdef797f73f6527f5f0bcdb1f8411bac6daec50b28c05b2b3adddc0988 WHIRLPOOL 511729648e2fb4bc4a4a7768e9530d59d2a314b65e25bfae05b6c5c5be0ab71b11264bdce29ba7b95d681a1422c4ae16f62a12c88f1fddcf07627addafc40193 -EBUILD wine-d3d9-2.1-r1.ebuild 18443 SHA256 95b84370957e39da254930d4ecfea856ba42c1c4d6dd6e7d0367543d52a799e5 SHA512 4d70810a20b65906b1a0386df29a2ac61c33fb5ef4b3161c37698bbbbb18d4b016f37b46ec6c26b56914d75fb6b9c886960ac08040b5b1078244bd8d1a4e6839 WHIRLPOOL ef195572c7625b8f1706cfffadbeeb793357d35c88070a044bfc7b7a1ccae116718b0e5f989f270e76a09a86c9196fe20fdedd36c5cd51e6bd45c23a4c961146 -EBUILD wine-d3d9-2.10-r1.ebuild 18507 SHA256 0d8e02907da4d5d6dbea26cb5490b9642b6a18e96b85114ca2c1bfa7700b9655 SHA512 61185ff90bd4c428c6631b8f050091f62957d36ebb7de0ee5fdec48eb363a24f8543bebd67b89784f7adfcf171e71eb4d725c68d4cea69d5fb2f8c830e39c3bf WHIRLPOOL 54d03f574109bbc2b04646f54de913328050bcf111e5b6c1386e89f50410647684caf40516562a1796c7bec190e7184078b3cea901c7777305a2b0459d3dde63 -EBUILD wine-d3d9-2.11-r1.ebuild 18507 SHA256 0d8e02907da4d5d6dbea26cb5490b9642b6a18e96b85114ca2c1bfa7700b9655 SHA512 61185ff90bd4c428c6631b8f050091f62957d36ebb7de0ee5fdec48eb363a24f8543bebd67b89784f7adfcf171e71eb4d725c68d4cea69d5fb2f8c830e39c3bf WHIRLPOOL 54d03f574109bbc2b04646f54de913328050bcf111e5b6c1386e89f50410647684caf40516562a1796c7bec190e7184078b3cea901c7777305a2b0459d3dde63 -EBUILD wine-d3d9-2.12-r1.ebuild 18507 SHA256 0d8e02907da4d5d6dbea26cb5490b9642b6a18e96b85114ca2c1bfa7700b9655 SHA512 61185ff90bd4c428c6631b8f050091f62957d36ebb7de0ee5fdec48eb363a24f8543bebd67b89784f7adfcf171e71eb4d725c68d4cea69d5fb2f8c830e39c3bf WHIRLPOOL 54d03f574109bbc2b04646f54de913328050bcf111e5b6c1386e89f50410647684caf40516562a1796c7bec190e7184078b3cea901c7777305a2b0459d3dde63 -EBUILD wine-d3d9-2.13-r1.ebuild 18507 SHA256 0d8e02907da4d5d6dbea26cb5490b9642b6a18e96b85114ca2c1bfa7700b9655 SHA512 61185ff90bd4c428c6631b8f050091f62957d36ebb7de0ee5fdec48eb363a24f8543bebd67b89784f7adfcf171e71eb4d725c68d4cea69d5fb2f8c830e39c3bf WHIRLPOOL 54d03f574109bbc2b04646f54de913328050bcf111e5b6c1386e89f50410647684caf40516562a1796c7bec190e7184078b3cea901c7777305a2b0459d3dde63 -EBUILD wine-d3d9-2.14-r1.ebuild 18507 SHA256 8c60d889c04d80d6b5bb3187fca1e3fd4da6d5854285f70e510f514d7f1f5c04 SHA512 7b8434695495e4a835f2e0efa63f09f94c80af9130a4c335ed2807d2d533248bf348f1500f6efb122c3912e83737f9ceff5d393aa1448451ab4d1f082d9da554 WHIRLPOOL 27d3d1915005f9d3ef54a42bfb3f53fa81ac0fdca7db236153f6f3a46f360cca838e577604efc054b15cac75903e149af91a05bd02fb35dab605433bbfb09541 -EBUILD wine-d3d9-2.15-r1.ebuild 18507 SHA256 8c60d889c04d80d6b5bb3187fca1e3fd4da6d5854285f70e510f514d7f1f5c04 SHA512 7b8434695495e4a835f2e0efa63f09f94c80af9130a4c335ed2807d2d533248bf348f1500f6efb122c3912e83737f9ceff5d393aa1448451ab4d1f082d9da554 WHIRLPOOL 27d3d1915005f9d3ef54a42bfb3f53fa81ac0fdca7db236153f6f3a46f360cca838e577604efc054b15cac75903e149af91a05bd02fb35dab605433bbfb09541 -EBUILD wine-d3d9-2.16-r1.ebuild 18507 SHA256 8c60d889c04d80d6b5bb3187fca1e3fd4da6d5854285f70e510f514d7f1f5c04 SHA512 7b8434695495e4a835f2e0efa63f09f94c80af9130a4c335ed2807d2d533248bf348f1500f6efb122c3912e83737f9ceff5d393aa1448451ab4d1f082d9da554 WHIRLPOOL 27d3d1915005f9d3ef54a42bfb3f53fa81ac0fdca7db236153f6f3a46f360cca838e577604efc054b15cac75903e149af91a05bd02fb35dab605433bbfb09541 -EBUILD wine-d3d9-2.17-r1.ebuild 18507 SHA256 8c60d889c04d80d6b5bb3187fca1e3fd4da6d5854285f70e510f514d7f1f5c04 SHA512 7b8434695495e4a835f2e0efa63f09f94c80af9130a4c335ed2807d2d533248bf348f1500f6efb122c3912e83737f9ceff5d393aa1448451ab4d1f082d9da554 WHIRLPOOL 27d3d1915005f9d3ef54a42bfb3f53fa81ac0fdca7db236153f6f3a46f360cca838e577604efc054b15cac75903e149af91a05bd02fb35dab605433bbfb09541 -EBUILD wine-d3d9-2.2-r1.ebuild 18443 SHA256 95b84370957e39da254930d4ecfea856ba42c1c4d6dd6e7d0367543d52a799e5 SHA512 4d70810a20b65906b1a0386df29a2ac61c33fb5ef4b3161c37698bbbbb18d4b016f37b46ec6c26b56914d75fb6b9c886960ac08040b5b1078244bd8d1a4e6839 WHIRLPOOL ef195572c7625b8f1706cfffadbeeb793357d35c88070a044bfc7b7a1ccae116718b0e5f989f270e76a09a86c9196fe20fdedd36c5cd51e6bd45c23a4c961146 -EBUILD wine-d3d9-2.3-r1.ebuild 18443 SHA256 95b84370957e39da254930d4ecfea856ba42c1c4d6dd6e7d0367543d52a799e5 SHA512 4d70810a20b65906b1a0386df29a2ac61c33fb5ef4b3161c37698bbbbb18d4b016f37b46ec6c26b56914d75fb6b9c886960ac08040b5b1078244bd8d1a4e6839 WHIRLPOOL ef195572c7625b8f1706cfffadbeeb793357d35c88070a044bfc7b7a1ccae116718b0e5f989f270e76a09a86c9196fe20fdedd36c5cd51e6bd45c23a4c961146 -EBUILD wine-d3d9-2.4-r1.ebuild 18443 SHA256 af17784f19cbb514f1d23279f2578f92fb4dd3c1a3916931ae343fa0b62f9737 SHA512 773b5e4338f4dadbe3ec9baa0bd53bff6549bdfa27ba27cc1f1285d42b6c06c56c061c3ebcd9984f6fde3770b3fc1ad0a37828ad1c64b8d6527a2b7ebb2af662 WHIRLPOOL 6187f7893a99d9430964b34dca467431c421ec3b85dc3e81483d7f9afd2b3e5dad18cb0256058eb59da17201e8e978777af30464f3a403c1edbbc72a28ec4838 -EBUILD wine-d3d9-2.5-r1.ebuild 18443 SHA256 af17784f19cbb514f1d23279f2578f92fb4dd3c1a3916931ae343fa0b62f9737 SHA512 773b5e4338f4dadbe3ec9baa0bd53bff6549bdfa27ba27cc1f1285d42b6c06c56c061c3ebcd9984f6fde3770b3fc1ad0a37828ad1c64b8d6527a2b7ebb2af662 WHIRLPOOL 6187f7893a99d9430964b34dca467431c421ec3b85dc3e81483d7f9afd2b3e5dad18cb0256058eb59da17201e8e978777af30464f3a403c1edbbc72a28ec4838 -EBUILD wine-d3d9-2.6-r1.ebuild 18443 SHA256 af17784f19cbb514f1d23279f2578f92fb4dd3c1a3916931ae343fa0b62f9737 SHA512 773b5e4338f4dadbe3ec9baa0bd53bff6549bdfa27ba27cc1f1285d42b6c06c56c061c3ebcd9984f6fde3770b3fc1ad0a37828ad1c64b8d6527a2b7ebb2af662 WHIRLPOOL 6187f7893a99d9430964b34dca467431c421ec3b85dc3e81483d7f9afd2b3e5dad18cb0256058eb59da17201e8e978777af30464f3a403c1edbbc72a28ec4838 -EBUILD wine-d3d9-2.7-r1.ebuild 18443 SHA256 af17784f19cbb514f1d23279f2578f92fb4dd3c1a3916931ae343fa0b62f9737 SHA512 773b5e4338f4dadbe3ec9baa0bd53bff6549bdfa27ba27cc1f1285d42b6c06c56c061c3ebcd9984f6fde3770b3fc1ad0a37828ad1c64b8d6527a2b7ebb2af662 WHIRLPOOL 6187f7893a99d9430964b34dca467431c421ec3b85dc3e81483d7f9afd2b3e5dad18cb0256058eb59da17201e8e978777af30464f3a403c1edbbc72a28ec4838 -EBUILD wine-d3d9-2.8-r1.ebuild 18443 SHA256 af17784f19cbb514f1d23279f2578f92fb4dd3c1a3916931ae343fa0b62f9737 SHA512 773b5e4338f4dadbe3ec9baa0bd53bff6549bdfa27ba27cc1f1285d42b6c06c56c061c3ebcd9984f6fde3770b3fc1ad0a37828ad1c64b8d6527a2b7ebb2af662 WHIRLPOOL 6187f7893a99d9430964b34dca467431c421ec3b85dc3e81483d7f9afd2b3e5dad18cb0256058eb59da17201e8e978777af30464f3a403c1edbbc72a28ec4838 -EBUILD wine-d3d9-2.9-r1.ebuild 18507 SHA256 0d8e02907da4d5d6dbea26cb5490b9642b6a18e96b85114ca2c1bfa7700b9655 SHA512 61185ff90bd4c428c6631b8f050091f62957d36ebb7de0ee5fdec48eb363a24f8543bebd67b89784f7adfcf171e71eb4d725c68d4cea69d5fb2f8c830e39c3bf WHIRLPOOL 54d03f574109bbc2b04646f54de913328050bcf111e5b6c1386e89f50410647684caf40516562a1796c7bec190e7184078b3cea901c7777305a2b0459d3dde63 -EBUILD wine-d3d9-9999.ebuild 18315 SHA256 f0e55868060d3f14fa620ee40d09ddb5e57cc84032e7faf72b04d0d77efc3aa8 SHA512 800557a5f1ea37bc0c327ed4ed07a6943a2bdfa108d0866fdaa03b1fe1873d5e07d863d05eb6c50d4676e6282b80f3a8cb1360fe42f235bbf89829cff9988202 WHIRLPOOL 2568bc10188d24ac24b0b0387e23164136e573cedfa1e93d29cc5a3bac097fb290e7647ebb7da7514082fc8b591aea2dd1ba8a427d15a94e7cd698b13a4496b3 +EBUILD wine-d3d9-2.0-r1.ebuild 18550 SHA256 ed10510ab0bd446a125519cb8e6863ae9590f4c6e9f94648d16190685113c485 SHA512 8c1b4bd83f9e3e25d3ee3ae9a99298ee6469e53fb605be4b8c5a9537cc36d6dafa47a3fd7fdda5c51fa68ba3cb31ff9b5f95948a406e569c4e7700431fd4e5cd WHIRLPOOL b10501cc4b34b6d0eb441c3aad79d8029adb486e9000b88547d69318a9f6ed17efbfbbadab1c830b46ebbc8e965f545e0f8dcb73405307a0397993b0a937507c +EBUILD wine-d3d9-2.1-r1.ebuild 18549 SHA256 aa37a88e4d2847716e526922188802b1ab302442248d0b841fc3d2f030392e8e SHA512 3d093f32b5d7d67590acaf44072c96035d2fca32ef8be7fa8b703a532c75b127c905b346c5889ff8cfde792648d8c4c39bbbc9604c7d313003305b022dc87d3a WHIRLPOOL 6832136f62bad83e62b1c9115eb0706d5170532ae1a38548cc3238c99ec6f1fc2c0408af6583688dd622bbb05992eb58343d2668ba0f6e19ee1e6818afe2469e +EBUILD wine-d3d9-2.10-r1.ebuild 18613 SHA256 7d931492f0bb9ac9a175beb6c5b7483be282ba53a920539975a0aa014fbd9f47 SHA512 59eec4428937ee2041e5182ed75f534ac5668ca4340ade988462864a195affd001ae4b2ec118a757ac5569509ae77a9d3a0b2438c1bf9152f16d48c58f294fdb WHIRLPOOL 175faa5c5001cb5effd3d0884dd4d989498d6b45e7bb09c146fe0a8c776fd4c57b46615ca0ee64fb2e8887ee6d6ad813830f3d826e27f21ba3297df8849141da +EBUILD wine-d3d9-2.11-r1.ebuild 18613 SHA256 7d931492f0bb9ac9a175beb6c5b7483be282ba53a920539975a0aa014fbd9f47 SHA512 59eec4428937ee2041e5182ed75f534ac5668ca4340ade988462864a195affd001ae4b2ec118a757ac5569509ae77a9d3a0b2438c1bf9152f16d48c58f294fdb WHIRLPOOL 175faa5c5001cb5effd3d0884dd4d989498d6b45e7bb09c146fe0a8c776fd4c57b46615ca0ee64fb2e8887ee6d6ad813830f3d826e27f21ba3297df8849141da +EBUILD wine-d3d9-2.12-r1.ebuild 18613 SHA256 7d931492f0bb9ac9a175beb6c5b7483be282ba53a920539975a0aa014fbd9f47 SHA512 59eec4428937ee2041e5182ed75f534ac5668ca4340ade988462864a195affd001ae4b2ec118a757ac5569509ae77a9d3a0b2438c1bf9152f16d48c58f294fdb WHIRLPOOL 175faa5c5001cb5effd3d0884dd4d989498d6b45e7bb09c146fe0a8c776fd4c57b46615ca0ee64fb2e8887ee6d6ad813830f3d826e27f21ba3297df8849141da +EBUILD wine-d3d9-2.13-r1.ebuild 18613 SHA256 7d931492f0bb9ac9a175beb6c5b7483be282ba53a920539975a0aa014fbd9f47 SHA512 59eec4428937ee2041e5182ed75f534ac5668ca4340ade988462864a195affd001ae4b2ec118a757ac5569509ae77a9d3a0b2438c1bf9152f16d48c58f294fdb WHIRLPOOL 175faa5c5001cb5effd3d0884dd4d989498d6b45e7bb09c146fe0a8c776fd4c57b46615ca0ee64fb2e8887ee6d6ad813830f3d826e27f21ba3297df8849141da +EBUILD wine-d3d9-2.14-r1.ebuild 18613 SHA256 8c9714e856c743f40a8832fdc915e3af9d3ae2f5a7ba5d3ffc16259a74d4aa18 SHA512 eb38e3fb9f40c45e7eb7cd7a5eb14a1337266438b9177b8ff41bbbecc557141ef24eccd67892a4ad9c50cf57793e08169607a6a37c807398a7ccc21b9bfc2ce3 WHIRLPOOL 40daafc00ba3163a74d5ef59161a88008af42d41150b0678aa199fdec7b5de9219d1dc55be20141b1b4bb19ce1d40187009ec5089e1c1db8754a59feb94a8c32 +EBUILD wine-d3d9-2.15-r1.ebuild 18613 SHA256 8c9714e856c743f40a8832fdc915e3af9d3ae2f5a7ba5d3ffc16259a74d4aa18 SHA512 eb38e3fb9f40c45e7eb7cd7a5eb14a1337266438b9177b8ff41bbbecc557141ef24eccd67892a4ad9c50cf57793e08169607a6a37c807398a7ccc21b9bfc2ce3 WHIRLPOOL 40daafc00ba3163a74d5ef59161a88008af42d41150b0678aa199fdec7b5de9219d1dc55be20141b1b4bb19ce1d40187009ec5089e1c1db8754a59feb94a8c32 +EBUILD wine-d3d9-2.16-r1.ebuild 18613 SHA256 8c9714e856c743f40a8832fdc915e3af9d3ae2f5a7ba5d3ffc16259a74d4aa18 SHA512 eb38e3fb9f40c45e7eb7cd7a5eb14a1337266438b9177b8ff41bbbecc557141ef24eccd67892a4ad9c50cf57793e08169607a6a37c807398a7ccc21b9bfc2ce3 WHIRLPOOL 40daafc00ba3163a74d5ef59161a88008af42d41150b0678aa199fdec7b5de9219d1dc55be20141b1b4bb19ce1d40187009ec5089e1c1db8754a59feb94a8c32 +EBUILD wine-d3d9-2.17-r1.ebuild 18613 SHA256 8c9714e856c743f40a8832fdc915e3af9d3ae2f5a7ba5d3ffc16259a74d4aa18 SHA512 eb38e3fb9f40c45e7eb7cd7a5eb14a1337266438b9177b8ff41bbbecc557141ef24eccd67892a4ad9c50cf57793e08169607a6a37c807398a7ccc21b9bfc2ce3 WHIRLPOOL 40daafc00ba3163a74d5ef59161a88008af42d41150b0678aa199fdec7b5de9219d1dc55be20141b1b4bb19ce1d40187009ec5089e1c1db8754a59feb94a8c32 +EBUILD wine-d3d9-2.18.ebuild 18423 SHA256 1706363c395a1768cc20086fbb271d25b7f5b9670e632c66ba6c6351851a13fd SHA512 313b82c024888c5fde974975cb129cd2913662963cbdd14c97b29174c3e1a32df11af91630d7302d0b545f952cc2bc3e47f7c1ed3e640ab933d5727078257b3b WHIRLPOOL 7ed3223e87e62f0a3b2e609f3418a12fd75b3b0811942b4ad6f269e31cd875bd0ecb4f3b1a8fe38243f0621bdb155484b2134378268679933cadabb164b8e8c1 +EBUILD wine-d3d9-2.19.ebuild 18423 SHA256 1706363c395a1768cc20086fbb271d25b7f5b9670e632c66ba6c6351851a13fd SHA512 313b82c024888c5fde974975cb129cd2913662963cbdd14c97b29174c3e1a32df11af91630d7302d0b545f952cc2bc3e47f7c1ed3e640ab933d5727078257b3b WHIRLPOOL 7ed3223e87e62f0a3b2e609f3418a12fd75b3b0811942b4ad6f269e31cd875bd0ecb4f3b1a8fe38243f0621bdb155484b2134378268679933cadabb164b8e8c1 +EBUILD wine-d3d9-2.2-r1.ebuild 18549 SHA256 aa37a88e4d2847716e526922188802b1ab302442248d0b841fc3d2f030392e8e SHA512 3d093f32b5d7d67590acaf44072c96035d2fca32ef8be7fa8b703a532c75b127c905b346c5889ff8cfde792648d8c4c39bbbc9604c7d313003305b022dc87d3a WHIRLPOOL 6832136f62bad83e62b1c9115eb0706d5170532ae1a38548cc3238c99ec6f1fc2c0408af6583688dd622bbb05992eb58343d2668ba0f6e19ee1e6818afe2469e +EBUILD wine-d3d9-2.3-r1.ebuild 18549 SHA256 aa37a88e4d2847716e526922188802b1ab302442248d0b841fc3d2f030392e8e SHA512 3d093f32b5d7d67590acaf44072c96035d2fca32ef8be7fa8b703a532c75b127c905b346c5889ff8cfde792648d8c4c39bbbc9604c7d313003305b022dc87d3a WHIRLPOOL 6832136f62bad83e62b1c9115eb0706d5170532ae1a38548cc3238c99ec6f1fc2c0408af6583688dd622bbb05992eb58343d2668ba0f6e19ee1e6818afe2469e +EBUILD wine-d3d9-2.4-r1.ebuild 18549 SHA256 3bbfdd5fd933bb830fef5baf3039b0fc2df3376be02e1567bc4677a6e2588fdb SHA512 ade566b963c5b116dd399195f00c759cb39a0b13292f98da74ee2041f7e70ffdffe1cc8a3aff683c0a2b2137c25460a61de431337a8644be491cb9de55ca14be WHIRLPOOL c0920b4f5dfffac9902174c50a4f12cbbf86e19aed451259e4750895126afef7530c42add907500caa24c3d5951b59a42e2149eccd9dcb2bd6a74418192b9e68 +EBUILD wine-d3d9-2.5-r1.ebuild 18549 SHA256 3bbfdd5fd933bb830fef5baf3039b0fc2df3376be02e1567bc4677a6e2588fdb SHA512 ade566b963c5b116dd399195f00c759cb39a0b13292f98da74ee2041f7e70ffdffe1cc8a3aff683c0a2b2137c25460a61de431337a8644be491cb9de55ca14be WHIRLPOOL c0920b4f5dfffac9902174c50a4f12cbbf86e19aed451259e4750895126afef7530c42add907500caa24c3d5951b59a42e2149eccd9dcb2bd6a74418192b9e68 +EBUILD wine-d3d9-2.6-r1.ebuild 18549 SHA256 3bbfdd5fd933bb830fef5baf3039b0fc2df3376be02e1567bc4677a6e2588fdb SHA512 ade566b963c5b116dd399195f00c759cb39a0b13292f98da74ee2041f7e70ffdffe1cc8a3aff683c0a2b2137c25460a61de431337a8644be491cb9de55ca14be WHIRLPOOL c0920b4f5dfffac9902174c50a4f12cbbf86e19aed451259e4750895126afef7530c42add907500caa24c3d5951b59a42e2149eccd9dcb2bd6a74418192b9e68 +EBUILD wine-d3d9-2.7-r1.ebuild 18549 SHA256 3bbfdd5fd933bb830fef5baf3039b0fc2df3376be02e1567bc4677a6e2588fdb SHA512 ade566b963c5b116dd399195f00c759cb39a0b13292f98da74ee2041f7e70ffdffe1cc8a3aff683c0a2b2137c25460a61de431337a8644be491cb9de55ca14be WHIRLPOOL c0920b4f5dfffac9902174c50a4f12cbbf86e19aed451259e4750895126afef7530c42add907500caa24c3d5951b59a42e2149eccd9dcb2bd6a74418192b9e68 +EBUILD wine-d3d9-2.8-r1.ebuild 18549 SHA256 3bbfdd5fd933bb830fef5baf3039b0fc2df3376be02e1567bc4677a6e2588fdb SHA512 ade566b963c5b116dd399195f00c759cb39a0b13292f98da74ee2041f7e70ffdffe1cc8a3aff683c0a2b2137c25460a61de431337a8644be491cb9de55ca14be WHIRLPOOL c0920b4f5dfffac9902174c50a4f12cbbf86e19aed451259e4750895126afef7530c42add907500caa24c3d5951b59a42e2149eccd9dcb2bd6a74418192b9e68 +EBUILD wine-d3d9-2.9-r1.ebuild 18613 SHA256 7d931492f0bb9ac9a175beb6c5b7483be282ba53a920539975a0aa014fbd9f47 SHA512 59eec4428937ee2041e5182ed75f534ac5668ca4340ade988462864a195affd001ae4b2ec118a757ac5569509ae77a9d3a0b2438c1bf9152f16d48c58f294fdb WHIRLPOOL 175faa5c5001cb5effd3d0884dd4d989498d6b45e7bb09c146fe0a8c776fd4c57b46615ca0ee64fb2e8887ee6d6ad813830f3d826e27f21ba3297df8849141da +EBUILD wine-d3d9-9999.ebuild 18423 SHA256 1706363c395a1768cc20086fbb271d25b7f5b9670e632c66ba6c6351851a13fd SHA512 313b82c024888c5fde974975cb129cd2913662963cbdd14c97b29174c3e1a32df11af91630d7302d0b545f952cc2bc3e47f7c1ed3e640ab933d5727078257b3b WHIRLPOOL 7ed3223e87e62f0a3b2e609f3418a12fd75b3b0811942b4ad6f269e31cd875bd0ecb4f3b1a8fe38243f0621bdb155484b2134378268679933cadabb164b8e8c1 MISC metadata.xml 2847 SHA256 ebcbb8031a6ebd212375f86d53c8ec909e5e3a2e35c04ef4739132e8306beac8 SHA512 aa92412a3858822c2bf82c517008a2730eb9710126b1ef336020c3085c4e36503ee921661bd88a5b20d9fa01b539fbcee617620a7c7762665592d8cd711863a0 WHIRLPOOL 9f44d9ac730cd07225c0686f41f86ff23898b9012857289987ca167223066a50e08dbd035d20f0dd498d9bcfee120a20294c775937712e057dbafb1f6283ea42 diff --git a/app-emulation/wine-d3d9/wine-d3d9-2.0-r1.ebuild b/app-emulation/wine-d3d9/wine-d3d9-2.0-r1.ebuild index 768fae6fbaf2..39d1a0612257 100644 --- a/app-emulation/wine-d3d9/wine-d3d9-2.0-r1.ebuild +++ b/app-emulation/wine-d3d9/wine-d3d9-2.0-r1.ebuild @@ -146,7 +146,6 @@ RDEPEND="${COMMON_DEPEND} # tools/make_requests requires perl DEPEND="${COMMON_DEPEND} - dev-util/patchbin sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig @@ -166,6 +165,23 @@ 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 @@ -327,17 +343,7 @@ src_prepare() { } 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" - "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676 - "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376 - ) - local PATCHES_BIN=( - "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376 - ) + if use d3d9; then PATCHES+=( "${D3D9_DIR}/d3d9-helper.patch" ) PATCHES+=( "${D3D9_DIR}/wine-d3d9.patch" ) diff --git a/app-emulation/wine-d3d9/wine-d3d9-2.1-r1.ebuild b/app-emulation/wine-d3d9/wine-d3d9-2.1-r1.ebuild index 280c1174f312..e9754927f543 100644 --- a/app-emulation/wine-d3d9/wine-d3d9-2.1-r1.ebuild +++ b/app-emulation/wine-d3d9/wine-d3d9-2.1-r1.ebuild @@ -146,7 +146,6 @@ RDEPEND="${COMMON_DEPEND} # tools/make_requests requires perl DEPEND="${COMMON_DEPEND} - dev-util/patchbin sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig @@ -166,6 +165,23 @@ 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 @@ -327,17 +343,7 @@ src_prepare() { } 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" - "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676 - "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376 - ) - local PATCHES_BIN=( - "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376 - ) + if use d3d9; then PATCHES+=( "${D3D9_DIR}/d3d9-helper.patch" ) PATCHES+=( "${D3D9_DIR}/wine-d3d9.patch" ) diff --git a/app-emulation/wine-d3d9/wine-d3d9-2.10-r1.ebuild b/app-emulation/wine-d3d9/wine-d3d9-2.10-r1.ebuild index 2b18410a845f..71db470f65e4 100644 --- a/app-emulation/wine-d3d9/wine-d3d9-2.10-r1.ebuild +++ b/app-emulation/wine-d3d9/wine-d3d9-2.10-r1.ebuild @@ -147,7 +147,6 @@ RDEPEND="${COMMON_DEPEND} # tools/make_requests requires perl DEPEND="${COMMON_DEPEND} - dev-util/patchbin sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig @@ -167,6 +166,23 @@ 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 @@ -328,17 +344,7 @@ src_prepare() { } 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" - "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676 - "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376 - ) - local PATCHES_BIN=( - "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376 - ) + if use d3d9; then PATCHES+=( "${D3D9_DIR}/d3d9-helper.patch" ) PATCHES+=( "${D3D9_DIR}/wine-d3d9.patch" ) diff --git a/app-emulation/wine-d3d9/wine-d3d9-2.11-r1.ebuild b/app-emulation/wine-d3d9/wine-d3d9-2.11-r1.ebuild index 2b18410a845f..71db470f65e4 100644 --- a/app-emulation/wine-d3d9/wine-d3d9-2.11-r1.ebuild +++ b/app-emulation/wine-d3d9/wine-d3d9-2.11-r1.ebuild @@ -147,7 +147,6 @@ RDEPEND="${COMMON_DEPEND} # tools/make_requests requires perl DEPEND="${COMMON_DEPEND} - dev-util/patchbin sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig @@ -167,6 +166,23 @@ 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 @@ -328,17 +344,7 @@ src_prepare() { } 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" - "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676 - "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376 - ) - local PATCHES_BIN=( - "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376 - ) + if use d3d9; then PATCHES+=( "${D3D9_DIR}/d3d9-helper.patch" ) PATCHES+=( "${D3D9_DIR}/wine-d3d9.patch" ) diff --git a/app-emulation/wine-d3d9/wine-d3d9-2.12-r1.ebuild b/app-emulation/wine-d3d9/wine-d3d9-2.12-r1.ebuild index 2b18410a845f..71db470f65e4 100644 --- a/app-emulation/wine-d3d9/wine-d3d9-2.12-r1.ebuild +++ b/app-emulation/wine-d3d9/wine-d3d9-2.12-r1.ebuild @@ -147,7 +147,6 @@ RDEPEND="${COMMON_DEPEND} # tools/make_requests requires perl DEPEND="${COMMON_DEPEND} - dev-util/patchbin sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig @@ -167,6 +166,23 @@ 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 @@ -328,17 +344,7 @@ src_prepare() { } 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" - "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676 - "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376 - ) - local PATCHES_BIN=( - "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376 - ) + if use d3d9; then PATCHES+=( "${D3D9_DIR}/d3d9-helper.patch" ) PATCHES+=( "${D3D9_DIR}/wine-d3d9.patch" ) diff --git a/app-emulation/wine-d3d9/wine-d3d9-2.13-r1.ebuild b/app-emulation/wine-d3d9/wine-d3d9-2.13-r1.ebuild index 2b18410a845f..71db470f65e4 100644 --- a/app-emulation/wine-d3d9/wine-d3d9-2.13-r1.ebuild +++ b/app-emulation/wine-d3d9/wine-d3d9-2.13-r1.ebuild @@ -147,7 +147,6 @@ RDEPEND="${COMMON_DEPEND} # tools/make_requests requires perl DEPEND="${COMMON_DEPEND} - dev-util/patchbin sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig @@ -167,6 +166,23 @@ 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 @@ -328,17 +344,7 @@ src_prepare() { } 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" - "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676 - "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376 - ) - local PATCHES_BIN=( - "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376 - ) + if use d3d9; then PATCHES+=( "${D3D9_DIR}/d3d9-helper.patch" ) PATCHES+=( "${D3D9_DIR}/wine-d3d9.patch" ) diff --git a/app-emulation/wine-d3d9/wine-d3d9-2.14-r1.ebuild b/app-emulation/wine-d3d9/wine-d3d9-2.14-r1.ebuild index 89a37ab44504..c3bf9b8d1e4e 100644 --- a/app-emulation/wine-d3d9/wine-d3d9-2.14-r1.ebuild +++ b/app-emulation/wine-d3d9/wine-d3d9-2.14-r1.ebuild @@ -147,7 +147,6 @@ RDEPEND="${COMMON_DEPEND} # tools/make_requests requires perl DEPEND="${COMMON_DEPEND} - dev-util/patchbin sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig @@ -167,6 +166,23 @@ 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 @@ -328,17 +344,7 @@ src_prepare() { } 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" - "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676 - "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376 - ) - local PATCHES_BIN=( - "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376 - ) + if use d3d9; then PATCHES+=( "${D3D9_DIR}/d3d9-helper.patch" ) PATCHES+=( "${D3D9_DIR}/wine-d3d9.patch" ) diff --git a/app-emulation/wine-d3d9/wine-d3d9-2.15-r1.ebuild b/app-emulation/wine-d3d9/wine-d3d9-2.15-r1.ebuild index 89a37ab44504..c3bf9b8d1e4e 100644 --- a/app-emulation/wine-d3d9/wine-d3d9-2.15-r1.ebuild +++ b/app-emulation/wine-d3d9/wine-d3d9-2.15-r1.ebuild @@ -147,7 +147,6 @@ RDEPEND="${COMMON_DEPEND} # tools/make_requests requires perl DEPEND="${COMMON_DEPEND} - dev-util/patchbin sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig @@ -167,6 +166,23 @@ 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 @@ -328,17 +344,7 @@ src_prepare() { } 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" - "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676 - "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376 - ) - local PATCHES_BIN=( - "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376 - ) + if use d3d9; then PATCHES+=( "${D3D9_DIR}/d3d9-helper.patch" ) PATCHES+=( "${D3D9_DIR}/wine-d3d9.patch" ) diff --git a/app-emulation/wine-d3d9/wine-d3d9-2.16-r1.ebuild b/app-emulation/wine-d3d9/wine-d3d9-2.16-r1.ebuild index 89a37ab44504..c3bf9b8d1e4e 100644 --- a/app-emulation/wine-d3d9/wine-d3d9-2.16-r1.ebuild +++ b/app-emulation/wine-d3d9/wine-d3d9-2.16-r1.ebuild @@ -147,7 +147,6 @@ RDEPEND="${COMMON_DEPEND} # tools/make_requests requires perl DEPEND="${COMMON_DEPEND} - dev-util/patchbin sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig @@ -167,6 +166,23 @@ 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 @@ -328,17 +344,7 @@ src_prepare() { } 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" - "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676 - "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376 - ) - local PATCHES_BIN=( - "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376 - ) + if use d3d9; then PATCHES+=( "${D3D9_DIR}/d3d9-helper.patch" ) PATCHES+=( "${D3D9_DIR}/wine-d3d9.patch" ) diff --git a/app-emulation/wine-d3d9/wine-d3d9-2.17-r1.ebuild b/app-emulation/wine-d3d9/wine-d3d9-2.17-r1.ebuild index 89a37ab44504..c3bf9b8d1e4e 100644 --- a/app-emulation/wine-d3d9/wine-d3d9-2.17-r1.ebuild +++ b/app-emulation/wine-d3d9/wine-d3d9-2.17-r1.ebuild @@ -147,7 +147,6 @@ RDEPEND="${COMMON_DEPEND} # tools/make_requests requires perl DEPEND="${COMMON_DEPEND} - dev-util/patchbin sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig @@ -167,6 +166,23 @@ 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 @@ -328,17 +344,7 @@ src_prepare() { } 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" - "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676 - "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376 - ) - local PATCHES_BIN=( - "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376 - ) + if use d3d9; then PATCHES+=( "${D3D9_DIR}/d3d9-helper.patch" ) PATCHES+=( "${D3D9_DIR}/wine-d3d9.patch" ) diff --git a/app-emulation/wine-d3d9/wine-d3d9-2.18.ebuild b/app-emulation/wine-d3d9/wine-d3d9-2.18.ebuild new file mode 100644 index 000000000000..ec6c3d60b3cf --- /dev/null +++ b/app-emulation/wine-d3d9/wine-d3d9-2.18.ebuild @@ -0,0 +1,568 @@ +# 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}" + +D3D9_P="wine-d3d9-${PV}" +D3D9_DIR="${WORKDIR}/wine-d3d9-patches-${D3D9_P}" +GWP_V="20170830" +PATCHDIR="${WORKDIR}/gentoo-wine-patches" + +DESCRIPTION="Free implementation of Windows(tm) on Unix, with Gallium Nine patchset" +HOMEPAGE="https://www.winehq.org/" +SRC_URI="${SRC_URI} + https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-${GWP_V}.tar.xz +" + +if [[ ${PV} == "9999" ]] ; then + D3D9_EGIT_REPO_URI="https://github.com/sarnex/wine-d3d9-patches.git" +else + SRC_URI="${SRC_URI} + d3d9? ( https://github.com/sarnex/wine-d3d9-patches/archive/${D3D9_P}.tar.gz )" +fi + +LICENSE="LGPL-2.1" +SLOT="${PV}" +IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags d3d9 dos elibc_glibc +fontconfig +gecko gphoto2 gsm gstreamer +jpeg kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap +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}] ) + d3d9? ( + media-libs/mesa[d3d9,egl,${MULTILIB_USEDEP}] + x11-libs/libX11[${MULTILIB_USEDEP}] + x11-libs/libXext[${MULTILIB_USEDEP}] + x11-libs/libxcb[${MULTILIB_USEDEP}] + ) + fontconfig? ( media-libs/fontconfig:=[${MULTILIB_USEDEP}] ) + gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] ) + gsm? ( media-sound/gsm:=[${MULTILIB_USEDEP}] ) + gstreamer? ( + media-libs/gstreamer:1.0[${MULTILIB_USEDEP}] + media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}] + ) + jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] ) + lcms? ( media-libs/lcms:2=[${MULTILIB_USEDEP}] ) + ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] ) + mp3? ( >=media-sound/mpg123-1.5.0[${MULTILIB_USEDEP}] ) + ncurses? ( >=sys-libs/ncurses-5.2:0=[${MULTILIB_USEDEP}] ) + netapi? ( net-fs/samba[netapi(+),${MULTILIB_USEDEP}] ) + nls? ( sys-devel/gettext[${MULTILIB_USEDEP}] ) + odbc? ( dev-db/unixODBC:=[${MULTILIB_USEDEP}] ) + openal? ( media-libs/openal:=[${MULTILIB_USEDEP}] ) + opencl? ( virtual/opencl[${MULTILIB_USEDEP}] ) + opengl? ( + virtual/glu[${MULTILIB_USEDEP}] + virtual/opengl[${MULTILIB_USEDEP}] + ) + osmesa? ( >=media-libs/mesa-13[osmesa,${MULTILIB_USEDEP}] ) + pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] ) + png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] ) + pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] ) + scanner? ( media-gfx/sane-backends:=[${MULTILIB_USEDEP}] ) + ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] ) + 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" +) +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 ${pn_live_val} ]]; then + if use d3d9; then + eerror "Because of the multi-repo nature of ${MY_PN}, ${pn_live_var}" + eerror "cannot be used to set the commit. Instead, you may use the" + eerror "environmental variables WINE_COMMIT, and D3D9_COMMIT." + eerror + return 1 + fi + fi + if [[ ! -z ${EGIT_COMMIT} ]]; then + eerror "Commits must now be specified using the environmental variables" + eerror "WINE_COMMIT, and D3D9_COMMIT" + eerror + return 1 + fi +} + +pkg_pretend() { + wine_build_environment_check || die + + # Verify OSS support + if use oss && ! use kernel_FreeBSD; then + if ! has_version ">=media-sound/oss-4"; then + eerror "You cannot build wine with USE=oss without having support from a" + eerror "FreeBSD kernel or >=media-sound/oss-4 (only available through external repos)" + eerror + die + fi + fi +} + +pkg_setup() { + wine_build_environment_check || die + wine_env_vcs_vars || die + + WINE_VARIANT="${PN#wine}-${PV}" + WINE_VARIANT="${WINE_VARIANT#-}" + + MY_PREFIX="${EPREFIX}/usr/lib/wine-${WINE_VARIANT}" + MY_DATAROOTDIR="${EPREFIX}/usr/share/wine-${WINE_VARIANT}" + MY_DATADIR="${MY_DATAROOTDIR}" + MY_DOCDIR="${EPREFIX}/usr/share/doc/${PF}" + MY_INCLUDEDIR="${EPREFIX}/usr/include/wine-${WINE_VARIANT}" + MY_LIBEXECDIR="${EPREFIX}/usr/libexec/wine-${WINE_VARIANT}" + MY_LOCALSTATEDIR="${EPREFIX}/var/wine-${WINE_VARIANT}" + MY_MANDIR="${MY_DATADIR}/man" +} + +src_unpack() { + if [[ ${PV} == "9999" ]] ; then + EGIT_CHECKOUT_DIR="${S}" EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack + if use d3d9; then + git-r3_fetch "${D3D9_EGIT_REPO_URI}" "${D3D9_COMMIT}" + git-r3_checkout "${D3D9_EGIT_REPO_URI}" "${D3D9_DIR}" + fi + fi + + default + + l10n_find_plocales_changes "${S}/po" "" ".po" +} + +src_prepare() { + + eapply_bin(){ + local patch + for patch in ${PATCHES_BIN[@]}; do + patchbin --nogit < "${patch}" || die + done + } + + local md5="$(md5sum server/protocol.def)" + + if use d3d9; then + PATCHES+=( "${D3D9_DIR}/d3d9-helper.patch" ) + PATCHES+=( "${D3D9_DIR}/wine-d3d9.patch" ) + fi + + 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) + ) + + use d3d9 && myconf+=( $(use_with d3d9 d3d9-nine) ) + + local PKG_CONFIG AR RANLIB + # Avoid crossdev's i686-pc-linux-gnu-pkg-config if building wine32 on amd64; #472038 + # set AR and RANLIB to make QA scripts happy; #483342 + tc-export PKG_CONFIG AR RANLIB + + if use amd64; then + if [[ ${ABI} == amd64 ]]; then + myconf+=( --enable-win64 ) + else + myconf+=( --disable-win64 ) + fi + + # Note: using --with-wine64 results in problems with multilib.eclass + # CC/LD hackery. We're using separate tools instead. + fi + + ECONF_SOURCE=${S} \ + econf "${myconf[@]}" + emake depend +} + +multilib_src_test() { + # FIXME: win32-only; wine64 tests fail with "could not find the Wine loader" + if [[ ${ABI} == x86 ]]; then + if [[ $(id -u) == 0 ]]; then + ewarn "Skipping tests since they cannot be run under the root user." + ewarn "To run the test ${MY_PN} suite, add userpriv to FEATURES in make.conf" + return + fi + + WINEPREFIX="${T}/.wine-${ABI}" \ + Xemake test + fi +} + +multilib_src_install_all() { + local DOCS=( ANNOUNCE AUTHORS README ) + add_locale_docs() { + local locale_doc="documentation/README.$1" + [[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} ) + } + l10n_for_each_locale_do add_locale_docs + + einstalldocs + prune_libtool_files --all + + if ! use perl ; then # winedump calls function_grep.pl, and winemaker is a perl script + rm "${D%/}${MY_PREFIX}"/bin/{wine{dump,maker},function_grep.pl} \ + "${D%/}${MY_MANDIR}"/man1/wine{dump,maker}.1 || die + fi + + # Remove wineconsole if neither backend is installed #551124 + if ! use X && ! use ncurses; then + rm "${D%/}${MY_PREFIX}"/bin/wineconsole* || die + rm "${D%/}${MY_MANDIR}"/man1/wineconsole* || die + rm_wineconsole() { + rm "${D%/}${MY_PREFIX}/$(get_libdir)"/wine/{,fakedlls/}wineconsole.exe* || die + } + multilib_foreach_abi rm_wineconsole + fi + + use abi_x86_32 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine{,-preloader} #255055 + use abi_x86_64 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine64{,-preloader} + + if use abi_x86_64 && ! use abi_x86_32; then + dosym 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 + else + if use d3d9; then + eselect wine register --d3d9 ${P} || die + fi + 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 + else + if use d3d9; then + eselect wine deregister --d3d9 ${P} || die + fi + fi + + eselect wine update --all --if-unset || die +} + +pkg_postrm() { + xdg_desktop_database_update +} diff --git a/app-emulation/wine-d3d9/wine-d3d9-2.19.ebuild b/app-emulation/wine-d3d9/wine-d3d9-2.19.ebuild new file mode 100644 index 000000000000..ec6c3d60b3cf --- /dev/null +++ b/app-emulation/wine-d3d9/wine-d3d9-2.19.ebuild @@ -0,0 +1,568 @@ +# 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}" + +D3D9_P="wine-d3d9-${PV}" +D3D9_DIR="${WORKDIR}/wine-d3d9-patches-${D3D9_P}" +GWP_V="20170830" +PATCHDIR="${WORKDIR}/gentoo-wine-patches" + +DESCRIPTION="Free implementation of Windows(tm) on Unix, with Gallium Nine patchset" +HOMEPAGE="https://www.winehq.org/" +SRC_URI="${SRC_URI} + https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-${GWP_V}.tar.xz +" + +if [[ ${PV} == "9999" ]] ; then + D3D9_EGIT_REPO_URI="https://github.com/sarnex/wine-d3d9-patches.git" +else + SRC_URI="${SRC_URI} + d3d9? ( https://github.com/sarnex/wine-d3d9-patches/archive/${D3D9_P}.tar.gz )" +fi + +LICENSE="LGPL-2.1" +SLOT="${PV}" +IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags d3d9 dos elibc_glibc +fontconfig +gecko gphoto2 gsm gstreamer +jpeg kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap +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}] ) + d3d9? ( + media-libs/mesa[d3d9,egl,${MULTILIB_USEDEP}] + x11-libs/libX11[${MULTILIB_USEDEP}] + x11-libs/libXext[${MULTILIB_USEDEP}] + x11-libs/libxcb[${MULTILIB_USEDEP}] + ) + fontconfig? ( media-libs/fontconfig:=[${MULTILIB_USEDEP}] ) + gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] ) + gsm? ( media-sound/gsm:=[${MULTILIB_USEDEP}] ) + gstreamer? ( + media-libs/gstreamer:1.0[${MULTILIB_USEDEP}] + media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}] + ) + jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] ) + lcms? ( media-libs/lcms:2=[${MULTILIB_USEDEP}] ) + ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] ) + mp3? ( >=media-sound/mpg123-1.5.0[${MULTILIB_USEDEP}] ) + ncurses? ( >=sys-libs/ncurses-5.2:0=[${MULTILIB_USEDEP}] ) + netapi? ( net-fs/samba[netapi(+),${MULTILIB_USEDEP}] ) + nls? ( sys-devel/gettext[${MULTILIB_USEDEP}] ) + odbc? ( dev-db/unixODBC:=[${MULTILIB_USEDEP}] ) + openal? ( media-libs/openal:=[${MULTILIB_USEDEP}] ) + opencl? ( virtual/opencl[${MULTILIB_USEDEP}] ) + opengl? ( + virtual/glu[${MULTILIB_USEDEP}] + virtual/opengl[${MULTILIB_USEDEP}] + ) + osmesa? ( >=media-libs/mesa-13[osmesa,${MULTILIB_USEDEP}] ) + pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] ) + png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] ) + pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] ) + scanner? ( media-gfx/sane-backends:=[${MULTILIB_USEDEP}] ) + ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] ) + 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" +) +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 ${pn_live_val} ]]; then + if use d3d9; then + eerror "Because of the multi-repo nature of ${MY_PN}, ${pn_live_var}" + eerror "cannot be used to set the commit. Instead, you may use the" + eerror "environmental variables WINE_COMMIT, and D3D9_COMMIT." + eerror + return 1 + fi + fi + if [[ ! -z ${EGIT_COMMIT} ]]; then + eerror "Commits must now be specified using the environmental variables" + eerror "WINE_COMMIT, and D3D9_COMMIT" + eerror + return 1 + fi +} + +pkg_pretend() { + wine_build_environment_check || die + + # Verify OSS support + if use oss && ! use kernel_FreeBSD; then + if ! has_version ">=media-sound/oss-4"; then + eerror "You cannot build wine with USE=oss without having support from a" + eerror "FreeBSD kernel or >=media-sound/oss-4 (only available through external repos)" + eerror + die + fi + fi +} + +pkg_setup() { + wine_build_environment_check || die + wine_env_vcs_vars || die + + WINE_VARIANT="${PN#wine}-${PV}" + WINE_VARIANT="${WINE_VARIANT#-}" + + MY_PREFIX="${EPREFIX}/usr/lib/wine-${WINE_VARIANT}" + MY_DATAROOTDIR="${EPREFIX}/usr/share/wine-${WINE_VARIANT}" + MY_DATADIR="${MY_DATAROOTDIR}" + MY_DOCDIR="${EPREFIX}/usr/share/doc/${PF}" + MY_INCLUDEDIR="${EPREFIX}/usr/include/wine-${WINE_VARIANT}" + MY_LIBEXECDIR="${EPREFIX}/usr/libexec/wine-${WINE_VARIANT}" + MY_LOCALSTATEDIR="${EPREFIX}/var/wine-${WINE_VARIANT}" + MY_MANDIR="${MY_DATADIR}/man" +} + +src_unpack() { + if [[ ${PV} == "9999" ]] ; then + EGIT_CHECKOUT_DIR="${S}" EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack + if use d3d9; then + git-r3_fetch "${D3D9_EGIT_REPO_URI}" "${D3D9_COMMIT}" + git-r3_checkout "${D3D9_EGIT_REPO_URI}" "${D3D9_DIR}" + fi + fi + + default + + l10n_find_plocales_changes "${S}/po" "" ".po" +} + +src_prepare() { + + eapply_bin(){ + local patch + for patch in ${PATCHES_BIN[@]}; do + patchbin --nogit < "${patch}" || die + done + } + + local md5="$(md5sum server/protocol.def)" + + if use d3d9; then + PATCHES+=( "${D3D9_DIR}/d3d9-helper.patch" ) + PATCHES+=( "${D3D9_DIR}/wine-d3d9.patch" ) + fi + + 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) + ) + + use d3d9 && myconf+=( $(use_with d3d9 d3d9-nine) ) + + local PKG_CONFIG AR RANLIB + # Avoid crossdev's i686-pc-linux-gnu-pkg-config if building wine32 on amd64; #472038 + # set AR and RANLIB to make QA scripts happy; #483342 + tc-export PKG_CONFIG AR RANLIB + + if use amd64; then + if [[ ${ABI} == amd64 ]]; then + myconf+=( --enable-win64 ) + else + myconf+=( --disable-win64 ) + fi + + # Note: using --with-wine64 results in problems with multilib.eclass + # CC/LD hackery. We're using separate tools instead. + fi + + ECONF_SOURCE=${S} \ + econf "${myconf[@]}" + emake depend +} + +multilib_src_test() { + # FIXME: win32-only; wine64 tests fail with "could not find the Wine loader" + if [[ ${ABI} == x86 ]]; then + if [[ $(id -u) == 0 ]]; then + ewarn "Skipping tests since they cannot be run under the root user." + ewarn "To run the test ${MY_PN} suite, add userpriv to FEATURES in make.conf" + return + fi + + WINEPREFIX="${T}/.wine-${ABI}" \ + Xemake test + fi +} + +multilib_src_install_all() { + local DOCS=( ANNOUNCE AUTHORS README ) + add_locale_docs() { + local locale_doc="documentation/README.$1" + [[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} ) + } + l10n_for_each_locale_do add_locale_docs + + einstalldocs + prune_libtool_files --all + + if ! use perl ; then # winedump calls function_grep.pl, and winemaker is a perl script + rm "${D%/}${MY_PREFIX}"/bin/{wine{dump,maker},function_grep.pl} \ + "${D%/}${MY_MANDIR}"/man1/wine{dump,maker}.1 || die + fi + + # Remove wineconsole if neither backend is installed #551124 + if ! use X && ! use ncurses; then + rm "${D%/}${MY_PREFIX}"/bin/wineconsole* || die + rm "${D%/}${MY_MANDIR}"/man1/wineconsole* || die + rm_wineconsole() { + rm "${D%/}${MY_PREFIX}/$(get_libdir)"/wine/{,fakedlls/}wineconsole.exe* || die + } + multilib_foreach_abi rm_wineconsole + fi + + use abi_x86_32 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine{,-preloader} #255055 + use abi_x86_64 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine64{,-preloader} + + if use abi_x86_64 && ! use abi_x86_32; then + dosym 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 + else + if use d3d9; then + eselect wine register --d3d9 ${P} || die + fi + 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 + else + if use d3d9; then + eselect wine deregister --d3d9 ${P} || die + fi + fi + + eselect wine update --all --if-unset || die +} + +pkg_postrm() { + xdg_desktop_database_update +} diff --git a/app-emulation/wine-d3d9/wine-d3d9-2.2-r1.ebuild b/app-emulation/wine-d3d9/wine-d3d9-2.2-r1.ebuild index 280c1174f312..e9754927f543 100644 --- a/app-emulation/wine-d3d9/wine-d3d9-2.2-r1.ebuild +++ b/app-emulation/wine-d3d9/wine-d3d9-2.2-r1.ebuild @@ -146,7 +146,6 @@ RDEPEND="${COMMON_DEPEND} # tools/make_requests requires perl DEPEND="${COMMON_DEPEND} - dev-util/patchbin sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig @@ -166,6 +165,23 @@ 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 @@ -327,17 +343,7 @@ src_prepare() { } 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" - "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676 - "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376 - ) - local PATCHES_BIN=( - "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376 - ) + if use d3d9; then PATCHES+=( "${D3D9_DIR}/d3d9-helper.patch" ) PATCHES+=( "${D3D9_DIR}/wine-d3d9.patch" ) diff --git a/app-emulation/wine-d3d9/wine-d3d9-2.3-r1.ebuild b/app-emulation/wine-d3d9/wine-d3d9-2.3-r1.ebuild index 280c1174f312..e9754927f543 100644 --- a/app-emulation/wine-d3d9/wine-d3d9-2.3-r1.ebuild +++ b/app-emulation/wine-d3d9/wine-d3d9-2.3-r1.ebuild @@ -146,7 +146,6 @@ RDEPEND="${COMMON_DEPEND} # tools/make_requests requires perl DEPEND="${COMMON_DEPEND} - dev-util/patchbin sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig @@ -166,6 +165,23 @@ 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 @@ -327,17 +343,7 @@ src_prepare() { } 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" - "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676 - "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376 - ) - local PATCHES_BIN=( - "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376 - ) + if use d3d9; then PATCHES+=( "${D3D9_DIR}/d3d9-helper.patch" ) PATCHES+=( "${D3D9_DIR}/wine-d3d9.patch" ) diff --git a/app-emulation/wine-d3d9/wine-d3d9-2.4-r1.ebuild b/app-emulation/wine-d3d9/wine-d3d9-2.4-r1.ebuild index 6dcd268b951a..6f8a34c54fa0 100644 --- a/app-emulation/wine-d3d9/wine-d3d9-2.4-r1.ebuild +++ b/app-emulation/wine-d3d9/wine-d3d9-2.4-r1.ebuild @@ -146,7 +146,6 @@ RDEPEND="${COMMON_DEPEND} # tools/make_requests requires perl DEPEND="${COMMON_DEPEND} - dev-util/patchbin sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig @@ -166,6 +165,23 @@ 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 @@ -327,17 +343,7 @@ src_prepare() { } 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" - "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676 - "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376 - ) - local PATCHES_BIN=( - "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376 - ) + if use d3d9; then PATCHES+=( "${D3D9_DIR}/d3d9-helper.patch" ) PATCHES+=( "${D3D9_DIR}/wine-d3d9.patch" ) diff --git a/app-emulation/wine-d3d9/wine-d3d9-2.5-r1.ebuild b/app-emulation/wine-d3d9/wine-d3d9-2.5-r1.ebuild index 6dcd268b951a..6f8a34c54fa0 100644 --- a/app-emulation/wine-d3d9/wine-d3d9-2.5-r1.ebuild +++ b/app-emulation/wine-d3d9/wine-d3d9-2.5-r1.ebuild @@ -146,7 +146,6 @@ RDEPEND="${COMMON_DEPEND} # tools/make_requests requires perl DEPEND="${COMMON_DEPEND} - dev-util/patchbin sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig @@ -166,6 +165,23 @@ 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 @@ -327,17 +343,7 @@ src_prepare() { } 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" - "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676 - "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376 - ) - local PATCHES_BIN=( - "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376 - ) + if use d3d9; then PATCHES+=( "${D3D9_DIR}/d3d9-helper.patch" ) PATCHES+=( "${D3D9_DIR}/wine-d3d9.patch" ) diff --git a/app-emulation/wine-d3d9/wine-d3d9-2.6-r1.ebuild b/app-emulation/wine-d3d9/wine-d3d9-2.6-r1.ebuild index 6dcd268b951a..6f8a34c54fa0 100644 --- a/app-emulation/wine-d3d9/wine-d3d9-2.6-r1.ebuild +++ b/app-emulation/wine-d3d9/wine-d3d9-2.6-r1.ebuild @@ -146,7 +146,6 @@ RDEPEND="${COMMON_DEPEND} # tools/make_requests requires perl DEPEND="${COMMON_DEPEND} - dev-util/patchbin sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig @@ -166,6 +165,23 @@ 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 @@ -327,17 +343,7 @@ src_prepare() { } 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" - "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676 - "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376 - ) - local PATCHES_BIN=( - "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376 - ) + if use d3d9; then PATCHES+=( "${D3D9_DIR}/d3d9-helper.patch" ) PATCHES+=( "${D3D9_DIR}/wine-d3d9.patch" ) diff --git a/app-emulation/wine-d3d9/wine-d3d9-2.7-r1.ebuild b/app-emulation/wine-d3d9/wine-d3d9-2.7-r1.ebuild index 6dcd268b951a..6f8a34c54fa0 100644 --- a/app-emulation/wine-d3d9/wine-d3d9-2.7-r1.ebuild +++ b/app-emulation/wine-d3d9/wine-d3d9-2.7-r1.ebuild @@ -146,7 +146,6 @@ RDEPEND="${COMMON_DEPEND} # tools/make_requests requires perl DEPEND="${COMMON_DEPEND} - dev-util/patchbin sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig @@ -166,6 +165,23 @@ 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 @@ -327,17 +343,7 @@ src_prepare() { } 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" - "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676 - "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376 - ) - local PATCHES_BIN=( - "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376 - ) + if use d3d9; then PATCHES+=( "${D3D9_DIR}/d3d9-helper.patch" ) PATCHES+=( "${D3D9_DIR}/wine-d3d9.patch" ) diff --git a/app-emulation/wine-d3d9/wine-d3d9-2.8-r1.ebuild b/app-emulation/wine-d3d9/wine-d3d9-2.8-r1.ebuild index 6dcd268b951a..6f8a34c54fa0 100644 --- a/app-emulation/wine-d3d9/wine-d3d9-2.8-r1.ebuild +++ b/app-emulation/wine-d3d9/wine-d3d9-2.8-r1.ebuild @@ -146,7 +146,6 @@ RDEPEND="${COMMON_DEPEND} # tools/make_requests requires perl DEPEND="${COMMON_DEPEND} - dev-util/patchbin sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig @@ -166,6 +165,23 @@ 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 @@ -327,17 +343,7 @@ src_prepare() { } 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" - "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676 - "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376 - ) - local PATCHES_BIN=( - "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376 - ) + if use d3d9; then PATCHES+=( "${D3D9_DIR}/d3d9-helper.patch" ) PATCHES+=( "${D3D9_DIR}/wine-d3d9.patch" ) diff --git a/app-emulation/wine-d3d9/wine-d3d9-2.9-r1.ebuild b/app-emulation/wine-d3d9/wine-d3d9-2.9-r1.ebuild index 2b18410a845f..71db470f65e4 100644 --- a/app-emulation/wine-d3d9/wine-d3d9-2.9-r1.ebuild +++ b/app-emulation/wine-d3d9/wine-d3d9-2.9-r1.ebuild @@ -147,7 +147,6 @@ RDEPEND="${COMMON_DEPEND} # tools/make_requests requires perl DEPEND="${COMMON_DEPEND} - dev-util/patchbin sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig @@ -167,6 +166,23 @@ 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 @@ -328,17 +344,7 @@ src_prepare() { } 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" - "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676 - "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376 - ) - local PATCHES_BIN=( - "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376 - ) + if use d3d9; then PATCHES+=( "${D3D9_DIR}/d3d9-helper.patch" ) PATCHES+=( "${D3D9_DIR}/wine-d3d9.patch" ) diff --git a/app-emulation/wine-d3d9/wine-d3d9-9999.ebuild b/app-emulation/wine-d3d9/wine-d3d9-9999.ebuild index e4c7ac02109a..ec6c3d60b3cf 100644 --- a/app-emulation/wine-d3d9/wine-d3d9-9999.ebuild +++ b/app-emulation/wine-d3d9/wine-d3d9-9999.ebuild @@ -147,7 +147,6 @@ RDEPEND="${COMMON_DEPEND} # tools/make_requests requires perl DEPEND="${COMMON_DEPEND} - dev-util/patchbin sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig @@ -167,6 +166,19 @@ 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 @@ -328,14 +340,7 @@ src_prepare() { } 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=( - ) + if use d3d9; then PATCHES+=( "${D3D9_DIR}/d3d9-helper.patch" ) PATCHES+=( "${D3D9_DIR}/wine-d3d9.patch" ) diff --git a/app-emulation/wine-staging/Manifest b/app-emulation/wine-staging/Manifest index 7a37ba32e64d..0b53e2edc855 100644 --- a/app-emulation/wine-staging/Manifest +++ b/app-emulation/wine-staging/Manifest @@ -10,6 +10,7 @@ DIST wine-2.15.tar.xz 19463720 SHA256 d82d500cbf81fb08c711d3619bd52373138a05574d 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.3.tar.xz 18931732 SHA256 afc95c7a87cc8f0730b462c50a5dfc9c462eb02c6bf5874b4fa99946f49e067e SHA512 bea78e8468555ff9e08dedf3918da5ea82721549c43984869989bbdafeea00e454820ff9558aa29925c97a165a9b01e5cd1fd397f133833c58824984a6686171 WHIRLPOOL 1f5ec8e5c32d124277e4c71d95726d3a5337575757c3029567c77165d65fcfec2ddf33d3863b4bf55c9eff7c3582c1ec7dbd76d84ed8bbbe89dd16db6b0128c1 DIST wine-2.4.tar.xz 18953748 SHA256 87b5df07e4781fecce2f92415a4717208ea253a20a0df8b36b9f90b69b72748e SHA512 15ae7e97dc72a8636b2c15c93803ed430fa456d673add61457cf3e479e769559c682b40949b5d38828f6681f13183e560fcb4a2eb0f0ba25e6eade46f7d3d7c0 WHIRLPOOL 558ab7b7517ad5e03366b4db974047eba776585e958a5b71bb2e93993e21bc725ea7a8bcf2a4354f34ca38c94ba99ccd15f2f8b5e4b58066bf339d3517eec56c @@ -29,6 +30,7 @@ DIST wine-staging-2.15.tar.gz 10190900 SHA256 f2b5c43fbc185a6fd6399f4c351b83a172 DIST wine-staging-2.16.tar.gz 10220855 SHA256 da0ef4b0eafe9cd1b9cf26a5b950088adf1308e17a0d6f4ae62516b6ee64248e SHA512 96585caf77569a31f516aefe230a8907ef91db29759f75075593b751985f294bf292a1c146d287a3f0859a6b6273560670c4bc734ef0fbecb0809574eb3f09ba WHIRLPOOL 66128c8d59593243e95d6765b9fd8ace59e85e365a5e8a41eeb17d370464005aef060ddf3d862d0a3638048fd92189860e69a3cbf7d24d3ce1e420200d4b3cf5 DIST wine-staging-2.17.tar.gz 10211107 SHA256 f511bf3438dc418b4f667513bf1ae419255e4ee62229e9205c0c64b047222183 SHA512 b652f6a852a1382c1b8275e172b7ac7608749c34aef5c0c5387cf262bf0da8db67a77ce397d49e53f3e2a8f210a3dbea1a9b3f3feb15c7d5bad8952b6fb7b53c WHIRLPOOL c45dc5fc91bc774f9f28bb06dff959391829fafac398bef198755395afe5a65bb2d32ba3ce157607a6040481955926866ed8f0760850bfca821be8599f4d7b64 DIST wine-staging-2.18.tar.gz 10243957 SHA256 69c75d3ca17b1c3617cd0934a9e9ad6fca37c6679900d2cb63f6981aa1026cc8 SHA512 fe18b53d4160596d134ceed392f6459e9c183381f4712add43d8422e77d7d5d89ff34a3bb3afbd7740f250d85dfda0f3501e9600a41270790ae02138ed6d7dc7 WHIRLPOOL 2dc1429a7a4f13ee01b1317f1937ef7ec6b42c3cfdd78ff78bb8273e1056751edb2ac119904ba48ab645b430f269a9361a6d42bcbb5dfb46bd15a129569d3194 +DIST wine-staging-2.19.tar.gz 10241240 SHA256 2fdb083a484708362433000f92b54a5d648df190b2ab084647c45f5624063bd2 SHA512 90916cb096bbfec35514eff4c1b6e2090b6e68e3e7af1164715f5abb1d255c5cfd6411f53c27cb277adcf0982fa6d6e508a7cdbc1404dcca6c2700b05c2c5483 WHIRLPOOL 3ed1a5d39d0ec186538e04ca09e4fa2729f356385523177b753e7c7183416f666f336bec7d4b606f29266cd227cf5e72f707c79adf510bc3899adb76ce3df84f DIST wine-staging-2.2.tar.gz 10078327 SHA256 9d3cbf7e5f12c623d275457b910a158e0b176fcf50c09a5f8425864de604bc1d SHA512 8ad3f8ba4c6439a9ec4884a55018a67c9e2c2384830074646aac7b70cb9f4f5a20f760247ab42dc3d2f697cdac7ea5322be8ed12c435cb0bc185ac08fdd4dd91 WHIRLPOOL a34c19aaace64307de56d935cb0cef17d7c066c39b83c51e70ea76a20083f928bea55fe38d62b7a8250b0a9e8f00e0d2b744f43fcab433069ffb96625d955303 DIST wine-staging-2.3.tar.gz 10071742 SHA256 9a81be606836fab6203857f7937ff97575947f75d52c80fb5489418efb8b87e1 SHA512 8e8af1e36cc69c63ec3542f0ec4db18b6d8c16b5c9077eb211297f3a886519da71bcf72934bf8d6d72e44c7c9f765e1d00203d0d75cab8544f69f9b0c10a7133 WHIRLPOOL 50738a6e20890748d7eb01152244d34b259759f61b3587ba39815dc066fc8e2b66ce182e1ddbc912f50076a3599aa060ec6a94eeaab4513ce3a776711929b9b1 DIST wine-staging-2.4.tar.gz 10067020 SHA256 709cab12c0ebf7cf9504fd4a67eb851272309e00066ad81f184b0f55c63e9deb SHA512 55d11851697836b582ba54696cadc812ef6b14872440f5c3ed6fbe30a05abcb8abe2ab31a11ea4daeb354854c7c0e6549401d4b26b26621808bdeb89aeb206f9 WHIRLPOOL 8d344b7e6e89322c8dbbe6fd211851c90a45a33b514c182609cc60dc21939f791abc71d8665cd66e5c5161f159fe24c4772b99405833e3d11985a644e1335eaf @@ -37,24 +39,25 @@ DIST wine-staging-2.6.tar.gz 10034709 SHA256 ff86ddcceb7f6857bd415db3842ddf216a5 DIST wine-staging-2.7.tar.gz 10018082 SHA256 3095f9c634f00b143c2407dce8c3f29c629ec95074cf14c8e8dc2e0cdba45b6d SHA512 0abc89af701ae1b95c0eb08e72894c7bc40bdfe792e05b8af9282eab8407bb90b7dfcd4eb3a193a88759ce5d6ea6c2aa9696cac2d744f543c92529bb0d2636ee WHIRLPOOL 6cc666f702ef1bd574ede54a7f6755e07d768c9fa549b9bdb9b5416288619347e0c1b9c70893b6300800d8e6c94e8d2396937f639d1e821945ba9fe144b32c95 DIST wine-staging-2.8.tar.gz 10043842 SHA256 8680614be6c3b01c7c577eb6924fc05cc3de92394384939dd5b2e12e08235fff SHA512 af1707fe3119664a0d97d94fc4c955612d80cb76eae8c4248a268c0f6be9e659fccf7c26899c9e9ae5822f74474c0db5283b598dd4d9d69a3b108f947653217a WHIRLPOOL 7e9aa61a7666404475abb442304e63c76c2e6df26479711b7c08ebe7c15b9b53017e7a1d2dca4f9f8aeba78290df03f06076c99ac06c30d5ed893cfc3842107a DIST wine-staging-2.9.tar.gz 10062408 SHA256 cde0895142c0ca0be5b532560ec0546d6e4f655615572d80cfcce663f92c57f6 SHA512 7862a403817791c54c5c1b8f233b06a850500305c46283bccb9026fb6db041a8fba619d145ab21fe2fdc5f25ed3bbb75fde05245fbbbd67139a5f64b547b1196 WHIRLPOOL 52c0b9065cfa54f6b86b74f9a98c9d232e3a88aa9d61d06c6e01044122fab8b01a567e99f93014042031e9eb991fd9234c4a02ebe3d2aa8c042e5e769269095c -EBUILD wine-staging-2.0-r1.ebuild 19983 SHA256 c9d8a2e794b3c0640c1ba5c7586af532a20bd988456c848eda9af862b54b30e5 SHA512 86966519d6944d7bc32cc7984cacf0c0a885c9dcde629e8ccef76a31a1dc13acfa25fb8cf2f7c6253c1f222f3f4506040f4b8ecaf6ea46a07b12c9afb45170a7 WHIRLPOOL 0ce90e8d5136ba399a5fe72a1c55659621ecc848838c643d17028eede77dbeeb4c73aea3308108fb8a866135619d638d5d09fb76353c197e1223e078bbc749e3 -EBUILD wine-staging-2.1-r1.ebuild 19982 SHA256 e33c8f8e5d60b7addb4d4a4be6ab72594953f6cd912432f484128a603fd1ab11 SHA512 a52d95f7bb9515a061c079f3c1be7f867574be9399c99b7d48312bb718a01c050cd79dc5c1baf3a7ab99aedd63d6c23c19cc698d245687cdda27685ddf84ef0a WHIRLPOOL a138efdf7731e635feefb0d70e99475255dff2642dcff847907c2fc0421af0025c3c81f8aba8ef415b81250bbc37ee4b5eb0259845919150f097f43a9caaf20c -EBUILD wine-staging-2.10-r1.ebuild 19982 SHA256 17f8bce5e24aa140bbab385666fcddc562a585d12abdfce16ecc5065a0d57b6e SHA512 5d1fd68c6873b4e30a596be0509977e11513426bc4c3f942e1544fb628a43cefb52348bafb9573952a7989371581ee104acb67ecf99306d91ff8d55d81614e9c WHIRLPOOL 32f7760267d2aae8f7663de860d272ac9c1749170092168fb526358acc1b111d956ab31099e1b0b4a9dad81a93f571ec0b3bf09627b04c3942afd6969366b6e1 -EBUILD wine-staging-2.11-r1.ebuild 19982 SHA256 17f8bce5e24aa140bbab385666fcddc562a585d12abdfce16ecc5065a0d57b6e SHA512 5d1fd68c6873b4e30a596be0509977e11513426bc4c3f942e1544fb628a43cefb52348bafb9573952a7989371581ee104acb67ecf99306d91ff8d55d81614e9c WHIRLPOOL 32f7760267d2aae8f7663de860d272ac9c1749170092168fb526358acc1b111d956ab31099e1b0b4a9dad81a93f571ec0b3bf09627b04c3942afd6969366b6e1 -EBUILD wine-staging-2.12-r1.ebuild 19982 SHA256 17f8bce5e24aa140bbab385666fcddc562a585d12abdfce16ecc5065a0d57b6e SHA512 5d1fd68c6873b4e30a596be0509977e11513426bc4c3f942e1544fb628a43cefb52348bafb9573952a7989371581ee104acb67ecf99306d91ff8d55d81614e9c WHIRLPOOL 32f7760267d2aae8f7663de860d272ac9c1749170092168fb526358acc1b111d956ab31099e1b0b4a9dad81a93f571ec0b3bf09627b04c3942afd6969366b6e1 -EBUILD wine-staging-2.13-r1.ebuild 19982 SHA256 17f8bce5e24aa140bbab385666fcddc562a585d12abdfce16ecc5065a0d57b6e SHA512 5d1fd68c6873b4e30a596be0509977e11513426bc4c3f942e1544fb628a43cefb52348bafb9573952a7989371581ee104acb67ecf99306d91ff8d55d81614e9c WHIRLPOOL 32f7760267d2aae8f7663de860d272ac9c1749170092168fb526358acc1b111d956ab31099e1b0b4a9dad81a93f571ec0b3bf09627b04c3942afd6969366b6e1 -EBUILD wine-staging-2.14-r1.ebuild 19982 SHA256 7866a109eab8da015f1f3d44c67a61d145815b89143fee4dfce041dbc899d335 SHA512 940cb4906a24edadf552d1f3bbdecd79881374a5740ed7c082aa23c04e1519420a7f3375e285d56beb3cbab6bbaf6450240d096d305b1416856b17c3970ce638 WHIRLPOOL 44a5e60f344eaac880a37624dd9201086b8df1452cfac88431b6c8a595501a6dd326fa7a7016229570c1d2657f9adb4074acb4053cc466e24f969d262670615c -EBUILD wine-staging-2.15-r1.ebuild 19982 SHA256 7866a109eab8da015f1f3d44c67a61d145815b89143fee4dfce041dbc899d335 SHA512 940cb4906a24edadf552d1f3bbdecd79881374a5740ed7c082aa23c04e1519420a7f3375e285d56beb3cbab6bbaf6450240d096d305b1416856b17c3970ce638 WHIRLPOOL 44a5e60f344eaac880a37624dd9201086b8df1452cfac88431b6c8a595501a6dd326fa7a7016229570c1d2657f9adb4074acb4053cc466e24f969d262670615c -EBUILD wine-staging-2.16-r1.ebuild 19982 SHA256 7866a109eab8da015f1f3d44c67a61d145815b89143fee4dfce041dbc899d335 SHA512 940cb4906a24edadf552d1f3bbdecd79881374a5740ed7c082aa23c04e1519420a7f3375e285d56beb3cbab6bbaf6450240d096d305b1416856b17c3970ce638 WHIRLPOOL 44a5e60f344eaac880a37624dd9201086b8df1452cfac88431b6c8a595501a6dd326fa7a7016229570c1d2657f9adb4074acb4053cc466e24f969d262670615c -EBUILD wine-staging-2.17-r1.ebuild 19982 SHA256 7866a109eab8da015f1f3d44c67a61d145815b89143fee4dfce041dbc899d335 SHA512 940cb4906a24edadf552d1f3bbdecd79881374a5740ed7c082aa23c04e1519420a7f3375e285d56beb3cbab6bbaf6450240d096d305b1416856b17c3970ce638 WHIRLPOOL 44a5e60f344eaac880a37624dd9201086b8df1452cfac88431b6c8a595501a6dd326fa7a7016229570c1d2657f9adb4074acb4053cc466e24f969d262670615c -EBUILD wine-staging-2.18.ebuild 19790 SHA256 cda795f03527229a2f2be75c85f785f250c97c9ecfe82ef86b83d14401313db0 SHA512 86e3bf6fba538cf5f36f25cf892dc449fd24963256099e2a1cb2f4f8b61de1bc15c823ddd07686fc718c98b57d8baa3b0342bd1a33eee9dfbfdf7951f7fce5ae WHIRLPOOL 0d773a4b627819e99ce22ea66f36acbb554f52b3c005c852853b418eecdb754f8f4fa28e67738cc62f7c7395da504bf6a8507822a0bc32a7c3240373e6673eb9 -EBUILD wine-staging-2.2-r1.ebuild 19982 SHA256 e33c8f8e5d60b7addb4d4a4be6ab72594953f6cd912432f484128a603fd1ab11 SHA512 a52d95f7bb9515a061c079f3c1be7f867574be9399c99b7d48312bb718a01c050cd79dc5c1baf3a7ab99aedd63d6c23c19cc698d245687cdda27685ddf84ef0a WHIRLPOOL a138efdf7731e635feefb0d70e99475255dff2642dcff847907c2fc0421af0025c3c81f8aba8ef415b81250bbc37ee4b5eb0259845919150f097f43a9caaf20c -EBUILD wine-staging-2.3-r1.ebuild 19982 SHA256 e33c8f8e5d60b7addb4d4a4be6ab72594953f6cd912432f484128a603fd1ab11 SHA512 a52d95f7bb9515a061c079f3c1be7f867574be9399c99b7d48312bb718a01c050cd79dc5c1baf3a7ab99aedd63d6c23c19cc698d245687cdda27685ddf84ef0a WHIRLPOOL a138efdf7731e635feefb0d70e99475255dff2642dcff847907c2fc0421af0025c3c81f8aba8ef415b81250bbc37ee4b5eb0259845919150f097f43a9caaf20c -EBUILD wine-staging-2.4-r1.ebuild 19982 SHA256 17f8bce5e24aa140bbab385666fcddc562a585d12abdfce16ecc5065a0d57b6e SHA512 5d1fd68c6873b4e30a596be0509977e11513426bc4c3f942e1544fb628a43cefb52348bafb9573952a7989371581ee104acb67ecf99306d91ff8d55d81614e9c WHIRLPOOL 32f7760267d2aae8f7663de860d272ac9c1749170092168fb526358acc1b111d956ab31099e1b0b4a9dad81a93f571ec0b3bf09627b04c3942afd6969366b6e1 -EBUILD wine-staging-2.5-r1.ebuild 19982 SHA256 17f8bce5e24aa140bbab385666fcddc562a585d12abdfce16ecc5065a0d57b6e SHA512 5d1fd68c6873b4e30a596be0509977e11513426bc4c3f942e1544fb628a43cefb52348bafb9573952a7989371581ee104acb67ecf99306d91ff8d55d81614e9c WHIRLPOOL 32f7760267d2aae8f7663de860d272ac9c1749170092168fb526358acc1b111d956ab31099e1b0b4a9dad81a93f571ec0b3bf09627b04c3942afd6969366b6e1 -EBUILD wine-staging-2.6-r1.ebuild 19982 SHA256 17f8bce5e24aa140bbab385666fcddc562a585d12abdfce16ecc5065a0d57b6e SHA512 5d1fd68c6873b4e30a596be0509977e11513426bc4c3f942e1544fb628a43cefb52348bafb9573952a7989371581ee104acb67ecf99306d91ff8d55d81614e9c WHIRLPOOL 32f7760267d2aae8f7663de860d272ac9c1749170092168fb526358acc1b111d956ab31099e1b0b4a9dad81a93f571ec0b3bf09627b04c3942afd6969366b6e1 -EBUILD wine-staging-2.7-r1.ebuild 19982 SHA256 17f8bce5e24aa140bbab385666fcddc562a585d12abdfce16ecc5065a0d57b6e SHA512 5d1fd68c6873b4e30a596be0509977e11513426bc4c3f942e1544fb628a43cefb52348bafb9573952a7989371581ee104acb67ecf99306d91ff8d55d81614e9c WHIRLPOOL 32f7760267d2aae8f7663de860d272ac9c1749170092168fb526358acc1b111d956ab31099e1b0b4a9dad81a93f571ec0b3bf09627b04c3942afd6969366b6e1 -EBUILD wine-staging-2.8-r1.ebuild 19982 SHA256 17f8bce5e24aa140bbab385666fcddc562a585d12abdfce16ecc5065a0d57b6e SHA512 5d1fd68c6873b4e30a596be0509977e11513426bc4c3f942e1544fb628a43cefb52348bafb9573952a7989371581ee104acb67ecf99306d91ff8d55d81614e9c WHIRLPOOL 32f7760267d2aae8f7663de860d272ac9c1749170092168fb526358acc1b111d956ab31099e1b0b4a9dad81a93f571ec0b3bf09627b04c3942afd6969366b6e1 -EBUILD wine-staging-2.9-r1.ebuild 19982 SHA256 17f8bce5e24aa140bbab385666fcddc562a585d12abdfce16ecc5065a0d57b6e SHA512 5d1fd68c6873b4e30a596be0509977e11513426bc4c3f942e1544fb628a43cefb52348bafb9573952a7989371581ee104acb67ecf99306d91ff8d55d81614e9c WHIRLPOOL 32f7760267d2aae8f7663de860d272ac9c1749170092168fb526358acc1b111d956ab31099e1b0b4a9dad81a93f571ec0b3bf09627b04c3942afd6969366b6e1 -EBUILD wine-staging-9999.ebuild 19790 SHA256 cda795f03527229a2f2be75c85f785f250c97c9ecfe82ef86b83d14401313db0 SHA512 86e3bf6fba538cf5f36f25cf892dc449fd24963256099e2a1cb2f4f8b61de1bc15c823ddd07686fc718c98b57d8baa3b0342bd1a33eee9dfbfdf7951f7fce5ae WHIRLPOOL 0d773a4b627819e99ce22ea66f36acbb554f52b3c005c852853b418eecdb754f8f4fa28e67738cc62f7c7395da504bf6a8507822a0bc32a7c3240373e6673eb9 +EBUILD wine-staging-2.0-r1.ebuild 20089 SHA256 069f85b408ae7121e82714dfa6a0d50e0d78ed12bfcdbddde7c8e5f49cb21857 SHA512 9339464de99f783e23bf3ac0e7af811cad51f3d30e5060abd60244b0f859645910fa76b1ef29f0129c87f57dd0a5ad54ba067b3a8ab91501309a4e7a7fd6f790 WHIRLPOOL 88f2d030f8bd8f3170509955da37cd23ed16a2e575c7618e97fd3e5bce670e1bb798d4a6f6c5587d56949f7035675cc9e4665a8541cc916ec9c2479bcd13cc9c +EBUILD wine-staging-2.1-r1.ebuild 20088 SHA256 a6c8dae23ed0754b5217497bacd522067c98db77047769e5e126165726f54a63 SHA512 b7bf86d5a1b9a3b311d1336da744a6106569d0a56d6d0b5d1b167f3878e5c713956b1ffa3737462239bb563b511875f3577181e0b82f60b904daa3152b2f8823 WHIRLPOOL d303a38c7407bc11ebc017519fd750d52516035ad3611a83294b2e2a2df57551f8f213c475fe2f8c73b6729884c538651140b3175ca9a0e9aa18749f8f36c460 +EBUILD wine-staging-2.10-r1.ebuild 20152 SHA256 d664c61ac1b740442b0649fe9c412b116040b62890cfccd6f7e004dddc08cd25 SHA512 8c7ee8121a9738c6b1ccf2a17c765cb117ef767659182e0d746f87eef59d1a40618d24f6bd94619079267635303bd124ccab68857410260eebdd9eeca605a06b WHIRLPOOL dcea236785aed4e816177d0638cb97dd703f11a8a57924250a651499b5aca8f3397ce5207e9325e835eab622d5d2c1858af3ecbdf4944d1c6c8211e9e6074a0a +EBUILD wine-staging-2.11-r1.ebuild 20152 SHA256 d664c61ac1b740442b0649fe9c412b116040b62890cfccd6f7e004dddc08cd25 SHA512 8c7ee8121a9738c6b1ccf2a17c765cb117ef767659182e0d746f87eef59d1a40618d24f6bd94619079267635303bd124ccab68857410260eebdd9eeca605a06b WHIRLPOOL dcea236785aed4e816177d0638cb97dd703f11a8a57924250a651499b5aca8f3397ce5207e9325e835eab622d5d2c1858af3ecbdf4944d1c6c8211e9e6074a0a +EBUILD wine-staging-2.12-r1.ebuild 20152 SHA256 d664c61ac1b740442b0649fe9c412b116040b62890cfccd6f7e004dddc08cd25 SHA512 8c7ee8121a9738c6b1ccf2a17c765cb117ef767659182e0d746f87eef59d1a40618d24f6bd94619079267635303bd124ccab68857410260eebdd9eeca605a06b WHIRLPOOL dcea236785aed4e816177d0638cb97dd703f11a8a57924250a651499b5aca8f3397ce5207e9325e835eab622d5d2c1858af3ecbdf4944d1c6c8211e9e6074a0a +EBUILD wine-staging-2.13-r1.ebuild 20152 SHA256 d664c61ac1b740442b0649fe9c412b116040b62890cfccd6f7e004dddc08cd25 SHA512 8c7ee8121a9738c6b1ccf2a17c765cb117ef767659182e0d746f87eef59d1a40618d24f6bd94619079267635303bd124ccab68857410260eebdd9eeca605a06b WHIRLPOOL dcea236785aed4e816177d0638cb97dd703f11a8a57924250a651499b5aca8f3397ce5207e9325e835eab622d5d2c1858af3ecbdf4944d1c6c8211e9e6074a0a +EBUILD wine-staging-2.14-r1.ebuild 20152 SHA256 338eb55f59bd3c81041f31724f87b65aa1648a4c9f66b9668ad131db6ea36657 SHA512 39d12656be030af0218a3944bbf6754149cbd9dcb95545b7738ed7c467ae129eba0e0735e2516f3fa668efee423b160a961e028ee087ecd9ec8bf6292a80a6b4 WHIRLPOOL 70e74db0e7def46ce8c171256d6de7c6b0b771138557032afc715f02f0c2dc55fc9970e3a41fcd3da1fa11a2a2f4385bad866729c820bc4599ebac189c4c0910 +EBUILD wine-staging-2.15-r1.ebuild 20152 SHA256 338eb55f59bd3c81041f31724f87b65aa1648a4c9f66b9668ad131db6ea36657 SHA512 39d12656be030af0218a3944bbf6754149cbd9dcb95545b7738ed7c467ae129eba0e0735e2516f3fa668efee423b160a961e028ee087ecd9ec8bf6292a80a6b4 WHIRLPOOL 70e74db0e7def46ce8c171256d6de7c6b0b771138557032afc715f02f0c2dc55fc9970e3a41fcd3da1fa11a2a2f4385bad866729c820bc4599ebac189c4c0910 +EBUILD wine-staging-2.16-r1.ebuild 20152 SHA256 338eb55f59bd3c81041f31724f87b65aa1648a4c9f66b9668ad131db6ea36657 SHA512 39d12656be030af0218a3944bbf6754149cbd9dcb95545b7738ed7c467ae129eba0e0735e2516f3fa668efee423b160a961e028ee087ecd9ec8bf6292a80a6b4 WHIRLPOOL 70e74db0e7def46ce8c171256d6de7c6b0b771138557032afc715f02f0c2dc55fc9970e3a41fcd3da1fa11a2a2f4385bad866729c820bc4599ebac189c4c0910 +EBUILD wine-staging-2.17-r1.ebuild 20152 SHA256 338eb55f59bd3c81041f31724f87b65aa1648a4c9f66b9668ad131db6ea36657 SHA512 39d12656be030af0218a3944bbf6754149cbd9dcb95545b7738ed7c467ae129eba0e0735e2516f3fa668efee423b160a961e028ee087ecd9ec8bf6292a80a6b4 WHIRLPOOL 70e74db0e7def46ce8c171256d6de7c6b0b771138557032afc715f02f0c2dc55fc9970e3a41fcd3da1fa11a2a2f4385bad866729c820bc4599ebac189c4c0910 +EBUILD wine-staging-2.18.ebuild 19962 SHA256 c0d7627ff8b93f348fceae4688a7196a011c2e0062d2ed38994705df8495b0b7 SHA512 7cbaa98a77a0cb848585e57389de6a15f3fc7629b0b8b8e4591ed6f7b9279202e2bbe00fcd9f1c257b5d722cbfd169abb0ca52d5066c49fff4e99aaee180ab84 WHIRLPOOL ee8ee4774787038210a3059f6eb241103705c9c2848344455e42975eb7022707f0a756fdb38e259dea15eaa46746555e883f1892801e634330507c885d959143 +EBUILD wine-staging-2.19.ebuild 19962 SHA256 c0d7627ff8b93f348fceae4688a7196a011c2e0062d2ed38994705df8495b0b7 SHA512 7cbaa98a77a0cb848585e57389de6a15f3fc7629b0b8b8e4591ed6f7b9279202e2bbe00fcd9f1c257b5d722cbfd169abb0ca52d5066c49fff4e99aaee180ab84 WHIRLPOOL ee8ee4774787038210a3059f6eb241103705c9c2848344455e42975eb7022707f0a756fdb38e259dea15eaa46746555e883f1892801e634330507c885d959143 +EBUILD wine-staging-2.2-r1.ebuild 20088 SHA256 a6c8dae23ed0754b5217497bacd522067c98db77047769e5e126165726f54a63 SHA512 b7bf86d5a1b9a3b311d1336da744a6106569d0a56d6d0b5d1b167f3878e5c713956b1ffa3737462239bb563b511875f3577181e0b82f60b904daa3152b2f8823 WHIRLPOOL d303a38c7407bc11ebc017519fd750d52516035ad3611a83294b2e2a2df57551f8f213c475fe2f8c73b6729884c538651140b3175ca9a0e9aa18749f8f36c460 +EBUILD wine-staging-2.3-r1.ebuild 20088 SHA256 a6c8dae23ed0754b5217497bacd522067c98db77047769e5e126165726f54a63 SHA512 b7bf86d5a1b9a3b311d1336da744a6106569d0a56d6d0b5d1b167f3878e5c713956b1ffa3737462239bb563b511875f3577181e0b82f60b904daa3152b2f8823 WHIRLPOOL d303a38c7407bc11ebc017519fd750d52516035ad3611a83294b2e2a2df57551f8f213c475fe2f8c73b6729884c538651140b3175ca9a0e9aa18749f8f36c460 +EBUILD wine-staging-2.4-r1.ebuild 20088 SHA256 98ec66f0b6ca03a0baaaa39cdaf20b9757fb595ce448e5c5648f7cc253aa4400 SHA512 dadb02b3a648a09a04a2bc46c226ed2e57a61727fd9df891f7137308625330670dbf7c20cbb85f099eede40c8579e653af13de06f453b129c94a638e8651877a WHIRLPOOL 5df6a2e9d9aa5f66bd30a0e54342ecf593076568b6045b39d8ac404ad02926adbd6d4e5f03752b9bff8438a52db16904b8342adff1001f49d1d024dd07a339ae +EBUILD wine-staging-2.5-r1.ebuild 20088 SHA256 98ec66f0b6ca03a0baaaa39cdaf20b9757fb595ce448e5c5648f7cc253aa4400 SHA512 dadb02b3a648a09a04a2bc46c226ed2e57a61727fd9df891f7137308625330670dbf7c20cbb85f099eede40c8579e653af13de06f453b129c94a638e8651877a WHIRLPOOL 5df6a2e9d9aa5f66bd30a0e54342ecf593076568b6045b39d8ac404ad02926adbd6d4e5f03752b9bff8438a52db16904b8342adff1001f49d1d024dd07a339ae +EBUILD wine-staging-2.6-r1.ebuild 20088 SHA256 98ec66f0b6ca03a0baaaa39cdaf20b9757fb595ce448e5c5648f7cc253aa4400 SHA512 dadb02b3a648a09a04a2bc46c226ed2e57a61727fd9df891f7137308625330670dbf7c20cbb85f099eede40c8579e653af13de06f453b129c94a638e8651877a WHIRLPOOL 5df6a2e9d9aa5f66bd30a0e54342ecf593076568b6045b39d8ac404ad02926adbd6d4e5f03752b9bff8438a52db16904b8342adff1001f49d1d024dd07a339ae +EBUILD wine-staging-2.7-r1.ebuild 20088 SHA256 98ec66f0b6ca03a0baaaa39cdaf20b9757fb595ce448e5c5648f7cc253aa4400 SHA512 dadb02b3a648a09a04a2bc46c226ed2e57a61727fd9df891f7137308625330670dbf7c20cbb85f099eede40c8579e653af13de06f453b129c94a638e8651877a WHIRLPOOL 5df6a2e9d9aa5f66bd30a0e54342ecf593076568b6045b39d8ac404ad02926adbd6d4e5f03752b9bff8438a52db16904b8342adff1001f49d1d024dd07a339ae +EBUILD wine-staging-2.8-r1.ebuild 20088 SHA256 98ec66f0b6ca03a0baaaa39cdaf20b9757fb595ce448e5c5648f7cc253aa4400 SHA512 dadb02b3a648a09a04a2bc46c226ed2e57a61727fd9df891f7137308625330670dbf7c20cbb85f099eede40c8579e653af13de06f453b129c94a638e8651877a WHIRLPOOL 5df6a2e9d9aa5f66bd30a0e54342ecf593076568b6045b39d8ac404ad02926adbd6d4e5f03752b9bff8438a52db16904b8342adff1001f49d1d024dd07a339ae +EBUILD wine-staging-2.9-r1.ebuild 20152 SHA256 d664c61ac1b740442b0649fe9c412b116040b62890cfccd6f7e004dddc08cd25 SHA512 8c7ee8121a9738c6b1ccf2a17c765cb117ef767659182e0d746f87eef59d1a40618d24f6bd94619079267635303bd124ccab68857410260eebdd9eeca605a06b WHIRLPOOL dcea236785aed4e816177d0638cb97dd703f11a8a57924250a651499b5aca8f3397ce5207e9325e835eab622d5d2c1858af3ecbdf4944d1c6c8211e9e6074a0a +EBUILD wine-staging-9999.ebuild 19962 SHA256 c0d7627ff8b93f348fceae4688a7196a011c2e0062d2ed38994705df8495b0b7 SHA512 7cbaa98a77a0cb848585e57389de6a15f3fc7629b0b8b8e4591ed6f7b9279202e2bbe00fcd9f1c257b5d722cbfd169abb0ca52d5066c49fff4e99aaee180ab84 WHIRLPOOL ee8ee4774787038210a3059f6eb241103705c9c2848344455e42975eb7022707f0a756fdb38e259dea15eaa46746555e883f1892801e634330507c885d959143 MISC metadata.xml 3027 SHA256 1af7a4f4f402a4e1b807a9c5380701a87161a523afd4ba28012b868227edac0a SHA512 d1c58d449c2b9ab201da4338718b724cfb7d282b22b506375a7d9531d64d601414f2ac734e5cc2cb812cc4904351cacac731456596818201cd9361bbb1393d20 WHIRLPOOL f3bd4a2f90f3fe63add81b143aa6a0002199ae7cb0e8002de195ea07141148d9b4a65ffaf26c2ad4a79a3da6f6c75236043acd4e8e8371d6754591035a028035 diff --git a/app-emulation/wine-staging/wine-staging-2.0-r1.ebuild b/app-emulation/wine-staging/wine-staging-2.0-r1.ebuild index 0c4b6b962ecf..1aeafd492e5a 100644 --- a/app-emulation/wine-staging/wine-staging-2.0-r1.ebuild +++ b/app-emulation/wine-staging/wine-staging-2.0-r1.ebuild @@ -152,7 +152,6 @@ RDEPEND="${COMMON_DEPEND} # tools/make_requests requires perl DEPEND="${COMMON_DEPEND} - dev-util/patchbin sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig @@ -176,6 +175,23 @@ 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 @@ -347,17 +363,7 @@ src_prepare() { } 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" - "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676 - "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376 - ) - local PATCHES_BIN=( - "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376 - ) + if use staging; then ewarn "Applying the Wine-Staging patchset. Any bug reports to the" ewarn "Wine bugzilla should explicitly state that staging was used." diff --git a/app-emulation/wine-staging/wine-staging-2.1-r1.ebuild b/app-emulation/wine-staging/wine-staging-2.1-r1.ebuild index 04fe221e5109..1177c5533ac8 100644 --- a/app-emulation/wine-staging/wine-staging-2.1-r1.ebuild +++ b/app-emulation/wine-staging/wine-staging-2.1-r1.ebuild @@ -152,7 +152,6 @@ RDEPEND="${COMMON_DEPEND} # tools/make_requests requires perl DEPEND="${COMMON_DEPEND} - dev-util/patchbin sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig @@ -176,6 +175,23 @@ 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 @@ -347,17 +363,7 @@ src_prepare() { } 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" - "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676 - "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376 - ) - local PATCHES_BIN=( - "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376 - ) + if use staging; then ewarn "Applying the Wine-Staging patchset. Any bug reports to the" ewarn "Wine bugzilla should explicitly state that staging was used." diff --git a/app-emulation/wine-staging/wine-staging-2.10-r1.ebuild b/app-emulation/wine-staging/wine-staging-2.10-r1.ebuild index d41fb3977fc4..b119a5cd8635 100644 --- a/app-emulation/wine-staging/wine-staging-2.10-r1.ebuild +++ b/app-emulation/wine-staging/wine-staging-2.10-r1.ebuild @@ -63,6 +63,7 @@ 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}] @@ -152,7 +153,6 @@ RDEPEND="${COMMON_DEPEND} # tools/make_requests requires perl DEPEND="${COMMON_DEPEND} - dev-util/patchbin sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig @@ -176,6 +176,23 @@ 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 @@ -347,17 +364,7 @@ src_prepare() { } 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" - "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676 - "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376 - ) - local PATCHES_BIN=( - "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376 - ) + if use staging; then ewarn "Applying the Wine-Staging patchset. Any bug reports to the" ewarn "Wine bugzilla should explicitly state that staging was used." @@ -454,6 +461,7 @@ multilib_src_configure() { $(use_with udev) $(use_with v4l) $(use_with X x) + $(use_with X xfixes) $(use_with xcomposite) $(use_with xinerama) $(use_with xml) diff --git a/app-emulation/wine-staging/wine-staging-2.11-r1.ebuild b/app-emulation/wine-staging/wine-staging-2.11-r1.ebuild index d41fb3977fc4..b119a5cd8635 100644 --- a/app-emulation/wine-staging/wine-staging-2.11-r1.ebuild +++ b/app-emulation/wine-staging/wine-staging-2.11-r1.ebuild @@ -63,6 +63,7 @@ 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}] @@ -152,7 +153,6 @@ RDEPEND="${COMMON_DEPEND} # tools/make_requests requires perl DEPEND="${COMMON_DEPEND} - dev-util/patchbin sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig @@ -176,6 +176,23 @@ 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 @@ -347,17 +364,7 @@ src_prepare() { } 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" - "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676 - "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376 - ) - local PATCHES_BIN=( - "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376 - ) + if use staging; then ewarn "Applying the Wine-Staging patchset. Any bug reports to the" ewarn "Wine bugzilla should explicitly state that staging was used." @@ -454,6 +461,7 @@ multilib_src_configure() { $(use_with udev) $(use_with v4l) $(use_with X x) + $(use_with X xfixes) $(use_with xcomposite) $(use_with xinerama) $(use_with xml) diff --git a/app-emulation/wine-staging/wine-staging-2.12-r1.ebuild b/app-emulation/wine-staging/wine-staging-2.12-r1.ebuild index d41fb3977fc4..b119a5cd8635 100644 --- a/app-emulation/wine-staging/wine-staging-2.12-r1.ebuild +++ b/app-emulation/wine-staging/wine-staging-2.12-r1.ebuild @@ -63,6 +63,7 @@ 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}] @@ -152,7 +153,6 @@ RDEPEND="${COMMON_DEPEND} # tools/make_requests requires perl DEPEND="${COMMON_DEPEND} - dev-util/patchbin sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig @@ -176,6 +176,23 @@ 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 @@ -347,17 +364,7 @@ src_prepare() { } 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" - "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676 - "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376 - ) - local PATCHES_BIN=( - "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376 - ) + if use staging; then ewarn "Applying the Wine-Staging patchset. Any bug reports to the" ewarn "Wine bugzilla should explicitly state that staging was used." @@ -454,6 +461,7 @@ multilib_src_configure() { $(use_with udev) $(use_with v4l) $(use_with X x) + $(use_with X xfixes) $(use_with xcomposite) $(use_with xinerama) $(use_with xml) diff --git a/app-emulation/wine-staging/wine-staging-2.13-r1.ebuild b/app-emulation/wine-staging/wine-staging-2.13-r1.ebuild index d41fb3977fc4..b119a5cd8635 100644 --- a/app-emulation/wine-staging/wine-staging-2.13-r1.ebuild +++ b/app-emulation/wine-staging/wine-staging-2.13-r1.ebuild @@ -63,6 +63,7 @@ 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}] @@ -152,7 +153,6 @@ RDEPEND="${COMMON_DEPEND} # tools/make_requests requires perl DEPEND="${COMMON_DEPEND} - dev-util/patchbin sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig @@ -176,6 +176,23 @@ 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 @@ -347,17 +364,7 @@ src_prepare() { } 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" - "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676 - "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376 - ) - local PATCHES_BIN=( - "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376 - ) + if use staging; then ewarn "Applying the Wine-Staging patchset. Any bug reports to the" ewarn "Wine bugzilla should explicitly state that staging was used." @@ -454,6 +461,7 @@ multilib_src_configure() { $(use_with udev) $(use_with v4l) $(use_with X x) + $(use_with X xfixes) $(use_with xcomposite) $(use_with xinerama) $(use_with xml) diff --git a/app-emulation/wine-staging/wine-staging-2.14-r1.ebuild b/app-emulation/wine-staging/wine-staging-2.14-r1.ebuild index 72cf8da0423d..9df84ca6f8f8 100644 --- a/app-emulation/wine-staging/wine-staging-2.14-r1.ebuild +++ b/app-emulation/wine-staging/wine-staging-2.14-r1.ebuild @@ -63,6 +63,7 @@ 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}] @@ -152,7 +153,6 @@ RDEPEND="${COMMON_DEPEND} # tools/make_requests requires perl DEPEND="${COMMON_DEPEND} - dev-util/patchbin sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig @@ -176,6 +176,23 @@ 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 @@ -347,17 +364,7 @@ src_prepare() { } 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" - "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676 - "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376 - ) - local PATCHES_BIN=( - "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376 - ) + if use staging; then ewarn "Applying the Wine-Staging patchset. Any bug reports to the" ewarn "Wine bugzilla should explicitly state that staging was used." @@ -454,6 +461,7 @@ multilib_src_configure() { $(use_with udev) $(use_with v4l) $(use_with X x) + $(use_with X xfixes) $(use_with xcomposite) $(use_with xinerama) $(use_with xml) diff --git a/app-emulation/wine-staging/wine-staging-2.15-r1.ebuild b/app-emulation/wine-staging/wine-staging-2.15-r1.ebuild index 72cf8da0423d..9df84ca6f8f8 100644 --- a/app-emulation/wine-staging/wine-staging-2.15-r1.ebuild +++ b/app-emulation/wine-staging/wine-staging-2.15-r1.ebuild @@ -63,6 +63,7 @@ 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}] @@ -152,7 +153,6 @@ RDEPEND="${COMMON_DEPEND} # tools/make_requests requires perl DEPEND="${COMMON_DEPEND} - dev-util/patchbin sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig @@ -176,6 +176,23 @@ 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 @@ -347,17 +364,7 @@ src_prepare() { } 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" - "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676 - "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376 - ) - local PATCHES_BIN=( - "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376 - ) + if use staging; then ewarn "Applying the Wine-Staging patchset. Any bug reports to the" ewarn "Wine bugzilla should explicitly state that staging was used." @@ -454,6 +461,7 @@ multilib_src_configure() { $(use_with udev) $(use_with v4l) $(use_with X x) + $(use_with X xfixes) $(use_with xcomposite) $(use_with xinerama) $(use_with xml) diff --git a/app-emulation/wine-staging/wine-staging-2.16-r1.ebuild b/app-emulation/wine-staging/wine-staging-2.16-r1.ebuild index 72cf8da0423d..9df84ca6f8f8 100644 --- a/app-emulation/wine-staging/wine-staging-2.16-r1.ebuild +++ b/app-emulation/wine-staging/wine-staging-2.16-r1.ebuild @@ -63,6 +63,7 @@ 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}] @@ -152,7 +153,6 @@ RDEPEND="${COMMON_DEPEND} # tools/make_requests requires perl DEPEND="${COMMON_DEPEND} - dev-util/patchbin sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig @@ -176,6 +176,23 @@ 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 @@ -347,17 +364,7 @@ src_prepare() { } 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" - "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676 - "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376 - ) - local PATCHES_BIN=( - "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376 - ) + if use staging; then ewarn "Applying the Wine-Staging patchset. Any bug reports to the" ewarn "Wine bugzilla should explicitly state that staging was used." @@ -454,6 +461,7 @@ multilib_src_configure() { $(use_with udev) $(use_with v4l) $(use_with X x) + $(use_with X xfixes) $(use_with xcomposite) $(use_with xinerama) $(use_with xml) diff --git a/app-emulation/wine-staging/wine-staging-2.17-r1.ebuild b/app-emulation/wine-staging/wine-staging-2.17-r1.ebuild index 72cf8da0423d..9df84ca6f8f8 100644 --- a/app-emulation/wine-staging/wine-staging-2.17-r1.ebuild +++ b/app-emulation/wine-staging/wine-staging-2.17-r1.ebuild @@ -63,6 +63,7 @@ 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}] @@ -152,7 +153,6 @@ RDEPEND="${COMMON_DEPEND} # tools/make_requests requires perl DEPEND="${COMMON_DEPEND} - dev-util/patchbin sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig @@ -176,6 +176,23 @@ 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 @@ -347,17 +364,7 @@ src_prepare() { } 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" - "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676 - "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376 - ) - local PATCHES_BIN=( - "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376 - ) + if use staging; then ewarn "Applying the Wine-Staging patchset. Any bug reports to the" ewarn "Wine bugzilla should explicitly state that staging was used." @@ -454,6 +461,7 @@ multilib_src_configure() { $(use_with udev) $(use_with v4l) $(use_with X x) + $(use_with X xfixes) $(use_with xcomposite) $(use_with xinerama) $(use_with xml) diff --git a/app-emulation/wine-staging/wine-staging-2.18.ebuild b/app-emulation/wine-staging/wine-staging-2.18.ebuild index 64f408768d4c..7fc52bbe654b 100644 --- a/app-emulation/wine-staging/wine-staging-2.18.ebuild +++ b/app-emulation/wine-staging/wine-staging-2.18.ebuild @@ -63,6 +63,7 @@ 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}] @@ -152,7 +153,6 @@ RDEPEND="${COMMON_DEPEND} # tools/make_requests requires perl DEPEND="${COMMON_DEPEND} - dev-util/patchbin sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig @@ -176,6 +176,19 @@ 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 @@ -347,14 +360,7 @@ src_prepare() { } 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=( - ) + if use staging; then ewarn "Applying the Wine-Staging patchset. Any bug reports to the" ewarn "Wine bugzilla should explicitly state that staging was used." @@ -451,6 +457,7 @@ multilib_src_configure() { $(use_with udev) $(use_with v4l) $(use_with X x) + $(use_with X xfixes) $(use_with xcomposite) $(use_with xinerama) $(use_with xml) diff --git a/app-emulation/wine-staging/wine-staging-2.19.ebuild b/app-emulation/wine-staging/wine-staging-2.19.ebuild new file mode 100644 index 000000000000..7fc52bbe654b --- /dev/null +++ b/app-emulation/wine-staging/wine-staging-2.19.ebuild @@ -0,0 +1,605 @@ +# 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}" + +STAGING_P="wine-staging-${PV}" +STAGING_DIR="${WORKDIR}/${STAGING_P}" +GWP_V="20170830" +PATCHDIR="${WORKDIR}/gentoo-wine-patches" + +DESCRIPTION="Free implementation of Windows(tm) on Unix, with Wine-Staging patchset" +HOMEPAGE="https://www.winehq.org/" +SRC_URI="${SRC_URI} + https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-${GWP_V}.tar.xz +" + +if [[ ${PV} == "9999" ]] ; then + STAGING_EGIT_REPO_URI="https://github.com/wine-compholio/wine-staging.git" +else + SRC_URI="${SRC_URI} + staging? ( https://github.com/wine-compholio/wine-staging/archive/v${PV}.tar.gz -> ${STAGING_P}.tar.gz )" +fi + +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 pipelight +png prelink pulseaudio +realtime +run-exes s3tc samba scanner selinux +ssl staging test themes +threads +truetype udev +udisks v4l vaapi +X +xcomposite xinerama +xml" +REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 ) + X? ( truetype ) + elibc_glibc? ( threads ) + osmesa? ( opengl ) + pipelight? ( staging ) + s3tc? ( staging ) + test? ( abi_x86_32 ) + themes? ( staging ) + vaapi? ( staging )" # osmesa-opengl #286560 # X-truetype #551124 + +# FIXME: the test suite is unsuitable for us; many tests require net access +# or fail due to Xvfb's opengl limitations. +RESTRICT="test" + +COMMON_DEPEND=" + X? ( + x11-libs/libXcursor[${MULTILIB_USEDEP}] + x11-libs/libXext[${MULTILIB_USEDEP}] + x11-libs/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}] ) + staging? ( sys-apps/attr[${MULTILIB_USEDEP}] ) + themes? ( + dev-libs/glib:2[${MULTILIB_USEDEP}] + x11-libs/cairo[${MULTILIB_USEDEP}] + x11-libs/gtk+:3[${MULTILIB_USEDEP}] + ) + truetype? ( >=media-libs/freetype-2.0.0[${MULTILIB_USEDEP}] ) + udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] ) + udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] ) + v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] ) + vaapi? ( x11-libs/libva[X,${MULTILIB_USEDEP}] ) + xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] ) + xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] ) + xml? ( + dev-libs/libxml2[${MULTILIB_USEDEP}] + dev-libs/libxslt[${MULTILIB_USEDEP}] + ) + abi_x86_32? ( + !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] + !<app-emulation/emul-linux-x86-baselibs-20140508-r14 + !app-emulation/emul-linux-x86-db[-abi_x86_32(-)] + !<app-emulation/emul-linux-x86-db-20140508-r3 + !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] + !<app-emulation/emul-linux-x86-medialibs-20140508-r6 + !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] + !<app-emulation/emul-linux-x86-opengl-20140508-r1 + !app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)] + !<app-emulation/emul-linux-x86-sdl-20140508-r1 + !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] + !<app-emulation/emul-linux-x86-soundlibs-20140508 + !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] + !<app-emulation/emul-linux-x86-xlibs-20140508 + )" + +RDEPEND="${COMMON_DEPEND} + app-emulation/wine-desktop-common + >app-eselect/eselect-wine-0.3 + !app-emulation/wine:0 + dos? ( >=games-emulation/dosbox-0.74_p20160629 ) + gecko? ( app-emulation/wine-gecko:2.47[abi_x86_32?,abi_x86_64?] ) + mono? ( app-emulation/wine-mono:4.7.1 ) + perl? ( + dev-lang/perl + dev-perl/XML-Simple + ) + pulseaudio? ( + realtime? ( sys-auth/rtkit ) + ) + s3tc? ( >=media-libs/libtxc_dxtn-1.0.1-r1[${MULTILIB_USEDEP}] ) + samba? ( >=net-fs/samba-3.0.25[winbind] ) + selinux? ( sec-policy/selinux-wine ) + udisks? ( sys-fs/udisks:2 )" + +# tools/make_requests requires perl +DEPEND="${COMMON_DEPEND} + sys-devel/flex + >=sys-kernel/linux-headers-2.6 + virtual/pkgconfig + virtual/yacc + X? ( + x11-proto/inputproto + x11-proto/xextproto + x11-proto/xf86vidmodeproto + ) + prelink? ( sys-devel/prelink ) + staging? ( + dev-lang/perl + dev-perl/XML-Simple + ) + xinerama? ( x11-proto/xineramaproto )" + +# These use a non-standard "Wine" category, which is provided by +# /etc/xdg/applications-merged/wine.menu +QA_DESKTOP_FILE="usr/share/applications/wine-browsedrive.desktop +usr/share/applications/wine-notepad.desktop +usr/share/applications/wine-uninstaller.desktop +usr/share/applications/wine-winecfg.desktop" + +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 ${pn_live_val} ]]; then + if use staging; then + eerror "Because of the multi-repo nature of ${MY_PN}, ${pn_live_var}" + eerror "cannot be used to set the commit. Instead, you may use the" + eerror "environmental variables WINE_COMMIT, and STAGING_COMMIT." + eerror + return 1 + fi + fi + if [[ ! -z ${EGIT_COMMIT} ]]; then + eerror "Commits must now be specified using the environmental variables" + eerror "WINE_COMMIT, STAGING_COMMIT, and D3D9_COMMIT" + eerror + return 1 + fi +} + +pkg_pretend() { + wine_build_environment_check || die + + # Verify OSS support + if use oss && ! use kernel_FreeBSD; then + if ! has_version ">=media-sound/oss-4"; then + eerror "You cannot build wine with USE=oss without having support from a" + eerror "FreeBSD kernel or >=media-sound/oss-4 (only available through external repos)" + eerror + die + fi + fi +} + +pkg_setup() { + wine_build_environment_check || die + wine_env_vcs_vars || die + + WINE_VARIANT="${PN#wine}-${PV}" + WINE_VARIANT="${WINE_VARIANT#-}" + + MY_PREFIX="${EPREFIX}/usr/lib/wine-${WINE_VARIANT}" + MY_DATAROOTDIR="${EPREFIX}/usr/share/wine-${WINE_VARIANT}" + MY_DATADIR="${MY_DATAROOTDIR}" + MY_DOCDIR="${EPREFIX}/usr/share/doc/${PF}" + MY_INCLUDEDIR="${EPREFIX}/usr/include/wine-${WINE_VARIANT}" + MY_LIBEXECDIR="${EPREFIX}/usr/libexec/wine-${WINE_VARIANT}" + MY_LOCALSTATEDIR="${EPREFIX}/var/wine-${WINE_VARIANT}" + MY_MANDIR="${MY_DATADIR}/man" +} + +src_unpack() { + if [[ ${PV} == "9999" ]] ; then + EGIT_CHECKOUT_DIR="${S}" EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack + if use staging; then + local CURRENT_WINE_COMMIT=${EGIT_VERSION} + + git-r3_fetch "${STAGING_EGIT_REPO_URI}" "${STAGING_COMMIT}" + git-r3_checkout "${STAGING_EGIT_REPO_URI}" "${STAGING_DIR}" + + local COMPAT_WINE_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die + + if [[ "${CURRENT_WINE_COMMIT}" != "${COMPAT_WINE_COMMIT}" ]]; then + einfo "The current Staging patchset is not guaranteed to apply on this WINE commit." + einfo "If src_prepare fails, try emerging with the env var WINE_COMMIT." + einfo "Example: WINE_COMMIT=${COMPAT_WINE_COMMIT} emerge -1 wine" + fi + fi + 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)" + + if use staging; then + ewarn "Applying the Wine-Staging patchset. Any bug reports to the" + ewarn "Wine bugzilla should explicitly state that staging was used." + + local STAGING_EXCLUDE="" + STAGING_EXCLUDE="${STAGING_EXCLUDE} -W winhlp32-Flex_Workaround" # Avoid double patching https://bugs.winehq.org/show_bug.cgi?id=42132 + use pipelight || STAGING_EXCLUDE="${STAGING_EXCLUDE} -W Pipelight" + + # Launch wine-staging patcher in a subshell, using eapply as a backend, and gitapply.sh as a backend for binary patches + ebegin "Running Wine-Staging patch installer" + ( + set -- DESTDIR="${S}" --backend=eapply --no-autoconf --all ${STAGING_EXCLUDE} + cd "${STAGING_DIR}/patches" + source "${STAGING_DIR}/patches/patchinstall.sh" + ) + eend $? || die "Failed to apply Wine-Staging patches" + fi + + 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) + ) + + use staging && myconf+=( + --with-xattr + $(use_with themes gtk3) + $(use_with vaapi va) + ) + + 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 + else + if use staging; then + eselect wine register --staging ${P} || die + fi + 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 + else + if use staging; then + eselect wine deregister --staging ${P} || die + fi + fi + + eselect wine update --all --if-unset || die +} + +pkg_postrm() { + xdg_desktop_database_update +} diff --git a/app-emulation/wine-staging/wine-staging-2.2-r1.ebuild b/app-emulation/wine-staging/wine-staging-2.2-r1.ebuild index 04fe221e5109..1177c5533ac8 100644 --- a/app-emulation/wine-staging/wine-staging-2.2-r1.ebuild +++ b/app-emulation/wine-staging/wine-staging-2.2-r1.ebuild @@ -152,7 +152,6 @@ RDEPEND="${COMMON_DEPEND} # tools/make_requests requires perl DEPEND="${COMMON_DEPEND} - dev-util/patchbin sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig @@ -176,6 +175,23 @@ 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 @@ -347,17 +363,7 @@ src_prepare() { } 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" - "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676 - "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376 - ) - local PATCHES_BIN=( - "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376 - ) + if use staging; then ewarn "Applying the Wine-Staging patchset. Any bug reports to the" ewarn "Wine bugzilla should explicitly state that staging was used." diff --git a/app-emulation/wine-staging/wine-staging-2.3-r1.ebuild b/app-emulation/wine-staging/wine-staging-2.3-r1.ebuild index 04fe221e5109..1177c5533ac8 100644 --- a/app-emulation/wine-staging/wine-staging-2.3-r1.ebuild +++ b/app-emulation/wine-staging/wine-staging-2.3-r1.ebuild @@ -152,7 +152,6 @@ RDEPEND="${COMMON_DEPEND} # tools/make_requests requires perl DEPEND="${COMMON_DEPEND} - dev-util/patchbin sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig @@ -176,6 +175,23 @@ 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 @@ -347,17 +363,7 @@ src_prepare() { } 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" - "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676 - "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376 - ) - local PATCHES_BIN=( - "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376 - ) + if use staging; then ewarn "Applying the Wine-Staging patchset. Any bug reports to the" ewarn "Wine bugzilla should explicitly state that staging was used." diff --git a/app-emulation/wine-staging/wine-staging-2.4-r1.ebuild b/app-emulation/wine-staging/wine-staging-2.4-r1.ebuild index d41fb3977fc4..f4d14b26fc45 100644 --- a/app-emulation/wine-staging/wine-staging-2.4-r1.ebuild +++ b/app-emulation/wine-staging/wine-staging-2.4-r1.ebuild @@ -152,7 +152,6 @@ RDEPEND="${COMMON_DEPEND} # tools/make_requests requires perl DEPEND="${COMMON_DEPEND} - dev-util/patchbin sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig @@ -176,6 +175,23 @@ 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 @@ -347,17 +363,7 @@ src_prepare() { } 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" - "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676 - "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376 - ) - local PATCHES_BIN=( - "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376 - ) + if use staging; then ewarn "Applying the Wine-Staging patchset. Any bug reports to the" ewarn "Wine bugzilla should explicitly state that staging was used." diff --git a/app-emulation/wine-staging/wine-staging-2.5-r1.ebuild b/app-emulation/wine-staging/wine-staging-2.5-r1.ebuild index d41fb3977fc4..f4d14b26fc45 100644 --- a/app-emulation/wine-staging/wine-staging-2.5-r1.ebuild +++ b/app-emulation/wine-staging/wine-staging-2.5-r1.ebuild @@ -152,7 +152,6 @@ RDEPEND="${COMMON_DEPEND} # tools/make_requests requires perl DEPEND="${COMMON_DEPEND} - dev-util/patchbin sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig @@ -176,6 +175,23 @@ 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 @@ -347,17 +363,7 @@ src_prepare() { } 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" - "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676 - "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376 - ) - local PATCHES_BIN=( - "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376 - ) + if use staging; then ewarn "Applying the Wine-Staging patchset. Any bug reports to the" ewarn "Wine bugzilla should explicitly state that staging was used." diff --git a/app-emulation/wine-staging/wine-staging-2.6-r1.ebuild b/app-emulation/wine-staging/wine-staging-2.6-r1.ebuild index d41fb3977fc4..f4d14b26fc45 100644 --- a/app-emulation/wine-staging/wine-staging-2.6-r1.ebuild +++ b/app-emulation/wine-staging/wine-staging-2.6-r1.ebuild @@ -152,7 +152,6 @@ RDEPEND="${COMMON_DEPEND} # tools/make_requests requires perl DEPEND="${COMMON_DEPEND} - dev-util/patchbin sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig @@ -176,6 +175,23 @@ 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 @@ -347,17 +363,7 @@ src_prepare() { } 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" - "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676 - "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376 - ) - local PATCHES_BIN=( - "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376 - ) + if use staging; then ewarn "Applying the Wine-Staging patchset. Any bug reports to the" ewarn "Wine bugzilla should explicitly state that staging was used." diff --git a/app-emulation/wine-staging/wine-staging-2.7-r1.ebuild b/app-emulation/wine-staging/wine-staging-2.7-r1.ebuild index d41fb3977fc4..f4d14b26fc45 100644 --- a/app-emulation/wine-staging/wine-staging-2.7-r1.ebuild +++ b/app-emulation/wine-staging/wine-staging-2.7-r1.ebuild @@ -152,7 +152,6 @@ RDEPEND="${COMMON_DEPEND} # tools/make_requests requires perl DEPEND="${COMMON_DEPEND} - dev-util/patchbin sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig @@ -176,6 +175,23 @@ 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 @@ -347,17 +363,7 @@ src_prepare() { } 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" - "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676 - "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376 - ) - local PATCHES_BIN=( - "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376 - ) + if use staging; then ewarn "Applying the Wine-Staging patchset. Any bug reports to the" ewarn "Wine bugzilla should explicitly state that staging was used." diff --git a/app-emulation/wine-staging/wine-staging-2.8-r1.ebuild b/app-emulation/wine-staging/wine-staging-2.8-r1.ebuild index d41fb3977fc4..f4d14b26fc45 100644 --- a/app-emulation/wine-staging/wine-staging-2.8-r1.ebuild +++ b/app-emulation/wine-staging/wine-staging-2.8-r1.ebuild @@ -152,7 +152,6 @@ RDEPEND="${COMMON_DEPEND} # tools/make_requests requires perl DEPEND="${COMMON_DEPEND} - dev-util/patchbin sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig @@ -176,6 +175,23 @@ 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 @@ -347,17 +363,7 @@ src_prepare() { } 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" - "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676 - "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376 - ) - local PATCHES_BIN=( - "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376 - ) + if use staging; then ewarn "Applying the Wine-Staging patchset. Any bug reports to the" ewarn "Wine bugzilla should explicitly state that staging was used." diff --git a/app-emulation/wine-staging/wine-staging-2.9-r1.ebuild b/app-emulation/wine-staging/wine-staging-2.9-r1.ebuild index d41fb3977fc4..b119a5cd8635 100644 --- a/app-emulation/wine-staging/wine-staging-2.9-r1.ebuild +++ b/app-emulation/wine-staging/wine-staging-2.9-r1.ebuild @@ -63,6 +63,7 @@ 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}] @@ -152,7 +153,6 @@ RDEPEND="${COMMON_DEPEND} # tools/make_requests requires perl DEPEND="${COMMON_DEPEND} - dev-util/patchbin sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig @@ -176,6 +176,23 @@ 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 @@ -347,17 +364,7 @@ src_prepare() { } 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" - "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676 - "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376 - ) - local PATCHES_BIN=( - "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376 - ) + if use staging; then ewarn "Applying the Wine-Staging patchset. Any bug reports to the" ewarn "Wine bugzilla should explicitly state that staging was used." @@ -454,6 +461,7 @@ multilib_src_configure() { $(use_with udev) $(use_with v4l) $(use_with X x) + $(use_with X xfixes) $(use_with xcomposite) $(use_with xinerama) $(use_with xml) diff --git a/app-emulation/wine-staging/wine-staging-9999.ebuild b/app-emulation/wine-staging/wine-staging-9999.ebuild index 64f408768d4c..7fc52bbe654b 100644 --- a/app-emulation/wine-staging/wine-staging-9999.ebuild +++ b/app-emulation/wine-staging/wine-staging-9999.ebuild @@ -63,6 +63,7 @@ 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}] @@ -152,7 +153,6 @@ RDEPEND="${COMMON_DEPEND} # tools/make_requests requires perl DEPEND="${COMMON_DEPEND} - dev-util/patchbin sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig @@ -176,6 +176,19 @@ 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 @@ -347,14 +360,7 @@ src_prepare() { } 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=( - ) + if use staging; then ewarn "Applying the Wine-Staging patchset. Any bug reports to the" ewarn "Wine bugzilla should explicitly state that staging was used." @@ -451,6 +457,7 @@ multilib_src_configure() { $(use_with udev) $(use_with v4l) $(use_with X x) + $(use_with X xfixes) $(use_with xcomposite) $(use_with xinerama) $(use_with xml) diff --git a/app-emulation/wine-vanilla/Manifest b/app-emulation/wine-vanilla/Manifest index 36f48636cb3f..03c328149c49 100644 --- a/app-emulation/wine-vanilla/Manifest +++ b/app-emulation/wine-vanilla/Manifest @@ -1,6 +1,7 @@ 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 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 @@ -14,6 +15,7 @@ DIST wine-2.17.tar.xz 19505528 SHA256 7edc95739043ccc55957af663fb910318283dc5d1d 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 @@ -21,30 +23,32 @@ DIST wine-2.6.tar.xz 19023352 SHA256 e6ff64758f437647e99a36c1275e41adf54f0432907 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 -EBUILD wine-vanilla-2.0-r1.ebuild 17204 SHA256 88e52842a086bba49bd71a049e958fcf3217a7b4a42bc2fc9fbd17e937ec5985 SHA512 2f0ea3be386c1a3726ea75e1aab8cd4162f0f926ea02e4ed361b663afa3bed79a29490cc257ebc06e388ec7161609a597f937ed03b94cfb3d879ea69c266129d WHIRLPOOL 0f5566b62be58a4882e1476cf3d783f359cc17c0fd6ec9b106515d300474dc88b61d5b2331e83532e7393c7cc658a95cdf82eb0ed08b47b5ef235996ba5ed959 -EBUILD wine-vanilla-2.0.1-r1.ebuild 17203 SHA256 7e6a074d2248e2a94bab7e4b34429d84b93993a5fdbe48b4a607800f2c296cef SHA512 c4569c28975d0a8bbd6f86e495a41746c107598ae86cf07a9e8c774c790bf09e8c874f9a605e1309a69324d018fc4a6dff8da432a9f18403e4a3360a729a2b64 WHIRLPOOL 253881dee88d3e82100f15829ea7ad1ec55abf737f2c659fbc34fa550ff1124dd893e02a30a0907a71625928ed3076b7a2d011427e6578171d9c2302295fc77d +EBUILD wine-vanilla-2.0-r1.ebuild 17309 SHA256 17d949fee7b368a1a11a6996ef7c0440fc2c07d28930cee0cebd44c9805a538f SHA512 9450444cb5108947be45057c050f4d64b4ca84377e9f61413b37661dfb263f6b510bb761c6e164ef9875da4891851472af5831900e801c2d7095903b5bf6b4a5 WHIRLPOOL a397f0f1eed2a1e330c72a3b739f601b909cb59286e4f4bad9b388a024e37d554cc76a57846fb508cc52b102228e895236ee2350911ce0958a8370dc47b3193e +EBUILD wine-vanilla-2.0.1-r1.ebuild 17308 SHA256 459bb592a201aec7734a08262bc4d9730fa21d06fd1ef0be42388e3517f3a67f SHA512 8df961b63c1a41b5b126870a89f7ae9041be87b34f451ddc378e776f112364575a8dd5b70d5ed5747bd4136780b185c9e8fdaab7093a03f25c43ffd640563147 WHIRLPOOL cf777b93abea3bef5eb23bebc346cc46e435f6d864c7d0a2d213189451001faad943ea74bd25a41d4a6800a5ef06f42eb917b7ea46e7fe5859c03cbd24dcb37b EBUILD wine-vanilla-2.0.1.ebuild 16990 SHA256 c9e7ba657d6e4c6068a30f2e4def931a08ee9b52db3efdaa04c14d6f3e307bf9 SHA512 15f19061d5b46efaea08c1b8aece580522cb28accf5e024c66074806043438348890ce5885d236f20009809e8214424b183311101bf81f575188e4fac7065659 WHIRLPOOL e6d78076e77d6a530d5dbb1d2aabdda355b4efe59e76248739c7f546593da1bb569c7dcf2d37efe80eb561db9bb3473367cdbc9aacb896463247e236c4f6e83d -EBUILD wine-vanilla-2.0.2-r1.ebuild 17203 SHA256 7e6a074d2248e2a94bab7e4b34429d84b93993a5fdbe48b4a607800f2c296cef SHA512 c4569c28975d0a8bbd6f86e495a41746c107598ae86cf07a9e8c774c790bf09e8c874f9a605e1309a69324d018fc4a6dff8da432a9f18403e4a3360a729a2b64 WHIRLPOOL 253881dee88d3e82100f15829ea7ad1ec55abf737f2c659fbc34fa550ff1124dd893e02a30a0907a71625928ed3076b7a2d011427e6578171d9c2302295fc77d +EBUILD wine-vanilla-2.0.2-r1.ebuild 17308 SHA256 459bb592a201aec7734a08262bc4d9730fa21d06fd1ef0be42388e3517f3a67f SHA512 8df961b63c1a41b5b126870a89f7ae9041be87b34f451ddc378e776f112364575a8dd5b70d5ed5747bd4136780b185c9e8fdaab7093a03f25c43ffd640563147 WHIRLPOOL cf777b93abea3bef5eb23bebc346cc46e435f6d864c7d0a2d213189451001faad943ea74bd25a41d4a6800a5ef06f42eb917b7ea46e7fe5859c03cbd24dcb37b EBUILD wine-vanilla-2.0.2.ebuild 16990 SHA256 c9e7ba657d6e4c6068a30f2e4def931a08ee9b52db3efdaa04c14d6f3e307bf9 SHA512 15f19061d5b46efaea08c1b8aece580522cb28accf5e024c66074806043438348890ce5885d236f20009809e8214424b183311101bf81f575188e4fac7065659 WHIRLPOOL e6d78076e77d6a530d5dbb1d2aabdda355b4efe59e76248739c7f546593da1bb569c7dcf2d37efe80eb561db9bb3473367cdbc9aacb896463247e236c4f6e83d +EBUILD wine-vanilla-2.0.3.ebuild 17118 SHA256 1d9ffa6824d731dd25f4617c284ad59688dfac8fd2c53db094bee066b7734ab1 SHA512 6ef26c1ef0efee178420559100ee2e490f6dbef16a9e9b6edf1222a0101a19223b219c2c2a4abbd3752eaabb11d3dfca2c59f1ffea49391c9199f63f79551ecc WHIRLPOOL f603fc62e55e2969cba8eddee06b41f53bbf8c3c5515e469b097e9005890941d9f1718b00e7504b160f5b18259948975c4d876c2b4b0c8894ab0edb03473457c EBUILD wine-vanilla-2.0.ebuild 16991 SHA256 abf8011ff01dabd23ad44b7f8f8f77ac6e5668c000ac2811af281fe4f4302d4c SHA512 3f7b3bd00d10bf4c5421c33b8b29351669dff9cdfbbfad5ffd6be35778e14905e457fc1878c2f51f40d9b1c358ed044d4b27e5d023b844b540f5bd59b669100a WHIRLPOOL 814a9065d053dc911643f03eb038dcdc1fff924fd4ace94fafe2c88c078128d1c8bca1c3a13d245f65106326281a18b2aec9fe20411237b426511c7b5cf1c0b6 -EBUILD wine-vanilla-2.1-r1.ebuild 17203 SHA256 c1fd7883b2180c21566ac20b4116f41827c16703dd3a8544ac38587411417dcf SHA512 5cb3a6828254bee981a90ac32bdba6707c34b5aa63971aaff96578e17c7925e4a854e575ff8e1ac2e0e7f1b78113641c91412748004ab090fe28174ac5a97ab0 WHIRLPOOL 4dc5496c16e9716ff4ccfc4abc7ebac4229a8907ebeeddeef33d8060f59d2380ef53cf0cd132773ad37e04ff6095b394d4fcca26cc6cdb54dd21bb0d4327e6ef -EBUILD wine-vanilla-2.10-r1.ebuild 17267 SHA256 091bea1aab8ed3233c86569268a61abdfc9bdd278c00f7a6f3abc53993b103d7 SHA512 7f14fb5698029579eff40a028f7d794e1e812036326caa6788e7b21f4fa1206338c72b09b62daf00c9b340f77509198e8f03377d292f32c0bc8c389a210b64aa WHIRLPOOL 603d6bbfc5c048c58158f348ad146a7857dc3311fa3967da4f66d88fdddef85c69ca9a6c18d8e8f5b2d875d1a8beeb81a863ac8665ce3972248415b77d7e4eca -EBUILD wine-vanilla-2.11-r1.ebuild 17267 SHA256 091bea1aab8ed3233c86569268a61abdfc9bdd278c00f7a6f3abc53993b103d7 SHA512 7f14fb5698029579eff40a028f7d794e1e812036326caa6788e7b21f4fa1206338c72b09b62daf00c9b340f77509198e8f03377d292f32c0bc8c389a210b64aa WHIRLPOOL 603d6bbfc5c048c58158f348ad146a7857dc3311fa3967da4f66d88fdddef85c69ca9a6c18d8e8f5b2d875d1a8beeb81a863ac8665ce3972248415b77d7e4eca -EBUILD wine-vanilla-2.12-r1.ebuild 17267 SHA256 091bea1aab8ed3233c86569268a61abdfc9bdd278c00f7a6f3abc53993b103d7 SHA512 7f14fb5698029579eff40a028f7d794e1e812036326caa6788e7b21f4fa1206338c72b09b62daf00c9b340f77509198e8f03377d292f32c0bc8c389a210b64aa WHIRLPOOL 603d6bbfc5c048c58158f348ad146a7857dc3311fa3967da4f66d88fdddef85c69ca9a6c18d8e8f5b2d875d1a8beeb81a863ac8665ce3972248415b77d7e4eca -EBUILD wine-vanilla-2.13-r1.ebuild 17267 SHA256 091bea1aab8ed3233c86569268a61abdfc9bdd278c00f7a6f3abc53993b103d7 SHA512 7f14fb5698029579eff40a028f7d794e1e812036326caa6788e7b21f4fa1206338c72b09b62daf00c9b340f77509198e8f03377d292f32c0bc8c389a210b64aa WHIRLPOOL 603d6bbfc5c048c58158f348ad146a7857dc3311fa3967da4f66d88fdddef85c69ca9a6c18d8e8f5b2d875d1a8beeb81a863ac8665ce3972248415b77d7e4eca -EBUILD wine-vanilla-2.14-r1.ebuild 17267 SHA256 849799217ce7695d4d8c85b9bec9722f7286409bfe2ad9fd06426a5e618c9a7d SHA512 5b90cb0bbfb960a95b024707aeb87b6587fb0e353d8359f048a233979acc29260f3dbfb4189c363f861bac69718da0527f82ef71efa09d1f13e3a7a2b5d05af5 WHIRLPOOL 61fe081aae0f7d5e0e6a5638f4a234ccf71ff9ca9fa9e9ece00ce8948b12f0061d054292b12e30ab02c00ae6beb86299ed5db1a2655677070c0bec5432881452 -EBUILD wine-vanilla-2.15-r1.ebuild 17267 SHA256 849799217ce7695d4d8c85b9bec9722f7286409bfe2ad9fd06426a5e618c9a7d SHA512 5b90cb0bbfb960a95b024707aeb87b6587fb0e353d8359f048a233979acc29260f3dbfb4189c363f861bac69718da0527f82ef71efa09d1f13e3a7a2b5d05af5 WHIRLPOOL 61fe081aae0f7d5e0e6a5638f4a234ccf71ff9ca9fa9e9ece00ce8948b12f0061d054292b12e30ab02c00ae6beb86299ed5db1a2655677070c0bec5432881452 -EBUILD wine-vanilla-2.16-r1.ebuild 17267 SHA256 849799217ce7695d4d8c85b9bec9722f7286409bfe2ad9fd06426a5e618c9a7d SHA512 5b90cb0bbfb960a95b024707aeb87b6587fb0e353d8359f048a233979acc29260f3dbfb4189c363f861bac69718da0527f82ef71efa09d1f13e3a7a2b5d05af5 WHIRLPOOL 61fe081aae0f7d5e0e6a5638f4a234ccf71ff9ca9fa9e9ece00ce8948b12f0061d054292b12e30ab02c00ae6beb86299ed5db1a2655677070c0bec5432881452 -EBUILD wine-vanilla-2.17-r1.ebuild 17267 SHA256 849799217ce7695d4d8c85b9bec9722f7286409bfe2ad9fd06426a5e618c9a7d SHA512 5b90cb0bbfb960a95b024707aeb87b6587fb0e353d8359f048a233979acc29260f3dbfb4189c363f861bac69718da0527f82ef71efa09d1f13e3a7a2b5d05af5 WHIRLPOOL 61fe081aae0f7d5e0e6a5638f4a234ccf71ff9ca9fa9e9ece00ce8948b12f0061d054292b12e30ab02c00ae6beb86299ed5db1a2655677070c0bec5432881452 -EBUILD wine-vanilla-2.18-r1.ebuild 17075 SHA256 a27eb237af7debe37a2f036578cedc9171aa42a4c09713b9ab6eb61e99592256 SHA512 17ac784214a5fb5450790b038b132adc701226b36d40c3cefb68b4c9d1d4f63c95f0e99c3f4504987af1eed53b2a1f0a0023e0c2fc53920790803f6e8ffccb84 WHIRLPOOL cf02cf0d2b6c7bcc11e9d98fbdba40218ca5522f8e79d6b631788af69de43ad3023dfcdc36180498d5b6f215f6032a5fd0bd4c114ee9dd8134360ed4e7df440a -EBUILD wine-vanilla-2.19.ebuild 17075 SHA256 a27eb237af7debe37a2f036578cedc9171aa42a4c09713b9ab6eb61e99592256 SHA512 17ac784214a5fb5450790b038b132adc701226b36d40c3cefb68b4c9d1d4f63c95f0e99c3f4504987af1eed53b2a1f0a0023e0c2fc53920790803f6e8ffccb84 WHIRLPOOL cf02cf0d2b6c7bcc11e9d98fbdba40218ca5522f8e79d6b631788af69de43ad3023dfcdc36180498d5b6f215f6032a5fd0bd4c114ee9dd8134360ed4e7df440a -EBUILD wine-vanilla-2.2-r1.ebuild 17203 SHA256 c1fd7883b2180c21566ac20b4116f41827c16703dd3a8544ac38587411417dcf SHA512 5cb3a6828254bee981a90ac32bdba6707c34b5aa63971aaff96578e17c7925e4a854e575ff8e1ac2e0e7f1b78113641c91412748004ab090fe28174ac5a97ab0 WHIRLPOOL 4dc5496c16e9716ff4ccfc4abc7ebac4229a8907ebeeddeef33d8060f59d2380ef53cf0cd132773ad37e04ff6095b394d4fcca26cc6cdb54dd21bb0d4327e6ef -EBUILD wine-vanilla-2.3-r1.ebuild 17203 SHA256 c1fd7883b2180c21566ac20b4116f41827c16703dd3a8544ac38587411417dcf SHA512 5cb3a6828254bee981a90ac32bdba6707c34b5aa63971aaff96578e17c7925e4a854e575ff8e1ac2e0e7f1b78113641c91412748004ab090fe28174ac5a97ab0 WHIRLPOOL 4dc5496c16e9716ff4ccfc4abc7ebac4229a8907ebeeddeef33d8060f59d2380ef53cf0cd132773ad37e04ff6095b394d4fcca26cc6cdb54dd21bb0d4327e6ef -EBUILD wine-vanilla-2.4-r1.ebuild 17203 SHA256 62f2ab1f35ef37ceb18d0422d37072efc80a7a961c216637ae73f1b7ee9e3a8d SHA512 b5b54be7935ffaecfb74383d88313c238b7d387569a37fa8f7894213ba54274cf360e119dad9a654f4eaf360f8cbdf37ded79671970427d59d91a36d4e3e12e5 WHIRLPOOL 80f3ace5e1f8ffeeeb90e4232df3ac4a7d011e972d03b797b435e1aeb3b27c1a826924544cd715f2ec93e707ccaaff0e90185acb55a1e85444bdfe902e83ace7 -EBUILD wine-vanilla-2.5-r1.ebuild 17203 SHA256 62f2ab1f35ef37ceb18d0422d37072efc80a7a961c216637ae73f1b7ee9e3a8d SHA512 b5b54be7935ffaecfb74383d88313c238b7d387569a37fa8f7894213ba54274cf360e119dad9a654f4eaf360f8cbdf37ded79671970427d59d91a36d4e3e12e5 WHIRLPOOL 80f3ace5e1f8ffeeeb90e4232df3ac4a7d011e972d03b797b435e1aeb3b27c1a826924544cd715f2ec93e707ccaaff0e90185acb55a1e85444bdfe902e83ace7 -EBUILD wine-vanilla-2.6-r1.ebuild 17203 SHA256 62f2ab1f35ef37ceb18d0422d37072efc80a7a961c216637ae73f1b7ee9e3a8d SHA512 b5b54be7935ffaecfb74383d88313c238b7d387569a37fa8f7894213ba54274cf360e119dad9a654f4eaf360f8cbdf37ded79671970427d59d91a36d4e3e12e5 WHIRLPOOL 80f3ace5e1f8ffeeeb90e4232df3ac4a7d011e972d03b797b435e1aeb3b27c1a826924544cd715f2ec93e707ccaaff0e90185acb55a1e85444bdfe902e83ace7 -EBUILD wine-vanilla-2.7-r1.ebuild 17203 SHA256 62f2ab1f35ef37ceb18d0422d37072efc80a7a961c216637ae73f1b7ee9e3a8d SHA512 b5b54be7935ffaecfb74383d88313c238b7d387569a37fa8f7894213ba54274cf360e119dad9a654f4eaf360f8cbdf37ded79671970427d59d91a36d4e3e12e5 WHIRLPOOL 80f3ace5e1f8ffeeeb90e4232df3ac4a7d011e972d03b797b435e1aeb3b27c1a826924544cd715f2ec93e707ccaaff0e90185acb55a1e85444bdfe902e83ace7 -EBUILD wine-vanilla-2.8-r1.ebuild 17203 SHA256 62f2ab1f35ef37ceb18d0422d37072efc80a7a961c216637ae73f1b7ee9e3a8d SHA512 b5b54be7935ffaecfb74383d88313c238b7d387569a37fa8f7894213ba54274cf360e119dad9a654f4eaf360f8cbdf37ded79671970427d59d91a36d4e3e12e5 WHIRLPOOL 80f3ace5e1f8ffeeeb90e4232df3ac4a7d011e972d03b797b435e1aeb3b27c1a826924544cd715f2ec93e707ccaaff0e90185acb55a1e85444bdfe902e83ace7 -EBUILD wine-vanilla-2.9-r1.ebuild 17267 SHA256 091bea1aab8ed3233c86569268a61abdfc9bdd278c00f7a6f3abc53993b103d7 SHA512 7f14fb5698029579eff40a028f7d794e1e812036326caa6788e7b21f4fa1206338c72b09b62daf00c9b340f77509198e8f03377d292f32c0bc8c389a210b64aa WHIRLPOOL 603d6bbfc5c048c58158f348ad146a7857dc3311fa3967da4f66d88fdddef85c69ca9a6c18d8e8f5b2d875d1a8beeb81a863ac8665ce3972248415b77d7e4eca -EBUILD wine-vanilla-9999.ebuild 17075 SHA256 a27eb237af7debe37a2f036578cedc9171aa42a4c09713b9ab6eb61e99592256 SHA512 17ac784214a5fb5450790b038b132adc701226b36d40c3cefb68b4c9d1d4f63c95f0e99c3f4504987af1eed53b2a1f0a0023e0c2fc53920790803f6e8ffccb84 WHIRLPOOL cf02cf0d2b6c7bcc11e9d98fbdba40218ca5522f8e79d6b631788af69de43ad3023dfcdc36180498d5b6f215f6032a5fd0bd4c114ee9dd8134360ed4e7df440a +EBUILD wine-vanilla-2.1-r1.ebuild 17308 SHA256 a3a79313c0310dbced97d0509b869afdeb00122a6869e69de75eb263f0250218 SHA512 80f0e14e94baa959c82cc26d579e6d38ab6ca5ffa76c68e3b08d5059e2923783abe2fefd2f7f0e92e4f1da3f3e367fac5a02a8b1b90a90cd5087e5f762fba5ef WHIRLPOOL 1daf24943fcdc0491e5a29dbd052b3e236f0ee6d1a5115cfb6a759116062ffa526e38afb0f3a1adf04327b4d1a179227cc414d34a8f4c7c632f0adcdee4b35d7 +EBUILD wine-vanilla-2.10-r1.ebuild 17372 SHA256 bdfa56bda63459ae99988897aa249ff04de8865cd099f536c0438345dcc1bf1c SHA512 b19926278556d99ad4dabefbfee38fb741763a244de3a513e07a194db7e806a9631a4fdc6a95b96068904db67e728255846d447002fcf745c33b94a727e8be94 WHIRLPOOL 425b839cb29e9b61e50912921bd7740e2c57d47d45e307f7e26d228a7b4197a84293332f97f4d3d8adec1f7d9e0dc50f77e81c042286b5fbffe112de33583975 +EBUILD wine-vanilla-2.11-r1.ebuild 17372 SHA256 bdfa56bda63459ae99988897aa249ff04de8865cd099f536c0438345dcc1bf1c SHA512 b19926278556d99ad4dabefbfee38fb741763a244de3a513e07a194db7e806a9631a4fdc6a95b96068904db67e728255846d447002fcf745c33b94a727e8be94 WHIRLPOOL 425b839cb29e9b61e50912921bd7740e2c57d47d45e307f7e26d228a7b4197a84293332f97f4d3d8adec1f7d9e0dc50f77e81c042286b5fbffe112de33583975 +EBUILD wine-vanilla-2.12-r1.ebuild 17372 SHA256 bdfa56bda63459ae99988897aa249ff04de8865cd099f536c0438345dcc1bf1c SHA512 b19926278556d99ad4dabefbfee38fb741763a244de3a513e07a194db7e806a9631a4fdc6a95b96068904db67e728255846d447002fcf745c33b94a727e8be94 WHIRLPOOL 425b839cb29e9b61e50912921bd7740e2c57d47d45e307f7e26d228a7b4197a84293332f97f4d3d8adec1f7d9e0dc50f77e81c042286b5fbffe112de33583975 +EBUILD wine-vanilla-2.13-r1.ebuild 17372 SHA256 bdfa56bda63459ae99988897aa249ff04de8865cd099f536c0438345dcc1bf1c SHA512 b19926278556d99ad4dabefbfee38fb741763a244de3a513e07a194db7e806a9631a4fdc6a95b96068904db67e728255846d447002fcf745c33b94a727e8be94 WHIRLPOOL 425b839cb29e9b61e50912921bd7740e2c57d47d45e307f7e26d228a7b4197a84293332f97f4d3d8adec1f7d9e0dc50f77e81c042286b5fbffe112de33583975 +EBUILD wine-vanilla-2.14-r1.ebuild 17372 SHA256 cd6fc5ceed33d70d3d6120362329c2782ff778e307bea76e8f7e0429c9deef76 SHA512 b4b5c149b51ec7d6e7070349c9a373f7e2f4eb265073d34fa4da1def110722a4a4d47475a1cb954ded9e751879f9e54abac73878fd4124f7495601592a836c4f WHIRLPOOL 969b3fe1010122bd60d5ad15e5fdda3ffd8bcd7d41b99a567b9642bb08ce5dcb80c199ed76753c59588d5818219047f6e0b0f92715a6196206dc7f3330582f8a +EBUILD wine-vanilla-2.15-r1.ebuild 17372 SHA256 cd6fc5ceed33d70d3d6120362329c2782ff778e307bea76e8f7e0429c9deef76 SHA512 b4b5c149b51ec7d6e7070349c9a373f7e2f4eb265073d34fa4da1def110722a4a4d47475a1cb954ded9e751879f9e54abac73878fd4124f7495601592a836c4f WHIRLPOOL 969b3fe1010122bd60d5ad15e5fdda3ffd8bcd7d41b99a567b9642bb08ce5dcb80c199ed76753c59588d5818219047f6e0b0f92715a6196206dc7f3330582f8a +EBUILD wine-vanilla-2.16-r1.ebuild 17372 SHA256 cd6fc5ceed33d70d3d6120362329c2782ff778e307bea76e8f7e0429c9deef76 SHA512 b4b5c149b51ec7d6e7070349c9a373f7e2f4eb265073d34fa4da1def110722a4a4d47475a1cb954ded9e751879f9e54abac73878fd4124f7495601592a836c4f WHIRLPOOL 969b3fe1010122bd60d5ad15e5fdda3ffd8bcd7d41b99a567b9642bb08ce5dcb80c199ed76753c59588d5818219047f6e0b0f92715a6196206dc7f3330582f8a +EBUILD wine-vanilla-2.17-r1.ebuild 17372 SHA256 cd6fc5ceed33d70d3d6120362329c2782ff778e307bea76e8f7e0429c9deef76 SHA512 b4b5c149b51ec7d6e7070349c9a373f7e2f4eb265073d34fa4da1def110722a4a4d47475a1cb954ded9e751879f9e54abac73878fd4124f7495601592a836c4f WHIRLPOOL 969b3fe1010122bd60d5ad15e5fdda3ffd8bcd7d41b99a567b9642bb08ce5dcb80c199ed76753c59588d5818219047f6e0b0f92715a6196206dc7f3330582f8a +EBUILD wine-vanilla-2.18-r2.ebuild 17182 SHA256 75b60443b9bed49cb3a6cc74f00134d5efef26b6108bd3bd639ba0332cdf6b47 SHA512 d44a4f60d928162fd7e478ebee0b264b2e78dcfef772c55867885c5de51ea06557e628635932f06c97bc0bc6d2c2a9b5e4e02f31c57eb882675d53451806dd5b WHIRLPOOL d83673e11003311dafe41eb11e02733a1d8d68184306960cfb5151ab275643e652f5630d379b6875a84079ec518bb96f28e23ca96b09dd913eaacee58a4821b8 +EBUILD wine-vanilla-2.19-r1.ebuild 17182 SHA256 75b60443b9bed49cb3a6cc74f00134d5efef26b6108bd3bd639ba0332cdf6b47 SHA512 d44a4f60d928162fd7e478ebee0b264b2e78dcfef772c55867885c5de51ea06557e628635932f06c97bc0bc6d2c2a9b5e4e02f31c57eb882675d53451806dd5b WHIRLPOOL d83673e11003311dafe41eb11e02733a1d8d68184306960cfb5151ab275643e652f5630d379b6875a84079ec518bb96f28e23ca96b09dd913eaacee58a4821b8 +EBUILD wine-vanilla-2.2-r1.ebuild 17308 SHA256 a3a79313c0310dbced97d0509b869afdeb00122a6869e69de75eb263f0250218 SHA512 80f0e14e94baa959c82cc26d579e6d38ab6ca5ffa76c68e3b08d5059e2923783abe2fefd2f7f0e92e4f1da3f3e367fac5a02a8b1b90a90cd5087e5f762fba5ef WHIRLPOOL 1daf24943fcdc0491e5a29dbd052b3e236f0ee6d1a5115cfb6a759116062ffa526e38afb0f3a1adf04327b4d1a179227cc414d34a8f4c7c632f0adcdee4b35d7 +EBUILD wine-vanilla-2.20.ebuild 17267 SHA256 0507f05778d02026986c9dafda155128ee79d54807fa8813c259b3a1690ecffe SHA512 0b9eb0b091310c5d495a1f7bfcb102b6d468563e8b2cf36a68642210740386ae769ec4784fa63e7879eefa09c4956ae2a661f97cef0c5654eb7c4954eaefbe2e WHIRLPOOL 74abd70eb442d9a3c56b4bd981d657b16318baef24319a1c3d101ce101563b44e7912fa36c8ebefa84be9bba5a4cc5632b26c4d3dffefa43f62d86d8e3f61b58 +EBUILD wine-vanilla-2.3-r1.ebuild 17308 SHA256 a3a79313c0310dbced97d0509b869afdeb00122a6869e69de75eb263f0250218 SHA512 80f0e14e94baa959c82cc26d579e6d38ab6ca5ffa76c68e3b08d5059e2923783abe2fefd2f7f0e92e4f1da3f3e367fac5a02a8b1b90a90cd5087e5f762fba5ef WHIRLPOOL 1daf24943fcdc0491e5a29dbd052b3e236f0ee6d1a5115cfb6a759116062ffa526e38afb0f3a1adf04327b4d1a179227cc414d34a8f4c7c632f0adcdee4b35d7 +EBUILD wine-vanilla-2.4-r1.ebuild 17308 SHA256 db067211f1861755107c2b453d254d141e9376368fa41333b0458df6b8f1cdea SHA512 6cd9c55996117adbec76048a99601c77145cafee625a19083dc075b7cfbb4e81f30a74f980ab056012a06c96ec26a69e907efd95d97f5c2ff211dd3d4f30b2ae WHIRLPOOL 1d0028a829efeb8019029375cfeb2907ca6793f3a6a1b4fdbe7c5f4c3fb89cbefab10a8c5ea0c4ff1c33c763271dfb8c2b3048725236a89993dca2c2c183ba49 +EBUILD wine-vanilla-2.5-r1.ebuild 17308 SHA256 db067211f1861755107c2b453d254d141e9376368fa41333b0458df6b8f1cdea SHA512 6cd9c55996117adbec76048a99601c77145cafee625a19083dc075b7cfbb4e81f30a74f980ab056012a06c96ec26a69e907efd95d97f5c2ff211dd3d4f30b2ae WHIRLPOOL 1d0028a829efeb8019029375cfeb2907ca6793f3a6a1b4fdbe7c5f4c3fb89cbefab10a8c5ea0c4ff1c33c763271dfb8c2b3048725236a89993dca2c2c183ba49 +EBUILD wine-vanilla-2.6-r1.ebuild 17308 SHA256 db067211f1861755107c2b453d254d141e9376368fa41333b0458df6b8f1cdea SHA512 6cd9c55996117adbec76048a99601c77145cafee625a19083dc075b7cfbb4e81f30a74f980ab056012a06c96ec26a69e907efd95d97f5c2ff211dd3d4f30b2ae WHIRLPOOL 1d0028a829efeb8019029375cfeb2907ca6793f3a6a1b4fdbe7c5f4c3fb89cbefab10a8c5ea0c4ff1c33c763271dfb8c2b3048725236a89993dca2c2c183ba49 +EBUILD wine-vanilla-2.7-r1.ebuild 17308 SHA256 db067211f1861755107c2b453d254d141e9376368fa41333b0458df6b8f1cdea SHA512 6cd9c55996117adbec76048a99601c77145cafee625a19083dc075b7cfbb4e81f30a74f980ab056012a06c96ec26a69e907efd95d97f5c2ff211dd3d4f30b2ae WHIRLPOOL 1d0028a829efeb8019029375cfeb2907ca6793f3a6a1b4fdbe7c5f4c3fb89cbefab10a8c5ea0c4ff1c33c763271dfb8c2b3048725236a89993dca2c2c183ba49 +EBUILD wine-vanilla-2.8-r1.ebuild 17308 SHA256 db067211f1861755107c2b453d254d141e9376368fa41333b0458df6b8f1cdea SHA512 6cd9c55996117adbec76048a99601c77145cafee625a19083dc075b7cfbb4e81f30a74f980ab056012a06c96ec26a69e907efd95d97f5c2ff211dd3d4f30b2ae WHIRLPOOL 1d0028a829efeb8019029375cfeb2907ca6793f3a6a1b4fdbe7c5f4c3fb89cbefab10a8c5ea0c4ff1c33c763271dfb8c2b3048725236a89993dca2c2c183ba49 +EBUILD wine-vanilla-2.9-r1.ebuild 17372 SHA256 bdfa56bda63459ae99988897aa249ff04de8865cd099f536c0438345dcc1bf1c SHA512 b19926278556d99ad4dabefbfee38fb741763a244de3a513e07a194db7e806a9631a4fdc6a95b96068904db67e728255846d447002fcf745c33b94a727e8be94 WHIRLPOOL 425b839cb29e9b61e50912921bd7740e2c57d47d45e307f7e26d228a7b4197a84293332f97f4d3d8adec1f7d9e0dc50f77e81c042286b5fbffe112de33583975 +EBUILD wine-vanilla-9999.ebuild 17267 SHA256 0507f05778d02026986c9dafda155128ee79d54807fa8813c259b3a1690ecffe SHA512 0b9eb0b091310c5d495a1f7bfcb102b6d468563e8b2cf36a68642210740386ae769ec4784fa63e7879eefa09c4956ae2a661f97cef0c5654eb7c4954eaefbe2e WHIRLPOOL 74abd70eb442d9a3c56b4bd981d657b16318baef24319a1c3d101ce101563b44e7912fa36c8ebefa84be9bba5a4cc5632b26c4d3dffefa43f62d86d8e3f61b58 MISC metadata.xml 2603 SHA256 91d7833300e0c734d5f58399ef20b7ef16f1afe1075962733f677b8b8fcb4ea8 SHA512 3488427cc15c66af3bfca0ded6a51bbad6f3b3a0935dcb94fc7061056356b6d83eb8a5fee21e6b12f9bce6824d755af9c81b98c755821f9bd0e714929868a759 WHIRLPOOL 1c6d6b4ba1e2a4799e5573a791400b776f2082786e9aac0d063fd1c117a67b0cc7b162a66c66653d3757cc61b2fa2f79c3da7c7050a38dc87421b9a06839ca99 diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.0-r1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.0-r1.ebuild index 697e0f31fb09..775a1f19fce1 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-2.0-r1.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-2.0-r1.ebuild @@ -131,7 +131,6 @@ RDEPEND="${COMMON_DEPEND} # tools/make_requests requires perl DEPEND="${COMMON_DEPEND} - dev-util/patchbin sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig @@ -151,6 +150,23 @@ 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 @@ -299,17 +315,6 @@ src_prepare() { } 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" - "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676 - "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376 - ) - local PATCHES_BIN=( - "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376 - ) default eapply_bin 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 index 72ca9065ccc9..0a297502ec6c 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-2.0.1-r1.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-2.0.1-r1.ebuild @@ -131,7 +131,6 @@ RDEPEND="${COMMON_DEPEND} # tools/make_requests requires perl DEPEND="${COMMON_DEPEND} - dev-util/patchbin sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig @@ -151,6 +150,23 @@ 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 @@ -299,17 +315,6 @@ src_prepare() { } 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" - "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676 - "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376 - ) - local PATCHES_BIN=( - "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376 - ) default eapply_bin 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 index 72ca9065ccc9..0a297502ec6c 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-2.0.2-r1.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-2.0.2-r1.ebuild @@ -131,7 +131,6 @@ RDEPEND="${COMMON_DEPEND} # tools/make_requests requires perl DEPEND="${COMMON_DEPEND} - dev-util/patchbin sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig @@ -151,6 +150,23 @@ 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 @@ -299,17 +315,6 @@ src_prepare() { } 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" - "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676 - "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376 - ) - local PATCHES_BIN=( - "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376 - ) default eapply_bin diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.0.3.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.0.3.ebuild new file mode 100644 index 000000000000..ffa871203d4e --- /dev/null +++ b/app-emulation/wine-vanilla/wine-vanilla-2.0.3.ebuild @@ -0,0 +1,523 @@ +# 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.1-r1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.1-r1.ebuild index 5d4299bca598..c94a6ccc98d1 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-2.1-r1.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-2.1-r1.ebuild @@ -131,7 +131,6 @@ RDEPEND="${COMMON_DEPEND} # tools/make_requests requires perl DEPEND="${COMMON_DEPEND} - dev-util/patchbin sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig @@ -151,6 +150,23 @@ 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 @@ -299,17 +315,6 @@ src_prepare() { } 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" - "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676 - "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376 - ) - local PATCHES_BIN=( - "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376 - ) default eapply_bin diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.10-r1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.10-r1.ebuild index b79fd64dd9a9..0cbbf7c06825 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-2.10-r1.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-2.10-r1.ebuild @@ -132,7 +132,6 @@ RDEPEND="${COMMON_DEPEND} # tools/make_requests requires perl DEPEND="${COMMON_DEPEND} - dev-util/patchbin sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig @@ -152,6 +151,23 @@ 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 @@ -300,17 +316,6 @@ src_prepare() { } 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" - "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676 - "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376 - ) - local PATCHES_BIN=( - "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376 - ) default eapply_bin diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.11-r1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.11-r1.ebuild index b79fd64dd9a9..0cbbf7c06825 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-2.11-r1.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-2.11-r1.ebuild @@ -132,7 +132,6 @@ RDEPEND="${COMMON_DEPEND} # tools/make_requests requires perl DEPEND="${COMMON_DEPEND} - dev-util/patchbin sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig @@ -152,6 +151,23 @@ 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 @@ -300,17 +316,6 @@ src_prepare() { } 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" - "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676 - "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376 - ) - local PATCHES_BIN=( - "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376 - ) default eapply_bin diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.12-r1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.12-r1.ebuild index b79fd64dd9a9..0cbbf7c06825 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-2.12-r1.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-2.12-r1.ebuild @@ -132,7 +132,6 @@ RDEPEND="${COMMON_DEPEND} # tools/make_requests requires perl DEPEND="${COMMON_DEPEND} - dev-util/patchbin sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig @@ -152,6 +151,23 @@ 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 @@ -300,17 +316,6 @@ src_prepare() { } 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" - "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676 - "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376 - ) - local PATCHES_BIN=( - "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376 - ) default eapply_bin diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.13-r1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.13-r1.ebuild index b79fd64dd9a9..0cbbf7c06825 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-2.13-r1.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-2.13-r1.ebuild @@ -132,7 +132,6 @@ RDEPEND="${COMMON_DEPEND} # tools/make_requests requires perl DEPEND="${COMMON_DEPEND} - dev-util/patchbin sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig @@ -152,6 +151,23 @@ 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 @@ -300,17 +316,6 @@ src_prepare() { } 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" - "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676 - "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376 - ) - local PATCHES_BIN=( - "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376 - ) default eapply_bin diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.14-r1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.14-r1.ebuild index ef68ed711111..7a674044d95c 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-2.14-r1.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-2.14-r1.ebuild @@ -132,7 +132,6 @@ RDEPEND="${COMMON_DEPEND} # tools/make_requests requires perl DEPEND="${COMMON_DEPEND} - dev-util/patchbin sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig @@ -152,6 +151,23 @@ 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 @@ -300,17 +316,6 @@ src_prepare() { } 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" - "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676 - "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376 - ) - local PATCHES_BIN=( - "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376 - ) default eapply_bin diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.15-r1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.15-r1.ebuild index ef68ed711111..7a674044d95c 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-2.15-r1.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-2.15-r1.ebuild @@ -132,7 +132,6 @@ RDEPEND="${COMMON_DEPEND} # tools/make_requests requires perl DEPEND="${COMMON_DEPEND} - dev-util/patchbin sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig @@ -152,6 +151,23 @@ 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 @@ -300,17 +316,6 @@ src_prepare() { } 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" - "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676 - "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376 - ) - local PATCHES_BIN=( - "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376 - ) default eapply_bin diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.16-r1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.16-r1.ebuild index ef68ed711111..7a674044d95c 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-2.16-r1.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-2.16-r1.ebuild @@ -132,7 +132,6 @@ RDEPEND="${COMMON_DEPEND} # tools/make_requests requires perl DEPEND="${COMMON_DEPEND} - dev-util/patchbin sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig @@ -152,6 +151,23 @@ 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 @@ -300,17 +316,6 @@ src_prepare() { } 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" - "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676 - "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376 - ) - local PATCHES_BIN=( - "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376 - ) default eapply_bin diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.17-r1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.17-r1.ebuild index ef68ed711111..7a674044d95c 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-2.17-r1.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-2.17-r1.ebuild @@ -132,7 +132,6 @@ RDEPEND="${COMMON_DEPEND} # tools/make_requests requires perl DEPEND="${COMMON_DEPEND} - dev-util/patchbin sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig @@ -152,6 +151,23 @@ 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 @@ -300,17 +316,6 @@ src_prepare() { } 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" - "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676 - "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376 - ) - local PATCHES_BIN=( - "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376 - ) default eapply_bin diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.18-r1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.18-r2.ebuild index 8851cfc5ac4c..d8b9031e8ed8 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-2.18-r1.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-2.18-r2.ebuild @@ -132,7 +132,6 @@ RDEPEND="${COMMON_DEPEND} # tools/make_requests requires perl DEPEND="${COMMON_DEPEND} - dev-util/patchbin sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig @@ -152,6 +151,19 @@ 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 @@ -300,14 +312,6 @@ src_prepare() { } 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 diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.19.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.19-r1.ebuild index 8851cfc5ac4c..d8b9031e8ed8 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-2.19.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-2.19-r1.ebuild @@ -132,7 +132,6 @@ RDEPEND="${COMMON_DEPEND} # tools/make_requests requires perl DEPEND="${COMMON_DEPEND} - dev-util/patchbin sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig @@ -152,6 +151,19 @@ 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 @@ -300,14 +312,6 @@ src_prepare() { } 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 diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.2-r1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.2-r1.ebuild index 5d4299bca598..c94a6ccc98d1 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-2.2-r1.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-2.2-r1.ebuild @@ -131,7 +131,6 @@ RDEPEND="${COMMON_DEPEND} # tools/make_requests requires perl DEPEND="${COMMON_DEPEND} - dev-util/patchbin sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig @@ -151,6 +150,23 @@ 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 @@ -299,17 +315,6 @@ src_prepare() { } 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" - "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676 - "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376 - ) - local PATCHES_BIN=( - "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376 - ) default eapply_bin diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.20.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.20.ebuild new file mode 100644 index 000000000000..d64e83579c1b --- /dev/null +++ b/app-emulation/wine-vanilla/wine-vanilla-2.20.ebuild @@ -0,0 +1,527 @@ +# 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 kerberos 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}] ) + kerberos? ( virtual/krb5[${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" +) +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 kerberos krb5) + $(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.3-r1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.3-r1.ebuild index 5d4299bca598..c94a6ccc98d1 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-2.3-r1.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-2.3-r1.ebuild @@ -131,7 +131,6 @@ RDEPEND="${COMMON_DEPEND} # tools/make_requests requires perl DEPEND="${COMMON_DEPEND} - dev-util/patchbin sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig @@ -151,6 +150,23 @@ 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 @@ -299,17 +315,6 @@ src_prepare() { } 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" - "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676 - "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376 - ) - local PATCHES_BIN=( - "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376 - ) default eapply_bin diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.4-r1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.4-r1.ebuild index 757d3e9e8573..a69e75d961e0 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-2.4-r1.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-2.4-r1.ebuild @@ -131,7 +131,6 @@ RDEPEND="${COMMON_DEPEND} # tools/make_requests requires perl DEPEND="${COMMON_DEPEND} - dev-util/patchbin sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig @@ -151,6 +150,23 @@ 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 @@ -299,17 +315,6 @@ src_prepare() { } 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" - "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676 - "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376 - ) - local PATCHES_BIN=( - "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376 - ) default eapply_bin diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.5-r1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.5-r1.ebuild index 757d3e9e8573..a69e75d961e0 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-2.5-r1.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-2.5-r1.ebuild @@ -131,7 +131,6 @@ RDEPEND="${COMMON_DEPEND} # tools/make_requests requires perl DEPEND="${COMMON_DEPEND} - dev-util/patchbin sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig @@ -151,6 +150,23 @@ 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 @@ -299,17 +315,6 @@ src_prepare() { } 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" - "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676 - "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376 - ) - local PATCHES_BIN=( - "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376 - ) default eapply_bin diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.6-r1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.6-r1.ebuild index 757d3e9e8573..a69e75d961e0 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-2.6-r1.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-2.6-r1.ebuild @@ -131,7 +131,6 @@ RDEPEND="${COMMON_DEPEND} # tools/make_requests requires perl DEPEND="${COMMON_DEPEND} - dev-util/patchbin sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig @@ -151,6 +150,23 @@ 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 @@ -299,17 +315,6 @@ src_prepare() { } 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" - "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676 - "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376 - ) - local PATCHES_BIN=( - "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376 - ) default eapply_bin diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.7-r1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.7-r1.ebuild index 757d3e9e8573..a69e75d961e0 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-2.7-r1.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-2.7-r1.ebuild @@ -131,7 +131,6 @@ RDEPEND="${COMMON_DEPEND} # tools/make_requests requires perl DEPEND="${COMMON_DEPEND} - dev-util/patchbin sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig @@ -151,6 +150,23 @@ 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 @@ -299,17 +315,6 @@ src_prepare() { } 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" - "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676 - "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376 - ) - local PATCHES_BIN=( - "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376 - ) default eapply_bin diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.8-r1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.8-r1.ebuild index 757d3e9e8573..a69e75d961e0 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-2.8-r1.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-2.8-r1.ebuild @@ -131,7 +131,6 @@ RDEPEND="${COMMON_DEPEND} # tools/make_requests requires perl DEPEND="${COMMON_DEPEND} - dev-util/patchbin sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig @@ -151,6 +150,23 @@ 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 @@ -299,17 +315,6 @@ src_prepare() { } 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" - "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676 - "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376 - ) - local PATCHES_BIN=( - "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376 - ) default eapply_bin diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.9-r1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.9-r1.ebuild index b79fd64dd9a9..0cbbf7c06825 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-2.9-r1.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-2.9-r1.ebuild @@ -132,7 +132,6 @@ RDEPEND="${COMMON_DEPEND} # tools/make_requests requires perl DEPEND="${COMMON_DEPEND} - dev-util/patchbin sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig @@ -152,6 +151,23 @@ 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 @@ -300,17 +316,6 @@ src_prepare() { } 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" - "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676 - "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376 - ) - local PATCHES_BIN=( - "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376 - ) default eapply_bin diff --git a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild index 8851cfc5ac4c..d64e83579c1b 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild @@ -35,7 +35,7 @@ SRC_URI="${SRC_URI} 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" +IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +fontconfig +gecko gphoto2 gsm gstreamer +jpeg kerberos 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 ) @@ -66,6 +66,7 @@ COMMON_DEPEND=" media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}] ) jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] ) + kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] ) lcms? ( media-libs/lcms:2=[${MULTILIB_USEDEP}] ) ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] ) mp3? ( >=media-sound/mpg123-1.5.0[${MULTILIB_USEDEP}] ) @@ -132,7 +133,6 @@ RDEPEND="${COMMON_DEPEND} # tools/make_requests requires perl DEPEND="${COMMON_DEPEND} - dev-util/patchbin sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig @@ -152,6 +152,19 @@ 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 @@ -300,14 +313,6 @@ src_prepare() { } 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 @@ -367,6 +372,7 @@ multilib_src_configure() { $(use_with gstreamer) --without-hal $(use_with jpeg) + $(use_with kerberos krb5) $(use_with ldap) $(use_enable mono mscoree) $(use_with mp3 mpg123) diff --git a/app-emulation/xen-pvgrub/Manifest b/app-emulation/xen-pvgrub/Manifest index 5d30f1408e56..29a807c64096 100644 --- a/app-emulation/xen-pvgrub/Manifest +++ b/app-emulation/xen-pvgrub/Manifest @@ -13,7 +13,7 @@ DIST xen-4.8.2.tar.gz 22522336 SHA256 cb1cc2f0985e3d8651215e5d24c1fcc3036994fa7c DIST zlib-1.2.3.tar.gz 496597 SHA256 1795c7d067a43174113fdf03447532f373e1c6c57c08d61d9e4e9be5e244b05e SHA512 021b958fcd0d346c4ba761bcf0cc40f3522de6186cf5a0a6ea34a70504ce9622b1c2626fce40675bc8282cf5f5ade18473656abc38050f72f5d6480507a2106e WHIRLPOOL 8fd7010faf6a48a9c7ff4bcfe3ce4fe9061eb541259e0a2d0def214e8c4becf2b22e8d6f96f65ca827abffeaa9d96e95ed2402844f99835f7b079fc9f3e84276 EBUILD xen-pvgrub-4.7.2.ebuild 4855 SHA256 05ecb38bd3cf2d7d2ee916bde949f7cc5e51e3c112786dab71864f55d0255644 SHA512 86198959919f66903003d83a0b9a9951b85c25bae2507a2cf98701adf7f2d61149bf2653687f9f8f24384b9119269c35b67ac4e7eb727f18e96fa1f892233947 WHIRLPOOL 15969302211b83c417a9481f31636c6555777f761ed082dbe5f510f8b86f5986122359481879b8d660f256bbb3629699c987309a82b8a1a8966913076b4ae030 EBUILD xen-pvgrub-4.7.3.ebuild 4858 SHA256 b1a306442f38efe10e1699b44c7b0ef6da6765027e3b14505655bce7de77dfd0 SHA512 98342e4eb779dc0c8bd204baf73c177242d5678eec14871c252581456f0afd395e8758ea9f697b15bc242dc14a9c8217bba315ba71f891c238cb051c132fedd1 WHIRLPOOL e0f909b7701460529463cbc411e32f27e0437d1f1883c0b25bb84a8aafa8439875684057f4418a9a71aff5cffb8c6f63b7de4e5c2573137045ced23c4d4a9b5c -EBUILD xen-pvgrub-4.8.2-r1.ebuild 4867 SHA256 c1e2814c844c251ff8dca36275734810e111bf4e6fd6c935494389272470f16f SHA512 1d675f142afc4b52f4b216091d6109ac906548dedd04f67b312bff1823a5c2b1ca5adc06fe4ac80caeffcc58a3f7501be3bd83219c242e118b660e3e164ba4ba WHIRLPOOL 028e15584f5d7156ff99c0de989234768c415df223052039f168dd34987d38295485235a069c7b5fbe163f102e73760ae10e7728227ee5abb3292b7193f4e4ed +EBUILD xen-pvgrub-4.8.2-r1.ebuild 4866 SHA256 5c0219d2d22ba72af6a82c87f44534ee40c23c2253a0b6655e11e5d048317265 SHA512 7c711f3c45ca5cf76b7467f3c0b1a8fd71605c8afbeb3d223721b9509d713c860f4a89a10c593f012e3e67186218d982f5edd7a649a3a7f65a8adc5275c51e7f WHIRLPOOL 4b0f0360eb56725f338f78443d7849e2c06233a35927b89c10b7723aba1c70e4bdeea657f169b0ef48e6198429d737f43d39fd454da71e21158e4a6dc6ed14a1 EBUILD xen-pvgrub-4.8.2.ebuild 4860 SHA256 1d3dae13bc0280ec2627db29f9e875d2e61228fb4cd52899ac123462e4d5e431 SHA512 54ec10e72eb29850b48216e9d81c38cfe82510aac751be69bdcae124f05f07021562757f85e18f091a65b1dcf1f257ba4652d994d415d05ec4485845beedecc4 WHIRLPOOL 2a9ba421dc9e35d0fecd978d597c0b84d83f05671e0c2422985b0be2606f5fde3a818cc6c9d67eb7b429f2f11f3430b31710d06638c082454e4ebfdbc16c10aa MISC ChangeLog 7852 SHA256 ad4918f5c2385e0cdce11a5a4dd3025138389a2cdb2242b111d4d2318bd62975 SHA512 182aac066289033e565c50fe3ed620a6d123ffb9570e55fcfe1834f59f172a758a9238e160b7a9525512f94887617ff89165df1519d752fe26df84ef0016405b WHIRLPOOL c77c268d908fd4dd26888841e295eabc2040598a7651e36e712ae9a94149ebdd28b778895a76eb804276f791da832360c02559fd70c2973a8f88fce62d2cfa6c MISC ChangeLog-2015 15121 SHA256 729879428f3b9ee1f4d94eea1e3e3eaab4875658088799cfefe49eae3755fdcf SHA512 55627fe8e88dd3af475d65c33f28766ce475919add045bbf82a950729b4eec4df2ca02534cd39eba07dafb77b02c82d773d6540c05fa144ce96bc624c7bb915b WHIRLPOOL e66c52cf6783b0d77865b20074a3e2d4b8da4f3c37340e3f8ef96fbd9fbaf04ef2f8adcc0e21fa164bb2da1bab7ae5d664544080fa968f3d83e1d1461c3f27dc diff --git a/app-emulation/xen-pvgrub/xen-pvgrub-4.8.2-r1.ebuild b/app-emulation/xen-pvgrub/xen-pvgrub-4.8.2-r1.ebuild index 863eff7c2b44..78a162cc1c82 100644 --- a/app-emulation/xen-pvgrub/xen-pvgrub-4.8.2-r1.ebuild +++ b/app-emulation/xen-pvgrub/xen-pvgrub-4.8.2-r1.ebuild @@ -32,7 +32,7 @@ DESCRIPTION="allows to boot Xen domU kernels from a menu.lst laying inside guest HOMEPAGE="https://www.xenproject.org" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 x86" +KEYWORDS="amd64 x86" IUSE="custom-cflags" REQUIRED_USE="${PYTHON_REQUIRED_USE}" diff --git a/app-emulation/xen-tools/Manifest b/app-emulation/xen-tools/Manifest index 00177e10f0b7..7ae0d6e138d0 100644 --- a/app-emulation/xen-tools/Manifest +++ b/app-emulation/xen-tools/Manifest @@ -30,9 +30,9 @@ DIST xen-ovmf-patches-2.tar.xz 4344 SHA256 495d61d718440057f8b0b54fb57061450dd76 DIST xen-security-patches-25.tar.xz 9208 SHA256 ceaa520d4d98ab7b6ce5b58c380499372cb513dda0c8236106cdf878385d4458 SHA512 18539c1f42bc95a06f7b06855614fafb4ed7c07a145d9ab90e02954ba405d21fc4c379908e3233ddfb85ccaa04515b261ac4bbf3987ce00e4479158f03edd917 WHIRLPOOL 4cff34c29a5c38e6a5bd0d4f4fe89d8daf944740934b05cd61f4b8a345ddb4d8a8b2de6db27a723154169e3f28d5b34a43eddd08c909cfa3d6d5aee26fcae693 EBUILD xen-tools-4.7.2.ebuild 14072 SHA256 61ab7974b863a2791aaa188c5f5df408f115c21c7a1f770654a807ca45d33365 SHA512 2a8119fa5eaa93594379d51d039e0af86c11d4082cc9f723fb87beb4c7f04d6bf1b09da858ec5919e29e6d322771994589080f68dfd61f32dfa699bf852db0d4 WHIRLPOOL 8d22df2a0c065d0b959a1cb4f5d3242ac51a28f9c4d86e07b3b27a52d06c79b7c0efa0f2c32a8ac5e9d701a009b12a1a0a5d53c3f987e14819a79f004333a621 EBUILD xen-tools-4.7.3.ebuild 14050 SHA256 bc76a043677701c09d900c4661a6c0a280c542ee12511230f3e242a682208967 SHA512 9e7f809973bd7bd37a8761d22fed9704e94b1a9a41c346799d81066a64b0ee9ba02cb0e5687fccb7618088f548fe58644bee7f81b1a6d44e43c5755ae49bf154 WHIRLPOOL 10939d779ead31d040cdaf3d3d5894628405c2a6ef47e056ac5c5a19b3741cb35201a42da5c504fee45acf681bf040f30bd6e9599eb09101bf196bdd6d4f5daa -EBUILD xen-tools-4.8.2-r1.ebuild 14103 SHA256 e4d47b3fe72e202674954d7a45640b1ad63d1dfd1121444f1285aaf1b5e4e8df SHA512 61a2b8c34d5f6f54887e893007843719b40178dfb85b47c42ab53e588cb2abf13dc0f34d1785b60dd9fa2f673e899783fedd07d9e6089e95a9e948bb693770e3 WHIRLPOOL ba0fadaf8842ff6a31e1847cd9109407338e6a8f389431478d74ccd1992e13267d0df7a69f7fb549791a374750dc9f7df5ff7a096fc24df5e3ab8b4bf514ea9a +EBUILD xen-tools-4.8.2-r1.ebuild 14108 SHA256 46ef013e0ab45ae4bdc9fe3c01566f684d94641fd546c9519ea8f72ba8aa7472 SHA512 9ebb531419f566f7b1e6e17e981cce7dc080c8e93c5064b357f8eef423d8a6bc58dab7ae908897606903ef0f3e25d6b61377c0cf9af79504ff72732945cf77e8 WHIRLPOOL f3d54eed475a2081828cdfd2d9f960cd311e26ec41917a17f16adffe13c7316cfdfab93b071dbd599c5480d61078066a28a40e8e1e2bce755a19b7d71d539f9c EBUILD xen-tools-4.8.2-r2.ebuild 14156 SHA256 750f3847df14d1d1c6fa23166e2da0bcfc7996be822f78b7df933d0c0bb66b63 SHA512 c10bcfee7bbd61ba5e27c5e183afd952b0f3e773fafec2fcc8705a106aecee17e4e44aac97c4a74bd41e7b9eaa670174b6eb568f09117716db0e4613fddf74f7 WHIRLPOOL 5b3c0016a70a412d5c5e91647db4c8d2de843c5abc1c1285b20668099b5d74a1750938f1c003aa85dd7bed23f59d3f0a5a9e333ba486ac76fc699887ee4ade2e -EBUILD xen-tools-4.8.2-r3.ebuild 14156 SHA256 dad3618f9bda10450f57cfbb1c9448a3550a90d8d33acfc3a75748948946dfe5 SHA512 af7bdee9f7185b5eb4a4444ae7951723a72e24d324d9d363f2ad0df4d5c67c6bb7eb370c3d1c41501a05b3332fa38f1a4089244ea44ef1108441575e61bab1b2 WHIRLPOOL 0cd7f4165f4067417e8f1b354c457fd11abed716f92f6aece812d2524d7e5eed7c75835dae03a16977d1b4cb513568396b0b9de54841a38a3d512673b0ab6d98 +EBUILD xen-tools-4.8.2-r3.ebuild 14154 SHA256 e6a3c64a986346f1d9d584098dcd7d33d36dee0b69650ae7c371d8d461fabc12 SHA512 2b9d6213ead36548a128bf671bbc83d5196a733fa61473760e778f4a2a4a03c5bacd82b9de87903b2fdbdcb2d88e710d42009be2840e1ef04a999111ad221e73 WHIRLPOOL 28cbf6c5c6882c94b3f330268cc2c7287d89cb8e73ff94e0b59b7d3c7ff37bc61ad0b533b706f654cd797c66b90b0c0f858d626af977d9cd070d6028b037367c EBUILD xen-tools-4.8.2.ebuild 13727 SHA256 0d4650499b9177eeb87a5b023a51dd497167c10ef6a3de74365256d597365e03 SHA512 b01cdfe60007b8310d34f1c9be7ea268831f4b333219b2c0fbbd7ea501bdf6ca5ba84cae202e8a25aa1da9137f889d08bf49e3820ea9f923e3c5035e8ecb97aa WHIRLPOOL 36dfcacd7eb9876e64961de292f638c142a1678fa9d0d2d580f7f51eef33a612cbf1ad3f92b56f2dc563b21d4b0d044a325b2364bd4dc286de4a615f5e90c49d MISC ChangeLog 22964 SHA256 15c6bdb3723570f38291c42047455516934b7d0e29969a0b7ac0176309d09509 SHA512 29a5c27e3fc0dba37b6b54a7834e39e34d3056d999b0a0ac0278607d7ac7adf7a924b054b941390c06643fabf873d559d627c0a026f1c6352c0732289ebf6707 WHIRLPOOL 2ecd5711ccdb9823c04cc4ed68392f8d1743c7070f34dbfe9bb0c264651bdf51d65210b4879e303ac550caf1fbd9ec6c2913feaaf5cfb96dd14b40e04af02a05 MISC ChangeLog-2015 70841 SHA256 e2535b416e2777d7e80d7d96a388c50ab42fb18cd2dd242feb09e339726574ef SHA512 ea9f464a5cf37ce8e7872934f46794a23dec950d6de7d81610e3410356b9a9916dab7d6a7a114819ebe678517e60f53b3debb692383274c74e04adbb59368069 WHIRLPOOL fc0e6610406053b81d3d4258ca0f3117c552f3ab8a33ee282ba31aa69f8b07d196374c74b4f97a8f60422d53dae27fbd02e4cfea1940bc14b7b5ec995d825b07 diff --git a/app-emulation/xen-tools/xen-tools-4.8.2-r1.ebuild b/app-emulation/xen-tools/xen-tools-4.8.2-r1.ebuild index 6e96925cfed9..9bd159abe830 100644 --- a/app-emulation/xen-tools/xen-tools-4.8.2-r1.ebuild +++ b/app-emulation/xen-tools/xen-tools-4.8.2-r1.ebuild @@ -13,12 +13,12 @@ MAJOR_V="$(get_version_component_range 1-2)" if [[ $PV == *9999 ]]; then inherit git-r3 - KEYWORDS="x86" + KEYWORDS="amd64 x86" REPO="xen.git" EGIT_REPO_URI="git://xenbits.xen.org/${REPO}" S="${WORKDIR}/${REPO}" else - KEYWORDS="~amd64 ~arm ~arm64 x86" + KEYWORDS="amd64 ~arm ~arm64 x86" UPSTREAM_VER=1 SECURITY_VER= # xen-tools's gentoo patches tarball diff --git a/app-emulation/xen-tools/xen-tools-4.8.2-r3.ebuild b/app-emulation/xen-tools/xen-tools-4.8.2-r3.ebuild index 431efbabe512..c8bbd81561c6 100644 --- a/app-emulation/xen-tools/xen-tools-4.8.2-r3.ebuild +++ b/app-emulation/xen-tools/xen-tools-4.8.2-r3.ebuild @@ -18,7 +18,7 @@ if [[ $PV == *9999 ]]; then EGIT_REPO_URI="git://xenbits.xen.org/${REPO}" S="${WORKDIR}/${REPO}" else - KEYWORDS="~amd64 ~arm ~arm64 ~x86" + KEYWORDS="amd64 ~arm ~arm64 x86" UPSTREAM_VER=2 SECURITY_VER= # xen-tools's gentoo patches tarball diff --git a/app-emulation/xen/Manifest b/app-emulation/xen/Manifest index 279cfcccb4cd..d57ddb7e937d 100644 --- a/app-emulation/xen/Manifest +++ b/app-emulation/xen/Manifest @@ -9,8 +9,8 @@ DIST xen-4.8.2.tar.gz 22522336 SHA256 cb1cc2f0985e3d8651215e5d24c1fcc3036994fa7c DIST xen-security-patches-26.tar.xz 8276 SHA256 2a21ec429f8952875f7d95f24697600e606326f1a16d5622cee73628cd0401c1 SHA512 f54fc7e720a70258263d29cc482b8269386818ad75792de87b0d0357fdb6af81f2102e5983100db47563435fa28f875a84e8c6d73d44797aadaf0c469d9fb0ec WHIRLPOOL b31667d8415dc1fbcd60160fdbc2fe0ad4de9bd2171fda875f5585b8d7821c4c035b029dbf382abacf4b6be745aeeb708f419fdcabdd86f78ff1c13703802e3f EBUILD xen-4.7.2-r1.ebuild 5385 SHA256 4378b88ad0cbc515f40c2cf1151281a77678799c96d932e25b75682510c93e99 SHA512 8eb417f766c4c07c80ec3ff53734f3c24d703ef3ce99dad0052dbd5b63232cf66e22470b9779e45ee6662e4057c78d13a3b01d9d7e5e7d8203bf78452cc08f3b WHIRLPOOL 90fd34819474f35141be31efc48f11a7838058cfe9b323ab46d0164bf7b5bca4ecd51694e7b2765a6e72b62b3dad8d4620252996263959ea4ba203ac74e1ae1e EBUILD xen-4.7.3.ebuild 5386 SHA256 74a72af9515f3ead828cc0906f754572a0a2b3fd5afefad45cdec4ac0508e744 SHA512 4f9b09496d2c6aafe5e5a6a50b8e3cc926856398ae46149e05a451f8ee2f615640fa3d2fb444d3a95ff3b00210f3249cd8828ec168b61e2466656ae5e7eb5a58 WHIRLPOOL f7d88913e532714664fa1f9eea03855b3bffcf5926bc0ba9401fa401c78fc2a9a056428886300a5d0549cad30c0cc35028bb386e92dfcf593af4ffc02d3610c8 -EBUILD xen-4.8.2-r1.ebuild 4934 SHA256 e38e9660e801b5f1cb3b88080b0e804c563fdddd22b85677bb2d3249e031ef87 SHA512 2911276e186ae07c1e8322fb7e3638d3f1c6fe58d5214f23febe87e0231f685567312a5595e9da18bc852da02dd7457ca4cba4e7f568207ad6f47c4a042494e1 WHIRLPOOL 08142c3b1897231e8d355a8b0322194feb0c7218bd6388ad2db82ac69327be0aa8e39a60b25d40081b3e5320b676d4077b1b1028feec01069f7a05ee79157d07 -EBUILD xen-4.8.2-r2.ebuild 4934 SHA256 7335043936cfd6e5b18e82c3ffadcde298e8473bc5296239ffa207d45e2fa0c1 SHA512 360c886e6ee22373e29d0b3c8776d04689cacdd4280226ba6da728642c25ee543f11e91e061f1303ba1cc5979155ff7b624b4219a7795cad45cc51f399258c49 WHIRLPOOL 5dde9f078d3ef7749150ce9df1c5ef307975c5d1cc43e9872d0ab243baa146c2e4149a5df26b9c247c3e4fbbc98c118d8597b1decd67cac17a859d156c47ad1e +EBUILD xen-4.8.2-r1.ebuild 4938 SHA256 a45afb7fe85030bca1fb612d19d2c23172c82d4f975ece4a76c2256601cc1f66 SHA512 b343f5eeca869ce79bf5e63cd23711f5a974e7d498dd46805934dd7dda1f6e174dfdcca0f2259d6734bf912ef7e194c812e54a7b59778bf8d6fd853c8701c1c6 WHIRLPOOL a3443bd8c9bfe7ea10a4e65a2a8304881fa67b41d63a8ace9a25bf5ea7cd56dfdd00a2e36168dfeb1175a5f5e5f6a76a73709f117d34fa63d89513699bd50f17 +EBUILD xen-4.8.2-r2.ebuild 4933 SHA256 fb6581b3596436242c970fa044359735500c9e1732ba5a0ab3ba9e5e2dad64c4 SHA512 ce0551c26ed51598405eab862b42c872bccfe05e2064b2dd589e56c34828820356f4f39ffbffaf78cd07408e91569091de947cfe0cc0602faa3503063d3a7fa1 WHIRLPOOL f39164e4181af6292ff9939d0968699127889929652bb8d9726801fb1d1383e195ad6f5f4027ee615714c408dd295a4442ea3796db4e1c390333239a9f6f6d98 EBUILD xen-4.8.2.ebuild 5379 SHA256 78930fde5e11e655cf854cc23739e074b350e0b931716309e6c5aa48394db511 SHA512 79edc5c83b563b69851112afa2971f21ad2971fe62f4e7a5feafe3cb31abc866e8cb4156cf83ceb17a6f033fc5c23789be47f2cc5ebe7ce1a76d6db3e60dad01 WHIRLPOOL b0c85962342bef988cdeb945250d1f847c08c9b68c1a1fcb882eb0846e73b6ea2356fedad265aef5d6abc7776aaa0530dff4b02b179805fcc4ff05a749d46f38 MISC ChangeLog 19246 SHA256 ae107ab371c71d67ccbbb373a29add15e6203ecd6e42fbbce8d37ece1b186fc9 SHA512 b51269964858e15797062599b5b0329686c202da6aeeefeb3f72bec596f35080221ce7591db7a662d973eb1e17d80af8de953a27e1df70e365b9538e1d311bef WHIRLPOOL 72136dd18b3e3341e0fdad7abe3d75f633588c800c647a7a165c5a11741d6c98e492d22eaae4da40ce1d105c96db4ee9071ed0955ef2c376bb0d2e4415581339 MISC ChangeLog-2015 39538 SHA256 43b9fcb224880329df3962d7a0a5f67469d8a29677e9dcbc002e5e5d45b488df SHA512 0a23ab62077924f2daad976e7cb9a3f16de0c7b5eee9be874e4606168b495fe6d9a06245c7c6a375e93b411776f09b4c176de8f7f05ab9eef578b677f179e27d WHIRLPOOL 48ba9ac7cf44b1522d3846df5b917bfbe36839b60d9bee3b151aaad7ade953af73c2bb852c7b7181be8eff26a34ceddad5d97c323b9bd014ecb160daf53c5261 diff --git a/app-emulation/xen/xen-4.8.2-r1.ebuild b/app-emulation/xen/xen-4.8.2-r1.ebuild index c831cf8c10ba..fe53cdc62719 100644 --- a/app-emulation/xen/xen-4.8.2-r1.ebuild +++ b/app-emulation/xen/xen-4.8.2-r1.ebuild @@ -12,11 +12,11 @@ MY_P=${PN}-${MY_PV} if [[ $PV == *9999 ]]; then inherit git-r3 - KEYWORDS="" + KEYWORDS="amd64" EGIT_REPO_URI="git://xenbits.xen.org/xen.git" SRC_URI="" else - KEYWORDS="~amd64 ~arm -x86" + KEYWORDS="amd64 ~arm -x86" UPSTREAM_VER=1 SECURITY_VER= GENTOO_VER= diff --git a/app-emulation/xen/xen-4.8.2-r2.ebuild b/app-emulation/xen/xen-4.8.2-r2.ebuild index 9ddd4bb969ca..f44889548021 100644 --- a/app-emulation/xen/xen-4.8.2-r2.ebuild +++ b/app-emulation/xen/xen-4.8.2-r2.ebuild @@ -16,7 +16,7 @@ if [[ $PV == *9999 ]]; then EGIT_REPO_URI="git://xenbits.xen.org/xen.git" SRC_URI="" else - KEYWORDS="~amd64 ~arm -x86" + KEYWORDS="amd64 ~arm -x86" UPSTREAM_VER=2 SECURITY_VER= GENTOO_VER= |