commit: 0271219fa8a3a8395d2bff30d244e764aff07632
Author: NP-Hardass <NP-Hardass <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 15 22:47:37 2015 +0000
Commit: NP Hardass <np-hardass <AT> gentoo <DOT> org>
CommitDate: Mon Nov 16 07:57:55 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0271219f
app-emulation/wine: Version bump to 1.7.55. Pulseaudio now mainstream.
Pulseaudio support has been merged upstream. While this means that
patches from Wine Staging are no longer necessary, some users may still
want to keep the staging flag enabled for additional patches for pulseaudio.
Package-Manager: portage-2.2.23
app-emulation/wine/Manifest | 2 ++
.../wine/{wine-9999.ebuild => wine-1.7.55.ebuild} | 18 ++++++------------
app-emulation/wine/wine-9999.ebuild | 18 ++++++------------
3 files changed, 14 insertions(+), 24 deletions(-)
diff --git a/app-emulation/wine/Manifest b/app-emulation/wine/Manifest
index 966478f..b3ed6a9 100644
--- a/app-emulation/wine/Manifest
+++ b/app-emulation/wine/Manifest
@@ -38,6 +38,7 @@ DIST wine-1.7.51.tar.bz2 22639053 SHA256
397fc95b463d6ae1b65ab0477d9fe5d0871e8e2
DIST wine-1.7.52.tar.bz2 22707539 SHA256
0773b32a0c358323db4c383ceb1e9e28d5d4ed4ea37570af2bcb41fecf0d554b SHA512
834a77553d1352840c747ab5dc3e582b15da4ea65f16f9d58d0cc8afb460b4a0fded859929331dd32d9f4f66ab14bb890cf239d0a283bf9ffd92b48f9d1687de
WHIRLPOOL
7e6cc679d994449e7f822c2593d1e8cc87d439df6084ad7d48897f3829b866219a0674e81e1fecdc5629225cd3c6ca2735212e1a0cb9d41a236af4674b62d077
DIST wine-1.7.53.tar.bz2 22763993 SHA256
efba70b106cde683a50a4b1f42df3d900f8ffc291a3689cb897afcc12cc2c6a3 SHA512
82c53c5a7913f5c3ab38239f6cd4dc5ec16db878b8ff9ff46162f11f72c13a3da9c1dc80e7eddef5eb2b909e7b8cd771294cfdc79d734d643aecfeefb0059401
WHIRLPOOL
054640d64794e0eac3b41c359353a8d322f9ae9a9a01969616fe6f9207d4276909d4fa17c7a2b167d705166490df523b3dcaf738efab0a71bfab26ea59eeafe1
DIST wine-1.7.54.tar.bz2 22800326 SHA256
e0f311f392815468df774b33312cde80bf1ff3a894c9c2b462825fd49619bb27 SHA512
15c9c80518d41486da416d531f7be101353d379bcd8fd309395d2932eceabb3fa5cd8180066f73d13c6a211495146bb544a8878657cf9ca8e5e14987a038a6c7
WHIRLPOOL
b1f6f3e4149307f8c0b3feb443dd7b36e8a5c81b8b7b41f6c39167590fb13057174c95723f262082465fe1696c17d9216ea93ad2f8ce1e8f5c8d7aadc12d5425
+DIST wine-1.7.55.tar.bz2 22814631 SHA256
a148f6c9cb45a75ef1a15e60a7db9c22fce985e0e58fe1350e7931dfe5d36119 SHA512
f47025017836ce1bbf2ed69c7d7421bd8a2f33ff94ced4a5caf92f4fabdf336119c80a28aeb8ba1ebe0239871a6ac62d8af8435d220c317624c17aabc2100dd7
WHIRLPOOL
c5575d2ef687caccbdb5cc09a0c6a4ba9f65ec9674cbe3f23ecfced62710dcb0019a11ff66f2ec4c2eafdb30d9891abad158ac4f865cc580a2878067de7304d7
DIST wine-1.7.8.tar.bz2 21463503 SHA256
30e17f5f863a09416f3d229666566b318dbb40f683d4ca6630012c60bb511804 SHA512
1fdaddb7909f818050854bf351d20f445cf6a5906b1bcc789c96ee8d5058c90815a91bbbc6444f3e4527748764f03ab5297585c174b433093a3354a827402fea
WHIRLPOOL
3b5b18384ff04b80b936160c2c6e03676d69663c023f484981305c9272d0601b74cda5c5f7d56008b3900d702b1a4fe1929f16b1fba304a6480b076ffede663a
DIST wine-1.7.9.tar.bz2 21323337 SHA256
79f99ecc24696915439c474c4953bb77652ab53f16b41daa4da270fe43279c5a SHA512
29f8aa715ebe47c8a06bd5f6a80cac3fb75b2ca7aa81648cc8aed5461cfd825e4da68b6209ca672dce42b968521cfd9bffffaadd2d85b904b55d99687a1c83d0
WHIRLPOOL
333fee72b2a0e9d6ab8a003712c38166bd27aaff384a2b940c089ecc846f7669c59efbeb5cdc2fc87a46d63b0d29d0335873bb7c22f05913bad430b81990241a
DIST wine-gentoo-2013.06.24.tar.bz2 85442 SHA256
bfbf6b25e98f717320de2ede467e3628fbc749d936b8449f8477c9dc6f41e04b SHA512
b6819889314f6a6ea16c1332f4b177c43623116763969c31b23b61754cd304dd085f5d3eafbe847159331eb97dddd9b4c10699430129ea4a71da418c1fe175f0
WHIRLPOOL
227e0ac6569736d4ad5813cef49f775dae956f4fc9255de95753d5d3cba1bf6cf3db31d23d3702bb54d2e60c5a6f779b602f0efb2096e4c827c924565b273d00
@@ -72,6 +73,7 @@ DIST wine-staging-1.7.51.tar.gz 9628831 SHA256
662cbfcca95405045ba063f312fa4f605
DIST wine-staging-1.7.52.tar.gz 9654310 SHA256
84354a10e4226b5e456abb6d5727f4514c79d537ca809bb114a945830166cd73 SHA512
1c6c76ff67363dc3b1b9c92b10df3cdd3e5deb4c4223128478b891557ffafdcb5db2752ed26e23e8c2bc7176e5c9d22a3990b148aff6fbb5211a7527b9a542f1
WHIRLPOOL
24f2bf5b357a474de7efe95cbad13bc3126f55fe0610aa1d9c258af605a002eabfd860b2874e5a2c4d2f017e3f7238107001b57ba1c406066a450bc34937e9ed
DIST wine-staging-1.7.53.tar.gz 9638222 SHA256
438f41165987a57635694dba2f67cc435cd630581b13cafe0c85daacf37a102a SHA512
716840c44923848a28b481f6b4e422ef84fe33bef33a650c183c62be0dbec34471375fe2b1911382282f293fd5135ce133cdb775acd7df98029be2e4646b6d9e
WHIRLPOOL
702555a706e50521ca6864b7b29ee4a4774fc8d770775c5186728b19e2c71ba6040ce98f86a772435c0d2f0a4363bc2a1e8f0b13ffbbe9395c072d3d89d1118c
DIST wine-staging-1.7.54.tar.gz 9647030 SHA256
b244ab05326e0a4c149beba0684afc100d44dca8e6ff606bcfee883b21b27303 SHA512
f6e58be01ba10121d6904cb238b2d91dd79cb7d14d623c00a897e655adb88332bea125cedf3fad85e680c76aacfbab16dd5035c322278155defd3b493054aa23
WHIRLPOOL
4c053ad96e67f4e82c93d3cfa9b6f885c4c3fe693946dd0e2a30cef556aac55f9dcafb5c56ced0f714f8ea9448cb4e22f144ea7f3561cfdb5bbff1b049d34f07
+DIST wine-staging-1.7.55.tar.gz 9604441 SHA256
856b630fe95250e3d2dfc80588529e42e92e37f2e974ce8d3da37b39bf5cc3c3 SHA512
a6fbfa01b6d6efc75f79235aea86091c32ddf91ca300c73325c8347949c627f53ceb0fe085d6c212602797b0496d36c0a79f08eae4644a17774e95906332032d
WHIRLPOOL
ad232568c9df5d436a79a3557c82e231eed121356d8db1f5a3c0e7249b6c2760d87bb433ff30d6db53ce190b2d49401aa387b06f0c3f74925aefea7b1d73f112
DIST wine_gecko-2.21-x86.msi 20871680 SHA256
f01fafa6d7aab995c38add77315c4cbc2f32f52d5d6a9350056f42b62d631fd8 SHA512
f4ca9ca5b876dc39e906991e58c6da8ef4103782f83ba781ff27556c0ebdab7fe10c14f0551e900442a5d57a2c619da6e5ed6ed42323edcdd55ce9789c4c83ac
WHIRLPOOL
d1db97175b047652499c97c968b71c08c5b44774423f22ae626f89b4dde3d03b46295e5caae228f1f8614209e943e8246854b478eef3abb186e8de4c341b0a0d
DIST wine_gecko-2.21-x86_64.msi 21646336 SHA256
bc370bdc899f66d98f31c4d410a6952aa82c0c9c0a0ec27f2a11243c9b412c3f SHA512
2a48a7697beba4e45816a9eff09e181de353d8c93e02a70108fa77d27136cd5cd75b21c42caa7702a09f86544669ae2bbfc6975b1fc0d7fcb20150a4bc4ea514
WHIRLPOOL
2fce9b9a190a52c173551d47428dd8b8dc54d5878682733e0006a3f06f216cd9f47a88ada49f92fa5697ece8b2942a88f937bd2722b4cb85d2c35c19bda29b85
DIST wine_gecko-2.24-x86.msi 22373888 SHA256
6e38acae87ea66e2c1e8f2f0afe88f89eed3e6e0b431cd3da38dea814b71202c SHA512
f158d28ca09bc900a2680892e7ac10770e06050a9251e1ec3a953fee0bf9b1c326e166f92fb88a4648297b6587c91a5ef5af35f267bb2ba5f679da4c8fdb6898
WHIRLPOOL
bbe7a2572d89dc5e0347ba11b2014bac79fc4427d7551655313a46b147a79c1607b7f46596877c459ddaa0e202337fb3d217429ddd6a4df49ee33b373a788487
diff --git a/app-emulation/wine/wine-9999.ebuild
b/app-emulation/wine/wine-1.7.55.ebuild
similarity index 96%
copy from app-emulation/wine/wine-9999.ebuild
copy to app-emulation/wine/wine-1.7.55.ebuild
index 37b9d26..e6a53ea 100644
--- a/app-emulation/wine/wine-9999.ebuild
+++ b/app-emulation/wine/wine-1.7.55.ebuild
@@ -8,7 +8,7 @@ AUTOTOOLS_AUTORECONF=1
PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt
ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv
te th tr uk wa zh_CN zh_TW"
PLOCALE_BACKUP="en"
-inherit autotools-utils eutils fdo-mime flag-o-matic gnome2-utils l10n
multilib multilib-minimal pax-utils toolchain-funcs virtualx
+inherit autotools-utils eutils fdo-mime flag-o-matic gnome2-utils l10n
multilib multilib-minimal pax-utils toolchain-funcs virtualx versionator
if [[ ${PV} == "9999" ]] ; then
EGIT_REPO_URI="git://source.winehq.org/git/wine.git
http://source.winehq.org/git/wine.git";
@@ -17,10 +17,9 @@ if [[ ${PV} == "9999" ]] ; then
SRC_URI=""
#KEYWORDS=""
else
- MY_P="${PN}-${PV/_/-}"
- SRC_URI="mirror://sourceforge/${PN}/Source/${MY_P}.tar.bz2"
+ MAJOR_V=$(get_version_component_range 1-2)
+ SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}/${P}.tar.bz2";
KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
- S=${WORKDIR}/${MY_P}
fi
GV="2.40"
@@ -44,8 +43,7 @@ if [[ ${PV} == "9999" ]] ; then
STAGING_EGIT_REPO_URI="git://github.com/wine-compholio/wine-staging.git"
else
SRC_URI="${SRC_URI}
- staging? (
https://github.com/wine-compholio/wine-staging/archive/v${PV}.tar.gz ->
${STAGING_P}.tar.gz )
- pulseaudio? (
https://github.com/wine-compholio/wine-staging/archive/v${PV}.tar.gz ->
${STAGING_P}.tar.gz )"
+ staging? (
https://github.com/wine-compholio/wine-staging/archive/v${PV}.tar.gz ->
${STAGING_P}.tar.gz )"
fi
LICENSE="LGPL-2.1"
@@ -211,7 +209,7 @@ src_unpack() {
EGIT_CHECKOUT_DIR=${STAGING_DIR} git-r3_src_unpack
fi
else
- unpack ${MY_P}.tar.bz2
+ unpack ${P}.tar.bz2
use staging || use pulseaudio && unpack "${STAGING_P}.tar.gz"
fi
@@ -265,8 +263,6 @@ src_prepare() {
source "${STAGING_DIR}/patches/patchinstall.sh"
)
eend $?
- elif use pulseaudio; then
- PATCHES+=(
"${STAGING_DIR}/patches/winepulse-PulseAudio_Support"/*.patch )
fi
autotools-utils_src_prepare
@@ -322,6 +318,7 @@ multilib_src_configure() {
$(use_with oss)
$(use_with pcap)
$(use_with png)
+ $(use_with pulseaudio)
$(use_with threads pthread)
$(use_with scanner sane)
$(use_enable test tests)
@@ -334,9 +331,6 @@ multilib_src_configure() {
$(use_with xml xslt)
)
- if use pulseaudio || use staging; then
- myconf+=( $(use_with pulseaudio pulse) )
- fi
use staging && myconf+=(
--with-xattr
$(use_with vaapi va)
diff --git a/app-emulation/wine/wine-9999.ebuild
b/app-emulation/wine/wine-9999.ebuild
index 37b9d26..e6a53ea 100644
--- a/app-emulation/wine/wine-9999.ebuild
+++ b/app-emulation/wine/wine-9999.ebuild
@@ -8,7 +8,7 @@ AUTOTOOLS_AUTORECONF=1
PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt
ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv
te th tr uk wa zh_CN zh_TW"
PLOCALE_BACKUP="en"
-inherit autotools-utils eutils fdo-mime flag-o-matic gnome2-utils l10n
multilib multilib-minimal pax-utils toolchain-funcs virtualx
+inherit autotools-utils eutils fdo-mime flag-o-matic gnome2-utils l10n
multilib multilib-minimal pax-utils toolchain-funcs virtualx versionator
if [[ ${PV} == "9999" ]] ; then
EGIT_REPO_URI="git://source.winehq.org/git/wine.git
http://source.winehq.org/git/wine.git";
@@ -17,10 +17,9 @@ if [[ ${PV} == "9999" ]] ; then
SRC_URI=""
#KEYWORDS=""
else
- MY_P="${PN}-${PV/_/-}"
- SRC_URI="mirror://sourceforge/${PN}/Source/${MY_P}.tar.bz2"
+ MAJOR_V=$(get_version_component_range 1-2)
+ SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}/${P}.tar.bz2";
KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
- S=${WORKDIR}/${MY_P}
fi
GV="2.40"
@@ -44,8 +43,7 @@ if [[ ${PV} == "9999" ]] ; then
STAGING_EGIT_REPO_URI="git://github.com/wine-compholio/wine-staging.git"
else
SRC_URI="${SRC_URI}
- staging? (
https://github.com/wine-compholio/wine-staging/archive/v${PV}.tar.gz ->
${STAGING_P}.tar.gz )
- pulseaudio? (
https://github.com/wine-compholio/wine-staging/archive/v${PV}.tar.gz ->
${STAGING_P}.tar.gz )"
+ staging? (
https://github.com/wine-compholio/wine-staging/archive/v${PV}.tar.gz ->
${STAGING_P}.tar.gz )"
fi
LICENSE="LGPL-2.1"
@@ -211,7 +209,7 @@ src_unpack() {
EGIT_CHECKOUT_DIR=${STAGING_DIR} git-r3_src_unpack
fi
else
- unpack ${MY_P}.tar.bz2
+ unpack ${P}.tar.bz2
use staging || use pulseaudio && unpack "${STAGING_P}.tar.gz"
fi
@@ -265,8 +263,6 @@ src_prepare() {
source "${STAGING_DIR}/patches/patchinstall.sh"
)
eend $?
- elif use pulseaudio; then
- PATCHES+=(
"${STAGING_DIR}/patches/winepulse-PulseAudio_Support"/*.patch )
fi
autotools-utils_src_prepare
@@ -322,6 +318,7 @@ multilib_src_configure() {
$(use_with oss)
$(use_with pcap)
$(use_with png)
+ $(use_with pulseaudio)
$(use_with threads pthread)
$(use_with scanner sane)
$(use_enable test tests)
@@ -334,9 +331,6 @@ multilib_src_configure() {
$(use_with xml xslt)
)
- if use pulseaudio || use staging; then
- myconf+=( $(use_with pulseaudio pulse) )
- fi
use staging && myconf+=(
--with-xattr
$(use_with vaapi va)
