app-emulation/wine-staging: 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

diff --git a/app-emulation/wine-staging/wine-staging-2.0-r1.ebuild b/app-emulation/wine-staging/wine-staging-2.0-r1.ebuild
index 0c4b6b962ecfb6e6626d234e600e7448809d6a5d..1aeafd492e5a3635ca17d7139e422cffb6a12039 100644 (file)
--- a/app-emulation/wine-staging/wine-staging-2.0-r1.ebuild
+++ b/app-emulation/wine-staging/wine-staging-2.0-r1.ebuild
@@ -152,7 +152,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
@@ -176,6 +175,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
 
@@ -347,17 +363,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 staging; then
                ewarn "Applying the Wine-Staging patchset. Any bug reports to the"
                ewarn "Wine bugzilla should explicitly state that staging was used."

diff --git a/app-emulation/wine-staging/wine-staging-2.1-r1.ebuild b/app-emulation/wine-staging/wine-staging-2.1-r1.ebuild
index 04fe221e51092d3b7a1eef5f67394c404c11de51..1177c5533ac8009c98ce4c4e5be013eb22272db9 100644 (file)
--- a/app-emulation/wine-staging/wine-staging-2.1-r1.ebuild
+++ b/app-emulation/wine-staging/wine-staging-2.1-r1.ebuild
@@ -152,7 +152,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
@@ -176,6 +175,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
 
@@ -347,17 +363,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 staging; then
                ewarn "Applying the Wine-Staging patchset. Any bug reports to the"
                ewarn "Wine bugzilla should explicitly state that staging was used."

diff --git a/app-emulation/wine-staging/wine-staging-2.10-r1.ebuild b/app-emulation/wine-staging/wine-staging-2.10-r1.ebuild
index d41fb3977fc4795f68591b5daaf24225cea12c40..f4d14b26fc456c36fc61c675ba1fb0dd5a763402 100644 (file)
--- a/app-emulation/wine-staging/wine-staging-2.10-r1.ebuild
+++ b/app-emulation/wine-staging/wine-staging-2.10-r1.ebuild
@@ -152,7 +152,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
@@ -176,6 +175,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
 
@@ -347,17 +363,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 staging; then
                ewarn "Applying the Wine-Staging patchset. Any bug reports to the"
                ewarn "Wine bugzilla should explicitly state that staging was used."

diff --git a/app-emulation/wine-staging/wine-staging-2.11-r1.ebuild b/app-emulation/wine-staging/wine-staging-2.11-r1.ebuild
index d41fb3977fc4795f68591b5daaf24225cea12c40..f4d14b26fc456c36fc61c675ba1fb0dd5a763402 100644 (file)
--- a/app-emulation/wine-staging/wine-staging-2.11-r1.ebuild
+++ b/app-emulation/wine-staging/wine-staging-2.11-r1.ebuild
@@ -152,7 +152,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
@@ -176,6 +175,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
 
@@ -347,17 +363,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 staging; then
                ewarn "Applying the Wine-Staging patchset. Any bug reports to the"
                ewarn "Wine bugzilla should explicitly state that staging was used."

diff --git a/app-emulation/wine-staging/wine-staging-2.12-r1.ebuild b/app-emulation/wine-staging/wine-staging-2.12-r1.ebuild
index d41fb3977fc4795f68591b5daaf24225cea12c40..f4d14b26fc456c36fc61c675ba1fb0dd5a763402 100644 (file)
--- a/app-emulation/wine-staging/wine-staging-2.12-r1.ebuild
+++ b/app-emulation/wine-staging/wine-staging-2.12-r1.ebuild
@@ -152,7 +152,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
@@ -176,6 +175,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
 
@@ -347,17 +363,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 staging; then
                ewarn "Applying the Wine-Staging patchset. Any bug reports to the"
                ewarn "Wine bugzilla should explicitly state that staging was used."

diff --git a/app-emulation/wine-staging/wine-staging-2.13-r1.ebuild b/app-emulation/wine-staging/wine-staging-2.13-r1.ebuild
index d41fb3977fc4795f68591b5daaf24225cea12c40..f4d14b26fc456c36fc61c675ba1fb0dd5a763402 100644 (file)
--- a/app-emulation/wine-staging/wine-staging-2.13-r1.ebuild
+++ b/app-emulation/wine-staging/wine-staging-2.13-r1.ebuild
@@ -152,7 +152,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
@@ -176,6 +175,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
 
@@ -347,17 +363,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 staging; then
                ewarn "Applying the Wine-Staging patchset. Any bug reports to the"
                ewarn "Wine bugzilla should explicitly state that staging was used."

diff --git a/app-emulation/wine-staging/wine-staging-2.14-r1.ebuild b/app-emulation/wine-staging/wine-staging-2.14-r1.ebuild
index 72cf8da0423dc8a5948882a69f4da0422879a11d..a5b3fa57a03875994963bbecc18c1d027ec3cfb4 100644 (file)
--- a/app-emulation/wine-staging/wine-staging-2.14-r1.ebuild
+++ b/app-emulation/wine-staging/wine-staging-2.14-r1.ebuild
@@ -152,7 +152,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
@@ -176,6 +175,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
 
