Sync package app-emulation/wine with Upstream (Wine-Staging)

Release 1.9.6

app-emulation/wine/Manifest

@@ -37,6 +37,7 @@ DIST wine-staging-1.9.2.tar.gz 9702259 SHA256 67e830b27e1f69cf66cc65bc72e15231fa
 DIST wine-staging-1.9.3.tar.gz 9714022 SHA256 84c98e0fd04a1deb76a40d2d04810421c94b02e2670fec6a8718bb2286fac4b6 SHA512 4e8b5914d1607c8eb51d1da75c69517a9bd85fc8efc8813af400e8713b546ee98df212dc2d9a2da2eb032da0207cea7e873dcd232c97aee485219fc4d579c3eb WHIRLPOOL d0725139df4a60ca3a5d53214587291880886d8dba66bf540d24c5e1bcb60200ea8b76d1cea3f7608a1077c8e5993111c378d5aa8866a0279f3f2dade316e22d
 DIST wine-staging-1.9.4.tar.gz 9719676 SHA256 1b3c6bb3e21e549fb8657cd9a2117946b7e78140b400c614dd41b041b6dc2674 SHA512 2c81b9f0315ed4f68d1874482805c9b6d3f2f9611f6dd1477ad0632d17f66e7f5e75720e5c7cef3a873876541c9d7d212fa8803a57cbec415aca32793a734634 WHIRLPOOL 0a66f53327976dd63532b9350d64461df3dcb0ea2fdc63d3498eac94d92387cf4bd53054c693c4a902f7fbba8ad0f2fdf59682e8622f3920a9a426344c656f54
 DIST wine-staging-1.9.5.tar.gz 9889302 SHA256 e12c5fb741e6c5b55b99c37d6bba1746b0f40317f27198406e63f260ede3600c SHA512 aaaf08449e956f5f2b42440f8becf7233a22f2f807041b5524fae3c25c80078b86a84e6000803e014a5d2fc089e3df78cb66f0d1fe35675ae0f4ffdfa7ba3f10 WHIRLPOOL 692da1ec383b7efbcb12c8fa4078ed9b4143eb101baa06523f5bd85c749f0b87fe9a550e4d60e3c33e3d896782c9bc957f61171d01dcadbc8847ecbbc57c40ff
+DIST wine-staging-1.9.6.tar.gz 9959130 SHA256 e9eb9990aa7f3f07931bfe158c883ebad595e58239855c7f6c01758b4d195db9 SHA512 508b5cd553a8b4a293e9250af670de693992c6f6e71e9e3759408b1e8745985030fbcb78c83ae6669e73e48caf95c3a6f0c92da0a96791912d7e6c4d29a26bd2 WHIRLPOOL 2ebc3ca7ea38d2fda310567083f28b76c4f0120dce659152ccacf95eb07de3dfe8950eb9b306b1a91b30ded8e3914f5852f7928e735659c2b02eb50d82fe0fca
 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
 DIST wine_gecko-2.44-x86.msi 34832896 SHA256 77a64ad17571b3a00386a88b9b1b1ea4b7e759061675568bee0ec238fb456d39 SHA512 6c3b6ccbab0081d8ab188a9a031050ca8fd7ef8f1de0efa3a57569d6166397f91bf13037402e3437cc8cfc4fc25e7c2f8be32f66500306d567055e89aae0797d WHIRLPOOL 59c269a6d6e3ba829bd24cf81eba991f91bb0c1995a1841b7e548593f544088959093ba29eb83b53f38f77e71780d8288f0b12a212862af1374f954d61f24999
