app-emulation/wine: Fix staging gtk theming dependency and adjust syntax

Package-Manager: portage-2.3.0

18 files changed, 826 insertions, 359 deletions

diff --git a/app-emulation/wine/metadata.xml b/app-emulation/wine/metadata.xml
index aa61670c51b9..02c8686f56b4 100644
--- a/app-emulation/wine/metadata.xml
+++ b/app-emulation/wine/metadata.xml
@@ -22,8 +22,7 @@ Think of Wine as a compatibility layer for running Windows programs. Wine does n
 			This patch may break some applications.</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="gstreamer">Use <pkg>media-libs/gstreamer</pkg> to provide DirectShow functionality;
-			For versions before wine-1.9.2, uses experimental patch which may break some apps</flag>
+		<flag name="gstreamer">Use <pkg>media-libs/gstreamer</pkg> to provide DirectShow functionality;</flag>
 		<flag name="mono">Add support for .NET using Wine's Mono add-on</flag>
 		<flag name="netapi">Use libnetapi from <pkg>net-fs/samba</pkg> to support Windows networks in netapi32.dll</flag>
 		<flag name="opencl">Enable OpenCL support</flag>
@@ -39,8 +38,8 @@ Think of Wine as a compatibility layer for running Windows programs. Wine does n
 		<flag name="samba">Add support for NTLM auth. see
 		http://wiki.winehq.org/NtlmAuthSetupGuide and
 		http://wiki.winehq.org/NtlmSigningAndSealing</flag>
-		<flag name="staging">Apply Wine-Staging patches for advanced feature support that haven't made it into upstream Wine yet
-			For versions before wine-1.8, this patchset is unofficial.</flag>
+		<flag name="staging">Apply Wine-Staging patches for advanced feature support that haven't made it into upstream Wine yet</flag>
+		<flag name="themes">Support GTK+:3 window theming through Wine-Staging</flag>
 	</use>
 	<upstream>
 		<remote-id type="github">wine-compholio/wine-staging</remote-id>
diff --git a/app-emulation/wine/wine-1.8-r2.ebuild b/app-emulation/wine/wine-1.8-r3.ebuild
index 60871af5fe0f..ad22c0939c77 100644
--- a/app-emulation/wine/wine-1.8-r2.ebuild
+++ b/app-emulation/wine/wine-1.8-r3.ebuild
@@ -58,7 +58,7 @@ 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 kernel_FreeBSD +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"
+IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +fontconfig +gecko gphoto2 gsm gstreamer +jpeg kernel_FreeBSD +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 themes +threads +truetype +udisks v4l vaapi +X +xcomposite xinerama +xml"
 REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
 	X? ( truetype )
 	elibc_glibc? ( threads )
@@ -67,6 +67,7 @@ REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
 	pipelight? ( staging )
 	s3tc? ( staging )
 	test? ( abi_x86_32 )
+	themes? ( staging )
 	vaapi? ( staging )" # osmesa-opengl #286560 # X-truetype #551124
 
 # FIXME: the test suite is unsuitable for us; many tests require net access
@@ -112,6 +113,11 @@ COMMON_DEPEND="
 	scanner? ( media-gfx/sane-backends:=[${MULTILIB_USEDEP}] )
 	ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] )
 	staging? ( sys-apps/attr[${MULTILIB_USEDEP}] )
+	themes? (
+		dev-libs/glib:2[${MULTILIB_USEDEP}]
+		x11-libs/cairo[${MULTILIB_USEDEP}]
+		x11-libs/gtk+:3[${MULTILIB_USEDEP}]
+	)
 	truetype? ( >=media-libs/freetype-2.0.0[${MULTILIB_USEDEP}] )
 	udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
 	v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
