Version bump to wine-1.6 final release and remove RCs. See http://www.winehq.org/announce/1.6 for the announcement. Add dos USE flag to pull in dosbox for DOS support, as recommended by upstream. Install translated READMEs.

Package-Manager: portage-2.2.0_alpha188/cvs/Linux x86_64
Manifest-Sign-Key: 0xCF0ADD61

5 files changed, 30 insertions, 339 deletions

diff --git a/app-emulation/wine/ChangeLog b/app-emulation/wine/ChangeLog
index 89a85a23c1c9..1f424e5f867b 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.471 2013/07/13 03:17:13 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.472 2013/07/19 03:33:39 tetromino Exp $
+
+*wine-1.6 (19 Jul 2013)
+
+  19 Jul 2013; Alexandre Rostovtsev <tetromino@gentoo.org>
+  -wine-1.6_rc4.ebuild, -wine-1.6_rc5.ebuild, +wine-1.6.ebuild, metadata.xml:
+  Version bump to wine-1.6 final release and remove RCs. See
+  http://www.winehq.org/announce/1.6 for the announcement. Add dos USE flag to
+  pull in dosbox for DOS support, as recommended by upstream. Install
+  translated READMEs.
 
 *wine-1.6_rc5 (13 Jul 2013)
 
diff --git a/app-emulation/wine/Manifest b/app-emulation/wine/Manifest
index e91006656ec4..1fa2d3d05d03 100644
--- a/app-emulation/wine/Manifest
+++ b/app-emulation/wine/Manifest
@@ -46,8 +46,7 @@ DIST wine-1.5.6.tar.bz2 20380981 SHA256 b178bc34a69341a8f0a7ff73f7dadf2562ed2e5e
 DIST wine-1.5.7.tar.bz2 20386078 SHA256 c4cafaa6e8f67d548ee5f35cd486699350404b02b448dd8fd48d664b9c5f0b07 SHA512 2809ae5cf8695d0feefcee33d3ffb4bed58ad8a32edcee1fb9d1580f4f9dc2f9123a8f169284595f9041f8ffaa7e7fdbef4f6195de00d47f469f527d6764708d WHIRLPOOL e8783abb6a33ecb37d121f4f8b2b1f2d4ecdb57fbd0e53e3aaf4a157fc85ae150e245ddb9b238d533f3a9a6f565caf2ffdd0deab0d76d666b1ac3fb9d08e0b8b
 DIST wine-1.5.8.tar.bz2 20383248 SHA256 dff2bb0026dc155c0c8ae4fd4f87d4a9cd40496286af6ed05130c87d514fc543 SHA512 b34af3f5f26edf6a13e67d699247a82c1998eed8f28e495a65265f700b6fca436824f5bcebd52393d095e13564202874e420285044fa2feaca0a303e89d14f04 WHIRLPOOL 9844388a738ba6bfd88a5ca4b97f6f7902d66e7b3bc5054d642cfa6660ed2e5f861e8c67fb2351fb7afb2a7a9350ce87127b7f84022a72678336e3891e957ad9
 DIST wine-1.5.9.tar.bz2 20413229 SHA256 7bc25e7d0d8fec11a41fec89994dd65265b8fd1052ee82d5648232e646899cd3 SHA512 245b3819f6ca17f50ffedbac44e55a367cff16e3c0c3b28f701511e79c2c20d596e0ae7d4a4094c7203589915cf048e023dedbba9439e1e81bcc7681176dd33b WHIRLPOOL b10bb0606bb013f1a84e8bcfee184eb860d3df8be10b27ef7208d2eb73ed5b1a233be7be3831b61967cac11aa5ad76ab01e1638af860e6426347aec6c45d7c83
