commit: 5d546c16e06655439b580ecc970371cf49d230c3
Author: Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 20 15:54:21 2015 +0000
Commit: Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Sun Sep 20 15:54:21 2015 +0000
URL:
https://gitweb.gentoo.org/proj/multilib-portage.git/commit/?id=5d546c16
Follow main tree version for wine
Package-Manager: portage-2.2.18
Manifest-Sign-Key: 0xC05330B3211CA2D4
app-emulation/wine/Manifest | 22 +++++++++++++++++-----
.../{wine-1.7.47.ebuild => wine-1.7.51.ebuild} | 9 ++++-----
2 files changed, 21 insertions(+), 10 deletions(-)
diff --git a/app-emulation/wine/Manifest b/app-emulation/wine/Manifest
index cdd6184..9f03407 100644
--- a/app-emulation/wine/Manifest
+++ b/app-emulation/wine/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
AUX wine-1.4_rc2-multilib-portage.patch 1256 SHA256
9d0acd304d11d1bf73f56699754aaa1bfe1facba90648ee330fdbe08d9ff4938 SHA512
ac0b29e2b4c9b04bb6694a4e4da654446f68efbf90cda6809b45dad51e6679ac5410398763fde7e9505ef959493a037aa588cee58d14906563a4746702d2b0e9
WHIRLPOOL
8ea26266c327bc8313eca9b5d39c9741b226037750ca2d1d33262420093e05c306e7f004656c362c3c50b330d050cf9e5fceaa2b024a82809aae8b3617b0ae18
AUX wine-1.5.17-osmesa-check.patch 1774 SHA256
dc7dde67c416bb067e528b85228cff01833a2a20c802248ef56d74184014e50e SHA512
12325e75db5e63e1d4c4e2463c3e164b1eba0d3d88455cfcd698a8bb790d7c0b3c947a06e7a09e232b1a14202e64ea2dc9331cbc4b503833f78a7c1034410c79
WHIRLPOOL
2d9bb86a5d683301c75ea275302f67616a8e9c6ebfc436b05f8f1b3d5d815c310999ca9518747abcf4d248bd18f34388dcb323c526d633c50e66ffb4bf94e5d6
AUX wine-1.5.26-winegcc.patch 1808 SHA256
91c1012059b93a421b2eae9f2ea46b7b327d6d3d58ba0cb47021c8a57f6d8228 SHA512
fce9daf40a96f4a7502c249a30107c8dfc5d8edd4a171b863d2bf14c3ad46d18e4c29932ab4a6ede7da5d589d777b962d2f577f5360ee4db8019d71362c51d47
WHIRLPOOL
71cbe36c6bac87071472541b7f5cd3ed1b08f05479bc0016262b3f86e75738e467dad197563b4898f2b24fd0ab4e27c40dce04f244a3e7f5ea1582b4db1c5cc2
@@ -11,13 +14,22 @@ AUX wine-1.7.39-gstreamer-v5-staging-pre.patch 1237 SHA256
2d5ba5b40d4e6ea48906f
AUX wine-1.7.45-libunwind-osx-only.patch 1477 SHA256
01c73e559acdb5acf8393d0c5cb03ac1c1fa06714b87ff208fd545cc0bca9f23 SHA512
f11ce2df3f6f010fb3e7ee3761ecce72a92807ef0c62955886c08f333fcde6f543282f6cda4a0a9950414fe56583a78cb5bc8124263cd8a2b0904d3b506ef8ac
WHIRLPOOL
edc4708f102de65943e7ee436e6c2b65b31a377495fdae6ac7354141d1fd595967d978495744b04fa765299fe1b81150326a14e61ff4491cac7ea2d63f5f34bb
AUX wine-1.7.47-critical-security-cookie-fix.patch 2953 SHA256
f5b4ffc60aed2d3837b908697cd72a06fe06d9a87d059d846219ee0512b52499 SHA512
b7ffa6222f3b5a5530ae9ec9fd2e2448685dc7cd5859c7e48cd86c9db9e4a740990345991ad314cc5230a86bf16af7b77ebab03b1d8c75bb6d68b0561e2b84ef
WHIRLPOOL
c9a8830ae87d835c02c9d9d41d6a29dd798dc7f4350b0d8896b5ec851d2412c7d7fd2b121a76b4e8d5eae75705f1effff9934f50852c792a95e20e2e7bd01457
DIST wine-1.7.34-gstreamer-v5.patch.bz2 5703 SHA256
c3bb6f669f46d9f2d7ba494a2264cee457349f559d4b0758db80e39eb22f2aee SHA512
e780394e8739a58593d264322c462bfe9040c1cabce93b84d24f09040026368efb4ac34a6a302beb6048d14b4ac835b87a0c515b52c1a0c143aa4e15691eb01b
WHIRLPOOL
1befbb0fbd026d6e833c5d72341064dd6e12157e1b7df58e349b9985648bfbc63f70e9cab45b61155515ac65057968e30ba313e71e183b8027153c9392d89192
-DIST wine-1.7.47.tar.bz2 22398577 SHA256
ba74f75aec400dc4b1d64ddc29560e4946837e73cb19d9c231604ff0147bbb2e SHA512
588bc143fc371c013b3565044ac14a22176c63fb79e7798a32cd75ec2dbf6b52a73529638254809aa3a4b3105067e96289b555436099c41622b8ffeb2b97a601
WHIRLPOOL
6545baa254f181fbe7a35b19e319faf7b21b838b91fddcab46ae65d8331407d62b36f78f20a19f97895c5c16059f18b3d23d6659658f8939611b171a408478ef
+DIST wine-1.7.51.tar.bz2 22639053 SHA256
397fc95b463d6ae1b65ab0477d9fe5d0871e8e2a3322bc9d984e438f2c4d0f52 SHA512
d23b2a37f82c26b4a2b339711a9eb6d6819c8c4def27c65cb7b8bb917aa660f51b3190b35493246d0bc2eea1ffd47529c4ed18a75ee64654b5f40970eefe277a
WHIRLPOOL
ec4aec57c1623cf1c5bd91f654cff4a23f5ec4010c33217d2e46f25f6322aa8707797368b428561fee6252849bf09abb25e01524d0ff41ebf440ca7914dd9464
DIST wine-gentoo-2015.03.07.tar.bz2 85419 SHA256
f13f93dc49bbc33a294c4d511b6e01aec2d38bff77a1e44d07668291add1ab04 SHA512
bae1d2d5575d340d01f44008104f0e5ec0c4a4982995dec37d501594cd21d07a2b4ad4465c4273646d5bf6521996b4b82471097864be75342abe3e7d478a56bd
WHIRLPOOL
0f254dd692e87a1f71dd19f6c1c8c59b8a91b994e75912a2e6e3ba5e875b85119fe497a331a95c2ce33bbf5f064143d23ee00275da92c494227de0807c9abb06
DIST wine-mono-4.5.6.msi 53705216 SHA256
ac681f737f83742d786706529eb85f4bc8d6bdddd8dcdfa9e2e336b71973bc25 SHA512
4d8df04c1d0da09d1abe423dd271e5dd14a193d607fb54e214d2e340827f7c33829342d1580b6907d7cf466e70993d743c6e1ca9a026d4b6225dd7c1fc8b1386
WHIRLPOOL
9a68e502da0be6768e92d88f2ccace607300f3a331e0f9e1b6d60e9c6c2d4eb635b902f03e13aad73461dd5f0c2691c7b41958356ebb7f445e8def4282c675d3
-DIST wine-staging-1.7.47.tar.gz 9166592 SHA256
75aef17c68d1e54b922529832edadca5951e6a37637aad696cfe5abb93d9ca15 SHA512
b3feb61040a727b50fc3efb08441a800b08b4f7d61a00fc68175a6187486a701cc4737f9543119c32ed0c5f141d73ace396114337082cf7978a3437f4217844a
WHIRLPOOL
69bead0fa0748dab8d0480d20052b3a75798d42bc32d55b9b254fba7774dddda48642c4e2f116f2c3d813f97e0827232945b3adaad22a827a43be8de12698bbc
-DIST wine_gecko-2.36-x86.msi 29718016 SHA256
afa457ce8f9885225b6e549dd6f154713ce15bf063c23e38c1327d2f869e128a SHA512
6099240fb76368ed9bb6b775d5972b6124972ace92ccfe1051caeb8884d9e12d40c35220419f0d02443584bf2d82799dfca8206410d171470ce15903703924f0
WHIRLPOOL
4b8fc20a8b228268f3407ca425427a2d91f81ff9e6f0860d4f3eb156c97e3ec1ea83ca3510ee10bfb37598f91c3323a46ba75eace3334632b26cbd45959dc908
-DIST wine_gecko-2.36-x86_64.msi 31222784 SHA256
701b84004bf584a2dae7c1296121172c933321cb795c3817b64435fd3364ed44 SHA512
814b13268beeac4d0ace4ab62dbc29ccd92fc13a135499b8ea5a14355992d576268e1e401b28906e8379a826159c5bb051ad274a1e64dd0d5424d495f8e10e10
WHIRLPOOL
dbd0e275bdca2ff7a1930daa62d23fd438a90f71b0fed1096b34b8d00a3f51cb91468ce61acaa9361a57deb9f3cfe70a21d16fc23de95cb4e0f7f957d4727010
-EBUILD wine-1.7.47.ebuild 17915 SHA256
44a2b7eecc0a736f972277dc0c68fc28551cdc4d2dba1c31221860979623662a SHA512
ebba172873372ed931807051d55d547c15660e945aab0d435473b7c3431280c2f761ae7a32450892673a025ed516ce572a6f84e3f3427cadb2b35e137c69d352
WHIRLPOOL
5ac54f9425199459d81a8e252bf066654828be98e1c184e400aa41f4395e014059327fae7ab2fe198d518e84b7b9abc08ad82993d099734f6bbd5960758c67ea
+DIST wine-staging-1.7.51.tar.gz 9628831 SHA256
662cbfcca95405045ba063f312fa4f605d8c48b7b0930c951e2ebac817f3b763 SHA512
f9d2388d63af3aa6ccdc7b66f9d767c19c1577acb84eb3ac03f9b4e07b3ff76906875998fdb42baae3768202129d270b1a1b15fd6bfb20fa33e3bc70559bdf45
WHIRLPOOL
f606b6cb2f9a2ece0ce411423df8db1a95217341c2dc6720f748ba8df71758e0a099afc7679fc37fb6621ba1f2fcd5bb505a85cdde797adb45d093836e001441
+DIST wine_gecko-2.40-x86.msi 31741440 SHA256
1a29d17435a52b7663cea6f30a0771f74097962b07031947719bb7b46057d302 SHA512
2f203852afede3f6b0899a54ad6eaa27c972a84df51de1632cb21af0c322e369a13150a5f19f68d7c4fcb0610b65e9244658e622c7e6b14c93ae6b7372bb184f
WHIRLPOOL
461358782c8aa21be5bf934bdb7b7397717add883036a773dad20d2ba5169a5229c211781c60fb4df46057b476765c6541340f5764a5a7362daf357ab60877b6
+DIST wine_gecko-2.40-x86_64.msi 33056768 SHA256
c3e28988e7d92221596fc4c569d10eb4dd2ca64b9f4970bf77e791f5dd8c9230 SHA512
af171193f221f2cd51f6dc3382a9b1c658ef2553213be32f201c05f7122eb6883838be97c3ec66177b1e3922df64c409745c3223acb01910680a5476c3f01478
WHIRLPOOL
d11234b593f4190ae8fa99bec8363c0047f6de08b186752b9f49764519ee9f4aafd017a16c0496581a0f4791e1109273846cec0314d9e320423d51723cd2083a
+EBUILD wine-1.7.51.ebuild 17724 SHA256
0f0c82462f800e007471b314492960688e8f57a59a056c11ee57a823a90d635e SHA512
5d6ef22ee499187bae0ed211e56274374bf1e5d00feff7b28f370a900e18d78b6c296ea7cb18ccf7e5ffe7c80d61e188f581517b9e717ecc2e9baa78ca810de1
WHIRLPOOL
308e50e3f27804daca573a185c63cb9688118e21d1e712a85dc911b8805766746ad1263e2b7bc9302689e292adf7b4ba091d1afc7be0d926b6c3198ea0776cc4
MISC ChangeLog 30468 SHA256
438db6db8b27622f90e810a4c26bb0f6e4ae913e385c74850fde7c340c9be13c SHA512
9da54315c5d5079cfde0165bab881d1a2975f5be3b19fd238b8f03bd67c32edd305078c98553080c0a61cf9305eb9cba295879c1cc90265d98778101cbccdf12
WHIRLPOOL
57f06acb41c6ea74e234dcf41c2ef6804566cb84cecaa3260ed7684dca969dedffebeedc3b145b2949b04b56a883c3bbf33395742152fb301d35b4445e2160a1
MISC ChangeLog-2012 100362 SHA256
8e70fc54e7945c1f41e3e0b64fef6b9a7fe89acdaf8c79a06a16048fe8d2e26c SHA512
ca875e847ba100e1f19774b31a2b45a81d776275e3d11944be8a7b01dfcdbf4265b1a340d691bc4fe4054fea006059a06ed52bc0516b1f8b44a1772a1c813278
WHIRLPOOL
36ec708601a25cb8fa93b471112538480b6ef82cc4e6703b3d045f883078b49209ceaeef7bafa8417b881c2d11df84df9c83d1985d0d687a11f3db3de5abb014
MISC metadata.xml 2752 SHA256
0ad7fdfbcd95595e81b123dbb53b5a6e2fbae28c7182da46102a64fef5cc0cee SHA512
d5ae4bdb065bea44750e4186e1a857bc71990baf313d738dcfb4777c4fe772d11fb20eadb16cc46c0019ae5be323ed4fa5b851e7c700f4e6b8f096ab882c6a6b
WHIRLPOOL
e548500294da01e91a33a9b203259e801aeef5ef95ea41ebc803f17f874c70b8e0a2b3997d7762d28750e27517d6f3256b5392c024f91a62b91ba7ed1d68e8d0
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iJwEAQEIAAYFAlX+1qQACgkQG7kqcTWJkGfwjgQAhZKvSdHvUqqW6hAF1xMSYRH7
+hzp81mSm53E7mTHGDZOWxttJuZD8ZMakzi//BDM7PsDUxTDZr3w254vFrossHA/e
+5M27rzvBnxy3+QAM2LxVEr1Or6goCBTa8CohYT3snCJ91UCAEyBBCO5db+RtzYBT
+txL9qs+DbFjqpetjdCQ=
+=33be
+-----END PGP SIGNATURE-----
diff --git a/app-emulation/wine/wine-1.7.47.ebuild
b/app-emulation/wine/wine-1.7.51.ebuild
similarity index 97%
rename from app-emulation/wine/wine-1.7.47.ebuild
rename to app-emulation/wine/wine-1.7.51.ebuild
index a4add17..1f9990b 100644
--- a/app-emulation/wine/wine-1.7.47.ebuild
+++ b/app-emulation/wine/wine-1.7.51.ebuild
@@ -23,7 +23,7 @@ else
S=${WORKDIR}/${MY_P}
fi
-GV="2.36"
+GV="2.40"
MV="4.5.6"
STAGING_P="wine-staging-${PV}"
STAGING_DIR="${WORKDIR}/${STAGING_P}"
@@ -37,8 +37,8 @@ SRC_URI="${SRC_URI}
abi_x86_64? (
mirror://sourceforge/${PN}/Wine%20Gecko/${GV}/wine_gecko-${GV}-x86_64.msi )
)
mono? (
mirror://sourceforge/${PN}/Wine%20Mono/${MV}/wine-mono-${MV}.msi )
- gstreamer? (
http://dev.gentoo.org/~tetromino/distfiles/${PN}/${GST_P}.patch.bz2 )
- http://dev.gentoo.org/~tetromino/distfiles/${PN}/${WINE_GENTOO}.tar.bz2";
+ gstreamer? (
https://dev.gentoo.org/~tetromino/distfiles/${PN}/${GST_P}.patch.bz2 )
+
https://dev.gentoo.org/~tetromino/distfiles/${PN}/${WINE_GENTOO}.tar.bz2";
if [[ ${PV} == "9999" ]] ; then
STAGING_EGIT_REPO_URI="git://github.com/wine-compholio/wine-staging.git"
@@ -58,6 +58,7 @@ REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
pipelight? ( staging )
s3tc? ( staging )
vaapi? ( staging )
+ ?? ( gstreamer staging )
osmesa? ( opengl )" #286560
# FIXME: the test suite is unsuitable for us; many tests require net access
@@ -337,7 +338,6 @@ src_prepare() {
"${FILESDIR}"/${PN}-1.4_rc2-multilib-portage.patch #395615
"${FILESDIR}"/${PN}-1.7.12-osmesa-check.patch #429386
"${FILESDIR}"/${PN}-1.6-memset-O3.patch #480508
- "${FILESDIR}"/${PN}-1.7.47-critical-security-cookie-fix.patch #
only necessary for this version, upstream #38895
)
if use gstreamer; then
# See http://bugs.winehq.org/show_bug.cgi?id=30557
@@ -365,7 +365,6 @@ src_prepare() {
ewarn "unless you can reproduce them with USE=-staging"
local STAGING_EXCLUDE=""
- STAGING_EXCLUDE="${STAGING_EXCLUDE} -W
ntdll-Revert_Security_Cookie" # only necessary in this version
use pipelight || STAGING_EXCLUDE="${STAGING_EXCLUDE} -W
Pipelight"
# Launch wine-staging patcher in a subshell, using epatch as a
backend, and gitapply.sh as a backend for binary patches
