commit: 5b6d00017644283b5d199787b9603928ef8fa13e Author: NP-Hardass <NP-Hardass <AT> gentoo <DOT> org> AuthorDate: Fri Nov 3 16:56:15 2017 +0000 Commit: NP Hardass <np-hardass <AT> gentoo <DOT> org> CommitDate: Sun Nov 5 05:52:58 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b6d0001
app-emulation/wine-vanilla: 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 .../wine-vanilla/wine-vanilla-2.0-r1.ebuild | 29 +++++++++++++--------- .../wine-vanilla/wine-vanilla-2.0.1-r1.ebuild | 29 +++++++++++++--------- .../wine-vanilla/wine-vanilla-2.0.2-r1.ebuild | 29 +++++++++++++--------- .../wine-vanilla/wine-vanilla-2.1-r1.ebuild | 29 +++++++++++++--------- .../wine-vanilla/wine-vanilla-2.10-r1.ebuild | 29 +++++++++++++--------- .../wine-vanilla/wine-vanilla-2.11-r1.ebuild | 29 +++++++++++++--------- .../wine-vanilla/wine-vanilla-2.12-r1.ebuild | 29 +++++++++++++--------- .../wine-vanilla/wine-vanilla-2.13-r1.ebuild | 29 +++++++++++++--------- .../wine-vanilla/wine-vanilla-2.14-r1.ebuild | 29 +++++++++++++--------- .../wine-vanilla/wine-vanilla-2.15-r1.ebuild | 29 +++++++++++++--------- .../wine-vanilla/wine-vanilla-2.16-r1.ebuild | 29 +++++++++++++--------- .../wine-vanilla/wine-vanilla-2.17-r1.ebuild | 29 +++++++++++++--------- ...-2.18-r1.ebuild => wine-vanilla-2.18-r2.ebuild} | 22 +++++++++------- ...lla-2.19.ebuild => wine-vanilla-2.19-r1.ebuild} | 22 +++++++++------- .../wine-vanilla/wine-vanilla-2.2-r1.ebuild | 29 +++++++++++++--------- .../wine-vanilla/wine-vanilla-2.3-r1.ebuild | 29 +++++++++++++--------- .../wine-vanilla/wine-vanilla-2.4-r1.ebuild | 29 +++++++++++++--------- .../wine-vanilla/wine-vanilla-2.5-r1.ebuild | 29 +++++++++++++--------- .../wine-vanilla/wine-vanilla-2.6-r1.ebuild | 29 +++++++++++++--------- .../wine-vanilla/wine-vanilla-2.7-r1.ebuild | 29 +++++++++++++--------- .../wine-vanilla/wine-vanilla-2.8-r1.ebuild | 29 +++++++++++++--------- .../wine-vanilla/wine-vanilla-2.9-r1.ebuild | 29 +++++++++++++--------- .../wine-vanilla/wine-vanilla-9999.ebuild | 22 +++++++++------- 23 files changed, 379 insertions(+), 267 deletions(-) diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.0-r1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.0-r1.ebuild index 697e0f31fb0..775a1f19fce 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-2.0-r1.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-2.0-r1.ebuild @@ -131,7 +131,6 @@ RDEPEND="${COMMON_DEPEND} # tools/make_requests requires perl DEPEND="${COMMON_DEPEND} - dev-util/patchbin sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig @@ -151,6 +150,23 @@ usr/share/applications/wine-notepad.desktop usr/share/applications/wine-uninstaller.desktop usr/share/applications/wine-winecfg.desktop" +PATCHES=( + "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726 + "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615 + "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508 + "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" + "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676 + "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376 +) +PATCHES_BIN=( + "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376 +) + +# https://bugs.gentoo.org/show_bug.cgi?id=635222 +if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then + DEPEND+=" dev-util/patchbin" +fi + wine_compiler_check() { [[ ${MERGE_TYPE} = "binary" ]] && return 0 @@ -299,17 +315,6 @@ src_prepare() { } local md5="$(md5sum server/protocol.def)" - local PATCHES=( - "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726 - "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615 - "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508 - "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" - "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676 - "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376 - ) - local PATCHES_BIN=( - "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376 - ) default eapply_bin diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.0.1-r1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.0.1-r1.ebuild index 72ca9065ccc..0a297502ec6 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-2.0.1-r1.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-2.0.1-r1.ebuild @@ -131,7 +131,6 @@ RDEPEND="${COMMON_DEPEND} # tools/make_requests requires perl DEPEND="${COMMON_DEPEND} - dev-util/patchbin sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig @@ -151,6 +150,23 @@ usr/share/applications/wine-notepad.desktop usr/share/applications/wine-uninstaller.desktop usr/share/applications/wine-winecfg.desktop" +PATCHES=( + "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726 + "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615 + "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508 + "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" + "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676 + "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376 +) +PATCHES_BIN=( + "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376 +) + +# https://bugs.gentoo.org/show_bug.cgi?id=635222 +if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then + DEPEND+=" dev-util/patchbin" +fi + wine_compiler_check() { [[ ${MERGE_TYPE} = "binary" ]] && return 0 @@ -299,17 +315,6 @@ src_prepare() { } local md5="$(md5sum server/protocol.def)" - local PATCHES=( - "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726 - "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615 - "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508 - "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" - "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676 - "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376 - ) - local PATCHES_BIN=( - "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376 - ) default eapply_bin diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.0.2-r1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.0.2-r1.ebuild index 72ca9065ccc..0a297502ec6 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-2.0.2-r1.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-2.0.2-r1.ebuild @@ -131,7 +131,6 @@ RDEPEND="${COMMON_DEPEND} # tools/make_requests requires perl DEPEND="${COMMON_DEPEND} - dev-util/patchbin sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig @@ -151,6 +150,23 @@ usr/share/applications/wine-notepad.desktop usr/share/applications/wine-uninstaller.desktop usr/share/applications/wine-winecfg.desktop" +PATCHES=( + "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726 + "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615 + "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508 + "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" + "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676 + "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376 +) +PATCHES_BIN=( + "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376 +) + +# https://bugs.gentoo.org/show_bug.cgi?id=635222 +if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then + DEPEND+=" dev-util/patchbin" +fi + wine_compiler_check() { [[ ${MERGE_TYPE} = "binary" ]] && return 0 @@ -299,17 +315,6 @@ src_prepare() { } local md5="$(md5sum server/protocol.def)" - local PATCHES=( - "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726 - "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615 - "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508 - "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" - "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676 - "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376 - ) - local PATCHES_BIN=( - "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376 - ) default eapply_bin diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.1-r1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.1-r1.ebuild index 5d4299bca59..c94a6ccc98d 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-2.1-r1.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-2.1-r1.ebuild @@ -131,7 +131,6 @@ RDEPEND="${COMMON_DEPEND} # tools/make_requests requires perl DEPEND="${COMMON_DEPEND} - dev-util/patchbin sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig @@ -151,6 +150,23 @@ usr/share/applications/wine-notepad.desktop usr/share/applications/wine-uninstaller.desktop usr/share/applications/wine-winecfg.desktop" +PATCHES=( + "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726 + "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615 + "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508 + "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" + "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676 + "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376 +) +PATCHES_BIN=( + "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376 +) + +# https://bugs.gentoo.org/show_bug.cgi?id=635222 +if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then + DEPEND+=" dev-util/patchbin" +fi + wine_compiler_check() { [[ ${MERGE_TYPE} = "binary" ]] && return 0 @@ -299,17 +315,6 @@ src_prepare() { } local md5="$(md5sum server/protocol.def)" - local PATCHES=( - "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726 - "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615 - "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508 - "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" - "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676 - "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376 - ) - local PATCHES_BIN=( - "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376 - ) default eapply_bin diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.10-r1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.10-r1.ebuild index b79fd64dd9a..0cbbf7c0682 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-2.10-r1.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-2.10-r1.ebuild @@ -132,7 +132,6 @@ RDEPEND="${COMMON_DEPEND} # tools/make_requests requires perl DEPEND="${COMMON_DEPEND} - dev-util/patchbin sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig @@ -152,6 +151,23 @@ usr/share/applications/wine-notepad.desktop usr/share/applications/wine-uninstaller.desktop usr/share/applications/wine-winecfg.desktop" +PATCHES=( + "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726 + "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615 + "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508 + "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" + "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676 + "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376 +) +PATCHES_BIN=( + "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376 +) + +# https://bugs.gentoo.org/show_bug.cgi?id=635222 +if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then + DEPEND+=" dev-util/patchbin" +fi + wine_compiler_check() { [[ ${MERGE_TYPE} = "binary" ]] && return 0 @@ -300,17 +316,6 @@ src_prepare() { } local md5="$(md5sum server/protocol.def)" - local PATCHES=( - "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726 - "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615 - "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508 - "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" - "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676 - "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376 - ) - local PATCHES_BIN=( - "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376 - ) default eapply_bin diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.11-r1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.11-r1.ebuild index b79fd64dd9a..0cbbf7c0682 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-2.11-r1.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-2.11-r1.ebuild @@ -132,7 +132,6 @@ RDEPEND="${COMMON_DEPEND} # tools/make_requests requires perl DEPEND="${COMMON_DEPEND} - dev-util/patchbin sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig @@ -152,6 +151,23 @@ usr/share/applications/wine-notepad.desktop usr/share/applications/wine-uninstaller.desktop usr/share/applications/wine-winecfg.desktop" +PATCHES=( + "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726 + "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615 + "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508 + "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" + "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676 + "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376 +) +PATCHES_BIN=( + "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376 +) + +# https://bugs.gentoo.org/show_bug.cgi?id=635222 +if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then + DEPEND+=" dev-util/patchbin" +fi + wine_compiler_check() { [[ ${MERGE_TYPE} = "binary" ]] && return 0 @@ -300,17 +316,6 @@ src_prepare() { } local md5="$(md5sum server/protocol.def)" - local PATCHES=( - "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726 - "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615 - "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508 - "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" - "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676 - "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376 - ) - local PATCHES_BIN=( - "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376 - ) default eapply_bin diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.12-r1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.12-r1.ebuild index b79fd64dd9a..0cbbf7c0682 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-2.12-r1.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-2.12-r1.ebuild @@ -132,7 +132,6 @@ RDEPEND="${COMMON_DEPEND} # tools/make_requests requires perl DEPEND="${COMMON_DEPEND} - dev-util/patchbin sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig @@ -152,6 +151,23 @@ usr/share/applications/wine-notepad.desktop usr/share/applications/wine-uninstaller.desktop usr/share/applications/wine-winecfg.desktop" +PATCHES=( + "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726 + "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615 + "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508 + "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" + "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676 + "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376 +) +PATCHES_BIN=( + "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376 +) + +# https://bugs.gentoo.org/show_bug.cgi?id=635222 +if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then + DEPEND+=" dev-util/patchbin" +fi + wine_compiler_check() { [[ ${MERGE_TYPE} = "binary" ]] && return 0 @@ -300,17 +316,6 @@ src_prepare() { } local md5="$(md5sum server/protocol.def)" - local PATCHES=( - "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726 - "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615 - "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508 - "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" - "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676 - "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376 - ) - local PATCHES_BIN=( - "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376 - ) default eapply_bin diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.13-r1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.13-r1.ebuild index b79fd64dd9a..0cbbf7c0682 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-2.13-r1.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-2.13-r1.ebuild @@ -132,7 +132,6 @@ RDEPEND="${COMMON_DEPEND} # tools/make_requests requires perl DEPEND="${COMMON_DEPEND} - dev-util/patchbin sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig @@ -152,6 +151,23 @@ usr/share/applications/wine-notepad.desktop usr/share/applications/wine-uninstaller.desktop usr/share/applications/wine-winecfg.desktop" +PATCHES=( + "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726 + "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615 + "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508 + "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" + "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676 + "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376 +) +PATCHES_BIN=( + "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376 +) + +# https://bugs.gentoo.org/show_bug.cgi?id=635222 +if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then + DEPEND+=" dev-util/patchbin" +fi + wine_compiler_check() { [[ ${MERGE_TYPE} = "binary" ]] && return 0 @@ -300,17 +316,6 @@ src_prepare() { } local md5="$(md5sum server/protocol.def)" - local PATCHES=( - "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726 - "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615 - "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508 - "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" - "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676 - "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376 - ) - local PATCHES_BIN=( - "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376 - ) default eapply_bin diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.14-r1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.14-r1.ebuild index ef68ed71111..7a674044d95 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-2.14-r1.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-2.14-r1.ebuild @@ -132,7 +132,6 @@ RDEPEND="${COMMON_DEPEND} # tools/make_requests requires perl DEPEND="${COMMON_DEPEND} - dev-util/patchbin sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig @@ -152,6 +151,23 @@ usr/share/applications/wine-notepad.desktop usr/share/applications/wine-uninstaller.desktop usr/share/applications/wine-winecfg.desktop" +PATCHES=( + "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726 + "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615 + "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508 + "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" + "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676 + "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376 +) +PATCHES_BIN=( + "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376 +) + +# https://bugs.gentoo.org/show_bug.cgi?id=635222 +if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then + DEPEND+=" dev-util/patchbin" +fi + wine_compiler_check() { [[ ${MERGE_TYPE} = "binary" ]] && return 0 @@ -300,17 +316,6 @@ src_prepare() { } local md5="$(md5sum server/protocol.def)" - local PATCHES=( - "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726 - "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615 - "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508 - "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" - "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676 - "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376 - ) - local PATCHES_BIN=( - "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376 - ) default eapply_bin diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.15-r1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.15-r1.ebuild index ef68ed71111..7a674044d95 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-2.15-r1.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-2.15-r1.ebuild @@ -132,7 +132,6 @@ RDEPEND="${COMMON_DEPEND} # tools/make_requests requires perl DEPEND="${COMMON_DEPEND} - dev-util/patchbin sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig @@ -152,6 +151,23 @@ usr/share/applications/wine-notepad.desktop usr/share/applications/wine-uninstaller.desktop usr/share/applications/wine-winecfg.desktop" +PATCHES=( + "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726 + "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615 + "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508 + "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" + "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676 + "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376 +) +PATCHES_BIN=( + "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376 +) + +# https://bugs.gentoo.org/show_bug.cgi?id=635222 +if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then + DEPEND+=" dev-util/patchbin" +fi + wine_compiler_check() { [[ ${MERGE_TYPE} = "binary" ]] && return 0 @@ -300,17 +316,6 @@ src_prepare() { } local md5="$(md5sum server/protocol.def)" - local PATCHES=( - "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726 - "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615 - "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508 - "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" - "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676 - "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376 - ) - local PATCHES_BIN=( - "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376 - ) default eapply_bin diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.16-r1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.16-r1.ebuild index ef68ed71111..7a674044d95 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-2.16-r1.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-2.16-r1.ebuild @@ -132,7 +132,6 @@ RDEPEND="${COMMON_DEPEND} # tools/make_requests requires perl DEPEND="${COMMON_DEPEND} - dev-util/patchbin sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig @@ -152,6 +151,23 @@ usr/share/applications/wine-notepad.desktop usr/share/applications/wine-uninstaller.desktop usr/share/applications/wine-winecfg.desktop" +PATCHES=( + "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726 + "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615 + "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508 + "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" + "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676 + "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376 +) +PATCHES_BIN=( + "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376 +) + +# https://bugs.gentoo.org/show_bug.cgi?id=635222 +if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then + DEPEND+=" dev-util/patchbin" +fi + wine_compiler_check() { [[ ${MERGE_TYPE} = "binary" ]] && return 0 @@ -300,17 +316,6 @@ src_prepare() { } local md5="$(md5sum server/protocol.def)" - local PATCHES=( - "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726 - "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615 - "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508 - "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" - "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676 - "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376 - ) - local PATCHES_BIN=( - "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376 - ) default eapply_bin diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.17-r1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.17-r1.ebuild index ef68ed71111..7a674044d95 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-2.17-r1.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-2.17-r1.ebuild @@ -132,7 +132,6 @@ RDEPEND="${COMMON_DEPEND} # tools/make_requests requires perl DEPEND="${COMMON_DEPEND} - dev-util/patchbin sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig @@ -152,6 +151,23 @@ usr/share/applications/wine-notepad.desktop usr/share/applications/wine-uninstaller.desktop usr/share/applications/wine-winecfg.desktop" +PATCHES=( + "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726 + "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615 + "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508 + "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" + "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676 + "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376 +) +PATCHES_BIN=( + "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376 +) + +# https://bugs.gentoo.org/show_bug.cgi?id=635222 +if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then + DEPEND+=" dev-util/patchbin" +fi + wine_compiler_check() { [[ ${MERGE_TYPE} = "binary" ]] && return 0 @@ -300,17 +316,6 @@ src_prepare() { } local md5="$(md5sum server/protocol.def)" - local PATCHES=( - "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726 - "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615 - "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508 - "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" - "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676 - "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376 - ) - local PATCHES_BIN=( - "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376 - ) default eapply_bin diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.18-r1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.18-r2.ebuild similarity index 97% rename from app-emulation/wine-vanilla/wine-vanilla-2.18-r1.ebuild rename to app-emulation/wine-vanilla/wine-vanilla-2.18-r2.ebuild index 8851cfc5ac4..d8b9031e8ed 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-2.18-r1.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-2.18-r2.ebuild @@ -132,7 +132,6 @@ RDEPEND="${COMMON_DEPEND} # tools/make_requests requires perl DEPEND="${COMMON_DEPEND} - dev-util/patchbin sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig @@ -152,6 +151,19 @@ usr/share/applications/wine-notepad.desktop usr/share/applications/wine-uninstaller.desktop usr/share/applications/wine-winecfg.desktop" +PATCHES=( + "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726 + "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615 + "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508 + "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" +) +PATCHES_BIN=() + +# https://bugs.gentoo.org/show_bug.cgi?id=635222 +if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then + DEPEND+=" dev-util/patchbin" +fi + wine_compiler_check() { [[ ${MERGE_TYPE} = "binary" ]] && return 0 @@ -300,14 +312,6 @@ src_prepare() { } local md5="$(md5sum server/protocol.def)" - local PATCHES=( - "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726 - "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615 - "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508 - "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" - ) - local PATCHES_BIN=( - ) default eapply_bin diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.19.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.19-r1.ebuild similarity index 97% rename from app-emulation/wine-vanilla/wine-vanilla-2.19.ebuild rename to app-emulation/wine-vanilla/wine-vanilla-2.19-r1.ebuild index 8851cfc5ac4..d8b9031e8ed 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-2.19.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-2.19-r1.ebuild @@ -132,7 +132,6 @@ RDEPEND="${COMMON_DEPEND} # tools/make_requests requires perl DEPEND="${COMMON_DEPEND} - dev-util/patchbin sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig @@ -152,6 +151,19 @@ usr/share/applications/wine-notepad.desktop usr/share/applications/wine-uninstaller.desktop usr/share/applications/wine-winecfg.desktop" +PATCHES=( + "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726 + "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615 + "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508 + "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" +) +PATCHES_BIN=() + +# https://bugs.gentoo.org/show_bug.cgi?id=635222 +if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then + DEPEND+=" dev-util/patchbin" +fi + wine_compiler_check() { [[ ${MERGE_TYPE} = "binary" ]] && return 0 @@ -300,14 +312,6 @@ src_prepare() { } local md5="$(md5sum server/protocol.def)" - local PATCHES=( - "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726 - "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615 - "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508 - "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" - ) - local PATCHES_BIN=( - ) default eapply_bin diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.2-r1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.2-r1.ebuild index 5d4299bca59..c94a6ccc98d 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-2.2-r1.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-2.2-r1.ebuild @@ -131,7 +131,6 @@ RDEPEND="${COMMON_DEPEND} # tools/make_requests requires perl DEPEND="${COMMON_DEPEND} - dev-util/patchbin sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig @@ -151,6 +150,23 @@ usr/share/applications/wine-notepad.desktop usr/share/applications/wine-uninstaller.desktop usr/share/applications/wine-winecfg.desktop" +PATCHES=( + "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726 + "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615 + "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508 + "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" + "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676 + "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376 +) +PATCHES_BIN=( + "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376 +) + +# https://bugs.gentoo.org/show_bug.cgi?id=635222 +if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then + DEPEND+=" dev-util/patchbin" +fi + wine_compiler_check() { [[ ${MERGE_TYPE} = "binary" ]] && return 0 @@ -299,17 +315,6 @@ src_prepare() { } local md5="$(md5sum server/protocol.def)" - local PATCHES=( - "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726 - "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615 - "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508 - "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" - "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676 - "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376 - ) - local PATCHES_BIN=( - "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376 - ) default eapply_bin diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.3-r1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.3-r1.ebuild index 5d4299bca59..c94a6ccc98d 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-2.3-r1.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-2.3-r1.ebuild @@ -131,7 +131,6 @@ RDEPEND="${COMMON_DEPEND} # tools/make_requests requires perl DEPEND="${COMMON_DEPEND} - dev-util/patchbin sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig @@ -151,6 +150,23 @@ usr/share/applications/wine-notepad.desktop usr/share/applications/wine-uninstaller.desktop usr/share/applications/wine-winecfg.desktop" +PATCHES=( + "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726 + "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615 + "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508 + "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" + "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676 + "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376 +) +PATCHES_BIN=( + "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376 +) + +# https://bugs.gentoo.org/show_bug.cgi?id=635222 +if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then + DEPEND+=" dev-util/patchbin" +fi + wine_compiler_check() { [[ ${MERGE_TYPE} = "binary" ]] && return 0 @@ -299,17 +315,6 @@ src_prepare() { } local md5="$(md5sum server/protocol.def)" - local PATCHES=( - "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726 - "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615 - "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508 - "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" - "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676 - "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376 - ) - local PATCHES_BIN=( - "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376 - ) default eapply_bin diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.4-r1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.4-r1.ebuild index 757d3e9e857..a69e75d961e 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-2.4-r1.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-2.4-r1.ebuild @@ -131,7 +131,6 @@ RDEPEND="${COMMON_DEPEND} # tools/make_requests requires perl DEPEND="${COMMON_DEPEND} - dev-util/patchbin sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig @@ -151,6 +150,23 @@ usr/share/applications/wine-notepad.desktop usr/share/applications/wine-uninstaller.desktop usr/share/applications/wine-winecfg.desktop" +PATCHES=( + "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726 + "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615 + "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508 + "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" + "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676 + "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376 +) +PATCHES_BIN=( + "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376 +) + +# https://bugs.gentoo.org/show_bug.cgi?id=635222 +if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then + DEPEND+=" dev-util/patchbin" +fi + wine_compiler_check() { [[ ${MERGE_TYPE} = "binary" ]] && return 0 @@ -299,17 +315,6 @@ src_prepare() { } local md5="$(md5sum server/protocol.def)" - local PATCHES=( - "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726 - "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615 - "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508 - "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" - "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676 - "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376 - ) - local PATCHES_BIN=( - "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376 - ) default eapply_bin diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.5-r1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.5-r1.ebuild index 757d3e9e857..a69e75d961e 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-2.5-r1.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-2.5-r1.ebuild @@ -131,7 +131,6 @@ RDEPEND="${COMMON_DEPEND} # tools/make_requests requires perl DEPEND="${COMMON_DEPEND} - dev-util/patchbin sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig @@ -151,6 +150,23 @@ usr/share/applications/wine-notepad.desktop usr/share/applications/wine-uninstaller.desktop usr/share/applications/wine-winecfg.desktop" +PATCHES=( + "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726 + "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615 + "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508 + "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" + "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676 + "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376 +) +PATCHES_BIN=( + "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376 +) + +# https://bugs.gentoo.org/show_bug.cgi?id=635222 +if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then + DEPEND+=" dev-util/patchbin" +fi + wine_compiler_check() { [[ ${MERGE_TYPE} = "binary" ]] && return 0 @@ -299,17 +315,6 @@ src_prepare() { } local md5="$(md5sum server/protocol.def)" - local PATCHES=( - "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726 - "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615 - "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508 - "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" - "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676 - "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376 - ) - local PATCHES_BIN=( - "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376 - ) default eapply_bin diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.6-r1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.6-r1.ebuild index 757d3e9e857..a69e75d961e 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-2.6-r1.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-2.6-r1.ebuild @@ -131,7 +131,6 @@ RDEPEND="${COMMON_DEPEND} # tools/make_requests requires perl DEPEND="${COMMON_DEPEND} - dev-util/patchbin sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig @@ -151,6 +150,23 @@ usr/share/applications/wine-notepad.desktop usr/share/applications/wine-uninstaller.desktop usr/share/applications/wine-winecfg.desktop" +PATCHES=( + "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726 + "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615 + "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508 + "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" + "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676 + "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376 +) +PATCHES_BIN=( + "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376 +) + +# https://bugs.gentoo.org/show_bug.cgi?id=635222 +if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then + DEPEND+=" dev-util/patchbin" +fi + wine_compiler_check() { [[ ${MERGE_TYPE} = "binary" ]] && return 0 @@ -299,17 +315,6 @@ src_prepare() { } local md5="$(md5sum server/protocol.def)" - local PATCHES=( - "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726 - "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615 - "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508 - "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" - "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676 - "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376 - ) - local PATCHES_BIN=( - "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376 - ) default eapply_bin diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.7-r1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.7-r1.ebuild index 757d3e9e857..a69e75d961e 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-2.7-r1.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-2.7-r1.ebuild @@ -131,7 +131,6 @@ RDEPEND="${COMMON_DEPEND} # tools/make_requests requires perl DEPEND="${COMMON_DEPEND} - dev-util/patchbin sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig @@ -151,6 +150,23 @@ usr/share/applications/wine-notepad.desktop usr/share/applications/wine-uninstaller.desktop usr/share/applications/wine-winecfg.desktop" +PATCHES=( + "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726 + "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615 + "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508 + "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" + "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676 + "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376 +) +PATCHES_BIN=( + "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376 +) + +# https://bugs.gentoo.org/show_bug.cgi?id=635222 +if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then + DEPEND+=" dev-util/patchbin" +fi + wine_compiler_check() { [[ ${MERGE_TYPE} = "binary" ]] && return 0 @@ -299,17 +315,6 @@ src_prepare() { } local md5="$(md5sum server/protocol.def)" - local PATCHES=( - "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726 - "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615 - "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508 - "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" - "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676 - "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376 - ) - local PATCHES_BIN=( - "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376 - ) default eapply_bin diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.8-r1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.8-r1.ebuild index 757d3e9e857..a69e75d961e 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-2.8-r1.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-2.8-r1.ebuild @@ -131,7 +131,6 @@ RDEPEND="${COMMON_DEPEND} # tools/make_requests requires perl DEPEND="${COMMON_DEPEND} - dev-util/patchbin sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig @@ -151,6 +150,23 @@ usr/share/applications/wine-notepad.desktop usr/share/applications/wine-uninstaller.desktop usr/share/applications/wine-winecfg.desktop" +PATCHES=( + "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726 + "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615 + "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508 + "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" + "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676 + "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376 +) +PATCHES_BIN=( + "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376 +) + +# https://bugs.gentoo.org/show_bug.cgi?id=635222 +if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then + DEPEND+=" dev-util/patchbin" +fi + wine_compiler_check() { [[ ${MERGE_TYPE} = "binary" ]] && return 0 @@ -299,17 +315,6 @@ src_prepare() { } local md5="$(md5sum server/protocol.def)" - local PATCHES=( - "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726 - "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615 - "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508 - "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" - "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676 - "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376 - ) - local PATCHES_BIN=( - "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376 - ) default eapply_bin diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.9-r1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.9-r1.ebuild index b79fd64dd9a..0cbbf7c0682 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-2.9-r1.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-2.9-r1.ebuild @@ -132,7 +132,6 @@ RDEPEND="${COMMON_DEPEND} # tools/make_requests requires perl DEPEND="${COMMON_DEPEND} - dev-util/patchbin sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig @@ -152,6 +151,23 @@ usr/share/applications/wine-notepad.desktop usr/share/applications/wine-uninstaller.desktop usr/share/applications/wine-winecfg.desktop" +PATCHES=( + "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726 + "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615 + "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508 + "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" + "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676 + "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376 +) +PATCHES_BIN=( + "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376 +) + +# https://bugs.gentoo.org/show_bug.cgi?id=635222 +if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then + DEPEND+=" dev-util/patchbin" +fi + wine_compiler_check() { [[ ${MERGE_TYPE} = "binary" ]] && return 0 @@ -300,17 +316,6 @@ src_prepare() { } local md5="$(md5sum server/protocol.def)" - local PATCHES=( - "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726 - "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615 - "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508 - "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" - "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676 - "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376 - ) - local PATCHES_BIN=( - "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376 - ) default eapply_bin diff --git a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild index 8851cfc5ac4..d8b9031e8ed 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild @@ -132,7 +132,6 @@ RDEPEND="${COMMON_DEPEND} # tools/make_requests requires perl DEPEND="${COMMON_DEPEND} - dev-util/patchbin sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig @@ -152,6 +151,19 @@ usr/share/applications/wine-notepad.desktop usr/share/applications/wine-uninstaller.desktop usr/share/applications/wine-winecfg.desktop" +PATCHES=( + "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726 + "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615 + "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508 + "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" +) +PATCHES_BIN=() + +# https://bugs.gentoo.org/show_bug.cgi?id=635222 +if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then + DEPEND+=" dev-util/patchbin" +fi + wine_compiler_check() { [[ ${MERGE_TYPE} = "binary" ]] && return 0 @@ -300,14 +312,6 @@ src_prepare() { } local md5="$(md5sum server/protocol.def)" - local PATCHES=( - "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726 - "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615 - "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508 - "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" - ) - local PATCHES_BIN=( - ) default eapply_bin