@@ -52,7 +53,7 @@ EBUILD wine-1.9.1.ebuild 17536 SHA256 ec7ca55270e4a41e212c6861950f50345aa01cb7a9
 EBUILD wine-1.9.2.ebuild 16929 SHA256 dcf196b11288aef5872341d908b755053a3311aba17fbe973516377d292bc162 SHA512 408fd90d3a16c6b9b5bb9fe5c0c0b559b72147acae49a579fb801a83c0e0cd7adf4e2ebb966c689df81f440f95fa49c5a4554d3c403678d4f093dee25a1b1eb3 WHIRLPOOL 23b4de576ce2ddefbb260e552d58e4b21c8acf17dd9a10b421842f89233c3d806d50eaeeb93ae0bc3a3cec4e2866ec22d29b18d08bc2c7eacea50f3ed094db12
 EBUILD wine-1.9.3.ebuild 16929 SHA256 d613a3504d7e5fe8617be4649355da9981e1aade5decde7ef88791ab829b4025 SHA512 86b961e626f470778d2f82778ad043e61d1bd55333275ee9cb955dededb4647cbe2cc2d0d705b228d9e4b19ada072f2af0db0f37b90b7b2a2fd3b77f39d7fbce WHIRLPOOL f4db2a563f05ba49875b5e1b03e0fecc7f934b080121e4f5d36fad4904d9ac69249b5be3714c303b5056eb4348970e1f82dc7ac83d2d36441c195755833cbe14
 EBUILD wine-1.9.4.ebuild 16929 SHA256 d613a3504d7e5fe8617be4649355da9981e1aade5decde7ef88791ab829b4025 SHA512 86b961e626f470778d2f82778ad043e61d1bd55333275ee9cb955dededb4647cbe2cc2d0d705b228d9e4b19ada072f2af0db0f37b90b7b2a2fd3b77f39d7fbce WHIRLPOOL f4db2a563f05ba49875b5e1b03e0fecc7f934b080121e4f5d36fad4904d9ac69249b5be3714c303b5056eb4348970e1f82dc7ac83d2d36441c195755833cbe14