-DIST wine-1.6-rc4.tar.bz2 22693015 SHA256 f196819a836322bee96baaf2977068178fe262ff657afeb262989d657d4fc4f9 SHA512 f6fa6bdd7b2e34b4cba7f8ef04d288ff289061b9ee3c63c27c723bfcd88dbf1af2d683c2c504fbf8198293af2ee25b401ad92bb0d06f3c6fe4095b683db35d49 WHIRLPOOL 12fd6b9567aada5037dbbb4f0bfc8e629ff403fe85b5be4d280f4b114f889db503f4f0a221221ad8e76ea9a1887f9c0b0fa018d7f86fcc1917ff378e76fa2459
-DIST wine-1.6-rc5.tar.bz2 21123386 SHA256 b44f5ba6bb661e7e00e422ee7234b59e51208469d8989ce6fcdc128a0572ec77 SHA512 794707592838989fcf25764a2ed98ce4b6d77735f560035e7e07d9d22c7e5a964b1f7b0b95f2b8254b0ed277ffda1ec8148ff71854f0049c5b229a4c7938a14f WHIRLPOOL 9c5219260f3ededaaee088bacd10a29118ff5d9e7e90edf53e9b5282f5208bd83592bf86451dc1a928b34652f556f4eb678ab46cd33642ab0c3ee0e3fe6bddac
+DIST wine-1.6.tar.bz2 21124403 SHA256 e1f130efbdcbfa211ca56ee03357ccd17a31443889b4feebdcb88248520b42ae SHA512 f8a98d732547c685e20ec3b7c50b44943307396b93097ef53b01ab1919209a159b81bd1560d8b2f242cec7f7303e446a8632ddd238359fc1861acc555105c92a WHIRLPOOL a2852f766a982681f61c4e28b878a99eee30ce07b4be01ccb86e4aa5269b40b792521d38c0ba78955b198901f08a0823b61cfd35476086a6dd12c459a13c9ac8
 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.4.msi 44408320 SHA256 15d8a612cdeca4eff3137353f29fdeb7a99e055cd633844c91cd00e0186b8882 SHA512 a7a3d5a564bab68ec6f3b96dff53c7b1491ce6d53b9fa3c2f5770e3ada69ffdefcbdde340697e9916d8c487f748db22aae97803b21bd63e461149be1eac096e4 WHIRLPOOL dc3bfafb8768cbda124870fceb1389e34a7d8ff0b1bad3df7e05923ce2695a2b037467bfddd90e1726f3f64f79bfa9f64bf65054ae3355a69039026fabf1eb4a
@@ -121,20 +120,19 @@ EBUILD wine-1.5.6.ebuild 6691 SHA256 95e8af5853819ee4b4fa42ac1f272ba9e3255340dc7
 EBUILD wine-1.5.7.ebuild 6923 SHA256 08ac49eccdb16bbe11e246e01c449b4a46df3fba01e73c68ccd9aaaf703a767f SHA512 59d1e91d36b116dfcc0fd004efb7146193cca51976f40c5fceca8d99dedfbc560954104d7eb92257f3f75b744d3f9563cc2f5611ce6823ff0131f946388dd202 WHIRLPOOL bc1e10b8f16fd1f45fac6d6f426e658976e85365a91721bf95a90b22926f46e2a0873f296d6e7cf303b58227d08a8ccb1c9b05e5092261d36dddb3f0822f83cc
 EBUILD wine-1.5.8.ebuild 6923 SHA256 29f247c643c007c3d45f4e1700d622879f2805935b0c04c8331d8931a523be35 SHA512 e8b0e8df2f18bb3d736091d0f26f6509861244d028b2cf5c5fd6f6fc5071cdcdfa526f1f5f3af7c316926fc0ab5bee2ff7174b3714eb1d06c03a3778f3de33ff WHIRLPOOL 7867d477b5239a283d43ef7c401c34869c969d6aac66c450a627d8d19dfe7e874020823b1f41944dfe4819ab92db81cb137b3a914b101809849267a3779e0eb7
 EBUILD wine-1.5.9.ebuild 6923 SHA256 374268a106f968d93a5db63dcdb28b06a6682c30166b03835a18c8c5c70aead2 SHA512 ca61b5d254f015ca808dd665d4f6981090c1da004bc4f11cb5d1d6ea6f42b00763452a606346d1bfe9e60c35f9496bf4efc85ffd6a4cd4080cd7d515bb9d983b WHIRLPOOL e6453e640c3dbe82465e9232fc691b6f5c618f53d6d59794fd081a02112c384836e36551642e5b2430d5d2a7c5f715203b3e1f03667cfba458e96244ff9637e9
