Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
path: root/app-emulation
diff options
context:
space:
mode:
Diffstat (limited to 'app-emulation')
-rw-r--r--app-emulation/wine/ChangeLog11
-rw-r--r--app-emulation/wine/Manifest20
-rw-r--r--app-emulation/wine/files/wine-1.5.23-winebuild-CCAS.patch214
-rw-r--r--app-emulation/wine/wine-1.5.23-r1.ebuild287
-rw-r--r--app-emulation/wine/wine-9999.ebuild6
5 files changed, 526 insertions, 12 deletions
diff --git a/app-emulation/wine/ChangeLog b/app-emulation/wine/ChangeLog
index 52c6117bc1e3..e40cbeef5d90 100644
--- a/app-emulation/wine/ChangeLog
+++ b/app-emulation/wine/ChangeLog
@@ -1,6 +1,15 @@
# ChangeLog for app-emulation/wine
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.449 2013/02/03 00:52:52 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.450 2013/02/04 02:38:40 tetromino Exp $
+
+*wine-1.5.23-r1 (04 Feb 2013)
+
+ 04 Feb 2013; Alexandre Rostovtsev <tetromino@gentoo.org>
+ +wine-1.5.23-r1.ebuild, +files/wine-1.5.23-winebuild-CCAS.patch,
+ wine-9999.ebuild:
+ Use the correct system 'as' command as the assembler; fixes text relocation in
+ wine binaries on systems with sys-devel/clang installed (bug #455308, thanks
+ to Dennis Schridde and Rafał Mużyło).
*wine-1.5.23 (03 Feb 2013)
diff --git a/app-emulation/wine/Manifest b/app-emulation/wine/Manifest
index f5fa54930b54..5578e09a42b7 100644
--- a/app-emulation/wine/Manifest
+++ b/app-emulation/wine/Manifest
@@ -6,6 +6,7 @@ AUX wine-1.2.3-msxml3-libxml2-headers.patch 14328 SHA256 0a046e532343f9a45083074
AUX wine-1.4_rc2-multilib-portage.patch 1256 SHA256 9d0acd304d11d1bf73f56699754aaa1bfe1facba90648ee330fdbe08d9ff4938 SHA512 ac0b29e2b4c9b04bb6694a4e4da654446f68efbf90cda6809b45dad51e6679ac5410398763fde7e9505ef959493a037aa588cee58d14906563a4746702d2b0e9 WHIRLPOOL 8ea26266c327bc8313eca9b5d39c9741b226037750ca2d1d33262420093e05c306e7f004656c362c3c50b330d050cf9e5fceaa2b024a82809aae8b3617b0ae18
AUX wine-1.5.11-osmesa-check.patch 1888 SHA256 8aa70a10a215d5a10e70a404701cf70c0efc674ca6e2f093bbd243f70153e3bb SHA512 5c53e19efa4e080e4bc46c955d2f53beaaa55726e3ee528a5d41374452d6a75817f2145df4a2b05e0d168ed78fe81da35bab1322d6fcc736bf59ba6282e7ff9b WHIRLPOOL d35b52ddcace0fcb043894f00b14a90ecef8af87ff16d2ff091e64b34d8629a5d49ff59cae355c0457b7b9213f1ec66ae53747cb096b23c4f0a2ec8b7c8c8431
AUX wine-1.5.17-osmesa-check.patch 1774 SHA256 dc7dde67c416bb067e528b85228cff01833a2a20c802248ef56d74184014e50e SHA512 12325e75db5e63e1d4c4e2463c3e164b1eba0d3d88455cfcd698a8bb790d7c0b3c947a06e7a09e232b1a14202e64ea2dc9331cbc4b503833f78a7c1034410c79 WHIRLPOOL 2d9bb86a5d683301c75ea275302f67616a8e9c6ebfc436b05f8f1b3d5d815c310999ca9518747abcf4d248bd18f34388dcb323c526d633c50e66ffb4bf94e5d6
+AUX wine-1.5.23-winebuild-CCAS.patch 6101 SHA256 34143c55618870dd31eea1e260ae973572d99557a20f24a4f217bb0ff1d615eb SHA512 f44580efcf4a406517a2fc65d7509a42b0b0b180a4c63f5980c894e708934d60155d87634e406763426415d00c1ea2f8f3894ac4797a2e2527ca0d9ed23430af WHIRLPOOL d62fb5c27fba3b8297ae2151a432f80d9655c0c2ccee9dee12beea84a2186c0e7965a6902d6bc5638cdb1c853c188a49b790825c8741a9dc4bb1516ff6ca9a53
DIST wine-1.2.3.tar.bz2 17651336 SHA256 3fd8d3f2b466d07eb90b8198cdc9ec3005917a4533db7b8c6c69058a2e57c61f SHA512 602ae802aa6f94c4498ccae96a67e355a8aa5cdc1e9c1e0f29482f45a9e7cc7af766ade9f2f1fef77ee77d5bbfc5f34cd110b95db244b8cff42998b5b0cf708d WHIRLPOOL 02ac95d8c86d0f2d870c8e4c4789c1bef1ef965f8bb186de23fd3a949126ba2aadd5791d1908bdf11d946d5dc5348b085881c2594cf1b407fa0df44c1990ecd9
DIST wine-1.3.28.tar.bz2 19626794 SHA256 9a311124a1a911066ab9d3a742dda888487ee516a18eda946be105a1d1135a38 SHA512 b8fb881cf03dce1a40a9212bc6170858ddde38cd2fc282b455ab94cee7ee2e78f5043fee72df3b1e7566c29fb8c8a43726953a8bc5eb22d3ab7f869e6f4e9722 WHIRLPOOL acb6b8b978541e1b0f95f124e95ad9823e73590229515fd40e4e59d5af21c414c4824490710b436370b4d3fda3c477d6c4b626f89c6cc90e2fcf066355c3bee9
DIST wine-1.4.1.tar.bz2 20104401 SHA256 3c233e3811e42c2f3623413783dbcd0f2288014b5645211f669ffd0ba6ae1856 SHA512 a0fe7f36325a51d9b381ab09a4460cdf59b12b810722d28aa8e98a3d6c3de29bfc62dd0f0d4e5336bfa82a6b549e45c313a714b6d43f562c45ffadb47874058a WHIRLPOOL 81f837ecd31902bc769065de353a92bcdfa1b59b3cd53e700e345b24480260c68daf7075fec685a948a46e66e6f4470ff4158df92e132760013b17ad6690885b
@@ -85,6 +86,7 @@ EBUILD wine-1.5.2.ebuild 6385 SHA256 bb1f7d43a9ca8e8da360046a8da4a1fede2c7c928a8
EBUILD wine-1.5.20.ebuild 8019 SHA256 a606a3b18bf3709ca5d80c78a46680f7257e3f7644e4eb211f4e3e4467051cfb SHA512 a203d965867c9bd4ff8d6867af4959c7242da29dd3eff3f5cb6391221de8892b57c6f4794864ff6c724c5481f3438b241f50470ec727f81fd7002bdd070935a1 WHIRLPOOL 52b731780c3c599177547cf5351af275e9fb72a4e6b0fbf6a56032dc2fe54cd4a1251728f31045f45286768615d17a3fb045ab216f93355236dd5516010a37f7
EBUILD wine-1.5.21.ebuild 8007 SHA256 4fd76dc3dd874af438e909699306e6dbe61213b1081a30e133baf2b7e4287880 SHA512 2f39a52b9a508b5e680448caa4b632a0dc7f3c71e5cfafc78d2975ebec9f6bc96158403bcbb860e57257d43c2a6b9087393462da82f9c827809959b22d03caa2 WHIRLPOOL edf65255b8685fa8160bd9346a16e55528943966209186fe0d2c97dcb709fc93d85cf810c452e599d6ea40bb80c7c08d1fa1f8d69bf3d1074a72db49a62d14af
EBUILD wine-1.5.22.ebuild 8007 SHA256 ec3515b8425cafeb32cec889d5794af6bd1ab4969e574ae5ec348ad6bbadc174 SHA512 ac539e24a88e38707e26e8499b7c2809434656daa96f6bfb0c5c46881eae3c57f418e00ff450044dfaa232cc1fedf77ea7fe38703be269d420b6f553470be29c WHIRLPOOL 5873a2f646ac493d438739bf4d5cf2f1369780ef9c3d37ec6482098fa358c024668b2cd3b98a144d79b7006d19f1edd98e4f359ee44b9774a0a81e7f3e26088c
+EBUILD wine-1.5.23-r1.ebuild 8113 SHA256 aa55c905f87f30721d68a8a8b9b14b827fd5456a3a54692a0fdf6f00ab05917b SHA512 cf68702544a2057f13e472efceb8c51ad7d05f530eebe5eca5d3dea9cbc2793a1edd4356d60231697eebdb5245c30d2d63cc672ced552492d2dc1d4f9ee83c3b WHIRLPOOL a4e325efcc864a0f9ef18b9b07ce5ad0a15af45340bcc7c77f3a692d543dba631156dbcca3f6c89fc8d53e940a621d5a29d26e6d3fc135213f5ba3a38e70b3f3
EBUILD wine-1.5.23.ebuild 8007 SHA256 18d701088e09d549a7492ff14794022cbeeafe4ea7a862ff6b07906527bb6869 SHA512 cfbb44822315c64a0011f0966df27a5323fdea224c2842e396a09c1bbe4cfb7e47a3bbddccb08a721f1ada9a5164aca4a6e64b554372ca69d6f262f04b55705a WHIRLPOOL d04b34d3b3a781b6b4ce10e3f726910d8ee99ae3618ae1c4c7a83a4098d5f794a5fe426820b7616f12dd3f4d58d4a456c95c8d27e2432804dcbb9b5dfdc0bcf0
EBUILD wine-1.5.3.ebuild 6385 SHA256 80c5a8c0a390c5e1676b7c0458a9e96631e57e7733fce5e5d9fd3c8694d778b5 SHA512 9154d918c65cdc973ab6ff956f70d8069c026126013313f0d6865d9dee0ff2282db1196493d2f8aeaabd0bb4b220017e80a6f239e3ca3bf9f4d368fab6795c46 WHIRLPOOL 9097656a9940331808440dfcbb48c5f5735b9a8b2173906a6c29b4c10a5fa7a7d579966447b2d76cfa6cc9e27355bab3266aa38839f7b38007b93923d587dbb3
EBUILD wine-1.5.4.ebuild 6385 SHA256 b858e0aae1f76726a338d2b4754c829416d5f709aaa6565930ba58b0927b2021 SHA512 6757b1c4e738201861af63afd1f7e1920068bcefbbc4b27d2738f93e363cceef38f5806dabf349563261a755264c65cfc2bd4ff00a5cedb8951645759e36812c WHIRLPOOL f8c00af6e3b94553bd989ca4e6d0304c8a57284d6691cd13546f3275c719f65462c7a207b0345a1ac5becddaba68b16a094b4463f8f0c5528ad2928501c47eec
@@ -93,18 +95,18 @@ EBUILD wine-1.5.6.ebuild 6605 SHA256 89bb5d1c80780c2015f246195a3d1dc52ac84e194ca
EBUILD wine-1.5.7.ebuild 6853 SHA256 eb4e0bb4f1932685c7fb91ea08cc4d0f116bc137155bc66c521581e40f1fd207 SHA512 8f80e298b45addec8e1054da647e76c10eeb1ed89545343d45470628650f9f6257086555c681e71fbdeca794630fbf74dab562030448885d5a2794f1232d2d96 WHIRLPOOL ae6637106e12d7c494af047bf889d31e82fec3dfc7573163a7c828c64121b060684ad05a5f9d5dc8bf82823b2d1d0f17465b1dcbb305b8bf556bc59ce4c48d28
EBUILD wine-1.5.8.ebuild 6853 SHA256 b4bfb67e1245c06c2569c5ff2824cd1e94a18736f3dd5eb8757a9cf46932ee0d SHA512 b073a3149056e958cfc47580341e6849c93674bd48e7f0ab94fe5c2f28978ee554e8613c6de1c131e82c133d97a8bcfce46558754bbd4ee40377bced5d19f132 WHIRLPOOL f83e2e736857ff5f06c83956a3339ad842ab8d22f3094d7911e817235128d5307751d86f9ea49babd1b6299fbe726750ee8f6a497b59cd4971b79780913f3437
EBUILD wine-1.5.9.ebuild 6853 SHA256 a9d570b694ec03450b0e0b7aaad8f5b6224c5ffddf5c54b1907bdfd3de4631d8 SHA512 eccbb58860ef6cabff4d43b1133eb128bb12add39dcc5a71198bde41be971300db80df3e6a4f7c2d82512ee3e55481042dfd91ac514e5a6ecd7eb47bfe43396b WHIRLPOOL 1c0dca8e7c9b0cf224f0857c858f66d3f9853677b5cf68522e9ed64143e5083d38432f91150a3e826328ec95e11c5ade1dbd5cedee8e2b0933e7828b1f31b1bd
-EBUILD wine-9999.ebuild 8007 SHA256 d7dcdacec1e5037bf0c6a1c7d594f07ca1d79cd5af928598f9a462c36ea5543a SHA512 8eaf9051843b299a2f7741abac2b8e64c72d6940c2bcd2895a91d86b81a754e739a79b30cc1424a623dc946f60296fe7811fdb2506b5fb6e4c598b538d7abc12 WHIRLPOOL bacfb68edf095237fe1be4d54a06c341cf14cd5b94c44e137191ea7523284bdd60be3ab3abd809915a3d68c8692733822a891ea853a38830309bc7a1d7db94dd
-MISC ChangeLog 1114 SHA256 621729658e6e20f1f7f7c543ab2445e62c3c7042624ca589f07ac7a461600dc0 SHA512 99974a0eb9bc3fa878dca7037208824584b7e54619e6798db5bba5027d78df91f8705fc601414976e6bafae6ca10f6e6d95f42b6c2304708113e57fe0d7df584 WHIRLPOOL 20d4f163dd43c2207ba26eeeb9fbcfb436b8dad94b8ba4d7f82cb901c3e23f96dcff0b1688136666e568b2a0882ea0246824aea514a3edb36fd3ff9ae6c6b42b
+EBUILD wine-9999.ebuild 8110 SHA256 752e2b7a14efe6331b72a4f90476765f6979874e229bd522ee8f135605ad2b8a SHA512 401715338be3b8b93730462ddcef33b9b1d04a033c3d7ab33d9713d2536524482cc86c1ac17ab050323a0fc39ca64e8d17cdbebdd956e0120ab9d965f59f7b51 WHIRLPOOL 0db472095b94eb7e35a6b3a06bfd2d816f5e4999595ddfbb8aeebe6a900b3405981947ec0d2a0df213c2f2e34b6d869bc309c7b987e1225ff67688dfb79e081f
+MISC ChangeLog 1495 SHA256 4bd5d93b63e03b95a4091f3b7bc0a02e89864ff0c0457f9e60ffcae33ae8c5fe SHA512 9aa1bfadb9f5e5bd0108e10e19d1b68e9e22a3fbc5db306c26d53e94d94e73daa6cd901bcc760b141376d8f619b4bb4942a1d774c99093b5581cdbe3ea0a8042 WHIRLPOOL 10e99a02ea18d87350862fa942cc5d787c6cf086144add15aa5547665246539ef895021dd622056a2ec69df35e4770defafff9a748f7c3f91e638569965e88fb
MISC ChangeLog-2012 100362 SHA256 8e70fc54e7945c1f41e3e0b64fef6b9a7fe89acdaf8c79a06a16048fe8d2e26c SHA512 ca875e847ba100e1f19774b31a2b45a81d776275e3d11944be8a7b01dfcdbf4265b1a340d691bc4fe4054fea006059a06ed52bc0516b1f8b44a1772a1c813278 WHIRLPOOL 36ec708601a25cb8fa93b471112538480b6ef82cc4e6703b3d045f883078b49209ceaeef7bafa8417b881c2d11df84df9c83d1985d0d687a11f3db3de5abb014
MISC metadata.xml 1857 SHA256 8a16a223604fe47d86a35f79912e60aa419c467dd050ae21d96ea45d615f92ea SHA512 279a5169d2ab779ad41889f8d6b24e8d2de7bba3a611470d5d9cb6c5f27930d336de07bd2431ae9a0c9065887456c150fb2e3582201280945f8fb1520e0a3a3e WHIRLPOOL 1797da0945b3134c72ed15da155a26b24431f35051bc729edec9466a2db73a49a1919993a562e23c8315c362f10a43b3d26fd9fbec205518fadbf9b6324172d3
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (GNU/Linux)
-iQEcBAEBCAAGBQJRDbTlAAoJEJ0WA1zPCt1hTIYIAJp74ZWwpWi5LAt9rJoVKsIu
-8YOlarKaxg9AOnC0IprFpco6D2whSAkHwNXiRfvfnNQei2B0ssxgdqgRIAHK2VO/
-Jym6FBvGXJcbQswv/RhXR+a6Hp/rytRQ5tKzjmfT6Ip53JeLgl9vEAgwBhIcYhOt
-Sf1nCh+6EeRtIqRAQFOqcpH9+8JAN1lkXm0JPdrrF5ONIulDUlHNQm8qumhL94Nk
-RtpBsBJTJcFK3J3KxklSkbx7bHbf9Q7USV4EWqSxwUN8NHvUNqPqXT0ikFuVxK9k
-aVUsnHQgiuggJOe+DFhvUjLE8aFQp7SxVMy+uqghGi3iYpcw4bUOUYFeOYkek/M=
-=LHuQ
+iQEcBAEBCAAGBQJRDx8yAAoJEJ0WA1zPCt1hxq0H/3PqzVHuq1bOVPZXPU/EaZZJ
+BOEqY8I003MTtqYl90mC+Wad/lT+/aBB0qm9rp9YvAzMiuM20mq0DlCzEh/CTa2Q
+N9ASQBMzwxqgVXXte9+a52rfnJ7encabVRKHP43q/PkCMq6zH0My/b4IKoVm/ELc
+/BZxNdE63RtWQx1MhNtq00I/UIwP5gMcLxobomYsTi4d8+W6Xz+zY6FaSa3slRax
++Lhi3SEcpBUVaJaNe896UxV6sEW6Ze91NfZuOjPsxSUpqJioWyzVbIH4x8B3JeKI
+knCh67wOwdtkL+8crpKPIvnlBHX8f0+HdrviSADWm+qEegcbLnqWfLzSjCeRRis=
+=Na9L
-----END PGP SIGNATURE-----
diff --git a/app-emulation/wine/files/wine-1.5.23-winebuild-CCAS.patch b/app-emulation/wine/files/wine-1.5.23-winebuild-CCAS.patch
new file mode 100644
index 000000000000..3971ddd362c9
--- /dev/null
+++ b/app-emulation/wine/files/wine-1.5.23-winebuild-CCAS.patch
@@ -0,0 +1,214 @@
+From 57c57e9dfae50f045503ae9f3107fa3748512483 Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Sun, 3 Feb 2013 19:19:36 -0500
+Subject: [PATCH] winebuild: Use $CCAS to assemble if found
+
+Commit c14bdaf1 made winebuild use Clang to assemble if found.
+
+However, just because a user has some version of Clang installed, it
+does not mean that she wants to use Clang to assemble Wine. For example,
+a user who has both Clang and GAS installed may want to use GAS to avoid
+textrels (see https://bugs.gentoo.org/show_bug.cgi?id=455308).
+
+This patch allows the user to override which assembler gets used by
+exporting CCAS at Wine configure time; the name CCAS was chosen for
+compatibility with automake's standard AM_PROG_AS macro.
+---
+ configure | 106 ++++++++++++++++++++++++++++++++++++++++++++
+ configure.ac | 4 ++
+ tools/winebuild/Makefile.in | 5 ++-
+ tools/winebuild/utils.c | 12 +++++
+ 4 files changed, 126 insertions(+), 1 deletion(-)
+
+diff --git a/configure b/configure
+index e3253ee..d0b7777 100755
+--- a/configure
++++ b/configure
+@@ -732,6 +732,8 @@ FLEX
+ TOOLSDIR
+ WOW64_DISABLE
+ TARGETFLAGS
++ac_ct_CCAS
++CCAS
+ CPPBIN
+ ac_ct_CXX
+ CXXFLAGS
+@@ -861,6 +863,7 @@ CPPFLAGS
+ CXX
+ CXXFLAGS
+ CCC
++CCAS
+ CPP
+ XMKMF'
+
+@@ -1549,6 +1552,7 @@ Some influential environment variables:
+ you have headers in a nonstandard directory <include dir>
+ CXX C++ compiler command
+ CXXFLAGS C++ compiler flags
++ CCAS Assembler command
+ CPP C preprocessor
+ XMKMF Path to xmkmf, Makefile generator for X Window System
+
+@@ -4075,6 +4079,108 @@ cat >>confdefs.h <<_ACEOF
+ _ACEOF
+
+
++
++if test -n "$ac_tool_prefix"; then
++ for ac_prog in clang gas as
++ do
++ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
++set dummy $ac_tool_prefix$ac_prog; ac_word=$2
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if ${ac_cv_prog_CCAS+:} false; then :
++ $as_echo_n "(cached) " >&6
++else
++ if test -n "$CCAS"; then
++ ac_cv_prog_CCAS="$CCAS" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++ IFS=$as_save_IFS
++ test -z "$as_dir" && as_dir=.
++ for ac_exec_ext in '' $ac_executable_extensions; do
++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++ ac_cv_prog_CCAS="$ac_tool_prefix$ac_prog"
++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++ break 2
++ fi
++done
++ done
++IFS=$as_save_IFS
++
++fi
++fi
++CCAS=$ac_cv_prog_CCAS
++if test -n "$CCAS"; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CCAS" >&5
++$as_echo "$CCAS" >&6; }
++else
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++fi
++
++
++ test -n "$CCAS" && break
++ done
++fi
++if test -z "$CCAS"; then
++ ac_ct_CCAS=$CCAS
++ for ac_prog in clang gas as
++do
++ # Extract the first word of "$ac_prog", so it can be a program name with args.
++set dummy $ac_prog; ac_word=$2
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if ${ac_cv_prog_ac_ct_CCAS+:} false; then :
++ $as_echo_n "(cached) " >&6
++else
++ if test -n "$ac_ct_CCAS"; then
++ ac_cv_prog_ac_ct_CCAS="$ac_ct_CCAS" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++ IFS=$as_save_IFS
++ test -z "$as_dir" && as_dir=.
++ for ac_exec_ext in '' $ac_executable_extensions; do
++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++ ac_cv_prog_ac_ct_CCAS="$ac_prog"
++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++ break 2
++ fi
++done
++ done
++IFS=$as_save_IFS
++
++fi
++fi
++ac_ct_CCAS=$ac_cv_prog_ac_ct_CCAS
++if test -n "$ac_ct_CCAS"; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CCAS" >&5
++$as_echo "$ac_ct_CCAS" >&6; }
++else
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++fi
++
++
++ test -n "$ac_ct_CCAS" && break
++done
++
++ if test "x$ac_ct_CCAS" = x; then
++ CCAS=""$CC""
++ else
++ case $cross_compiling:$ac_tool_warned in
++yes:)
++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
++ac_tool_warned=yes ;;
++esac
++ CCAS=$ac_ct_CCAS
++ fi
++fi
++
++
+ case $host in
+ *-darwin*)
+ if test "x$enable_win64" = "xyes"
+diff --git a/configure.ac b/configure.ac
+index c93cd08..760f325 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -126,6 +126,10 @@ dnl We can't use AC_PROG_CPP for winegcc, it uses by default $(CC) -E
+ AC_CHECK_TOOL(CPPBIN,cpp,cpp)
+ AC_DEFINE_UNQUOTED(EXEEXT,["$ac_exeext"],[Define to the file extension for executables.])
+
++dnl Analogous to AM_PROG_AS
++AC_ARG_VAR([CCAS],[Assembler command])
++AC_CHECK_TOOLS(CCAS,[clang gas as],["$CC"])
++
+ case $host in
+ *-darwin*)
+ if test "x$enable_win64" = "xyes"
+diff --git a/tools/winebuild/Makefile.in b/tools/winebuild/Makefile.in
+index 2017129..3fe47a3 100644
+--- a/tools/winebuild/Makefile.in
++++ b/tools/winebuild/Makefile.in
+@@ -1,4 +1,7 @@
+-DEFS = -D__WINESRC__ $(EXTRADEFS)
++DEFS = \
++ -DCCAS="\"@CCAS@\"" \
++ -D__WINESRC__ \
++ $(EXTRADEFS)
+
+ PROGRAMS = winebuild$(EXEEXT)
+ MANPAGE = winebuild.man
+diff --git a/tools/winebuild/utils.c b/tools/winebuild/utils.c
+index 262ff3a..1c5f918 100644
+--- a/tools/winebuild/utils.c
++++ b/tools/winebuild/utils.c
+@@ -352,6 +352,18 @@ struct strarray *get_as_command(void)
+ static int as_is_clang = 0;
+ struct strarray *args = strarray_init();
+
++ if (!as_command && strlen( CCAS ))
++ {
++ struct stat st;
++
++ if (!stat( CCAS, &st ))
++ as_command = CCAS;
++ else
++ as_command = find_tool( CCAS, NULL );
++
++ if (as_command && strstr( as_command, "clang" )) as_is_clang = 1;
++ }
++
+ if (!as_command)
+ {
+ as_command = find_tool( "clang", NULL );
+--
+1.8.1.2
+
diff --git a/app-emulation/wine/wine-1.5.23-r1.ebuild b/app-emulation/wine/wine-1.5.23-r1.ebuild
new file mode 100644
index 000000000000..41ea5f36d07d
--- /dev/null
+++ b/app-emulation/wine/wine-1.5.23-r1.ebuild
@@ -0,0 +1,287 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.5.23-r1.ebuild,v 1.1 2013/02/04 02:38:40 tetromino Exp $
+
+EAPI="5"
+
+inherit autotools eutils flag-o-matic gnome2-utils multilib pax-utils toolchain-funcs
+
+if [[ ${PV} == "9999" ]] ; then
+ EGIT_REPO_URI="git://source.winehq.org/git/wine.git"
+ inherit git-2
+ 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="1.9"
+MV="0.0.8"
+PULSE_PATCHES="winepulse-patches-1.5.23"
+WINE_GENTOO="wine-gentoo-2012.11.24"
+DESCRIPTION="Free implementation of Windows(tm) on Unix"
+HOMEPAGE="http://www.winehq.org/"
+SRC_URI="${SRC_URI}
+ gecko? (
+ mirror://sourceforge/${PN}/Wine%20Gecko/${GV}/wine_gecko-${GV}-x86.msi
+ win64? ( mirror://sourceforge/${PN}/Wine%20Gecko/${GV}/wine_gecko-${GV}-x86_64.msi )
+ )
+ mono? ( mirror://sourceforge/${PN}/Wine%20Mono/${MV}/wine-mono-${MV}.msi )
+ http://dev.gentoo.org/~tetromino/distfiles/${PN}/${PULSE_PATCHES}.tar.bz2
+ http://dev.gentoo.org/~tetromino/distfiles/${PN}/${WINE_GENTOO}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE="alsa capi cups custom-cflags elibc_glibc fontconfig +gecko gnutls gphoto2 gsm gstreamer jpeg lcms ldap +mono mp3 ncurses nls odbc openal opencl +opengl osmesa +oss +perl png +prelink samba scanner selinux ssl test +threads +truetype udisks v4l +win32 +win64 +X xcomposite xinerama xml"
+[[ ${PV} == "9999" ]] || IUSE="${IUSE} pulseaudio"
+REQUIRED_USE="elibc_glibc? ( threads )
+ mono? ( || ( win32 !win64 ) )
+ osmesa? ( opengl )" #286560
+RESTRICT="test" #72375
+
+MLIB_DEPS="amd64? (
+ truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 )
+ X? (
+ >=app-emulation/emul-linux-x86-xlibs-2.1
+ >=app-emulation/emul-linux-x86-soundlibs-2.1
+ )
+ mp3? ( app-emulation/emul-linux-x86-soundlibs )
+ odbc? ( app-emulation/emul-linux-x86-db )
+ openal? ( app-emulation/emul-linux-x86-sdl )
+ opengl? ( app-emulation/emul-linux-x86-opengl )
+ osmesa? ( >=app-emulation/emul-linux-x86-opengl-20121028 )
+ scanner? ( app-emulation/emul-linux-x86-medialibs )
+ v4l? ( app-emulation/emul-linux-x86-medialibs )
+ app-emulation/emul-linux-x86-baselibs
+ >=sys-kernel/linux-headers-2.6
+ )"
+RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts )
+ perl? ( dev-lang/perl dev-perl/XML-Simple )
+ capi? ( net-dialup/capi4k-utils )
+ ncurses? ( >=sys-libs/ncurses-5.2 )
+ fontconfig? ( media-libs/fontconfig:= )
+ gphoto2? ( media-libs/libgphoto2:= )
+ openal? ( media-libs/openal:= )
+ udisks? (
+ sys-apps/dbus
+ sys-fs/udisks:2
+ )
+ gnutls? ( net-libs/gnutls:= )
+ 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/libXmu
+ 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:= )
+ ldap? ( net-nds/openldap:= )
+ lcms? ( media-libs/lcms:0= )
+ mp3? ( >=media-sound/mpg123-1.5.0 )
+ nls? ( sys-devel/gettext )
+ odbc? ( dev-db/unixODBC:= )
+ osmesa? ( media-libs/mesa[osmesa] )
+ samba? ( >=net-fs/samba-3.0.25 )
+ selinux? ( sec-policy/selinux-wine )
+ xml? ( dev-libs/libxml2 dev-libs/libxslt )
+ scanner? ( media-gfx/sane-backends:= )
+ ssl? ( dev-libs/openssl:= )
+ png? ( media-libs/libpng:= )
+ v4l? ( media-libs/libv4l )
+ !win64? ( ${MLIB_DEPS} )
+ win32? ( ${MLIB_DEPS} )
+ xcomposite? ( x11-libs/libXcomposite )"
+[[ ${PV} == "9999" ]] || RDEPEND="${RDEPEND}
+ pulseaudio? (
+ media-sound/pulseaudio
+ sys-auth/rtkit
+ )"
+DEPEND="${RDEPEND}
+ X? (
+ x11-proto/inputproto
+ x11-proto/xextproto
+ x11-proto/xf86vidmodeproto
+ )
+ xinerama? ( x11-proto/xineramaproto )
+ prelink? ( sys-devel/prelink )
+ 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"
+
+src_unpack() {
+ if use win64 ; then
+ [[ $(( $(gcc-major-version) * 100 + $(gcc-minor-version) )) -lt 404 ]] \
+ && die "you need gcc-4.4+ to build 64bit wine"
+ fi
+
+ if use win32 && use opencl; then
+ [[ x$(eselect opencl show) = "xintel" ]] &&
+ die "Cannot build wine[opencl,win32]: intel-ocl-sdk is 64-bit only" # 403947
+ fi
+
+ if [[ ${PV} == "9999" ]] ; then
+ git-2_src_unpack
+ else
+ unpack ${MY_P}.tar.bz2
+ fi
+
+ unpack "${PULSE_PATCHES}.tar.bz2"
+ unpack "${WINE_GENTOO}.tar.bz2"
+}
+
+src_prepare() {
+ local md5="$(md5sum server/protocol.def)"
+ epatch "${FILESDIR}"/${PN}-1.1.15-winegcc.patch #260726
+ epatch "${FILESDIR}"/${PN}-1.4_rc2-multilib-portage.patch #395615
+ epatch "${FILESDIR}"/${PN}-1.5.17-osmesa-check.patch #429386
+ epatch "${FILESDIR}"/${PN}-1.5.23-winebuild-CCAS.patch #455308
+ [[ ${PV} == "9999" ]] || epatch "../${PULSE_PATCHES}"/*.patch #421365
+ epatch_user #282735
+ if [[ "$(md5sum server/protocol.def)" != "${md5}" ]]; then
+ einfo "server/protocol.def was patched; running tools/make_requests"
+ tools/make_requests || die #432348
+ fi
+ eautoreconf
+ sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
+ sed -i '/^MimeType/d' tools/wine.desktop || die #117785
+}
+
+do_configure() {
+ local builddir="${WORKDIR}/wine$1"
+ mkdir -p "${builddir}"
+ pushd "${builddir}" >/dev/null
+
+ local usepulse
+ [[ ${PV} == "9999" ]] || usepulse=$(use_with pulseaudio pulse)
+
+ ECONF_SOURCE=${S} \
+ econf \
+ --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 gnutls) \
+ $(use_with gphoto2 gphoto) \
+ $(use_with gsm) \
+ $(use_with gstreamer) \
+ --without-hal \
+ $(use_with jpeg) \
+ $(use_with ldap) \
+ $(use_with mp3 mpg123) \
+ $(use_with nls gettext) \
+ $(use_with openal) \
+ $(use_with opencl) \
+ $(use_with opengl) \
+ $(use_with ssl openssl) \
+ $(use_with osmesa) \
+ $(use_with oss) \
+ $(use_with png) \
+ $(use_with threads pthread) \
+ ${usepulse} \
+ $(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) \
+ CCAS="$(tc-getAS)" \
+ $2
+
+ emake -j1 depend
+
+ popd >/dev/null
+}
+
+src_configure() {
+ export LDCONFIG=/bin/true
+ use custom-cflags || strip-flags
+
+ if use win64 ; then
+ do_configure 64 --enable-win64
+ use win32 && ABI=x86 do_configure 32 --with-wine64=../wine64
+ else
+ ABI=x86 do_configure 32 --disable-win64
+ fi
+}
+
+src_compile() {
+ local b
+ for b in 64 32 ; do
+ local builddir="${WORKDIR}/wine${b}"
+ [[ -d ${builddir} ]] || continue
+ emake -C "${builddir}" all
+ done
+}
+
+src_install() {
+ local b
+ for b in 64 32 ; do
+ local builddir="${WORKDIR}/wine${b}"
+ [[ -d ${builddir} ]] || continue
+ emake -C "${builddir}" install DESTDIR="${D}"
+ done
+ emake -C "../${WINE_GENTOO}" install DESTDIR="${D}" EPREFIX="${EPREFIX}"
+ dodoc ANNOUNCE AUTHORS README
+ if use gecko ; then
+ insinto /usr/share/wine/gecko
+ doins "${DISTDIR}"/wine_gecko-${GV}-x86.msi
+ use win64 && 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
+ rm "${D}"usr/bin/{wine{dump,maker},function_grep.pl} "${D}"usr/share/man/man1/wine{dump,maker}.1 || die
+ fi
+
+ if use win32 || ! use win64; then
+ pax-mark psmr "${D}"usr/bin/wine{,-preloader} #255055
+ fi
+ use win64 && pax-mark psmr "${D}"usr/bin/wine64{,-preloader}
+
+ if use win64 && ! use win32; then
+ dosym /usr/bin/wine{64,} # 404331
+ dosym /usr/bin/wine{64,}-preloader
+ fi
+}
+
+pkg_preinst() {
+ gnome2_icon_savelist
+}
+
+pkg_postinst() {
+ gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+ gnome2_icon_cache_update
+}
diff --git a/app-emulation/wine/wine-9999.ebuild b/app-emulation/wine/wine-9999.ebuild
index 2f2e70eb2089..fd02d5b7bfcf 100644
--- a/app-emulation/wine/wine-9999.ebuild
+++ b/app-emulation/wine/wine-9999.ebuild
@@ -1,10 +1,10 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-9999.ebuild,v 1.130 2013/02/03 00:52:52 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-9999.ebuild,v 1.131 2013/02/04 02:38:40 tetromino Exp $
EAPI="5"
-inherit autotools eutils flag-o-matic gnome2-utils multilib pax-utils
+inherit autotools eutils flag-o-matic gnome2-utils multilib pax-utils toolchain-funcs
if [[ ${PV} == "9999" ]] ; then
EGIT_REPO_URI="git://source.winehq.org/git/wine.git"
@@ -155,6 +155,7 @@ src_prepare() {
epatch "${FILESDIR}"/${PN}-1.1.15-winegcc.patch #260726
epatch "${FILESDIR}"/${PN}-1.4_rc2-multilib-portage.patch #395615
epatch "${FILESDIR}"/${PN}-1.5.17-osmesa-check.patch #429386
+ epatch "${FILESDIR}"/${PN}-1.5.23-winebuild-CCAS.patch #455308
[[ ${PV} == "9999" ]] || epatch "../${PULSE_PATCHES}"/*.patch #421365
epatch_user #282735
if [[ "$(md5sum server/protocol.def)" != "${md5}" ]]; then
@@ -211,6 +212,7 @@ do_configure() {
$(use_with xinerama) \
$(use_with xml) \
$(use_with xml xslt) \
+ CCAS="$(tc-getAS)" \
$2
emake -j1 depend