@@ -347,17 +363,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 staging; then
                ewarn "Applying the Wine-Staging patchset. Any bug reports to the"
                ewarn "Wine bugzilla should explicitly state that staging was used."

diff --git a/app-emulation/wine-staging/wine-staging-2.15-r1.ebuild b/app-emulation/wine-staging/wine-staging-2.15-r1.ebuild
index 72cf8da0423dc8a5948882a69f4da0422879a11d..a5b3fa57a03875994963bbecc18c1d027ec3cfb4 100644 (file)
--- a/app-emulation/wine-staging/wine-staging-2.15-r1.ebuild
+++ b/app-emulation/wine-staging/wine-staging-2.15-r1.ebuild
@@ -152,7 +152,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
@@ -176,6 +175,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
 
@@ -347,17 +363,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 staging; then
                ewarn "Applying the Wine-Staging patchset. Any bug reports to the"
                ewarn "Wine bugzilla should explicitly state that staging was used."

diff --git a/app-emulation/wine-staging/wine-staging-2.16-r1.ebuild b/app-emulation/wine-staging/wine-staging-2.16-r1.ebuild
index 72cf8da0423dc8a5948882a69f4da0422879a11d..a5b3fa57a03875994963bbecc18c1d027ec3cfb4 100644 (file)
--- a/app-emulation/wine-staging/wine-staging-2.16-r1.ebuild
+++ b/app-emulation/wine-staging/wine-staging-2.16-r1.ebuild
@@ -152,7 +152,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
@@ -176,6 +175,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
 
@@ -347,17 +363,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 staging; then
                ewarn "Applying the Wine-Staging patchset. Any bug reports to the"
                ewarn "Wine bugzilla should explicitly state that staging was used."

diff --git a/app-emulation/wine-staging/wine-staging-2.17-r1.ebuild b/app-emulation/wine-staging/wine-staging-2.17-r1.ebuild
index 72cf8da0423dc8a5948882a69f4da0422879a11d..a5b3fa57a03875994963bbecc18c1d027ec3cfb4 100644 (file)
--- a/app-emulation/wine-staging/wine-staging-2.17-r1.ebuild
+++ b/app-emulation/wine-staging/wine-staging-2.17-r1.ebuild
@@ -152,7 +152,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
@@ -176,6 +175,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
 
@@ -347,17 +363,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 staging; then
                ewarn "Applying the Wine-Staging patchset. Any bug reports to the"
                ewarn "Wine bugzilla should explicitly state that staging was used."

diff --git a/app-emulation/wine-staging/wine-staging-2.18.ebuild b/app-emulation/wine-staging/wine-staging-2.18.ebuild
index 64f408768d4c7c7c1e18c48f9f9c815aebcd3286..cacc432e2505354100786e563171ede37bd86e94 100644 (file)
--- a/app-emulation/wine-staging/wine-staging-2.18.ebuild
+++ b/app-emulation/wine-staging/wine-staging-2.18.ebuild
@@ -152,7 +152,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
@@ -176,6 +175,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
 
@@ -347,14 +359,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 staging; then
                ewarn "Applying the Wine-Staging patchset. Any bug reports to the"
                ewarn "Wine bugzilla should explicitly state that staging was used."

diff --git a/app-emulation/wine-staging/wine-staging-2.2-r1.ebuild b/app-emulation/wine-staging/wine-staging-2.2-r1.ebuild
index 04fe221e51092d3b7a1eef5f67394c404c11de51..1177c5533ac8009c98ce4c4e5be013eb22272db9 100644 (file)
--- a/app-emulation/wine-staging/wine-staging-2.2-r1.ebuild
+++ b/app-emulation/wine-staging/wine-staging-2.2-r1.ebuild
@@ -152,7 +152,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
@@ -176,6 +175,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
 
@@ -347,17 +363,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 staging; then
                ewarn "Applying the Wine-Staging patchset. Any bug reports to the"
                ewarn "Wine bugzilla should explicitly state that staging was used."

diff --git a/app-emulation/wine-staging/wine-staging-2.3-r1.ebuild b/app-emulation/wine-staging/wine-staging-2.3-r1.ebuild
index 04fe221e51092d3b7a1eef5f67394c404c11de51..1177c5533ac8009c98ce4c4e5be013eb22272db9 100644 (file)
--- a/app-emulation/wine-staging/wine-staging-2.3-r1.ebuild
+++ b/app-emulation/wine-staging/wine-staging-2.3-r1.ebuild
@@ -152,7 +152,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
@@ -176,6 +175,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
 
@@ -347,17 +363,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 staging; then
                ewarn "Applying the Wine-Staging patchset. Any bug reports to the"
                ewarn "Wine bugzilla should explicitly state that staging was used."