-EBUILD wine-1.6_rc4.ebuild 9624 SHA256 7972b6c359d6fa0b9e7332492ca57a373aacf823d764ac7588917e0f2467a7ea SHA512 7768d9a0c35a3ba564490f7c239f9dea32d63433bc4f7068d153a5d31de96791f3340481c0b638cfadfa55a3e99623602383c3658ec72c7d15e927c68f98641c WHIRLPOOL 7aa15b0dcdd1c45cae3336bb0e7f841a9d6dd98100c2dd84028ae072327e0527cd2f8bf65db23c662e74a8c878350b61e265779be4eaefb8df1db3e274c9be9f
-EBUILD wine-1.6_rc5.ebuild 9624 SHA256 820261d11801bee254d942b2c350bfcf37186a0f3baad97b48445c2a1fe614d7 SHA512 ebfca636298e490ac1d4226152e05ea27c8ecabbdc0a4aa12002df9e032c086384e9310bcf6df7ca083d29cd85e1599a3981e4a600786e44dfe78fa06dd09c79 WHIRLPOOL d8a09c38004ee490b5f6f628fd20269f9962a0941d2e45dd3063b80fa7a38169acf0089a4b54cd85162cf1caff70b8e6905bf776cbac65c4e3ff19ebdf5714fa
+EBUILD wine-1.6.ebuild 9833 SHA256 fe22d27be4c6b40d47467c39894bd59ed124a85e4a80cc6cd0177a4b5cea7403 SHA512 2f814f7bb1bf16eed9dbe522b9c076767e1d4219404fb00a489cfae0abc6eaf83ea45376c51b0f3cb94b150b2b5a87a9fbba0918b48e3b16dea397230763ff0c WHIRLPOOL e5abf47e1c83de1c120b5d9f9a453e3df0ab4c9879f32b66f5ea3faf485f14d0b9f0ba9f2d0fbd910f908ff68c72d4517a3e3db3caf434cf5821fa2143481a7e
 EBUILD wine-9999.ebuild 9623 SHA256 ffc057ac46aa40bc58c3cf199813873c6aa529d689ab3bbfee58c43b722c3c6f SHA512 8825576d1d870ff08931f075f1bc9035cb22595b3b7d66525f7ac4ba486c686d50b2b56b896908c2a995fe6533af6348883378d7dbdc5bff02cc475735488d87 WHIRLPOOL 2518ab174c767baf0159d32549cd5705b4bff5d10829565eb4783cd46f6e606a9538247eb2ec38d8f1a075c84598401bb935299448d1f29b7210b8c838cf4016
-MISC ChangeLog 9151 SHA256 ae06a7e27a0cc86a0aaddc5b7667213335e5fda23ee4ccf6274022376c5faec9 SHA512 bdbec295dcb4d14533afb78b53575cac438fa6545b403fbc24214992c2f249e2dce367c048d96973b1b50da23d0f4d5edd72a3d6f9defe52cedab9da444c3dd9 WHIRLPOOL 3d49b205fbf8ede1a5e35a1cdd2e8080bc5833d630dfc87c89b20abb9f00f3799a756d565e6bf88ded6bcd79fa8ab174d72c11c6c82b94a083ba3fc6645ceaa4
+MISC ChangeLog 9546 SHA256 2d8fd6df947932176fb3950a4581b335b31a1aee8963dfe4e37e30d2feb035d8 SHA512 772778c0685553a6f1130df3a6b478f417f2c6e2fe98fba7922246b0feea9d61245351906aed31d2ab43b11759f65bd76a366e73413dfa83cafe9ff6de7c4d5a WHIRLPOOL 08304864a7a3eea3f277bdfba65fbab63de7d1c12b402fe19af41fc4c1768fa46a5f33008dc870081fc9f70ecec141ae214b2d21b91f390e551274c7e82f33a1
 MISC ChangeLog-2012 100362 SHA256 8e70fc54e7945c1f41e3e0b64fef6b9a7fe89acdaf8c79a06a16048fe8d2e26c SHA512 ca875e847ba100e1f19774b31a2b45a81d776275e3d11944be8a7b01dfcdbf4265b1a340d691bc4fe4054fea006059a06ed52bc0516b1f8b44a1772a1c813278 WHIRLPOOL 36ec708601a25cb8fa93b471112538480b6ef82cc4e6703b3d045f883078b49209ceaeef7bafa8417b881c2d11df84df9c83d1985d0d687a11f3db3de5abb014
