app-emulation/wine: Fix two QA issues, #588604

Package-Manager: portage-2.2.28

diff --git a/app-emulation/wine/wine-1.8-r2.ebuild b/app-emulation/wine/wine-1.8-r2.ebuild
index 4675885485df4cfa7bdef81c6ac9cac3a3464486..60871af5fe0f209ab434a321b225942d3c90f6b7 100644 (file)
--- a/app-emulation/wine/wine-1.8-r2.ebuild
+++ b/app-emulation/wine/wine-1.8-r2.ebuild
@@ -21,8 +21,8 @@ else
        KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
 fi
 
-GV="2.40"
-MV="4.5.6"
+VANILLA_GV="2.40"
+VANILLA_MV="4.5.6"
 STAGING_GV="2.40"
 STAGING_MV="4.5.6"
 STAGING_P="wine-staging-${PV}"
@@ -34,10 +34,10 @@ HOMEPAGE="http://www.winehq.org/"
 SRC_URI="${SRC_URI}
        !staging? (
                gecko? (
-                       abi_x86_32? ( https://dl.winehq.org/wine/wine-gecko/${GV}/wine_gecko-${GV}-x86.msi )
-                       abi_x86_64? ( https://dl.winehq.org/wine/wine-gecko/${GV}/wine_gecko-${GV}-x86_64.msi )
+                       abi_x86_32? ( https://dl.winehq.org/wine/wine-gecko/${VANILLA_GV}/wine_gecko-${VANILLA_GV}-x86.msi )
+                       abi_x86_64? ( https://dl.winehq.org/wine/wine-gecko/${VANILLA_GV}/wine_gecko-${VANILLA_GV}-x86_64.msi )
                )
-               mono? ( https://dl.winehq.org/wine/wine-mono/${MV}/wine-mono-${MV}.msi )
+               mono? ( https://dl.winehq.org/wine/wine-mono/${VANILLA_MV}/wine-mono-${VANILLA_MV}.msi )
        )
        staging? (
                gecko? (
@@ -261,7 +261,10 @@ pkg_pretend() {
 
 pkg_setup() {
        wine_build_environment_check || die
-       if use staging; then
+       if ! use staging; then
+               GV=${VANILLA_GV}
+               MV=${VANILLA_MV}
+       else
                GV=${STAGING_GV}
                MV=${STAGING_MV}
        fi
@@ -341,7 +344,7 @@ src_prepare() {
        # hi-res default icon, #472990, http://bugs.winehq.org/show_bug.cgi?id=24652
        cp "${WORKDIR}"/${WINE_GENTOO}/icons/oic_winlogo.ico dlls/user32/resources/ || die
 
-       l10n_get_locales > po/LINGUAS # otherwise wine doesn't respect LINGUAS
+       l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
 }
 
 src_configure() {

diff --git a/app-emulation/wine/wine-1.8.1-r2.ebuild b/app-emulation/wine/wine-1.8.1-r2.ebuild
index fb7173254b74d5966de3405fbba11ed3148eb7ee..79bcfa04127b58aa1e3118eddca67915de962902 100644 (file)
--- a/app-emulation/wine/wine-1.8.1-r2.ebuild
+++ b/app-emulation/wine/wine-1.8.1-r2.ebuild
@@ -21,8 +21,8 @@ else
        KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
 fi
 
-GV="2.40"
-MV="4.5.6"
+VANILLA_GV="2.40"
+VANILLA_MV="4.5.6"
 STAGING_GV="2.40"
 STAGING_MV="4.5.6"
 [[ ${MAJOR_V} == "1.8" ]] && SUFFIX="-unofficial"
@@ -35,10 +35,10 @@ HOMEPAGE="http://www.winehq.org/"
 SRC_URI="${SRC_URI}
        !staging? (
                gecko? (
-                       abi_x86_32? ( https://dl.winehq.org/wine/wine-gecko/${GV}/wine_gecko-${GV}-x86.msi )
-                       abi_x86_64? ( https://dl.winehq.org/wine/wine-gecko/${GV}/wine_gecko-${GV}-x86_64.msi )
+                       abi_x86_32? ( https://dl.winehq.org/wine/wine-gecko/${VANILLA_GV}/wine_gecko-${VANILLA_GV}-x86.msi )
+                       abi_x86_64? ( https://dl.winehq.org/wine/wine-gecko/${VANILLA_GV}/wine_gecko-${VANILLA_GV}-x86_64.msi )
                )
-               mono? ( https://dl.winehq.org/wine/wine-mono/${MV}/wine-mono-${MV}.msi )
+               mono? ( https://dl.winehq.org/wine/wine-mono/${VANILLA_MV}/wine-mono-${VANILLA_MV}.msi )
        )
        staging? (
                gecko? (
@@ -262,7 +262,10 @@ pkg_pretend() {
 
 pkg_setup() {
        wine_build_environment_check || die
-       if use staging; then
+       if ! use staging; then
+               GV=${VANILLA_GV}
+               MV=${VANILLA_MV}
+       else
                GV=${STAGING_GV}
                MV=${STAGING_MV}
        fi
@@ -347,7 +350,7 @@ src_prepare() {
        # hi-res default icon, #472990, http://bugs.winehq.org/show_bug.cgi?id=24652
        cp "${WORKDIR}"/${WINE_GENTOO}/icons/oic_winlogo.ico dlls/user32/resources/ || die
 
-       l10n_get_locales > po/LINGUAS # otherwise wine doesn't respect LINGUAS
+       l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
 }
 
 src_configure() {

diff --git a/app-emulation/wine/wine-1.8.2-r1.ebuild b/app-emulation/wine/wine-1.8.2-r1.ebuild
index 6d7436a6108a4daa1b6a3f95271564fa87b35cd0..772d165365dd50bf76eff60430341eb19264a10d 100644 (file)
--- a/app-emulation/wine/wine-1.8.2-r1.ebuild
+++ b/app-emulation/wine/wine-1.8.2-r1.ebuild
@@ -21,8 +21,8 @@ else
        KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
 fi
 
-GV="2.40"
-MV="4.5.6"
+VANILLA_GV="2.40"
+VANILLA_MV="4.5.6"
 STAGING_GV="2.40"
 STAGING_MV="4.5.6"
 [[ ${MAJOR_V} == "1.8" ]] && SUFFIX="-unofficial"
@@ -35,10 +35,10 @@ HOMEPAGE="http://www.winehq.org/"
 SRC_URI="${SRC_URI}
        !staging? (
                gecko? (
-                       abi_x86_32? ( https://dl.winehq.org/wine/wine-gecko/${GV}/wine_gecko-${GV}-x86.msi )
-                       abi_x86_64? ( https://dl.winehq.org/wine/wine-gecko/${GV}/wine_gecko-${GV}-x86_64.msi )
+                       abi_x86_32? ( https://dl.winehq.org/wine/wine-gecko/${VANILLA_GV}/wine_gecko-${VANILLA_GV}-x86.msi )
+                       abi_x86_64? ( https://dl.winehq.org/wine/wine-gecko/${VANILLA_GV}/wine_gecko-${VANILLA_GV}-x86_64.msi )
                )
-               mono? ( https://dl.winehq.org/wine/wine-mono/${MV}/wine-mono-${MV}.msi )
+               mono? ( https://dl.winehq.org/wine/wine-mono/${VANILLA_MV}/wine-mono-${VANILLA_MV}.msi )
        )
        staging? (
                gecko? (
@@ -262,7 +262,10 @@ pkg_pretend() {
 
 pkg_setup() {
        wine_build_environment_check || die
-       if use staging; then
+       if ! use staging; then
+               GV=${VANILLA_GV}
+               MV=${VANILLA_MV}
+       else
                GV=${STAGING_GV}
                MV=${STAGING_MV}
        fi
@@ -347,7 +350,7 @@ src_prepare() {
        # hi-res default icon, #472990, http://bugs.winehq.org/show_bug.cgi?id=24652
        cp "${WORKDIR}"/${WINE_GENTOO}/icons/oic_winlogo.ico dlls/user32/resources/ || die
 
-       l10n_get_locales > po/LINGUAS # otherwise wine doesn't respect LINGUAS
+       l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
 }
 
 src_configure() {

diff --git a/app-emulation/wine/wine-1.8.2.ebuild b/app-emulation/wine/wine-1.8.2.ebuild
index 0da62bb62dd62316714abd059a03dff598a8e71a..d9b63719607d7194d7c36bc4f30ba12557568d30 100644 (file)
--- a/app-emulation/wine/wine-1.8.2.ebuild
+++ b/app-emulation/wine/wine-1.8.2.ebuild
@@ -314,7 +314,7 @@ src_prepare() {
        # hi-res default icon, #472990, http://bugs.winehq.org/show_bug.cgi?id=24652
        cp "${WORKDIR}"/${WINE_GENTOO}/icons/oic_winlogo.ico dlls/user32/resources/ || die
 
-       l10n_get_locales > po/LINGUAS # otherwise wine doesn't respect LINGUAS
+       l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
 }
 
 src_configure() {

diff --git a/app-emulation/wine/wine-1.8.3.ebuild b/app-emulation/wine/wine-1.8.3.ebuild
index 6d397103168a39a54a1698c01d4e2eed03fe2598..1feebaeccc0769a770913e20262a3bdf32368349 100644 (file)
--- a/app-emulation/wine/wine-1.8.3.ebuild
+++ b/app-emulation/wine/wine-1.8.3.ebuild
@@ -21,8 +21,8 @@ else
        KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
 fi
 
-GV="2.40"
-MV="4.5.6"
+VANILLA_GV="2.40"
+VANILLA_MV="4.5.6"
 STAGING_GV="2.40"
 STAGING_MV="4.5.6"
 [[ ${MAJOR_V} == "1.8" ]] && SUFFIX="-unofficial"
@@ -35,10 +35,10 @@ HOMEPAGE="http://www.winehq.org/"
 SRC_URI="${SRC_URI}
        !staging? (
                gecko? (
-                       abi_x86_32? ( https://dl.winehq.org/wine/wine-gecko/${GV}/wine_gecko-${GV}-x86.msi )
-                       abi_x86_64? ( https://dl.winehq.org/wine/wine-gecko/${GV}/wine_gecko-${GV}-x86_64.msi )
+                       abi_x86_32? ( https://dl.winehq.org/wine/wine-gecko/${VANILLA_GV}/wine_gecko-${VANILLA_GV}-x86.msi )
+                       abi_x86_64? ( https://dl.winehq.org/wine/wine-gecko/${VANILLA_GV}/wine_gecko-${VANILLA_GV}-x86_64.msi )
                )
-               mono? ( https://dl.winehq.org/wine/wine-mono/${MV}/wine-mono-${MV}.msi )
+               mono? ( https://dl.winehq.org/wine/wine-mono/${VANILLA_MV}/wine-mono-${VANILLA_MV}.msi )
        )
        staging? (
                gecko? (
@@ -262,7 +262,10 @@ pkg_pretend() {
 
 pkg_setup() {
        wine_build_environment_check || die
-       if use staging; then
+       if ! use staging; then
+               GV=${VANILLA_GV}
+               MV=${VANILLA_MV}
+       else
                GV=${STAGING_GV}
                MV=${STAGING_MV}
        fi
@@ -346,7 +349,7 @@ src_prepare() {
        # hi-res default icon, #472990, http://bugs.winehq.org/show_bug.cgi?id=24652
        cp "${WORKDIR}"/${WINE_GENTOO}/icons/oic_winlogo.ico dlls/user32/resources/ || die
 
-       l10n_get_locales > po/LINGUAS # otherwise wine doesn't respect LINGUAS
+       l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
 }
 
 src_configure() {

diff --git a/app-emulation/wine/wine-1.9.10-r1.ebuild b/app-emulation/wine/wine-1.9.10-r1.ebuild
index 97400a546d5d911fbcbbe725405c07daea2e5f25..33c7d8f4f51b70c18d3aeb0ba2e5f9ef78bb82e1 100644 (file)
--- a/app-emulation/wine/wine-1.9.10-r1.ebuild
+++ b/app-emulation/wine/wine-1.9.10-r1.ebuild
@@ -21,8 +21,8 @@ else
        KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
 fi
 
-GV="2.44"
-MV="4.6.2"
+VANILLA_GV="2.44"
+VANILLA_MV="4.6.2"
 STAGING_GV="2.47-beta1"
 STAGING_MV="4.6.2"
 [[ ${MAJOR_V} == "1.8" ]] && SUFFIX="-unofficial"
@@ -36,10 +36,10 @@ HOMEPAGE="http://www.winehq.org/"
 SRC_URI="${SRC_URI}
        !staging? (
                gecko? (
-                       abi_x86_32? ( https://dl.winehq.org/wine/wine-gecko/${GV}/wine_gecko-${GV}-x86.msi )
-                       abi_x86_64? ( https://dl.winehq.org/wine/wine-gecko/${GV}/wine_gecko-${GV}-x86_64.msi )
+                       abi_x86_32? ( https://dl.winehq.org/wine/wine-gecko/${VANILLA_GV}/wine_gecko-${VANILLA_GV}-x86.msi )
+                       abi_x86_64? ( https://dl.winehq.org/wine/wine-gecko/${VANILLA_GV}/wine_gecko-${VANILLA_GV}-x86_64.msi )
                )
-               mono? ( https://dl.winehq.org/wine/wine-mono/${MV}/wine-mono-${MV}.msi )
+               mono? ( https://dl.winehq.org/wine/wine-mono/${VANILLA_MV}/wine-mono-${VANILLA_MV}.msi )
        )
        staging? (
                gecko? (
@@ -264,7 +264,10 @@ pkg_pretend() {
 
 pkg_setup() {
        wine_build_environment_check || die
-       if use staging; then
+       if ! use staging; then
+               GV=${VANILLA_GV}
+               MV=${VANILLA_MV}
+       else
                GV=${STAGING_GV}
                MV=${STAGING_MV}
        fi
@@ -360,7 +363,7 @@ src_prepare() {
        # hi-res default icon, #472990, http://bugs.winehq.org/show_bug.cgi?id=24652
        cp "${WORKDIR}"/${WINE_GENTOO}/icons/oic_winlogo.ico dlls/user32/resources/ || die
 
-       l10n_get_locales > po/LINGUAS # otherwise wine doesn't respect LINGUAS
+       l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
 }
 
 src_configure() {

diff --git a/app-emulation/wine/wine-1.9.11-r1.ebuild b/app-emulation/wine/wine-1.9.11-r1.ebuild
index 97400a546d5d911fbcbbe725405c07daea2e5f25..33c7d8f4f51b70c18d3aeb0ba2e5f9ef78bb82e1 100644 (file)
--- a/app-emulation/wine/wine-1.9.11-r1.ebuild
+++ b/app-emulation/wine/wine-1.9.11-r1.ebuild
@@ -21,8 +21,8 @@ else
        KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
 fi
 
-GV="2.44"
-MV="4.6.2"
+VANILLA_GV="2.44"
+VANILLA_MV="4.6.2"
 STAGING_GV="2.47-beta1"
 STAGING_MV="4.6.2"
 [[ ${MAJOR_V} == "1.8" ]] && SUFFIX="-unofficial"
@@ -36,10 +36,10 @@ HOMEPAGE="http://www.winehq.org/"
 SRC_URI="${SRC_URI}
        !staging? (
                gecko? (
-                       abi_x86_32? ( https://dl.winehq.org/wine/wine-gecko/${GV}/wine_gecko-${GV}-x86.msi )
-                       abi_x86_64? ( https://dl.winehq.org/wine/wine-gecko/${GV}/wine_gecko-${GV}-x86_64.msi )
+                       abi_x86_32? ( https://dl.winehq.org/wine/wine-gecko/${VANILLA_GV}/wine_gecko-${VANILLA_GV}-x86.msi )
+                       abi_x86_64? ( https://dl.winehq.org/wine/wine-gecko/${VANILLA_GV}/wine_gecko-${VANILLA_GV}-x86_64.msi )
                )
-               mono? ( https://dl.winehq.org/wine/wine-mono/${MV}/wine-mono-${MV}.msi )
+               mono? ( https://dl.winehq.org/wine/wine-mono/${VANILLA_MV}/wine-mono-${VANILLA_MV}.msi )
        )
        staging? (
                gecko? (
@@ -264,7 +264,10 @@ pkg_pretend() {
 
 pkg_setup() {
        wine_build_environment_check || die
-       if use staging; then
+       if ! use staging; then
+               GV=${VANILLA_GV}
+               MV=${VANILLA_MV}
+       else
                GV=${STAGING_GV}
                MV=${STAGING_MV}
        fi
@@ -360,7 +363,7 @@ src_prepare() {
        # hi-res default icon, #472990, http://bugs.winehq.org/show_bug.cgi?id=24652
        cp "${WORKDIR}"/${WINE_GENTOO}/icons/oic_winlogo.ico dlls/user32/resources/ || die
 
-       l10n_get_locales > po/LINGUAS # otherwise wine doesn't respect LINGUAS
+       l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
 }
 
 src_configure() {

diff --git a/app-emulation/wine/wine-1.9.12.ebuild b/app-emulation/wine/wine-1.9.12.ebuild
index 1c8e112b1a6a528060e661acacaa39965e84df14..d5f0bad64a84fb0b1edbcfda163c425bc2a1a382 100644 (file)
--- a/app-emulation/wine/wine-1.9.12.ebuild
+++ b/app-emulation/wine/wine-1.9.12.ebuild
@@ -21,8 +21,8 @@ else
        KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
 fi
 
-GV="2.44"
-MV="4.6.3"
+VANILLA_GV="2.44"
+VANILLA_MV="4.6.3"
 STAGING_GV="2.47-beta1"
 STAGING_MV="4.6.3"
 [[ ${MAJOR_V} == "1.8" ]] && SUFFIX="-unofficial"
@@ -36,10 +36,10 @@ HOMEPAGE="http://www.winehq.org/"
 SRC_URI="${SRC_URI}
        !staging? (
                gecko? (
-                       abi_x86_32? ( https://dl.winehq.org/wine/wine-gecko/${GV}/wine_gecko-${GV}-x86.msi )
-                       abi_x86_64? ( https://dl.winehq.org/wine/wine-gecko/${GV}/wine_gecko-${GV}-x86_64.msi )
+                       abi_x86_32? ( https://dl.winehq.org/wine/wine-gecko/${VANILLA_GV}/wine_gecko-${VANILLA_GV}-x86.msi )
+                       abi_x86_64? ( https://dl.winehq.org/wine/wine-gecko/${VANILLA_GV}/wine_gecko-${VANILLA_GV}-x86_64.msi )
                )
-               mono? ( https://dl.winehq.org/wine/wine-mono/${MV}/wine-mono-${MV}.msi )
+               mono? ( https://dl.winehq.org/wine/wine-mono/${VANILLA_MV}/wine-mono-${VANILLA_MV}.msi )
        )
        staging? (
                gecko? (
@@ -264,7 +264,10 @@ pkg_pretend() {
 
 pkg_setup() {
        wine_build_environment_check || die
-       if use staging; then
+       if ! use staging; then
+               GV=${VANILLA_GV}
+               MV=${VANILLA_MV}
+       else
                GV=${STAGING_GV}
                MV=${STAGING_MV}
        fi
@@ -360,7 +363,7 @@ src_prepare() {
        # hi-res default icon, #472990, http://bugs.winehq.org/show_bug.cgi?id=24652
        cp "${WORKDIR}"/${WINE_GENTOO}/icons/oic_winlogo.ico dlls/user32/resources/ || die
 
-       l10n_get_locales > po/LINGUAS # otherwise wine doesn't respect LINGUAS
+       l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
 }
 
 src_configure() {

diff --git a/app-emulation/wine/wine-1.9.13.ebuild b/app-emulation/wine/wine-1.9.13.ebuild
index 5da73b4d940308f45538a283f69dc3eaa24663f8..c637572cb6197a1a839d0d82874b394475795183 100644 (file)
--- a/app-emulation/wine/wine-1.9.13.ebuild
+++ b/app-emulation/wine/wine-1.9.13.ebuild
@@ -21,8 +21,8 @@ else
        KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
 fi
 
-GV="2.47"
-MV="4.6.3"
+VANILLA_GV="2.47"
+VANILLA_MV="4.6.3"
 STAGING_GV="2.47"
 STAGING_MV="4.6.3"
 [[ ${MAJOR_V} == "1.8" ]] && SUFFIX="-unofficial"
@@ -36,10 +36,10 @@ HOMEPAGE="http://www.winehq.org/"
 SRC_URI="${SRC_URI}
        !staging? (
                gecko? (
-                       abi_x86_32? ( https://dl.winehq.org/wine/wine-gecko/${GV}/wine_gecko-${GV}-x86.msi )
-                       abi_x86_64? ( https://dl.winehq.org/wine/wine-gecko/${GV}/wine_gecko-${GV}-x86_64.msi )
+                       abi_x86_32? ( https://dl.winehq.org/wine/wine-gecko/${VANILLA_GV}/wine_gecko-${VANILLA_GV}-x86.msi )
+                       abi_x86_64? ( https://dl.winehq.org/wine/wine-gecko/${VANILLA_GV}/wine_gecko-${VANILLA_GV}-x86_64.msi )
                )
-               mono? ( https://dl.winehq.org/wine/wine-mono/${MV}/wine-mono-${MV}.msi )
+               mono? ( https://dl.winehq.org/wine/wine-mono/${VANILLA_MV}/wine-mono-${VANILLA_MV}.msi )
        )
        staging? (
                gecko? (
@@ -264,7 +264,10 @@ pkg_pretend() {
 
 pkg_setup() {
        wine_build_environment_check || die
-       if use staging; then
+       if ! use staging; then
+               GV=${VANILLA_GV}
+               MV=${VANILLA_MV}
+       else
                GV=${STAGING_GV}
                MV=${STAGING_MV}
        fi
@@ -359,7 +362,7 @@ src_prepare() {
        # hi-res default icon, #472990, http://bugs.winehq.org/show_bug.cgi?id=24652
        cp "${WORKDIR}"/${WINE_GENTOO}/icons/oic_winlogo.ico dlls/user32/resources/ || die
 
-       l10n_get_locales > po/LINGUAS # otherwise wine doesn't respect LINGUAS
+       l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
 }
 
 src_configure() {

diff --git a/app-emulation/wine/wine-1.9.4-r2.ebuild b/app-emulation/wine/wine-1.9.4-r2.ebuild
index e72fc4972c3cb01a12d5d1d00993efa549d62a5b..0f6ce355c56451aa389f9c4d50aff124b7e73fb4 100644 (file)
--- a/app-emulation/wine/wine-1.9.4-r2.ebuild
+++ b/app-emulation/wine/wine-1.9.4-r2.ebuild
@@ -21,8 +21,8 @@ else
        KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
 fi
 
-GV="2.44"
-MV="4.5.6"
+VANILLA_GV="2.44"
+VANILLA_MV="4.5.6"
 STAGING_GV="2.44"
 STAGING_MV="4.5.6"
 [[ ${MAJOR_V} == "1.8" ]] && SUFFIX="-unofficial"
@@ -34,10 +34,10 @@ HOMEPAGE="http://www.winehq.org/"
 SRC_URI="${SRC_URI}
        !staging? (
                gecko? (
-                       abi_x86_32? ( https://dl.winehq.org/wine/wine-gecko/${GV}/wine_gecko-${GV}-x86.msi )
-                       abi_x86_64? ( https://dl.winehq.org/wine/wine-gecko/${GV}/wine_gecko-${GV}-x86_64.msi )
+                       abi_x86_32? ( https://dl.winehq.org/wine/wine-gecko/${VANILLA_GV}/wine_gecko-${VANILLA_GV}-x86.msi )
+                       abi_x86_64? ( https://dl.winehq.org/wine/wine-gecko/${VANILLA_GV}/wine_gecko-${VANILLA_GV}-x86_64.msi )
                )
-               mono? ( https://dl.winehq.org/wine/wine-mono/${MV}/wine-mono-${MV}.msi )
+               mono? ( https://dl.winehq.org/wine/wine-mono/${VANILLA_MV}/wine-mono-${VANILLA_MV}.msi )
        )
        staging? (
                gecko? (
@@ -260,7 +260,10 @@ pkg_pretend() {
 
 pkg_setup() {
        wine_build_environment_check || die
-       if use staging; then
+       if ! use staging; then
+               GV=${VANILLA_GV}
+               MV=${VANILLA_MV}
+       else
                GV=${STAGING_GV}
                MV=${STAGING_MV}
        fi
@@ -343,7 +346,7 @@ src_prepare() {
        # hi-res default icon, #472990, http://bugs.winehq.org/show_bug.cgi?id=24652
        cp "${WORKDIR}"/${WINE_GENTOO}/icons/oic_winlogo.ico dlls/user32/resources/ || die
 
-       l10n_get_locales > po/LINGUAS # otherwise wine doesn't respect LINGUAS
+       l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
 }
 
 src_configure() {

diff --git a/app-emulation/wine/wine-1.9.5-r2.ebuild b/app-emulation/wine/wine-1.9.5-r2.ebuild
index a2e4f3ed137673ba3c83768a1667ec2834795332..717ef85883bc317346a96e71fe78815f9dcb9216 100644 (file)
--- a/app-emulation/wine/wine-1.9.5-r2.ebuild
+++ b/app-emulation/wine/wine-1.9.5-r2.ebuild
@@ -21,8 +21,8 @@ else
        KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
 fi
 
-GV="2.44"
-MV="4.6.0"
+VANILLA_GV="2.44"
+VANILLA_MV="4.6.0"
 STAGING_GV="2.44"
 STAGING_MV="4.6.0"
 [[ ${MAJOR_V} == "1.8" ]] && SUFFIX="-unofficial"
@@ -34,10 +34,10 @@ HOMEPAGE="http://www.winehq.org/"
 SRC_URI="${SRC_URI}
        !staging? (
                gecko? (
-                       abi_x86_32? ( https://dl.winehq.org/wine/wine-gecko/${GV}/wine_gecko-${GV}-x86.msi )
-                       abi_x86_64? ( https://dl.winehq.org/wine/wine-gecko/${GV}/wine_gecko-${GV}-x86_64.msi )
+                       abi_x86_32? ( https://dl.winehq.org/wine/wine-gecko/${VANILLA_GV}/wine_gecko-${VANILLA_GV}-x86.msi )
+                       abi_x86_64? ( https://dl.winehq.org/wine/wine-gecko/${VANILLA_GV}/wine_gecko-${VANILLA_GV}-x86_64.msi )
                )
-               mono? ( https://dl.winehq.org/wine/wine-mono/${MV}/wine-mono-${MV}.msi )
+               mono? ( https://dl.winehq.org/wine/wine-mono/${VANILLA_MV}/wine-mono-${VANILLA_MV}.msi )
        )
        staging? (
                gecko? (
@@ -259,7 +259,10 @@ pkg_pretend() {
 
 pkg_setup() {
        wine_build_environment_check || die
-       if use staging; then
+       if ! use staging; then
+               GV=${VANILLA_GV}
+               MV=${VANILLA_MV}
+       else
                GV=${STAGING_GV}
                MV=${STAGING_MV}
        fi
@@ -345,7 +348,7 @@ src_prepare() {
        # hi-res default icon, #472990, http://bugs.winehq.org/show_bug.cgi?id=24652
        cp "${WORKDIR}"/${WINE_GENTOO}/icons/oic_winlogo.ico dlls/user32/resources/ || die
 
-       l10n_get_locales > po/LINGUAS # otherwise wine doesn't respect LINGUAS
+       l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
 }
 
 src_configure() {

diff --git a/app-emulation/wine/wine-1.9.6-r2.ebuild b/app-emulation/wine/wine-1.9.6-r2.ebuild
index 47058cbbb024d7179dd35d2c970ae8f122d6daed..c52e2472d1b8635d4f5ae36ea0b643af6c86f748 100644 (file)
--- a/app-emulation/wine/wine-1.9.6-r2.ebuild
+++ b/app-emulation/wine/wine-1.9.6-r2.ebuild
@@ -21,8 +21,8 @@ else
        KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
 fi
 
-GV="2.44"
-MV="4.6.0"
+VANILLA_GV="2.44"
+VANILLA_MV="4.6.0"
 STAGING_GV="2.44"
 STAGING_MV="4.6.0"
 [[ ${MAJOR_V} == "1.8" ]] && SUFFIX="-unofficial"
@@ -34,10 +34,10 @@ HOMEPAGE="http://www.winehq.org/"
 SRC_URI="${SRC_URI}
        !staging? (
                gecko? (
-                       abi_x86_32? ( https://dl.winehq.org/wine/wine-gecko/${GV}/wine_gecko-${GV}-x86.msi )
-                       abi_x86_64? ( https://dl.winehq.org/wine/wine-gecko/${GV}/wine_gecko-${GV}-x86_64.msi )
+                       abi_x86_32? ( https://dl.winehq.org/wine/wine-gecko/${VANILLA_GV}/wine_gecko-${VANILLA_GV}-x86.msi )
+                       abi_x86_64? ( https://dl.winehq.org/wine/wine-gecko/${VANILLA_GV}/wine_gecko-${VANILLA_GV}-x86_64.msi )
                )
-               mono? ( https://dl.winehq.org/wine/wine-mono/${MV}/wine-mono-${MV}.msi )
+               mono? ( https://dl.winehq.org/wine/wine-mono/${VANILLA_MV}/wine-mono-${VANILLA_MV}.msi )
        )
        staging? (
                gecko? (
@@ -259,7 +259,10 @@ pkg_pretend() {
 
 pkg_setup() {
        wine_build_environment_check || die
-       if use staging; then
+       if ! use staging; then
+               GV=${VANILLA_GV}
+               MV=${VANILLA_MV}
+       else
                GV=${STAGING_GV}
                MV=${STAGING_MV}
        fi
@@ -342,7 +345,7 @@ src_prepare() {
        # hi-res default icon, #472990, http://bugs.winehq.org/show_bug.cgi?id=24652
        cp "${WORKDIR}"/${WINE_GENTOO}/icons/oic_winlogo.ico dlls/user32/resources/ || die
 
-       l10n_get_locales > po/LINGUAS # otherwise wine doesn't respect LINGUAS
+       l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
 }
 
 src_configure() {

diff --git a/app-emulation/wine/wine-1.9.7-r2.ebuild b/app-emulation/wine/wine-1.9.7-r2.ebuild
index 47058cbbb024d7179dd35d2c970ae8f122d6daed..c52e2472d1b8635d4f5ae36ea0b643af6c86f748 100644 (file)
--- a/app-emulation/wine/wine-1.9.7-r2.ebuild
+++ b/app-emulation/wine/wine-1.9.7-r2.ebuild
@@ -21,8 +21,8 @@ else
        KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
 fi
 
-GV="2.44"
-MV="4.6.0"
+VANILLA_GV="2.44"
+VANILLA_MV="4.6.0"
 STAGING_GV="2.44"
 STAGING_MV="4.6.0"
 [[ ${MAJOR_V} == "1.8" ]] && SUFFIX="-unofficial"
@@ -34,10 +34,10 @@ HOMEPAGE="http://www.winehq.org/"
 SRC_URI="${SRC_URI}
        !staging? (
                gecko? (
-                       abi_x86_32? ( https://dl.winehq.org/wine/wine-gecko/${GV}/wine_gecko-${GV}-x86.msi )
-                       abi_x86_64? ( https://dl.winehq.org/wine/wine-gecko/${GV}/wine_gecko-${GV}-x86_64.msi )
+                       abi_x86_32? ( https://dl.winehq.org/wine/wine-gecko/${VANILLA_GV}/wine_gecko-${VANILLA_GV}-x86.msi )
+                       abi_x86_64? ( https://dl.winehq.org/wine/wine-gecko/${VANILLA_GV}/wine_gecko-${VANILLA_GV}-x86_64.msi )
                )
-               mono? ( https://dl.winehq.org/wine/wine-mono/${MV}/wine-mono-${MV}.msi )
+               mono? ( https://dl.winehq.org/wine/wine-mono/${VANILLA_MV}/wine-mono-${VANILLA_MV}.msi )
        )
        staging? (
                gecko? (
@@ -259,7 +259,10 @@ pkg_pretend() {
 
 pkg_setup() {
        wine_build_environment_check || die
-       if use staging; then
+       if ! use staging; then
+               GV=${VANILLA_GV}
+               MV=${VANILLA_MV}
+       else
                GV=${STAGING_GV}
                MV=${STAGING_MV}
        fi
@@ -342,7 +345,7 @@ src_prepare() {
        # hi-res default icon, #472990, http://bugs.winehq.org/show_bug.cgi?id=24652
        cp "${WORKDIR}"/${WINE_GENTOO}/icons/oic_winlogo.ico dlls/user32/resources/ || die
 
-       l10n_get_locales > po/LINGUAS # otherwise wine doesn't respect LINGUAS
+       l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
 }
 
 src_configure() {

diff --git a/app-emulation/wine/wine-1.9.8-r1.ebuild b/app-emulation/wine/wine-1.9.8-r1.ebuild
index c886ca7267d1d71d7799e652874844be7a22e9d7..2db9e5bfbea1252f0335b4d27cc407c1fc094767 100644 (file)
--- a/app-emulation/wine/wine-1.9.8-r1.ebuild
+++ b/app-emulation/wine/wine-1.9.8-r1.ebuild
@@ -21,8 +21,8 @@ else
        KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
 fi
 
-GV="2.44"
-MV="4.6.2"
+VANILLA_GV="2.44"
+VANILLA_MV="4.6.2"
 STAGING_GV="2.44"
 STAGING_MV="4.6.2"
 [[ ${MAJOR_V} == "1.8" ]] && SUFFIX="-unofficial"
@@ -34,10 +34,10 @@ HOMEPAGE="http://www.winehq.org/"
 SRC_URI="${SRC_URI}
        !staging? (
                gecko? (
-                       abi_x86_32? ( https://dl.winehq.org/wine/wine-gecko/${GV}/wine_gecko-${GV}-x86.msi )
-                       abi_x86_64? ( https://dl.winehq.org/wine/wine-gecko/${GV}/wine_gecko-${GV}-x86_64.msi )
+                       abi_x86_32? ( https://dl.winehq.org/wine/wine-gecko/${VANILLA_GV}/wine_gecko-${VANILLA_GV}-x86.msi )
+                       abi_x86_64? ( https://dl.winehq.org/wine/wine-gecko/${VANILLA_GV}/wine_gecko-${VANILLA_GV}-x86_64.msi )
                )
-               mono? ( https://dl.winehq.org/wine/wine-mono/${MV}/wine-mono-${MV}.msi )
+               mono? ( https://dl.winehq.org/wine/wine-mono/${VANILLA_MV}/wine-mono-${VANILLA_MV}.msi )
        )
        staging? (
                gecko? (
@@ -259,7 +259,10 @@ pkg_pretend() {
 
 pkg_setup() {
        wine_build_environment_check || die
-       if use staging; then
+       if ! use staging; then
+               GV=${VANILLA_GV}
+               MV=${VANILLA_MV}
+       else
                GV=${STAGING_GV}
                MV=${STAGING_MV}
        fi
@@ -342,7 +345,7 @@ src_prepare() {
        # hi-res default icon, #472990, http://bugs.winehq.org/show_bug.cgi?id=24652
        cp "${WORKDIR}"/${WINE_GENTOO}/icons/oic_winlogo.ico dlls/user32/resources/ || die
 
-       l10n_get_locales > po/LINGUAS # otherwise wine doesn't respect LINGUAS
+       l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
 }
 
 src_configure() {

diff --git a/app-emulation/wine/wine-1.9.9-r1.ebuild b/app-emulation/wine/wine-1.9.9-r1.ebuild
index 34d2b890b0f2170cd72d084dadbe8ddc67d94599..ef7d72ca46d6d1ed1856aa538630e0915b3f57cf 100644 (file)
--- a/app-emulation/wine/wine-1.9.9-r1.ebuild
+++ b/app-emulation/wine/wine-1.9.9-r1.ebuild
@@ -21,8 +21,8 @@ else
        KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
 fi
 
-GV="2.44"
-MV="4.6.2"
+VANILLA_GV="2.44"
+VANILLA_MV="4.6.2"
 STAGING_GV="2.44"
 STAGING_MV="4.6.2"
 [[ ${MAJOR_V} == "1.8" ]] && SUFFIX="-unofficial"
@@ -36,10 +36,10 @@ HOMEPAGE="http://www.winehq.org/"
 SRC_URI="${SRC_URI}
        !staging? (
                gecko? (
-                       abi_x86_32? ( https://dl.winehq.org/wine/wine-gecko/${GV}/wine_gecko-${GV}-x86.msi )
-                       abi_x86_64? ( https://dl.winehq.org/wine/wine-gecko/${GV}/wine_gecko-${GV}-x86_64.msi )
+                       abi_x86_32? ( https://dl.winehq.org/wine/wine-gecko/${VANILLA_GV}/wine_gecko-${VANILLA_GV}-x86.msi )
+                       abi_x86_64? ( https://dl.winehq.org/wine/wine-gecko/${VANILLA_GV}/wine_gecko-${VANILLA_GV}-x86_64.msi )
                )
-               mono? ( https://dl.winehq.org/wine/wine-mono/${MV}/wine-mono-${MV}.msi )
+               mono? ( https://dl.winehq.org/wine/wine-mono/${VANILLA_MV}/wine-mono-${VANILLA_MV}.msi )
        )
        staging? (
                gecko? (
@@ -264,7 +264,10 @@ pkg_pretend() {
 
 pkg_setup() {
        wine_build_environment_check || die
-       if use staging; then
+       if ! use staging; then
+               GV=${VANILLA_GV}
+               MV=${VANILLA_MV}
+       else
                GV=${STAGING_GV}
                MV=${STAGING_MV}
        fi
@@ -360,7 +363,7 @@ src_prepare() {
        # hi-res default icon, #472990, http://bugs.winehq.org/show_bug.cgi?id=24652
        cp "${WORKDIR}"/${WINE_GENTOO}/icons/oic_winlogo.ico dlls/user32/resources/ || die
 
-       l10n_get_locales > po/LINGUAS # otherwise wine doesn't respect LINGUAS
+       l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
 }
 
 src_configure() {

diff --git a/app-emulation/wine/wine-9999.ebuild b/app-emulation/wine/wine-9999.ebuild
index 5da73b4d940308f45538a283f69dc3eaa24663f8..c637572cb6197a1a839d0d82874b394475795183 100644 (file)
--- a/app-emulation/wine/wine-9999.ebuild
+++ b/app-emulation/wine/wine-9999.ebuild
@@ -21,8 +21,8 @@ else
        KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
 fi
 
-GV="2.47"
-MV="4.6.3"
+VANILLA_GV="2.47"
+VANILLA_MV="4.6.3"
 STAGING_GV="2.47"
 STAGING_MV="4.6.3"
 [[ ${MAJOR_V} == "1.8" ]] && SUFFIX="-unofficial"
@@ -36,10 +36,10 @@ HOMEPAGE="http://www.winehq.org/"
 SRC_URI="${SRC_URI}
        !staging? (
                gecko? (
-                       abi_x86_32? ( https://dl.winehq.org/wine/wine-gecko/${GV}/wine_gecko-${GV}-x86.msi )
-                       abi_x86_64? ( https://dl.winehq.org/wine/wine-gecko/${GV}/wine_gecko-${GV}-x86_64.msi )
+                       abi_x86_32? ( https://dl.winehq.org/wine/wine-gecko/${VANILLA_GV}/wine_gecko-${VANILLA_GV}-x86.msi )
+                       abi_x86_64? ( https://dl.winehq.org/wine/wine-gecko/${VANILLA_GV}/wine_gecko-${VANILLA_GV}-x86_64.msi )
                )
-               mono? ( https://dl.winehq.org/wine/wine-mono/${MV}/wine-mono-${MV}.msi )
+               mono? ( https://dl.winehq.org/wine/wine-mono/${VANILLA_MV}/wine-mono-${VANILLA_MV}.msi )
        )
        staging? (
                gecko? (
@@ -264,7 +264,10 @@ pkg_pretend() {
 
 pkg_setup() {
        wine_build_environment_check || die
-       if use staging; then
+       if ! use staging; then
+               GV=${VANILLA_GV}
+               MV=${VANILLA_MV}
+       else
                GV=${STAGING_GV}
                MV=${STAGING_MV}
        fi
@@ -359,7 +362,7 @@ src_prepare() {
        # hi-res default icon, #472990, http://bugs.winehq.org/show_bug.cgi?id=24652
        cp "${WORKDIR}"/${WINE_GENTOO}/icons/oic_winlogo.ico dlls/user32/resources/ || die
 
-       l10n_get_locales > po/LINGUAS # otherwise wine doesn't respect LINGUAS
+       l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
 }
 
 src_configure() {