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

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 697e0f31fb09dc32cd52e3ede7cc579c456494f2..775a1f19fce18601f4d53d79969dc07afcb4c9b7 100644 (file)
--- 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 72ca9065ccc926dcf60e18d1e5e5d08b70d5ba53..0a297502ec6cb638253e32b6792d03349e27adf5 100644 (file)
--- 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 72ca9065ccc926dcf60e18d1e5e5d08b70d5ba53..0a297502ec6cb638253e32b6792d03349e27adf5 100644 (file)
--- 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 5d4299bca5983c50422b4a25e4711274959681e3..c94a6ccc98d196cb90953c5056688061fffdbca1 100644 (file)
--- 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 b79fd64dd9a932ad156cebf668beb5caa13bd378..0cbbf7c06825722f9e881ea04318bd6becbf3994 100644 (file)
--- 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 b79fd64dd9a932ad156cebf668beb5caa13bd378..0cbbf7c06825722f9e881ea04318bd6becbf3994 100644 (file)
--- 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 b79fd64dd9a932ad156cebf668beb5caa13bd378..0cbbf7c06825722f9e881ea04318bd6becbf3994 100644 (file)
--- 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 b79fd64dd9a932ad156cebf668beb5caa13bd378..0cbbf7c06825722f9e881ea04318bd6becbf3994 100644 (file)
--- 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 ef68ed71111160d79cd19604a07537875df8589b..7a674044d95c221b9acb4e310197abc1d0c47273 100644 (file)
--- 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 ef68ed71111160d79cd19604a07537875df8589b..7a674044d95c221b9acb4e310197abc1d0c47273 100644 (file)
--- 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 ef68ed71111160d79cd19604a07537875df8589b..7a674044d95c221b9acb4e310197abc1d0c47273 100644 (file)
--- 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 ef68ed71111160d79cd19604a07537875df8589b..7a674044d95c221b9acb4e310197abc1d0c47273 100644 (file)
--- 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 8851cfc5ac4c68602b72017c896321f252440bf8..d8b9031e8ed8e5b02d639e5307f5f6cfe2419a97 100644 (file)
--- 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 8851cfc5ac4c68602b72017c896321f252440bf8..d8b9031e8ed8e5b02d639e5307f5f6cfe2419a97 100644 (file)
--- 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 5d4299bca5983c50422b4a25e4711274959681e3..c94a6ccc98d196cb90953c5056688061fffdbca1 100644 (file)
--- 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 5d4299bca5983c50422b4a25e4711274959681e3..c94a6ccc98d196cb90953c5056688061fffdbca1 100644 (file)
--- 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 757d3e9e8573b957b2ea361dd2dbfce04bda5ab5..a69e75d961e07c5db14c3b64be1cc73d902e5874 100644 (file)
--- 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 757d3e9e8573b957b2ea361dd2dbfce04bda5ab5..a69e75d961e07c5db14c3b64be1cc73d902e5874 100644 (file)
--- 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 757d3e9e8573b957b2ea361dd2dbfce04bda5ab5..a69e75d961e07c5db14c3b64be1cc73d902e5874 100644 (file)
--- 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 757d3e9e8573b957b2ea361dd2dbfce04bda5ab5..a69e75d961e07c5db14c3b64be1cc73d902e5874 100644 (file)
--- 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 757d3e9e8573b957b2ea361dd2dbfce04bda5ab5..a69e75d961e07c5db14c3b64be1cc73d902e5874 100644 (file)
--- 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 b79fd64dd9a932ad156cebf668beb5caa13bd378..0cbbf7c06825722f9e881ea04318bd6becbf3994 100644 (file)
--- 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 8851cfc5ac4c68602b72017c896321f252440bf8..d8b9031e8ed8e5b02d639e5307f5f6cfe2419a97 100644 (file)
--- 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