| 1 |
commit: 70a08bc01bd3397c41965b8e0f7046d44bd028cd |
| 2 |
Author: Nick Sarnie <sarnex <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Nov 4 21:01:16 2018 +0000 |
| 4 |
Commit: Nick Sarnie <sarnex <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Nov 4 21:01:16 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=70a08bc0 |
| 7 |
|
| 8 |
app-emulation/wine-d3d9: 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-d3d9/Manifest | 2 ++ |
| 17 |
app-emulation/wine-d3d9/metadata.xml | 11 ++++++----- |
| 18 |
app-emulation/wine-d3d9/wine-d3d9-3.16.ebuild | 20 +++++++++++--------- |
| 19 |
app-emulation/wine-d3d9/wine-d3d9-3.17.ebuild | 18 ++++++++++-------- |
| 20 |
app-emulation/wine-d3d9/wine-d3d9-3.18.ebuild | 18 ++++++++++-------- |
| 21 |
.../{wine-d3d9-3.18.ebuild => wine-d3d9-3.19.ebuild} | 18 ++++++++++-------- |
| 22 |
app-emulation/wine-d3d9/wine-d3d9-9999.ebuild | 20 +++++++++++--------- |
| 23 |
7 files changed, 60 insertions(+), 47 deletions(-) |
| 24 |
|
| 25 |
diff --git a/app-emulation/wine-d3d9/Manifest b/app-emulation/wine-d3d9/Manifest |
| 26 |
index f3464f3991f..cf5670e4dee 100644 |
| 27 |
--- a/app-emulation/wine-d3d9/Manifest |
| 28 |
+++ b/app-emulation/wine-d3d9/Manifest |
| 29 |
@@ -3,7 +3,9 @@ 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 |
|
| 40 |
diff --git a/app-emulation/wine-d3d9/metadata.xml b/app-emulation/wine-d3d9/metadata.xml |
| 41 |
index fcb2defbd2b..3116c6dc74c 100644 |
| 42 |
--- a/app-emulation/wine-d3d9/metadata.xml |
| 43 |
+++ b/app-emulation/wine-d3d9/metadata.xml |
| 44 |
@@ -36,12 +36,13 @@ This variant of the Wine packaging includes the Gallium Nine patchset. |
| 45 |
<flag name="pcap">Support packet capture software (e.g. wireshark)</flag> |
| 46 |
<flag name="perl">Install helpers written in perl (winedump/winemaker)</flag> |
| 47 |
<flag name="prelink">Run prelink on DLLs during build; |
| 48 |
- 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> |
| 49 |
+ For Gentoo hardened, do not disable if you do not know what this means as it can break things at runtime</flag> |
| 50 |
<flag name="realtime">Pull in <pkg>sys-auth/rtkit</pkg> for low-latency pulseaudio support</flag> |
| 51 |
<flag name="run-exes">Use Wine to open and run .EXE and .MSI files</flag> |
| 52 |
- <flag name="samba">Add support for NTLM auth. see |
| 53 |
- http://wiki.winehq.org/NtlmAuthSetupGuide and |
| 54 |
- http://wiki.winehq.org/NtlmSigningAndSealing</flag> |
| 55 |
+ <flag name="samba">Add support for NTLM auth. See: |
| 56 |
+ https://web.archive.org/web/20160108123008/http://wiki.winehq.org:80/NtlmAuthSetupGuide and |
| 57 |
+ https://web.archive.org/web/20150906013746/http://wiki.winehq.org/NtlmSigningAndSealing |
| 58 |
+ (these pages are not currently in the updated WineHQ Wiki).</flag> |
| 59 |
<flag name="sdl">Add support for gamepad detection using SDL</flag> |
| 60 |
<flag name="udev">Use <pkg>virtual/libudev</pkg> to provide plug and play support</flag> |
| 61 |
<flag name="vkd3d">Use <pkg>app-emulation/vkd3d</pkg> to provide Direct3D 12 support</flag> |
| 62 |
@@ -49,6 +50,6 @@ This variant of the Wine packaging includes the Gallium Nine patchset. |
| 63 |
</use> |
| 64 |
<upstream> |
| 65 |
<remote-id type="sourceforge">wine</remote-id> |
| 66 |
- <remote-id type="github">NP-Hardass/wine-desktop-common</remote-id> |
| 67 |
+ <remote-id type="github">sarnex/wine-d3d9-patches</remote-id> |
| 68 |
</upstream> |
| 69 |
</pkgmetadata> |
| 70 |
|
| 71 |
diff --git a/app-emulation/wine-d3d9/wine-d3d9-3.16.ebuild b/app-emulation/wine-d3d9/wine-d3d9-3.16.ebuild |
| 72 |
index b92ea182b4a..fb4d194b4fb 100644 |
| 73 |
--- a/app-emulation/wine-d3d9/wine-d3d9-3.16.ebuild |
| 74 |
+++ b/app-emulation/wine-d3d9/wine-d3d9-3.16.ebuild |
| 75 |
@@ -1,4 +1,4 @@ |
| 76 |
-# Copyright 1999-2018 Gentoo Foundation |
| 77 |
+# Copyright 1999-2018 Gentoo Authors |
| 78 |
# Distributed under the terms of the GNU General Public License v2 |
| 79 |
|
| 80 |
EAPI=6 |
| 81 |
@@ -6,7 +6,7 @@ EAPI=6 |
| 82 |
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" |
| 83 |
PLOCALE_BACKUP="en" |
| 84 |
|
| 85 |
-inherit autotools estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx versionator xdg-utils |
| 86 |
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils |
| 87 |
|
| 88 |
MY_PN="${PN%%-*}" |
| 89 |
MY_P="${MY_PN}-${PV}" |
| 90 |
@@ -18,7 +18,7 @@ if [[ ${PV} == "9999" ]] ; then |
| 91 |
SRC_URI="" |
| 92 |
#KEYWORDS="" |
| 93 |
else |
| 94 |
- MAJOR_V=$(get_version_component_range 1) |
| 95 |
+ MAJOR_V=$(ver_cut 1) |
| 96 |
SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.x/${MY_P}.tar.xz" |
| 97 |
KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd" |
| 98 |
fi |
| 99 |
@@ -258,14 +258,17 @@ wine_env_vcs_vars() { |
| 100 |
if use d3d9; then |
| 101 |
eerror "Because of the multi-repo nature of ${MY_PN}, ${pn_live_var}" |
| 102 |
eerror "cannot be used to set the commit. Instead, you may use the" |
| 103 |
- eerror "environmental variables WINE_COMMIT, and D3D9_COMMIT." |
| 104 |
+ eerror "environment variables:" |
| 105 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
| 106 |
+ eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES" |
| 107 |
eerror |
| 108 |
return 1 |
| 109 |
fi |
| 110 |
fi |
| 111 |
if [[ ! -z ${EGIT_COMMIT} ]]; then |
| 112 |
- eerror "Commits must now be specified using the environmental variables" |
| 113 |
- eerror "WINE_COMMIT, and D3D9_COMMIT" |
| 114 |
+ eerror "Commits must now be specified using the environment variables:" |
| 115 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
| 116 |
+ eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES" |
| 117 |
eerror |
| 118 |
return 1 |
| 119 |
fi |
| 120 |
@@ -304,10 +307,9 @@ pkg_setup() { |
| 121 |
|
| 122 |
src_unpack() { |
| 123 |
if [[ ${PV} == "9999" ]] ; then |
| 124 |
- EGIT_CHECKOUT_DIR="${S}" EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack |
| 125 |
+ EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack |
| 126 |
if use d3d9; then |
| 127 |
- git-r3_fetch "${D3D9_EGIT_REPO_URI}" "${D3D9_COMMIT}" |
| 128 |
- git-r3_checkout "${D3D9_EGIT_REPO_URI}" "${D3D9_DIR}" |
| 129 |
+ EGIT_CHECKOUT_DIR="${D3D9_DIR}" EGIT_REPO_URI="${D3D9_EGIT_REPO_URI}" git-r3_src_unpack |
| 130 |
fi |
| 131 |
fi |
| 132 |
|
| 133 |
|
| 134 |
diff --git a/app-emulation/wine-d3d9/wine-d3d9-3.17.ebuild b/app-emulation/wine-d3d9/wine-d3d9-3.17.ebuild |
| 135 |
index 175fd1b98d0..fb4d194b4fb 100644 |
| 136 |
--- a/app-emulation/wine-d3d9/wine-d3d9-3.17.ebuild |
| 137 |
+++ b/app-emulation/wine-d3d9/wine-d3d9-3.17.ebuild |
| 138 |
@@ -6,7 +6,7 @@ EAPI=6 |
| 139 |
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" |
| 140 |
PLOCALE_BACKUP="en" |
| 141 |
|
| 142 |
-inherit autotools estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx versionator xdg-utils |
| 143 |
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils |
| 144 |
|
| 145 |
MY_PN="${PN%%-*}" |
| 146 |
MY_P="${MY_PN}-${PV}" |
| 147 |
@@ -18,7 +18,7 @@ if [[ ${PV} == "9999" ]] ; then |
| 148 |
SRC_URI="" |
| 149 |
#KEYWORDS="" |
| 150 |
else |
| 151 |
- MAJOR_V=$(get_version_component_range 1) |
| 152 |
+ MAJOR_V=$(ver_cut 1) |
| 153 |
SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.x/${MY_P}.tar.xz" |
| 154 |
KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd" |
| 155 |
fi |
| 156 |
@@ -258,14 +258,17 @@ wine_env_vcs_vars() { |
| 157 |
if use d3d9; then |
| 158 |
eerror "Because of the multi-repo nature of ${MY_PN}, ${pn_live_var}" |
| 159 |
eerror "cannot be used to set the commit. Instead, you may use the" |
| 160 |
- eerror "environmental variables WINE_COMMIT, and D3D9_COMMIT." |
| 161 |
+ eerror "environment variables:" |
| 162 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
| 163 |
+ eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES" |
| 164 |
eerror |
| 165 |
return 1 |
| 166 |
fi |
| 167 |
fi |
| 168 |
if [[ ! -z ${EGIT_COMMIT} ]]; then |
| 169 |
- eerror "Commits must now be specified using the environmental variables" |
| 170 |
- eerror "WINE_COMMIT, and D3D9_COMMIT" |
| 171 |
+ eerror "Commits must now be specified using the environment variables:" |
| 172 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
| 173 |
+ eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES" |
| 174 |
eerror |
| 175 |
return 1 |
| 176 |
fi |
| 177 |
@@ -304,10 +307,9 @@ pkg_setup() { |
| 178 |
|
| 179 |
src_unpack() { |
| 180 |
if [[ ${PV} == "9999" ]] ; then |
| 181 |
- EGIT_CHECKOUT_DIR="${S}" EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack |
| 182 |
+ EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack |
| 183 |
if use d3d9; then |
| 184 |
- git-r3_fetch "${D3D9_EGIT_REPO_URI}" "${D3D9_COMMIT}" |
| 185 |
- git-r3_checkout "${D3D9_EGIT_REPO_URI}" "${D3D9_DIR}" |
| 186 |
+ EGIT_CHECKOUT_DIR="${D3D9_DIR}" EGIT_REPO_URI="${D3D9_EGIT_REPO_URI}" git-r3_src_unpack |
| 187 |
fi |
| 188 |
fi |
| 189 |
|
| 190 |
|
| 191 |
diff --git a/app-emulation/wine-d3d9/wine-d3d9-3.18.ebuild b/app-emulation/wine-d3d9/wine-d3d9-3.18.ebuild |
| 192 |
index 175fd1b98d0..fb4d194b4fb 100644 |
| 193 |
--- a/app-emulation/wine-d3d9/wine-d3d9-3.18.ebuild |
| 194 |
+++ b/app-emulation/wine-d3d9/wine-d3d9-3.18.ebuild |
| 195 |
@@ -6,7 +6,7 @@ EAPI=6 |
| 196 |
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" |
| 197 |
PLOCALE_BACKUP="en" |
| 198 |
|
| 199 |
-inherit autotools estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx versionator xdg-utils |
| 200 |
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils |
| 201 |
|
| 202 |
MY_PN="${PN%%-*}" |
| 203 |
MY_P="${MY_PN}-${PV}" |
| 204 |
@@ -18,7 +18,7 @@ if [[ ${PV} == "9999" ]] ; then |
| 205 |
SRC_URI="" |
| 206 |
#KEYWORDS="" |
| 207 |
else |
| 208 |
- MAJOR_V=$(get_version_component_range 1) |
| 209 |
+ MAJOR_V=$(ver_cut 1) |
| 210 |
SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.x/${MY_P}.tar.xz" |
| 211 |
KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd" |
| 212 |
fi |
| 213 |
@@ -258,14 +258,17 @@ wine_env_vcs_vars() { |
| 214 |
if use d3d9; then |
| 215 |
eerror "Because of the multi-repo nature of ${MY_PN}, ${pn_live_var}" |
| 216 |
eerror "cannot be used to set the commit. Instead, you may use the" |
| 217 |
- eerror "environmental variables WINE_COMMIT, and D3D9_COMMIT." |
| 218 |
+ eerror "environment variables:" |
| 219 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
| 220 |
+ eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES" |
| 221 |
eerror |
| 222 |
return 1 |
| 223 |
fi |
| 224 |
fi |
| 225 |
if [[ ! -z ${EGIT_COMMIT} ]]; then |
| 226 |
- eerror "Commits must now be specified using the environmental variables" |
| 227 |
- eerror "WINE_COMMIT, and D3D9_COMMIT" |
| 228 |
+ eerror "Commits must now be specified using the environment variables:" |
| 229 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
| 230 |
+ eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES" |
| 231 |
eerror |
| 232 |
return 1 |
| 233 |
fi |
| 234 |
@@ -304,10 +307,9 @@ pkg_setup() { |
| 235 |
|
| 236 |
src_unpack() { |
| 237 |
if [[ ${PV} == "9999" ]] ; then |
| 238 |
- EGIT_CHECKOUT_DIR="${S}" EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack |
| 239 |
+ EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack |
| 240 |
if use d3d9; then |
| 241 |
- git-r3_fetch "${D3D9_EGIT_REPO_URI}" "${D3D9_COMMIT}" |
| 242 |
- git-r3_checkout "${D3D9_EGIT_REPO_URI}" "${D3D9_DIR}" |
| 243 |
+ EGIT_CHECKOUT_DIR="${D3D9_DIR}" EGIT_REPO_URI="${D3D9_EGIT_REPO_URI}" git-r3_src_unpack |
| 244 |
fi |
| 245 |
fi |
| 246 |
|
| 247 |
|
| 248 |
diff --git a/app-emulation/wine-d3d9/wine-d3d9-3.18.ebuild b/app-emulation/wine-d3d9/wine-d3d9-3.19.ebuild |
| 249 |
similarity index 96% |
| 250 |
copy from app-emulation/wine-d3d9/wine-d3d9-3.18.ebuild |
| 251 |
copy to app-emulation/wine-d3d9/wine-d3d9-3.19.ebuild |
| 252 |
index 175fd1b98d0..fb4d194b4fb 100644 |
| 253 |
--- a/app-emulation/wine-d3d9/wine-d3d9-3.18.ebuild |
| 254 |
+++ b/app-emulation/wine-d3d9/wine-d3d9-3.19.ebuild |
| 255 |
@@ -6,7 +6,7 @@ EAPI=6 |
| 256 |
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" |
| 257 |
PLOCALE_BACKUP="en" |
| 258 |
|
| 259 |
-inherit autotools estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx versionator xdg-utils |
| 260 |
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils |
| 261 |
|
| 262 |
MY_PN="${PN%%-*}" |
| 263 |
MY_P="${MY_PN}-${PV}" |
| 264 |
@@ -18,7 +18,7 @@ if [[ ${PV} == "9999" ]] ; then |
| 265 |
SRC_URI="" |
| 266 |
#KEYWORDS="" |
| 267 |
else |
| 268 |
- MAJOR_V=$(get_version_component_range 1) |
| 269 |
+ MAJOR_V=$(ver_cut 1) |
| 270 |
SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.x/${MY_P}.tar.xz" |
| 271 |
KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd" |
| 272 |
fi |
| 273 |
@@ -258,14 +258,17 @@ wine_env_vcs_vars() { |
| 274 |
if use d3d9; then |
| 275 |
eerror "Because of the multi-repo nature of ${MY_PN}, ${pn_live_var}" |
| 276 |
eerror "cannot be used to set the commit. Instead, you may use the" |
| 277 |
- eerror "environmental variables WINE_COMMIT, and D3D9_COMMIT." |
| 278 |
+ eerror "environment variables:" |
| 279 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
| 280 |
+ eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES" |
| 281 |
eerror |
| 282 |
return 1 |
| 283 |
fi |
| 284 |
fi |
| 285 |
if [[ ! -z ${EGIT_COMMIT} ]]; then |
| 286 |
- eerror "Commits must now be specified using the environmental variables" |
| 287 |
- eerror "WINE_COMMIT, and D3D9_COMMIT" |
| 288 |
+ eerror "Commits must now be specified using the environment variables:" |
| 289 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
| 290 |
+ eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES" |
| 291 |
eerror |
| 292 |
return 1 |
| 293 |
fi |
| 294 |
@@ -304,10 +307,9 @@ pkg_setup() { |
| 295 |
|
| 296 |
src_unpack() { |
| 297 |
if [[ ${PV} == "9999" ]] ; then |
| 298 |
- EGIT_CHECKOUT_DIR="${S}" EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack |
| 299 |
+ EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack |
| 300 |
if use d3d9; then |
| 301 |
- git-r3_fetch "${D3D9_EGIT_REPO_URI}" "${D3D9_COMMIT}" |
| 302 |
- git-r3_checkout "${D3D9_EGIT_REPO_URI}" "${D3D9_DIR}" |
| 303 |
+ EGIT_CHECKOUT_DIR="${D3D9_DIR}" EGIT_REPO_URI="${D3D9_EGIT_REPO_URI}" git-r3_src_unpack |
| 304 |
fi |
| 305 |
fi |
| 306 |
|
| 307 |
|
| 308 |
diff --git a/app-emulation/wine-d3d9/wine-d3d9-9999.ebuild b/app-emulation/wine-d3d9/wine-d3d9-9999.ebuild |
| 309 |
index b92ea182b4a..fb4d194b4fb 100644 |
| 310 |
--- a/app-emulation/wine-d3d9/wine-d3d9-9999.ebuild |
| 311 |
+++ b/app-emulation/wine-d3d9/wine-d3d9-9999.ebuild |
| 312 |
@@ -1,4 +1,4 @@ |
| 313 |
-# Copyright 1999-2018 Gentoo Foundation |
| 314 |
+# Copyright 1999-2018 Gentoo Authors |
| 315 |
# Distributed under the terms of the GNU General Public License v2 |
| 316 |
|
| 317 |
EAPI=6 |
| 318 |
@@ -6,7 +6,7 @@ EAPI=6 |
| 319 |
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" |
| 320 |
PLOCALE_BACKUP="en" |
| 321 |
|
| 322 |
-inherit autotools estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx versionator xdg-utils |
| 323 |
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils |
| 324 |
|
| 325 |
MY_PN="${PN%%-*}" |
| 326 |
MY_P="${MY_PN}-${PV}" |
| 327 |
@@ -18,7 +18,7 @@ if [[ ${PV} == "9999" ]] ; then |
| 328 |
SRC_URI="" |
| 329 |
#KEYWORDS="" |
| 330 |
else |
| 331 |
- MAJOR_V=$(get_version_component_range 1) |
| 332 |
+ MAJOR_V=$(ver_cut 1) |
| 333 |
SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.x/${MY_P}.tar.xz" |
| 334 |
KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd" |
| 335 |
fi |
| 336 |
@@ -258,14 +258,17 @@ wine_env_vcs_vars() { |
| 337 |
if use d3d9; then |
| 338 |
eerror "Because of the multi-repo nature of ${MY_PN}, ${pn_live_var}" |
| 339 |
eerror "cannot be used to set the commit. Instead, you may use the" |
| 340 |
- eerror "environmental variables WINE_COMMIT, and D3D9_COMMIT." |
| 341 |
+ eerror "environment variables:" |
| 342 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
| 343 |
+ eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES" |
| 344 |
eerror |
| 345 |
return 1 |
| 346 |
fi |
| 347 |
fi |
| 348 |
if [[ ! -z ${EGIT_COMMIT} ]]; then |
| 349 |
- eerror "Commits must now be specified using the environmental variables" |
| 350 |
- eerror "WINE_COMMIT, and D3D9_COMMIT" |
| 351 |
+ eerror "Commits must now be specified using the environment variables:" |
| 352 |
+ eerror " EGIT_OVERRIDE_COMMIT_WINE" |
| 353 |
+ eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES" |
| 354 |
eerror |
| 355 |
return 1 |
| 356 |
fi |
| 357 |
@@ -304,10 +307,9 @@ pkg_setup() { |
| 358 |
|
| 359 |
src_unpack() { |
| 360 |
if [[ ${PV} == "9999" ]] ; then |
| 361 |
- EGIT_CHECKOUT_DIR="${S}" EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack |
| 362 |
+ EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack |
| 363 |
if use d3d9; then |
| 364 |
- git-r3_fetch "${D3D9_EGIT_REPO_URI}" "${D3D9_COMMIT}" |
| 365 |
- git-r3_checkout "${D3D9_EGIT_REPO_URI}" "${D3D9_DIR}" |
| 366 |
+ EGIT_CHECKOUT_DIR="${D3D9_DIR}" EGIT_REPO_URI="${D3D9_EGIT_REPO_URI}" git-r3_src_unpack |
| 367 |
fi |
| 368 |
fi |
Archives