commit: 74628047b7bc8e62cd634bd518484330412489f6 Author: NP-Hardass <NP-Hardass <AT> gentoo <DOT> org> AuthorDate: Sun Nov 5 05:27:23 2017 +0000 Commit: NP Hardass <np-hardass <AT> gentoo <DOT> org> CommitDate: Sun Nov 5 05:53:07 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=74628047
app-emulation/wine-d3d9: Refactor to dynamically add patchbin dep Bug: https://bugs.gentoo.org/show_bug.cgi?id=635222 Package-Manager: Portage-2.3.13, Repoman-2.3.4 app-emulation/wine-d3d9/wine-d3d9-2.0-r1.ebuild | 30 ++++++++++++++---------- app-emulation/wine-d3d9/wine-d3d9-2.1-r1.ebuild | 30 ++++++++++++++---------- app-emulation/wine-d3d9/wine-d3d9-2.10-r1.ebuild | 30 ++++++++++++++---------- app-emulation/wine-d3d9/wine-d3d9-2.11-r1.ebuild | 30 ++++++++++++++---------- app-emulation/wine-d3d9/wine-d3d9-2.12-r1.ebuild | 30 ++++++++++++++---------- app-emulation/wine-d3d9/wine-d3d9-2.13-r1.ebuild | 30 ++++++++++++++---------- app-emulation/wine-d3d9/wine-d3d9-2.14-r1.ebuild | 30 ++++++++++++++---------- app-emulation/wine-d3d9/wine-d3d9-2.15-r1.ebuild | 30 ++++++++++++++---------- app-emulation/wine-d3d9/wine-d3d9-2.16-r1.ebuild | 30 ++++++++++++++---------- app-emulation/wine-d3d9/wine-d3d9-2.17-r1.ebuild | 30 ++++++++++++++---------- app-emulation/wine-d3d9/wine-d3d9-2.2-r1.ebuild | 30 ++++++++++++++---------- app-emulation/wine-d3d9/wine-d3d9-2.3-r1.ebuild | 30 ++++++++++++++---------- app-emulation/wine-d3d9/wine-d3d9-2.4-r1.ebuild | 30 ++++++++++++++---------- app-emulation/wine-d3d9/wine-d3d9-2.5-r1.ebuild | 30 ++++++++++++++---------- app-emulation/wine-d3d9/wine-d3d9-2.6-r1.ebuild | 30 ++++++++++++++---------- app-emulation/wine-d3d9/wine-d3d9-2.7-r1.ebuild | 30 ++++++++++++++---------- app-emulation/wine-d3d9/wine-d3d9-2.8-r1.ebuild | 30 ++++++++++++++---------- app-emulation/wine-d3d9/wine-d3d9-2.9-r1.ebuild | 30 ++++++++++++++---------- app-emulation/wine-d3d9/wine-d3d9-9999.ebuild | 23 +++++++++++------- 19 files changed, 338 insertions(+), 225 deletions(-) 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 768fae6fbaf..39d1a061225 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 280c1174f31..e9754927f54 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 2b18410a845..71db470f65e 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 2b18410a845..71db470f65e 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 2b18410a845..71db470f65e 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 2b18410a845..71db470f65e 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 89a37ab4450..c3bf9b8d1e4 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 89a37ab4450..c3bf9b8d1e4 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 89a37ab4450..c3bf9b8d1e4 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 89a37ab4450..c3bf9b8d1e4 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.2-r1.ebuild b/app-emulation/wine-d3d9/wine-d3d9-2.2-r1.ebuild index 280c1174f31..e9754927f54 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 280c1174f31..e9754927f54 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 6dcd268b951..6f8a34c54fa 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 6dcd268b951..6f8a34c54fa 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 6dcd268b951..6f8a34c54fa 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 6dcd268b951..6f8a34c54fa 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 6dcd268b951..6f8a34c54fa 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 2b18410a845..71db470f65e 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 e4c7ac02109..ec6c3d60b3c 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" )
