| 1 |
commit: 416a61b17f83c05d0f3d6c4ecda0b74bc29f3832 |
| 2 |
Author: Nick Sarnie <sarnex <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Nov 4 21:05:38 2018 +0000 |
| 4 |
Commit: Nick Sarnie <sarnex <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Nov 4 21:05:38 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=416a61b1 |
| 7 |
|
| 8 |
app-emulation/wine-any: Sync with ::wine |
| 9 |
|
| 10 |
Bump to 3.19 |
| 11 |
Merge PR to ::gentoo |
| 12 |
|
| 13 |
Package-Manager: Portage-2.3.51, Repoman-2.3.12 |
| 14 |
Signed-off-by: Nick Sarnie <sarnex <AT> gentoo.org> |
| 15 |
|
| 16 |
app-emulation/wine-any/Manifest | 3 ++ |
| 17 |
app-emulation/wine-any/metadata.xml | 10 ++++--- |
| 18 |
app-emulation/wine-any/wine-any-3.16.ebuild | 35 ++++++++++++---------- |
| 19 |
app-emulation/wine-any/wine-any-3.17.ebuild | 33 ++++++++++---------- |
| 20 |
app-emulation/wine-any/wine-any-3.18.ebuild | 33 ++++++++++---------- |
| 21 |
.../{wine-any-3.18.ebuild => wine-any-3.19.ebuild} | 33 ++++++++++---------- |
| 22 |
app-emulation/wine-any/wine-any-9999.ebuild | 35 ++++++++++++---------- |
| 23 |
7 files changed, 101 insertions(+), 81 deletions(-) |
| 24 |
|
| 25 |
diff --git a/app-emulation/wine-any/Manifest b/app-emulation/wine-any/Manifest |
| 26 |
index 071dd10d935..dcffedfef12 100644 |
| 27 |
--- a/app-emulation/wine-any/Manifest |
| 28 |
+++ b/app-emulation/wine-any/Manifest |
| 29 |
@@ -3,11 +3,14 @@ DIST wine-3.15.tar.xz 21402964 BLAKE2B fb74ae33b89612b894463b6381184737ddda7b8a2 |
| 30 |
DIST wine-3.16.tar.xz 21432308 BLAKE2B 7c1bca001fed1472ceaf0331e8e17ebf5aa9c0ec025c46c785d2530fd70ebafdff95b581e28ba1e0167f19bac80dd05c4c5c291180c5a3784c44c1dcd4424edb SHA512 f0c566f70ede01e5896b7611dfe58cd6748b92d55d22a71ccc9add575e9aa5062bbbffa14f0a30ee3df5cf79e9ea4dcf02a7d62db64b94d5b56927e256a978c2 |
| 31 |
DIST wine-3.17.tar.xz 21457736 BLAKE2B 34c2390bd1180f81a15e7db4c712bddd3436033f209870d31f7f286d7dba8c8a65f5dd5cb13cf4c0719cef6a53c168d104e3c78a5ca1777ecf401d8d74e7927a SHA512 ea50c9e09d3fd7f41ff96a1219d43896946ac79c8cdef31ae56e10664fc3b0b6dd1f9d8cd72db874d08c431eba9c8033ea72182499666a5aa62c1056876b0a66 |
| 32 |
DIST wine-3.18.tar.xz 21479964 BLAKE2B 226ec5df6fb5bd94ea4b994f9142ff725b04c4d92da45360f811533880aa3865715a5fe5bb11ce29a55ed2881974013d58479add90b6ba655b035e61eec149c1 SHA512 2137662ea69964a69d77ff5c05f271783bda49af65d605909074d465ed8087d84065156e5c509eae31b4c3a20e83a838fc71bd077b2267640b163acfa5f7366e |
| 33 |
+DIST wine-3.19.tar.xz 21503304 BLAKE2B 0844970cd1f39daf51baf5aba537483d24ee5f5e6d188a1502367a7e2b121fea695cd6584cc87d50dfa32fb1f716387adb513b1645406dbcaed1731e1fd7d50f SHA512 84a1811b01024191959fd16a86bd532c96f16344feb4241954d0b5819ba1db8073dc7adcf1589b67169fb6089d2d501846f6fcbdc396c804f26c794cc4a1edd1 |
| 34 |
DIST wine-d3d9-3.15.tar.gz 50540 BLAKE2B 5fbb56d4e6b2373fa9a2075a379e577584a50c04fa15fbe3e282d25b03211e64dc5f429082a654c3c61016ddda9c5a12277b78086a0938e5cb20952b01ef72e2 SHA512 448433198cb40628edf2ee6f7697671c9efb1c8e68ce826b0edc884625e5f1659956f0c76ea995443c29ca4cefe5030559860d7413f553fc4a3523df3a35b3a7 |
| 35 |
DIST wine-d3d9-3.16.tar.gz 50547 BLAKE2B d2031ceeb048a1221bd99c634b4ff84787b46fe79bb781c429706c5030a2509792ee3f24ca0d69d844d2d1e505c688aec255b5bf9a6561dc74a819360522c8df SHA512 3f1d2d75fc11ea7dfbe6b9e4e75c4dccc6488814e53be53ba7513da56848d6a57a7a7c66a70088b0615078b00a784caa9033d0415d3c3bb29adbd373d72a4d10 |
| 36 |
DIST wine-d3d9-3.17.tar.gz 50535 BLAKE2B 13e422d9c87696e7573f21120dbc4872792b6abd6dc28638ea3645d97eae1a6d12e8a8f91a219856aa5bf83c3882bc27fd52c5ae66f87a51d362694728f583ba SHA512 06b4c28650a6de9b5028ba9072f75f12c1d47aaa1008d4d21d1c3d26025dd1e42fa23928d2c33167dd969fcd9234b7766f4c6c2e0376b5aad5b38016e48296f8 |
| 37 |
DIST wine-d3d9-3.18.tar.gz 50540 BLAKE2B 53e292015f420657d5fa54e4fdd1fa86cb03c0ae7c092cb96642a211600fd96fcbe7fa2f8451248e4fb4b7a78bcc174a2db07c7a3ca15ed95a2e70bd4d35876b SHA512 f62b88572210f318da6ff010b4615d0edf215d15fb29292548f116685cb51fffd48aeb393f3471b01604aacbddaf3115522d678307e2c3f5405d1fd6a6f4503c |
| 38 |
+DIST wine-d3d9-3.19.tar.gz 50542 BLAKE2B 9914139b2657943182f1ac02c43f040669ff6f2e36eee3112267505bbd02969b567ffc23e6965dcb38bd27147f4b6c3630dfd9340b21dcdb6f222a2155fd1b8a SHA512 d8cc0fb98278763d60b4a00c68499aa498b14f12a03d607fa2a0765d26b231a8c270b2b61f7a89b767099ac02aa4e820020eb2dcd78f279885f539e3908362c8 |
| 39 |
DIST wine-staging-3.15.tar.gz 9941091 BLAKE2B 5a0e37ce52ff3e6130434aa56953e70fafb0c83dc33fa1ad7562a9244821ae75c30b9c858c7506462348b6d13016c236a14bde0297bc43d2d282d60c6c012470 SHA512 f0ed9d4a099b03c04a126927919b7eddbdaff7a08a0b97cdf387c64318826d6454183cf03997425b349540d13b1ccf6262aa2c5af0af682939584e3de71b7541 |
| 40 |
DIST wine-staging-3.16.tar.gz 9928264 BLAKE2B 61882e36da7026b078e753de7a3a089fc64578fc2cf4ceb27146125003e86cc386ada2fa55d48e40279665218ae630bf63fce12b72acddfd8e4a6ea1730a9fca SHA512 25f06b06a0880b3926d9d3dfb35fd1aeb1f168426917dee32dcf906970474862021416f4e9db1917d8320962bc0bc17d1f3dad21b634a60b8e0da87a4b54067e |
| 41 |
DIST wine-staging-3.17.tar.gz 9928657 BLAKE2B 549c44cb07423405b95351a8b7c2675ea8dafc015d457b87235d36c7b115778336bd52d6fa97b10dd9d439c8938f05fc81b6b73082680d906db93c8e401f29c8 SHA512 2fe9e8f801b53fa9b71fd908f5403956251522851383bfdde6828c6a8545d6f50ac8c41df54d89c2f92d74dc3bb563cd6a7d8ad394002c981197b71adc1a5e13 |
| 42 |
DIST wine-staging-3.18.tar.gz 9927742 BLAKE2B efd581555feacaac263e550c3a854b4a3ad92c72d7f81bb7cfc846a94d57decde1e82f38de4586eb824b2fe3574581621f0251cc1a126796f466e99e85e8e609 SHA512 d7c353b2302616b8ffe9f41090bc36c8869238410eda16072aed0b70e54c8a09b4a48d439fc9e4f211804945d55dc4a00a5d70efd2ca4a50f72db7607e6ef10e |
| 43 |
+DIST wine-staging-3.19.tar.gz 9957279 BLAKE2B 323ce53df248b7ecc761332537590abcd63f3de9a834b752ca62a472c077d71278907a9758dcda879f50f9044620894e51dbca8702b39fe1a8938b983c568418 SHA512 c3e66c88b4baad4c854b8729ef58aabff587f16f0a13fe89396dd5d99c9b928c6e23ff15938dd40376ec76a40538bba950dd0e2b5b25ce1260de023bb1d17198 |
| 44 |
|
| 45 |
diff --git a/app-emulation/wine-any/metadata.xml b/app-emulation/wine-any/metadata.xml |
| 46 |
index 5e010fdca87..04e20b91419 100644 |
| 47 |
--- a/app-emulation/wine-any/metadata.xml |
| 48 |
+++ b/app-emulation/wine-any/metadata.xml |
| 49 |
@@ -34,12 +34,13 @@ This variant of the wine packaging allows for the use of the Wine-Staging patchs |
| 50 |
<flag name="perl">Install helpers written in perl (winedump/winemaker)</flag> |
| 51 |
<flag name="pipelight">Apply Wine-Staging patches for Pipelight/Silverlight support</flag> |
| 52 |
<flag name="prelink">Run prelink on DLLs during build; |
| 53 |
- For versions before wine-1.7.55 or hardened, do not disable if you do not know what this means as it can break things at runtime</flag> |
| 54 |
+ For Gentoo hardened, do not disable if you do not know what this means as it can break things at runtime</flag> |
| 55 |
<flag name="realtime">Pull in <pkg>sys-auth/rtkit</pkg> for low-latency pulseaudio support</flag> |
| 56 |
<flag name="run-exes">Use Wine to open and run .EXE and .MSI files</flag> |
| 57 |
- <flag name="samba">Add support for NTLM auth. see |
| 58 |
- http://wiki.winehq.org/NtlmAuthSetupGuide and |
| 59 |
- http://wiki.winehq.org/NtlmSigningAndSealing</flag> |
| 60 |
+ <flag name="samba">Add support for NTLM auth. See: |
| 61 |
+ https://web.archive.org/web/20160108123008/http://wiki.winehq.org:80/NtlmAuthSetupGuide and |
| 62 |
+ https://web.archive.org/web/20150906013746/http://wiki.winehq.org/NtlmSigningAndSealing |
| 63 |
+ (these pages are not currently in the updated WineHQ Wiki).</flag> |
| 64 |
<flag name="sdl">Add support for gamepad detection using SDL</flag> |
| 65 |
<flag name="staging">Apply Wine-Staging patches for advanced feature support that haven't made it into upstream Wine yet</flag> |
| 66 |
<flag name="themes">Support GTK+:3 window theming through Wine-Staging</flag> |
| 67 |
@@ -48,6 +49,7 @@ This variant of the wine packaging allows for the use of the Wine-Staging patchs |
| 68 |
<flag name="vulkan">Enable Vulkan drivers</flag> |
| 69 |
</use> |
| 70 |
<upstream> |
| 71 |
+ <remote-id type="github">sarnex/wine-d3d9-patches</remote-id> |
| 72 |
<remote-id type="github">wine-compholio/wine-staging</remote-id> |
| 73 |
<remote-id type="sourceforge">wine</remote-id> |
| 74 |
</upstream> |
| 75 |
|
| 76 |
diff --git a/app-emulation/wine-any/wine-any-3.16.ebuild b/app-emulation/wine-any/wine-any-3.16.ebuild |
| 77 |
index 66208fb6657..24ab26fa3a3 100644 |
| 78 |
--- a/app-emulation/wine-any/wine-any-3.16.ebuild |
| 79 |
+++ b/app-emulation/wine-any/wine-any-3.16.ebuild |
| 80 |
@@ -1,4 +1,4 @@ |
| 81 |
-# Copyright 1999-2018 Gentoo Foundation |
| 82 |
+# Copyright 1999-2018 Gentoo Authors |
| 83 |
# Distributed under the terms of the GNU General Public License v2 |
| 84 |
|
| 85 |
EAPI=6 |
| 86 |
@@ -6,7 +6,7 @@ EAPI=6 |
| 87 |
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" |
| 88 |
PLOCALE_BACKUP="en" |
| 89 |
|
| 90 |
-inherit autotools estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx versionator xdg-utils |
| 91 |
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils |
| 92 |
|
| 93 |
MY_PN="${PN%%-*}" |
| 94 |
MY_P="${MY_PN}-${PV}" |
| 95 |
@@ -18,7 +18,7 @@ if [[ ${PV} == "9999" ]] ; then |
| 96 |
SRC_URI="" |
| 97 |
#KEYWORDS="" |
| 98 |
else |
| 99 |
- MAJOR_V=$(get_version_component_range 1) |
| 100 |
+ MAJOR_V=$(ver_cut 1) |
| 101 |
SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.x/${MY_P}.tar.xz" |
| 102 |
KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd" |
| 103 |
fi |
| 104 |
@@ -278,14 +278,19 @@ wine_env_vcs_vars() { |
| 105 |
if use staging || use d3d9; then |
| 106 |
eerror "Because of the multi-repo nature of ${MY_PN}, ${pn_live_var}" |
| 107 |
eerror "cannot be used to set the commit. Instead, you may use the" |
| 108 |
- eerror "environmental variables WINE_COMMIT, STAGING_COMMIT, and D3D9_COMMIT." |
| 109 |
+ eerror "environment variables:" |
| 110 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
| 111 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE_STAGING_WINE_STAGING" |
| 112 |
+ eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES" |
| 113 |
eerror |
| 114 |
return 1 |
| 115 |
fi |
| 116 |
fi |
| 117 |
if [[ ! -z ${EGIT_COMMIT} ]]; then |
| 118 |
- eerror "Commits must now be specified using the environmental variables" |
| 119 |
- eerror "WINE_COMMIT, STAGING_COMMIT, and D3D9_COMMIT" |
| 120 |
+ eerror "Commits must now be specified using the environment variables:" |
| 121 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
| 122 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE_STAGING_WINE_STAGING" |
| 123 |
+ eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES" |
| 124 |
eerror |
| 125 |
return 1 |
| 126 |
fi |
| 127 |
@@ -324,24 +329,22 @@ pkg_setup() { |
| 128 |
|
| 129 |
src_unpack() { |
| 130 |
if [[ ${PV} == "9999" ]] ; then |
| 131 |
- EGIT_CHECKOUT_DIR="${S}" EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack |
| 132 |
+ EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack |
| 133 |
if use staging; then |
| 134 |
- local CURRENT_WINE_COMMIT=${EGIT_VERSION} |
| 135 |
+ local CURRENT_COMMIT_WINE=${EGIT_VERSION} |
| 136 |
|
| 137 |
- git-r3_fetch "${STAGING_EGIT_REPO_URI}" "${STAGING_COMMIT}" |
| 138 |
- git-r3_checkout "${STAGING_EGIT_REPO_URI}" "${STAGING_DIR}" |
| 139 |
+ EGIT_CHECKOUT_DIR="${STAGING_DIR}" EGIT_REPO_URI="${STAGING_EGIT_REPO_URI}" git-r3_src_unpack |
| 140 |
|
| 141 |
- local COMPAT_WINE_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die |
| 142 |
+ local COMPAT_COMMIT_WINE=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die |
| 143 |
|
| 144 |
- if [[ "${CURRENT_WINE_COMMIT}" != "${COMPAT_WINE_COMMIT}" ]]; then |
| 145 |
+ if [[ "${CURRENT_COMMIT_WINE}" != "${COMPAT_COMMIT_WINE}" ]]; then |
| 146 |
einfo "The current Staging patchset is not guaranteed to apply on this WINE commit." |
| 147 |
- einfo "If src_prepare fails, try emerging with the env var WINE_COMMIT." |
| 148 |
- einfo "Example: WINE_COMMIT=${COMPAT_WINE_COMMIT} emerge -1 wine" |
| 149 |
+ einfo "If src_prepare fails, try emerging with the env var EGIT_OVERRIDE_COMMIT_WINE." |
| 150 |
+ einfo "Example: EGIT_OVERRIDE_COMMIT_WINE=${COMPAT_COMMIT_WINE} emerge -1 wine" |
| 151 |
fi |
| 152 |
fi |
| 153 |
if use d3d9; then |
| 154 |
- git-r3_fetch "${D3D9_EGIT_REPO_URI}" "${D3D9_COMMIT}" |
| 155 |
- git-r3_checkout "${D3D9_EGIT_REPO_URI}" "${D3D9_DIR}" |
| 156 |
+ EGIT_CHECKOUT_DIR="${D3D9_DIR}" EGIT_REPO_URI="${D3D9_EGIT_REPO_URI}" git-r3_src_unpack |
| 157 |
fi |
| 158 |
fi |
| 159 |
|
| 160 |
|
| 161 |
diff --git a/app-emulation/wine-any/wine-any-3.17.ebuild b/app-emulation/wine-any/wine-any-3.17.ebuild |
| 162 |
index 67fbe2cda64..24ab26fa3a3 100644 |
| 163 |
--- a/app-emulation/wine-any/wine-any-3.17.ebuild |
| 164 |
+++ b/app-emulation/wine-any/wine-any-3.17.ebuild |
| 165 |
@@ -6,7 +6,7 @@ EAPI=6 |
| 166 |
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" |
| 167 |
PLOCALE_BACKUP="en" |
| 168 |
|
| 169 |
-inherit autotools estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx versionator xdg-utils |
| 170 |
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils |
| 171 |
|
| 172 |
MY_PN="${PN%%-*}" |
| 173 |
MY_P="${MY_PN}-${PV}" |
| 174 |
@@ -18,7 +18,7 @@ if [[ ${PV} == "9999" ]] ; then |
| 175 |
SRC_URI="" |
| 176 |
#KEYWORDS="" |
| 177 |
else |
| 178 |
- MAJOR_V=$(get_version_component_range 1) |
| 179 |
+ MAJOR_V=$(ver_cut 1) |
| 180 |
SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.x/${MY_P}.tar.xz" |
| 181 |
KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd" |
| 182 |
fi |
| 183 |
@@ -278,14 +278,19 @@ wine_env_vcs_vars() { |
| 184 |
if use staging || use d3d9; then |
| 185 |
eerror "Because of the multi-repo nature of ${MY_PN}, ${pn_live_var}" |
| 186 |
eerror "cannot be used to set the commit. Instead, you may use the" |
| 187 |
- eerror "environmental variables WINE_COMMIT, STAGING_COMMIT, and D3D9_COMMIT." |
| 188 |
+ eerror "environment variables:" |
| 189 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
| 190 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE_STAGING_WINE_STAGING" |
| 191 |
+ eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES" |
| 192 |
eerror |
| 193 |
return 1 |
| 194 |
fi |
| 195 |
fi |
| 196 |
if [[ ! -z ${EGIT_COMMIT} ]]; then |
| 197 |
- eerror "Commits must now be specified using the environmental variables" |
| 198 |
- eerror "WINE_COMMIT, STAGING_COMMIT, and D3D9_COMMIT" |
| 199 |
+ eerror "Commits must now be specified using the environment variables:" |
| 200 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
| 201 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE_STAGING_WINE_STAGING" |
| 202 |
+ eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES" |
| 203 |
eerror |
| 204 |
return 1 |
| 205 |
fi |
| 206 |
@@ -324,24 +329,22 @@ pkg_setup() { |
| 207 |
|
| 208 |
src_unpack() { |
| 209 |
if [[ ${PV} == "9999" ]] ; then |
| 210 |
- EGIT_CHECKOUT_DIR="${S}" EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack |
| 211 |
+ EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack |
| 212 |
if use staging; then |
| 213 |
- local CURRENT_WINE_COMMIT=${EGIT_VERSION} |
| 214 |
+ local CURRENT_COMMIT_WINE=${EGIT_VERSION} |
| 215 |
|
| 216 |
- git-r3_fetch "${STAGING_EGIT_REPO_URI}" "${STAGING_COMMIT}" |
| 217 |
- git-r3_checkout "${STAGING_EGIT_REPO_URI}" "${STAGING_DIR}" |
| 218 |
+ EGIT_CHECKOUT_DIR="${STAGING_DIR}" EGIT_REPO_URI="${STAGING_EGIT_REPO_URI}" git-r3_src_unpack |
| 219 |
|
| 220 |
- local COMPAT_WINE_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die |
| 221 |
+ local COMPAT_COMMIT_WINE=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die |
| 222 |
|
| 223 |
- if [[ "${CURRENT_WINE_COMMIT}" != "${COMPAT_WINE_COMMIT}" ]]; then |
| 224 |
+ if [[ "${CURRENT_COMMIT_WINE}" != "${COMPAT_COMMIT_WINE}" ]]; then |
| 225 |
einfo "The current Staging patchset is not guaranteed to apply on this WINE commit." |
| 226 |
- einfo "If src_prepare fails, try emerging with the env var WINE_COMMIT." |
| 227 |
- einfo "Example: WINE_COMMIT=${COMPAT_WINE_COMMIT} emerge -1 wine" |
| 228 |
+ einfo "If src_prepare fails, try emerging with the env var EGIT_OVERRIDE_COMMIT_WINE." |
| 229 |
+ einfo "Example: EGIT_OVERRIDE_COMMIT_WINE=${COMPAT_COMMIT_WINE} emerge -1 wine" |
| 230 |
fi |
| 231 |
fi |
| 232 |
if use d3d9; then |
| 233 |
- git-r3_fetch "${D3D9_EGIT_REPO_URI}" "${D3D9_COMMIT}" |
| 234 |
- git-r3_checkout "${D3D9_EGIT_REPO_URI}" "${D3D9_DIR}" |
| 235 |
+ EGIT_CHECKOUT_DIR="${D3D9_DIR}" EGIT_REPO_URI="${D3D9_EGIT_REPO_URI}" git-r3_src_unpack |
| 236 |
fi |
| 237 |
fi |
| 238 |
|
| 239 |
|
| 240 |
diff --git a/app-emulation/wine-any/wine-any-3.18.ebuild b/app-emulation/wine-any/wine-any-3.18.ebuild |
| 241 |
index 67fbe2cda64..24ab26fa3a3 100644 |
| 242 |
--- a/app-emulation/wine-any/wine-any-3.18.ebuild |
| 243 |
+++ b/app-emulation/wine-any/wine-any-3.18.ebuild |
| 244 |
@@ -6,7 +6,7 @@ EAPI=6 |
| 245 |
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" |
| 246 |
PLOCALE_BACKUP="en" |
| 247 |
|
| 248 |
-inherit autotools estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx versionator xdg-utils |
| 249 |
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils |
| 250 |
|
| 251 |
MY_PN="${PN%%-*}" |
| 252 |
MY_P="${MY_PN}-${PV}" |
| 253 |
@@ -18,7 +18,7 @@ if [[ ${PV} == "9999" ]] ; then |
| 254 |
SRC_URI="" |
| 255 |
#KEYWORDS="" |
| 256 |
else |
| 257 |
- MAJOR_V=$(get_version_component_range 1) |
| 258 |
+ MAJOR_V=$(ver_cut 1) |
| 259 |
SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.x/${MY_P}.tar.xz" |
| 260 |
KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd" |
| 261 |
fi |
| 262 |
@@ -278,14 +278,19 @@ wine_env_vcs_vars() { |
| 263 |
if use staging || use d3d9; then |
| 264 |
eerror "Because of the multi-repo nature of ${MY_PN}, ${pn_live_var}" |
| 265 |
eerror "cannot be used to set the commit. Instead, you may use the" |
| 266 |
- eerror "environmental variables WINE_COMMIT, STAGING_COMMIT, and D3D9_COMMIT." |
| 267 |
+ eerror "environment variables:" |
| 268 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
| 269 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE_STAGING_WINE_STAGING" |
| 270 |
+ eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES" |
| 271 |
eerror |
| 272 |
return 1 |
| 273 |
fi |
| 274 |
fi |
| 275 |
if [[ ! -z ${EGIT_COMMIT} ]]; then |
| 276 |
- eerror "Commits must now be specified using the environmental variables" |
| 277 |
- eerror "WINE_COMMIT, STAGING_COMMIT, and D3D9_COMMIT" |
| 278 |
+ eerror "Commits must now be specified using the environment variables:" |
| 279 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
| 280 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE_STAGING_WINE_STAGING" |
| 281 |
+ eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES" |
| 282 |
eerror |
| 283 |
return 1 |
| 284 |
fi |
| 285 |
@@ -324,24 +329,22 @@ pkg_setup() { |
| 286 |
|
| 287 |
src_unpack() { |
| 288 |
if [[ ${PV} == "9999" ]] ; then |
| 289 |
- EGIT_CHECKOUT_DIR="${S}" EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack |
| 290 |
+ EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack |
| 291 |
if use staging; then |
| 292 |
- local CURRENT_WINE_COMMIT=${EGIT_VERSION} |
| 293 |
+ local CURRENT_COMMIT_WINE=${EGIT_VERSION} |
| 294 |
|
| 295 |
- git-r3_fetch "${STAGING_EGIT_REPO_URI}" "${STAGING_COMMIT}" |
| 296 |
- git-r3_checkout "${STAGING_EGIT_REPO_URI}" "${STAGING_DIR}" |
| 297 |
+ EGIT_CHECKOUT_DIR="${STAGING_DIR}" EGIT_REPO_URI="${STAGING_EGIT_REPO_URI}" git-r3_src_unpack |
| 298 |
|
| 299 |
- local COMPAT_WINE_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die |
| 300 |
+ local COMPAT_COMMIT_WINE=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die |
| 301 |
|
| 302 |
- if [[ "${CURRENT_WINE_COMMIT}" != "${COMPAT_WINE_COMMIT}" ]]; then |
| 303 |
+ if [[ "${CURRENT_COMMIT_WINE}" != "${COMPAT_COMMIT_WINE}" ]]; then |
| 304 |
einfo "The current Staging patchset is not guaranteed to apply on this WINE commit." |
| 305 |
- einfo "If src_prepare fails, try emerging with the env var WINE_COMMIT." |
| 306 |
- einfo "Example: WINE_COMMIT=${COMPAT_WINE_COMMIT} emerge -1 wine" |
| 307 |
+ einfo "If src_prepare fails, try emerging with the env var EGIT_OVERRIDE_COMMIT_WINE." |
| 308 |
+ einfo "Example: EGIT_OVERRIDE_COMMIT_WINE=${COMPAT_COMMIT_WINE} emerge -1 wine" |
| 309 |
fi |
| 310 |
fi |
| 311 |
if use d3d9; then |
| 312 |
- git-r3_fetch "${D3D9_EGIT_REPO_URI}" "${D3D9_COMMIT}" |
| 313 |
- git-r3_checkout "${D3D9_EGIT_REPO_URI}" "${D3D9_DIR}" |
| 314 |
+ EGIT_CHECKOUT_DIR="${D3D9_DIR}" EGIT_REPO_URI="${D3D9_EGIT_REPO_URI}" git-r3_src_unpack |
| 315 |
fi |
| 316 |
fi |
| 317 |
|
| 318 |
|
| 319 |
diff --git a/app-emulation/wine-any/wine-any-3.18.ebuild b/app-emulation/wine-any/wine-any-3.19.ebuild |
| 320 |
similarity index 94% |
| 321 |
copy from app-emulation/wine-any/wine-any-3.18.ebuild |
| 322 |
copy to app-emulation/wine-any/wine-any-3.19.ebuild |
| 323 |
index 67fbe2cda64..24ab26fa3a3 100644 |
| 324 |
--- a/app-emulation/wine-any/wine-any-3.18.ebuild |
| 325 |
+++ b/app-emulation/wine-any/wine-any-3.19.ebuild |
| 326 |
@@ -6,7 +6,7 @@ EAPI=6 |
| 327 |
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" |
| 328 |
PLOCALE_BACKUP="en" |
| 329 |
|
| 330 |
-inherit autotools estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx versionator xdg-utils |
| 331 |
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils |
| 332 |
|
| 333 |
MY_PN="${PN%%-*}" |
| 334 |
MY_P="${MY_PN}-${PV}" |
| 335 |
@@ -18,7 +18,7 @@ if [[ ${PV} == "9999" ]] ; then |
| 336 |
SRC_URI="" |
| 337 |
#KEYWORDS="" |
| 338 |
else |
| 339 |
- MAJOR_V=$(get_version_component_range 1) |
| 340 |
+ MAJOR_V=$(ver_cut 1) |
| 341 |
SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.x/${MY_P}.tar.xz" |
| 342 |
KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd" |
| 343 |
fi |
| 344 |
@@ -278,14 +278,19 @@ wine_env_vcs_vars() { |
| 345 |
if use staging || use d3d9; then |
| 346 |
eerror "Because of the multi-repo nature of ${MY_PN}, ${pn_live_var}" |
| 347 |
eerror "cannot be used to set the commit. Instead, you may use the" |
| 348 |
- eerror "environmental variables WINE_COMMIT, STAGING_COMMIT, and D3D9_COMMIT." |
| 349 |
+ eerror "environment variables:" |
| 350 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
| 351 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE_STAGING_WINE_STAGING" |
| 352 |
+ eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES" |
| 353 |
eerror |
| 354 |
return 1 |
| 355 |
fi |
| 356 |
fi |
| 357 |
if [[ ! -z ${EGIT_COMMIT} ]]; then |
| 358 |
- eerror "Commits must now be specified using the environmental variables" |
| 359 |
- eerror "WINE_COMMIT, STAGING_COMMIT, and D3D9_COMMIT" |
| 360 |
+ eerror "Commits must now be specified using the environment variables:" |
| 361 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
| 362 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE_STAGING_WINE_STAGING" |
| 363 |
+ eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES" |
| 364 |
eerror |
| 365 |
return 1 |
| 366 |
fi |
| 367 |
@@ -324,24 +329,22 @@ pkg_setup() { |
| 368 |
|
| 369 |
src_unpack() { |
| 370 |
if [[ ${PV} == "9999" ]] ; then |
| 371 |
- EGIT_CHECKOUT_DIR="${S}" EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack |
| 372 |
+ EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack |
| 373 |
if use staging; then |
| 374 |
- local CURRENT_WINE_COMMIT=${EGIT_VERSION} |
| 375 |
+ local CURRENT_COMMIT_WINE=${EGIT_VERSION} |
| 376 |
|
| 377 |
- git-r3_fetch "${STAGING_EGIT_REPO_URI}" "${STAGING_COMMIT}" |
| 378 |
- git-r3_checkout "${STAGING_EGIT_REPO_URI}" "${STAGING_DIR}" |
| 379 |
+ EGIT_CHECKOUT_DIR="${STAGING_DIR}" EGIT_REPO_URI="${STAGING_EGIT_REPO_URI}" git-r3_src_unpack |
| 380 |
|
| 381 |
- local COMPAT_WINE_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die |
| 382 |
+ local COMPAT_COMMIT_WINE=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die |
| 383 |
|
| 384 |
- if [[ "${CURRENT_WINE_COMMIT}" != "${COMPAT_WINE_COMMIT}" ]]; then |
| 385 |
+ if [[ "${CURRENT_COMMIT_WINE}" != "${COMPAT_COMMIT_WINE}" ]]; then |
| 386 |
einfo "The current Staging patchset is not guaranteed to apply on this WINE commit." |
| 387 |
- einfo "If src_prepare fails, try emerging with the env var WINE_COMMIT." |
| 388 |
- einfo "Example: WINE_COMMIT=${COMPAT_WINE_COMMIT} emerge -1 wine" |
| 389 |
+ einfo "If src_prepare fails, try emerging with the env var EGIT_OVERRIDE_COMMIT_WINE." |
| 390 |
+ einfo "Example: EGIT_OVERRIDE_COMMIT_WINE=${COMPAT_COMMIT_WINE} emerge -1 wine" |
| 391 |
fi |
| 392 |
fi |
| 393 |
if use d3d9; then |
| 394 |
- git-r3_fetch "${D3D9_EGIT_REPO_URI}" "${D3D9_COMMIT}" |
| 395 |
- git-r3_checkout "${D3D9_EGIT_REPO_URI}" "${D3D9_DIR}" |
| 396 |
+ EGIT_CHECKOUT_DIR="${D3D9_DIR}" EGIT_REPO_URI="${D3D9_EGIT_REPO_URI}" git-r3_src_unpack |
| 397 |
fi |
| 398 |
fi |
| 399 |
|
| 400 |
|
| 401 |
diff --git a/app-emulation/wine-any/wine-any-9999.ebuild b/app-emulation/wine-any/wine-any-9999.ebuild |
| 402 |
index 66208fb6657..24ab26fa3a3 100644 |
| 403 |
--- a/app-emulation/wine-any/wine-any-9999.ebuild |
| 404 |
+++ b/app-emulation/wine-any/wine-any-9999.ebuild |
| 405 |
@@ -1,4 +1,4 @@ |
| 406 |
-# Copyright 1999-2018 Gentoo Foundation |
| 407 |
+# Copyright 1999-2018 Gentoo Authors |
| 408 |
# Distributed under the terms of the GNU General Public License v2 |
| 409 |
|
| 410 |
EAPI=6 |
| 411 |
@@ -6,7 +6,7 @@ EAPI=6 |
| 412 |
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" |
| 413 |
PLOCALE_BACKUP="en" |
| 414 |
|
| 415 |
-inherit autotools estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx versionator xdg-utils |
| 416 |
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils |
| 417 |
|
| 418 |
MY_PN="${PN%%-*}" |
| 419 |
MY_P="${MY_PN}-${PV}" |
| 420 |
@@ -18,7 +18,7 @@ if [[ ${PV} == "9999" ]] ; then |
| 421 |
SRC_URI="" |
| 422 |
#KEYWORDS="" |
| 423 |
else |
| 424 |
- MAJOR_V=$(get_version_component_range 1) |
| 425 |
+ MAJOR_V=$(ver_cut 1) |
| 426 |
SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.x/${MY_P}.tar.xz" |
| 427 |
KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd" |
| 428 |
fi |
| 429 |
@@ -278,14 +278,19 @@ wine_env_vcs_vars() { |
| 430 |
if use staging || use d3d9; then |
| 431 |
eerror "Because of the multi-repo nature of ${MY_PN}, ${pn_live_var}" |
| 432 |
eerror "cannot be used to set the commit. Instead, you may use the" |
| 433 |
- eerror "environmental variables WINE_COMMIT, STAGING_COMMIT, and D3D9_COMMIT." |
| 434 |
+ eerror "environment variables:" |
| 435 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
| 436 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE_STAGING_WINE_STAGING" |
| 437 |
+ eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES" |
| 438 |
eerror |
| 439 |
return 1 |
| 440 |
fi |
| 441 |
fi |
| 442 |
if [[ ! -z ${EGIT_COMMIT} ]]; then |
| 443 |
- eerror "Commits must now be specified using the environmental variables" |
| 444 |
- eerror "WINE_COMMIT, STAGING_COMMIT, and D3D9_COMMIT" |
| 445 |
+ eerror "Commits must now be specified using the environment variables:" |
| 446 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
| 447 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE_STAGING_WINE_STAGING" |
| 448 |
+ eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES" |
| 449 |
eerror |
| 450 |
return 1 |
| 451 |
fi |
| 452 |
@@ -324,24 +329,22 @@ pkg_setup() { |
| 453 |
|
| 454 |
src_unpack() { |
| 455 |
if [[ ${PV} == "9999" ]] ; then |
| 456 |
- EGIT_CHECKOUT_DIR="${S}" EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack |
| 457 |
+ EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack |
| 458 |
if use staging; then |
| 459 |
- local CURRENT_WINE_COMMIT=${EGIT_VERSION} |
| 460 |
+ local CURRENT_COMMIT_WINE=${EGIT_VERSION} |
| 461 |
|
| 462 |
- git-r3_fetch "${STAGING_EGIT_REPO_URI}" "${STAGING_COMMIT}" |
| 463 |
- git-r3_checkout "${STAGING_EGIT_REPO_URI}" "${STAGING_DIR}" |
| 464 |
+ EGIT_CHECKOUT_DIR="${STAGING_DIR}" EGIT_REPO_URI="${STAGING_EGIT_REPO_URI}" git-r3_src_unpack |
| 465 |
|
| 466 |
- local COMPAT_WINE_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die |
| 467 |
+ local COMPAT_COMMIT_WINE=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die |
| 468 |
|
| 469 |
- if [[ "${CURRENT_WINE_COMMIT}" != "${COMPAT_WINE_COMMIT}" ]]; then |
| 470 |
+ if [[ "${CURRENT_COMMIT_WINE}" != "${COMPAT_COMMIT_WINE}" ]]; then |
| 471 |
einfo "The current Staging patchset is not guaranteed to apply on this WINE commit." |
| 472 |
- einfo "If src_prepare fails, try emerging with the env var WINE_COMMIT." |
| 473 |
- einfo "Example: WINE_COMMIT=${COMPAT_WINE_COMMIT} emerge -1 wine" |
| 474 |
+ einfo "If src_prepare fails, try emerging with the env var EGIT_OVERRIDE_COMMIT_WINE." |
| 475 |
+ einfo "Example: EGIT_OVERRIDE_COMMIT_WINE=${COMPAT_COMMIT_WINE} emerge -1 wine" |
| 476 |
fi |
| 477 |
fi |
| 478 |
if use d3d9; then |
| 479 |
- git-r3_fetch "${D3D9_EGIT_REPO_URI}" "${D3D9_COMMIT}" |
| 480 |
- git-r3_checkout "${D3D9_EGIT_REPO_URI}" "${D3D9_DIR}" |
| 481 |
+ EGIT_CHECKOUT_DIR="${D3D9_DIR}" EGIT_REPO_URI="${D3D9_EGIT_REPO_URI}" git-r3_src_unpack |
| 482 |
fi |
| 483 |
fi |
Archives