-EBUILD wine-1.9.5.ebuild 17080 SHA256 3ff121807c897fc7756a6f6e27493f3d7042a15bb7f855b7e43709c59e77bc2f SHA512 74d3baf03003f3dca23d7627d3ad80689e1e356ac9fedd0b7fd2dc21f00d31d6c18f7d7e2c2ee333e723ea0e91a7c0ca5b83ec561dc0f3e87587cd0c6e90eebc WHIRLPOOL b3553da70b6a3248eca0d1a056733178b2c93af2936969abd05bfdb909a926b7f7ea118d4d0c4734032640339aa0f498b1b6444fd635b8919b8cb597902cfa0b
-EBUILD wine-1.9.6.ebuild 14501 SHA256 6ab89716c66802bf03dc33d1f273476ba9c47932b687c32d4d9ed0d794ec68e5 SHA512 2c576099df0cc7f1748ca755d1d9fe453c1b352d5fb7a16e9db0db65a46ce7b8c7e01b99f36c672402349ec51ab44c0640ce3a08320a294479e7c01c8fd9a950 WHIRLPOOL 84e642263dfe91e7a62ab3dd6e48e91a68284cad73d8571768323e37b2183ec1f8da450259263308b89c3c7992b9e43dd11b653d07456b221c78d97e380db389
-EBUILD wine-9999.ebuild 16905 SHA256 d5ed636f5c44ae1f2752b879e6f4ef93372f58808833c722bb34dd6ff114caca SHA512 bb7421f9e72ec181b2403c342b3667e21cc2128e1509c6305516724cb56e524a66a15721e6442f0d7a31b2bb113425f1d799dbd6eb9127b41784c4cbe166a46b WHIRLPOOL 8e77ddfdca5ea73860bccb42b932d7a6455003b69608859ec6543eb349b8c24ba7b03ac733a75bcf51598b24c83fee5c7359bfd24636a4b70eefeb0844861353
+EBUILD wine-1.9.5.ebuild 17013 SHA256 57a25b09b419f71a01d9e57283bf939418518645ebd9434615daecb73efdf07a SHA512 4087da632c1207c9b8891e2761fcc3704e555a7b540f1c014109afcf09963c9c17fc555496d5cfe69e8846fbd027c3ea97522b533091db4a19a17753791f0a1d WHIRLPOOL c8880692efb271b502e188316b034e0113d8aac2b87c70d88fae6c5a7e9c459839ad4d8d26914766a6cae3058e949561a4db0380a4cc02a1569e4d572df221c1
+EBUILD wine-1.9.6.ebuild 16927 SHA256 b87279230ca66a9e8e961e1ce501bc06d2ae5897c4072dda10e9fa653c2a7a9a SHA512 9544ba0083f4976d9c6ece65f9ba12e9c64f542fef16bf1e331ef4f0427b2126964f1afc98abdbeeb95f44406a7702ad87dbc0f098d90065f2510f905545345e WHIRLPOOL d9001e3261b4cd4f1d337d32a28dcece327f706c23cd45d359a9459db573aa09367d65bb0710adaf11b9980c12d55528325de5ed21af36771c1edf2e28b60c30
+EBUILD wine-9999.ebuild 16927 SHA256 b87279230ca66a9e8e961e1ce501bc06d2ae5897c4072dda10e9fa653c2a7a9a SHA512 9544ba0083f4976d9c6ece65f9ba12e9c64f542fef16bf1e331ef4f0427b2126964f1afc98abdbeeb95f44406a7702ad87dbc0f098d90065f2510f905545345e WHIRLPOOL d9001e3261b4cd4f1d337d32a28dcece327f706c23cd45d359a9459db573aa09367d65bb0710adaf11b9980c12d55528325de5ed21af36771c1edf2e28b60c30
 MISC metadata.xml 3055 SHA256 8d5075f16300008a170fe765e488f3018884395f5c95698f06e3781d357fe72e SHA512 aa84d75b1147e49962b5017531a94ee5d6b358971c90fc3752360ae8a22fa893096134bb1c745343f622e18aecbefc6fa71514e61e4644dd5eceadd8f564e6fc WHIRLPOOL 497239b6e55435ac3f01ed2f0a03c38e6299506ba47ab68792f996033c84aa137bd8f8857543e99f412f492385b7080c0d682b525a1f6b047451e2165bdd35c3

app-emulation/wine/tools/wine-patch.sh

@@ -6,7 +6,7 @@ script_name=$( basename "${script_path}" )
 
 # Global variables
 new_wine_versions="1.8_rc1 1.8_rc2 1.8_rc3 1.8_rc4 1.8.1 1.9.0 1.9.1 1.9.2 1.9.3 1.9.4 1.9.5 1.9.6 9999"
-wine_staging_unsupported_versions="1.8.1 1.9.6"
+wine_staging_unsupported_versions="1.8.1"
 legacy_gstreamer_wine_versions="1.6.* 1.7.* 1.8* 1.9.1"
 
 # Rename and patch all the stock mesa ebuild files

app-emulation/wine/wine-1.9.5.ebuild

@@ -61,6 +61,7 @@ IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +fon
 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 )
@@ -300,9 +301,6 @@ src_prepare() {
 		use pipelight || STAGING_EXCLUDE="${STAGING_EXCLUDE} -W Pipelight"
 		use nls || STAGING_EXCLUDE="${STAGING_EXCLUDE} -W makefiles-Disabled_Rules" #577198
 
-		#577198 1.9.5 only
-		STAGING_EXCLUDE="${STAGING_EXCLUDE} -W makefiles-Disabled_Rules"
-
 		# 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"
 		(

app-emulation/wine/wine-1.9.6.ebuild

@@ -35,6 +35,8 @@ fi
 
 GV="2.44"
 MV="4.6.0"
+STAGING_P="wine-staging-${MY_PV}"
+STAGING_DIR="${WORKDIR}/${STAGING_P}"
 WINE_GENTOO="wine-gentoo-2015.03.07"
 DESCRIPTION="Free implementation of Windows(tm) on Unix"
 HOMEPAGE="http://www.winehq.org/"
@@ -46,13 +48,23 @@ SRC_URI="${SRC_URI}
 	mono? ( https://dl.winehq.org/wine/wine-mono/${MV}/wine-mono-${MV}.msi )
 	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"
+else
+	SRC_URI="${SRC_URI}
+	staging? ( https://github.com/wine-compholio/wine-staging/archive/v${MY_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 +png prelink pulseaudio +realtime +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 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
@@ -97,6 +109,7 @@ COMMON_DEPEND="
 	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}]
@@ -105,6 +118,7 @@ COMMON_DEPEND="
 	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(-)]
@@ -126,13 +140,15 @@ COMMON_DEPEND="
 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}