@@ -189,8 +195,7 @@ wine_compiler_check() {
 			$(tc-getCC) -O2 "${FILESDIR}"/pr66838.c -o "${T}"/pr66838 || die
 			# Run in subshell to prevent "Aborted" message
 			( "${T}"/pr66838 || false ) >/dev/null 2>&1
-			eend $?
-			if [[ $? -ne 0 ]] ; then
+			if ! eend $?; then
 				eerror "64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0"
 				eerror "due to compiler bugs; please re-emerge the latest gcc-5.2.x ebuild,"
 				eerror "or use gcc-config to select a different compiler version."
@@ -203,9 +208,8 @@ wine_compiler_check() {
 		if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then
 			ebegin "Checking for gcc-5-3 stack realignment compiler bug"
 			# Compile in subshell to prevent "Aborted" message
-			( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${FILESDIR}"/pr69140.c -o "${T}"/pr69140 || false ) >/dev/null 2>&1
-			eend $?
-			if [[ $? -ne 0 ]] ; then
+			( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${FILESDIR}"/pr69140.c -o "${T}"/pr69140 ) >/dev/null 2>&1
+			if ! eend $?; then
 				eerror "Wine cannot be built with this version of gcc-5.3"
 				eerror "due to compiler bugs; please re-emerge the latest gcc-5.3.x ebuild,"
 				eerror "or use gcc-config to select a different compiler version."
@@ -221,8 +225,7 @@ wine_compiler_check() {
 		ebegin "Checking for 64-bit compiler with builtin_ms_va_list support"
 		# Compile in subshell to prevent "Aborted" message
 		( $(tc-getCC) -O2 "${FILESDIR}"/builtin_ms_va_list.c -o "${T}"/builtin_ms_va_list >/dev/null 2>&1)
-		eend $?
-		if [[ $? -ne 0 ]]; then
+		if ! eend $?; then
 			eerror "This version of $(tc-getCC) does not support builtin_ms_va_list, can't enable 64-bit wine"
 			eerror
 			eerror "You need gcc-4.4+ or clang 3.8+ to build 64-bit wine"
@@ -235,7 +238,7 @@ wine_compiler_check() {
 wine_build_environment_check() {
 	[[ ${MERGE_TYPE} = "binary" ]] && return 0
 
-	if use abi_x86_32 && use opencl && [[ x$(eselect opencl show 2> /dev/null) = "xintel" ]]; then
+	if use abi_x86_32 && use opencl && [[ "$(eselect opencl show 2> /dev/null)" == "intel" ]]; then
 		eerror "You cannot build wine with USE=opencl because intel-ocl-sdk is 64-bit only."
 		eerror "See https://bugs.gentoo.org/487864 for more details."
 		eerror
@@ -249,8 +252,7 @@ pkg_pretend() {
 
 	# Verify OSS support
 	if use oss && ! use kernel_FreeBSD; then
-		local oss_vers=$(best_version media-sound/oss)
-		if [[ -z ${oss_vers} ]] || ! version_is_at_least "4" ${oss_vers}; then
+		if ! has_version ">=media-sound/oss-4"; then
 			eerror "You cannot build wine with USE=oss without having support from a"
 			eerror "FreeBSD kernel or >=media-sound/oss-4 (only available through external repos)"
 			eerror
@@ -276,10 +278,8 @@ src_unpack() {
 		if use staging; then
 			local WINE_COMMIT=${EGIT_VERSION}
 
-			EGIT_REPO_URI=${STAGING_EGIT_REPO_URI}
-			unset ${PN}_LIVE_{REPO,BRANCH,COMMIT} EGIT_COMMIT;
-
-			EGIT_CHECKOUT_DIR=${STAGING_DIR} git-r3_src_unpack
+			git-r3_fetch "${STAGING_EGIT_REPO_URI}"
+			git-r3_checkout "${STAGING_EGIT_REPO_URI}" "${STAGING_DIR}"
 
 			local STAGING_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die
 
@@ -289,13 +289,9 @@ src_unpack() {
 				einfo "Example: EGIT_COMMIT=${STAGING_COMMIT} emerge -1 wine"
 			fi
 		fi
-	else
-		unpack ${P}.tar.bz2
-		use staging && unpack "${STAGING_P}.tar.gz"
 	fi
 
-	unpack "${WINE_GENTOO}.tar.bz2"
-	unpack "${GST_P}.patch.bz2"
+	default
 
 	l10n_find_plocales_changes "${S}/po" "" ".po"
 }
@@ -325,7 +321,7 @@ src_prepare() {
 			cd "${STAGING_DIR}/patches"
 			source "${STAGING_DIR}/patches/patchinstall.sh"
 		)
-		eend $?
+		eend $? || die "Failed to apply Wine-Staging patches"
 	fi
 
 	default
@@ -398,6 +394,7 @@ multilib_src_configure() {
 
 	use staging && myconf+=(
 		--with-xattr
+		$(use_with themes gtk3)
 		$(use_with vaapi va)
 	)
 
diff --git a/app-emulation/wine/wine-1.8.1-r2.ebuild b/app-emulation/wine/wine-1.8.1-r3.ebuild
index 79bcfa04127b..56ea43cbd28a 100644
--- a/app-emulation/wine/wine-1.8.1-r2.ebuild
+++ b/app-emulation/wine/wine-1.8.1-r3.ebuild
@@ -59,7 +59,7 @@ 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 kernel_FreeBSD +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"
+IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +fontconfig +gecko gphoto2 gsm gstreamer +jpeg kernel_FreeBSD +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 themes +threads +truetype +udisks v4l vaapi +X +xcomposite xinerama +xml"
 REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
 	X? ( truetype )
 	elibc_glibc? ( threads )
@@ -68,6 +68,7 @@ REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
 	pipelight? ( staging )
 	s3tc? ( staging )
 	test? ( abi_x86_32 )
+	themes? ( staging )
 	vaapi? ( staging )" # osmesa-opengl #286560 # X-truetype #551124
 
 # FIXME: the test suite is unsuitable for us; many tests require net access
@@ -113,6 +114,11 @@ COMMON_DEPEND="
 	scanner? ( media-gfx/sane-backends:=[${MULTILIB_USEDEP}] )
 	ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] )
 	staging? ( sys-apps/attr[${MULTILIB_USEDEP}] )
+	themes? (
+		dev-libs/glib:2[${MULTILIB_USEDEP}]
+		x11-libs/cairo[${MULTILIB_USEDEP}]
+		x11-libs/gtk+:3[${MULTILIB_USEDEP}]
+	)
 	truetype? ( >=media-libs/freetype-2.0.0[${MULTILIB_USEDEP}] )
 	udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
 	v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
@@ -190,8 +196,7 @@ wine_compiler_check() {
 			$(tc-getCC) -O2 "${FILESDIR}"/pr66838.c -o "${T}"/pr66838 || die
 			# Run in subshell to prevent "Aborted" message
 			( "${T}"/pr66838 || false ) >/dev/null 2>&1
-			eend $?
-			if [[ $? -ne 0 ]] ; then
+			if ! eend $?; then
 				eerror "64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0"
 				eerror "due to compiler bugs; please re-emerge the latest gcc-5.2.x ebuild,"
 				eerror "or use gcc-config to select a different compiler version."
@@ -204,9 +209,8 @@ wine_compiler_check() {
 		if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then
 			ebegin "Checking for gcc-5-3 stack realignment compiler bug"
 			# Compile in subshell to prevent "Aborted" message
-			( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${FILESDIR}"/pr69140.c -o "${T}"/pr69140 || false ) >/dev/null 2>&1
-			eend $?
-			if [[ $? -ne 0 ]] ; then
+			( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${FILESDIR}"/pr69140.c -o "${T}"/pr69140 ) >/dev/null 2>&1
+			if ! eend $?; then
 				eerror "Wine cannot be built with this version of gcc-5.3"
 				eerror "due to compiler bugs; please re-emerge the latest gcc-5.3.x ebuild,"
 				eerror "or use gcc-config to select a different compiler version."
@@ -222,8 +226,7 @@ wine_compiler_check() {
 		ebegin "Checking for 64-bit compiler with builtin_ms_va_list support"
 		# Compile in subshell to prevent "Aborted" message
 		( $(tc-getCC) -O2 "${FILESDIR}"/builtin_ms_va_list.c -o "${T}"/builtin_ms_va_list >/dev/null 2>&1)
-		eend $?
-		if [[ $? -ne 0 ]]; then
+		if ! eend $?; then
 			eerror "This version of $(tc-getCC) does not support builtin_ms_va_list, can't enable 64-bit wine"
 			eerror
 			eerror "You need gcc-4.4+ or clang 3.8+ to build 64-bit wine"
@@ -236,7 +239,7 @@ wine_compiler_check() {
 wine_build_environment_check() {
 	[[ ${MERGE_TYPE} = "binary" ]] && return 0
 
-	if use abi_x86_32 && use opencl && [[ x$(eselect opencl show 2> /dev/null) = "xintel" ]]; then
+	if use abi_x86_32 && use opencl && [[ "$(eselect opencl show 2> /dev/null)" == "intel" ]]; then
 		eerror "You cannot build wine with USE=opencl because intel-ocl-sdk is 64-bit only."
 		eerror "See https://bugs.gentoo.org/487864 for more details."
 		eerror
@@ -250,8 +253,7 @@ pkg_pretend() {
 
 	# Verify OSS support
 	if use oss && ! use kernel_FreeBSD; then
-		local oss_vers=$(best_version media-sound/oss)
-		if [[ -z ${oss_vers} ]] || ! version_is_at_least "4" ${oss_vers}; then
+		if ! has_version ">=media-sound/oss-4"; then
 			eerror "You cannot build wine with USE=oss without having support from a"
 			eerror "FreeBSD kernel or >=media-sound/oss-4 (only available through external repos)"
 			eerror
@@ -277,10 +279,8 @@ src_unpack() {
 		if use staging; then
 			local WINE_COMMIT=${EGIT_VERSION}
 
-			EGIT_REPO_URI=${STAGING_EGIT_REPO_URI}
-			unset ${PN}_LIVE_{REPO,BRANCH,COMMIT} EGIT_COMMIT;
-
-			EGIT_CHECKOUT_DIR=${STAGING_DIR} git-r3_src_unpack
+			git-r3_fetch "${STAGING_EGIT_REPO_URI}"
+			git-r3_checkout "${STAGING_EGIT_REPO_URI}" "${STAGING_DIR}"
 
 			local STAGING_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die
 
@@ -290,13 +290,9 @@ src_unpack() {
 				einfo "Example: EGIT_COMMIT=${STAGING_COMMIT} emerge -1 wine"
 			fi
 		fi
-	else
-		unpack ${P}.tar.bz2
-		use staging && unpack "${STAGING_P}.tar.gz"
 	fi
 
-	unpack "${WINE_GENTOO}.tar.bz2"
-	unpack "${GST_P}.patch.bz2"
+	default
 
 	l10n_find_plocales_changes "${S}/po" "" ".po"
 }
@@ -326,7 +322,7 @@ src_prepare() {
 			cd "${STAGING_DIR}/patches"
 			source "${STAGING_DIR}/patches/patchinstall.sh"
 		)
-		eend $?
+		eend $? || die "Failed to apply Wine-Staging patches"
 
 		# To differentiate unofficial staging releases
 		if [[ ! -z ${SUFFIX} ]]; then
@@ -404,6 +400,7 @@ multilib_src_configure() {
 
 	use staging && myconf+=(
 		--with-xattr
+		$(use_with themes gtk3)
 		$(use_with vaapi va)
 	)
 
diff --git a/app-emulation/wine/wine-1.8.2-r1.ebuild b/app-emulation/wine/wine-1.8.2-r2.ebuild
index 772d165365dd..22769236e171 100644
--- a/app-emulation/wine/wine-1.8.2-r1.ebuild
+++ b/app-emulation/wine/wine-1.8.2-r2.ebuild
@@ -59,7 +59,7 @@ 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 kernel_FreeBSD +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"
+IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +fontconfig +gecko gphoto2 gsm gstreamer +jpeg kernel_FreeBSD +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 themes +threads +truetype +udisks v4l vaapi +X +xcomposite xinerama +xml"
 REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
 	X? ( truetype )
 	elibc_glibc? ( threads )
@@ -68,6 +68,7 @@ REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
 	pipelight? ( staging )
 	s3tc? ( staging )
 	test? ( abi_x86_32 )
+	themes? ( staging )
 	vaapi? ( staging )" # osmesa-opengl #286560 # X-truetype #551124
 
 # FIXME: the test suite is unsuitable for us; many tests require net access
@@ -113,6 +114,11 @@ COMMON_DEPEND="
 	scanner? ( media-gfx/sane-backends:=[${MULTILIB_USEDEP}] )
 	ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] )
 	staging? ( sys-apps/attr[${MULTILIB_USEDEP}] )
+	themes? (
+		dev-libs/glib:2[${MULTILIB_USEDEP}]
+		x11-libs/cairo[${MULTILIB_USEDEP}]
+		x11-libs/gtk+:3[${MULTILIB_USEDEP}]
+	)
 	truetype? ( >=media-libs/freetype-2.0.0[${MULTILIB_USEDEP}] )
 	udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
 	v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
@@ -190,8 +196,7 @@ wine_compiler_check() {
 			$(tc-getCC) -O2 "${FILESDIR}"/pr66838.c -o "${T}"/pr66838 || die
 			# Run in subshell to prevent "Aborted" message
 			( "${T}"/pr66838 || false ) >/dev/null 2>&1
-			eend $?
-			if [[ $? -ne 0 ]] ; then
+			if ! eend $?; then
 				eerror "64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0"
 				eerror "due to compiler bugs; please re-emerge the latest gcc-5.2.x ebuild,"
 				eerror "or use gcc-config to select a different compiler version."
@@ -204,9 +209,8 @@ wine_compiler_check() {
 		if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then
 			ebegin "Checking for gcc-5-3 stack realignment compiler bug"
 			# Compile in subshell to prevent "Aborted" message
-			( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${FILESDIR}"/pr69140.c -o "${T}"/pr69140 || false ) >/dev/null 2>&1
-			eend $?
-			if [[ $? -ne 0 ]] ; then
+			( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${FILESDIR}"/pr69140.c -o "${T}"/pr69140 ) >/dev/null 2>&1
+			if ! eend $?; then
 				eerror "Wine cannot be built with this version of gcc-5.3"
 				eerror "due to compiler bugs; please re-emerge the latest gcc-5.3.x ebuild,"
 				eerror "or use gcc-config to select a different compiler version."
@@ -222,8 +226,7 @@ wine_compiler_check() {
 		ebegin "Checking for 64-bit compiler with builtin_ms_va_list support"
 		# Compile in subshell to prevent "Aborted" message
 		( $(tc-getCC) -O2 "${FILESDIR}"/builtin_ms_va_list.c -o "${T}"/builtin_ms_va_list >/dev/null 2>&1)
-		eend $?
-		if [[ $? -ne 0 ]]; then
+		if ! eend $?; then
 			eerror "This version of $(tc-getCC) does not support builtin_ms_va_list, can't enable 64-bit wine"
 			eerror
 			eerror "You need gcc-4.4+ or clang 3.8+ to build 64-bit wine"
@@ -236,7 +239,7 @@ wine_compiler_check() {
 wine_build_environment_check() {
 	[[ ${MERGE_TYPE} = "binary" ]] && return 0
 
-	if use abi_x86_32 && use opencl && [[ x$(eselect opencl show 2> /dev/null) = "xintel" ]]; then
+	if use abi_x86_32 && use opencl && [[ "$(eselect opencl show 2> /dev/null)" == "intel" ]]; then
 		eerror "You cannot build wine with USE=opencl because intel-ocl-sdk is 64-bit only."
 		eerror "See https://bugs.gentoo.org/487864 for more details."
 		eerror
@@ -250,8 +253,7 @@ pkg_pretend() {
 
 	# Verify OSS support
 	if use oss && ! use kernel_FreeBSD; then
-		local oss_vers=$(best_version media-sound/oss)
-		if [[ -z ${oss_vers} ]] || ! version_is_at_least "4" ${oss_vers}; then
+		if ! has_version ">=media-sound/oss-4"; then
 			eerror "You cannot build wine with USE=oss without having support from a"
 			eerror "FreeBSD kernel or >=media-sound/oss-4 (only available through external repos)"
 			eerror
@@ -277,10 +279,8 @@ src_unpack() {
 		if use staging; then
 			local WINE_COMMIT=${EGIT_VERSION}
 
-			EGIT_REPO_URI=${STAGING_EGIT_REPO_URI}
-			unset ${PN}_LIVE_{REPO,BRANCH,COMMIT} EGIT_COMMIT;
-
-			EGIT_CHECKOUT_DIR=${STAGING_DIR} git-r3_src_unpack
+			git-r3_fetch "${STAGING_EGIT_REPO_URI}"
+			git-r3_checkout "${STAGING_EGIT_REPO_URI}" "${STAGING_DIR}"
 
 			local STAGING_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die
 
@@ -290,13 +290,9 @@ src_unpack() {
 				einfo "Example: EGIT_COMMIT=${STAGING_COMMIT} emerge -1 wine"
 			fi
 		fi
-	else
-		unpack ${P}.tar.bz2
-		use staging && unpack "${STAGING_P}.tar.gz"
 	fi
 
-	unpack "${WINE_GENTOO}.tar.bz2"
-	unpack "${GST_P}.patch.bz2"
+	default
 
 	l10n_find_plocales_changes "${S}/po" "" ".po"
 }
@@ -326,7 +322,7 @@ src_prepare() {
 			cd "${STAGING_DIR}/patches"
 			source "${STAGING_DIR}/patches/patchinstall.sh"
 		)
-		eend $?
+		eend $? || die "Failed to apply Wine-Staging patches"
 
 		# To differentiate unofficial staging releases
 		if [[ ! -z ${SUFFIX} ]]; then
@@ -404,6 +400,7 @@ multilib_src_configure() {
 
 	use staging && myconf+=(
 		--with-xattr
+		$(use_with themes gtk3)
 		$(use_with vaapi va)
 	)
 
diff --git a/app-emulation/wine/wine-1.8.3-r1.ebuild b/app-emulation/wine/wine-1.8.3-r1.ebuild
new file mode 100644
index 000000000000..8ef5cc90c0b2
--- /dev/null
+++ b/app-emulation/wine/wine-1.8.3-r1.ebuild
@@ -0,0 +1,519 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+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 eutils fdo-mime flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx versionator
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="git://source.winehq.org/git/wine.git http://source.winehq.org/git/wine.git"
+	EGIT_BRANCH="master"
+	inherit git-r3
+	SRC_URI=""
+	#KEYWORDS=""
+else
+	MAJOR_V=$(get_version_component_range 1-2)
+	SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}/${P}.tar.bz2"
+	KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
+fi
+
+VANILLA_GV="2.40"
+VANILLA_MV="4.5.6"
+STAGING_GV="2.40"
+STAGING_MV="4.5.6"
+[[ ${MAJOR_V} == "1.8" ]] && SUFFIX="-unofficial"
+STAGING_P="wine-staging-${PV}"
+STAGING_DIR="${WORKDIR}/${STAGING_P}${SUFFIX}"
+WINE_GENTOO="wine-gentoo-2015.03.07"
+GST_P="wine-1.8-gstreamer-1.0"
+DESCRIPTION="Free implementation of Windows(tm) on Unix"
+HOMEPAGE="http://www.winehq.org/"
+SRC_URI="${SRC_URI}
+	!staging? (
+		gecko? (
+			abi_x86_32? ( https://dl.winehq.org/wine/wine-gecko/${VANILLA_GV}/wine_gecko-${VANILLA_GV}-x86.msi )
+			abi_x86_64? ( https://dl.winehq.org/wine/wine-gecko/${VANILLA_GV}/wine_gecko-${VANILLA_GV}-x86_64.msi )
+		)
+		mono? ( https://dl.winehq.org/wine/wine-mono/${VANILLA_MV}/wine-mono-${VANILLA_MV}.msi )
+	)
+	staging? (
+		gecko? (
+			abi_x86_32? ( https://dl.winehq.org/wine/wine-gecko/${STAGING_GV}/wine_gecko-${STAGING_GV}-x86.msi )
+			abi_x86_64? ( https://dl.winehq.org/wine/wine-gecko/${STAGING_GV}/wine_gecko-${STAGING_GV}-x86_64.msi )
+		)
+		mono? ( https://dl.winehq.org/wine/wine-mono/${STAGING_MV}/wine-mono-${STAGING_MV}.msi )
+	)
+	https://dev.gentoo.org/~np-hardass/distfiles/${PN}/${GST_P}.patch.bz2
+	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${PV}${SUFFIX}.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 kernel_FreeBSD +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 themes +threads +truetype +udisks v4l vaapi +X +xcomposite xinerama +xml"
+REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
+	X? ( truetype )
+	elibc_glibc? ( threads )
+	mono? ( abi_x86_32 )
+	osmesa? ( opengl )
+	pipelight? ( staging )
+	s3tc? ( staging )
+	test? ( abi_x86_32 )
+	themes? ( staging )
+	vaapi? ( staging )" # osmesa-opengl #286560 # X-truetype #551124
+
+# FIXME: the test suite is unsuitable for us; many tests require net access
+# or fail due to Xvfb's opengl limitations.
+RESTRICT="test"
+
+COMMON_DEPEND="
+	X? (
+		x11-libs/libXcursor[${MULTILIB_USEDEP}]
+		x11-libs/libXext[${MULTILIB_USEDEP}]
+		x11-libs/libXrandr[${MULTILIB_USEDEP}]
+		x11-libs/libXi[${MULTILIB_USEDEP}]
+		x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
+	)
+	alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
+	capi? ( net-libs/libcapi[${MULTILIB_USEDEP}] )
+	cups? ( net-print/cups:=[${MULTILIB_USEDEP}] )
+	fontconfig? ( media-libs/fontconfig:=[${MULTILIB_USEDEP}] )
+	gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] )
+	gsm? ( media-sound/gsm:=[${MULTILIB_USEDEP}] )
+	gstreamer? (
+		media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
+		media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}]
+	)
+	jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] )
+	lcms? ( media-libs/lcms:2=[${MULTILIB_USEDEP}] )
+	ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] )
+	mp3? ( >=media-sound/mpg123-1.5.0[${MULTILIB_USEDEP}] )
+	ncurses? ( >=sys-libs/ncurses-5.2:0=[${MULTILIB_USEDEP}] )
+	netapi? ( net-fs/samba[netapi(+),${MULTILIB_USEDEP}] )
+	nls? ( sys-devel/gettext[${MULTILIB_USEDEP}] )
+	odbc? ( dev-db/unixODBC:=[${MULTILIB_USEDEP}] )
+	openal? ( media-libs/openal:=[${MULTILIB_USEDEP}] )
+	opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
+	opengl? (
+		virtual/glu[${MULTILIB_USEDEP}]
+		virtual/opengl[${MULTILIB_USEDEP}]
+	)
+	osmesa? ( media-libs/mesa[osmesa,${MULTILIB_USEDEP}] )
+	pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] )
+	png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] )
+	pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )
+	scanner? ( media-gfx/sane-backends:=[${MULTILIB_USEDEP}] )
+	ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] )
+	staging? ( sys-apps/attr[${MULTILIB_USEDEP}] )
+	themes? (
+		dev-libs/glib:2[${MULTILIB_USEDEP}]
+		x11-libs/cairo[${MULTILIB_USEDEP}]
+		x11-libs/gtk+:3[${MULTILIB_USEDEP}]
+	)
+	truetype? ( >=media-libs/freetype-2.0.0[${MULTILIB_USEDEP}] )
+	udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
+	v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
+	vaapi? ( x11-libs/libva[X,${MULTILIB_USEDEP}] )
+	xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
+	xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
+	xml? (
+		dev-libs/libxml2[${MULTILIB_USEDEP}]
+		dev-libs/libxslt[${MULTILIB_USEDEP}]
+	)
+	abi_x86_32? (
+		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+		!<app-emulation/emul-linux-x86-baselibs-20140508-r14
+		!app-emulation/emul-linux-x86-db[-abi_x86_32(-)]
+		!<app-emulation/emul-linux-x86-db-20140508-r3
+		!app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)]
+		!<app-emulation/emul-linux-x86-medialibs-20140508-r6
+		!app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)]
+		!<app-emulation/emul-linux-x86-opengl-20140508-r1
+		!app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)]
+		!<app-emulation/emul-linux-x86-sdl-20140508-r1
+		!app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)]
+		!<app-emulation/emul-linux-x86-soundlibs-20140508
+		!app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
+		!<app-emulation/emul-linux-x86-xlibs-20140508
+	)"
+
+RDEPEND="${COMMON_DEPEND}
+	dos? ( >=games-emulation/dosbox-0.74_p20160629 )
+	perl? (
+		dev-lang/perl
+		dev-perl/XML-Simple
+	)
+	pulseaudio? (
+		realtime? ( sys-auth/rtkit )
+	)
+	s3tc? ( >=media-libs/libtxc_dxtn-1.0.1-r1[${MULTILIB_USEDEP}] )
+	samba? ( >=net-fs/samba-3.0.25[winbind] )
+	selinux? ( sec-policy/selinux-wine )
+	udisks? ( sys-fs/udisks:2 )"
+
+# tools/make_requests requires perl
+DEPEND="${COMMON_DEPEND}
+	sys-devel/flex
+	>=sys-kernel/linux-headers-2.6
+	virtual/pkgconfig
+	virtual/yacc
+	X? (
+		x11-proto/inputproto
+		x11-proto/xextproto
+		x11-proto/xf86vidmodeproto
+	)
+	prelink? ( sys-devel/prelink )
+	staging? (
+		dev-lang/perl
+		dev-perl/XML-Simple
+	)
+	xinerama? ( x11-proto/xineramaproto )"
+
+# 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"
+
+wine_compiler_check() {
+	[[ ${MERGE_TYPE} = "binary" ]] && return 0
+
+	# GCC-specific bugs
+	if tc-is-gcc; then
+		# bug #549768
+		if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then
+			ebegin "Checking for gcc-5 ms_abi compiler bug"
+			$(tc-getCC) -O2 "${FILESDIR}"/pr66838.c -o "${T}"/pr66838 || die
+			# Run in subshell to prevent "Aborted" message
+			( "${T}"/pr66838 || false ) >/dev/null 2>&1
+			if ! eend $?; then
+				eerror "64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0"
+				eerror "due to compiler bugs; please re-emerge the latest gcc-5.2.x ebuild,"
+				eerror "or use gcc-config to select a different compiler version."
+				eerror "See https://bugs.gentoo.org/549768"
+				eerror
+				return 1
+			fi
+		fi
+		# bug #574044
+		if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then
+			ebegin "Checking for gcc-5-3 stack realignment compiler bug"
+			# Compile in subshell to prevent "Aborted" message
+			( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${FILESDIR}"/pr69140.c -o "${T}"/pr69140 ) >/dev/null 2>&1
+			if ! eend $?; then
+				eerror "Wine cannot be built with this version of gcc-5.3"
+				eerror "due to compiler bugs; please re-emerge the latest gcc-5.3.x ebuild,"
+				eerror "or use gcc-config to select a different compiler version."
+				eerror "See https://bugs.gentoo.org/574044"
+				eerror
+				return 1
+			fi
+		fi
+	fi
+
+	# Ensure compiler support
+	if use abi_x86_64; then
+		ebegin "Checking for 64-bit compiler with builtin_ms_va_list support"
+		# Compile in subshell to prevent "Aborted" message
+		( $(tc-getCC) -O2 "${FILESDIR}"/builtin_ms_va_list.c -o "${T}"/builtin_ms_va_list >/dev/null 2>&1)
+		if ! eend $?; then
+			eerror "This version of $(tc-getCC) does not support builtin_ms_va_list, can't enable 64-bit wine"
+			eerror
+			eerror "You need gcc-4.4+ or clang 3.8+ to build 64-bit wine"
+			eerror
+			return 1
+		fi
+	fi
+}
+
+wine_build_environment_check() {
+	[[ ${MERGE_TYPE} = "binary" ]] && return 0
+
+	if use abi_x86_32 && use opencl && [[ "$(eselect opencl show 2> /dev/null)" == "intel" ]]; then
+		eerror "You cannot build wine with USE=opencl because intel-ocl-sdk is 64-bit only."
+		eerror "See https://bugs.gentoo.org/487864 for more details."
+		eerror
+		return 1
+	fi
+}
+
+pkg_pretend() {
+	wine_compiler_check || die
+	wine_build_environment_check || die
+
+	# Verify OSS support
+	if use oss && ! use kernel_FreeBSD; then
+		if ! has_version ">=media-sound/oss-4"; then
+			eerror "You cannot build wine with USE=oss without having support from a"
+			eerror "FreeBSD kernel or >=media-sound/oss-4 (only available through external repos)"
+			eerror
+			die
+		fi
+	fi
+}
+
+pkg_setup() {
+	wine_build_environment_check || die
+	if ! use staging; then
+		GV=${VANILLA_GV}
+		MV=${VANILLA_MV}
+	else
+		GV=${STAGING_GV}
+		MV=${STAGING_MV}
+	fi
+}
+
+src_unpack() {
+	if [[ ${PV} == "9999" ]] ; then
+		git-r3_src_unpack
+		if use staging; then
+			local WINE_COMMIT=${EGIT_VERSION}
+
+			git-r3_fetch "${STAGING_EGIT_REPO_URI}"
+			git-r3_checkout "${STAGING_EGIT_REPO_URI}" "${STAGING_DIR}"
+
+			local STAGING_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die
+
+			if [[ "${WINE_COMMIT}" != "${STAGING_COMMIT}" ]]; then
+				einfo "The current Staging patchset is not guaranteed to apply on this WINE commit."
+				einfo "If src_prepare fails, try emerging with the env var EGIT_COMMIT."
+				einfo "Example: EGIT_COMMIT=${STAGING_COMMIT} emerge -1 wine"
+			fi
+		fi
+	fi
+
+	default
+
+	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.9.5-multilib-portage.patch #395615
+		"${FILESDIR}"/${PN}-1.7.12-osmesa-check.patch #429386
+		"${FILESDIR}"/${PN}-1.6-memset-O3.patch #480508
+		"${FILESDIR}"/${PN}-1.8-gnutls-3.5-compat.patch #587028
+		"${WORKDIR}/${GST_P}.patch"
+	)
+	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"
+		)
+		eend $? || die "Failed to apply Wine-Staging patches"
+
+		# To differentiate unofficial staging releases
+		if [[ ! -z ${SUFFIX} ]]; then
+			sed -i "s/(Staging)/(Staging [Unofficial])/" libs/wine/Makefile.in || die
+		fi
+	fi
+
+	default
+	eautoreconf
+
+	# 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
+	fi
+	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
+	if ! use run-exes; then
+		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 || die # otherwise wine doesn't respect LINGUAS
+}
+
+src_configure() {
+	export LDCONFIG=/bin/true
+	use custom-cflags || strip-flags
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local myconf=(
+		--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_enable gecko mshtml)
+		$(use_with gphoto2 gphoto)
+		$(use_with gsm)
+		$(use_with gstreamer)
+		--without-hal
+		$(use_with jpeg)
+		$(use_with ldap)
+		$(use_enable mono mscoree)
+		$(use_with mp3 mpg123)
+		$(use_with netapi)
+		$(use_with nls gettext)
+		$(use_with openal)
+		$(use_with opencl)
+		$(use_with opengl)
+		$(use_with osmesa)
+		$(use_with oss)
+		$(use_with pcap)
+		$(use_with png)
+		$(use_with pulseaudio pulse)
+		$(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)
+	)
+
+	use staging && myconf+=(
+		--with-xattr
+		$(use_with themes gtk3)
+		$(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
+	tc-export PKG_CONFIG AR RANLIB
+
+	if use amd64; then
+		if [[ ${ABI} == amd64 ]]; then
+			myconf+=( --enable-win64 )
+		else
+			myconf+=( --disable-win64 )
+		fi
+
+		# Note: using --with-wine64 results in problems with multilib.eclass
+		# CC/LD hackery. We're using separate tools instead.
+	fi
+
+	ECONF_SOURCE=${S} \
+	econf "${myconf[@]}"
+	emake depend
+}
+
+multilib_src_test() {
+	# FIXME: win32-only; wine64 tests fail with "could not find the Wine loader"
+	if [[ ${ABI} == x86 ]]; then
+		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
+
+		WINEPREFIX="${T}/.wine-${ABI}" \
+		Xemake test
+	fi
+}
+
+multilib_src_install_all() {
+	local DOCS=( ANNOUNCE AUTHORS README )
+	local l
+	add_locale_docs() {
+		local locale_doc="documentation/README.$1"
+		[[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
+	}
+	l10n_for_each_locale_do add_locale_docs
+
+	einstalldocs
+	prune_libtool_files --all
+
+	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 # winedump calls function_grep.pl, and winemaker is a perl script
+		rm "${D}"usr/bin/{wine{dump,maker},function_grep.pl} "${D}"usr/share/man/man1/wine{dump,maker}.1 || die
+	fi
+
+	# Remove wineconsole if neither backend is installed #551124
+	if ! use X && ! use ncurses; then
+		rm	"${D}"/usr/{bin/,man/man1/}wineconsole* || die
+		use abi_x86_32 && rm "${D}"/usr/lib32/wine/{,fakedlls/}wineconsole.exe* || die
+		use abi_x86_64 && rm "${D}"/usr/lib64/wine/{,fakedlls/}wineconsole.exe* || 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
+
+	if ! use gecko; then
+		ewarn "Without Wine Gecko, wine prefixes will not have a default"
+		ewarn "implementation of iexplore.  Many older windows applications"
+		ewarn "rely upon the existence of an iexplore implementation, so"
+		ewarn "you will likely need to install an external one, like via winetricks"
+	fi
+	if ! use mono; then
+		ewarn "Without Wine Mono, wine prefixes will not have a default"
+		ewarn "implementation of .NET.  Many windows applications rely upon"
+		ewarn "the existence of a .NET implementation, so you will likely need"
+		ewarn "to install an external one, like via winetricks"
+	fi
+
+	if use gstreamer; then
+		ewarn "This package uses a Gentoo specific patchset to provide"
+		ewarn "GStreamer 1.0 support.  Any bugs related to GStreamer should"
+		ewarn "be filed at Gentoo's bugzilla, not upstream's."
+	fi
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	fdo-mime_desktop_database_update
+}
diff --git a/app-emulation/wine/wine-1.9.11-r2.ebuild b/app-emulation/wine/wine-1.9.10-r3.ebuild
index 23e0e41a09cc..0f8b69e87128 100644
--- a/app-emulation/wine/wine-1.9.11-r2.ebuild
+++ b/app-emulation/wine/wine-1.9.10-r3.ebuild
@@ -61,7 +61,7 @@ fi
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags d3d9 dos elibc_glibc +fontconfig +gecko gphoto2 gsm gstreamer +jpeg kernel_FreeBSD +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"
+IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags d3d9 dos elibc_glibc +fontconfig +gecko gphoto2 gsm gstreamer +jpeg kernel_FreeBSD +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 themes +threads +truetype +udisks v4l vaapi +X +xcomposite xinerama +xml"
 REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
 	X? ( truetype )
 	elibc_glibc? ( threads )
@@ -69,6 +69,7 @@ REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
 	pipelight? ( staging )
 	s3tc? ( staging )
 	test? ( abi_x86_32 )
+	themes? ( staging )
 	vaapi? ( staging )" # osmesa-opengl #286560 # X-truetype #551124
 
 # FIXME: the test suite is unsuitable for us; many tests require net access
@@ -120,6 +121,11 @@ COMMON_DEPEND="
 	scanner? ( media-gfx/sane-backends:=[${MULTILIB_USEDEP}] )
 	ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] )
 	staging? ( sys-apps/attr[${MULTILIB_USEDEP}] )
+	themes? (
+		dev-libs/glib:2[${MULTILIB_USEDEP}]
+		x11-libs/cairo[${MULTILIB_USEDEP}]
+		x11-libs/gtk+:3[${MULTILIB_USEDEP}]
+	)
 	truetype? ( >=media-libs/freetype-2.0.0[${MULTILIB_USEDEP}] )
 	udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
 	v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
@@ -197,8 +203,7 @@ wine_compiler_check() {
 			$(tc-getCC) -O2 "${FILESDIR}"/pr66838.c -o "${T}"/pr66838 || die
 			# Run in subshell to prevent "Aborted" message
 			( "${T}"/pr66838 || false ) >/dev/null 2>&1
-			eend $?
-			if [[ $? -ne 0 ]] ; then
+			if ! eend $?; then
 				eerror "64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0"
 				eerror "due to compiler bugs; please re-emerge the latest gcc-5.2.x ebuild,"
 				eerror "or use gcc-config to select a different compiler version."
@@ -211,9 +216,8 @@ wine_compiler_check() {
 		if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then
 			ebegin "Checking for gcc-5-3 stack realignment compiler bug"
 			# Compile in subshell to prevent "Aborted" message
-			( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${FILESDIR}"/pr69140.c -o "${T}"/pr69140 || false ) >/dev/null 2>&1
-			eend $?
-			if [[ $? -ne 0 ]] ; then
+			( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${FILESDIR}"/pr69140.c -o "${T}"/pr69140 ) >/dev/null 2>&1
+			if ! eend $?; then
 				eerror "Wine cannot be built with this version of gcc-5.3"
 				eerror "due to compiler bugs; please re-emerge the latest gcc-5.3.x ebuild,"
 				eerror "or use gcc-config to select a different compiler version."
@@ -229,8 +233,7 @@ wine_compiler_check() {
 		ebegin "Checking for 64-bit compiler with builtin_ms_va_list support"
 		# Compile in subshell to prevent "Aborted" message
 		( $(tc-getCC) -O2 "${FILESDIR}"/builtin_ms_va_list.c -o "${T}"/builtin_ms_va_list >/dev/null 2>&1)
-		eend $?
-		if [[ $? -ne 0 ]]; then
+		if ! eend $?; then
 			eerror "This version of $(tc-getCC) does not support builtin_ms_va_list, can't enable 64-bit wine"
 			eerror
 			eerror "You need gcc-4.4+ or clang 3.8+ to build 64-bit wine"
@@ -243,7 +246,7 @@ wine_compiler_check() {
 wine_build_environment_check() {
 	[[ ${MERGE_TYPE} = "binary" ]] && return 0
 
-	if use abi_x86_32 && use opencl && [[ x$(eselect opencl show 2> /dev/null) = "xintel" ]]; then
+	if use abi_x86_32 && use opencl && [[ "$(eselect opencl show 2> /dev/null)" == "intel" ]]; then
 		eerror "You cannot build wine with USE=opencl because intel-ocl-sdk is 64-bit only."
 		eerror "See https://bugs.gentoo.org/487864 for more details."
 		eerror
@@ -257,8 +260,7 @@ pkg_pretend() {
 
 	# Verify OSS support
 	if use oss && ! use kernel_FreeBSD; then
-		local oss_vers=$(best_version media-sound/oss)
-		if [[ -z ${oss_vers} ]] || ! version_is_at_least "4" ${oss_vers}; then
+		if ! has_version ">=media-sound/oss-4"; then
 			eerror "You cannot build wine with USE=oss without having support from a"
 			eerror "FreeBSD kernel or >=media-sound/oss-4 (only available through external repos)"
 			eerror
@@ -284,10 +286,8 @@ src_unpack() {
 		if use staging; then
 			local WINE_COMMIT=${EGIT_VERSION}
 
-			EGIT_REPO_URI=${STAGING_EGIT_REPO_URI}
-			unset ${PN}_LIVE_{REPO,BRANCH,COMMIT} EGIT_COMMIT;
-
-			EGIT_CHECKOUT_DIR=${STAGING_DIR} git-r3_src_unpack
+			git-r3_fetch "${STAGING_EGIT_REPO_URI}"
+			git-r3_checkout "${STAGING_EGIT_REPO_URI}" "${STAGING_DIR}"
 
 			local STAGING_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die
 
@@ -298,17 +298,12 @@ src_unpack() {
 			fi
 		fi
 		if use d3d9; then
-			EGIT_REPO_URI="${D3D9_EGIT_REPO_URI}"
-			unset ${PN}_LIVE_{REPO,BRANCH,COMMIT} EGIT_COMMIT;
-			EGIT_CHECKOUT_DIR="${D3D9_DIR}" git-r3_src_unpack
+			git-r3_fetch "${D3D9_EGIT_REPO_URI}"
+			git-r3_checkout "${D3D9_EGIT_REPO_URI}" "${D3D9_DIR}"
 		fi
-	else
-		unpack ${P}.tar.bz2
-		use staging && unpack "${STAGING_P}.tar.gz"
-		use d3d9 && unpack "${D3D9_P}.tar.gz"
 	fi
 
-	unpack "${WINE_GENTOO}.tar.bz2"
+	default
 
 	l10n_find_plocales_changes "${S}/po" "" ".po"
 }
@@ -336,7 +331,7 @@ src_prepare() {
 			cd "${STAGING_DIR}/patches"
 			source "${STAGING_DIR}/patches/patchinstall.sh"
 		)
-		eend $?
+		eend $? || die "Failed to apply Wine-Staging patches"
 
 		# To differentiate unofficial staging releases
 		if [[ ! -z ${SUFFIX} ]]; then
@@ -422,6 +417,7 @@ multilib_src_configure() {
 
 	use staging && myconf+=(
 		--with-xattr
+		$(use_with themes gtk3)
 		$(use_with vaapi va)
 	)
 	use d3d9 && myconf+=( $(use_with d3d9 d3dadapter) )
diff --git a/app-emulation/wine/wine-1.9.10-r2.ebuild b/app-emulation/wine/wine-1.9.11-r3.ebuild
index 23e0e41a09cc..0f8b69e87128 100644
--- a/app-emulation/wine/wine-1.9.10-r2.ebuild
+++ b/app-emulation/wine/wine-1.9.11-r3.ebuild
@@ -61,7 +61,7 @@ fi
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags d3d9 dos elibc_glibc +fontconfig +gecko gphoto2 gsm gstreamer +jpeg kernel_FreeBSD +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"
+IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags d3d9 dos elibc_glibc +fontconfig +gecko gphoto2 gsm gstreamer +jpeg kernel_FreeBSD +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 themes +threads +truetype +udisks v4l vaapi +X +xcomposite xinerama +xml"
 REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
 	X? ( truetype )
 	elibc_glibc? ( threads )
@@ -69,6 +69,7 @@ REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
 	pipelight? ( staging )
 	s3tc? ( staging )
 	test? ( abi_x86_32 )
+	themes? ( staging )
 	vaapi? ( staging )" # osmesa-opengl #286560 # X-truetype #551124
 
 # FIXME: the test suite is unsuitable for us; many tests require net access
@@ -120,6 +121,11 @@ COMMON_DEPEND="
 	scanner? ( media-gfx/sane-backends:=[${MULTILIB_USEDEP}] )
 	ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] )
 	staging? ( sys-apps/attr[${MULTILIB_USEDEP}] )
+	themes? (
+		dev-libs/glib:2[${MULTILIB_USEDEP}]
+		x11-libs/cairo[${MULTILIB_USEDEP}]
+		x11-libs/gtk+:3[${MULTILIB_USEDEP}]
+	)
 	truetype? ( >=media-libs/freetype-2.0.0[${MULTILIB_USEDEP}] )
 	udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
 	v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
@@ -197,8 +203,7 @@ wine_compiler_check() {
 			$(tc-getCC) -O2 "${FILESDIR}"/pr66838.c -o "${T}"/pr66838 || die
 			# Run in subshell to prevent "Aborted" message
 			( "${T}"/pr66838 || false ) >/dev/null 2>&1
-			eend $?
-			if [[ $? -ne 0 ]] ; then
+			if ! eend $?; then
 				eerror "64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0"
 				eerror "due to compiler bugs; please re-emerge the latest gcc-5.2.x ebuild,"
 				eerror "or use gcc-config to select a different compiler version."
@@ -211,9 +216,8 @@ wine_compiler_check() {
 		if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then
 			ebegin "Checking for gcc-5-3 stack realignment compiler bug"
 			# Compile in subshell to prevent "Aborted" message
-			( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${FILESDIR}"/pr69140.c -o "${T}"/pr69140 || false ) >/dev/null 2>&1
-			eend $?
-			if [[ $? -ne 0 ]] ; then
+			( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${FILESDIR}"/pr69140.c -o "${T}"/pr69140 ) >/dev/null 2>&1
+			if ! eend $?; then
 				eerror "Wine cannot be built with this version of gcc-5.3"
 				eerror "due to compiler bugs; please re-emerge the latest gcc-5.3.x ebuild,"
 				eerror "or use gcc-config to select a different compiler version."
@@ -229,8 +233,7 @@ wine_compiler_check() {
 		ebegin "Checking for 64-bit compiler with builtin_ms_va_list support"
 		# Compile in subshell to prevent "Aborted" message
 		( $(tc-getCC) -O2 "${FILESDIR}"/builtin_ms_va_list.c -o "${T}"/builtin_ms_va_list >/dev/null 2>&1)
-		eend $?
-		if [[ $? -ne 0 ]]; then
+		if ! eend $?; then
 			eerror "This version of $(tc-getCC) does not support builtin_ms_va_list, can't enable 64-bit wine"
 			eerror
 			eerror "You need gcc-4.4+ or clang 3.8+ to build 64-bit wine"
@@ -243,7 +246,7 @@ wine_compiler_check() {
 wine_build_environment_check() {
 	[[ ${MERGE_TYPE} = "binary" ]] && return 0
 
-	if use abi_x86_32 && use opencl && [[ x$(eselect opencl show 2> /dev/null) = "xintel" ]]; then
+	if use abi_x86_32 && use opencl && [[ "$(eselect opencl show 2> /dev/null)" == "intel" ]]; then
 		eerror "You cannot build wine with USE=opencl because intel-ocl-sdk is 64-bit only."
 		eerror "See https://bugs.gentoo.org/487864 for more details."
 		eerror
@@ -257,8 +260,7 @@ pkg_pretend() {
 
 	# Verify OSS support
 	if use oss && ! use kernel_FreeBSD; then
-		local oss_vers=$(best_version media-sound/oss)
-		if [[ -z ${oss_vers} ]] || ! version_is_at_least "4" ${oss_vers}; then
+		if ! has_version ">=media-sound/oss-4"; then
 			eerror "You cannot build wine with USE=oss without having support from a"
 			eerror "FreeBSD kernel or >=media-sound/oss-4 (only available through external repos)"
 			eerror
@@ -284,10 +286,8 @@ src_unpack() {
 		if use staging; then
 			local WINE_COMMIT=${EGIT_VERSION}
 
-			EGIT_REPO_URI=${STAGING_EGIT_REPO_URI}
-			unset ${PN}_LIVE_{REPO,BRANCH,COMMIT} EGIT_COMMIT;
-
-			EGIT_CHECKOUT_DIR=${STAGING_DIR} git-r3_src_unpack
+			git-r3_fetch "${STAGING_EGIT_REPO_URI}"
+			git-r3_checkout "${STAGING_EGIT_REPO_URI}" "${STAGING_DIR}"
 
 			local STAGING_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die
 
@@ -298,17 +298,12 @@ src_unpack() {
 			fi
 		fi
 		if use d3d9; then
-			EGIT_REPO_URI="${D3D9_EGIT_REPO_URI}"
-			unset ${PN}_LIVE_{REPO,BRANCH,COMMIT} EGIT_COMMIT;
-			EGIT_CHECKOUT_DIR="${D3D9_DIR}" git-r3_src_unpack
+			git-r3_fetch "${D3D9_EGIT_REPO_URI}"
+			git-r3_checkout "${D3D9_EGIT_REPO_URI}" "${D3D9_DIR}"
 		fi
-	else
-		unpack ${P}.tar.bz2
-		use staging && unpack "${STAGING_P}.tar.gz"
-		use d3d9 && unpack "${D3D9_P}.tar.gz"
 	fi
 
-	unpack "${WINE_GENTOO}.tar.bz2"
+	default
 
 	l10n_find_plocales_changes "${S}/po" "" ".po"
 }
@@ -336,7 +331,7 @@ src_prepare() {
 			cd "${STAGING_DIR}/patches"
 			source "${STAGING_DIR}/patches/patchinstall.sh"
 		)
-		eend $?
+		eend $? || die "Failed to apply Wine-Staging patches"
 
 		# To differentiate unofficial staging releases
 		if [[ ! -z ${SUFFIX} ]]; then
@@ -422,6 +417,7 @@ multilib_src_configure() {
 
 	use staging && myconf+=(
 		--with-xattr
+		$(use_with themes gtk3)
 		$(use_with vaapi va)
 	)
 	use d3d9 && myconf+=( $(use_with d3d9 d3dadapter) )
diff --git a/app-emulation/wine/wine-1.9.12-r1.ebuild b/app-emulation/wine/wine-1.9.12-r2.ebuild
index b0082ca1423e..46a6f207d6c6 100644
--- a/app-emulation/wine/wine-1.9.12-r1.ebuild
+++ b/app-emulation/wine/wine-1.9.12-r2.ebuild
@@ -61,7 +61,7 @@ fi
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags d3d9 dos elibc_glibc +fontconfig +gecko gphoto2 gsm gstreamer +jpeg kernel_FreeBSD +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"
+IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags d3d9 dos elibc_glibc +fontconfig +gecko gphoto2 gsm gstreamer +jpeg kernel_FreeBSD +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 themes +threads +truetype +udisks v4l vaapi +X +xcomposite xinerama +xml"
 REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
 	X? ( truetype )
 	elibc_glibc? ( threads )
@@ -69,6 +69,7 @@ REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
 	pipelight? ( staging )
 	s3tc? ( staging )
 	test? ( abi_x86_32 )
+	themes? ( staging )
 	vaapi? ( staging )" # osmesa-opengl #286560 # X-truetype #551124
 
 # FIXME: the test suite is unsuitable for us; many tests require net access
@@ -120,6 +121,11 @@ COMMON_DEPEND="
 	scanner? ( media-gfx/sane-backends:=[${MULTILIB_USEDEP}] )
 	ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] )
 	staging? ( sys-apps/attr[${MULTILIB_USEDEP}] )
+	themes? (
+		dev-libs/glib:2[${MULTILIB_USEDEP}]
+		x11-libs/cairo[${MULTILIB_USEDEP}]
+		x11-libs/gtk+:3[${MULTILIB_USEDEP}]
+	)
 	truetype? ( >=media-libs/freetype-2.0.0[${MULTILIB_USEDEP}] )
 	udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
 	v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
@@ -197,8 +203,7 @@ wine_compiler_check() {
 			$(tc-getCC) -O2 "${FILESDIR}"/pr66838.c -o "${T}"/pr66838 || die
 			# Run in subshell to prevent "Aborted" message
 			( "${T}"/pr66838 || false ) >/dev/null 2>&1
-			eend $?
-			if [[ $? -ne 0 ]] ; then
+			if ! eend $?; then
 				eerror "64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0"
 				eerror "due to compiler bugs; please re-emerge the latest gcc-5.2.x ebuild,"
 				eerror "or use gcc-config to select a different compiler version."
@@ -211,9 +216,8 @@ wine_compiler_check() {
 		if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then
 			ebegin "Checking for gcc-5-3 stack realignment compiler bug"
 			# Compile in subshell to prevent "Aborted" message
-			( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${FILESDIR}"/pr69140.c -o "${T}"/pr69140 || false ) >/dev/null 2>&1
-			eend $?
-			if [[ $? -ne 0 ]] ; then
+			( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${FILESDIR}"/pr69140.c -o "${T}"/pr69140 ) >/dev/null 2>&1
+			if ! eend $?; then
 				eerror "Wine cannot be built with this version of gcc-5.3"
 				eerror "due to compiler bugs; please re-emerge the latest gcc-5.3.x ebuild,"
 				eerror "or use gcc-config to select a different compiler version."
@@ -229,8 +233,7 @@ wine_compiler_check() {
 		ebegin "Checking for 64-bit compiler with builtin_ms_va_list support"
 		# Compile in subshell to prevent "Aborted" message
 		( $(tc-getCC) -O2 "${FILESDIR}"/builtin_ms_va_list.c -o "${T}"/builtin_ms_va_list >/dev/null 2>&1)
-		eend $?
-		if [[ $? -ne 0 ]]; then
+		if ! eend $?; then
 			eerror "This version of $(tc-getCC) does not support builtin_ms_va_list, can't enable 64-bit wine"
 			eerror
 			eerror "You need gcc-4.4+ or clang 3.8+ to build 64-bit wine"
@@ -243,7 +246,7 @@ wine_compiler_check() {
 wine_build_environment_check() {
 	[[ ${MERGE_TYPE} = "binary" ]] && return 0
 
-	if use abi_x86_32 && use opencl && [[ x$(eselect opencl show 2> /dev/null) = "xintel" ]]; then
+	if use abi_x86_32 && use opencl && [[ "$(eselect opencl show 2> /dev/null)" == "intel" ]]; then
 		eerror "You cannot build wine with USE=opencl because intel-ocl-sdk is 64-bit only."
 		eerror "See https://bugs.gentoo.org/487864 for more details."
 		eerror
@@ -257,8 +260,7 @@ pkg_pretend() {
 
 	# Verify OSS support
 	if use oss && ! use kernel_FreeBSD; then
-		local oss_vers=$(best_version media-sound/oss)
-		if [[ -z ${oss_vers} ]] || ! version_is_at_least "4" ${oss_vers}; then
+		if ! has_version ">=media-sound/oss-4"; then
 			eerror "You cannot build wine with USE=oss without having support from a"
 			eerror "FreeBSD kernel or >=media-sound/oss-4 (only available through external repos)"
 			eerror
@@ -284,10 +286,8 @@ src_unpack() {
 		if use staging; then
 			local WINE_COMMIT=${EGIT_VERSION}
 
-			EGIT_REPO_URI=${STAGING_EGIT_REPO_URI}
-			unset ${PN}_LIVE_{REPO,BRANCH,COMMIT} EGIT_COMMIT;
-
-			EGIT_CHECKOUT_DIR=${STAGING_DIR} git-r3_src_unpack
+			git-r3_fetch "${STAGING_EGIT_REPO_URI}"
+			git-r3_checkout "${STAGING_EGIT_REPO_URI}" "${STAGING_DIR}"
 
 			local STAGING_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die
 
@@ -298,17 +298,12 @@ src_unpack() {
 			fi
 		fi
 		if use d3d9; then
-			EGIT_REPO_URI="${D3D9_EGIT_REPO_URI}"
-			unset ${PN}_LIVE_{REPO,BRANCH,COMMIT} EGIT_COMMIT;
-			EGIT_CHECKOUT_DIR="${D3D9_DIR}" git-r3_src_unpack
+			git-r3_fetch "${D3D9_EGIT_REPO_URI}"
+			git-r3_checkout "${D3D9_EGIT_REPO_URI}" "${D3D9_DIR}"
 		fi
-	else
-		unpack ${P}.tar.bz2
-		use staging && unpack "${STAGING_P}.tar.gz"
-		use d3d9 && unpack "${D3D9_P}.tar.gz"
 	fi
 
-	unpack "${WINE_GENTOO}.tar.bz2"
+	default
 
 	l10n_find_plocales_changes "${S}/po" "" ".po"
 }
@@ -336,7 +331,7 @@ src_prepare() {
 			cd "${STAGING_DIR}/patches"
 			source "${STAGING_DIR}/patches/patchinstall.sh"
 		)
-		eend $?
+		eend $? || die "Failed to apply Wine-Staging patches"
 
 		# To differentiate unofficial staging releases
 		if [[ ! -z ${SUFFIX} ]]; then
@@ -422,6 +417,7 @@ multilib_src_configure() {
 
 	use staging && myconf+=(
 		--with-xattr
+		$(use_with themes gtk3)
 		$(use_with vaapi va)
 	)
 	use d3d9 && myconf+=( $(use_with d3d9 d3dadapter) )
diff --git a/app-emulation/wine/wine-1.9.14-r1.ebuild b/app-emulation/wine/wine-1.9.13-r2.ebuild
index f1c142df4b7b..8bedf3424818 100644
--- a/app-emulation/wine/wine-1.9.14-r1.ebuild
+++ b/app-emulation/wine/wine-1.9.13-r2.ebuild
@@ -61,7 +61,7 @@ fi
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags d3d9 dos elibc_glibc +fontconfig +gecko gphoto2 gsm gstreamer +jpeg kernel_FreeBSD +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"
+IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags d3d9 dos elibc_glibc +fontconfig +gecko gphoto2 gsm gstreamer +jpeg kernel_FreeBSD +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 themes +threads +truetype +udisks v4l vaapi +X +xcomposite xinerama +xml"
 REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
 	X? ( truetype )
 	elibc_glibc? ( threads )
@@ -69,6 +69,7 @@ REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
 	pipelight? ( staging )
 	s3tc? ( staging )
 	test? ( abi_x86_32 )
+	themes? ( staging )
 	vaapi? ( staging )" # osmesa-opengl #286560 # X-truetype #551124
 
 # FIXME: the test suite is unsuitable for us; many tests require net access
@@ -120,6 +121,11 @@ COMMON_DEPEND="
 	scanner? ( media-gfx/sane-backends:=[${MULTILIB_USEDEP}] )
 	ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] )
 	staging? ( sys-apps/attr[${MULTILIB_USEDEP}] )
+	themes? (
+		dev-libs/glib:2[${MULTILIB_USEDEP}]
+		x11-libs/cairo[${MULTILIB_USEDEP}]
+		x11-libs/gtk+:3[${MULTILIB_USEDEP}]
+	)
 	truetype? ( >=media-libs/freetype-2.0.0[${MULTILIB_USEDEP}] )
 	udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
 	v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
@@ -197,8 +203,7 @@ wine_compiler_check() {
 			$(tc-getCC) -O2 "${FILESDIR}"/pr66838.c -o "${T}"/pr66838 || die
 			# Run in subshell to prevent "Aborted" message
 			( "${T}"/pr66838 || false ) >/dev/null 2>&1
-			eend $?
-			if [[ $? -ne 0 ]] ; then
+			if ! eend $?; then
 				eerror "64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0"
 				eerror "due to compiler bugs; please re-emerge the latest gcc-5.2.x ebuild,"
 				eerror "or use gcc-config to select a different compiler version."
@@ -211,9 +216,8 @@ wine_compiler_check() {
 		if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then
 			ebegin "Checking for gcc-5-3 stack realignment compiler bug"
 			# Compile in subshell to prevent "Aborted" message
-			( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${FILESDIR}"/pr69140.c -o "${T}"/pr69140 || false ) >/dev/null 2>&1
-			eend $?
-			if [[ $? -ne 0 ]] ; then
+			( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${FILESDIR}"/pr69140.c -o "${T}"/pr69140 ) >/dev/null 2>&1
+			if ! eend $?; then
 				eerror "Wine cannot be built with this version of gcc-5.3"
 				eerror "due to compiler bugs; please re-emerge the latest gcc-5.3.x ebuild,"
 				eerror "or use gcc-config to select a different compiler version."
@@ -229,8 +233,7 @@ wine_compiler_check() {
 		ebegin "Checking for 64-bit compiler with builtin_ms_va_list support"
 		# Compile in subshell to prevent "Aborted" message
 		( $(tc-getCC) -O2 "${FILESDIR}"/builtin_ms_va_list.c -o "${T}"/builtin_ms_va_list >/dev/null 2>&1)
-		eend $?
-		if [[ $? -ne 0 ]]; then
+		if ! eend $?; then
 			eerror "This version of $(tc-getCC) does not support builtin_ms_va_list, can't enable 64-bit wine"
 			eerror
 			eerror "You need gcc-4.4+ or clang 3.8+ to build 64-bit wine"
@@ -243,7 +246,7 @@ wine_compiler_check() {
 wine_build_environment_check() {
 	[[ ${MERGE_TYPE} = "binary" ]] && return 0
 
-	if use abi_x86_32 && use opencl && [[ x$(eselect opencl show 2> /dev/null) = "xintel" ]]; then
+	if use abi_x86_32 && use opencl && [[ "$(eselect opencl show 2> /dev/null)" == "intel" ]]; then
 		eerror "You cannot build wine with USE=opencl because intel-ocl-sdk is 64-bit only."
 		eerror "See https://bugs.gentoo.org/487864 for more details."
 		eerror
@@ -257,8 +260,7 @@ pkg_pretend() {
 
 	# Verify OSS support
 	if use oss && ! use kernel_FreeBSD; then
-		local oss_vers=$(best_version media-sound/oss)
-		if [[ -z ${oss_vers} ]] || ! version_is_at_least "4" ${oss_vers}; then
+		if ! has_version ">=media-sound/oss-4"; then
 			eerror "You cannot build wine with USE=oss without having support from a"
 			eerror "FreeBSD kernel or >=media-sound/oss-4 (only available through external repos)"
 			eerror
@@ -284,10 +286,8 @@ src_unpack() {
 		if use staging; then
 			local WINE_COMMIT=${EGIT_VERSION}
 
-			EGIT_REPO_URI=${STAGING_EGIT_REPO_URI}
-			unset ${PN}_LIVE_{REPO,BRANCH,COMMIT} EGIT_COMMIT;
-
-			EGIT_CHECKOUT_DIR=${STAGING_DIR} git-r3_src_unpack
+			git-r3_fetch "${STAGING_EGIT_REPO_URI}"
+			git-r3_checkout "${STAGING_EGIT_REPO_URI}" "${STAGING_DIR}"
 
 			local STAGING_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die
 
@@ -298,17 +298,12 @@ src_unpack() {
 			fi
 		fi
 		if use d3d9; then
-			EGIT_REPO_URI="${D3D9_EGIT_REPO_URI}"
-			unset ${PN}_LIVE_{REPO,BRANCH,COMMIT} EGIT_COMMIT;
-			EGIT_CHECKOUT_DIR="${D3D9_DIR}" git-r3_src_unpack
+			git-r3_fetch "${D3D9_EGIT_REPO_URI}"
+			git-r3_checkout "${D3D9_EGIT_REPO_URI}" "${D3D9_DIR}"
 		fi
-	else
-		unpack ${P}.tar.bz2
-		use staging && unpack "${STAGING_P}.tar.gz"
-		use d3d9 && unpack "${D3D9_P}.tar.gz"
 	fi
 
-	unpack "${WINE_GENTOO}.tar.bz2"
+	default
 
 	l10n_find_plocales_changes "${S}/po" "" ".po"
 }
@@ -335,7 +330,7 @@ src_prepare() {
 			cd "${STAGING_DIR}/patches"
 			source "${STAGING_DIR}/patches/patchinstall.sh"
 		)
-		eend $?
+		eend $? || die "Failed to apply Wine-Staging patches"
 
 		# To differentiate unofficial staging releases
 		if [[ ! -z ${SUFFIX} ]]; then
@@ -421,6 +416,7 @@ multilib_src_configure() {
 
 	use staging && myconf+=(
 		--with-xattr
+		$(use_with themes gtk3)
 		$(use_with vaapi va)
 	)
 	use d3d9 && myconf+=( $(use_with d3d9 d3dadapter) )
diff --git a/app-emulation/wine/wine-1.9.13-r1.ebuild b/app-emulation/wine/wine-1.9.14-r2.ebuild
index f1c142df4b7b..8bedf3424818 100644
--- a/app-emulation/wine/wine-1.9.13-r1.ebuild
+++ b/app-emulation/wine/wine-1.9.14-r2.ebuild
@@ -61,7 +61,7 @@ fi
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags d3d9 dos elibc_glibc +fontconfig +gecko gphoto2 gsm gstreamer +jpeg kernel_FreeBSD +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"
+IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags d3d9 dos elibc_glibc +fontconfig +gecko gphoto2 gsm gstreamer +jpeg kernel_FreeBSD +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 themes +threads +truetype +udisks v4l vaapi +X +xcomposite xinerama +xml"
 REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
 	X? ( truetype )
 	elibc_glibc? ( threads )
@@ -69,6 +69,7 @@ REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
 	pipelight? ( staging )
 	s3tc? ( staging )
 	test? ( abi_x86_32 )
+	themes? ( staging )
 	vaapi? ( staging )" # osmesa-opengl #286560 # X-truetype #551124
 
 # FIXME: the test suite is unsuitable for us; many tests require net access
@@ -120,6 +121,11 @@ COMMON_DEPEND="
 	scanner? ( media-gfx/sane-backends:=[${MULTILIB_USEDEP}] )
 	ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] )
 	staging? ( sys-apps/attr[${MULTILIB_USEDEP}] )
+	themes? (
+		dev-libs/glib:2[${MULTILIB_USEDEP}]
+		x11-libs/cairo[${MULTILIB_USEDEP}]
+		x11-libs/gtk+:3[${MULTILIB_USEDEP}]
+	)
 	truetype? ( >=media-libs/freetype-2.0.0[${MULTILIB_USEDEP}] )
 	udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
 	v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
@@ -197,8 +203,7 @@ wine_compiler_check() {
 			$(tc-getCC) -O2 "${FILESDIR}"/pr66838.c -o "${T}"/pr66838 || die
 			# Run in subshell to prevent "Aborted" message
 			( "${T}"/pr66838 || false ) >/dev/null 2>&1
-			eend $?
-			if [[ $? -ne 0 ]] ; then
+			if ! eend $?; then
 				eerror "64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0"
 				eerror "due to compiler bugs; please re-emerge the latest gcc-5.2.x ebuild,"
 				eerror "or use gcc-config to select a different compiler version."
@@ -211,9 +216,8 @@ wine_compiler_check() {
 		if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then
 			ebegin "Checking for gcc-5-3 stack realignment compiler bug"
 			# Compile in subshell to prevent "Aborted" message
-			( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${FILESDIR}"/pr69140.c -o "${T}"/pr69140 || false ) >/dev/null 2>&1
-			eend $?
-			if [[ $? -ne 0 ]] ; then
+			( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${FILESDIR}"/pr69140.c -o "${T}"/pr69140 ) >/dev/null 2>&1
+			if ! eend $?; then
 				eerror "Wine cannot be built with this version of gcc-5.3"
 				eerror "due to compiler bugs; please re-emerge the latest gcc-5.3.x ebuild,"
 				eerror "or use gcc-config to select a different compiler version."
@@ -229,8 +233,7 @@ wine_compiler_check() {
 		ebegin "Checking for 64-bit compiler with builtin_ms_va_list support"
 		# Compile in subshell to prevent "Aborted" message
 		( $(tc-getCC) -O2 "${FILESDIR}"/builtin_ms_va_list.c -o "${T}"/builtin_ms_va_list >/dev/null 2>&1)
-		eend $?
-		if [[ $? -ne 0 ]]; then
+		if ! eend $?; then
 			eerror "This version of $(tc-getCC) does not support builtin_ms_va_list, can't enable 64-bit wine"
 			eerror
 			eerror "You need gcc-4.4+ or clang 3.8+ to build 64-bit wine"
@@ -243,7 +246,7 @@ wine_compiler_check() {
 wine_build_environment_check() {
 	[[ ${MERGE_TYPE} = "binary" ]] && return 0
 
-	if use abi_x86_32 && use opencl && [[ x$(eselect opencl show 2> /dev/null) = "xintel" ]]; then
+	if use abi_x86_32 && use opencl && [[ "$(eselect opencl show 2> /dev/null)" == "intel" ]]; then
 		eerror "You cannot build wine with USE=opencl because intel-ocl-sdk is 64-bit only."
 		eerror "See https://bugs.gentoo.org/487864 for more details."
 		eerror
@@ -257,8 +260,7 @@ pkg_pretend() {
 
 	# Verify OSS support
 	if use oss && ! use kernel_FreeBSD; then
-		local oss_vers=$(best_version media-sound/oss)
-		if [[ -z ${oss_vers} ]] || ! version_is_at_least "4" ${oss_vers}; then
+		if ! has_version ">=media-sound/oss-4"; then
 			eerror "You cannot build wine with USE=oss without having support from a"
 			eerror "FreeBSD kernel or >=media-sound/oss-4 (only available through external repos)"
 			eerror
@@ -284,10 +286,8 @@ src_unpack() {
 		if use staging; then
 			local WINE_COMMIT=${EGIT_VERSION}
 
-			EGIT_REPO_URI=${STAGING_EGIT_REPO_URI}
-			unset ${PN}_LIVE_{REPO,BRANCH,COMMIT} EGIT_COMMIT;
-
-			EGIT_CHECKOUT_DIR=${STAGING_DIR} git-r3_src_unpack
+			git-r3_fetch "${STAGING_EGIT_REPO_URI}"
+			git-r3_checkout "${STAGING_EGIT_REPO_URI}" "${STAGING_DIR}"
 
 			local STAGING_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die
 
@@ -298,17 +298,12 @@ src_unpack() {
 			fi
 		fi
 		if use d3d9; then
-			EGIT_REPO_URI="${D3D9_EGIT_REPO_URI}"
-			unset ${PN}_LIVE_{REPO,BRANCH,COMMIT} EGIT_COMMIT;
-			EGIT_CHECKOUT_DIR="${D3D9_DIR}" git-r3_src_unpack
+			git-r3_fetch "${D3D9_EGIT_REPO_URI}"
+			git-r3_checkout "${D3D9_EGIT_REPO_URI}" "${D3D9_DIR}"
 		fi
-	else
-		unpack ${P}.tar.bz2
-		use staging && unpack "${STAGING_P}.tar.gz"
-		use d3d9 && unpack "${D3D9_P}.tar.gz"
 	fi
 
-	unpack "${WINE_GENTOO}.tar.bz2"
+	default
 
 	l10n_find_plocales_changes "${S}/po" "" ".po"
 }
@@ -335,7 +330,7 @@ src_prepare() {
 			cd "${STAGING_DIR}/patches"
 			source "${STAGING_DIR}/patches/patchinstall.sh"
 		)
-		eend $?
+		eend $? || die "Failed to apply Wine-Staging patches"
 
 		# To differentiate unofficial staging releases
 		if [[ ! -z ${SUFFIX} ]]; then
@@ -421,6 +416,7 @@ multilib_src_configure() {
 
 	use staging && myconf+=(
 		--with-xattr
+		$(use_with themes gtk3)
 		$(use_with vaapi va)
 	)
 	use d3d9 && myconf+=( $(use_with d3d9 d3dadapter) )
diff --git a/app-emulation/wine/wine-1.9.15.ebuild b/app-emulation/wine/wine-1.9.15-r1.ebuild
index f1c142df4b7b..8bedf3424818 100644
--- a/app-emulation/wine/wine-1.9.15.ebuild
+++ b/app-emulation/wine/wine-1.9.15-r1.ebuild
@@ -61,7 +61,7 @@ fi
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags d3d9 dos elibc_glibc +fontconfig +gecko gphoto2 gsm gstreamer +jpeg kernel_FreeBSD +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"
+IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags d3d9 dos elibc_glibc +fontconfig +gecko gphoto2 gsm gstreamer +jpeg kernel_FreeBSD +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 themes +threads +truetype +udisks v4l vaapi +X +xcomposite xinerama +xml"
 REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
 	X? ( truetype )
 	elibc_glibc? ( threads )
@@ -69,6 +69,7 @@ REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
 	pipelight? ( staging )
 	s3tc? ( staging )
 	test? ( abi_x86_32 )
+	themes? ( staging )
 	vaapi? ( staging )" # osmesa-opengl #286560 # X-truetype #551124
 
 # FIXME: the test suite is unsuitable for us; many tests require net access
@@ -120,6 +121,11 @@ COMMON_DEPEND="
 	scanner? ( media-gfx/sane-backends:=[${MULTILIB_USEDEP}] )
 	ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] )
 	staging? ( sys-apps/attr[${MULTILIB_USEDEP}] )
+	themes? (
+		dev-libs/glib:2[${MULTILIB_USEDEP}]
+		x11-libs/cairo[${MULTILIB_USEDEP}]
+		x11-libs/gtk+:3[${MULTILIB_USEDEP}]
+	)
 	truetype? ( >=media-libs/freetype-2.0.0[${MULTILIB_USEDEP}] )
 	udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
 	v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
@@ -197,8 +203,7 @@ wine_compiler_check() {
 			$(tc-getCC) -O2 "${FILESDIR}"/pr66838.c -o "${T}"/pr66838 || die
 			# Run in subshell to prevent "Aborted" message
 			( "${T}"/pr66838 || false ) >/dev/null 2>&1
-			eend $?
-			if [[ $? -ne 0 ]] ; then
+			if ! eend $?; then
 				eerror "64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0"
 				eerror "due to compiler bugs; please re-emerge the latest gcc-5.2.x ebuild,"
 				eerror "or use gcc-config to select a different compiler version."
@@ -211,9 +216,8 @@ wine_compiler_check() {
 		if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then
 			ebegin "Checking for gcc-5-3 stack realignment compiler bug"
 			# Compile in subshell to prevent "Aborted" message
-			( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${FILESDIR}"/pr69140.c -o "${T}"/pr69140 || false ) >/dev/null 2>&1
-			eend $?
-			if [[ $? -ne 0 ]] ; then
+			( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${FILESDIR}"/pr69140.c -o "${T}"/pr69140 ) >/dev/null 2>&1
+			if ! eend $?; then
 				eerror "Wine cannot be built with this version of gcc-5.3"
 				eerror "due to compiler bugs; please re-emerge the latest gcc-5.3.x ebuild,"
 				eerror "or use gcc-config to select a different compiler version."
@@ -229,8 +233,7 @@ wine_compiler_check() {
 		ebegin "Checking for 64-bit compiler with builtin_ms_va_list support"
 		# Compile in subshell to prevent "Aborted" message
 		( $(tc-getCC) -O2 "${FILESDIR}"/builtin_ms_va_list.c -o "${T}"/builtin_ms_va_list >/dev/null 2>&1)
-		eend $?
-		if [[ $? -ne 0 ]]; then
+		if ! eend $?; then
 			eerror "This version of $(tc-getCC) does not support builtin_ms_va_list, can't enable 64-bit wine"
 			eerror
 			eerror "You need gcc-4.4+ or clang 3.8+ to build 64-bit wine"
@@ -243,7 +246,7 @@ wine_compiler_check() {
 wine_build_environment_check() {
 	[[ ${MERGE_TYPE} = "binary" ]] && return 0
 
-	if use abi_x86_32 && use opencl && [[ x$(eselect opencl show 2> /dev/null) = "xintel" ]]; then
+	if use abi_x86_32 && use opencl && [[ "$(eselect opencl show 2> /dev/null)" == "intel" ]]; then
 		eerror "You cannot build wine with USE=opencl because intel-ocl-sdk is 64-bit only."
 		eerror "See https://bugs.gentoo.org/487864 for more details."
 		eerror
@@ -257,8 +260,7 @@ pkg_pretend() {
 
 	# Verify OSS support
 	if use oss && ! use kernel_FreeBSD; then
-		local oss_vers=$(best_version media-sound/oss)
-		if [[ -z ${oss_vers} ]] || ! version_is_at_least "4" ${oss_vers}; then
+		if ! has_version ">=media-sound/oss-4"; then
 			eerror "You cannot build wine with USE=oss without having support from a"
 			eerror "FreeBSD kernel or >=media-sound/oss-4 (only available through external repos)"
 			eerror
@@ -284,10 +286,8 @@ src_unpack() {
 		if use staging; then
 			local WINE_COMMIT=${EGIT_VERSION}
 
-			EGIT_REPO_URI=${STAGING_EGIT_REPO_URI}
-			unset ${PN}_LIVE_{REPO,BRANCH,COMMIT} EGIT_COMMIT;
-
-			EGIT_CHECKOUT_DIR=${STAGING_DIR} git-r3_src_unpack
+			git-r3_fetch "${STAGING_EGIT_REPO_URI}"
+			git-r3_checkout "${STAGING_EGIT_REPO_URI}" "${STAGING_DIR}"
 
 			local STAGING_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die
 
@@ -298,17 +298,12 @@ src_unpack() {
 			fi
 		fi
 		if use d3d9; then
-			EGIT_REPO_URI="${D3D9_EGIT_REPO_URI}"
-			unset ${PN}_LIVE_{REPO,BRANCH,COMMIT} EGIT_COMMIT;
-			EGIT_CHECKOUT_DIR="${D3D9_DIR}" git-r3_src_unpack
+			git-r3_fetch "${D3D9_EGIT_REPO_URI}"
+			git-r3_checkout "${D3D9_EGIT_REPO_URI}" "${D3D9_DIR}"
 		fi
-	else
-		unpack ${P}.tar.bz2
-		use staging && unpack "${STAGING_P}.tar.gz"
-		use d3d9 && unpack "${D3D9_P}.tar.gz"
 	fi
 
-	unpack "${WINE_GENTOO}.tar.bz2"
+	default
 
 	l10n_find_plocales_changes "${S}/po" "" ".po"
 }
@@ -335,7 +330,7 @@ src_prepare() {
 			cd "${STAGING_DIR}/patches"
 			source "${STAGING_DIR}/patches/patchinstall.sh"
 		)
-		eend $?
+		eend $? || die "Failed to apply Wine-Staging patches"
 
 		# To differentiate unofficial staging releases
 		if [[ ! -z ${SUFFIX} ]]; then
@@ -421,6 +416,7 @@ multilib_src_configure() {
 
 	use staging && myconf+=(
 		--with-xattr
+		$(use_with themes gtk3)
 		$(use_with vaapi va)
 	)
 	use d3d9 && myconf+=( $(use_with d3d9 d3dadapter) )
diff --git a/app-emulation/wine/wine-1.9.4-r2.ebuild b/app-emulation/wine/wine-1.9.4-r3.ebuild
index 0f6ce355c564..6a4d343f1e42 100644
--- a/app-emulation/wine/wine-1.9.4-r2.ebuild
+++ b/app-emulation/wine/wine-1.9.4-r3.ebuild
@@ -57,7 +57,7 @@ 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 kernel_FreeBSD +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"
+IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +fontconfig +gecko gphoto2 gsm gstreamer +jpeg kernel_FreeBSD +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 themes +threads +truetype +udisks v4l vaapi +X +xcomposite xinerama +xml"
 REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
 	X? ( truetype )
 	elibc_glibc? ( threads )
@@ -66,6 +66,7 @@ REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
 	pipelight? ( staging )
 	s3tc? ( staging )
 	test? ( abi_x86_32 )
+	themes? ( staging )
 	vaapi? ( staging )" # osmesa-opengl #286560 # X-truetype #551124
 
 # FIXME: the test suite is unsuitable for us; many tests require net access
@@ -111,6 +112,11 @@ COMMON_DEPEND="
 	scanner? ( media-gfx/sane-backends:=[${MULTILIB_USEDEP}] )
 	ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] )
 	staging? ( sys-apps/attr[${MULTILIB_USEDEP}] )
+	themes? (
+		dev-libs/glib:2[${MULTILIB_USEDEP}]
+		x11-libs/cairo[${MULTILIB_USEDEP}]
+		x11-libs/gtk+:3[${MULTILIB_USEDEP}]
+	)
 	truetype? ( >=media-libs/freetype-2.0.0[${MULTILIB_USEDEP}] )
 	udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
 	v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
@@ -188,8 +194,7 @@ wine_compiler_check() {
 			$(tc-getCC) -O2 "${FILESDIR}"/pr66838.c -o "${T}"/pr66838 || die
 			# Run in subshell to prevent "Aborted" message
 			( "${T}"/pr66838 || false ) >/dev/null 2>&1
-			eend $?
-			if [[ $? -ne 0 ]] ; then
+			if ! eend $?; then
 				eerror "64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0"
 				eerror "due to compiler bugs; please re-emerge the latest gcc-5.2.x ebuild,"
 				eerror "or use gcc-config to select a different compiler version."
@@ -202,9 +207,8 @@ wine_compiler_check() {
 		if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then
 			ebegin "Checking for gcc-5-3 stack realignment compiler bug"
 			# Compile in subshell to prevent "Aborted" message
-			( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${FILESDIR}"/pr69140.c -o "${T}"/pr69140 || false ) >/dev/null 2>&1
-			eend $?
-			if [[ $? -ne 0 ]] ; then
+			( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${FILESDIR}"/pr69140.c -o "${T}"/pr69140 ) >/dev/null 2>&1
+			if ! eend $?; then
 				eerror "Wine cannot be built with this version of gcc-5.3"
 				eerror "due to compiler bugs; please re-emerge the latest gcc-5.3.x ebuild,"
 				eerror "or use gcc-config to select a different compiler version."
@@ -220,8 +224,7 @@ wine_compiler_check() {
 		ebegin "Checking for 64-bit compiler with builtin_ms_va_list support"
 		# Compile in subshell to prevent "Aborted" message
 		( $(tc-getCC) -O2 "${FILESDIR}"/builtin_ms_va_list.c -o "${T}"/builtin_ms_va_list >/dev/null 2>&1)
-		eend $?
-		if [[ $? -ne 0 ]]; then
+		if ! eend $?; then
 			eerror "This version of $(tc-getCC) does not support builtin_ms_va_list, can't enable 64-bit wine"
 			eerror
 			eerror "You need gcc-4.4+ or clang 3.8+ to build 64-bit wine"
@@ -234,7 +237,7 @@ wine_compiler_check() {
 wine_build_environment_check() {
 	[[ ${MERGE_TYPE} = "binary" ]] && return 0
 
-	if use abi_x86_32 && use opencl && [[ x$(eselect opencl show 2> /dev/null) = "xintel" ]]; then
+	if use abi_x86_32 && use opencl && [[ "$(eselect opencl show 2> /dev/null)" == "intel" ]]; then
 		eerror "You cannot build wine with USE=opencl because intel-ocl-sdk is 64-bit only."
 		eerror "See https://bugs.gentoo.org/487864 for more details."
 		eerror
@@ -248,8 +251,7 @@ pkg_pretend() {
 
 	# Verify OSS support
 	if use oss && ! use kernel_FreeBSD; then
-		local oss_vers=$(best_version media-sound/oss)
-		if [[ -z ${oss_vers} ]] || ! version_is_at_least "4" ${oss_vers}; then
+		if ! has_version ">=media-sound/oss-4"; then
 			eerror "You cannot build wine with USE=oss without having support from a"
 			eerror "FreeBSD kernel or >=media-sound/oss-4 (only available through external repos)"
 			eerror
@@ -275,10 +277,8 @@ src_unpack() {
 		if use staging; then
 			local WINE_COMMIT=${EGIT_VERSION}
 
-			EGIT_REPO_URI=${STAGING_EGIT_REPO_URI}
-			unset ${PN}_LIVE_{REPO,BRANCH,COMMIT} EGIT_COMMIT;
-
-			EGIT_CHECKOUT_DIR=${STAGING_DIR} git-r3_src_unpack
+			git-r3_fetch "${STAGING_EGIT_REPO_URI}"
+			git-r3_checkout "${STAGING_EGIT_REPO_URI}" "${STAGING_DIR}"
 
 			local STAGING_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die
 
@@ -288,12 +288,9 @@ src_unpack() {
 				einfo "Example: EGIT_COMMIT=${STAGING_COMMIT} emerge -1 wine"
 			fi
 		fi
-	else
-		unpack ${P}.tar.bz2
-		use staging && unpack "${STAGING_P}.tar.gz"
 	fi
 
-	unpack "${WINE_GENTOO}.tar.bz2"
+	default
 
 	l10n_find_plocales_changes "${S}/po" "" ".po"
 }
@@ -322,7 +319,7 @@ src_prepare() {
 			cd "${STAGING_DIR}/patches"
 			source "${STAGING_DIR}/patches/patchinstall.sh"
 		)
-		eend $?
+		eend $? || die "Failed to apply Wine-Staging patches"
 
 		# To differentiate unofficial staging releases
 		if [[ ! -z ${SUFFIX} ]]; then
@@ -400,6 +397,7 @@ multilib_src_configure() {
 
 	use staging && myconf+=(
 		--with-xattr
+		$(use_with themes gtk3)
 		$(use_with vaapi va)
 	)
 
diff --git a/app-emulation/wine/wine-1.9.5-r2.ebuild b/app-emulation/wine/wine-1.9.5-r3.ebuild
index 717ef85883bc..e1865137f9c8 100644
--- a/app-emulation/wine/wine-1.9.5-r2.ebuild
+++ b/app-emulation/wine/wine-1.9.5-r3.ebuild
@@ -57,7 +57,7 @@ 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 kernel_FreeBSD +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"
+IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +fontconfig +gecko gphoto2 gsm gstreamer +jpeg kernel_FreeBSD +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 themes +threads +truetype +udisks v4l vaapi +X +xcomposite xinerama +xml"
 REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
 	X? ( truetype )
 	elibc_glibc? ( threads )
@@ -65,6 +65,7 @@ REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
 	pipelight? ( staging )
 	s3tc? ( staging )
 	test? ( abi_x86_32 )
+	themes? ( staging )
 	vaapi? ( staging )" # osmesa-opengl #286560 # X-truetype #551124
 
 # FIXME: the test suite is unsuitable for us; many tests require net access
@@ -110,6 +111,11 @@ COMMON_DEPEND="
 	scanner? ( media-gfx/sane-backends:=[${MULTILIB_USEDEP}] )
 	ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] )
 	staging? ( sys-apps/attr[${MULTILIB_USEDEP}] )
+	themes? (
+		dev-libs/glib:2[${MULTILIB_USEDEP}]
+		x11-libs/cairo[${MULTILIB_USEDEP}]
+		x11-libs/gtk+:3[${MULTILIB_USEDEP}]
+	)
 	truetype? ( >=media-libs/freetype-2.0.0[${MULTILIB_USEDEP}] )
 	udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
 	v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
@@ -187,8 +193,7 @@ wine_compiler_check() {
 			$(tc-getCC) -O2 "${FILESDIR}"/pr66838.c -o "${T}"/pr66838 || die
 			# Run in subshell to prevent "Aborted" message
 			( "${T}"/pr66838 || false ) >/dev/null 2>&1
-			eend $?
-			if [[ $? -ne 0 ]] ; then
+			if ! eend $?; then
 				eerror "64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0"
 				eerror "due to compiler bugs; please re-emerge the latest gcc-5.2.x ebuild,"
 				eerror "or use gcc-config to select a different compiler version."
@@ -201,9 +206,8 @@ wine_compiler_check() {
 		if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then
 			ebegin "Checking for gcc-5-3 stack realignment compiler bug"
 			# Compile in subshell to prevent "Aborted" message
-			( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${FILESDIR}"/pr69140.c -o "${T}"/pr69140 || false ) >/dev/null 2>&1
-			eend $?
-			if [[ $? -ne 0 ]] ; then
+			( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${FILESDIR}"/pr69140.c -o "${T}"/pr69140 ) >/dev/null 2>&1
+			if ! eend $?; then
 				eerror "Wine cannot be built with this version of gcc-5.3"
 				eerror "due to compiler bugs; please re-emerge the latest gcc-5.3.x ebuild,"
 				eerror "or use gcc-config to select a different compiler version."
@@ -219,8 +223,7 @@ wine_compiler_check() {
 		ebegin "Checking for 64-bit compiler with builtin_ms_va_list support"
 		# Compile in subshell to prevent "Aborted" message
 		( $(tc-getCC) -O2 "${FILESDIR}"/builtin_ms_va_list.c -o "${T}"/builtin_ms_va_list >/dev/null 2>&1)
-		eend $?
-		if [[ $? -ne 0 ]]; then
+		if ! eend $?; then
 			eerror "This version of $(tc-getCC) does not support builtin_ms_va_list, can't enable 64-bit wine"
 			eerror
 			eerror "You need gcc-4.4+ or clang 3.8+ to build 64-bit wine"
@@ -233,7 +236,7 @@ wine_compiler_check() {
 wine_build_environment_check() {
 	[[ ${MERGE_TYPE} = "binary" ]] && return 0
 
-	if use abi_x86_32 && use opencl && [[ x$(eselect opencl show 2> /dev/null) = "xintel" ]]; then
+	if use abi_x86_32 && use opencl && [[ "$(eselect opencl show 2> /dev/null)" == "intel" ]]; then
 		eerror "You cannot build wine with USE=opencl because intel-ocl-sdk is 64-bit only."
 		eerror "See https://bugs.gentoo.org/487864 for more details."
 		eerror
@@ -247,8 +250,7 @@ pkg_pretend() {
 
 	# Verify OSS support
 	if use oss && ! use kernel_FreeBSD; then
-		local oss_vers=$(best_version media-sound/oss)
-		if [[ -z ${oss_vers} ]] || ! version_is_at_least "4" ${oss_vers}; then
+		if ! has_version ">=media-sound/oss-4"; then
 			eerror "You cannot build wine with USE=oss without having support from a"
 			eerror "FreeBSD kernel or >=media-sound/oss-4 (only available through external repos)"
 			eerror
@@ -274,10 +276,8 @@ src_unpack() {
 		if use staging; then
 			local WINE_COMMIT=${EGIT_VERSION}
 
-			EGIT_REPO_URI=${STAGING_EGIT_REPO_URI}
-			unset ${PN}_LIVE_{REPO,BRANCH,COMMIT} EGIT_COMMIT;
-
-			EGIT_CHECKOUT_DIR=${STAGING_DIR} git-r3_src_unpack
+			git-r3_fetch "${STAGING_EGIT_REPO_URI}"
+			git-r3_checkout "${STAGING_EGIT_REPO_URI}" "${STAGING_DIR}"
 
 			local STAGING_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die
 
@@ -287,12 +287,9 @@ src_unpack() {
 				einfo "Example: EGIT_COMMIT=${STAGING_COMMIT} emerge -1 wine"
 			fi
 		fi
-	else
-		unpack ${P}.tar.bz2
-		use staging && unpack "${STAGING_P}.tar.gz"
 	fi
 
-	unpack "${WINE_GENTOO}.tar.bz2"
+	default
 
 	l10n_find_plocales_changes "${S}/po" "" ".po"
 }
@@ -324,7 +321,7 @@ src_prepare() {
 			cd "${STAGING_DIR}/patches"
 			source "${STAGING_DIR}/patches/patchinstall.sh"
 		)
-		eend $?
+		eend $? || die "Failed to apply Wine-Staging patches"
 
 		# To differentiate unofficial staging releases
 		if [[ ! -z ${SUFFIX} ]]; then
@@ -402,6 +399,7 @@ multilib_src_configure() {
 
 	use staging && myconf+=(
 		--with-xattr
+		$(use_with themes gtk3)
 		$(use_with vaapi va)
 	)
 
diff --git a/app-emulation/wine/wine-1.9.6-r2.ebuild b/app-emulation/wine/wine-1.9.6-r3.ebuild
index c52e2472d1b8..d91273b57d92 100644
--- a/app-emulation/wine/wine-1.9.6-r2.ebuild
+++ b/app-emulation/wine/wine-1.9.6-r3.ebuild
@@ -57,7 +57,7 @@ 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 kernel_FreeBSD +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"
+IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +fontconfig +gecko gphoto2 gsm gstreamer +jpeg kernel_FreeBSD +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 themes +threads +truetype +udisks v4l vaapi +X +xcomposite xinerama +xml"
 REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
 	X? ( truetype )
 	elibc_glibc? ( threads )
@@ -65,6 +65,7 @@ REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
 	pipelight? ( staging )
 	s3tc? ( staging )
 	test? ( abi_x86_32 )
+	themes? ( staging )
 	vaapi? ( staging )" # osmesa-opengl #286560 # X-truetype #551124
 
 # FIXME: the test suite is unsuitable for us; many tests require net access
@@ -110,6 +111,11 @@ COMMON_DEPEND="
 	scanner? ( media-gfx/sane-backends:=[${MULTILIB_USEDEP}] )
 	ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] )
 	staging? ( sys-apps/attr[${MULTILIB_USEDEP}] )
+	themes? (
+		dev-libs/glib:2[${MULTILIB_USEDEP}]
+		x11-libs/cairo[${MULTILIB_USEDEP}]
+		x11-libs/gtk+:3[${MULTILIB_USEDEP}]
+	)
 	truetype? ( >=media-libs/freetype-2.0.0[${MULTILIB_USEDEP}] )
 	udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
 	v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
@@ -187,8 +193,7 @@ wine_compiler_check() {
 			$(tc-getCC) -O2 "${FILESDIR}"/pr66838.c -o "${T}"/pr66838 || die
 			# Run in subshell to prevent "Aborted" message
 			( "${T}"/pr66838 || false ) >/dev/null 2>&1
-			eend $?
-			if [[ $? -ne 0 ]] ; then
+			if ! eend $?; then
 				eerror "64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0"
 				eerror "due to compiler bugs; please re-emerge the latest gcc-5.2.x ebuild,"
 				eerror "or use gcc-config to select a different compiler version."
@@ -201,9 +206,8 @@ wine_compiler_check() {
 		if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then
 			ebegin "Checking for gcc-5-3 stack realignment compiler bug"
 			# Compile in subshell to prevent "Aborted" message
-			( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${FILESDIR}"/pr69140.c -o "${T}"/pr69140 || false ) >/dev/null 2>&1
-			eend $?
-			if [[ $? -ne 0 ]] ; then
+			( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${FILESDIR}"/pr69140.c -o "${T}"/pr69140 ) >/dev/null 2>&1
+			if ! eend $?; then
 				eerror "Wine cannot be built with this version of gcc-5.3"
 				eerror "due to compiler bugs; please re-emerge the latest gcc-5.3.x ebuild,"
 				eerror "or use gcc-config to select a different compiler version."
@@ -219,8 +223,7 @@ wine_compiler_check() {
 		ebegin "Checking for 64-bit compiler with builtin_ms_va_list support"
 		# Compile in subshell to prevent "Aborted" message
 		( $(tc-getCC) -O2 "${FILESDIR}"/builtin_ms_va_list.c -o "${T}"/builtin_ms_va_list >/dev/null 2>&1)
-		eend $?
-		if [[ $? -ne 0 ]]; then
+		if ! eend $?; then
 			eerror "This version of $(tc-getCC) does not support builtin_ms_va_list, can't enable 64-bit wine"
 			eerror
 			eerror "You need gcc-4.4+ or clang 3.8+ to build 64-bit wine"
@@ -233,7 +236,7 @@ wine_compiler_check() {
 wine_build_environment_check() {
 	[[ ${MERGE_TYPE} = "binary" ]] && return 0
 
-	if use abi_x86_32 && use opencl && [[ x$(eselect opencl show 2> /dev/null) = "xintel" ]]; then
+	if use abi_x86_32 && use opencl && [[ "$(eselect opencl show 2> /dev/null)" == "intel" ]]; then
 		eerror "You cannot build wine with USE=opencl because intel-ocl-sdk is 64-bit only."
 		eerror "See https://bugs.gentoo.org/487864 for more details."
 		eerror
@@ -247,8 +250,7 @@ pkg_pretend() {
 
 	# Verify OSS support
 	if use oss && ! use kernel_FreeBSD; then
-		local oss_vers=$(best_version media-sound/oss)
-		if [[ -z ${oss_vers} ]] || ! version_is_at_least "4" ${oss_vers}; then
+		if ! has_version ">=media-sound/oss-4"; then
 			eerror "You cannot build wine with USE=oss without having support from a"
 			eerror "FreeBSD kernel or >=media-sound/oss-4 (only available through external repos)"
 			eerror
@@ -274,10 +276,8 @@ src_unpack() {
 		if use staging; then
 			local WINE_COMMIT=${EGIT_VERSION}
 
-			EGIT_REPO_URI=${STAGING_EGIT_REPO_URI}
-			unset ${PN}_LIVE_{REPO,BRANCH,COMMIT} EGIT_COMMIT;
-
-			EGIT_CHECKOUT_DIR=${STAGING_DIR} git-r3_src_unpack
+			git-r3_fetch "${STAGING_EGIT_REPO_URI}"
+			git-r3_checkout "${STAGING_EGIT_REPO_URI}" "${STAGING_DIR}"
 
 			local STAGING_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die
 
@@ -287,12 +287,9 @@ src_unpack() {
 				einfo "Example: EGIT_COMMIT=${STAGING_COMMIT} emerge -1 wine"
 			fi
 		fi
-	else
-		unpack ${P}.tar.bz2
-		use staging && unpack "${STAGING_P}.tar.gz"
 	fi
 
-	unpack "${WINE_GENTOO}.tar.bz2"
+	default
 
 	l10n_find_plocales_changes "${S}/po" "" ".po"
 }
@@ -321,7 +318,7 @@ src_prepare() {
 			cd "${STAGING_DIR}/patches"
 			source "${STAGING_DIR}/patches/patchinstall.sh"
 		)
-		eend $?
+		eend $? || die "Failed to apply Wine-Staging patches"
 
 		# To differentiate unofficial staging releases
 		if [[ ! -z ${SUFFIX} ]]; then
@@ -399,6 +396,7 @@ multilib_src_configure() {
 
 	use staging && myconf+=(
 		--with-xattr
+		$(use_with themes gtk3)
 		$(use_with vaapi va)
 	)
 
diff --git a/app-emulation/wine/wine-1.9.7-r2.ebuild b/app-emulation/wine/wine-1.9.7-r3.ebuild
index c52e2472d1b8..d91273b57d92 100644
--- a/app-emulation/wine/wine-1.9.7-r2.ebuild
+++ b/app-emulation/wine/wine-1.9.7-r3.ebuild
@@ -57,7 +57,7 @@ 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 kernel_FreeBSD +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"
+IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +fontconfig +gecko gphoto2 gsm gstreamer +jpeg kernel_FreeBSD +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 themes +threads +truetype +udisks v4l vaapi +X +xcomposite xinerama +xml"
 REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
 	X? ( truetype )
 	elibc_glibc? ( threads )
@@ -65,6 +65,7 @@ REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
 	pipelight? ( staging )
 	s3tc? ( staging )
 	test? ( abi_x86_32 )
+	themes? ( staging )
 	vaapi? ( staging )" # osmesa-opengl #286560 # X-truetype #551124
 
 # FIXME: the test suite is unsuitable for us; many tests require net access
@@ -110,6 +111,11 @@ COMMON_DEPEND="
 	scanner? ( media-gfx/sane-backends:=[${MULTILIB_USEDEP}] )
 	ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] )
 	staging? ( sys-apps/attr[${MULTILIB_USEDEP}] )
+	themes? (
+		dev-libs/glib:2[${MULTILIB_USEDEP}]
+		x11-libs/cairo[${MULTILIB_USEDEP}]
+		x11-libs/gtk+:3[${MULTILIB_USEDEP}]
+	)
 	truetype? ( >=media-libs/freetype-2.0.0[${MULTILIB_USEDEP}] )
 	udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
 	v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
@@ -187,8 +193,7 @@ wine_compiler_check() {
 			$(tc-getCC) -O2 "${FILESDIR}"/pr66838.c -o "${T}"/pr66838 || die
 			# Run in subshell to prevent "Aborted" message
 			( "${T}"/pr66838 || false ) >/dev/null 2>&1
-			eend $?
-			if [[ $? -ne 0 ]] ; then
+			if ! eend $?; then
 				eerror "64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0"
 				eerror "due to compiler bugs; please re-emerge the latest gcc-5.2.x ebuild,"
 				eerror "or use gcc-config to select a different compiler version."
@@ -201,9 +206,8 @@ wine_compiler_check() {
 		if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then
 			ebegin "Checking for gcc-5-3 stack realignment compiler bug"
 			# Compile in subshell to prevent "Aborted" message
-			( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${FILESDIR}"/pr69140.c -o "${T}"/pr69140 || false ) >/dev/null 2>&1
-			eend $?
-			if [[ $? -ne 0 ]] ; then
+			( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${FILESDIR}"/pr69140.c -o "${T}"/pr69140 ) >/dev/null 2>&1
+			if ! eend $?; then
 				eerror "Wine cannot be built with this version of gcc-5.3"
 				eerror "due to compiler bugs; please re-emerge the latest gcc-5.3.x ebuild,"
 				eerror "or use gcc-config to select a different compiler version."
@@ -219,8 +223,7 @@ wine_compiler_check() {
 		ebegin "Checking for 64-bit compiler with builtin_ms_va_list support"
 		# Compile in subshell to prevent "Aborted" message
 		( $(tc-getCC) -O2 "${FILESDIR}"/builtin_ms_va_list.c -o "${T}"/builtin_ms_va_list >/dev/null 2>&1)
-		eend $?
-		if [[ $? -ne 0 ]]; then
+		if ! eend $?; then
 			eerror "This version of $(tc-getCC) does not support builtin_ms_va_list, can't enable 64-bit wine"
 			eerror
 			eerror "You need gcc-4.4+ or clang 3.8+ to build 64-bit wine"
@@ -233,7 +236,7 @@ wine_compiler_check() {
 wine_build_environment_check() {
 	[[ ${MERGE_TYPE} = "binary" ]] && return 0
 
-	if use abi_x86_32 && use opencl && [[ x$(eselect opencl show 2> /dev/null) = "xintel" ]]; then
+	if use abi_x86_32 && use opencl && [[ "$(eselect opencl show 2> /dev/null)" == "intel" ]]; then
 		eerror "You cannot build wine with USE=opencl because intel-ocl-sdk is 64-bit only."
 		eerror "See https://bugs.gentoo.org/487864 for more details."
 		eerror
@@ -247,8 +250,7 @@ pkg_pretend() {
 
 	# Verify OSS support
 	if use oss && ! use kernel_FreeBSD; then
-		local oss_vers=$(best_version media-sound/oss)
-		if [[ -z ${oss_vers} ]] || ! version_is_at_least "4" ${oss_vers}; then
+		if ! has_version ">=media-sound/oss-4"; then
 			eerror "You cannot build wine with USE=oss without having support from a"
 			eerror "FreeBSD kernel or >=media-sound/oss-4 (only available through external repos)"
 			eerror
@@ -274,10 +276,8 @@ src_unpack() {
 		if use staging; then
 			local WINE_COMMIT=${EGIT_VERSION}
 
-			EGIT_REPO_URI=${STAGING_EGIT_REPO_URI}
-			unset ${PN}_LIVE_{REPO,BRANCH,COMMIT} EGIT_COMMIT;
-
-			EGIT_CHECKOUT_DIR=${STAGING_DIR} git-r3_src_unpack
+			git-r3_fetch "${STAGING_EGIT_REPO_URI}"
+			git-r3_checkout "${STAGING_EGIT_REPO_URI}" "${STAGING_DIR}"
 
 			local STAGING_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die
 
@@ -287,12 +287,9 @@ src_unpack() {
 				einfo "Example: EGIT_COMMIT=${STAGING_COMMIT} emerge -1 wine"
 			fi
 		fi
-	else
-		unpack ${P}.tar.bz2
-		use staging && unpack "${STAGING_P}.tar.gz"
 	fi
 
-	unpack "${WINE_GENTOO}.tar.bz2"
+	default
 
 	l10n_find_plocales_changes "${S}/po" "" ".po"
 }
@@ -321,7 +318,7 @@ src_prepare() {
 			cd "${STAGING_DIR}/patches"
 			source "${STAGING_DIR}/patches/patchinstall.sh"
 		)
-		eend $?
+		eend $? || die "Failed to apply Wine-Staging patches"
 
 		# To differentiate unofficial staging releases
 		if [[ ! -z ${SUFFIX} ]]; then
@@ -399,6 +396,7 @@ multilib_src_configure() {
 
 	use staging && myconf+=(
 		--with-xattr
+		$(use_with themes gtk3)
 		$(use_with vaapi va)
 	)
 
diff --git a/app-emulation/wine/wine-1.9.8-r1.ebuild b/app-emulation/wine/wine-1.9.8-r2.ebuild
index 2db9e5bfbea1..cc1f86d9239e 100644
--- a/app-emulation/wine/wine-1.9.8-r1.ebuild
+++ b/app-emulation/wine/wine-1.9.8-r2.ebuild
@@ -57,7 +57,7 @@ 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 kernel_FreeBSD +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"
+IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +fontconfig +gecko gphoto2 gsm gstreamer +jpeg kernel_FreeBSD +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 themes +threads +truetype +udisks v4l vaapi +X +xcomposite xinerama +xml"
 REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
 	X? ( truetype )
 	elibc_glibc? ( threads )
@@ -65,6 +65,7 @@ REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
 	pipelight? ( staging )
 	s3tc? ( staging )
 	test? ( abi_x86_32 )
+	themes? ( staging )
 	vaapi? ( staging )" # osmesa-opengl #286560 # X-truetype #551124
 
 # FIXME: the test suite is unsuitable for us; many tests require net access
@@ -110,6 +111,11 @@ COMMON_DEPEND="
 	scanner? ( media-gfx/sane-backends:=[${MULTILIB_USEDEP}] )
 	ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] )
 	staging? ( sys-apps/attr[${MULTILIB_USEDEP}] )
+	themes? (
+		dev-libs/glib:2[${MULTILIB_USEDEP}]
+		x11-libs/cairo[${MULTILIB_USEDEP}]
+		x11-libs/gtk+:3[${MULTILIB_USEDEP}]
+	)
 	truetype? ( >=media-libs/freetype-2.0.0[${MULTILIB_USEDEP}] )
 	udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
 	v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
@@ -187,8 +193,7 @@ wine_compiler_check() {
 			$(tc-getCC) -O2 "${FILESDIR}"/pr66838.c -o "${T}"/pr66838 || die
 			# Run in subshell to prevent "Aborted" message
 			( "${T}"/pr66838 || false ) >/dev/null 2>&1
-			eend $?
-			if [[ $? -ne 0 ]] ; then
+			if ! eend $?; then
 				eerror "64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0"
 				eerror "due to compiler bugs; please re-emerge the latest gcc-5.2.x ebuild,"
 				eerror "or use gcc-config to select a different compiler version."
@@ -201,9 +206,8 @@ wine_compiler_check() {
 		if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then
 			ebegin "Checking for gcc-5-3 stack realignment compiler bug"
 			# Compile in subshell to prevent "Aborted" message
-			( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${FILESDIR}"/pr69140.c -o "${T}"/pr69140 || false ) >/dev/null 2>&1
-			eend $?
-			if [[ $? -ne 0 ]] ; then
+			( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${FILESDIR}"/pr69140.c -o "${T}"/pr69140 ) >/dev/null 2>&1
+			if ! eend $?; then
 				eerror "Wine cannot be built with this version of gcc-5.3"
 				eerror "due to compiler bugs; please re-emerge the latest gcc-5.3.x ebuild,"
 				eerror "or use gcc-config to select a different compiler version."
@@ -219,8 +223,7 @@ wine_compiler_check() {
 		ebegin "Checking for 64-bit compiler with builtin_ms_va_list support"
 		# Compile in subshell to prevent "Aborted" message
 		( $(tc-getCC) -O2 "${FILESDIR}"/builtin_ms_va_list.c -o "${T}"/builtin_ms_va_list >/dev/null 2>&1)
-		eend $?
-		if [[ $? -ne 0 ]]; then
+		if ! eend $?; then
 			eerror "This version of $(tc-getCC) does not support builtin_ms_va_list, can't enable 64-bit wine"
 			eerror
 			eerror "You need gcc-4.4+ or clang 3.8+ to build 64-bit wine"
@@ -233,7 +236,7 @@ wine_compiler_check() {
 wine_build_environment_check() {
 	[[ ${MERGE_TYPE} = "binary" ]] && return 0
 
-	if use abi_x86_32 && use opencl && [[ x$(eselect opencl show 2> /dev/null) = "xintel" ]]; then
+	if use abi_x86_32 && use opencl && [[ "$(eselect opencl show 2> /dev/null)" == "intel" ]]; then
 		eerror "You cannot build wine with USE=opencl because intel-ocl-sdk is 64-bit only."
 		eerror "See https://bugs.gentoo.org/487864 for more details."
 		eerror
@@ -247,8 +250,7 @@ pkg_pretend() {
 
 	# Verify OSS support
 	if use oss && ! use kernel_FreeBSD; then
-		local oss_vers=$(best_version media-sound/oss)
-		if [[ -z ${oss_vers} ]] || ! version_is_at_least "4" ${oss_vers}; then
+		if ! has_version ">=media-sound/oss-4"; then
 			eerror "You cannot build wine with USE=oss without having support from a"
 			eerror "FreeBSD kernel or >=media-sound/oss-4 (only available through external repos)"
 			eerror
@@ -274,10 +276,8 @@ src_unpack() {
 		if use staging; then
 			local WINE_COMMIT=${EGIT_VERSION}
 
-			EGIT_REPO_URI=${STAGING_EGIT_REPO_URI}
-			unset ${PN}_LIVE_{REPO,BRANCH,COMMIT} EGIT_COMMIT;
-
-			EGIT_CHECKOUT_DIR=${STAGING_DIR} git-r3_src_unpack
+			git-r3_fetch "${STAGING_EGIT_REPO_URI}"
+			git-r3_checkout "${STAGING_EGIT_REPO_URI}" "${STAGING_DIR}"
 
 			local STAGING_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die
 
@@ -287,12 +287,9 @@ src_unpack() {
 				einfo "Example: EGIT_COMMIT=${STAGING_COMMIT} emerge -1 wine"
 			fi
 		fi
-	else
-		unpack ${P}.tar.bz2
-		use staging && unpack "${STAGING_P}.tar.gz"
 	fi
 
-	unpack "${WINE_GENTOO}.tar.bz2"
+	default
 
 	l10n_find_plocales_changes "${S}/po" "" ".po"
 }
@@ -321,7 +318,7 @@ src_prepare() {
 			cd "${STAGING_DIR}/patches"
 			source "${STAGING_DIR}/patches/patchinstall.sh"
 		)
-		eend $?
+		eend $? || die "Failed to apply Wine-Staging patches"
 
 		# To differentiate unofficial staging releases
 		if [[ ! -z ${SUFFIX} ]]; then
@@ -399,6 +396,7 @@ multilib_src_configure() {
 
 	use staging && myconf+=(
 		--with-xattr
+		$(use_with themes gtk3)
 		$(use_with vaapi va)
 	)
 
diff --git a/app-emulation/wine/wine-1.9.9-r2.ebuild b/app-emulation/wine/wine-1.9.9-r3.ebuild
index 26889d384dfc..24ef63d8023d 100644
--- a/app-emulation/wine/wine-1.9.9-r2.ebuild
+++ b/app-emulation/wine/wine-1.9.9-r3.ebuild
@@ -61,7 +61,7 @@ fi
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags d3d9 dos elibc_glibc +fontconfig +gecko gphoto2 gsm gstreamer +jpeg kernel_FreeBSD +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"
+IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags d3d9 dos elibc_glibc +fontconfig +gecko gphoto2 gsm gstreamer +jpeg kernel_FreeBSD +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 themes +threads +truetype +udisks v4l vaapi +X +xcomposite xinerama +xml"
 REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
 	X? ( truetype )
 	elibc_glibc? ( threads )
@@ -69,6 +69,7 @@ REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
 	pipelight? ( staging )
 	s3tc? ( staging )
 	test? ( abi_x86_32 )
+	themes? ( staging )
 	vaapi? ( staging )" # osmesa-opengl #286560 # X-truetype #551124
 
 # FIXME: the test suite is unsuitable for us; many tests require net access
@@ -120,6 +121,11 @@ COMMON_DEPEND="
 	scanner? ( media-gfx/sane-backends:=[${MULTILIB_USEDEP}] )
 	ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] )
 	staging? ( sys-apps/attr[${MULTILIB_USEDEP}] )
+	themes? (
+		dev-libs/glib:2[${MULTILIB_USEDEP}]
+		x11-libs/cairo[${MULTILIB_USEDEP}]
+		x11-libs/gtk+:3[${MULTILIB_USEDEP}]
+	)
 	truetype? ( >=media-libs/freetype-2.0.0[${MULTILIB_USEDEP}] )
 	udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
 	v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
@@ -197,8 +203,7 @@ wine_compiler_check() {
 			$(tc-getCC) -O2 "${FILESDIR}"/pr66838.c -o "${T}"/pr66838 || die
 			# Run in subshell to prevent "Aborted" message
 			( "${T}"/pr66838 || false ) >/dev/null 2>&1
-			eend $?
-			if [[ $? -ne 0 ]] ; then
+			if ! eend $?; then
 				eerror "64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0"
 				eerror "due to compiler bugs; please re-emerge the latest gcc-5.2.x ebuild,"
 				eerror "or use gcc-config to select a different compiler version."
@@ -211,9 +216,8 @@ wine_compiler_check() {
 		if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then
 			ebegin "Checking for gcc-5-3 stack realignment compiler bug"
 			# Compile in subshell to prevent "Aborted" message
-			( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${FILESDIR}"/pr69140.c -o "${T}"/pr69140 || false ) >/dev/null 2>&1
-			eend $?
-			if [[ $? -ne 0 ]] ; then
+			( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${FILESDIR}"/pr69140.c -o "${T}"/pr69140 ) >/dev/null 2>&1
+			if ! eend $?; then
 				eerror "Wine cannot be built with this version of gcc-5.3"
 				eerror "due to compiler bugs; please re-emerge the latest gcc-5.3.x ebuild,"
 				eerror "or use gcc-config to select a different compiler version."
@@ -229,8 +233,7 @@ wine_compiler_check() {
 		ebegin "Checking for 64-bit compiler with builtin_ms_va_list support"
 		# Compile in subshell to prevent "Aborted" message
 		( $(tc-getCC) -O2 "${FILESDIR}"/builtin_ms_va_list.c -o "${T}"/builtin_ms_va_list >/dev/null 2>&1)
-		eend $?
-		if [[ $? -ne 0 ]]; then
+		if ! eend $?; then
 			eerror "This version of $(tc-getCC) does not support builtin_ms_va_list, can't enable 64-bit wine"
 			eerror
 			eerror "You need gcc-4.4+ or clang 3.8+ to build 64-bit wine"
@@ -243,7 +246,7 @@ wine_compiler_check() {
 wine_build_environment_check() {
 	[[ ${MERGE_TYPE} = "binary" ]] && return 0
 
-	if use abi_x86_32 && use opencl && [[ x$(eselect opencl show 2> /dev/null) = "xintel" ]]; then
+	if use abi_x86_32 && use opencl && [[ "$(eselect opencl show 2> /dev/null)" == "intel" ]]; then
 		eerror "You cannot build wine with USE=opencl because intel-ocl-sdk is 64-bit only."
 		eerror "See https://bugs.gentoo.org/487864 for more details."
 		eerror
@@ -257,8 +260,7 @@ pkg_pretend() {
 
 	# Verify OSS support
 	if use oss && ! use kernel_FreeBSD; then
-		local oss_vers=$(best_version media-sound/oss)
-		if [[ -z ${oss_vers} ]] || ! version_is_at_least "4" ${oss_vers}; then
+		if ! has_version ">=media-sound/oss-4"; then
 			eerror "You cannot build wine with USE=oss without having support from a"
 			eerror "FreeBSD kernel or >=media-sound/oss-4 (only available through external repos)"
 			eerror
@@ -284,10 +286,8 @@ src_unpack() {
 		if use staging; then
 			local WINE_COMMIT=${EGIT_VERSION}
 
-			EGIT_REPO_URI=${STAGING_EGIT_REPO_URI}
-			unset ${PN}_LIVE_{REPO,BRANCH,COMMIT} EGIT_COMMIT;
-
-			EGIT_CHECKOUT_DIR=${STAGING_DIR} git-r3_src_unpack
+			git-r3_fetch "${STAGING_EGIT_REPO_URI}"
+			git-r3_checkout "${STAGING_EGIT_REPO_URI}" "${STAGING_DIR}"
 
 			local STAGING_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die
 
@@ -298,17 +298,12 @@ src_unpack() {
 			fi
 		fi
 		if use d3d9; then
-			EGIT_REPO_URI="${D3D9_EGIT_REPO_URI}"
-			unset ${PN}_LIVE_{REPO,BRANCH,COMMIT} EGIT_COMMIT;
-			EGIT_CHECKOUT_DIR="${D3D9_DIR}" git-r3_src_unpack
+			git-r3_fetch "${D3D9_EGIT_REPO_URI}"
+			git-r3_checkout "${D3D9_EGIT_REPO_URI}" "${D3D9_DIR}"
 		fi
-	else
-		unpack ${P}.tar.bz2
-		use staging && unpack "${STAGING_P}.tar.gz"
-		use d3d9 && unpack "${D3D9_P}.tar.gz"
 	fi
 
-	unpack "${WINE_GENTOO}.tar.bz2"
+	default
 
 	l10n_find_plocales_changes "${S}/po" "" ".po"
 }
@@ -336,7 +331,7 @@ src_prepare() {
 			cd "${STAGING_DIR}/patches"
 			source "${STAGING_DIR}/patches/patchinstall.sh"
 		)
-		eend $?
+		eend $? || die "Failed to apply Wine-Staging patches"
 
 		# To differentiate unofficial staging releases
 		if [[ ! -z ${SUFFIX} ]]; then
@@ -422,6 +417,7 @@ multilib_src_configure() {
 
 	use staging && myconf+=(
 		--with-xattr
+		$(use_with themes gtk3)
 		$(use_with vaapi va)
 	)
 	use d3d9 && myconf+=( $(use_with d3d9 d3dadapter) )
diff --git a/app-emulation/wine/wine-9999.ebuild b/app-emulation/wine/wine-9999.ebuild
index f1c142df4b7b..8bedf3424818 100644
--- a/app-emulation/wine/wine-9999.ebuild
+++ b/app-emulation/wine/wine-9999.ebuild
@@ -61,7 +61,7 @@ fi
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags d3d9 dos elibc_glibc +fontconfig +gecko gphoto2 gsm gstreamer +jpeg kernel_FreeBSD +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"
+IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags d3d9 dos elibc_glibc +fontconfig +gecko gphoto2 gsm gstreamer +jpeg kernel_FreeBSD +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 themes +threads +truetype +udisks v4l vaapi +X +xcomposite xinerama +xml"
 REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
 	X? ( truetype )
 	elibc_glibc? ( threads )
@@ -69,6 +69,7 @@ REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
 	pipelight? ( staging )
 	s3tc? ( staging )
 	test? ( abi_x86_32 )
+	themes? ( staging )
 	vaapi? ( staging )" # osmesa-opengl #286560 # X-truetype #551124
 
 # FIXME: the test suite is unsuitable for us; many tests require net access
@@ -120,6 +121,11 @@ COMMON_DEPEND="
 	scanner? ( media-gfx/sane-backends:=[${MULTILIB_USEDEP}] )
 	ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] )
 	staging? ( sys-apps/attr[${MULTILIB_USEDEP}] )
+	themes? (
+		dev-libs/glib:2[${MULTILIB_USEDEP}]
+		x11-libs/cairo[${MULTILIB_USEDEP}]
+		x11-libs/gtk+:3[${MULTILIB_USEDEP}]
+	)
 	truetype? ( >=media-libs/freetype-2.0.0[${MULTILIB_USEDEP}] )
 	udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
 	v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
@@ -197,8 +203,7 @@ wine_compiler_check() {
 			$(tc-getCC) -O2 "${FILESDIR}"/pr66838.c -o "${T}"/pr66838 || die
 			# Run in subshell to prevent "Aborted" message
 			( "${T}"/pr66838 || false ) >/dev/null 2>&1
-			eend $?
-			if [[ $? -ne 0 ]] ; then
+			if ! eend $?; then
 				eerror "64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0"
 				eerror "due to compiler bugs; please re-emerge the latest gcc-5.2.x ebuild,"
 				eerror "or use gcc-config to select a different compiler version."
@@ -211,9 +216,8 @@ wine_compiler_check() {
 		if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then
 			ebegin "Checking for gcc-5-3 stack realignment compiler bug"
 			# Compile in subshell to prevent "Aborted" message
-			( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${FILESDIR}"/pr69140.c -o "${T}"/pr69140 || false ) >/dev/null 2>&1
-			eend $?
-			if [[ $? -ne 0 ]] ; then
+			( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${FILESDIR}"/pr69140.c -o "${T}"/pr69140 ) >/dev/null 2>&1
+			if ! eend $?; then
 				eerror "Wine cannot be built with this version of gcc-5.3"
 				eerror "due to compiler bugs; please re-emerge the latest gcc-5.3.x ebuild,"
 				eerror "or use gcc-config to select a different compiler version."
@@ -229,8 +233,7 @@ wine_compiler_check() {
 		ebegin "Checking for 64-bit compiler with builtin_ms_va_list support"
 		# Compile in subshell to prevent "Aborted" message
 		( $(tc-getCC) -O2 "${FILESDIR}"/builtin_ms_va_list.c -o "${T}"/builtin_ms_va_list >/dev/null 2>&1)
-		eend $?
-		if [[ $? -ne 0 ]]; then
+		if ! eend $?; then
 			eerror "This version of $(tc-getCC) does not support builtin_ms_va_list, can't enable 64-bit wine"
 			eerror
 			eerror "You need gcc-4.4+ or clang 3.8+ to build 64-bit wine"
@@ -243,7 +246,7 @@ wine_compiler_check() {
 wine_build_environment_check() {
 	[[ ${MERGE_TYPE} = "binary" ]] && return 0
 
-	if use abi_x86_32 && use opencl && [[ x$(eselect opencl show 2> /dev/null) = "xintel" ]]; then
+	if use abi_x86_32 && use opencl && [[ "$(eselect opencl show 2> /dev/null)" == "intel" ]]; then
 		eerror "You cannot build wine with USE=opencl because intel-ocl-sdk is 64-bit only."
 		eerror "See https://bugs.gentoo.org/487864 for more details."
 		eerror
@@ -257,8 +260,7 @@ pkg_pretend() {
 
 	# Verify OSS support
 	if use oss && ! use kernel_FreeBSD; then
-		local oss_vers=$(best_version media-sound/oss)
-		if [[ -z ${oss_vers} ]] || ! version_is_at_least "4" ${oss_vers}; then
+		if ! has_version ">=media-sound/oss-4"; then
 			eerror "You cannot build wine with USE=oss without having support from a"
 			eerror "FreeBSD kernel or >=media-sound/oss-4 (only available through external repos)"
 			eerror
@@ -284,10 +286,8 @@ src_unpack() {
 		if use staging; then
 			local WINE_COMMIT=${EGIT_VERSION}
 
-			EGIT_REPO_URI=${STAGING_EGIT_REPO_URI}
-			unset ${PN}_LIVE_{REPO,BRANCH,COMMIT} EGIT_COMMIT;
-
-			EGIT_CHECKOUT_DIR=${STAGING_DIR} git-r3_src_unpack
+			git-r3_fetch "${STAGING_EGIT_REPO_URI}"
+			git-r3_checkout "${STAGING_EGIT_REPO_URI}" "${STAGING_DIR}"
 
 			local STAGING_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die
 
@@ -298,17 +298,12 @@ src_unpack() {
 			fi
 		fi
 		if use d3d9; then
-			EGIT_REPO_URI="${D3D9_EGIT_REPO_URI}"
-			unset ${PN}_LIVE_{REPO,BRANCH,COMMIT} EGIT_COMMIT;
-			EGIT_CHECKOUT_DIR="${D3D9_DIR}" git-r3_src_unpack
+			git-r3_fetch "${D3D9_EGIT_REPO_URI}"
+			git-r3_checkout "${D3D9_EGIT_REPO_URI}" "${D3D9_DIR}"
 		fi
-	else
-		unpack ${P}.tar.bz2
-		use staging && unpack "${STAGING_P}.tar.gz"
-		use d3d9 && unpack "${D3D9_P}.tar.gz"
 	fi
 
-	unpack "${WINE_GENTOO}.tar.bz2"
+	default
 
 	l10n_find_plocales_changes "${S}/po" "" ".po"
 }
@@ -335,7 +330,7 @@ src_prepare() {
 			cd "${STAGING_DIR}/patches"
 			source "${STAGING_DIR}/patches/patchinstall.sh"
 		)
-		eend $?
+		eend $? || die "Failed to apply Wine-Staging patches"
 
 		# To differentiate unofficial staging releases
 		if [[ ! -z ${SUFFIX} ]]; then
@@ -421,6 +416,7 @@ multilib_src_configure() {
 
 	use staging && myconf+=(
 		--with-xattr
+		$(use_with themes gtk3)
 		$(use_with vaapi va)
 	)
 	use d3d9 && myconf+=( $(use_with d3d9 d3dadapter) )