-MISC metadata.xml 1932 SHA256 391c4192823b0613e5fa565dfbdf33c48fa04d5aabf672ab198e91c4a56f9b4e SHA512 f559e8fcb5f552a884cddaa8248b3b2e721d8f2bb8b650635517664c7e6ef5ff124832e09e1e12e7d0bb54bd68108f3139591fcda3b3411d0b63b3cdba9d241a WHIRLPOOL a87834a62b0755b3ac43e3e5409d104f5e0d5976caf5544bf0cc08d726aaa19efd94caedae27279182a9e52b70830c6a8726568aa4439d1156f82f640ad2fe9f
+MISC metadata.xml 2023 SHA256 bc4b00c15bc4d481b0fdafb5b2f33fb33b186dfed650954517871abc2bc653bc SHA512 923017213dbc4ff83fb2e0b39191b21c682175f56c09f657f3a84f5a239178237d835d2ac45bfff5841d61ea53f101d95ccb2d803801846f2962a6820126336b WHIRLPOOL e366d05df1d7ebf37d437859cc0191ba63cd0c4cdb453052ecb46cc46ad4838e25a00dd9943890b0aa7c6134d78223177d727237213f09bb15338dc6dd57600e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQEcBAEBCAAGBQJR4Ma6AAoJEJ0WA1zPCt1hV7AIAKtpTkLZ4Uj2hV3lX8laHjKS
-+Vj02V+8/uBXMU9FBmkdukBp39XWaaT/lDhRkxI/bEf40um6rRPXQ6pVQKvTYMY0
-3Riq6RvmbvGISdzx+nmD6E0tpGilRKLLByolrQnM26L0LNppRCMHMXJ7jXGdgRCq
-TwgZ11lHFTDduob3Ia0kPKQK1m5Xts87yVK4TsvCZrKuDZdAF9LVhJ5oj9X6xA+p
-j2RovzT2dxLHjAdSYc4Rr1h+iiEnJkomfHZyWx+cH9zjjYuSWY+JYtu0D+/44rEB
-T3PhPctmeY0xRZ8qTVv+/z8N8OXjYJiVwEtwS5wCrPvqa2uG8J+4Sxlwopg088k=
-=qdWL
+iQEcBAEBCAAGBQJR6LOUAAoJEJ0WA1zPCt1h80gH+wVifOmqDHIafMU+wCl139NG
+PKKu6jJty9wIzu3jGBudo3gJa0l0heSRiLcjdy6sQqbyitlPGoaJDwS4mCQzuV32
+Wq/dPD69u2cSmchcNN9Clppgbp2W1O5sSSk1p6rLWpmxFpjMVTrxCOKMtDMVTahT
+MM76YiEyYLIVD3049UKE/uInMyTTC5J2jZ0xvqIO/kcf55i0vYHtECbbgH6oMi7I
+dj/BxhQGYxdJhLglyVUbgmMIG5XEhowe4PVQRtg1vs9hRI16AM8UvlMxG+86A9Fy
+6Pz1iCh8WlpuW2H8D0ZsREF2ujco2QB+COdpui1lgl3AhnUFlEqRJPHybPc2DLU=
+=O5Em
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/wine/metadata.xml b/app-emulation/wine/metadata.xml
index 9653a134bc08..3cfc8fe27f4f 100644
--- a/app-emulation/wine/metadata.xml
+++ b/app-emulation/wine/metadata.xml
@@ -10,6 +10,7 @@ Think of Wine as a compatibility layer for running Windows programs. Wine does n
 <use>
 	<flag name='capi'>Enable ISDN support via CAPI</flag>
 	<flag name='custom-cflags'>Bypass strip-flags; use are your own peril</flag>
+	<flag name='dos'>Pull in <pkg>games-emulation/dosbox</pkg> to run DOS applications</flag>
 	<flag name='gecko'>Add support for the Gecko engine when using iexplore</flag>
 	<flag name='mono'>Add support for .NET using Wine's Mono add-on</flag>
 	<flag name='opencl'>Enable OpenCL support</flag>
diff --git a/app-emulation/wine/wine-1.6_rc4.ebuild b/app-emulation/wine/wine-1.6.ebuild
index 23e273f37618..1d8e91c4e5a3 100644
--- a/app-emulation/wine/wine-1.6_rc4.ebuild
+++ b/app-emulation/wine/wine-1.6.ebuild
@@ -1,6 +1,6 @@
 # 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.6_rc4.ebuild,v 1.1 2013/06/30 02:27:50 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.6.ebuild,v 1.1 2013/07/19 03:33:39 tetromino Exp $
 
 EAPI="5"
 
@@ -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 +run-exes 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 dos 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 )
@@ -55,6 +55,7 @@ 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:= )
+	dos? ( games-emulation/dosbox )
 	fontconfig? ( media-libs/fontconfig:= )
 	gphoto2? ( media-libs/libgphoto2:= )
 	openal? ( media-libs/openal:= )