+	staging? ( dev-lang/perl dev-perl/XML-Simple )
 	X? (
 		x11-proto/inputproto
 		x11-proto/xextproto
@@ -218,14 +234,29 @@ pkg_pretend() {
 pkg_setup() {
 	wine_build_environment_setup_tests || die
 
-	if [[ ${PV} == "9999" ]] && [[ -z "${EGIT_BRANCH}" ]] && [[ -z "${EGIT_COMMIT}" ]]; then
-		einfo "By default the Wine git tree branch master will be used."
+	if [[ ${PV} == "9999" ]]; then
+		if use staging; then
+			ewarn "You have enabled a live ebuild of Wine with USE +staging."
+			ewarn "All git branch and commit references will link to the Wine-Staging git tree."
+		fi
+		if [[ -z "${EGIT_BRANCH}" ]] && [[ -z "${EGIT_COMMIT}" ]]; then
+			use staging && einfo "By default the Wine-Staging git tree branch master will be used."
+			use staging || einfo "By default the Wine git tree branch master will be used."
+		fi
 	fi
 }
 
 src_unpack() {
 	if [[ ${PV} == "9999" ]] ; then
+		# Reference either Wine or Wine Staging git branch (depending on +staging use flag)
 		EGIT_BRANCH=${EGIT_BRANCH:-master}
+		if use staging; then
+			EGIT_REPO_URI=${STAGING_EGIT_REPO_URI} EGIT_CHECKOUT_DIR=${STAGING_DIR} git-r3_src_unpack
+			local WINE_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit)
+			[[ ! ${WINE_COMMIT} =~ [[:xdigit:]]{40} ]] && die "Failed to get Wine git commit corresponding to Wine-Staging git commit ${EGIT_VERSION}."
+			einfo "Building Wine commit ${WINE_COMMIT} referenced by Wine-Staging commit ${EGIT_VERSION} ..."
+			EGIT_COMMIT="${WINE_COMMIT}"
+		fi
 		EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack
 		if use gstreamer && grep -q "gstreamer-0.10" "${S}"/configure &>/dev/null ; then
 			local GSTREAMER_COMMIT="e8311270ab7e01b8c58ec615f039335bd166882a"
@@ -235,6 +266,7 @@ src_unpack() {
 		fi
 	else
 		unpack ${P}.tar.bz2
+		use staging && unpack "${STAGING_P}.tar.gz"
 	fi
 
 	unpack "${WINE_GENTOO}.tar.bz2"
@@ -261,8 +293,25 @@ src_prepare() {
 		)
 		eend $?
 	fi
+	if use staging; then
+		ewarn "Applying the Wine-Staging patchset. Any bug reports to the"
+		ewarn "Wine bugzilla should explicitly state that staging was used."
+
+		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" || die "Failed to apply Wine-Staging patches."
+		)
+		eend $?
+	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
@@ -272,6 +321,7 @@ src_prepare() {
 		sed -i '/^MimeType/d' loader/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
@@ -326,6 +376,11 @@ multilib_src_configure() {
 		$(use_with xml xslt)
 	)
 
+	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

app-emulation/wine/wine-9999.ebuild

@@ -61,6 +61,7 @@ IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +fon
 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 )