diff --git a/app-emulation/wine-staging/wine-staging-2.4-r1.ebuild b/app-emulation/wine-staging/wine-staging-2.4-r1.ebuild
index d41fb3977fc4795f68591b5daaf24225cea12c40..f4d14b26fc456c36fc61c675ba1fb0dd5a763402 100644 (file)
--- a/app-emulation/wine-staging/wine-staging-2.4-r1.ebuild
+++ b/app-emulation/wine-staging/wine-staging-2.4-r1.ebuild
@@ -152,7 +152,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
@@ -176,6 +175,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
 
@@ -347,17 +363,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 staging; then
                ewarn "Applying the Wine-Staging patchset. Any bug reports to the"
                ewarn "Wine bugzilla should explicitly state that staging was used."

diff --git a/app-emulation/wine-staging/wine-staging-2.5-r1.ebuild b/app-emulation/wine-staging/wine-staging-2.5-r1.ebuild
index d41fb3977fc4795f68591b5daaf24225cea12c40..f4d14b26fc456c36fc61c675ba1fb0dd5a763402 100644 (file)
--- a/app-emulation/wine-staging/wine-staging-2.5-r1.ebuild
+++ b/app-emulation/wine-staging/wine-staging-2.5-r1.ebuild
@@ -152,7 +152,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
@@ -176,6 +175,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
 
@@ -347,17 +363,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 staging; then
                ewarn "Applying the Wine-Staging patchset. Any bug reports to the"
                ewarn "Wine bugzilla should explicitly state that staging was used."

diff --git a/app-emulation/wine-staging/wine-staging-2.6-r1.ebuild b/app-emulation/wine-staging/wine-staging-2.6-r1.ebuild
index d41fb3977fc4795f68591b5daaf24225cea12c40..f4d14b26fc456c36fc61c675ba1fb0dd5a763402 100644 (file)
--- a/app-emulation/wine-staging/wine-staging-2.6-r1.ebuild
+++ b/app-emulation/wine-staging/wine-staging-2.6-r1.ebuild
@@ -152,7 +152,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
@@ -176,6 +175,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
 
@@ -347,17 +363,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 staging; then
                ewarn "Applying the Wine-Staging patchset. Any bug reports to the"
                ewarn "Wine bugzilla should explicitly state that staging was used."

diff --git a/app-emulation/wine-staging/wine-staging-2.7-r1.ebuild b/app-emulation/wine-staging/wine-staging-2.7-r1.ebuild
index d41fb3977fc4795f68591b5daaf24225cea12c40..f4d14b26fc456c36fc61c675ba1fb0dd5a763402 100644 (file)
--- a/app-emulation/wine-staging/wine-staging-2.7-r1.ebuild
+++ b/app-emulation/wine-staging/wine-staging-2.7-r1.ebuild
@@ -152,7 +152,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
@@ -176,6 +175,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
 
@@ -347,17 +363,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 staging; then
                ewarn "Applying the Wine-Staging patchset. Any bug reports to the"
                ewarn "Wine bugzilla should explicitly state that staging was used."

diff --git a/app-emulation/wine-staging/wine-staging-2.8-r1.ebuild b/app-emulation/wine-staging/wine-staging-2.8-r1.ebuild
index d41fb3977fc4795f68591b5daaf24225cea12c40..f4d14b26fc456c36fc61c675ba1fb0dd5a763402 100644 (file)
--- a/app-emulation/wine-staging/wine-staging-2.8-r1.ebuild
+++ b/app-emulation/wine-staging/wine-staging-2.8-r1.ebuild
@@ -152,7 +152,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
@@ -176,6 +175,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
 
@@ -347,17 +363,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 staging; then
                ewarn "Applying the Wine-Staging patchset. Any bug reports to the"
                ewarn "Wine bugzilla should explicitly state that staging was used."

diff --git a/app-emulation/wine-staging/wine-staging-2.9-r1.ebuild b/app-emulation/wine-staging/wine-staging-2.9-r1.ebuild
index d41fb3977fc4795f68591b5daaf24225cea12c40..f4d14b26fc456c36fc61c675ba1fb0dd5a763402 100644 (file)
--- a/app-emulation/wine-staging/wine-staging-2.9-r1.ebuild
+++ b/app-emulation/wine-staging/wine-staging-2.9-r1.ebuild
@@ -152,7 +152,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
@@ -176,6 +175,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
 
@@ -347,17 +363,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 staging; then
                ewarn "Applying the Wine-Staging patchset. Any bug reports to the"
                ewarn "Wine bugzilla should explicitly state that staging was used."

diff --git a/app-emulation/wine-staging/wine-staging-9999.ebuild b/app-emulation/wine-staging/wine-staging-9999.ebuild
index 64f408768d4c7c7c1e18c48f9f9c815aebcd3286..cacc432e2505354100786e563171ede37bd86e94 100644 (file)
--- a/app-emulation/wine-staging/wine-staging-9999.ebuild
+++ b/app-emulation/wine-staging/wine-staging-9999.ebuild
@@ -152,7 +152,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
@@ -176,6 +175,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
 
@@ -347,14 +359,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 staging; then
                ewarn "Applying the Wine-Staging patchset. Any bug reports to the"
                ewarn "Wine bugzilla should explicitly state that staging was used."