@@ -278,6 +279,11 @@ src_test() {
 
 src_install() {
 	local DOCS=( ANNOUNCE AUTHORS README )
+	add_locale_docs() {
+		local locale_doc="documentation/README.$1"
+		[[ ! -e ${locale_doc} ]] || DOCS=( "${DOCS[@]}" ${locale_doc} )
+	}
+	l10n_for_each_locale_do add_locale_docs
 	autotools-multilib_src_install
 
 	emake -C "../${WINE_GENTOO}" install DESTDIR="${D}" EPREFIX="${EPREFIX}"
diff --git a/app-emulation/wine/wine-1.6_rc5.ebuild b/app-emulation/wine/wine-1.6_rc5.ebuild
deleted file mode 100644
index 26c8b719a860..000000000000
--- a/app-emulation/wine/wine-1.6_rc5.ebuild
+++ /dev/null
@@ -1,323 +0,0 @@
-# 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.6_rc5.ebuild,v 1.1 2013/07/13 03:17:13 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-multilib eutils fdo-mime flag-o-matic gnome2-utils l10n multilib pax-utils toolchain-funcs virtualx
-
-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="2.21"
-MV="0.0.8"
-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}
-	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 )
-	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="+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 )
-	elibc_glibc? ( threads )
-	mono? ( abi_x86_32 )
-	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"
-
-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
-	)
-	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? ( net-libs/gnutls:= )
-	png? ( media-libs/libpng:0= )
-	v4l? ( media-libs/libv4l )
-	xcomposite? ( x11-libs/libXcomposite )
-	amd64? (
-		abi_x86_32? (
-			gstreamer? (
-				app-emulation/emul-linux-x86-gstplugins
-				app-emulation/emul-linux-x86-medialibs[development]
-			)
-			truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1[development] )
-			X? (
-				>=app-emulation/emul-linux-x86-xlibs-2.1[development]
-				>=app-emulation/emul-linux-x86-soundlibs-2.1[development]
-			)
-			mp3? ( app-emulation/emul-linux-x86-soundlibs[development] )
-			odbc? ( app-emulation/emul-linux-x86-db[development] )
-			openal? ( app-emulation/emul-linux-x86-sdl[development] )
-			opengl? ( app-emulation/emul-linux-x86-opengl[development] )
-			osmesa? ( >=app-emulation/emul-linux-x86-opengl-20121028[development] )
-			scanner? ( app-emulation/emul-linux-x86-medialibs[development] )
-			v4l? ( app-emulation/emul-linux-x86-medialibs[development] )
-			>=app-emulation/emul-linux-x86-baselibs-20130224[development]
-			>=sys-kernel/linux-headers-2.6
-		)
-	)"
-[[ ${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 abi_x86_64; then
-		[[ $(( $(gcc-major-version) * 100 + $(gcc-minor-version) )) -lt 404 ]] \
-			&& die "you need gcc-4.4+ to build 64bit wine"
-	fi
-
-	if use abi_x86_32 && use opencl; then
-		[[ x$(eselect opencl show) = "xintel" ]] &&
-			die "Cannot build wine[opencl,abi_x86_32]: 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"
-
-	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.5.17-osmesa-check.patch #429386
-	)
-	[[ ${PV} == "9999" ]] || PATCHES+=(
-		"../${PULSE_PATCHES}"/*.patch #421365
-	)
-
-	autotools-utils_src_prepare
-
-	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
-}
-
-do_configure() {
-	local myeconfargs=( "${myeconfargs[@]}" )
-
-	if use amd64; then
-		if [[ ${ABI} == amd64 ]]; then
-			myeconfargs+=( --enable-win64 )
-		else
-			myeconfargs+=( --disable-win64 )
-		fi
-
-		# Note: using --with-wine64 results in problems with multilib.eclass
-		# CC/LD hackery. We're using separate tools instead.
-	fi
-
-	autotools-utils_src_configure
-}
-
-src_configure() {
-	export LDCONFIG=/bin/true
-	use custom-cflags || strip-flags
-
-	local myeconfargs=( # common
-		--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_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 osmesa)
-		$(use_with oss)
-		$(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)
-	)
-
-	[[ ${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
-}
-
-src_compile() {
-	autotools-multilib_src_compile depend
-	autotools-multilib_src_compile all
-}
-
-src_test() {
-	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
-
-	# FIXME: win32-only; wine64 tests fail with "could not find the Wine loader"
-	multilib_toolchain_setup x86
-	local BUILD_DIR="${S}-${ABI}"
-	cd "${BUILD_DIR}" || die
-	WINEPREFIX="${T}/.wine-${ABI}" Xemake test
-}
-
-src_install() {
-	local DOCS=( ANNOUNCE AUTHORS README )
-	autotools-multilib_src_install
-
-	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
-		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
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	fdo-mime_desktop_database_update
-}