wine: sync with portage

5 files changed, 124 insertions, 72 deletions

diff --git a/app-emulation/wine/ChangeLog b/app-emulation/wine/ChangeLog
index fcdb237..306c361 100644
--- a/app-emulation/wine/ChangeLog
+++ b/app-emulation/wine/ChangeLog
@@ -1,6 +1,93 @@
 # 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.458 2013/03/18 03:28:57 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.470 2013/06/30 02:27:50 tetromino Exp $
+
+*wine-1.6_rc4 (30 Jun 2013)
+
+  30 Jun 2013; Alexandre Rostovtsev <tetromino@gentoo.org>
+  -wine-1.6_rc1.ebuild, -wine-1.6_rc2.ebuild, +wine-1.6_rc4.ebuild,
+  -files/wine-1.6_rc1-pkg-config.patch:
+  Version bump, see http://www.winehq.org/announce/1.6-rc4 for the
+  announcement. Remove old RCs.
+
+*wine-1.6_rc3 (24 Jun 2013)
+
+  24 Jun 2013; Alexandre Rostovtsev <tetromino@gentoo.org>
+  +wine-1.6_rc3.ebuild, wine-9999.ebuild:
+  Version bump, see http://www.winehq.org/announce/1.6-rc3 for the
+  announcement. Add a high-res wineglass icon as fallback for newly installed
+  Windows shortcuts which don't have an icon of their own (bug #472990, thanks
+  to Pacho Ramos).
+
+  15 Jun 2013; Alexandre Rostovtsev <tetromino@gentoo.org> wine-1.6_rc2.ebuild,
+  wine-9999.ebuild, metadata.xml:
+  Rename mime-handler USE flag to run-exes in order to be more clear about its
+  effects.
+
+*wine-1.6_rc2 (15 Jun 2013)
+
+  15 Jun 2013; Alexandre Rostovtsev <tetromino@gentoo.org>
+  +wine-1.6_rc2.ebuild, wine-9999.ebuild, metadata.xml:
+  Version bump, see http://www.winehq.org/announce/1.6-rc2 for the announcement.
+  CCAS patch shouldn't be needed any more.
+  Make USE flag defaults more sensible (most users want alsa, not oss).
+  Add a mime-handler USE flag (enabled by default) to register wine as the
+  handler for .EXE and .MSI file MIME types, like in most other distros. Users
+  with special security requirements can disable the flag to restore the old
+  Gentoo behavior.
+
+  12 Jun 2013; Alexandre Rostovtsev <tetromino@gentoo.org> wine-1.5.25.ebuild,
+  wine-1.5.26.ebuild, wine-1.5.27.ebuild, wine-1.5.28.ebuild,
+  wine-1.5.29.ebuild, wine-1.5.30.ebuild, wine-1.5.31.ebuild,
+  wine-1.6_rc1.ebuild, wine-9999.ebuild:
+  Avoid crossdev's i686-pc-linux-gnu-pkg-config when building wine32 on amd64
+  (bug #472038, thanks to Dmitry Derevyanko). Update live ebuild's patches.
+
+*wine-1.6_rc1 (11 Jun 2013)
+
+  11 Jun 2013; Alexandre Rostovtsev <tetromino@gentoo.org>
+  +wine-1.6_rc1.ebuild, wine-9999.ebuild, +files/wine-1.6_rc1-pkg-config.patch:
+  Version bump, see http://www.winehq.org/announce/1.6-rc1 for the
+  announcement. Fix pkg-config detection with some combinations of USE flags
+  (bug #470172, thanks to Mike Callahan, Peter et al.)
+
+*wine-1.5.31 (26 May 2013)
+
+  26 May 2013; Alexandre Rostovtsev <tetromino@gentoo.org> wine-1.5.30.ebuild,
+  +wine-1.5.31.ebuild, wine-9999.ebuild, +files/wine-1.5.31-gnutls-3.2.0.patch:
+  Version bump, see http://www.winehq.org/announce/1.5.31 for the announcement.
+  Fix build failure with gnutls-3.2.0 (bug #471077, thanks to Ben Kohler).
+
+  16 May 2013; Alexandre Rostovtsev <tetromino@gentoo.org> wine-1.5.25.ebuild,
+  wine-1.5.26.ebuild, wine-1.5.27.ebuild, wine-1.5.28.ebuild,
+  wine-1.5.29.ebuild, wine-1.5.30.ebuild, wine-9999.ebuild:
+  Require emul-linux-x86-medialibs[development] for gstreamer (bug #462772,
+  thanks to Jan Vesely). Libwine patch is no longer needed for live ebuild (bug
+  #469834, thanks to Murray Colpman).
+
+*wine-1.5.30 (13 May 2013)
+
+  13 May 2013; Alexandre Rostovtsev <tetromino@gentoo.org> +wine-1.5.30.ebuild,
+  wine-9999.ebuild, +files/wine-1.5.30-libwine.patch:
+  Version bump, see http://www.winehq.org/announce/1.5.30 for the announcement
+  (bug #469568). Respect LINGUAS when installing translation resources and man
+  pages (bug #469418, thanks to Roman Žilka).
+
+*wine-1.5.29 (28 Apr 2013)
+
+  28 Apr 2013; Alexandre Rostovtsev <tetromino@gentoo.org> +wine-1.5.29.ebuild:
+  Version bump, see http://www.winehq.org/announce/1.5.29 for the announcement.
+
+*wine-1.5.28 (14 Apr 2013)
+
+  14 Apr 2013; Alexandre Rostovtsev <tetromino@gentoo.org> +wine-1.5.28.ebuild,
+  wine-9999.ebuild:
+  Version bump, see http://www.winehq.org/announce/1.5.28 for the announcement.
+
+*wine-1.5.27 (31 Mar 2013)
+
+  31 Mar 2013; Alexandre Rostovtsev <tetromino@gentoo.org> +wine-1.5.27.ebuild:
+  Version bump, see http://www.winehq.org/announce/1.5.27 for the announcement.
 
 *wine-1.5.26 (18 Mar 2013)
 
diff --git a/app-emulation/wine/Manifest b/app-emulation/wine/Manifest
index e742fb9..1a38f66 100644
--- a/app-emulation/wine/Manifest
+++ b/app-emulation/wine/Manifest
@@ -3,17 +3,19 @@ AUX wine-1.4_rc2-multilib-portage.patch 1256 SHA256 9d0acd304d11d1bf73f56699754a
 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
 AUX wine-1.5.26-winegcc.patch 1808 SHA256 91c1012059b93a421b2eae9f2ea46b7b327d6d3d58ba0cb47021c8a57f6d8228 SHA512 fce9daf40a96f4a7502c249a30107c8dfc5d8edd4a171b863d2bf14c3ad46d18e4c29932ab4a6ede7da5d589d777b962d2f577f5360ee4db8019d71362c51d47 WHIRLPOOL 71cbe36c6bac87071472541b7f5cd3ed1b08f05479bc0016262b3f86e75738e467dad197563b4898f2b24fd0ab4e27c40dce04f244a3e7f5ea1582b4db1c5cc2
-AUX wine-1.5.30-libwine.patch 1777 SHA256 2f0155c2c1d11fd9a06deab54dd753c1161e32217eae82604f8c1d542e87af4f SHA512 e6d566f75632065def197cf27b5705a3f2f736a7b3bb4ae03df19fea00fd980a5b5d0517981469fef0fa5347c1c3b9651894fb23d937b5dbbd993cd292f67183 WHIRLPOOL 62ed15db6bddda47dcf74d846e15a9904c11abdf63e0321e7e2bc3197f60c819992b3a95a4395f85edeef9181a1866749194b9744be8d42bd94acab37470aad6
 DIST wine-1.5.25.tar.bz2 21381514 SHA256 3d93266fbc1bf04fbe28c0028d436610273413884ceeba47c8f8811db6cf2220 SHA512 7a7944afcc925d9de4a6aaea5e47f6ae86304e59ffe7476a936f3a329104558ebb8b7f4ffd1510ac0c6601d53bb63349a8ec282547bf2a3b6027e8a1b8420289 WHIRLPOOL 4b70cf4167b5dd14824cb8614056719601d949779fbd7c2bbcdfd2bb5185dfcf5840add740f91a7ded1cfd1fb12e55e44995b9cb18280b56abcb8b977aeee132
-DIST wine-1.5.30.tar.bz2 22149237 SHA256 0f6f92a5730037b85b75089af6817ae2ceffb335caa5077e2ab1b41944c452c3 SHA512 437c0c0eb508c7ef6d468d434d751b91ca1007231fcc1732aff00be6f0bcf0d96e207d5251f336345c2fea2f20035ce4cdbd51ed258baebb5c13734858868c97 WHIRLPOOL dbab130d71ef4b4d3f2141f327222fb569921c2adb5bad00dd1024abd401b61d1e26d7bb0aa86f4361aadd6e7e29a7207fd139ffdad2b5ef50db4ab7f156cb69
+DIST wine-1.6-rc4.tar.bz2 22693015 SHA256 f196819a836322bee96baaf2977068178fe262ff657afeb262989d657d4fc4f9 SHA512 f6fa6bdd7b2e34b4cba7f8ef04d288ff289061b9ee3c63c27c723bfcd88dbf1af2d683c2c504fbf8198293af2ee25b401ad92bb0d06f3c6fe4095b683db35d49 WHIRLPOOL 12fd6b9567aada5037dbbb4f0bfc8e629ff403fe85b5be4d280f4b114f889db503f4f0a221221ad8e76ea9a1887f9c0b0fa018d7f86fcc1917ff378e76fa2459
 DIST wine-gentoo-2012.11.24.tar.bz2 57481 SHA256 164248d7ff8cf06053576a3ecc1f6fe88a52763b04058ae53a9a4d5cfb6e7e22 SHA512 2a626ccbd408204dc6d1710ebb524a7961f4f417abc4cf1b65b4954a7b3033592febc8e9886ab47b000fc97dd3fe016a5833079f6bff84cd1d5aeb57a5167e07 WHIRLPOOL c638d0b0d8632d99f34cc4a294c4ddc7b69812af2ef536b3586fcfb41aab88a545d4c85c5a41020911dcb244eb7ed512cc6a957c6efd7ed06bd840f38e91f61d
+DIST wine-gentoo-2013.06.24.tar.bz2 85442 SHA256 bfbf6b25e98f717320de2ede467e3628fbc749d936b8449f8477c9dc6f41e04b SHA512 b6819889314f6a6ea16c1332f4b177c43623116763969c31b23b61754cd304dd085f5d3eafbe847159331eb97dddd9b4c10699430129ea4a71da418c1fe175f0 WHIRLPOOL 227e0ac6569736d4ad5813cef49f775dae956f4fc9255de95753d5d3cba1bf6cf3db31d23d3702bb54d2e60c5a6f779b602f0efb2096e4c827c924565b273d00
 DIST wine-mono-0.0.8.msi 46967296 SHA256 3dfc23bbc29015e4e538dab8b83cb825d3248a0e5cf3b3318503ee7331115402 SHA512 d3009f2301b0a006136e880025a736f24612faa7a954956896124ec7282d35b678f02658e8be12b1c02ee217e594a2c728a9258c36ccb346b186a4781951adbd WHIRLPOOL 1d4b2e88ebab1f603326a238cc908982c7e135a33340087e8645572838d2b6034764e9fe787bb890792dea4c0531d26f9a6a811a7c200edb99ab82f975179389
 DIST wine_gecko-1.9-x86.msi 19060224 SHA256 2f1df59287a4f21ec0f1322ae10520c8e6a95de10f8ef7339ab217e4b46ce782 SHA512 6bbcbd79f4eb95bcc9ad1902b3b86059f18127c7fbff0f87f7875de2bcdd543441b9dad12d641926e22ba610df2801d82b3c63ef2b62323b5f4bc4f8bd85b124 WHIRLPOOL 5431d42abdefd48cefb5f6ead9324ba7d2a40a305393120beb544f83571974006f4208180c38ea800cc96157523cca16daec5b7b51ea8b5aead9379a4f6ec53a
 DIST wine_gecko-1.9-x86_64.msi 19622400 SHA256 0e5f87e5026f1f131fd595f11ae7ed5b5ba9978d917b96821d2ca34d3f91b1ea SHA512 426fe66d0b02ddb7e542db1ef5480867b9bbdd63e927ecba9f237991a2dc4fca119d24bd87dc2c372b90fe899a9f41306e90b3fadea6c69ec1f180f1af02576f WHIRLPOOL 8f7c38089fb89f48db2aa087a55953346a08988e0a0d3c0d215c968127f82f4de10b161fe7015e9114119d5f6f65b7b61bee1ce96720f7d7b7e6d3c1722eae2f
+DIST wine_gecko-2.21-x86.msi 20871680 SHA256 f01fafa6d7aab995c38add77315c4cbc2f32f52d5d6a9350056f42b62d631fd8 SHA512 f4ca9ca5b876dc39e906991e58c6da8ef4103782f83ba781ff27556c0ebdab7fe10c14f0551e900442a5d57a2c619da6e5ed6ed42323edcdd55ce9789c4c83ac WHIRLPOOL d1db97175b047652499c97c968b71c08c5b44774423f22ae626f89b4dde3d03b46295e5caae228f1f8614209e943e8246854b478eef3abb186e8de4c341b0a0d
+DIST wine_gecko-2.21-x86_64.msi 21646336 SHA256 bc370bdc899f66d98f31c4d410a6952aa82c0c9c0a0ec27f2a11243c9b412c3f SHA512 2a48a7697beba4e45816a9eff09e181de353d8c93e02a70108fa77d27136cd5cd75b21c42caa7702a09f86544669ae2bbfc6975b1fc0d7fcb20150a4bc4ea514 WHIRLPOOL 2fce9b9a190a52c173551d47428dd8b8dc54d5878682733e0006a3f06f216cd9f47a88ada49f92fa5697ece8b2942a88f937bd2722b4cb85d2c35c19bda29b85
 DIST winepulse-patches-1.5.25.tar.bz2 46795 SHA256 375c94dc4d12ab6b41da478104a1ca1f9c36d4d7d111f74d005900c8f04e3026 SHA512 1e2f6029cce6feb75fd9f170f0fa791b8b4f5d5e7c852e835c60d6dcb4e3319ed671b9eec2767cde7d8befe96a7fb1970f581efbc2b5d1b6277bb69e7f7e89a3 WHIRLPOOL e2cc043d21a36117a8de69597e61148edbf3b49ede1a95bc196693c47235efbb5a97c7f8964dc4906ece6a982bfce4cb156e4428a2c88c82cfa7cb4e82892503
-DIST winepulse-patches-1.5.30.tar.bz2 45835 SHA256 61f7cdee2c5cb21457a721752a4525c1c75257b18a3b19793934622136231a35 SHA512 90f2c4fd989260131570a5cc18f7304f641d7738bcafd284e1dae19767a8dfebd289c458eaba8efadef8a9dd9552f4a34be34f22d70b841484b0245559975f80 WHIRLPOOL 60fea09353f33f54ef4b19d34876ad307c17d6beab3733f439a5b2714c8de51bd8c69f0f7180f31e0378d857c0f1d1fcbb6f54fc2985f36b0dce9e37e0123d5f
+DIST winepulse-patches-1.6-rc1.tar.bz2 47873 SHA256 c963b08e520aafdc618caaa50044979ec573aa1862bc0637f1f4e381b3fc3665 SHA512 f5f9cbcb93ffcec8dc43bd8949d7f7ee71ab75771dc04ee1e28c3b4ba2ab3d7f7089ae2f872aed835979a94e51563e65e6fd8333104617c8e0465525c2854654 WHIRLPOOL ec38890c71a3e40d433c8e99f483f2453c2e88119d824aabebbc9c6cc95b3585ee8e1d47e1a00df795d6b731d041fd7e1b987781b76b66bf0dbf9f7cac4642e3
 EBUILD wine-1.5.25.ebuild 9374 SHA256 f93e7d769bde69ce72cb290576c35c7d4d5ce1096ef3ad09046bf4cbcc2749a2 SHA512 ceed82abaca6845c91aff1ba47642e89f16990008ea7187e2ff8225bfbe81f6a000ecf01fa6b30e83be6f91da1ac1dbe4cf46517b9e421d5a67433ba45891cf6 WHIRLPOOL 1f28d3fe5b571fcce3a1d62518e8513a574f421cec2ea8f80023bbb4043849e91617851fe17e5034c06bb5e00641738b5fce5be507bd24615d4c29b84cc89b74
-EBUILD wine-1.5.30.ebuild 10001 SHA256 7c1bf5108c2a021e50583d2afa2bc8689df21d3ca926e0c8f2a5cfa2c7457c29 SHA512 19d8711e6f4f393584b706f653840a6e728624849f3ce2fc53610783a22773e890fa914a8ea856d12fba1fe36c0c32ed9a5881d826c5f5b01cb8babfc0d448ce WHIRLPOOL 34c1d28174fdf74fc1272019c050e4284943bf98ddc193e80f6a680af0fe17d7f5c49c8775ba28bc218fb5885fda2c2adf0549b77f91cacd4ab32333e8fcb664
-MISC ChangeLog 4991 SHA256 488d06b927799a1ed38729e274aba3a9b3e0087468bb50ab7309b909bf0340d4 SHA512 9413392d41c167da130c2f7d01a4ab44c1a804d2a01654b1495f1267795fbe5e9b0812c72039261fb13e1fa8617dae43c422e5ff930a218ac3f61312a8459b72 WHIRLPOOL eb32fcd976450246f8fd3c5269237f51beaf702f391a8d8a1d4d2534e03faf828cf1b7eadcfed76440766be9fc0b4acdea93c64e2a7feb545b8d98dcc8379f94
+EBUILD wine-1.6_rc4.ebuild 10262 SHA256 4cdd74dabc6f8bb5274774a10a1ee99e29c8b5faab17162b94215e6ca22d198b SHA512 1f27c7e050df84de0d61383356d483d9dea45b66bec6c39b65883144b2139dde91bfb24e4ac4b51a22902181051dc5ab42d4ce3c0db7d88b35302ba8845e2c9b WHIRLPOOL 0dc4309a6da7fd78228b6b308814ec488c38d17bc768ef0f1d8f2841991783feb1d8339dfa9dc9980efbe8a2172f74004529ef173385bdd2687579188e008c6c
+MISC ChangeLog 8918 SHA256 7872269ee7317602e10d32cb651829901a21b4f2d7f37e0a8e7937fa214426b3 SHA512 b95f81d1402c7617030a38fe68cc6903e196ac717a8431e9376f33fdbf694db1b3b57ecffc980d2bc293d4c015208e1ac9b94bd5fe2a6f7856e31a4cee2f5f36 WHIRLPOOL 73c9ac65f511a318416994d028527cfaebd2bf420a53806e18b32b573f3deec9915399ac4487a344c3a6dfdc10e9aa485ec94219ed1fbcf4453d4f036e28f9b4
 MISC ChangeLog-2012 100362 SHA256 8e70fc54e7945c1f41e3e0b64fef6b9a7fe89acdaf8c79a06a16048fe8d2e26c SHA512 ca875e847ba100e1f19774b31a2b45a81d776275e3d11944be8a7b01dfcdbf4265b1a340d691bc4fe4054fea006059a06ed52bc0516b1f8b44a1772a1c813278 WHIRLPOOL 36ec708601a25cb8fa93b471112538480b6ef82cc4e6703b3d045f883078b49209ceaeef7bafa8417b881c2d11df84df9c83d1985d0d687a11f3db3de5abb014
-MISC metadata.xml 1689 SHA256 d0beb35389a77bab46dcc67af981b11c0b3a1745749608ba283ef6f14d7a48a8 SHA512 8c6185cfaa36e8527b274100754ba5b16c247e78df78191b6d51a03e79092d35932cfe08e7efa7c2899c04e822768f5eeafee8673c4bd093ea2da0abc49a9991 WHIRLPOOL d8e96e390c556f7b92b787816ff2777e6beb871f9fb4e7533c4111df81184b1a6615d2b511905c2e23dda0ba470b871111577b52fca439edb418fb1a75555e68
+MISC metadata.xml 1932 SHA256 391c4192823b0613e5fa565dfbdf33c48fa04d5aabf672ab198e91c4a56f9b4e SHA512 f559e8fcb5f552a884cddaa8248b3b2e721d8f2bb8b650635517664c7e6ef5ff124832e09e1e12e7d0bb54bd68108f3139591fcda3b3411d0b63b3cdba9d241a WHIRLPOOL a87834a62b0755b3ac43e3e5409d104f5e0d5976caf5544bf0cc08d726aaa19efd94caedae27279182a9e52b70830c6a8726568aa4439d1156f82f640ad2fe9f
diff --git a/app-emulation/wine/files/wine-1.5.30-libwine.patch b/app-emulation/wine/files/wine-1.5.30-libwine.patch
deleted file mode 100644
index 75fc83e..0000000
--- a/app-emulation/wine/files/wine-1.5.30-libwine.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-commit ce4b6451aabbe83809c7483c748cfa009cc090d6
-Author: Alexandre Julliard <julliard@winehq.org>
-Date:   Fri May 10 22:01:44 2013 +0200
-
-    configure: Add explicit install targets in libs/wine for make_makefiles.
-
-diff --git a/configure b/configure
-index d4c1f8e..ef38bfd 100755
---- a/configure
-+++ b/configure
-@@ -16379,7 +16379,7 @@ wine_fn_config_makefile documentation enable_documentation
- wine_fn_config_makefile fonts enable_fonts install-lib
- wine_fn_config_makefile include enable_include install-dev
- wine_fn_config_makefile libs/port enable_libs_port
--wine_fn_config_makefile libs/wine enable_libs_wine
-+wine_fn_config_makefile libs/wine enable_libs_wine install-dev,install-lib
- wine_fn_config_makefile libs/wpp enable_libs_wpp
- wine_fn_config_makefile loader enable_loader install-lib,manpage
- wine_fn_config_program aspnet_regiis enable_aspnet_regiis install
-diff --git a/configure.ac b/configure.ac
-index 6dd2348..b44673e 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -3173,7 +3173,7 @@ WINE_CONFIG_MAKEFILE([documentation])
- WINE_CONFIG_MAKEFILE([fonts],,[install-lib])
- WINE_CONFIG_MAKEFILE([include],,[install-dev])
- WINE_CONFIG_MAKEFILE([libs/port])
--WINE_CONFIG_MAKEFILE([libs/wine])
-+WINE_CONFIG_MAKEFILE([libs/wine],,[install-dev,install-lib])
- WINE_CONFIG_MAKEFILE([libs/wpp])
- WINE_CONFIG_MAKEFILE([loader],,[install-lib,manpage])
- WINE_CONFIG_PROGRAM(aspnet_regiis,,[install])
-diff --git a/libs/wine/Makefile.in b/libs/wine/Makefile.in
-index b8dc385..7de7799 100644
---- a/libs/wine/Makefile.in
-+++ b/libs/wine/Makefile.in
-@@ -111,4 +111,8 @@ version.c: dummy
- $(RELPATH):
- 	@cd $(TOOLSDIR)/tools && $(MAKE) relpath$(TOOLSEXT)
- 
-+# Make sure that make_makefiles sees the install rules
-+install install-lib::
-+install install-dev::
-+
- @LIBWINE_RULES@
diff --git a/app-emulation/wine/metadata.xml b/app-emulation/wine/metadata.xml
index 6bc69de..9653a13 100644
--- a/app-emulation/wine/metadata.xml
+++ b/app-emulation/wine/metadata.xml
@@ -16,9 +16,12 @@ Think of Wine as a compatibility layer for running Windows programs. Wine does n
 	<flag name='osmesa'>Add support for OpenGL in bitmaps using libOSMesa</flag>
 	<flag name='perl'>Install helpers written in perl (winedump/winemaker)</flag>
 	<flag name='prelink'>Run prelink on DLLs during build -- do not disable if you do not know what this means as it can break things at runtime</flag>
+	<flag name='run-exes'>Use Wine to open and run .EXE and .MSI files</flag>
 	<flag name='samba'>Add support for NTLM auth. see
 		http://wiki.winehq.org/NtlmAuthSetupGuide and
 		http://wiki.winehq.org/NtlmSigningAndSealing</flag>
 	<flag name='udisks'>Support dynamic storage devices using <pkg>sys-fs/udisks</pkg></flag>
+	<flag name='win32'>Build a 32bit version of Wine (won't run Win64 binaries)</flag>
+	<flag name='win64'>Build a 64bit version of Wine (won't run Win32 binaries)</flag>
 </use>
 </pkgmetadata>
diff --git a/app-emulation/wine/wine-1.5.30.ebuild b/app-emulation/wine/wine-1.6_rc4.ebuild
index a240ade..4ff182e 100644
--- a/app-emulation/wine/wine-1.5.30.ebuild
+++ b/app-emulation/wine/wine-1.6_rc4.ebuild
@@ -1,14 +1,14 @@
 # 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.30.ebuild,v 1.2 2013/05/16 13:30:56 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.6_rc4.ebuild,v 1.1 2013/06/30 02:27:50 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 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"
+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-multilib eutils flag-o-matic gnome2-utils l10n multilib pax-utils toolchain-funcs user virtualx
+inherit autotools-multilib eutils fdo-mime flag-o-matic gnome2-utils l10n multilib pax-utils toolchain-funcs user virtualx
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="git://source.winehq.org/git/wine.git"
@@ -22,10 +22,10 @@ else
 	S=${WORKDIR}/${MY_P}
 fi
 
-GV="1.9"
+GV="2.21"
 MV="0.0.8"
-PULSE_PATCHES="winepulse-patches-1.5.30"
-WINE_GENTOO="wine-gentoo-2012.11.24"
+PULSE_PATCHES="winepulse-patches-1.6-rc1"
+WINE_GENTOO="wine-gentoo-2013.06.24"
 DESCRIPTION="Free implementation of Windows(tm) on Unix"
 HOMEPAGE="http://www.winehq.org/"
 SRC_URI="${SRC_URI}
@@ -39,7 +39,7 @@ SRC_URI="${SRC_URI}
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-IUSE="+abi_x86_32 +abi_x86_64 alsa capi cups custom-cflags elibc_glibc fontconfig +gecko 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 +X xcomposite xinerama xml"
+IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags elibc_glibc +fontconfig +gecko gphoto2 gsm gstreamer +jpeg lcms ldap +mono mp3 ncurses nls odbc openal opencl +opengl osmesa oss +perl +png +prelink +run-exes samba scanner selinux +ssl test +threads +truetype +udisks v4l +X xcomposite xinerama +xml"
 [[ ${PV} == "9999" ]] || IUSE="${IUSE} pulseaudio"
 REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
 	test? ( abi_x86_32 )
@@ -166,12 +166,6 @@ src_unpack() {
 	unpack "${WINE_GENTOO}.tar.bz2"
 
 	l10n_find_plocales_changes "${S}/po" "" ".po"
-
-	# for all bins and libs disable world access and group write access
-	# only users from wine group may be able to use it
-	local filelist=$( find "${D}"/usr/{bin,lib} -type f | gawk -v path="${D}" '{ gsub("^"path,""); print $0 }')
-	fowners :wine ${filelist}
-	fperms -R o-rwx,g-w ${filelist}
 }
 
 src_prepare() {
@@ -180,8 +174,6 @@ src_prepare() {
 		"${FILESDIR}"/${PN}-1.5.26-winegcc.patch #260726
 		"${FILESDIR}"/${PN}-1.4_rc2-multilib-portage.patch #395615
 		"${FILESDIR}"/${PN}-1.5.17-osmesa-check.patch #429386
-		"${FILESDIR}"/${PN}-1.5.23-winebuild-CCAS.patch #455308
-		"${FILESDIR}"/${PN}-1.5.30-libwine.patch #http://bugs.winehq.org/show_bug.cgi?id=33560
 	)
 	[[ ${PV} == "9999" ]] || PATCHES+=(
 		"../${PULSE_PATCHES}"/*.patch #421365
@@ -194,16 +186,18 @@ src_prepare() {
 		tools/make_requests || die #432348
 	fi
 	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
-	sed -i '/^MimeType/d' tools/wine.desktop || die #117785
+	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
 }
 
 do_configure() {
-	local myeconfargs=(
-		"${myeconfargs[@]}"
-		CCAS="$(tc-getAS)"
-	)
+	local myeconfargs=( "${myeconfargs[@]}" )
 
 	if use amd64; then
 		if [[ ${ABI} == amd64 ]]; then
@@ -261,6 +255,9 @@ src_configure() {
 
 	[[ ${PV} == "9999" ]] || myeconfargs+=( $(use_with pulseaudio pulse) )
 
+	# Avoid crossdev's i686-pc-linux-gnu-pkg-config if building wine32 on amd64; #472038
+	use amd64 && use abi_x86_32 && tc-export PKG_CONFIG
+
 	multilib_parallel_foreach_abi do_configure
 }
 
@@ -313,6 +310,12 @@ src_install() {
 	for l in de fr pl; do
 		use linguas_${l} || rm -r "${D}"usr/share/man/${l}*
 	done
+
+	# for all bins and libs disable world access and group write access
+	# only users from wine group may be able to use it
+	local filelist=$( find "${D}"/usr/{bin,lib} -type f | gawk -v path="${D}" '{ gsub("^"path,""); print $0 }')
+	fowners :wine ${filelist}
+	fperms -R o-rwx,g-w ${filelist}
 }
 
 pkg_preinst() {
@@ -321,6 +324,7 @@ pkg_preinst() {
 
 pkg_postinst() {
 	gnome2_icon_cache_update
+	fdo-mime_desktop_database_update
 
 	ewarn "You must be in the wine group in order to be able to use wine."
 	ewarn "It is recommended to use a separate user for running wine in order"
@@ -330,4 +334,5 @@ pkg_postinst() {
 
 pkg_postrm() {
 	gnome2_icon_cache_update
+	fdo-mime_desktop_database_update
 }