summaryrefslogtreecommitdiff
path: root/app-emulation/wine-d3d9
diff options
context:
space:
mode:
Diffstat (limited to 'app-emulation/wine-d3d9')
-rw-r--r--app-emulation/wine-d3d9/Manifest20
-rw-r--r--app-emulation/wine-d3d9/metadata.xml11
-rw-r--r--app-emulation/wine-d3d9/wine-d3d9-3.17.ebuild18
-rw-r--r--app-emulation/wine-d3d9/wine-d3d9-3.18.ebuild18
-rw-r--r--app-emulation/wine-d3d9/wine-d3d9-3.19.ebuild (renamed from app-emulation/wine-d3d9/wine-d3d9-3.15.ebuild)20
-rw-r--r--app-emulation/wine-d3d9/wine-d3d9-3.20.ebuild (renamed from app-emulation/wine-d3d9/wine-d3d9-3.16.ebuild)20
-rw-r--r--app-emulation/wine-d3d9/wine-d3d9-9999.ebuild20
7 files changed, 69 insertions, 58 deletions
diff --git a/app-emulation/wine-d3d9/Manifest b/app-emulation/wine-d3d9/Manifest
index 10a051a3f0a9..004b6659e8bf 100644
--- a/app-emulation/wine-d3d9/Manifest
+++ b/app-emulation/wine-d3d9/Manifest
@@ -1,15 +1,15 @@
DIST gentoo-wine-patches-20180120.tar.xz 58672 BLAKE2B 84d621075b65475cec41a06429680b518d7eafb938cefd903f3f8aa71ea3049ac9d8de05af48f9f4f4a1b9172c7ef17784540413e410eb8ec11e8ec4a63858c6 SHA512 5b354a409c7a2b77499aaa593b9248a1d15d755e3687b095755faacc30068bfcdbdd5c2a2a78617cb1a78c46d2931162bd69ec3379b035d81494bea7108263c2
-DIST wine-3.15.tar.xz 21402964 BLAKE2B fb74ae33b89612b894463b6381184737ddda7b8a23d939cefc207124529d2042051ae16959f0e752400c02ca1ee69a5870d809912b7ddc9f56c7377bcc643bf2 SHA512 3fb3f6a896eae53ef75a751e72f7431f9b6986b56738dc314bca9eff9d078e65d865ebb28cbb7a63aa571eb11cdaed20c21c36cec565f81610e348fd165e0f2a
-DIST wine-3.16.tar.xz 21432308 BLAKE2B 7c1bca001fed1472ceaf0331e8e17ebf5aa9c0ec025c46c785d2530fd70ebafdff95b581e28ba1e0167f19bac80dd05c4c5c291180c5a3784c44c1dcd4424edb SHA512 f0c566f70ede01e5896b7611dfe58cd6748b92d55d22a71ccc9add575e9aa5062bbbffa14f0a30ee3df5cf79e9ea4dcf02a7d62db64b94d5b56927e256a978c2
DIST wine-3.17.tar.xz 21457736 BLAKE2B 34c2390bd1180f81a15e7db4c712bddd3436033f209870d31f7f286d7dba8c8a65f5dd5cb13cf4c0719cef6a53c168d104e3c78a5ca1777ecf401d8d74e7927a SHA512 ea50c9e09d3fd7f41ff96a1219d43896946ac79c8cdef31ae56e10664fc3b0b6dd1f9d8cd72db874d08c431eba9c8033ea72182499666a5aa62c1056876b0a66
DIST wine-3.18.tar.xz 21479964 BLAKE2B 226ec5df6fb5bd94ea4b994f9142ff725b04c4d92da45360f811533880aa3865715a5fe5bb11ce29a55ed2881974013d58479add90b6ba655b035e61eec149c1 SHA512 2137662ea69964a69d77ff5c05f271783bda49af65d605909074d465ed8087d84065156e5c509eae31b4c3a20e83a838fc71bd077b2267640b163acfa5f7366e
-DIST wine-d3d9-3.15.tar.gz 50540 BLAKE2B 5fbb56d4e6b2373fa9a2075a379e577584a50c04fa15fbe3e282d25b03211e64dc5f429082a654c3c61016ddda9c5a12277b78086a0938e5cb20952b01ef72e2 SHA512 448433198cb40628edf2ee6f7697671c9efb1c8e68ce826b0edc884625e5f1659956f0c76ea995443c29ca4cefe5030559860d7413f553fc4a3523df3a35b3a7
-DIST wine-d3d9-3.16.tar.gz 50547 BLAKE2B d2031ceeb048a1221bd99c634b4ff84787b46fe79bb781c429706c5030a2509792ee3f24ca0d69d844d2d1e505c688aec255b5bf9a6561dc74a819360522c8df SHA512 3f1d2d75fc11ea7dfbe6b9e4e75c4dccc6488814e53be53ba7513da56848d6a57a7a7c66a70088b0615078b00a784caa9033d0415d3c3bb29adbd373d72a4d10
+DIST wine-3.19.tar.xz 21503304 BLAKE2B 0844970cd1f39daf51baf5aba537483d24ee5f5e6d188a1502367a7e2b121fea695cd6584cc87d50dfa32fb1f716387adb513b1645406dbcaed1731e1fd7d50f SHA512 84a1811b01024191959fd16a86bd532c96f16344feb4241954d0b5819ba1db8073dc7adcf1589b67169fb6089d2d501846f6fcbdc396c804f26c794cc4a1edd1
+DIST wine-3.20.tar.xz 21541928 BLAKE2B 9183dacd1c6ec15ae5283eca3d17db5a869bcba9a93800a422f0dea5d9cfb5d3124a3e942e8b6487cd4ba31cfeacdd66de39128dd66d64e1226d265eae922d3a SHA512 fb66d1d4b427f46dd048b13e53bcd15a5eaeb19039221fe98ec771140c33b3c245a974e52242eab5731ffa0de15f5932204032fe24f86e1a313ff8f11da59cc4
DIST wine-d3d9-3.17.tar.gz 50535 BLAKE2B 13e422d9c87696e7573f21120dbc4872792b6abd6dc28638ea3645d97eae1a6d12e8a8f91a219856aa5bf83c3882bc27fd52c5ae66f87a51d362694728f583ba SHA512 06b4c28650a6de9b5028ba9072f75f12c1d47aaa1008d4d21d1c3d26025dd1e42fa23928d2c33167dd969fcd9234b7766f4c6c2e0376b5aad5b38016e48296f8
DIST wine-d3d9-3.18.tar.gz 50540 BLAKE2B 53e292015f420657d5fa54e4fdd1fa86cb03c0ae7c092cb96642a211600fd96fcbe7fa2f8451248e4fb4b7a78bcc174a2db07c7a3ca15ed95a2e70bd4d35876b SHA512 f62b88572210f318da6ff010b4615d0edf215d15fb29292548f116685cb51fffd48aeb393f3471b01604aacbddaf3115522d678307e2c3f5405d1fd6a6f4503c
-EBUILD wine-d3d9-3.15.ebuild 18592 BLAKE2B 8bc6780621a208ff8f65e1874728fe9b5f9cadb6096e76e558cba81756c60df1e6854b32db07200ec497daeacee81254969b80b62d5e6a7038b6089843f9d052 SHA512 c4e8ab68885b8342b5ea28f97f103b8ead51e34bdd9abc7f3ef880540a9ed41256d19c9e5b81df0d87f0bb433fc21fcdea770388bb14ab3f074e1a47f0e566f3
-EBUILD wine-d3d9-3.16.ebuild 18592 BLAKE2B 8bc6780621a208ff8f65e1874728fe9b5f9cadb6096e76e558cba81756c60df1e6854b32db07200ec497daeacee81254969b80b62d5e6a7038b6089843f9d052 SHA512 c4e8ab68885b8342b5ea28f97f103b8ead51e34bdd9abc7f3ef880540a9ed41256d19c9e5b81df0d87f0bb433fc21fcdea770388bb14ab3f074e1a47f0e566f3
-EBUILD wine-d3d9-3.17.ebuild 18589 BLAKE2B e5c7433d1d5a73e90d6602779799a6b8c7ef4700e3bd338e015c297c1aeae96c3d494bf3b3e3d31ff70d4ae0b2e9f7e46917fe5e1cd8901d7e930d0ead2049a8 SHA512 b077b02b80cb67a4aa717e398a231305a32bd37c0c2eb420dafd2025ec7ce87ce22573888d867eba215b157a5856a20e8b5e6505d04b6b05c3e14ca614058957
-EBUILD wine-d3d9-3.18.ebuild 18589 BLAKE2B e5c7433d1d5a73e90d6602779799a6b8c7ef4700e3bd338e015c297c1aeae96c3d494bf3b3e3d31ff70d4ae0b2e9f7e46917fe5e1cd8901d7e930d0ead2049a8 SHA512 b077b02b80cb67a4aa717e398a231305a32bd37c0c2eb420dafd2025ec7ce87ce22573888d867eba215b157a5856a20e8b5e6505d04b6b05c3e14ca614058957
-EBUILD wine-d3d9-9999.ebuild 18592 BLAKE2B 8bc6780621a208ff8f65e1874728fe9b5f9cadb6096e76e558cba81756c60df1e6854b32db07200ec497daeacee81254969b80b62d5e6a7038b6089843f9d052 SHA512 c4e8ab68885b8342b5ea28f97f103b8ead51e34bdd9abc7f3ef880540a9ed41256d19c9e5b81df0d87f0bb433fc21fcdea770388bb14ab3f074e1a47f0e566f3
-MISC metadata.xml 3320 BLAKE2B bbf5e79928f29d124d8a7dd947aa42fdf690d0d7f8905a0e0f43185b7026d4dde787809844ce230c3ab285a3c476c807973b899589d0d383931c96c9f1d54966 SHA512 14e380383fa5345cbd6c5366456f8d122c7bccbf54db863945e5c7673457f29f97e629ec3538030bd991f254d0262045a2d97a467cb100e80e1989728ba65c96
+DIST wine-d3d9-3.19.tar.gz 50542 BLAKE2B 9914139b2657943182f1ac02c43f040669ff6f2e36eee3112267505bbd02969b567ffc23e6965dcb38bd27147f4b6c3630dfd9340b21dcdb6f222a2155fd1b8a SHA512 d8cc0fb98278763d60b4a00c68499aa498b14f12a03d607fa2a0765d26b231a8c270b2b61f7a89b767099ac02aa4e820020eb2dcd78f279885f539e3908362c8
+DIST wine-d3d9-3.20.tar.gz 50539 BLAKE2B 53549364113f9dd9d7c9383ec74cc7eafec61dca5bf1943bd87e51b810e6d85d5d0f86f426a22042ee8a23eb21b6b13c691c43d67de19e66550dd0abc3c0319b SHA512 67d452d46807ee9ca44414326a9b2b90403b5c4c611e34ade03a9b624066b62b056f3adde2c0b6d6bdd73066775a1b3eb43d7cf52f82456eb979f788c3e591b4
+EBUILD wine-d3d9-3.17.ebuild 18641 BLAKE2B 2d5d5e7c36a7260b390f3597996cf071167c3cfcc8542b02a043c568cd3f94155e651c0aa76f99988fa394756124e001c602995e2a2ec4d452596e93ae0a18a2 SHA512 80408733be2a6305866e082eea9f25e8a40aac554966d8a600025d64414270467852f27f6ae1bdfa288e8be5ae55301d6ffcdc8f3859f4cf9bc89f2b07a6fc0d
+EBUILD wine-d3d9-3.18.ebuild 18641 BLAKE2B 2d5d5e7c36a7260b390f3597996cf071167c3cfcc8542b02a043c568cd3f94155e651c0aa76f99988fa394756124e001c602995e2a2ec4d452596e93ae0a18a2 SHA512 80408733be2a6305866e082eea9f25e8a40aac554966d8a600025d64414270467852f27f6ae1bdfa288e8be5ae55301d6ffcdc8f3859f4cf9bc89f2b07a6fc0d
+EBUILD wine-d3d9-3.19.ebuild 18641 BLAKE2B 2d5d5e7c36a7260b390f3597996cf071167c3cfcc8542b02a043c568cd3f94155e651c0aa76f99988fa394756124e001c602995e2a2ec4d452596e93ae0a18a2 SHA512 80408733be2a6305866e082eea9f25e8a40aac554966d8a600025d64414270467852f27f6ae1bdfa288e8be5ae55301d6ffcdc8f3859f4cf9bc89f2b07a6fc0d
+EBUILD wine-d3d9-3.20.ebuild 18641 BLAKE2B 2d5d5e7c36a7260b390f3597996cf071167c3cfcc8542b02a043c568cd3f94155e651c0aa76f99988fa394756124e001c602995e2a2ec4d452596e93ae0a18a2 SHA512 80408733be2a6305866e082eea9f25e8a40aac554966d8a600025d64414270467852f27f6ae1bdfa288e8be5ae55301d6ffcdc8f3859f4cf9bc89f2b07a6fc0d
+EBUILD wine-d3d9-9999.ebuild 18641 BLAKE2B 2d5d5e7c36a7260b390f3597996cf071167c3cfcc8542b02a043c568cd3f94155e651c0aa76f99988fa394756124e001c602995e2a2ec4d452596e93ae0a18a2 SHA512 80408733be2a6305866e082eea9f25e8a40aac554966d8a600025d64414270467852f27f6ae1bdfa288e8be5ae55301d6ffcdc8f3859f4cf9bc89f2b07a6fc0d
+MISC metadata.xml 3451 BLAKE2B 83f6906b20cb3effb9c37152cc36c2d2853d3c313707151e5f1962ea51fbbf5983300edfb7282c367e393ef2ba09534277a4349ef6bdd630802fda04b4861357 SHA512 9c7fa199e699e6df3728c7f9e522a1bd64526198d0a96274d14da00627587c357f6d5ee9678770e2e150065b1246e1803c3a39f0fb6f01182a896a563f8205d6
diff --git a/app-emulation/wine-d3d9/metadata.xml b/app-emulation/wine-d3d9/metadata.xml
index fcb2defbd2be..3116c6dc74c6 100644
--- a/app-emulation/wine-d3d9/metadata.xml
+++ b/app-emulation/wine-d3d9/metadata.xml
@@ -36,12 +36,13 @@ This variant of the Wine packaging includes the Gallium Nine patchset.
<flag name="pcap">Support packet capture software (e.g. wireshark)</flag>
<flag name="perl">Install helpers written in perl (winedump/winemaker)</flag>
<flag name="prelink">Run prelink on DLLs during build;
- 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>
+ For Gentoo hardened, do not disable if you do not know what this means as it can break things at runtime</flag>
<flag name="realtime">Pull in <pkg>sys-auth/rtkit</pkg> for low-latency pulseaudio support</flag>
<flag name="run-exes">Use Wine to open and run .EXE and .MSI files</flag>
- <flag name="samba">Add support for NTLM auth. see
- http://wiki.winehq.org/NtlmAuthSetupGuide and
- http://wiki.winehq.org/NtlmSigningAndSealing</flag>
+ <flag name="samba">Add support for NTLM auth. See:
+ https://web.archive.org/web/20160108123008/http://wiki.winehq.org:80/NtlmAuthSetupGuide and
+ https://web.archive.org/web/20150906013746/http://wiki.winehq.org/NtlmSigningAndSealing
+ (these pages are not currently in the updated WineHQ Wiki).</flag>
<flag name="sdl">Add support for gamepad detection using SDL</flag>
<flag name="udev">Use <pkg>virtual/libudev</pkg> to provide plug and play support</flag>
<flag name="vkd3d">Use <pkg>app-emulation/vkd3d</pkg> to provide Direct3D 12 support</flag>
@@ -49,6 +50,6 @@ This variant of the Wine packaging includes the Gallium Nine patchset.
</use>
<upstream>
<remote-id type="sourceforge">wine</remote-id>
- <remote-id type="github">NP-Hardass/wine-desktop-common</remote-id>
+ <remote-id type="github">sarnex/wine-d3d9-patches</remote-id>
</upstream>
</pkgmetadata>
diff --git a/app-emulation/wine-d3d9/wine-d3d9-3.17.ebuild b/app-emulation/wine-d3d9/wine-d3d9-3.17.ebuild
index 175fd1b98d03..fb4d194b4fbe 100644
--- a/app-emulation/wine-d3d9/wine-d3d9-3.17.ebuild
+++ b/app-emulation/wine-d3d9/wine-d3d9-3.17.ebuild
@@ -6,7 +6,7 @@ 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 estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx versionator xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
MY_PN="${PN%%-*}"
MY_P="${MY_PN}-${PV}"
@@ -18,7 +18,7 @@ if [[ ${PV} == "9999" ]] ; then
SRC_URI=""
#KEYWORDS=""
else
- MAJOR_V=$(get_version_component_range 1)
+ MAJOR_V=$(ver_cut 1)
SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.x/${MY_P}.tar.xz"
KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
fi
@@ -258,14 +258,17 @@ wine_env_vcs_vars() {
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 "environment variables:"
+ eerror " EGIT_OVERRIDE_COMMIT_WINE"
+ eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES"
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 "Commits must now be specified using the environment variables:"
+ eerror " EGIT_OVERRIDE_COMMIT_WINE"
+ eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES"
eerror
return 1
fi
@@ -304,10 +307,9 @@ pkg_setup() {
src_unpack() {
if [[ ${PV} == "9999" ]] ; then
- EGIT_CHECKOUT_DIR="${S}" EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack
+ EGIT_CHECKOUT_DIR="${S}" 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}"
+ EGIT_CHECKOUT_DIR="${D3D9_DIR}" EGIT_REPO_URI="${D3D9_EGIT_REPO_URI}" git-r3_src_unpack
fi
fi
diff --git a/app-emulation/wine-d3d9/wine-d3d9-3.18.ebuild b/app-emulation/wine-d3d9/wine-d3d9-3.18.ebuild
index 175fd1b98d03..fb4d194b4fbe 100644
--- a/app-emulation/wine-d3d9/wine-d3d9-3.18.ebuild
+++ b/app-emulation/wine-d3d9/wine-d3d9-3.18.ebuild
@@ -6,7 +6,7 @@ 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 estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx versionator xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
MY_PN="${PN%%-*}"
MY_P="${MY_PN}-${PV}"
@@ -18,7 +18,7 @@ if [[ ${PV} == "9999" ]] ; then
SRC_URI=""
#KEYWORDS=""
else
- MAJOR_V=$(get_version_component_range 1)
+ MAJOR_V=$(ver_cut 1)
SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.x/${MY_P}.tar.xz"
KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
fi
@@ -258,14 +258,17 @@ wine_env_vcs_vars() {
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 "environment variables:"
+ eerror " EGIT_OVERRIDE_COMMIT_WINE"
+ eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES"
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 "Commits must now be specified using the environment variables:"
+ eerror " EGIT_OVERRIDE_COMMIT_WINE"
+ eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES"
eerror
return 1
fi
@@ -304,10 +307,9 @@ pkg_setup() {
src_unpack() {
if [[ ${PV} == "9999" ]] ; then
- EGIT_CHECKOUT_DIR="${S}" EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack
+ EGIT_CHECKOUT_DIR="${S}" 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}"
+ EGIT_CHECKOUT_DIR="${D3D9_DIR}" EGIT_REPO_URI="${D3D9_EGIT_REPO_URI}" git-r3_src_unpack
fi
fi
diff --git a/app-emulation/wine-d3d9/wine-d3d9-3.15.ebuild b/app-emulation/wine-d3d9/wine-d3d9-3.19.ebuild
index b92ea182b4a0..fb4d194b4fbe 100644
--- a/app-emulation/wine-d3d9/wine-d3d9-3.15.ebuild
+++ b/app-emulation/wine-d3d9/wine-d3d9-3.19.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -6,7 +6,7 @@ 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 estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx versionator xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
MY_PN="${PN%%-*}"
MY_P="${MY_PN}-${PV}"
@@ -18,7 +18,7 @@ if [[ ${PV} == "9999" ]] ; then
SRC_URI=""
#KEYWORDS=""
else
- MAJOR_V=$(get_version_component_range 1)
+ MAJOR_V=$(ver_cut 1)
SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.x/${MY_P}.tar.xz"
KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
fi
@@ -258,14 +258,17 @@ wine_env_vcs_vars() {
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 "environment variables:"
+ eerror " EGIT_OVERRIDE_COMMIT_WINE"
+ eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES"
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 "Commits must now be specified using the environment variables:"
+ eerror " EGIT_OVERRIDE_COMMIT_WINE"
+ eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES"
eerror
return 1
fi
@@ -304,10 +307,9 @@ pkg_setup() {
src_unpack() {
if [[ ${PV} == "9999" ]] ; then
- EGIT_CHECKOUT_DIR="${S}" EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack
+ EGIT_CHECKOUT_DIR="${S}" 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}"
+ EGIT_CHECKOUT_DIR="${D3D9_DIR}" EGIT_REPO_URI="${D3D9_EGIT_REPO_URI}" git-r3_src_unpack
fi
fi
diff --git a/app-emulation/wine-d3d9/wine-d3d9-3.16.ebuild b/app-emulation/wine-d3d9/wine-d3d9-3.20.ebuild
index b92ea182b4a0..fb4d194b4fbe 100644
--- a/app-emulation/wine-d3d9/wine-d3d9-3.16.ebuild
+++ b/app-emulation/wine-d3d9/wine-d3d9-3.20.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -6,7 +6,7 @@ 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 estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx versionator xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
MY_PN="${PN%%-*}"
MY_P="${MY_PN}-${PV}"
@@ -18,7 +18,7 @@ if [[ ${PV} == "9999" ]] ; then
SRC_URI=""
#KEYWORDS=""
else
- MAJOR_V=$(get_version_component_range 1)
+ MAJOR_V=$(ver_cut 1)
SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.x/${MY_P}.tar.xz"
KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
fi
@@ -258,14 +258,17 @@ wine_env_vcs_vars() {
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 "environment variables:"
+ eerror " EGIT_OVERRIDE_COMMIT_WINE"
+ eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES"
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 "Commits must now be specified using the environment variables:"
+ eerror " EGIT_OVERRIDE_COMMIT_WINE"
+ eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES"
eerror
return 1
fi
@@ -304,10 +307,9 @@ pkg_setup() {
src_unpack() {
if [[ ${PV} == "9999" ]] ; then
- EGIT_CHECKOUT_DIR="${S}" EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack
+ EGIT_CHECKOUT_DIR="${S}" 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}"
+ EGIT_CHECKOUT_DIR="${D3D9_DIR}" EGIT_REPO_URI="${D3D9_EGIT_REPO_URI}" git-r3_src_unpack
fi
fi
diff --git a/app-emulation/wine-d3d9/wine-d3d9-9999.ebuild b/app-emulation/wine-d3d9/wine-d3d9-9999.ebuild
index b92ea182b4a0..fb4d194b4fbe 100644
--- a/app-emulation/wine-d3d9/wine-d3d9-9999.ebuild
+++ b/app-emulation/wine-d3d9/wine-d3d9-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -6,7 +6,7 @@ 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 estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx versionator xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
MY_PN="${PN%%-*}"
MY_P="${MY_PN}-${PV}"
@@ -18,7 +18,7 @@ if [[ ${PV} == "9999" ]] ; then
SRC_URI=""
#KEYWORDS=""
else
- MAJOR_V=$(get_version_component_range 1)
+ MAJOR_V=$(ver_cut 1)
SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.x/${MY_P}.tar.xz"
KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
fi
@@ -258,14 +258,17 @@ wine_env_vcs_vars() {
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 "environment variables:"
+ eerror " EGIT_OVERRIDE_COMMIT_WINE"
+ eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES"
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 "Commits must now be specified using the environment variables:"
+ eerror " EGIT_OVERRIDE_COMMIT_WINE"
+ eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES"
eerror
return 1
fi
@@ -304,10 +307,9 @@ pkg_setup() {
src_unpack() {
if [[ ${PV} == "9999" ]] ; then
- EGIT_CHECKOUT_DIR="${S}" EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack
+ EGIT_CHECKOUT_DIR="${S}" 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}"
+ EGIT_CHECKOUT_DIR="${D3D9_DIR}" EGIT_REPO_URI="${D3D9_EGIT_REPO_URI}" git-r3_src_unpack
fi
fi
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-27 18:04:17 +0000