wine-1.5.20 - sync from gentoo

2 files changed, 15 insertions, 7 deletions

diff --git a/app-emulation/wine/Manifest b/app-emulation/wine/Manifest
index bf253c1..71c6a9e 100644
--- a/app-emulation/wine/Manifest
+++ b/app-emulation/wine/Manifest
@@ -22,7 +22,7 @@ DIST winepulse-patches-1.5.21.tar.bz2 46068 SHA256 038b672bed96cae5c89a854d2e298
 DIST winepulse-patches-1.5.22.tar.bz2 46325 SHA256 4850ffb54ee4062c14457a6282b432604272858decaa438d95334c164ca05948 SHA512 0f05afafae79288cc73f926280d20b3acfb8aa617ba9bbfc57529eeb7d0a2a3dc7e20b92bef9d2eb04b32c9a7f0c256a61a88faff5c1df41950aaa946bc748a0 WHIRLPOOL eed9896a75b2765dae03215c34807ed42a9d26828f25d9687983ebbabc1fbf3d757ea8ce4cc805343d1fca0463d8f49b9524175efb2af5cc5d6efc19e0b8e6d4
 DIST winepulse-patches-1.5.25.tar.bz2 46795 SHA256 375c94dc4d12ab6b41da478104a1ca1f9c36d4d7d111f74d005900c8f04e3026 SHA512 1e2f6029cce6feb75fd9f170f0fa791b8b4f5d5e7c852e835c60d6dcb4e3319ed671b9eec2767cde7d8befe96a7fb1970f581efbc2b5d1b6277bb69e7f7e89a3 WHIRLPOOL e2cc043d21a36117a8de69597e61148edbf3b49ede1a95bc196693c47235efbb5a97c7f8964dc4906ece6a982bfce4cb156e4428a2c88c82cfa7cb4e82892503
 EBUILD wine-1.5.19.ebuild 7955 SHA256 5750f951cd68c9065ff55c9f5318bc51aefbc6f70074e20e3d3b41a52777067c SHA512 26c65977de67e559336e9f64f076925a796ca36eb3f0aed85d2c6c4f891ad5258f2269d47ba46e7d001288ead21b890e6b565da569d295cf23f83295cb101941 WHIRLPOOL d08ec95e489fa1b7448d10e487781648746667801a2a3ab752c6e879c1977da29a540c6ee2b415707742ab90111fee3e93eeaa7c903ced8282b4d7405d6a44f9
-EBUILD wine-1.5.20.ebuild 7771 SHA256 8180085145fcf3c43e41786650dfbafeba0d110f98a2d7f88c4d49e4afd783fc SHA512 725567a63c835c927151e753e9d2cdfdf5b2a2792dc73f90f694b44ac478c91867ebce0a42b9c3328746d5017fc5f0df378b53874a7cfdee19bac4b36825c0fa WHIRLPOOL 124df4eac42a5ab07dda6de08ab5ee99e7634977ed6ff86dba978a0dfbcdc534b54098719bdc40f3d3a876559affcf5a2a239dcaac36fe87297d5eb7c482c08a
+EBUILD wine-1.5.20.ebuild 8141 SHA256 7a26a6026067d621288615a17c122cf2e92f7766efd3a278cba157a3311f485f SHA512 d9a5ea63ae1a58f126f177e62d652a0e85749107f4cbbc9f6ec075d2967dd1e571a338e3054b83de192db2db3e5bc1b40aadb8d57019739faf7da2c5743046e5 WHIRLPOOL 5af3567865cb9c1d03efa9e708dff21777f554c3305dbbba9b2e648b1a13a2762459e0607fc7876682b955691063703281c846c338c28b9dfbef64df240f4ce9
 EBUILD wine-1.5.21.ebuild 7760 SHA256 8cd42fd45b023ead2c3dceef11f094b7b83f4c9d1c7a7024311eff464c2132c6 SHA512 ece22c3374560d4b5911604aebdca46e82da9bd90d61a244f34e9c325b1ddaec6c284445076fd8a15339fa4af0ffb25923864c98fa90dcbabdb50a51903b703b WHIRLPOOL bd841b7328845ec1ee7587851cd315852968807a2453709a181f78e1f0c35246bf77794c41f791e883c5dbc2c78aee6641a1fe45a68ce12a2c12d1934dec64ba
 EBUILD wine-1.5.22.ebuild 8148 SHA256 aeb324bdba73ac8627445aa55e23748fc87a8c9094354809e951b3ea7787d48c SHA512 ea44cb155cd23830b1632b16218c5a514e5e4d883f4bb243fe782ff658b3355f34877162cc5da1b751b1d723b896f78b9bfce1bd4c133d5641d7f174857c5c35 WHIRLPOOL e9aa919b596c9f12ae26fb88bc5a1e3587fbd198c9817efdac439f8987623c787f9eef11532b9560f46d6a6572967ed0b522716a48de414a461a4e7d343c993f
 EBUILD wine-1.5.28.ebuild 8877 SHA256 0c644ffb2eed740275ae859eeb3c562b1a24ddce43be71ab21c72f1b3733efe1 SHA512 2c1167ad1b16a6791e3a7877fd365183ded8706a1fcde320dace6dd170e2e1e390b24a4f61ae050d2b0d2fd2d9484caebd39a1e2905996e76a612f344ac9020e WHIRLPOOL 0722de3ebe8e9fc529a9e4d5c74f895bd33721d28dd030ac7057de25c8817ce1892ef47220853e104e2f60f31d0b0d81491d8d5d32fec14c2d7a7c60ba10edf6
diff --git a/app-emulation/wine/wine-1.5.20.ebuild b/app-emulation/wine/wine-1.5.20.ebuild
index 5aacbe0..3e9e481 100644
--- a/app-emulation/wine/wine-1.5.20.ebuild
+++ b/app-emulation/wine/wine-1.5.20.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# 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.20.ebuild,v 1.4 2012/12/31 07:38:44 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.5.20.ebuild,v 1.9 2013/08/05 09:31:06 ssuominen Exp $
 
 EAPI="5"
 
@@ -43,6 +43,7 @@ REQUIRED_USE="elibc_glibc? ( threads )
 RESTRICT="test" #72375
 
 MLIB_DEPS="amd64? (
+	gstreamer? ( app-emulation/emul-linux-x86-gstplugins )
 	truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 )
 	X? (
 		>=app-emulation/emul-linux-x86-xlibs-2.1
@@ -61,7 +62,7 @@ MLIB_DEPS="amd64? (
 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 )
+	ncurses? ( >=sys-libs/ncurses-5.2:= )
 	fontconfig? ( media-libs/fontconfig:= )
 	gphoto2? ( media-libs/libgphoto2:= )
 	openal? ( media-libs/openal:= )
@@ -88,7 +89,7 @@ RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts )
 		virtual/opengl
 	)
 	gsm? ( media-sound/gsm:= )
-	jpeg? ( virtual/jpeg:= )
+	jpeg? ( virtual/jpeg:0= )
 	ldap? ( net-nds/openldap:= )
 	lcms? ( media-libs/lcms:0= )
 	mp3? ( >=media-sound/mpg123-1.5.0 )
@@ -99,8 +100,8 @@ RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts )
 	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:= )
+	ssl? ( dev-libs/openssl:0= )
+	png? ( media-libs/libpng:0= )
 	v4l? ( media-libs/libv4l )
 	!win64? ( ${MLIB_DEPS} )
 	win32? ( ${MLIB_DEPS} )
@@ -122,6 +123,13 @@ DEPEND="${RDEPEND}
 	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 ]] \