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

Package-Manager: portage-2.2.28
hanetzer · Jul 11, 2016 · dd9a77d · dd9a77d
1 parent 6d5bee9
commit dd9a77d
Show file tree

Hide file tree

Showing 16 changed files with 151 additions and 106 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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() {