* [gentoo-commits] proj/multilib-portage:master commit in: app-emulation/wine/
@ 2015-09-20 15:56 Thomas Sachau
0 siblings, 0 replies; 5+ messages in thread
From: Thomas Sachau @ 2015-09-20 15:56 UTC (permalink / raw
To: gentoo-commits
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
^ permalink raw reply related [flat|nested] 5+ messages in thread* [gentoo-commits] proj/multilib-portage:master commit in: app-emulation/wine/
@ 2015-07-04 7:27 Thomas Sachau
0 siblings, 0 replies; 5+ messages in thread
From: Thomas Sachau @ 2015-07-04 7:27 UTC (permalink / raw
To: gentoo-commits
commit: 89478e8a89e1e0fc8becc61db05630731d66a6ba
Author: Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 4 07:27:18 2015 +0000
Commit: Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Sat Jul 4 07:27:18 2015 +0000
URL: https://gitweb.gentoo.org/proj/multilib-portage.git/commit/?id=89478e8a
Add missing Manifest
app-emulation/wine/Manifest | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/app-emulation/wine/Manifest b/app-emulation/wine/Manifest
index 49e3508..224d498 100644
--- a/app-emulation/wine/Manifest
+++ b/app-emulation/wine/Manifest
@@ -10,13 +10,13 @@ AUX wine-1.7.39-gstreamer-v5-staging-post.patch 1175 SHA256 034dc11ef6ecb9d4d8a9
AUX wine-1.7.39-gstreamer-v5-staging-pre.patch 1237 SHA256 2d5ba5b40d4e6ea48906f48d098fca05ad98ad75bf58f3b5a86f1dbf8353e7bf SHA512 4e0b0a64ae591307569db840968059dd22d3e06fbc766b7215d3b7b6ec01f989bf25a95c3674263b669fa142c2a0736a71cba2de5a57becef0eab40df480fe39 WHIRLPOOL 83f20e69af5f4c17e7fd7c3a3befa9517b4e021d3a5acc6854648647a503cbfafee82a959f67e38e4b5fafc52088f6b94d9f451793ebe88bee937b80c1ab15f6
AUX wine-1.7.45-libunwind-osx-only.patch 1477 SHA256 01c73e559acdb5acf8393d0c5cb03ac1c1fa06714b87ff208fd545cc0bca9f23 SHA512 f11ce2df3f6f010fb3e7ee3761ecce72a92807ef0c62955886c08f333fcde6f543282f6cda4a0a9950414fe56583a78cb5bc8124263cd8a2b0904d3b506ef8ac WHIRLPOOL edc4708f102de65943e7ee436e6c2b65b31a377495fdae6ac7354141d1fd595967d978495744b04fa765299fe1b81150326a14e61ff4491cac7ea2d63f5f34bb
DIST wine-1.7.34-gstreamer-v5.patch.bz2 5703 SHA256 c3bb6f669f46d9f2d7ba494a2264cee457349f559d4b0758db80e39eb22f2aee SHA512 e780394e8739a58593d264322c462bfe9040c1cabce93b84d24f09040026368efb4ac34a6a302beb6048d14b4ac835b87a0c515b52c1a0c143aa4e15691eb01b WHIRLPOOL 1befbb0fbd026d6e833c5d72341064dd6e12157e1b7df58e349b9985648bfbc63f70e9cab45b61155515ac65057968e30ba313e71e183b8027153c9392d89192
-DIST wine-1.7.45.tar.bz2 22312840 SHA256 a30cef1ee4ceaee4b6c9c2ad96df3b8a8847278246e7727624db314c68adaa23 SHA512 409e7c5b75e5311b02697b993b5d6a5cd08cf7e2e2b4feb295b8a5b88b4edf5034c3bd9feafd208892b05082970a198542e046d31ca3629edd6e505d4bbff45e WHIRLPOOL f662ae6370003f7f31e4be5397fa69b4847581770d2d5d72b6de0ac88617995fb0e3206957075bc7d247cc9f11ae5a29a8e82344fd1c22b480edfc307d25c48f
+DIST wine-1.7.46.tar.bz2 22356320 SHA256 9ab4046cc676de3054f9f2560e7d757b25324f72dd9a9cfed0d4aa48cc87350b SHA512 42710c39436fcd66d2a245da9d8242f3c909c58e0f0178a74562ae9d5360e8dc5908a336633edd8f717fb5c5ba07310fc24a2ec57cb447900ff8f57b59e5ec1d WHIRLPOOL 8ca9a25301559001176eb542defbfae279760a4e758b6563431900608ca4efa1ea01a2f3ea56039c4116052be58ee7c4a8ab6df773c3c6fdd65599e1ed376b60
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.45.tar.gz 9216075 SHA256 06180e1189e8669892e8b3d640810306b0310c508842272eccc65034534e9411 SHA512 051f10237306cac13dcfba0ee3453facbadf821a2eb5751d507bfcf86a936a08a236e1787d025378e3039e0fe91958bbb64b1fa90f5ea1a1b53d1d53788a5eb2 WHIRLPOOL 0277059d933cad1ae3449ec4028e7935f5a73c2790629ed0d0d6321bac0804caeaed282eef9fa1282ab85454123781c8cf2061e0220478685fc76405f3876757
+DIST wine-staging-1.7.46.tar.gz 9204220 SHA256 a3b681f38917889bc6dce3ea3e78e91da75789f212b69fd1a10a5bac329761d3 SHA512 24861e1adf882465c3f9f6e0aee47776dd18418342eff500007d36eacfadc166bdea40a53318c7fce3871742559904a1d757ea9a9c0f0624da678a3e9ea2d400 WHIRLPOOL d091925e99dc830ff1a6e49ec9c6f7cd1fc7e40920be2e4a5a10c4b7bc3a5b2109487eb32c5426f31b22baf53216b9b7caeb1b4faf6be8c2b5ecc8233d4ae198
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.45.ebuild 17584 SHA256 acc97f0ea529b12ff8c2a159f9e39872e3fbe6cc1717065153fe17c0cbb2a620 SHA512 a6567a7a6415da0bed1369224b07b4ee3d00ca24637390e3fd600eaf1a9d31a61907568b05e6c1482d44c890b296822040b701de940396c02cd6a0cc98f0ce7b WHIRLPOOL de83173b90e39deef26c8a16d85dff0bdd1a2fa5f5e80102ded4fbaf537e21663becf48c3b97e93604ca67d9de8fc673ed7a74dbc9b550ff9ca55845e260595b
+EBUILD wine-1.7.46.ebuild 17696 SHA256 a57c14a11cc3d5f2ed89bb3be7232285d28feb73cd204ee25b7abbc56edc68a0 SHA512 c696e308555f191b413e0af1e5e6fa6f6f3ddaa0f505feabfa8ad16c716bc43bbb0dcac298bb6cbaddb286243d63ec3a35d70241f987a183420c157fe72d76b4 WHIRLPOOL d0c468e9801790f95fc1129e856ce822049866718b752d13b4c8acce3bcbc6f2540ef623e2b96f18bc351bc1924f89b82f367ece413b4a567af6d8e1ef77e145
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
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] proj/multilib-portage:master commit in: app-emulation/wine/
@ 2015-07-04 7:12 Thomas Sachau
0 siblings, 0 replies; 5+ messages in thread
From: Thomas Sachau @ 2015-07-04 7:12 UTC (permalink / raw
To: gentoo-commits
commit: 1bd67f5e85b4c280aa76071a51dc602b5ff2b5ce
Author: Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 4 07:12:42 2015 +0000
Commit: Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Sat Jul 4 07:12:42 2015 +0000
URL: https://gitweb.gentoo.org/proj/multilib-portage.git/commit/?id=1bd67f5e
Version bump
.../wine/{wine-1.7.45.ebuild => wine-1.7.46.ebuild} | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/app-emulation/wine/wine-1.7.45.ebuild b/app-emulation/wine/wine-1.7.46.ebuild
similarity index 98%
rename from app-emulation/wine/wine-1.7.45.ebuild
rename to app-emulation/wine/wine-1.7.46.ebuild
index b7e828f..ff7a850 100644
--- a/app-emulation/wine/wine-1.7.45.ebuild
+++ b/app-emulation/wine/wine-1.7.46.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.45.ebuild,v 1.1 2015/06/18 06:06:00 np-hardass Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.46.ebuild,v 1.1 2015/06/30 02:59:17 np-hardass Exp $
EAPI="5"
@@ -11,7 +11,7 @@ PLOCALE_BACKUP="en"
inherit autotools-utils eutils fdo-mime flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx
if [[ ${PV} == "9999" ]] ; then
- EGIT_REPO_URI="git://source.winehq.org/git/wine.git"
+ EGIT_REPO_URI="git://source.winehq.org/git/wine.git http://source.winehq.org/git/wine.git"
EGIT_BRANCH="master"
inherit git-r3
SRC_URI=""
@@ -282,6 +282,13 @@ usr/share/applications/wine-winecfg.desktop"
wine_build_environment_check() {
[[ ${MERGE_TYPE} = "binary" ]] && return 0
+ # bug #549768
+ if [[ $(gcc-major-version) = 5 ]]; then
+ eerror "You need gcc-4.x to build wine; see https://bugs.gentoo.org/549768"
+ eerror
+ return 1
+ fi
+
if use abi_x86_64 && [[ $(( $(gcc-major-version) * 100 + $(gcc-minor-version) )) -lt 404 ]]; then
eerror "You need gcc-4.4+ to build 64-bit wine"
eerror
@@ -330,7 +337,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.45-libunwind-osx-only.patch # only applies to this version
)
if use gstreamer; then
# See http://bugs.winehq.org/show_bug.cgi?id=30557
^ permalink raw reply related [flat|nested] 5+ messages in thread* [gentoo-commits] proj/multilib-portage:master commit in: app-emulation/wine/
@ 2015-06-21 8:49 Thomas Sachau
0 siblings, 0 replies; 5+ messages in thread
From: Thomas Sachau @ 2015-06-21 8:49 UTC (permalink / raw
To: gentoo-commits
commit: bc44ea307a27aaddb01b98070306e2f065c173cd
Author: Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 20 15:00:17 2015 +0000
Commit: Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Sat Jun 20 15:00:17 2015 +0000
URL: https://gitweb.gentoo.org/proj/multilib-portage.git/commit/?id=bc44ea30
Update Manifest
app-emulation/wine/Manifest | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/app-emulation/wine/Manifest b/app-emulation/wine/Manifest
index 7218a04..49e3508 100644
--- a/app-emulation/wine/Manifest
+++ b/app-emulation/wine/Manifest
@@ -8,14 +8,15 @@ AUX wine-1.7.38-gstreamer-v5-staging-post.patch 2187 SHA256 5dcd005d410f834e89b1
AUX wine-1.7.38-gstreamer-v5-staging-pre.patch 1529 SHA256 891819135df197282e9e5ae4077f2e5ec29f2b50386a0cedaa0cc85633e31988 SHA512 62b55f7330939081aa3c854bfa57107a7e1d930e0ec2bda45fa66af887aec6a7663be1e36b5b6deeeec8f84aa70cbd8221ad83148e702716fecdf7d2c54ee7a1 WHIRLPOOL adc11e3ede16249da846d9980f681458827710db190a7b5e23f87bda8fe4945c655cf21f1dc0de0ce3145ae6d7606bebd4f598892a516f2b78d093c40a79f997
AUX wine-1.7.39-gstreamer-v5-staging-post.patch 1175 SHA256 034dc11ef6ecb9d4d8a9734266f612e9154f155f80085d05ab0d45e9b237d386 SHA512 c8e64722a8be5725515a568534fe052c8714859d030be102b823588c117ae9649c3637fe905a8c52c8df676d6a1f7cc22dd3d25a1dd397edef516eb07906c776 WHIRLPOOL 9bd0dd5d38b3ebd03f2115f505266baa96b95de9764c57596366ea935f2bca570f9b896de3ce1af53f6d80557a537a8a2630654e1b788b588f335625e63aa4ac
AUX wine-1.7.39-gstreamer-v5-staging-pre.patch 1237 SHA256 2d5ba5b40d4e6ea48906f48d098fca05ad98ad75bf58f3b5a86f1dbf8353e7bf SHA512 4e0b0a64ae591307569db840968059dd22d3e06fbc766b7215d3b7b6ec01f989bf25a95c3674263b669fa142c2a0736a71cba2de5a57becef0eab40df480fe39 WHIRLPOOL 83f20e69af5f4c17e7fd7c3a3befa9517b4e021d3a5acc6854648647a503cbfafee82a959f67e38e4b5fafc52088f6b94d9f451793ebe88bee937b80c1ab15f6
+AUX wine-1.7.45-libunwind-osx-only.patch 1477 SHA256 01c73e559acdb5acf8393d0c5cb03ac1c1fa06714b87ff208fd545cc0bca9f23 SHA512 f11ce2df3f6f010fb3e7ee3761ecce72a92807ef0c62955886c08f333fcde6f543282f6cda4a0a9950414fe56583a78cb5bc8124263cd8a2b0904d3b506ef8ac WHIRLPOOL edc4708f102de65943e7ee436e6c2b65b31a377495fdae6ac7354141d1fd595967d978495744b04fa765299fe1b81150326a14e61ff4491cac7ea2d63f5f34bb
DIST wine-1.7.34-gstreamer-v5.patch.bz2 5703 SHA256 c3bb6f669f46d9f2d7ba494a2264cee457349f559d4b0758db80e39eb22f2aee SHA512 e780394e8739a58593d264322c462bfe9040c1cabce93b84d24f09040026368efb4ac34a6a302beb6048d14b4ac835b87a0c515b52c1a0c143aa4e15691eb01b WHIRLPOOL 1befbb0fbd026d6e833c5d72341064dd6e12157e1b7df58e349b9985648bfbc63f70e9cab45b61155515ac65057968e30ba313e71e183b8027153c9392d89192
-DIST wine-1.7.44.tar.bz2 22308686 SHA256 d2e3290d4b312d235ab8ac214eaae8f81c751fb610b15b40c2620904bd38d8bb SHA512 55cc555a5f40fe802d6cca65c7bc3d294c10c79dee93e602c4ccefd540002174bc1a1ca8c5cb56311b94782f7b5af7002420c20110fd4c913f1d1bdb380dc82d WHIRLPOOL f9d6b2eb38b78a97c096408775ca36d7d010eb120f1ee59f5da8db93b19e91a4bdd74d337626ab9b81338ddcfc9d58441919975152b1dd1c2379a1a7154467cc
+DIST wine-1.7.45.tar.bz2 22312840 SHA256 a30cef1ee4ceaee4b6c9c2ad96df3b8a8847278246e7727624db314c68adaa23 SHA512 409e7c5b75e5311b02697b993b5d6a5cd08cf7e2e2b4feb295b8a5b88b4edf5034c3bd9feafd208892b05082970a198542e046d31ca3629edd6e505d4bbff45e WHIRLPOOL f662ae6370003f7f31e4be5397fa69b4847581770d2d5d72b6de0ac88617995fb0e3206957075bc7d247cc9f11ae5a29a8e82344fd1c22b480edfc307d25c48f
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.44.tar.gz 9194166 SHA256 ae2db1fe506c936f9e3c5664584126d58db8305c47b8155c636b8a8843a0ae20 SHA512 e01ff7d458a3162ad19577d127660bcf953c048201a2f98aa23fc5bf19e232af3e155e64e2d0fac33fdf01a9508be6e45a663e4151ee5b50b6ea2ce56a1e0beb WHIRLPOOL 915426aab0142a4142938a119339541f7a72d6a3e1c7fbd46c0dc9ad7178a56951e5a996f4b13f50bf7581a13607d15e3ae9796cd39974e069928c358400cc3f
+DIST wine-staging-1.7.45.tar.gz 9216075 SHA256 06180e1189e8669892e8b3d640810306b0310c508842272eccc65034534e9411 SHA512 051f10237306cac13dcfba0ee3453facbadf821a2eb5751d507bfcf86a936a08a236e1787d025378e3039e0fe91958bbb64b1fa90f5ea1a1b53d1d53788a5eb2 WHIRLPOOL 0277059d933cad1ae3449ec4028e7935f5a73c2790629ed0d0d6321bac0804caeaed282eef9fa1282ab85454123781c8cf2061e0220478685fc76405f3876757
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.44.ebuild 17695 SHA256 6e19335cbebbaff4a2a60305861777958d576ed1b9ee71b415ce258e24a05cc8 SHA512 5c05ce1bbd0e8ee7c5b6e580b966f4c9c4daf4d653876e35338b5b7d787aab4851e8f9fdca16f52e0e4d42246a0f9e7a5595ac229c7d16660493f7f39008c91e WHIRLPOOL 2ab8ca1ec1a56387b98173e690c50387ba39c8e6d6cfe3a387f6c7f1afcba3b5b44d674b1c1523a1515ca853039e42ac83a63e20a6ec662d73e41be1b4873b74
+EBUILD wine-1.7.45.ebuild 17584 SHA256 acc97f0ea529b12ff8c2a159f9e39872e3fbe6cc1717065153fe17c0cbb2a620 SHA512 a6567a7a6415da0bed1369224b07b4ee3d00ca24637390e3fd600eaf1a9d31a61907568b05e6c1482d44c890b296822040b701de940396c02cd6a0cc98f0ce7b WHIRLPOOL de83173b90e39deef26c8a16d85dff0bdd1a2fa5f5e80102ded4fbaf537e21663becf48c3b97e93604ca67d9de8fc673ed7a74dbc9b550ff9ca55845e260595b
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
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] proj/multilib-portage:master commit in: app-emulation/wine/
@ 2015-06-14 10:08 Thomas Sachau
0 siblings, 0 replies; 5+ messages in thread
From: Thomas Sachau @ 2015-06-14 10:08 UTC (permalink / raw
To: gentoo-commits
commit: a04fa13da2cbe6705dd8a105847ad0a84c8d5982
Author: Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 14 10:01:37 2015 +0000
Commit: Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Sun Jun 14 10:01:37 2015 +0000
URL: https://gitweb.gentoo.org/proj/multilib-portage.git/commit/?id=a04fa13d
Fix typo and Manifest
app-emulation/wine/Manifest | 3 +-
app-emulation/wine/wine-1.7.44 | 554 ----------------------------------
app-emulation/wine/wine-1.7.44.ebuild | 238 +++++++++++----
3 files changed, 179 insertions(+), 616 deletions(-)
diff --git a/app-emulation/wine/Manifest b/app-emulation/wine/Manifest
index ae18722..7218a04 100644
--- a/app-emulation/wine/Manifest
+++ b/app-emulation/wine/Manifest
@@ -15,8 +15,7 @@ DIST wine-mono-4.5.6.msi 53705216 SHA256 ac681f737f83742d786706529eb85f4bc8d6bdd
DIST wine-staging-1.7.44.tar.gz 9194166 SHA256 ae2db1fe506c936f9e3c5664584126d58db8305c47b8155c636b8a8843a0ae20 SHA512 e01ff7d458a3162ad19577d127660bcf953c048201a2f98aa23fc5bf19e232af3e155e64e2d0fac33fdf01a9508be6e45a663e4151ee5b50b6ea2ce56a1e0beb WHIRLPOOL 915426aab0142a4142938a119339541f7a72d6a3e1c7fbd46c0dc9ad7178a56951e5a996f4b13f50bf7581a13607d15e3ae9796cd39974e069928c358400cc3f
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.44.ebuild 14490 SHA256 0f257e976d937e8d3d47608404344729caac8446b87402336c851952dd48eac1 SHA512 b29f934277c5c34cd65acd2f022a16b5d2b6e820c82d2bf2d488ce635885096b5663f8a6b1e92134d8c8e2b1741b05da4966f656196b607c75d24abfd97fdf15 WHIRLPOOL 8725f5e77b6e2533336d1520af05ea9f68c23d043648ed3e72d0662df166ff3271eb81aa1f88647f2d569f3a147920c44374692a4d69ad7a2f48eedfbba5c1cc
+EBUILD wine-1.7.44.ebuild 17695 SHA256 6e19335cbebbaff4a2a60305861777958d576ed1b9ee71b415ce258e24a05cc8 SHA512 5c05ce1bbd0e8ee7c5b6e580b966f4c9c4daf4d653876e35338b5b7d787aab4851e8f9fdca16f52e0e4d42246a0f9e7a5595ac229c7d16660493f7f39008c91e WHIRLPOOL 2ab8ca1ec1a56387b98173e690c50387ba39c8e6d6cfe3a387f6c7f1afcba3b5b44d674b1c1523a1515ca853039e42ac83a63e20a6ec662d73e41be1b4873b74
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
-MISC wine-1.7.44 17695 SHA256 6e19335cbebbaff4a2a60305861777958d576ed1b9ee71b415ce258e24a05cc8 SHA512 5c05ce1bbd0e8ee7c5b6e580b966f4c9c4daf4d653876e35338b5b7d787aab4851e8f9fdca16f52e0e4d42246a0f9e7a5595ac229c7d16660493f7f39008c91e WHIRLPOOL 2ab8ca1ec1a56387b98173e690c50387ba39c8e6d6cfe3a387f6c7f1afcba3b5b44d674b1c1523a1515ca853039e42ac83a63e20a6ec662d73e41be1b4873b74
diff --git a/app-emulation/wine/wine-1.7.44 b/app-emulation/wine/wine-1.7.44
deleted file mode 100644
index ccb52fd..0000000
--- a/app-emulation/wine/wine-1.7.44
+++ /dev/null
@@ -1,554 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.43.ebuild,v 1.1 2015/05/18 04:59:26 tetromino Exp $
-
-EAPI="5"
-
-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
-
-if [[ ${PV} == "9999" ]] ; then
- EGIT_REPO_URI="git://source.winehq.org/git/wine.git http://source.winehq.org/git/wine.git"
- EGIT_BRANCH="master"
- inherit git-r3
- SRC_URI=""
- #KEYWORDS=""
-else
- MY_P="${PN}-${PV/_/-}"
- SRC_URI="mirror://sourceforge/${PN}/Source/${MY_P}.tar.bz2"
- KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
- S=${WORKDIR}/${MY_P}
-fi
-
-GV="2.36"
-MV="4.5.6"
-STAGING_P="wine-staging-${PV}"
-STAGING_DIR="${WORKDIR}/${STAGING_P}"
-WINE_GENTOO="wine-gentoo-2015.03.07"
-GST_P="wine-1.7.34-gstreamer-v5"
-DESCRIPTION="Free implementation of Windows(tm) on Unix"
-HOMEPAGE="http://www.winehq.org/"
-SRC_URI="${SRC_URI}
- gecko? (
- abi_x86_32? ( mirror://sourceforge/${PN}/Wine%20Gecko/${GV}/wine_gecko-${GV}-x86.msi )
- 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"
-
-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 )"
-fi
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +fontconfig +gecko gphoto2 gsm gstreamer +jpeg +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pipelight +png +prelink pulseaudio +realtime +run-exes s3tc samba scanner selinux +ssl staging test +threads +truetype +udisks v4l vaapi +X +xcomposite xinerama +xml"
-REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
- test? ( abi_x86_32 )
- elibc_glibc? ( threads )
- mono? ( abi_x86_32 )
- pipelight? ( staging )
- s3tc? ( staging )
- vaapi? ( staging )
- osmesa? ( opengl )" #286560
-
-# FIXME: the test suite is unsuitable for us; many tests require net access
-# or fail due to Xvfb's opengl limitations.
-RESTRICT="test"
-
-NATIVE_DEPEND="
- truetype? ( >=media-libs/freetype-2.0.0 )
- capi? ( net-dialup/capi4k-utils )
- ncurses? ( >=sys-libs/ncurses-5.2:= )
- udisks? ( sys-apps/dbus )
- fontconfig? ( media-libs/fontconfig:= )
- gphoto2? ( media-libs/libgphoto2:= )
- openal? ( media-libs/openal:= )
- gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 )
- X? (
- x11-libs/libXcursor
- x11-libs/libXext
- x11-libs/libXrandr
- x11-libs/libXi
- x11-libs/libXxf86vm
- )
- xinerama? ( x11-libs/libXinerama )
- alsa? ( media-libs/alsa-lib )
- cups? ( net-print/cups:= )
- opencl? ( virtual/opencl )
- opengl? (
- virtual/glu
- virtual/opengl
- )
- gsm? ( media-sound/gsm:= )
- jpeg? ( virtual/jpeg:0= )
- ldap? ( net-nds/openldap:= )
- lcms? ( media-libs/lcms:2= )
- mp3? ( >=media-sound/mpg123-1.5.0 )
- netapi? ( net-fs/samba[netapi(+)] )
- nls? ( sys-devel/gettext )
- odbc? ( dev-db/unixODBC:= )
- osmesa? ( media-libs/mesa[osmesa] )
- pcap? ( net-libs/libpcap )
- staging? ( sys-apps/attr )
- pulseaudio? ( media-sound/pulseaudio )
- xml? ( dev-libs/libxml2 dev-libs/libxslt )
- scanner? ( media-gfx/sane-backends:= )
- ssl? ( net-libs/gnutls:= )
- png? ( media-libs/libpng:0= )
- v4l? ( media-libs/libv4l )
- vaapi? ( x11-libs/libva[X] )
- xcomposite? ( x11-libs/libXcomposite )"
-
-COMMON_DEPEND="
- !amd64? ( ${NATIVE_DEPEND} )
- amd64? (
- abi_x86_64? ( ${NATIVE_DEPEND} )
- abi_x86_32? (
- truetype? ( || (
- >=app-emulation/emul-linux-x86-xlibs-2.1[development,-abi_x86_32(-)]
- >=media-libs/freetype-2.5.0.1[abi_x86_32(-)]
- ) )
- ncurses? ( || (
- app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
- >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)]
- ) )
- udisks? ( || (
- >=app-emulation/emul-linux-x86-baselibs-20130224[development,-abi_x86_32(-)]
- >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)]
- ) )
- fontconfig? ( || (
- app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
- >=media-libs/fontconfig-2.10.92[abi_x86_32(-)]
- ) )
- gphoto2? ( || (
- app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
- >=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)]
- ) )
- openal? ( || (
- app-emulation/emul-linux-x86-sdl[development,-abi_x86_32(-)]
- >=media-libs/openal-1.15.1[abi_x86_32(-)]
- ) )
- gstreamer? ( || (
- app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
- (
- >=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)]
- >=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)]
- )
- ) )
- X? ( || (
- app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
- (
- >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)]
- >=x11-libs/libXext-1.3.2[abi_x86_32(-)]
- >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)]
- >=x11-libs/libXi-1.7.2[abi_x86_32(-)]
- >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)]
- )
- ) )
- xinerama? ( || (
- app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
- >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)]
- ) )
- alsa? ( || (
- app-emulation/emul-linux-x86-soundlibs[alsa,development,-abi_x86_32(-)]
- >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)]
- ) )
- cups? ( || (
- app-emulation/emul-linux-x86-baselibs
- >=net-print/cups-1.7.1-r1[abi_x86_32(-)]
- ) )
- opencl? ( >=virtual/opencl-0-r3[abi_x86_32(-)] )
- opengl? ( || (
- app-emulation/emul-linux-x86-opengl[development,-abi_x86_32(-)]
- (
- >=virtual/glu-9.0-r1[abi_x86_32(-)]
- >=virtual/opengl-7.0-r1[abi_x86_32(-)]
- )
- ) )
- gsm? ( || (
- app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)]
- >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)]
- ) )
- jpeg? ( || (
- app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
- >=virtual/jpeg-0-r2:0[abi_x86_32(-)]
- ) )
- ldap? ( || (
- app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
- >=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)]
- ) )
- lcms? ( || (
- app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
- >=media-libs/lcms-2.5:2[abi_x86_32(-)]
- ) )
- mp3? ( || (
- app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)]
- >=media-sound/mpg123-1.15.4[abi_x86_32(-)]
- ) )
- netapi? ( >=net-fs/samba-3.6.23-r1[netapi(+),abi_x86_32(-)] )
- nls? ( || (
- app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
- >=sys-devel/gettext-0.18.3.2[abi_x86_32(-)]
- ) )
- odbc? ( || (
- app-emulation/emul-linux-x86-db[development,-abi_x86_32(-)]
- >=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)]
- ) )
- osmesa? ( || (
- >=app-emulation/emul-linux-x86-opengl-20121028[development,-abi_x86_32(-)]
- >=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)]
- ) )
- pcap? ( net-libs/libpcap[abi_x86_32(-)] )
- pulseaudio? ( || (
- app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)]
- >=media-sound/pulseaudio-5.0[abi_x86_32(-)]
- ) )
- staging? ( || (
- app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
- >=sys-apps/attr-2.4.47-r1[abi_x86_32(-)]
- ) )
- xml? ( || (
- >=app-emulation/emul-linux-x86-baselibs-20131008[development,-abi_x86_32(-)]
- (
- >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)]
- >=dev-libs/libxslt-1.1.28-r1[abi_x86_32(-)]
- )
- ) )
- scanner? ( || (
- app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
- >=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)]
- ) )
- ssl? ( || (
- app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
- >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)]
- ) )
- png? ( || (
- app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
- >=media-libs/libpng-1.6.10:0[abi_x86_32(-)]
- ) )
- v4l? ( || (
- app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
- >=media-libs/libv4l-0.9.5[abi_x86_32(-)]
- ) )
- vaapi? ( x11-libs/libva[X,abi_x86_32(-)] )
- xcomposite? ( || (
- app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
- >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)]
- ) )
- )
- )"
-
-RDEPEND="${COMMON_DEPEND}
- dos? ( games-emulation/dosbox )
- perl? ( dev-lang/perl dev-perl/XML-Simple )
- s3tc? ( >=media-libs/libtxc_dxtn-1.0.1-r1[${MULTILIB_USEDEP}] )
- samba? ( >=net-fs/samba-3.0.25 )
- selinux? ( sec-policy/selinux-wine )
- udisks? ( sys-fs/udisks:2 )
- pulseaudio? ( realtime? ( sys-auth/rtkit ) )"
-
-# tools/make_requests requires perl
-DEPEND="${COMMON_DEPEND}
- amd64? ( abi_x86_32? ( !abi_x86_64? ( ${NATIVE_DEPEND} ) ) )
- staging? ( dev-lang/perl dev-perl/XML-Simple )
- X? (
- x11-proto/inputproto
- x11-proto/xextproto
- x11-proto/xf86vidmodeproto
- )
- xinerama? ( x11-proto/xineramaproto )
- prelink? ( sys-devel/prelink )
- >=sys-kernel/linux-headers-2.6
- virtual/pkgconfig
- virtual/yacc
- sys-devel/flex"
-
-# These use a non-standard "Wine" category, which is provided by
-# /etc/xdg/applications-merged/wine.menu
-QA_DESKTOP_FILE="usr/share/applications/wine-browsedrive.desktop
-usr/share/applications/wine-notepad.desktop
-usr/share/applications/wine-uninstaller.desktop
-usr/share/applications/wine-winecfg.desktop"
-
-wine_build_environment_check() {
- [[ ${MERGE_TYPE} = "binary" ]] && return 0
-
- # bug #549768
- if [[ $(gcc-major-version) = 5 ]]; then
- eerror "You need gcc-4.x to build wine; see https://bugs.gentoo.org/549768"
- eerror
- return 1
- fi
-
- if use abi_x86_64 && [[ $(( $(gcc-major-version) * 100 + $(gcc-minor-version) )) -lt 404 ]]; then
- eerror "You need gcc-4.4+ to build 64-bit wine"
- eerror
- return 1
- fi
-
- if use abi_x86_32 && use opencl && [[ x$(eselect opencl show 2> /dev/null) = "xintel" ]]; then
- eerror "You cannot build wine with USE=opencl because intel-ocl-sdk is 64-bit only."
- eerror "See https://bugs.gentoo.org/487864 for more details."
- eerror
- return 1
- fi
-}
-
-pkg_pretend() {
- wine_build_environment_check || die
-}
-
-pkg_setup() {
- wine_build_environment_check || die
-}
-
-src_unpack() {
- if [[ ${PV} == "9999" ]] ; then
- git-r3_src_unpack
- if use staging || use pulseaudio; then
- EGIT_REPO_URI=${STAGING_EGIT_REPO_URI}
- unset ${PN}_LIVE_REPO;
- EGIT_CHECKOUT_DIR=${STAGING_DIR} git-r3_src_unpack
- fi
- else
- unpack ${MY_P}.tar.bz2
- use staging || use pulseaudio && unpack "${STAGING_P}.tar.gz"
- fi
-
- unpack "${WINE_GENTOO}.tar.bz2"
- use gstreamer && unpack "${GST_P}.patch.bz2"
-
- l10n_find_plocales_changes "${S}/po" "" ".po"
-}
-
-src_prepare() {
- local md5="$(md5sum server/protocol.def)"
- local PATCHES=(
- "${FILESDIR}"/${PN}-1.5.26-winegcc.patch #260726
- "${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
- )
- if use gstreamer; then
- # See http://bugs.winehq.org/show_bug.cgi?id=30557
- ewarn "Applying experimental patch to fix GStreamer support. Note that"
- ewarn "this patch has been reported to cause crashes in certain games."
-
- # Wine-Staging 1.7.38 "ntdll: Fix race-condition when threads are killed
- # during shutdown" patch and "Added patch to implement shared memory
- # wineserver communication for various user32 functions" prevents the
- # gstreamer patch from applying cleanly.
- # So undo the staging patch, apply gstreamer, then re-apply rebased staging
- # patch on top.
- if use staging; then
- PATCHES+=(
- "${FILESDIR}/${PN}-1.7.39-gstreamer-v5-staging-pre.patch"
- "${WORKDIR}/${GST_P}.patch"
- "${FILESDIR}/${PN}-1.7.39-gstreamer-v5-staging-post.patch" )
- else
- PATCHES+=( "${WORKDIR}/${GST_P}.patch" )
- fi
- fi
- if use staging; then
- ewarn "Applying the unofficial Wine-Staging patchset which is unsupported"
- ewarn "by Wine developers. Please don't report bugs to Wine bugzilla"
- ewarn "unless you can reproduce them with USE=-staging"
-
- local STAGING_EXCLUDE=""
- 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
- ebegin "Running Wine-Staging patch installer"
- (
- set -- DESTDIR="${S}" --backend=epatch --no-autoconf --all ${STAGING_EXCLUDE}
- cd "${STAGING_DIR}/patches"
- source "${STAGING_DIR}/patches/patchinstall.sh"
- )
- eend $?
- elif use pulseaudio; then
- PATCHES+=( "${STAGING_DIR}/patches/winepulse-PulseAudio_Support"/*.patch )
- fi
- autotools-utils_src_prepare
-
- # Modification of the server protocol requires regenerating the server requests
- if [[ "$(md5sum server/protocol.def)" != "${md5}" ]]; then
- einfo "server/protocol.def was patched; running tools/make_requests"
- tools/make_requests || die #432348
- fi
- sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
- if ! use run-exes; then
- sed -i '/^MimeType/d' tools/wine.desktop || die #117785
- fi
-
- # 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
-}
-
-src_configure() {
- export LDCONFIG=/bin/true
- use custom-cflags || strip-flags
-
- multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
- local myconf=(
- --sysconfdir=/etc/wine
- $(use_with alsa)
- $(use_with capi)
- $(use_with lcms cms)
- $(use_with cups)
- $(use_with ncurses curses)
- $(use_with udisks dbus)
- $(use_with fontconfig)
- $(use_with ssl gnutls)
- $(use_enable gecko mshtml)
- $(use_with gphoto2 gphoto)
- $(use_with gsm)
- $(use_with gstreamer)
- --without-hal
- $(use_with jpeg)
- $(use_with ldap)
- $(use_enable mono mscoree)
- $(use_with mp3 mpg123)
- $(use_with netapi)
- $(use_with nls gettext)
- $(use_with openal)
- $(use_with opencl)
- $(use_with opengl)
- $(use_with osmesa)
- $(use_with oss)
- $(use_with pcap)
- $(use_with png)
- $(use_with threads pthread)
- $(use_with scanner sane)
- $(use_enable test tests)
- $(use_with truetype freetype)
- $(use_with v4l)
- $(use_with X x)
- $(use_with xcomposite)
- $(use_with xinerama)
- $(use_with xml)
- $(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)
- )
-
- local PKG_CONFIG AR RANLIB
- # Avoid crossdev's i686-pc-linux-gnu-pkg-config if building wine32 on amd64; #472038
- # set AR and RANLIB to make QA scripts happy; #483342
- tc-export PKG_CONFIG AR RANLIB
-
- if use amd64; then
- if [[ ${ABI} == amd64 ]]; then
- myconf+=( --enable-win64 )
- else
- myconf+=( --disable-win64 )
- fi
-
- # Note: using --with-wine64 results in problems with multilib.eclass
- # CC/LD hackery. We're using separate tools instead.
- fi
-
- ECONF_SOURCE=${S} \
- econf "${myconf[@]}"
- emake depend
-}
-
-multilib_src_test() {
- # FIXME: win32-only; wine64 tests fail with "could not find the Wine loader"
- if [[ ${ABI} == x86 ]]; then
- if [[ $(id -u) == 0 ]]; then
- ewarn "Skipping tests since they cannot be run under the root user."
- ewarn "To run the test ${PN} suite, add userpriv to FEATURES in make.conf"
- return
- fi
-
- WINEPREFIX="${T}/.wine-${ABI}" \
- Xemake test
- fi
-}
-
-multilib_src_install_all() {
- local DOCS=( ANNOUNCE AUTHORS README )
- local l
- add_locale_docs() {
- local locale_doc="documentation/README.$1"
- [[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
- }
- l10n_for_each_locale_do add_locale_docs
-
- einstalldocs
- prune_libtool_files --all
-
- emake -C "../${WINE_GENTOO}" install DESTDIR="${D}" EPREFIX="${EPREFIX}"
- if use gecko ; then
- insinto /usr/share/wine/gecko
- use abi_x86_32 && doins "${DISTDIR}"/wine_gecko-${GV}-x86.msi
- use abi_x86_64 && doins "${DISTDIR}"/wine_gecko-${GV}-x86_64.msi
- fi
- if use mono ; then
- insinto /usr/share/wine/mono
- doins "${DISTDIR}"/wine-mono-${MV}.msi
- fi
- if ! use perl ; then # winedump calls function_grep.pl, and winemaker is a perl script
- rm "${D}"usr/bin/{wine{dump,maker},function_grep.pl} "${D}"usr/share/man/man1/wine{dump,maker}.1 || die
- fi
-
- use abi_x86_32 && pax-mark psmr "${D}"usr/bin/wine{,-preloader} #255055
- use abi_x86_64 && pax-mark psmr "${D}"usr/bin/wine64{,-preloader}
-
- if use abi_x86_64 && ! use abi_x86_32; then
- dosym /usr/bin/wine{64,} # 404331
- dosym /usr/bin/wine{64,}-preloader
- fi
-
- # respect LINGUAS when installing man pages, #469418
- for l in de fr pl; do
- use linguas_${l} || rm -r "${D}"usr/share/man/${l}*
- done
-}
-
-pkg_preinst() {
- gnome2_icon_savelist
-}
-
-pkg_postinst() {
- gnome2_icon_cache_update
- fdo-mime_desktop_database_update
-
- if ! use gecko; then
- ewarn "Without Wine Gecko, wine prefixes will not have a default"
- ewarn "implementation of iexplore. Many older windows applications"
- ewarn "rely upon the existence of an iexplore implementation, so"
- ewarn "you will likely need to install an external one, like via winetricks"
- fi
- if ! use mono; then
- ewarn "Without Wine Mono, wine prefixes will not have a default"
- ewarn "implementation of .NET. Many windows applications rely upon"
- ewarn "the existence of a .NET implementation, so you will likely need"
- ewarn "to install an external one, like via winetricks"
- fi
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
- fdo-mime_desktop_database_update
-}
diff --git a/app-emulation/wine/wine-1.7.44.ebuild b/app-emulation/wine/wine-1.7.44.ebuild
index 24a54ca..ccb52fd 100644
--- a/app-emulation/wine/wine-1.7.44.ebuild
+++ b/app-emulation/wine/wine-1.7.44.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.44.ebuild,v 1.1 2015/05/31 22:07:17 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.43.ebuild,v 1.1 2015/05/18 04:59:26 tetromino Exp $
EAPI="5"
@@ -64,70 +64,187 @@ REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
# or fail due to Xvfb's opengl limitations.
RESTRICT="test"
-COMMON_DEPEND="
- truetype? ( >=media-libs/freetype-2.0.0[${MULTILIB_USEDEP}] )
+NATIVE_DEPEND="
+ truetype? ( >=media-libs/freetype-2.0.0 )
capi? ( net-dialup/capi4k-utils )
- ncurses? ( >=sys-libs/ncurses-5.2:=[${MULTILIB_USEDEP}] )
- udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
- fontconfig? ( media-libs/fontconfig:=[${MULTILIB_USEDEP}] )
- gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] )
- openal? ( media-libs/openal:=[${MULTILIB_USEDEP}] )
- gstreamer? (
- media-libs/gstreamer:0.10[${MULTILIB_USEDEP}]
- media-libs/gst-plugins-base:0.10[${MULTILIB_USEDEP}]
- )
+ ncurses? ( >=sys-libs/ncurses-5.2:= )
+ udisks? ( sys-apps/dbus )
+ fontconfig? ( media-libs/fontconfig:= )
+ gphoto2? ( media-libs/libgphoto2:= )
+ openal? ( media-libs/openal:= )
+ gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 )
X? (
- x11-libs/libXcursor[${MULTILIB_USEDEP}]
- x11-libs/libXext[${MULTILIB_USEDEP}]
- x11-libs/libXrandr[${MULTILIB_USEDEP}]
- x11-libs/libXi[${MULTILIB_USEDEP}]
- x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
+ x11-libs/libXcursor
+ x11-libs/libXext
+ x11-libs/libXrandr
+ x11-libs/libXi
+ x11-libs/libXxf86vm
)
- xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
- alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
- cups? ( net-print/cups:=[${MULTILIB_USEDEP}] )
- opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
+ xinerama? ( x11-libs/libXinerama )
+ alsa? ( media-libs/alsa-lib )
+ cups? ( net-print/cups:= )
+ opencl? ( virtual/opencl )
opengl? (
- virtual/glu[${MULTILIB_USEDEP}]
- virtual/opengl[${MULTILIB_USEDEP}]
- )
- gsm? ( media-sound/gsm:=[${MULTILIB_USEDEP}] )
- jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] )
- ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] )
- lcms? ( media-libs/lcms:2=[${MULTILIB_USEDEP}] )
- mp3? ( >=media-sound/mpg123-1.5.0[${MULTILIB_USEDEP}] )
- netapi? ( net-fs/samba[netapi(+),${MULTILIB_USEDEP}] )
- nls? ( sys-devel/gettext[${MULTILIB_USEDEP}] )
- odbc? ( dev-db/unixODBC:=[${MULTILIB_USEDEP}] )
- osmesa? ( media-libs/mesa[osmesa,${MULTILIB_USEDEP}] )
- pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] )
- pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )
- staging? ( sys-apps/attr[${MULTILIB_USEDEP}] )
- xml? (
- dev-libs/libxml2[${MULTILIB_USEDEP}]
- dev-libs/libxslt[${MULTILIB_USEDEP}]
+ virtual/glu
+ virtual/opengl
)
- scanner? ( media-gfx/sane-backends:=[${MULTILIB_USEDEP}] )
- ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] )
- png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] )
- v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
- vaapi? ( x11-libs/libva[X,${MULTILIB_USEDEP}] )
- xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
- abi_x86_32? (
- !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
- !<app-emulation/emul-linux-x86-baselibs-20140508-r14
- !app-emulation/emul-linux-x86-db[-abi_x86_32(-)]
- !<app-emulation/emul-linux-x86-db-20140508-r3
- !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)]
- !<app-emulation/emul-linux-x86-medialibs-20140508-r6
- !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)]
- !<app-emulation/emul-linux-x86-opengl-20140508-r1
- !app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)]
- !<app-emulation/emul-linux-x86-sdl-20140508-r1
- !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)]
- !<app-emulation/emul-linux-x86-soundlibs-20140508
- !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
- !<app-emulation/emul-linux-x86-xlibs-20140508
+ gsm? ( media-sound/gsm:= )
+ jpeg? ( virtual/jpeg:0= )
+ ldap? ( net-nds/openldap:= )
+ lcms? ( media-libs/lcms:2= )
+ mp3? ( >=media-sound/mpg123-1.5.0 )
+ netapi? ( net-fs/samba[netapi(+)] )
+ nls? ( sys-devel/gettext )
+ odbc? ( dev-db/unixODBC:= )
+ osmesa? ( media-libs/mesa[osmesa] )
+ pcap? ( net-libs/libpcap )
+ staging? ( sys-apps/attr )
+ pulseaudio? ( media-sound/pulseaudio )
+ xml? ( dev-libs/libxml2 dev-libs/libxslt )
+ scanner? ( media-gfx/sane-backends:= )
+ ssl? ( net-libs/gnutls:= )
+ png? ( media-libs/libpng:0= )
+ v4l? ( media-libs/libv4l )
+ vaapi? ( x11-libs/libva[X] )
+ xcomposite? ( x11-libs/libXcomposite )"
+
+COMMON_DEPEND="
+ !amd64? ( ${NATIVE_DEPEND} )
+ amd64? (
+ abi_x86_64? ( ${NATIVE_DEPEND} )
+ abi_x86_32? (
+ truetype? ( || (
+ >=app-emulation/emul-linux-x86-xlibs-2.1[development,-abi_x86_32(-)]
+ >=media-libs/freetype-2.5.0.1[abi_x86_32(-)]
+ ) )
+ ncurses? ( || (
+ app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+ >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)]
+ ) )
+ udisks? ( || (
+ >=app-emulation/emul-linux-x86-baselibs-20130224[development,-abi_x86_32(-)]
+ >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)]
+ ) )
+ fontconfig? ( || (
+ app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
+ >=media-libs/fontconfig-2.10.92[abi_x86_32(-)]
+ ) )
+ gphoto2? ( || (
+ app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
+ >=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)]
+ ) )
+ openal? ( || (
+ app-emulation/emul-linux-x86-sdl[development,-abi_x86_32(-)]
+ >=media-libs/openal-1.15.1[abi_x86_32(-)]
+ ) )
+ gstreamer? ( || (
+ app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
+ (
+ >=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)]
+ >=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)]
+ )
+ ) )
+ X? ( || (
+ app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
+ (
+ >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)]
+ >=x11-libs/libXext-1.3.2[abi_x86_32(-)]
+ >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)]
+ >=x11-libs/libXi-1.7.2[abi_x86_32(-)]
+ >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)]
+ )
+ ) )
+ xinerama? ( || (
+ app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
+ >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)]
+ ) )
+ alsa? ( || (
+ app-emulation/emul-linux-x86-soundlibs[alsa,development,-abi_x86_32(-)]
+ >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)]
+ ) )
+ cups? ( || (
+ app-emulation/emul-linux-x86-baselibs
+ >=net-print/cups-1.7.1-r1[abi_x86_32(-)]
+ ) )
+ opencl? ( >=virtual/opencl-0-r3[abi_x86_32(-)] )
+ opengl? ( || (
+ app-emulation/emul-linux-x86-opengl[development,-abi_x86_32(-)]
+ (
+ >=virtual/glu-9.0-r1[abi_x86_32(-)]
+ >=virtual/opengl-7.0-r1[abi_x86_32(-)]
+ )
+ ) )
+ gsm? ( || (
+ app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)]
+ >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)]
+ ) )
+ jpeg? ( || (
+ app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+ >=virtual/jpeg-0-r2:0[abi_x86_32(-)]
+ ) )
+ ldap? ( || (
+ app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+ >=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)]
+ ) )
+ lcms? ( || (
+ app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+ >=media-libs/lcms-2.5:2[abi_x86_32(-)]
+ ) )
+ mp3? ( || (
+ app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)]
+ >=media-sound/mpg123-1.15.4[abi_x86_32(-)]
+ ) )
+ netapi? ( >=net-fs/samba-3.6.23-r1[netapi(+),abi_x86_32(-)] )
+ nls? ( || (
+ app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+ >=sys-devel/gettext-0.18.3.2[abi_x86_32(-)]
+ ) )
+ odbc? ( || (
+ app-emulation/emul-linux-x86-db[development,-abi_x86_32(-)]
+ >=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)]
+ ) )
+ osmesa? ( || (
+ >=app-emulation/emul-linux-x86-opengl-20121028[development,-abi_x86_32(-)]
+ >=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)]
+ ) )
+ pcap? ( net-libs/libpcap[abi_x86_32(-)] )
+ pulseaudio? ( || (
+ app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)]
+ >=media-sound/pulseaudio-5.0[abi_x86_32(-)]
+ ) )
+ staging? ( || (
+ app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+ >=sys-apps/attr-2.4.47-r1[abi_x86_32(-)]
+ ) )
+ xml? ( || (
+ >=app-emulation/emul-linux-x86-baselibs-20131008[development,-abi_x86_32(-)]
+ (
+ >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)]
+ >=dev-libs/libxslt-1.1.28-r1[abi_x86_32(-)]
+ )
+ ) )
+ scanner? ( || (
+ app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
+ >=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)]
+ ) )
+ ssl? ( || (
+ app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+ >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)]
+ ) )
+ png? ( || (
+ app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+ >=media-libs/libpng-1.6.10:0[abi_x86_32(-)]
+ ) )
+ v4l? ( || (
+ app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
+ >=media-libs/libv4l-0.9.5[abi_x86_32(-)]
+ ) )
+ vaapi? ( x11-libs/libva[X,abi_x86_32(-)] )
+ xcomposite? ( || (
+ app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
+ >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)]
+ ) )
+ )
)"
RDEPEND="${COMMON_DEPEND}
@@ -141,6 +258,7 @@ RDEPEND="${COMMON_DEPEND}
# tools/make_requests requires perl
DEPEND="${COMMON_DEPEND}
+ amd64? ( abi_x86_32? ( !abi_x86_64? ( ${NATIVE_DEPEND} ) ) )
staging? ( dev-lang/perl dev-perl/XML-Simple )
X? (
x11-proto/inputproto
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2015-09-20 15:56 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-09-20 15:56 [gentoo-commits] proj/multilib-portage:master commit in: app-emulation/wine/ Thomas Sachau
-- strict thread matches above, loose matches on Subject: below --
2015-07-04 7:27 Thomas Sachau
2015-07-04 7:12 Thomas Sachau
2015-06-21 8:49 Thomas Sachau
2015-06-14 10:08 Thomas Sachau
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox