cleanup

35 files changed, 378 insertions, 2970 deletions

diff --git a/app-arch/lld/Manifest b/app-arch/lld/Manifest
deleted file mode 100644
index ee1664c..0000000
--- a/app-arch/lld/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-EBUILD lld-9999.ebuild 1832 SHA256 4de8cd516d7ec6c28875f945f613dffc5242bf1a499d74495128a12d77a20c68 SHA512 e337018a78f769b15a8bf446f4971207861a1145d991bc3b192a16260e5923d68522913b71da6527749f9bd0b0dad9029ccf959f2e4ec6cc8ea6fad57faf2675 WHIRLPOOL bc77d243fb85126f6db9567825198713c313d7ef3d5c6cc0b2953abe82f192faa76ef9ed891751cb0b4f273e9b94a3a02c30d9b8e6338680d0f3dd2d3fa5b061
-MISC metadata.xml 251 SHA256 71226737033a1091dcc8c1dcfcce629c3dcdcd96a7ca109753e419ed0089b782 SHA512 31994542b20237c0cf5e07475018b7d3d2e820da86d36b51b30332b660421a0bcd7b3583854770c1380fd474edf8047ada5d7835a6261aad4bb1dcf1724d5607 WHIRLPOOL cf9f47c00107cf68f601d67c47f4a734f45c85c71d959cdaca5e2cf9ee26a97943837dd0ba15d0ef9a16ea94300ef62ae4daf66599455ed6aae8b61ef4ac9feb
diff --git a/app-arch/lld/lld-9999.ebuild b/app-arch/lld/lld-9999.ebuild
index 9a7c816..361388b 100644
--- a/app-arch/lld/lld-9999.ebuild
+++ b/app-arch/lld/lld-9999.ebuild
@@ -1,6 +1,7 @@
-# By Eroen, 2013
-# Distributed under the terms of the ISC License
-# $Header: $
+# By eroen <eroen-overlay@occam.eroen.eu>, 2013 - 2016
+# Permission to use, copy, modify, and/or distribute this software for any
+# purpose with or without fee is hereby granted, provided that the above
+# copyright notice and this permission notice appear in all copies.
 
 EAPI=5
 
@@ -13,13 +14,13 @@ SRC_URI=""
 
 LICENSE="UoI-NCSA"
 SLOT="0"
-KEYWORDS="~amd64"
+#KEYWORDS="~amd64"
 IUSE=""
 
 LIBDEPEND="
 	|| ( ( 	>=sys-devel/clang-3.1
 			sys-libs/libcxx )
-		>=sys-devel/gcc-4.7 )
+		>=sys-devel/gcc-4.7:* )
 "
 RDEPEND="${LIBDEPEND}"
 DEPEND="${LIBDEPEND}"
diff --git a/app-arch/lld/metadata.xml b/app-arch/lld/metadata.xml
index a7a544e..f20a271 100644
--- a/app-arch/lld/metadata.xml
+++ b/app-arch/lld/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="person">
+		<email>eroen-overlay@occam.eroen.eu</email>
+		<name>eroen</name>
+	</maintainer>
 	<longdescription lang="en">
 		lld is a new set of modular code for creating linker tools.
 	</longdescription>
 </pkgmetadata>
-
diff --git a/app-emulation/wine-compholio/wine-compholio-1.7.26.ebuild b/app-emulation/wine-compholio/wine-compholio-1.7.26.ebuild
index a510d43..16fff43 100644
--- a/app-emulation/wine-compholio/wine-compholio-1.7.26.ebuild
+++ b/app-emulation/wine-compholio/wine-compholio-1.7.26.ebuild
@@ -26,7 +26,7 @@ fi
 GV="2.24"
 MV="4.5.2"
 WINE_GENTOO="wine-gentoo-2013.06.24"
-DESCRIPTION="Special build of wine with patches to make a variety of Windows applications work out of the box"
+DESCRIPTION="Special build of wine with patches to make more applications work out of the box"
 HOMEPAGE="http://www.compholio.com/wine-compholio/"
 SRC_URI="${SRC_URI}
 	gecko? (
diff --git a/app-emulation/wine/wine-1.7.13.ebuild b/app-emulation/wine/wine-1.7.13.ebuild
index ea58f39..fe63b95 100644
--- a/app-emulation/wine/wine-1.7.13.ebuild
+++ b/app-emulation/wine/wine-1.7.13.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.13.ebuild,v 1.1 2014/02/21 06:31:47 tetromino Exp $
+# $Header: $
 
 EAPI="5"
 
@@ -96,111 +96,85 @@ COMMON_DEPEND="
 	amd64? (
 		abi_x86_64? ( ${NATIVE_DEPEND} )
 		abi_x86_32? (
-			truetype? ( || (
-				>=app-emulation/emul-linux-x86-xlibs-2.1[development]
+			truetype? (
 				>=media-libs/freetype-2.0.0[abi_x86_32]
-			) )
-			ncurses? ( || (
-				app-emulation/emul-linux-x86-baselibs[development]
+			)
+			ncurses? (
 				sys-libs/ncurses[abi_x86_32]
-			) )
-			udisks? ( || (
-				>=app-emulation/emul-linux-x86-baselibs-20130224[development]
+			)
+			udisks? (
 				sys-apps/dbus[abi_x86_32]
-			) )
-			fontconfig? ( || (
-				app-emulation/emul-linux-x86-xlibs[development]
+			)
+			fontconfig? (
 				media-libs/fontconfig[abi_x86_32]
-			) )
+			)
 			gphoto2? (
 				app-emulation/emul-linux-x86-medialibs[development]
 			)
-			openal? ( || (
-				app-emulation/emul-linux-x86-sdl[development]
+			openal? (
 				media-libs/openal[abi_x86_32]
-			) )
+			)
 			gstreamer? (
 				app-emulation/emul-linux-x86-gstplugins
 				app-emulation/emul-linux-x86-medialibs[development]
 			)
-			X? ( || (
-				app-emulation/emul-linux-x86-xlibs[development]
-				(
+			X? (
 					x11-libs/libXcursor[abi_x86_32]
 					x11-libs/libXext[abi_x86_32]
 					x11-libs/libXrandr[abi_x86_32]
 					x11-libs/libXi[abi_x86_32]
 					x11-libs/libXxf86vm[abi_x86_32]
-				)
-			) )
-			xinerama? ( || (
-				app-emulation/emul-linux-x86-xlibs[development]
+			)
+			xinerama? (
 				x11-libs/libXinerama[abi_x86_32]
-			) )
-			alsa? ( || (
-				app-emulation/emul-linux-x86-soundlibs[alsa,development]
+			)
+			alsa? (
 				media-libs/alsa-lib[abi_x86_32]
-			) )
+			)
 			cups? ( app-emulation/emul-linux-x86-baselibs )
 			opencl? ( virtual/opencl[abi_x86_32] )
-			opengl? ( || (
-				app-emulation/emul-linux-x86-opengl[development]
-				(
+			opengl? (
 					virtual/glu[abi_x86_32]
 					virtual/opengl[abi_x86_32]
-				)
-			) )
-			gsm? ( || (
-				app-emulation/emul-linux-x86-soundlibs[development]
+			)
+			gsm? (
 				media-sound/gsm[abi_x86_32]
-			) )
-			jpeg? ( || (
-				app-emulation/emul-linux-x86-baselibs[development]
+			)
+			jpeg? (
 				virtual/jpeg:0[abi_x86_32]
-			) )
+			)
 			ldap? ( app-emulation/emul-linux-x86-baselibs[development] )
-			lcms? ( || (
-				app-emulation/emul-linux-x86-baselibs[development]
+			lcms? (
 				media-libs/lcms:2[abi_x86_32]
-			) )
-			mp3? ( || (
-				app-emulation/emul-linux-x86-soundlibs[development]
+			)
+			mp3? (
 				>=media-sound/mpg123-1.5.0[abi_x86_32]
-			) )
-			nls? ( || (
-				app-emulation/emul-linux-x86-baselibs[development]
+			)
+			nls? (
 				sys-devel/gettext[abi_x86_32]
-			) )
+			)
 			odbc? ( app-emulation/emul-linux-x86-db[development] )
-			osmesa? ( || (
-				>=app-emulation/emul-linux-x86-opengl-20121028[development]
+			osmesa? (
 				media-libs/mesa[osmesa,abi_x86_32]
-			) )
-			pulseaudio? ( || (
-				app-emulation/emul-linux-x86-soundlibs[development]
+			)
+			pulseaudio? (
 				>=media-sound/pulseaudio-4.0-r1[abi_x86_32]
-			) )
-			xml? ( || (
-				>=app-emulation/emul-linux-x86-baselibs-20131008[development]
-				(
+			)
+			xml? (
 					dev-libs/libxml2[abi_x86_32]
 					dev-libs/libxslt[abi_x86_32]
-				)
-			) )
+			)
 			scanner? ( app-emulation/emul-linux-x86-medialibs[development] )
 			ssl? ( app-emulation/emul-linux-x86-baselibs[development] )
-			png? ( || (
-				app-emulation/emul-linux-x86-baselibs[development]
+			png? (
 				media-libs/libpng:0[abi_x86_32]
-			) )
-			v4l? ( || (
-				app-emulation/emul-linux-x86-medialibs[development]
+			)
+			v4l? (
 				media-libs/libv4l[abi_x86_32]
-			) )
-			xcomposite? ( || (
-				app-emulation/emul-linux-x86-xlibs[development]
+			)
+			xcomposite? (
 				x11-libs/libXcomposite[abi_x86_32]
-			) )
+			)
 		)
 	)"
 
diff --git a/app-emulation/wine/wine-1.7.14.ebuild b/app-emulation/wine/wine-1.7.14.ebuild
index f9b4dd6..88b7471 100644..120000
--- a/app-emulation/wine/wine-1.7.14.ebuild
+++ b/app-emulation/wine/wine-1.7.14.ebuild
@@ -1,453 +1 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.14.ebuild,v 1.1 2014/03/08 04:35:53 tetromino Exp $
-
-EAPI="5"
-
-AUTOTOOLS_AUTORECONF=1
-PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv te th tr uk wa zh_CN zh_TW"
-PLOCALE_BACKUP="en"
-
-inherit autotools-multilib eutils fdo-mime flag-o-matic gnome2-utils l10n multilib pax-utils toolchain-funcs virtualx
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="git://source.winehq.org/git/wine.git"
-	inherit git-2
-	SRC_URI=""
-	#KEYWORDS=""
-else
-	MY_P="${PN}-${PV/_/-}"
-	SRC_URI="mirror://sourceforge/${PN}/Source/${MY_P}.tar.bz2"
-	KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
-	S=${WORKDIR}/${MY_P}
-fi
-
-GV="2.24"
-MV="4.5.2"
-PULSE_PATCHES="winepulse-patches-1.7.12"
-WINE_GENTOO="wine-gentoo-2013.06.24"
-DESCRIPTION="Free implementation of Windows(tm) on Unix"
-HOMEPAGE="http://www.winehq.org/"
-SRC_URI="${SRC_URI}
-	gecko? (
-		abi_x86_32? ( mirror://sourceforge/${PN}/Wine%20Gecko/${GV}/wine_gecko-${GV}-x86.msi )
-		abi_x86_64? ( mirror://sourceforge/${PN}/Wine%20Gecko/${GV}/wine_gecko-${GV}-x86_64.msi )
-	)
-	mono? ( mirror://sourceforge/${PN}/Wine%20Mono/${MV}/wine-mono-${MV}.msi )
-	pulseaudio? ( http://dev.gentoo.org/~tetromino/distfiles/${PN}/${PULSE_PATCHES}.tar.bz2 )
-	http://dev.gentoo.org/~tetromino/distfiles/${PN}/${WINE_GENTOO}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +fontconfig +gecko gphoto2 gsm gstreamer +jpeg lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl +png +prelink pulseaudio +realtime +run-exes samba scanner selinux +ssl swtor teso test +threads +truetype +udisks v4l +X xcomposite xinerama +xml"
-REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
-	test? ( abi_x86_32 )
-	elibc_glibc? ( threads )
-	mono? ( abi_x86_32 )
-	osmesa? ( opengl )" #286560
-
-# FIXME: the test suite is unsuitable for us; many tests require net access
-# or fail due to Xvfb's opengl limitations.
-RESTRICT="test"
-
-NATIVE_DEPEND="
-	truetype? ( >=media-libs/freetype-2.0.0  )
-	capi? ( net-dialup/capi4k-utils )
-	ncurses? ( >=sys-libs/ncurses-5.2:= )
-	udisks? ( sys-apps/dbus )
-	fontconfig? ( media-libs/fontconfig:= )
-	gphoto2? ( media-libs/libgphoto2:= )
-	openal? ( media-libs/openal:= )
-	gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 )
-	X? (
-		x11-libs/libXcursor
-		x11-libs/libXext
-		x11-libs/libXrandr
-		x11-libs/libXi
-		x11-libs/libXxf86vm
-	)
-	xinerama? ( x11-libs/libXinerama )
-	alsa? ( media-libs/alsa-lib )
-	cups? ( net-print/cups:= )
-	opencl? ( virtual/opencl )
-	opengl? (
-		virtual/glu
-		virtual/opengl
-	)
-	gsm? ( media-sound/gsm:= )
-	jpeg? ( virtual/jpeg:0= )
-	ldap? ( net-nds/openldap:= )
-	lcms? ( media-libs/lcms:2= )
-	mp3? ( >=media-sound/mpg123-1.5.0 )
-	netapi? ( net-fs/samba[netapi(+)] )
-	nls? ( sys-devel/gettext )
-	odbc? ( dev-db/unixODBC:= )
-	osmesa? ( media-libs/mesa[osmesa] )
-	pulseaudio? ( media-sound/pulseaudio )
-	xml? ( dev-libs/libxml2 dev-libs/libxslt )
-	scanner? ( media-gfx/sane-backends:= )
-	ssl? ( net-libs/gnutls:= )
-	png? ( media-libs/libpng:0= )
-	v4l? ( media-libs/libv4l )
-	xcomposite? ( x11-libs/libXcomposite )"
-
-COMMON_DEPEND="
-	!amd64? ( ${NATIVE_DEPEND} )
-	amd64? (
-		abi_x86_64? ( ${NATIVE_DEPEND} )
-		abi_x86_32? (
-			truetype? ( || (
-				>=app-emulation/emul-linux-x86-xlibs-2.1[development]
-				>=media-libs/freetype-2.0.0[abi_x86_32]
-			) )
-			ncurses? ( || (
-				app-emulation/emul-linux-x86-baselibs[development]
-				sys-libs/ncurses[abi_x86_32]
-			) )
-			udisks? ( || (
-				>=app-emulation/emul-linux-x86-baselibs-20130224[development]
-				sys-apps/dbus[abi_x86_32]
-			) )
-			fontconfig? ( || (
-				app-emulation/emul-linux-x86-xlibs[development]
-				media-libs/fontconfig[abi_x86_32]
-			) )
-			gphoto2? (
-				app-emulation/emul-linux-x86-medialibs[development]
-			)
-			openal? ( || (
-				app-emulation/emul-linux-x86-sdl[development]
-				media-libs/openal[abi_x86_32]
-			) )
-			gstreamer? (
-				app-emulation/emul-linux-x86-gstplugins
-				app-emulation/emul-linux-x86-medialibs[development]
-			)
-			X? ( || (
-				app-emulation/emul-linux-x86-xlibs[development]
-				(
-					x11-libs/libXcursor[abi_x86_32]
-					x11-libs/libXext[abi_x86_32]
-					x11-libs/libXrandr[abi_x86_32]
-					x11-libs/libXi[abi_x86_32]
-					x11-libs/libXxf86vm[abi_x86_32]
-				)
-			) )
-			xinerama? ( || (
-				app-emulation/emul-linux-x86-xlibs[development]
-				x11-libs/libXinerama[abi_x86_32]
-			) )
-			alsa? ( || (
-				app-emulation/emul-linux-x86-soundlibs[alsa,development]
-				media-libs/alsa-lib[abi_x86_32]
-			) )
-			cups? ( app-emulation/emul-linux-x86-baselibs )
-			opencl? ( virtual/opencl[abi_x86_32] )
-			opengl? ( || (
-				app-emulation/emul-linux-x86-opengl[development]
-				(
-					virtual/glu[abi_x86_32]
-					virtual/opengl[abi_x86_32]
-				)
-			) )
-			gsm? ( || (
-				app-emulation/emul-linux-x86-soundlibs[development]
-				media-sound/gsm[abi_x86_32]
-			) )
-			jpeg? ( || (
-				app-emulation/emul-linux-x86-baselibs[development]
-				virtual/jpeg:0[abi_x86_32]
-			) )
-			ldap? ( app-emulation/emul-linux-x86-baselibs[development] )
-			lcms? ( || (
-				app-emulation/emul-linux-x86-baselibs[development]
-				media-libs/lcms:2[abi_x86_32]
-			) )
-			mp3? ( || (
-				app-emulation/emul-linux-x86-soundlibs[development]
-				>=media-sound/mpg123-1.5.0[abi_x86_32]
-			) )
-			nls? ( || (
-				app-emulation/emul-linux-x86-baselibs[development]
-				sys-devel/gettext[abi_x86_32]
-			) )
-			odbc? ( app-emulation/emul-linux-x86-db[development] )
-			osmesa? ( || (
-				>=app-emulation/emul-linux-x86-opengl-20121028[development]
-				media-libs/mesa[osmesa,abi_x86_32]
-			) )
-			pulseaudio? ( || (
-				app-emulation/emul-linux-x86-soundlibs[development]
-				>=media-sound/pulseaudio-4.0-r1[abi_x86_32]
-			) )
-			xml? ( || (
-				>=app-emulation/emul-linux-x86-baselibs-20131008[development]
-				(
-					dev-libs/libxml2[abi_x86_32]
-					dev-libs/libxslt[abi_x86_32]
-				)
-			) )
-			scanner? ( app-emulation/emul-linux-x86-medialibs[development] )
-			ssl? ( app-emulation/emul-linux-x86-baselibs[development] )
-			png? ( || (
-				app-emulation/emul-linux-x86-baselibs[development]
-				media-libs/libpng:0[abi_x86_32]
-			) )
-			v4l? ( || (
-				app-emulation/emul-linux-x86-medialibs[development]
-				media-libs/libv4l[abi_x86_32]
-			) )
-			xcomposite? ( || (
-				app-emulation/emul-linux-x86-xlibs[development]
-				x11-libs/libXcomposite[abi_x86_32]
-			) )
-		)
-	)"
-
-RDEPEND="${COMMON_DEPEND}
-	dos? ( games-emulation/dosbox )
-	perl? ( dev-lang/perl dev-perl/XML-Simple )
-	samba? ( >=net-fs/samba-3.0.25 )
-	selinux? ( sec-policy/selinux-wine )
-	udisks? ( sys-fs/udisks:2 )
-	pulseaudio? ( realtime? ( sys-auth/rtkit ) )"
-
-DEPEND="${COMMON_DEPEND}
-	amd64? ( abi_x86_32? ( !abi_x86_64? ( ${NATIVE_DEPEND} ) ) )
-	X? (
-		x11-proto/inputproto
-		x11-proto/xextproto
-		x11-proto/xf86vidmodeproto
-	)
-	xinerama? ( x11-proto/xineramaproto )
-	prelink? ( sys-devel/prelink )
-	>=sys-kernel/linux-headers-2.6
-	virtual/pkgconfig
-	virtual/yacc
-	sys-devel/flex"
-
-# These use a non-standard "Wine" category, which is provided by
-# /etc/xdg/applications-merged/wine.menu
-QA_DESKTOP_FILE="usr/share/applications/wine-browsedrive.desktop
-usr/share/applications/wine-notepad.desktop
-usr/share/applications/wine-uninstaller.desktop
-usr/share/applications/wine-winecfg.desktop"
-
-wine_build_environment_check() {
-	[[ ${MERGE_TYPE} = "binary" ]] && return 0
-
-	if use abi_x86_64 && [[ $(( $(gcc-major-version) * 100 + $(gcc-minor-version) )) -lt 404 ]]; then
-		eerror "You need gcc-4.4+ to build 64-bit wine"
-		eerror
-		return 1
-	fi
-
-	if use abi_x86_32 && use opencl && [[ x$(eselect opencl show 2> /dev/null) = "xintel" ]]; 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_build_environment_check || die
-}
-
-pkg_setup() {
-	wine_build_environment_check || die
-}
-
-src_unpack() {
-	if [[ ${PV} == "9999" ]] ; then
-		git-2_src_unpack
-	else
-		unpack ${MY_P}.tar.bz2
-	fi
-
-	use pulseaudio && unpack "${PULSE_PATCHES}.tar.bz2"
-	unpack "${WINE_GENTOO}.tar.bz2"
-
-	l10n_find_plocales_changes "${S}/po" "" ".po"
-}
-
-src_prepare() {
-	local md5="$(md5sum server/protocol.def)"
-	local PATCHES=(
-		"${FILESDIR}"/${PN}-1.5.26-winegcc.patch #260726
-		"${FILESDIR}"/${PN}-1.4_rc2-multilib-portage.patch #395615
-		"${FILESDIR}"/${PN}-1.7.12-osmesa-check.patch #429386
-		"${FILESDIR}"/${PN}-1.6-memset-O3.patch #480508
-	)
-	use pulseaudio && PATCHES+=(
-		"../${PULSE_PATCHES}"/*.patch #421365
-	)
-	# http://bugs.winehq.org/show_bug.cgi?id=29168
-	use swtor && PATCHES+=(
-		"${FILESDIR}"/${PN}-1.7.1-KUSER_SHARED_DATA_18.patch
-	)
-	# http://bugs.winehq.org/show_bug.cgi?id=34388
-	use teso && PATCHES+=(
-		"${FILESDIR}"/${PN}-1.7.2-crypt32-Skip-unknown-item-when.patch
-	)
-
-	autotools-utils_src_prepare
-
-	if [[ "$(md5sum server/protocol.def)" != "${md5}" ]]; then
-		einfo "server/protocol.def was patched; running tools/make_requests"
-		tools/make_requests || die #432348
-	fi
-	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
-	if ! use run-exes; then
-		sed -i '/^MimeType/d' tools/wine.desktop || die #117785
-	fi
-
-	# hi-res default icon, #472990, http://bugs.winehq.org/show_bug.cgi?id=24652
-	cp "${WORKDIR}"/${WINE_GENTOO}/icons/oic_winlogo.ico dlls/user32/resources/ || die
-
-	l10n_get_locales > po/LINGUAS # otherwise wine doesn't respect LINGUAS
-}
-
-do_configure() {
-	local myeconfargs=( "${myeconfargs[@]}" )
-
-	if use amd64; then
-		if [[ ${ABI} == amd64 ]]; then
-			myeconfargs+=( --enable-win64 )
-		else
-			use netapi && ewarn "Disabling netapi in wine32; see https://bugs.gentoo.org/494394"
-			# We currently don't have 32-bit libnetapi on amd64; #494394
-			myeconfargs+=(
-				--without-netapi
-				--disable-win64
-			)
-		fi
-
-		# Note: using --with-wine64 results in problems with multilib.eclass
-		# CC/LD hackery. We're using separate tools instead.
-	fi
-
-	autotools-utils_src_configure
-}
-
-src_configure() {
-	export LDCONFIG=/bin/true
-	use custom-cflags || strip-flags
-
-	local myeconfargs=( # common
-		--sysconfdir=/etc/wine
-		$(use_with alsa)
-		$(use_with capi)
-		$(use_with lcms cms)
-		$(use_with cups)
-		$(use_with ncurses curses)
-		$(use_with udisks dbus)
-		$(use_with fontconfig)
-		$(use_with ssl gnutls)
-		$(use_with gphoto2 gphoto)
-		$(use_with gsm)
-		$(use_with gstreamer)
-		--without-hal
-		$(use_with jpeg)
-		$(use_with ldap)
-		$(use_with mp3 mpg123)
-		$(use_with netapi)
-		$(use_with nls gettext)
-		$(use_with openal)
-		$(use_with opencl)
-		$(use_with opengl)
-		$(use_with osmesa)
-		$(use_with oss)
-		$(use_with png)
-		$(use_with threads pthread)
-		$(use_with scanner sane)
-		$(use_enable test tests)
-		$(use_with truetype freetype)
-		$(use_with v4l)
-		$(use_with X x)
-		$(use_with xcomposite)
-		$(use_with xinerama)
-		$(use_with xml)
-		$(use_with xml xslt)
-	)
-
-	use pulseaudio && myeconfargs+=( --with-pulse )
-
-	if use amd64 && use abi_x86_32; then
-		# 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
-	fi
-
-	multilib_parallel_foreach_abi do_configure
-}
-
-src_compile() {
-	autotools-multilib_src_compile depend
-	autotools-multilib_src_compile all
-}
-
-src_test() {
-	if [[ $(id -u) == 0 ]]; then
-		ewarn "Skipping tests since they cannot be run under the root user."
-		ewarn "To run the test ${PN} suite, add userpriv to FEATURES in make.conf"
-		return
-	fi
-
-	# FIXME: win32-only; wine64 tests fail with "could not find the Wine loader"
-	multilib_toolchain_setup x86
-	local BUILD_DIR="${S}-${ABI}"
-	cd "${BUILD_DIR}" || die
-	WINEPREFIX="${T}/.wine-${ABI}" Xemake test
-}
-
-src_install() {
-	local DOCS=( ANNOUNCE AUTHORS README )
-	add_locale_docs() {
-		local locale_doc="documentation/README.$1"
-		[[ ! -e ${locale_doc} ]] || DOCS=( "${DOCS[@]}" ${locale_doc} )
-	}
-	l10n_for_each_locale_do add_locale_docs
-	autotools-multilib_src_install
-
-	emake -C "../${WINE_GENTOO}" install DESTDIR="${D}" EPREFIX="${EPREFIX}"
-	if use gecko ; then
-		insinto /usr/share/wine/gecko
-		use abi_x86_32 && doins "${DISTDIR}"/wine_gecko-${GV}-x86.msi
-		use abi_x86_64 && doins "${DISTDIR}"/wine_gecko-${GV}-x86_64.msi
-	fi
-	if use mono ; then
-		insinto /usr/share/wine/mono
-		doins "${DISTDIR}"/wine-mono-${MV}.msi
-	fi
-	if ! use perl ; then
-		rm "${D}"usr/bin/{wine{dump,maker},function_grep.pl} "${D}"usr/share/man/man1/wine{dump,maker}.1 || die
-	fi
-
-	use abi_x86_32 && pax-mark psmr "${D}"usr/bin/wine{,-preloader} #255055
-	use abi_x86_64 && pax-mark psmr "${D}"usr/bin/wine64{,-preloader}
-
-	if use abi_x86_64 && ! use abi_x86_32; then
-		dosym /usr/bin/wine{64,} # 404331
-		dosym /usr/bin/wine{64,}-preloader
-	fi
-
-	# respect LINGUAS when installing man pages, #469418
-	for l in de fr pl; do
-		use linguas_${l} || rm -r "${D}"usr/share/man/${l}*
-	done
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	fdo-mime_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	fdo-mime_desktop_database_update
-}
+wine-1.7.13.ebuild
\ No newline at end of file
diff --git a/app-emulation/wine/wine-1.7.15.ebuild b/app-emulation/wine/wine-1.7.15.ebuild
index cbc18e7..88b7471 100644..120000
--- a/app-emulation/wine/wine-1.7.15.ebuild
+++ b/app-emulation/wine/wine-1.7.15.ebuild
@@ -1,453 +1 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.15.ebuild,v 1.1 2014/03/23 05:30:35 tetromino Exp $
-
-EAPI="5"
-
-AUTOTOOLS_AUTORECONF=1
-PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv te th tr uk wa zh_CN zh_TW"
-PLOCALE_BACKUP="en"
-
-inherit autotools-multilib eutils fdo-mime flag-o-matic gnome2-utils l10n multilib pax-utils toolchain-funcs virtualx
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="git://source.winehq.org/git/wine.git"
-	inherit git-2
-	SRC_URI=""
-	#KEYWORDS=""
-else
-	MY_P="${PN}-${PV/_/-}"
-	SRC_URI="mirror://sourceforge/${PN}/Source/${MY_P}.tar.bz2"
-	KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
-	S=${WORKDIR}/${MY_P}
-fi
-
-GV="2.24"
-MV="4.5.2"
-PULSE_PATCHES="winepulse-patches-1.7.12"
-WINE_GENTOO="wine-gentoo-2013.06.24"
-DESCRIPTION="Free implementation of Windows(tm) on Unix"
-HOMEPAGE="http://www.winehq.org/"
-SRC_URI="${SRC_URI}
-	gecko? (
-		abi_x86_32? ( mirror://sourceforge/${PN}/Wine%20Gecko/${GV}/wine_gecko-${GV}-x86.msi )
-		abi_x86_64? ( mirror://sourceforge/${PN}/Wine%20Gecko/${GV}/wine_gecko-${GV}-x86_64.msi )
-	)
-	mono? ( mirror://sourceforge/${PN}/Wine%20Mono/${MV}/wine-mono-${MV}.msi )
-	pulseaudio? ( http://dev.gentoo.org/~tetromino/distfiles/${PN}/${PULSE_PATCHES}.tar.bz2 )
-	http://dev.gentoo.org/~tetromino/distfiles/${PN}/${WINE_GENTOO}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +fontconfig +gecko gphoto2 gsm gstreamer +jpeg lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl +png +prelink pulseaudio +realtime +run-exes samba scanner selinux +ssl swtor teso test +threads +truetype +udisks v4l +X xcomposite xinerama +xml"
-REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
-	test? ( abi_x86_32 )
-	elibc_glibc? ( threads )
-	mono? ( abi_x86_32 )
-	osmesa? ( opengl )" #286560
-
-# FIXME: the test suite is unsuitable for us; many tests require net access
-# or fail due to Xvfb's opengl limitations.
-RESTRICT="test"
-
-NATIVE_DEPEND="
-	truetype? ( >=media-libs/freetype-2.0.0  )
-	capi? ( net-dialup/capi4k-utils )
-	ncurses? ( >=sys-libs/ncurses-5.2:= )
-	udisks? ( sys-apps/dbus )
-	fontconfig? ( media-libs/fontconfig:= )
-	gphoto2? ( media-libs/libgphoto2:= )
-	openal? ( media-libs/openal:= )
-	gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 )
-	X? (
-		x11-libs/libXcursor
-		x11-libs/libXext
-		x11-libs/libXrandr
-		x11-libs/libXi
-		x11-libs/libXxf86vm
-	)
-	xinerama? ( x11-libs/libXinerama )
-	alsa? ( media-libs/alsa-lib )
-	cups? ( net-print/cups:= )
-	opencl? ( virtual/opencl )
-	opengl? (
-		virtual/glu
-		virtual/opengl
-	)
-	gsm? ( media-sound/gsm:= )
-	jpeg? ( virtual/jpeg:0= )
-	ldap? ( net-nds/openldap:= )
-	lcms? ( media-libs/lcms:2= )
-	mp3? ( >=media-sound/mpg123-1.5.0 )
-	netapi? ( net-fs/samba[netapi(+)] )
-	nls? ( sys-devel/gettext )
-	odbc? ( dev-db/unixODBC:= )
-	osmesa? ( media-libs/mesa[osmesa] )
-	pulseaudio? ( media-sound/pulseaudio )
-	xml? ( dev-libs/libxml2 dev-libs/libxslt )
-	scanner? ( media-gfx/sane-backends:= )
-	ssl? ( net-libs/gnutls:= )
-	png? ( media-libs/libpng:0= )
-	v4l? ( media-libs/libv4l )
-	xcomposite? ( x11-libs/libXcomposite )"
-
-COMMON_DEPEND="
-	!amd64? ( ${NATIVE_DEPEND} )
-	amd64? (
-		abi_x86_64? ( ${NATIVE_DEPEND} )
-		abi_x86_32? (
-			truetype? ( || (
-				>=app-emulation/emul-linux-x86-xlibs-2.1[development]
-				>=media-libs/freetype-2.0.0[abi_x86_32]
-			) )
-			ncurses? ( || (
-				app-emulation/emul-linux-x86-baselibs[development]
-				sys-libs/ncurses[abi_x86_32]
-			) )
-			udisks? ( || (
-				>=app-emulation/emul-linux-x86-baselibs-20130224[development]
-				sys-apps/dbus[abi_x86_32]
-			) )
-			fontconfig? ( || (
-				app-emulation/emul-linux-x86-xlibs[development]
-				media-libs/fontconfig[abi_x86_32]
-			) )
-			gphoto2? (
-				app-emulation/emul-linux-x86-medialibs[development]
-			)
-			openal? ( || (
-				app-emulation/emul-linux-x86-sdl[development]
-				media-libs/openal[abi_x86_32]
-			) )
-			gstreamer? (
-				app-emulation/emul-linux-x86-gstplugins
-				app-emulation/emul-linux-x86-medialibs[development]
-			)
-			X? ( || (
-				app-emulation/emul-linux-x86-xlibs[development]
-				(
-					x11-libs/libXcursor[abi_x86_32]
-					x11-libs/libXext[abi_x86_32]
-					x11-libs/libXrandr[abi_x86_32]
-					x11-libs/libXi[abi_x86_32]
-					x11-libs/libXxf86vm[abi_x86_32]
-				)
-			) )
-			xinerama? ( || (
-				app-emulation/emul-linux-x86-xlibs[development]
-				x11-libs/libXinerama[abi_x86_32]
-			) )
-			alsa? ( || (
-				app-emulation/emul-linux-x86-soundlibs[alsa,development]
-				media-libs/alsa-lib[abi_x86_32]
-			) )
-			cups? ( app-emulation/emul-linux-x86-baselibs )
-			opencl? ( virtual/opencl[abi_x86_32] )
-			opengl? ( || (
-				app-emulation/emul-linux-x86-opengl[development]
-				(
-					virtual/glu[abi_x86_32]
-					virtual/opengl[abi_x86_32]
-				)
-			) )
-			gsm? ( || (
-				app-emulation/emul-linux-x86-soundlibs[development]
-				media-sound/gsm[abi_x86_32]
-			) )
-			jpeg? ( || (
-				app-emulation/emul-linux-x86-baselibs[development]
-				virtual/jpeg:0[abi_x86_32]
-			) )
-			ldap? ( app-emulation/emul-linux-x86-baselibs[development] )
-			lcms? ( || (
-				app-emulation/emul-linux-x86-baselibs[development]
-				media-libs/lcms:2[abi_x86_32]
-			) )
-			mp3? ( || (
-				app-emulation/emul-linux-x86-soundlibs[development]
-				>=media-sound/mpg123-1.5.0[abi_x86_32]
-			) )
-			nls? ( || (
-				app-emulation/emul-linux-x86-baselibs[development]
-				sys-devel/gettext[abi_x86_32]
-			) )
-			odbc? ( app-emulation/emul-linux-x86-db[development] )
-			osmesa? ( || (
-				>=app-emulation/emul-linux-x86-opengl-20121028[development]
-				media-libs/mesa[osmesa,abi_x86_32]
-			) )
-			pulseaudio? ( || (
-				app-emulation/emul-linux-x86-soundlibs[development]
-				>=media-sound/pulseaudio-4.0-r1[abi_x86_32]
-			) )
-			xml? ( || (
-				>=app-emulation/emul-linux-x86-baselibs-20131008[development]
-				(
-					dev-libs/libxml2[abi_x86_32]
-					dev-libs/libxslt[abi_x86_32]
-				)
-			) )
-			scanner? ( app-emulation/emul-linux-x86-medialibs[development] )
-			ssl? ( app-emulation/emul-linux-x86-baselibs[development] )
-			png? ( || (
-				app-emulation/emul-linux-x86-baselibs[development]
-				media-libs/libpng:0[abi_x86_32]
-			) )
-			v4l? ( || (
-				app-emulation/emul-linux-x86-medialibs[development]
-				media-libs/libv4l[abi_x86_32]
-			) )
-			xcomposite? ( || (
-				app-emulation/emul-linux-x86-xlibs[development]
-				x11-libs/libXcomposite[abi_x86_32]
-			) )
-		)
-	)"
-
-RDEPEND="${COMMON_DEPEND}
-	dos? ( games-emulation/dosbox )
-	perl? ( dev-lang/perl dev-perl/XML-Simple )
-	samba? ( >=net-fs/samba-3.0.25 )
-	selinux? ( sec-policy/selinux-wine )
-	udisks? ( sys-fs/udisks:2 )
-	pulseaudio? ( realtime? ( sys-auth/rtkit ) )"
-
-DEPEND="${COMMON_DEPEND}
-	amd64? ( abi_x86_32? ( !abi_x86_64? ( ${NATIVE_DEPEND} ) ) )
-	X? (
-		x11-proto/inputproto
-		x11-proto/xextproto
-		x11-proto/xf86vidmodeproto
-	)
-	xinerama? ( x11-proto/xineramaproto )
-	prelink? ( sys-devel/prelink )
-	>=sys-kernel/linux-headers-2.6
-	virtual/pkgconfig
-	virtual/yacc
-	sys-devel/flex"
-
-# These use a non-standard "Wine" category, which is provided by
-# /etc/xdg/applications-merged/wine.menu
-QA_DESKTOP_FILE="usr/share/applications/wine-browsedrive.desktop
-usr/share/applications/wine-notepad.desktop
-usr/share/applications/wine-uninstaller.desktop
-usr/share/applications/wine-winecfg.desktop"
-
-wine_build_environment_check() {
-	[[ ${MERGE_TYPE} = "binary" ]] && return 0
-
-	if use abi_x86_64 && [[ $(( $(gcc-major-version) * 100 + $(gcc-minor-version) )) -lt 404 ]]; then
-		eerror "You need gcc-4.4+ to build 64-bit wine"
-		eerror
-		return 1
-	fi
-
-	if use abi_x86_32 && use opencl && [[ x$(eselect opencl show 2> /dev/null) = "xintel" ]]; 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_build_environment_check || die
-}
-
-pkg_setup() {
-	wine_build_environment_check || die
-}
-
-src_unpack() {
-	if [[ ${PV} == "9999" ]] ; then
-		git-2_src_unpack
-	else
-		unpack ${MY_P}.tar.bz2
-	fi
-
-	use pulseaudio && unpack "${PULSE_PATCHES}.tar.bz2"
-	unpack "${WINE_GENTOO}.tar.bz2"
-
-	l10n_find_plocales_changes "${S}/po" "" ".po"
-}
-
-src_prepare() {
-	local md5="$(md5sum server/protocol.def)"
-	local PATCHES=(
-		"${FILESDIR}"/${PN}-1.5.26-winegcc.patch #260726
-		"${FILESDIR}"/${PN}-1.4_rc2-multilib-portage.patch #395615
-		"${FILESDIR}"/${PN}-1.7.12-osmesa-check.patch #429386
-		"${FILESDIR}"/${PN}-1.6-memset-O3.patch #480508
-	)
-	use pulseaudio && PATCHES+=(
-		"../${PULSE_PATCHES}"/*.patch #421365
-	)
-	# http://bugs.winehq.org/show_bug.cgi?id=29168
-	use swtor && PATCHES+=(
-		"${FILESDIR}"/${PN}-1.7.1-KUSER_SHARED_DATA_18.patch
-	)
-	# http://bugs.winehq.org/show_bug.cgi?id=34388
-	use teso && PATCHES+=(
-		"${FILESDIR}"/${PN}-1.7.2-crypt32-Skip-unknown-item-when.patch
-	)
-
-	autotools-utils_src_prepare
-
-	if [[ "$(md5sum server/protocol.def)" != "${md5}" ]]; then
-		einfo "server/protocol.def was patched; running tools/make_requests"
-		tools/make_requests || die #432348
-	fi
-	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
-	if ! use run-exes; then
-		sed -i '/^MimeType/d' tools/wine.desktop || die #117785
-	fi
-
-	# hi-res default icon, #472990, http://bugs.winehq.org/show_bug.cgi?id=24652
-	cp "${WORKDIR}"/${WINE_GENTOO}/icons/oic_winlogo.ico dlls/user32/resources/ || die
-
-	l10n_get_locales > po/LINGUAS # otherwise wine doesn't respect LINGUAS
-}
-
-do_configure() {
-	local myeconfargs=( "${myeconfargs[@]}" )
-
-	if use amd64; then
-		if [[ ${ABI} == amd64 ]]; then
-			myeconfargs+=( --enable-win64 )
-		else
-			use netapi && ewarn "Disabling netapi in wine32; see https://bugs.gentoo.org/494394"
-			# We currently don't have 32-bit libnetapi on amd64; #494394
-			myeconfargs+=(
-				--without-netapi
-				--disable-win64
-			)
-		fi
-
-		# Note: using --with-wine64 results in problems with multilib.eclass
-		# CC/LD hackery. We're using separate tools instead.
-	fi
-
-	autotools-utils_src_configure
-}
-
-src_configure() {
-	export LDCONFIG=/bin/true
-	use custom-cflags || strip-flags
-
-	local myeconfargs=( # common
-		--sysconfdir=/etc/wine
-		$(use_with alsa)
-		$(use_with capi)
-		$(use_with lcms cms)
-		$(use_with cups)
-		$(use_with ncurses curses)
-		$(use_with udisks dbus)
-		$(use_with fontconfig)
-		$(use_with ssl gnutls)
-		$(use_with gphoto2 gphoto)
-		$(use_with gsm)
-		$(use_with gstreamer)
-		--without-hal
-		$(use_with jpeg)
-		$(use_with ldap)
-		$(use_with mp3 mpg123)
-		$(use_with netapi)
-		$(use_with nls gettext)
-		$(use_with openal)
-		$(use_with opencl)
-		$(use_with opengl)
-		$(use_with osmesa)
-		$(use_with oss)
-		$(use_with png)
-		$(use_with threads pthread)
-		$(use_with scanner sane)
-		$(use_enable test tests)
-		$(use_with truetype freetype)
-		$(use_with v4l)
-		$(use_with X x)
-		$(use_with xcomposite)
-		$(use_with xinerama)
-		$(use_with xml)
-		$(use_with xml xslt)
-	)
-
-	use pulseaudio && myeconfargs+=( --with-pulse )
-
-	if use amd64 && use abi_x86_32; then
-		# 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
-	fi
-
-	multilib_parallel_foreach_abi do_configure
-}
-
-src_compile() {
-	autotools-multilib_src_compile depend
-	autotools-multilib_src_compile all
-}
-
-src_test() {
-	if [[ $(id -u) == 0 ]]; then
-		ewarn "Skipping tests since they cannot be run under the root user."
-		ewarn "To run the test ${PN} suite, add userpriv to FEATURES in make.conf"
-		return
-	fi
-
-	# FIXME: win32-only; wine64 tests fail with "could not find the Wine loader"
-	multilib_toolchain_setup x86
-	local BUILD_DIR="${S}-${ABI}"
-	cd "${BUILD_DIR}" || die
-	WINEPREFIX="${T}/.wine-${ABI}" Xemake test
-}
-
-src_install() {
-	local DOCS=( ANNOUNCE AUTHORS README )
-	add_locale_docs() {
-		local locale_doc="documentation/README.$1"
-		[[ ! -e ${locale_doc} ]] || DOCS=( "${DOCS[@]}" ${locale_doc} )
-	}
-	l10n_for_each_locale_do add_locale_docs
-	autotools-multilib_src_install
-
-	emake -C "../${WINE_GENTOO}" install DESTDIR="${D}" EPREFIX="${EPREFIX}"
-	if use gecko ; then
-		insinto /usr/share/wine/gecko
-		use abi_x86_32 && doins "${DISTDIR}"/wine_gecko-${GV}-x86.msi
-		use abi_x86_64 && doins "${DISTDIR}"/wine_gecko-${GV}-x86_64.msi
-	fi
-	if use mono ; then
-		insinto /usr/share/wine/mono
-		doins "${DISTDIR}"/wine-mono-${MV}.msi
-	fi
-	if ! use perl ; then
-		rm "${D}"usr/bin/{wine{dump,maker},function_grep.pl} "${D}"usr/share/man/man1/wine{dump,maker}.1 || die
-	fi
-
-	use abi_x86_32 && pax-mark psmr "${D}"usr/bin/wine{,-preloader} #255055
-	use abi_x86_64 && pax-mark psmr "${D}"usr/bin/wine64{,-preloader}
-
-	if use abi_x86_64 && ! use abi_x86_32; then
-		dosym /usr/bin/wine{64,} # 404331
-		dosym /usr/bin/wine{64,}-preloader
-	fi
-
-	# respect LINGUAS when installing man pages, #469418
-	for l in de fr pl; do
-		use linguas_${l} || rm -r "${D}"usr/share/man/${l}*
-	done
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	fdo-mime_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	fdo-mime_desktop_database_update
-}
+wine-1.7.13.ebuild
\ No newline at end of file
diff --git a/app-emulation/wine/wine-1.7.16.ebuild b/app-emulation/wine/wine-1.7.16.ebuild
index d379199..88b7471 100644..120000
--- a/app-emulation/wine/wine-1.7.16.ebuild
+++ b/app-emulation/wine/wine-1.7.16.ebuild
@@ -1,453 +1 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="5"
-
-AUTOTOOLS_AUTORECONF=1
-PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv te th tr uk wa zh_CN zh_TW"
-PLOCALE_BACKUP="en"
-
-inherit autotools-multilib eutils fdo-mime flag-o-matic gnome2-utils l10n multilib pax-utils toolchain-funcs virtualx
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="git://source.winehq.org/git/wine.git"
-	inherit git-2
-	SRC_URI=""
-	#KEYWORDS=""
-else
-	MY_P="${PN}-${PV/_/-}"
-	SRC_URI="mirror://sourceforge/${PN}/Source/${MY_P}.tar.bz2"
-	KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
-	S=${WORKDIR}/${MY_P}
-fi
-
-GV="2.24"
-MV="4.5.2"
-PULSE_PATCHES="winepulse-patches-1.7.12"
-WINE_GENTOO="wine-gentoo-2013.06.24"
-DESCRIPTION="Free implementation of Windows(tm) on Unix"
-HOMEPAGE="http://www.winehq.org/"
-SRC_URI="${SRC_URI}
-	gecko? (
-		abi_x86_32? ( mirror://sourceforge/${PN}/Wine%20Gecko/${GV}/wine_gecko-${GV}-x86.msi )
-		abi_x86_64? ( mirror://sourceforge/${PN}/Wine%20Gecko/${GV}/wine_gecko-${GV}-x86_64.msi )
-	)
-	mono? ( mirror://sourceforge/${PN}/Wine%20Mono/${MV}/wine-mono-${MV}.msi )
-	pulseaudio? ( http://dev.gentoo.org/~tetromino/distfiles/${PN}/${PULSE_PATCHES}.tar.bz2 )
-	http://dev.gentoo.org/~tetromino/distfiles/${PN}/${WINE_GENTOO}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +fontconfig +gecko gphoto2 gsm gstreamer +jpeg lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl +png +prelink pulseaudio +realtime +run-exes samba scanner selinux +ssl swtor teso test +threads +truetype +udisks v4l +X xcomposite xinerama +xml"
-REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
-	test? ( abi_x86_32 )
-	elibc_glibc? ( threads )
-	mono? ( abi_x86_32 )
-	osmesa? ( opengl )" #286560
-
-# FIXME: the test suite is unsuitable for us; many tests require net access
-# or fail due to Xvfb's opengl limitations.
-RESTRICT="test"
-
-NATIVE_DEPEND="
-	truetype? ( >=media-libs/freetype-2.0.0  )
-	capi? ( net-dialup/capi4k-utils )
-	ncurses? ( >=sys-libs/ncurses-5.2:= )
-	udisks? ( sys-apps/dbus )
-	fontconfig? ( media-libs/fontconfig:= )
-	gphoto2? ( media-libs/libgphoto2:= )
-	openal? ( media-libs/openal:= )
-	gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 )
-	X? (
-		x11-libs/libXcursor
-		x11-libs/libXext
-		x11-libs/libXrandr
-		x11-libs/libXi
-		x11-libs/libXxf86vm
-	)
-	xinerama? ( x11-libs/libXinerama )
-	alsa? ( media-libs/alsa-lib )
-	cups? ( net-print/cups:= )
-	opencl? ( virtual/opencl )
-	opengl? (
-		virtual/glu
-		virtual/opengl
-	)
-	gsm? ( media-sound/gsm:= )
-	jpeg? ( virtual/jpeg:0= )
-	ldap? ( net-nds/openldap:= )
-	lcms? ( media-libs/lcms:2= )
-	mp3? ( >=media-sound/mpg123-1.5.0 )
-	netapi? ( net-fs/samba[netapi(+)] )
-	nls? ( sys-devel/gettext )
-	odbc? ( dev-db/unixODBC:= )
-	osmesa? ( media-libs/mesa[osmesa] )
-	pulseaudio? ( media-sound/pulseaudio )
-	xml? ( dev-libs/libxml2 dev-libs/libxslt )
-	scanner? ( media-gfx/sane-backends:= )
-	ssl? ( net-libs/gnutls:= )
-	png? ( media-libs/libpng:0= )
-	v4l? ( media-libs/libv4l )
-	xcomposite? ( x11-libs/libXcomposite )"
-
-COMMON_DEPEND="
-	!amd64? ( ${NATIVE_DEPEND} )
-	amd64? (
-		abi_x86_64? ( ${NATIVE_DEPEND} )
-		abi_x86_32? (
-			truetype? ( || (
-				>=app-emulation/emul-linux-x86-xlibs-2.1[development]
-				>=media-libs/freetype-2.0.0[abi_x86_32]
-			) )
-			ncurses? ( || (
-				app-emulation/emul-linux-x86-baselibs[development]
-				sys-libs/ncurses[abi_x86_32]
-			) )
-			udisks? ( || (
-				>=app-emulation/emul-linux-x86-baselibs-20130224[development]
-				sys-apps/dbus[abi_x86_32]
-			) )
-			fontconfig? ( || (
-				app-emulation/emul-linux-x86-xlibs[development]
-				media-libs/fontconfig[abi_x86_32]
-			) )
-			gphoto2? (
-				app-emulation/emul-linux-x86-medialibs[development]
-			)
-			openal? ( || (
-				app-emulation/emul-linux-x86-sdl[development]
-				media-libs/openal[abi_x86_32]
-			) )
-			gstreamer? (
-				app-emulation/emul-linux-x86-gstplugins
-				app-emulation/emul-linux-x86-medialibs[development]
-			)
-			X? ( || (
-				app-emulation/emul-linux-x86-xlibs[development]
-				(
-					x11-libs/libXcursor[abi_x86_32]
-					x11-libs/libXext[abi_x86_32]
-					x11-libs/libXrandr[abi_x86_32]
-					x11-libs/libXi[abi_x86_32]
-					x11-libs/libXxf86vm[abi_x86_32]
-				)
-			) )
-			xinerama? ( || (
-				app-emulation/emul-linux-x86-xlibs[development]
-				x11-libs/libXinerama[abi_x86_32]
-			) )
-			alsa? ( || (
-				app-emulation/emul-linux-x86-soundlibs[alsa,development]
-				media-libs/alsa-lib[abi_x86_32]
-			) )
-			cups? ( app-emulation/emul-linux-x86-baselibs )
-			opencl? ( virtual/opencl[abi_x86_32] )
-			opengl? ( || (
-				app-emulation/emul-linux-x86-opengl[development]
-				(
-					virtual/glu[abi_x86_32]
-					virtual/opengl[abi_x86_32]
-				)
-			) )
-			gsm? ( || (
-				app-emulation/emul-linux-x86-soundlibs[development]
-				media-sound/gsm[abi_x86_32]
-			) )
-			jpeg? ( || (
-				app-emulation/emul-linux-x86-baselibs[development]
-				virtual/jpeg:0[abi_x86_32]
-			) )
-			ldap? ( app-emulation/emul-linux-x86-baselibs[development] )
-			lcms? ( || (
-				app-emulation/emul-linux-x86-baselibs[development]
-				media-libs/lcms:2[abi_x86_32]
-			) )
-			mp3? ( || (
-				app-emulation/emul-linux-x86-soundlibs[development]
-				>=media-sound/mpg123-1.5.0[abi_x86_32]
-			) )
-			nls? ( || (
-				app-emulation/emul-linux-x86-baselibs[development]
-				sys-devel/gettext[abi_x86_32]
-			) )
-			odbc? ( app-emulation/emul-linux-x86-db[development] )
-			osmesa? ( || (
-				>=app-emulation/emul-linux-x86-opengl-20121028[development]
-				media-libs/mesa[osmesa,abi_x86_32]
-			) )
-			pulseaudio? ( || (
-				app-emulation/emul-linux-x86-soundlibs[development]
-				>=media-sound/pulseaudio-4.0-r1[abi_x86_32]
-			) )
-			xml? ( || (
-				>=app-emulation/emul-linux-x86-baselibs-20131008[development]
-				(
-					dev-libs/libxml2[abi_x86_32]
-					dev-libs/libxslt[abi_x86_32]
-				)
-			) )
-			scanner? ( app-emulation/emul-linux-x86-medialibs[development] )
-			ssl? ( app-emulation/emul-linux-x86-baselibs[development] )
-			png? ( || (
-				app-emulation/emul-linux-x86-baselibs[development]
-				media-libs/libpng:0[abi_x86_32]
-			) )
-			v4l? ( || (
-				app-emulation/emul-linux-x86-medialibs[development]
-				media-libs/libv4l[abi_x86_32]
-			) )
-			xcomposite? ( || (
-				app-emulation/emul-linux-x86-xlibs[development]
-				x11-libs/libXcomposite[abi_x86_32]
-			) )
-		)
-	)"
-
-RDEPEND="${COMMON_DEPEND}
-	dos? ( games-emulation/dosbox )
-	perl? ( dev-lang/perl dev-perl/XML-Simple )
-	samba? ( >=net-fs/samba-3.0.25 )
-	selinux? ( sec-policy/selinux-wine )
-	udisks? ( sys-fs/udisks:2 )
-	pulseaudio? ( realtime? ( sys-auth/rtkit ) )"
-
-DEPEND="${COMMON_DEPEND}
-	amd64? ( abi_x86_32? ( !abi_x86_64? ( ${NATIVE_DEPEND} ) ) )
-	X? (
-		x11-proto/inputproto
-		x11-proto/xextproto
-		x11-proto/xf86vidmodeproto
-	)
-	xinerama? ( x11-proto/xineramaproto )
-	prelink? ( sys-devel/prelink )
-	>=sys-kernel/linux-headers-2.6
-	virtual/pkgconfig
-	virtual/yacc
-	sys-devel/flex"
-
-# These use a non-standard "Wine" category, which is provided by
-# /etc/xdg/applications-merged/wine.menu
-QA_DESKTOP_FILE="usr/share/applications/wine-browsedrive.desktop
-usr/share/applications/wine-notepad.desktop
-usr/share/applications/wine-uninstaller.desktop
-usr/share/applications/wine-winecfg.desktop"
-
-wine_build_environment_check() {
-	[[ ${MERGE_TYPE} = "binary" ]] && return 0
-
-	if use abi_x86_64 && [[ $(( $(gcc-major-version) * 100 + $(gcc-minor-version) )) -lt 404 ]]; then
-		eerror "You need gcc-4.4+ to build 64-bit wine"
-		eerror
-		return 1
-	fi
-
-	if use abi_x86_32 && use opencl && [[ x$(eselect opencl show 2> /dev/null) = "xintel" ]]; 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_build_environment_check || die
-}
-
-pkg_setup() {
-	wine_build_environment_check || die
-}
-
-src_unpack() {
-	if [[ ${PV} == "9999" ]] ; then
-		git-2_src_unpack
-	else
-		unpack ${MY_P}.tar.bz2
-	fi
-
-	use pulseaudio && unpack "${PULSE_PATCHES}.tar.bz2"
-	unpack "${WINE_GENTOO}.tar.bz2"
-
-	l10n_find_plocales_changes "${S}/po" "" ".po"
-}
-
-src_prepare() {
-	local md5="$(md5sum server/protocol.def)"
-	local PATCHES=(
-		"${FILESDIR}"/${PN}-1.5.26-winegcc.patch #260726
-		"${FILESDIR}"/${PN}-1.4_rc2-multilib-portage.patch #395615
-		"${FILESDIR}"/${PN}-1.7.12-osmesa-check.patch #429386
-		"${FILESDIR}"/${PN}-1.6-memset-O3.patch #480508
-	)
-	use pulseaudio && PATCHES+=(
-		"../${PULSE_PATCHES}"/*.patch #421365
-	)
-	# http://bugs.winehq.org/show_bug.cgi?id=29168
-	use swtor && PATCHES+=(
-		"${FILESDIR}"/${PN}-1.7.1-KUSER_SHARED_DATA_18.patch
-	)
-	# http://bugs.winehq.org/show_bug.cgi?id=34388
-	use teso && PATCHES+=(
-		"${FILESDIR}"/${PN}-1.7.2-crypt32-Skip-unknown-item-when.patch
-	)
-
-	autotools-utils_src_prepare
-
-	if [[ "$(md5sum server/protocol.def)" != "${md5}" ]]; then
-		einfo "server/protocol.def was patched; running tools/make_requests"
-		tools/make_requests || die #432348
-	fi
-	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
-	if ! use run-exes; then
-		sed -i '/^MimeType/d' tools/wine.desktop || die #117785
-	fi
-
-	# hi-res default icon, #472990, http://bugs.winehq.org/show_bug.cgi?id=24652
-	cp "${WORKDIR}"/${WINE_GENTOO}/icons/oic_winlogo.ico dlls/user32/resources/ || die
-
-	l10n_get_locales > po/LINGUAS # otherwise wine doesn't respect LINGUAS
-}
-
-do_configure() {
-	local myeconfargs=( "${myeconfargs[@]}" )
-
-	if use amd64; then
-		if [[ ${ABI} == amd64 ]]; then
-			myeconfargs+=( --enable-win64 )
-		else
-			use netapi && ewarn "Disabling netapi in wine32; see https://bugs.gentoo.org/494394"
-			# We currently don't have 32-bit libnetapi on amd64; #494394
-			myeconfargs+=(
-				--without-netapi
-				--disable-win64
-			)
-		fi
-
-		# Note: using --with-wine64 results in problems with multilib.eclass
-		# CC/LD hackery. We're using separate tools instead.
-	fi
-
-	autotools-utils_src_configure
-}
-
-src_configure() {
-	export LDCONFIG=/bin/true
-	use custom-cflags || strip-flags
-
-	local myeconfargs=( # common
-		--sysconfdir=/etc/wine
-		$(use_with alsa)
-		$(use_with capi)
-		$(use_with lcms cms)
-		$(use_with cups)
-		$(use_with ncurses curses)
-		$(use_with udisks dbus)
-		$(use_with fontconfig)
-		$(use_with ssl gnutls)
-		$(use_with gphoto2 gphoto)
-		$(use_with gsm)
-		$(use_with gstreamer)
-		--without-hal
-		$(use_with jpeg)
-		$(use_with ldap)
-		$(use_with mp3 mpg123)
-		$(use_with netapi)
-		$(use_with nls gettext)
-		$(use_with openal)
-		$(use_with opencl)
-		$(use_with opengl)
-		$(use_with osmesa)
-		$(use_with oss)
-		$(use_with png)
-		$(use_with threads pthread)
-		$(use_with scanner sane)
-		$(use_enable test tests)
-		$(use_with truetype freetype)
-		$(use_with v4l)
-		$(use_with X x)
-		$(use_with xcomposite)
-		$(use_with xinerama)
-		$(use_with xml)
-		$(use_with xml xslt)
-	)
-
-	use pulseaudio && myeconfargs+=( --with-pulse )
-
-	if use amd64 && use abi_x86_32; then
-		# 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
-	fi
-
-	multilib_parallel_foreach_abi do_configure
-}
-
-src_compile() {
-	autotools-multilib_src_compile depend
-	autotools-multilib_src_compile all
-}
-
-src_test() {
-	if [[ $(id -u) == 0 ]]; then
-		ewarn "Skipping tests since they cannot be run under the root user."
-		ewarn "To run the test ${PN} suite, add userpriv to FEATURES in make.conf"
-		return
-	fi
-
-	# FIXME: win32-only; wine64 tests fail with "could not find the Wine loader"
-	multilib_toolchain_setup x86
-	local BUILD_DIR="${S}-${ABI}"
-	cd "${BUILD_DIR}" || die
-	WINEPREFIX="${T}/.wine-${ABI}" Xemake test
-}
-
-src_install() {
-	local DOCS=( ANNOUNCE AUTHORS README )
-	add_locale_docs() {
-		local locale_doc="documentation/README.$1"
-		[[ ! -e ${locale_doc} ]] || DOCS=( "${DOCS[@]}" ${locale_doc} )
-	}
-	l10n_for_each_locale_do add_locale_docs
-	autotools-multilib_src_install
-
-	emake -C "../${WINE_GENTOO}" install DESTDIR="${D}" EPREFIX="${EPREFIX}"
-	if use gecko ; then
-		insinto /usr/share/wine/gecko
-		use abi_x86_32 && doins "${DISTDIR}"/wine_gecko-${GV}-x86.msi
-		use abi_x86_64 && doins "${DISTDIR}"/wine_gecko-${GV}-x86_64.msi
-	fi
-	if use mono ; then
-		insinto /usr/share/wine/mono
-		doins "${DISTDIR}"/wine-mono-${MV}.msi
-	fi
-	if ! use perl ; then
-		rm "${D}"usr/bin/{wine{dump,maker},function_grep.pl} "${D}"usr/share/man/man1/wine{dump,maker}.1 || die
-	fi
-
-	use abi_x86_32 && pax-mark psmr "${D}"usr/bin/wine{,-preloader} #255055
-	use abi_x86_64 && pax-mark psmr "${D}"usr/bin/wine64{,-preloader}
-
-	if use abi_x86_64 && ! use abi_x86_32; then
-		dosym /usr/bin/wine{64,} # 404331
-		dosym /usr/bin/wine{64,}-preloader
-	fi
-
-	# respect LINGUAS when installing man pages, #469418
-	for l in de fr pl; do
-		use linguas_${l} || rm -r "${D}"usr/share/man/${l}*
-	done
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	fdo-mime_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	fdo-mime_desktop_database_update
-}
+wine-1.7.13.ebuild
\ No newline at end of file
diff --git a/app-emulation/wine/wine-1.7.17.ebuild b/app-emulation/wine/wine-1.7.17.ebuild
index d379199..88b7471 100644..120000
--- a/app-emulation/wine/wine-1.7.17.ebuild
+++ b/app-emulation/wine/wine-1.7.17.ebuild
@@ -1,453 +1 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="5"
-
-AUTOTOOLS_AUTORECONF=1
-PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv te th tr uk wa zh_CN zh_TW"
-PLOCALE_BACKUP="en"
-
-inherit autotools-multilib eutils fdo-mime flag-o-matic gnome2-utils l10n multilib pax-utils toolchain-funcs virtualx
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="git://source.winehq.org/git/wine.git"
-	inherit git-2
-	SRC_URI=""
-	#KEYWORDS=""
-else
-	MY_P="${PN}-${PV/_/-}"
-	SRC_URI="mirror://sourceforge/${PN}/Source/${MY_P}.tar.bz2"
-	KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
-	S=${WORKDIR}/${MY_P}
-fi
-
-GV="2.24"
-MV="4.5.2"
-PULSE_PATCHES="winepulse-patches-1.7.12"
-WINE_GENTOO="wine-gentoo-2013.06.24"
-DESCRIPTION="Free implementation of Windows(tm) on Unix"
-HOMEPAGE="http://www.winehq.org/"
-SRC_URI="${SRC_URI}
-	gecko? (
-		abi_x86_32? ( mirror://sourceforge/${PN}/Wine%20Gecko/${GV}/wine_gecko-${GV}-x86.msi )
-		abi_x86_64? ( mirror://sourceforge/${PN}/Wine%20Gecko/${GV}/wine_gecko-${GV}-x86_64.msi )
-	)
-	mono? ( mirror://sourceforge/${PN}/Wine%20Mono/${MV}/wine-mono-${MV}.msi )
-	pulseaudio? ( http://dev.gentoo.org/~tetromino/distfiles/${PN}/${PULSE_PATCHES}.tar.bz2 )
-	http://dev.gentoo.org/~tetromino/distfiles/${PN}/${WINE_GENTOO}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +fontconfig +gecko gphoto2 gsm gstreamer +jpeg lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl +png +prelink pulseaudio +realtime +run-exes samba scanner selinux +ssl swtor teso test +threads +truetype +udisks v4l +X xcomposite xinerama +xml"
-REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
-	test? ( abi_x86_32 )
-	elibc_glibc? ( threads )
-	mono? ( abi_x86_32 )
-	osmesa? ( opengl )" #286560
-
-# FIXME: the test suite is unsuitable for us; many tests require net access
-# or fail due to Xvfb's opengl limitations.
-RESTRICT="test"
-
-NATIVE_DEPEND="
-	truetype? ( >=media-libs/freetype-2.0.0  )
-	capi? ( net-dialup/capi4k-utils )
-	ncurses? ( >=sys-libs/ncurses-5.2:= )
-	udisks? ( sys-apps/dbus )
-	fontconfig? ( media-libs/fontconfig:= )
-	gphoto2? ( media-libs/libgphoto2:= )
-	openal? ( media-libs/openal:= )
-	gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 )
-	X? (
-		x11-libs/libXcursor
-		x11-libs/libXext
-		x11-libs/libXrandr
-		x11-libs/libXi
-		x11-libs/libXxf86vm
-	)
-	xinerama? ( x11-libs/libXinerama )
-	alsa? ( media-libs/alsa-lib )
-	cups? ( net-print/cups:= )
-	opencl? ( virtual/opencl )
-	opengl? (
-		virtual/glu
-		virtual/opengl
-	)
-	gsm? ( media-sound/gsm:= )
-	jpeg? ( virtual/jpeg:0= )
-	ldap? ( net-nds/openldap:= )
-	lcms? ( media-libs/lcms:2= )
-	mp3? ( >=media-sound/mpg123-1.5.0 )
-	netapi? ( net-fs/samba[netapi(+)] )
-	nls? ( sys-devel/gettext )
-	odbc? ( dev-db/unixODBC:= )
-	osmesa? ( media-libs/mesa[osmesa] )
-	pulseaudio? ( media-sound/pulseaudio )
-	xml? ( dev-libs/libxml2 dev-libs/libxslt )
-	scanner? ( media-gfx/sane-backends:= )
-	ssl? ( net-libs/gnutls:= )
-	png? ( media-libs/libpng:0= )
-	v4l? ( media-libs/libv4l )
-	xcomposite? ( x11-libs/libXcomposite )"
-
-COMMON_DEPEND="
-	!amd64? ( ${NATIVE_DEPEND} )
-	amd64? (
-		abi_x86_64? ( ${NATIVE_DEPEND} )
-		abi_x86_32? (
-			truetype? ( || (
-				>=app-emulation/emul-linux-x86-xlibs-2.1[development]
-				>=media-libs/freetype-2.0.0[abi_x86_32]
-			) )
-			ncurses? ( || (
-				app-emulation/emul-linux-x86-baselibs[development]
-				sys-libs/ncurses[abi_x86_32]
-			) )
-			udisks? ( || (
-				>=app-emulation/emul-linux-x86-baselibs-20130224[development]
-				sys-apps/dbus[abi_x86_32]
-			) )
-			fontconfig? ( || (
-				app-emulation/emul-linux-x86-xlibs[development]
-				media-libs/fontconfig[abi_x86_32]
-			) )
-			gphoto2? (
-				app-emulation/emul-linux-x86-medialibs[development]
-			)
-			openal? ( || (
-				app-emulation/emul-linux-x86-sdl[development]
-				media-libs/openal[abi_x86_32]
-			) )
-			gstreamer? (
-				app-emulation/emul-linux-x86-gstplugins
-				app-emulation/emul-linux-x86-medialibs[development]
-			)
-			X? ( || (
-				app-emulation/emul-linux-x86-xlibs[development]
-				(
-					x11-libs/libXcursor[abi_x86_32]
-					x11-libs/libXext[abi_x86_32]
-					x11-libs/libXrandr[abi_x86_32]
-					x11-libs/libXi[abi_x86_32]
-					x11-libs/libXxf86vm[abi_x86_32]
-				)
-			) )
-			xinerama? ( || (
-				app-emulation/emul-linux-x86-xlibs[development]
-				x11-libs/libXinerama[abi_x86_32]
-			) )
-			alsa? ( || (
-				app-emulation/emul-linux-x86-soundlibs[alsa,development]
-				media-libs/alsa-lib[abi_x86_32]
-			) )
-			cups? ( app-emulation/emul-linux-x86-baselibs )
-			opencl? ( virtual/opencl[abi_x86_32] )
-			opengl? ( || (
-				app-emulation/emul-linux-x86-opengl[development]
-				(
-					virtual/glu[abi_x86_32]
-					virtual/opengl[abi_x86_32]
-				)
-			) )
-			gsm? ( || (
-				app-emulation/emul-linux-x86-soundlibs[development]
-				media-sound/gsm[abi_x86_32]
-			) )
-			jpeg? ( || (
-				app-emulation/emul-linux-x86-baselibs[development]
-				virtual/jpeg:0[abi_x86_32]
-			) )
-			ldap? ( app-emulation/emul-linux-x86-baselibs[development] )
-			lcms? ( || (
-				app-emulation/emul-linux-x86-baselibs[development]
-				media-libs/lcms:2[abi_x86_32]
-			) )
-			mp3? ( || (
-				app-emulation/emul-linux-x86-soundlibs[development]
-				>=media-sound/mpg123-1.5.0[abi_x86_32]
-			) )
-			nls? ( || (
-				app-emulation/emul-linux-x86-baselibs[development]
-				sys-devel/gettext[abi_x86_32]
-			) )
-			odbc? ( app-emulation/emul-linux-x86-db[development] )
-			osmesa? ( || (
-				>=app-emulation/emul-linux-x86-opengl-20121028[development]
-				media-libs/mesa[osmesa,abi_x86_32]
-			) )
-			pulseaudio? ( || (
-				app-emulation/emul-linux-x86-soundlibs[development]
-				>=media-sound/pulseaudio-4.0-r1[abi_x86_32]
-			) )
-			xml? ( || (
-				>=app-emulation/emul-linux-x86-baselibs-20131008[development]
-				(
-					dev-libs/libxml2[abi_x86_32]
-					dev-libs/libxslt[abi_x86_32]
-				)
-			) )
-			scanner? ( app-emulation/emul-linux-x86-medialibs[development] )
-			ssl? ( app-emulation/emul-linux-x86-baselibs[development] )
-			png? ( || (
-				app-emulation/emul-linux-x86-baselibs[development]
-				media-libs/libpng:0[abi_x86_32]
-			) )
-			v4l? ( || (
-				app-emulation/emul-linux-x86-medialibs[development]
-				media-libs/libv4l[abi_x86_32]
-			) )
-			xcomposite? ( || (
-				app-emulation/emul-linux-x86-xlibs[development]
-				x11-libs/libXcomposite[abi_x86_32]
-			) )
-		)
-	)"
-
-RDEPEND="${COMMON_DEPEND}
-	dos? ( games-emulation/dosbox )
-	perl? ( dev-lang/perl dev-perl/XML-Simple )
-	samba? ( >=net-fs/samba-3.0.25 )
-	selinux? ( sec-policy/selinux-wine )
-	udisks? ( sys-fs/udisks:2 )
-	pulseaudio? ( realtime? ( sys-auth/rtkit ) )"
-
-DEPEND="${COMMON_DEPEND}
-	amd64? ( abi_x86_32? ( !abi_x86_64? ( ${NATIVE_DEPEND} ) ) )
-	X? (
-		x11-proto/inputproto
-		x11-proto/xextproto
-		x11-proto/xf86vidmodeproto
-	)
-	xinerama? ( x11-proto/xineramaproto )
-	prelink? ( sys-devel/prelink )
-	>=sys-kernel/linux-headers-2.6
-	virtual/pkgconfig
-	virtual/yacc
-	sys-devel/flex"
-
-# These use a non-standard "Wine" category, which is provided by
-# /etc/xdg/applications-merged/wine.menu
-QA_DESKTOP_FILE="usr/share/applications/wine-browsedrive.desktop
-usr/share/applications/wine-notepad.desktop
-usr/share/applications/wine-uninstaller.desktop
-usr/share/applications/wine-winecfg.desktop"
-
-wine_build_environment_check() {
-	[[ ${MERGE_TYPE} = "binary" ]] && return 0
-
-	if use abi_x86_64 && [[ $(( $(gcc-major-version) * 100 + $(gcc-minor-version) )) -lt 404 ]]; then
-		eerror "You need gcc-4.4+ to build 64-bit wine"
-		eerror
-		return 1
-	fi
-
-	if use abi_x86_32 && use opencl && [[ x$(eselect opencl show 2> /dev/null) = "xintel" ]]; 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_build_environment_check || die
-}
-
-pkg_setup() {
-	wine_build_environment_check || die
-}
-
-src_unpack() {
-	if [[ ${PV} == "9999" ]] ; then
-		git-2_src_unpack
-	else
-		unpack ${MY_P}.tar.bz2
-	fi
-
-	use pulseaudio && unpack "${PULSE_PATCHES}.tar.bz2"
-	unpack "${WINE_GENTOO}.tar.bz2"
-
-	l10n_find_plocales_changes "${S}/po" "" ".po"
-}
-
-src_prepare() {
-	local md5="$(md5sum server/protocol.def)"
-	local PATCHES=(
-		"${FILESDIR}"/${PN}-1.5.26-winegcc.patch #260726
-		"${FILESDIR}"/${PN}-1.4_rc2-multilib-portage.patch #395615
-		"${FILESDIR}"/${PN}-1.7.12-osmesa-check.patch #429386
-		"${FILESDIR}"/${PN}-1.6-memset-O3.patch #480508
-	)
-	use pulseaudio && PATCHES+=(
-		"../${PULSE_PATCHES}"/*.patch #421365
-	)
-	# http://bugs.winehq.org/show_bug.cgi?id=29168
-	use swtor && PATCHES+=(
-		"${FILESDIR}"/${PN}-1.7.1-KUSER_SHARED_DATA_18.patch
-	)
-	# http://bugs.winehq.org/show_bug.cgi?id=34388
-	use teso && PATCHES+=(
-		"${FILESDIR}"/${PN}-1.7.2-crypt32-Skip-unknown-item-when.patch
-	)
-
-	autotools-utils_src_prepare
-
-	if [[ "$(md5sum server/protocol.def)" != "${md5}" ]]; then
-		einfo "server/protocol.def was patched; running tools/make_requests"
-		tools/make_requests || die #432348
-	fi
-	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
-	if ! use run-exes; then
-		sed -i '/^MimeType/d' tools/wine.desktop || die #117785
-	fi
-
-	# hi-res default icon, #472990, http://bugs.winehq.org/show_bug.cgi?id=24652
-	cp "${WORKDIR}"/${WINE_GENTOO}/icons/oic_winlogo.ico dlls/user32/resources/ || die
-
-	l10n_get_locales > po/LINGUAS # otherwise wine doesn't respect LINGUAS
-}
-
-do_configure() {
-	local myeconfargs=( "${myeconfargs[@]}" )
-
-	if use amd64; then
-		if [[ ${ABI} == amd64 ]]; then
-			myeconfargs+=( --enable-win64 )
-		else
-			use netapi && ewarn "Disabling netapi in wine32; see https://bugs.gentoo.org/494394"
-			# We currently don't have 32-bit libnetapi on amd64; #494394
-			myeconfargs+=(
-				--without-netapi
-				--disable-win64
-			)
-		fi
-
-		# Note: using --with-wine64 results in problems with multilib.eclass
-		# CC/LD hackery. We're using separate tools instead.
-	fi
-
-	autotools-utils_src_configure
-}
-
-src_configure() {
-	export LDCONFIG=/bin/true
-	use custom-cflags || strip-flags
-
-	local myeconfargs=( # common
-		--sysconfdir=/etc/wine
-		$(use_with alsa)
-		$(use_with capi)
-		$(use_with lcms cms)
-		$(use_with cups)
-		$(use_with ncurses curses)
-		$(use_with udisks dbus)
-		$(use_with fontconfig)
-		$(use_with ssl gnutls)
-		$(use_with gphoto2 gphoto)
-		$(use_with gsm)
-		$(use_with gstreamer)
-		--without-hal
-		$(use_with jpeg)
-		$(use_with ldap)
-		$(use_with mp3 mpg123)
-		$(use_with netapi)
-		$(use_with nls gettext)
-		$(use_with openal)
-		$(use_with opencl)
-		$(use_with opengl)
-		$(use_with osmesa)
-		$(use_with oss)
-		$(use_with png)
-		$(use_with threads pthread)
-		$(use_with scanner sane)
-		$(use_enable test tests)
-		$(use_with truetype freetype)
-		$(use_with v4l)
-		$(use_with X x)
-		$(use_with xcomposite)
-		$(use_with xinerama)
-		$(use_with xml)
-		$(use_with xml xslt)
-	)
-
-	use pulseaudio && myeconfargs+=( --with-pulse )
-
-	if use amd64 && use abi_x86_32; then
-		# 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
-	fi
-
-	multilib_parallel_foreach_abi do_configure
-}
-
-src_compile() {
-	autotools-multilib_src_compile depend
-	autotools-multilib_src_compile all
-}
-
-src_test() {
-	if [[ $(id -u) == 0 ]]; then
-		ewarn "Skipping tests since they cannot be run under the root user."
-		ewarn "To run the test ${PN} suite, add userpriv to FEATURES in make.conf"
-		return
-	fi
-
-	# FIXME: win32-only; wine64 tests fail with "could not find the Wine loader"
-	multilib_toolchain_setup x86
-	local BUILD_DIR="${S}-${ABI}"
-	cd "${BUILD_DIR}" || die
-	WINEPREFIX="${T}/.wine-${ABI}" Xemake test
-}
-
-src_install() {
-	local DOCS=( ANNOUNCE AUTHORS README )
-	add_locale_docs() {
-		local locale_doc="documentation/README.$1"
-		[[ ! -e ${locale_doc} ]] || DOCS=( "${DOCS[@]}" ${locale_doc} )
-	}
-	l10n_for_each_locale_do add_locale_docs
-	autotools-multilib_src_install
-
-	emake -C "../${WINE_GENTOO}" install DESTDIR="${D}" EPREFIX="${EPREFIX}"
-	if use gecko ; then
-		insinto /usr/share/wine/gecko
-		use abi_x86_32 && doins "${DISTDIR}"/wine_gecko-${GV}-x86.msi
-		use abi_x86_64 && doins "${DISTDIR}"/wine_gecko-${GV}-x86_64.msi
-	fi
-	if use mono ; then
-		insinto /usr/share/wine/mono
-		doins "${DISTDIR}"/wine-mono-${MV}.msi
-	fi
-	if ! use perl ; then
-		rm "${D}"usr/bin/{wine{dump,maker},function_grep.pl} "${D}"usr/share/man/man1/wine{dump,maker}.1 || die
-	fi
-
-	use abi_x86_32 && pax-mark psmr "${D}"usr/bin/wine{,-preloader} #255055
-	use abi_x86_64 && pax-mark psmr "${D}"usr/bin/wine64{,-preloader}
-
-	if use abi_x86_64 && ! use abi_x86_32; then
-		dosym /usr/bin/wine{64,} # 404331
-		dosym /usr/bin/wine{64,}-preloader
-	fi
-
-	# respect LINGUAS when installing man pages, #469418
-	for l in de fr pl; do
-		use linguas_${l} || rm -r "${D}"usr/share/man/${l}*
-	done
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	fdo-mime_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	fdo-mime_desktop_database_update
-}
+wine-1.7.13.ebuild
\ No newline at end of file
diff --git a/app-emulation/wine/wine-1.7.18.ebuild b/app-emulation/wine/wine-1.7.18.ebuild
index d379199..88b7471 100644..120000
--- a/app-emulation/wine/wine-1.7.18.ebuild
+++ b/app-emulation/wine/wine-1.7.18.ebuild
@@ -1,453 +1 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="5"
-
-AUTOTOOLS_AUTORECONF=1
-PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv te th tr uk wa zh_CN zh_TW"
-PLOCALE_BACKUP="en"
-
-inherit autotools-multilib eutils fdo-mime flag-o-matic gnome2-utils l10n multilib pax-utils toolchain-funcs virtualx
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="git://source.winehq.org/git/wine.git"
-	inherit git-2
-	SRC_URI=""
-	#KEYWORDS=""
-else
-	MY_P="${PN}-${PV/_/-}"
-	SRC_URI="mirror://sourceforge/${PN}/Source/${MY_P}.tar.bz2"
-	KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
-	S=${WORKDIR}/${MY_P}
-fi
-
-GV="2.24"
-MV="4.5.2"
-PULSE_PATCHES="winepulse-patches-1.7.12"
-WINE_GENTOO="wine-gentoo-2013.06.24"
-DESCRIPTION="Free implementation of Windows(tm) on Unix"
-HOMEPAGE="http://www.winehq.org/"
-SRC_URI="${SRC_URI}
-	gecko? (
-		abi_x86_32? ( mirror://sourceforge/${PN}/Wine%20Gecko/${GV}/wine_gecko-${GV}-x86.msi )
-		abi_x86_64? ( mirror://sourceforge/${PN}/Wine%20Gecko/${GV}/wine_gecko-${GV}-x86_64.msi )
-	)
-	mono? ( mirror://sourceforge/${PN}/Wine%20Mono/${MV}/wine-mono-${MV}.msi )
-	pulseaudio? ( http://dev.gentoo.org/~tetromino/distfiles/${PN}/${PULSE_PATCHES}.tar.bz2 )
-	http://dev.gentoo.org/~tetromino/distfiles/${PN}/${WINE_GENTOO}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +fontconfig +gecko gphoto2 gsm gstreamer +jpeg lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl +png +prelink pulseaudio +realtime +run-exes samba scanner selinux +ssl swtor teso test +threads +truetype +udisks v4l +X xcomposite xinerama +xml"
-REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
-	test? ( abi_x86_32 )
-	elibc_glibc? ( threads )
-	mono? ( abi_x86_32 )
-	osmesa? ( opengl )" #286560
-
-# FIXME: the test suite is unsuitable for us; many tests require net access
-# or fail due to Xvfb's opengl limitations.
-RESTRICT="test"
-
-NATIVE_DEPEND="
-	truetype? ( >=media-libs/freetype-2.0.0  )
-	capi? ( net-dialup/capi4k-utils )
-	ncurses? ( >=sys-libs/ncurses-5.2:= )
-	udisks? ( sys-apps/dbus )
-	fontconfig? ( media-libs/fontconfig:= )
-	gphoto2? ( media-libs/libgphoto2:= )
-	openal? ( media-libs/openal:= )
-	gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 )
-	X? (
-		x11-libs/libXcursor
-		x11-libs/libXext
-		x11-libs/libXrandr
-		x11-libs/libXi
-		x11-libs/libXxf86vm
-	)
-	xinerama? ( x11-libs/libXinerama )
-	alsa? ( media-libs/alsa-lib )
-	cups? ( net-print/cups:= )
-	opencl? ( virtual/opencl )
-	opengl? (
-		virtual/glu
-		virtual/opengl
-	)
-	gsm? ( media-sound/gsm:= )
-	jpeg? ( virtual/jpeg:0= )
-	ldap? ( net-nds/openldap:= )
-	lcms? ( media-libs/lcms:2= )
-	mp3? ( >=media-sound/mpg123-1.5.0 )
-	netapi? ( net-fs/samba[netapi(+)] )
-	nls? ( sys-devel/gettext )
-	odbc? ( dev-db/unixODBC:= )
-	osmesa? ( media-libs/mesa[osmesa] )
-	pulseaudio? ( media-sound/pulseaudio )
-	xml? ( dev-libs/libxml2 dev-libs/libxslt )
-	scanner? ( media-gfx/sane-backends:= )
-	ssl? ( net-libs/gnutls:= )
-	png? ( media-libs/libpng:0= )
-	v4l? ( media-libs/libv4l )
-	xcomposite? ( x11-libs/libXcomposite )"
-
-COMMON_DEPEND="
-	!amd64? ( ${NATIVE_DEPEND} )
-	amd64? (
-		abi_x86_64? ( ${NATIVE_DEPEND} )
-		abi_x86_32? (
-			truetype? ( || (
-				>=app-emulation/emul-linux-x86-xlibs-2.1[development]
-				>=media-libs/freetype-2.0.0[abi_x86_32]
-			) )
-			ncurses? ( || (
-				app-emulation/emul-linux-x86-baselibs[development]
-				sys-libs/ncurses[abi_x86_32]
-			) )
-			udisks? ( || (
-				>=app-emulation/emul-linux-x86-baselibs-20130224[development]
-				sys-apps/dbus[abi_x86_32]
-			) )
-			fontconfig? ( || (
-				app-emulation/emul-linux-x86-xlibs[development]
-				media-libs/fontconfig[abi_x86_32]
-			) )
-			gphoto2? (
-				app-emulation/emul-linux-x86-medialibs[development]
-			)
-			openal? ( || (
-				app-emulation/emul-linux-x86-sdl[development]
-				media-libs/openal[abi_x86_32]
-			) )
-			gstreamer? (
-				app-emulation/emul-linux-x86-gstplugins
-				app-emulation/emul-linux-x86-medialibs[development]
-			)
-			X? ( || (
-				app-emulation/emul-linux-x86-xlibs[development]
-				(
-					x11-libs/libXcursor[abi_x86_32]
-					x11-libs/libXext[abi_x86_32]
-					x11-libs/libXrandr[abi_x86_32]
-					x11-libs/libXi[abi_x86_32]
-					x11-libs/libXxf86vm[abi_x86_32]
-				)
-			) )
-			xinerama? ( || (
-				app-emulation/emul-linux-x86-xlibs[development]
-				x11-libs/libXinerama[abi_x86_32]
-			) )
-			alsa? ( || (
-				app-emulation/emul-linux-x86-soundlibs[alsa,development]
-				media-libs/alsa-lib[abi_x86_32]
-			) )
-			cups? ( app-emulation/emul-linux-x86-baselibs )
-			opencl? ( virtual/opencl[abi_x86_32] )
-			opengl? ( || (
-				app-emulation/emul-linux-x86-opengl[development]
-				(
-					virtual/glu[abi_x86_32]
-					virtual/opengl[abi_x86_32]
-				)
-			) )
-			gsm? ( || (
-				app-emulation/emul-linux-x86-soundlibs[development]
-				media-sound/gsm[abi_x86_32]
-			) )
-			jpeg? ( || (
-				app-emulation/emul-linux-x86-baselibs[development]
-				virtual/jpeg:0[abi_x86_32]
-			) )
-			ldap? ( app-emulation/emul-linux-x86-baselibs[development] )
-			lcms? ( || (
-				app-emulation/emul-linux-x86-baselibs[development]
-				media-libs/lcms:2[abi_x86_32]
-			) )
-			mp3? ( || (
-				app-emulation/emul-linux-x86-soundlibs[development]
-				>=media-sound/mpg123-1.5.0[abi_x86_32]
-			) )
-			nls? ( || (
-				app-emulation/emul-linux-x86-baselibs[development]
-				sys-devel/gettext[abi_x86_32]
-			) )
-			odbc? ( app-emulation/emul-linux-x86-db[development] )
-			osmesa? ( || (
-				>=app-emulation/emul-linux-x86-opengl-20121028[development]
-				media-libs/mesa[osmesa,abi_x86_32]
-			) )
-			pulseaudio? ( || (
-				app-emulation/emul-linux-x86-soundlibs[development]
-				>=media-sound/pulseaudio-4.0-r1[abi_x86_32]
-			) )
-			xml? ( || (
-				>=app-emulation/emul-linux-x86-baselibs-20131008[development]
-				(
-					dev-libs/libxml2[abi_x86_32]
-					dev-libs/libxslt[abi_x86_32]
-				)
-			) )
-			scanner? ( app-emulation/emul-linux-x86-medialibs[development] )
-			ssl? ( app-emulation/emul-linux-x86-baselibs[development] )
-			png? ( || (
-				app-emulation/emul-linux-x86-baselibs[development]
-				media-libs/libpng:0[abi_x86_32]
-			) )
-			v4l? ( || (
-				app-emulation/emul-linux-x86-medialibs[development]
-				media-libs/libv4l[abi_x86_32]
-			) )
-			xcomposite? ( || (
-				app-emulation/emul-linux-x86-xlibs[development]
-				x11-libs/libXcomposite[abi_x86_32]
-			) )
-		)
-	)"
-
-RDEPEND="${COMMON_DEPEND}
-	dos? ( games-emulation/dosbox )
-	perl? ( dev-lang/perl dev-perl/XML-Simple )
-	samba? ( >=net-fs/samba-3.0.25 )
-	selinux? ( sec-policy/selinux-wine )
-	udisks? ( sys-fs/udisks:2 )
-	pulseaudio? ( realtime? ( sys-auth/rtkit ) )"
-
-DEPEND="${COMMON_DEPEND}
-	amd64? ( abi_x86_32? ( !abi_x86_64? ( ${NATIVE_DEPEND} ) ) )
-	X? (
-		x11-proto/inputproto
-		x11-proto/xextproto
-		x11-proto/xf86vidmodeproto
-	)
-	xinerama? ( x11-proto/xineramaproto )
-	prelink? ( sys-devel/prelink )
-	>=sys-kernel/linux-headers-2.6
-	virtual/pkgconfig
-	virtual/yacc
-	sys-devel/flex"
-
-# These use a non-standard "Wine" category, which is provided by
-# /etc/xdg/applications-merged/wine.menu
-QA_DESKTOP_FILE="usr/share/applications/wine-browsedrive.desktop
-usr/share/applications/wine-notepad.desktop
-usr/share/applications/wine-uninstaller.desktop
-usr/share/applications/wine-winecfg.desktop"
-
-wine_build_environment_check() {
-	[[ ${MERGE_TYPE} = "binary" ]] && return 0
-
-	if use abi_x86_64 && [[ $(( $(gcc-major-version) * 100 + $(gcc-minor-version) )) -lt 404 ]]; then
-		eerror "You need gcc-4.4+ to build 64-bit wine"
-		eerror
-		return 1
-	fi
-
-	if use abi_x86_32 && use opencl && [[ x$(eselect opencl show 2> /dev/null) = "xintel" ]]; 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_build_environment_check || die
-}
-
-pkg_setup() {
-	wine_build_environment_check || die
-}
-
-src_unpack() {
-	if [[ ${PV} == "9999" ]] ; then
-		git-2_src_unpack
-	else
-		unpack ${MY_P}.tar.bz2
-	fi
-
-	use pulseaudio && unpack "${PULSE_PATCHES}.tar.bz2"
-	unpack "${WINE_GENTOO}.tar.bz2"
-
-	l10n_find_plocales_changes "${S}/po" "" ".po"
-}
-
-src_prepare() {
-	local md5="$(md5sum server/protocol.def)"
-	local PATCHES=(
-		"${FILESDIR}"/${PN}-1.5.26-winegcc.patch #260726
-		"${FILESDIR}"/${PN}-1.4_rc2-multilib-portage.patch #395615
-		"${FILESDIR}"/${PN}-1.7.12-osmesa-check.patch #429386
-		"${FILESDIR}"/${PN}-1.6-memset-O3.patch #480508
-	)
-	use pulseaudio && PATCHES+=(
-		"../${PULSE_PATCHES}"/*.patch #421365
-	)
-	# http://bugs.winehq.org/show_bug.cgi?id=29168
-	use swtor && PATCHES+=(
-		"${FILESDIR}"/${PN}-1.7.1-KUSER_SHARED_DATA_18.patch
-	)
-	# http://bugs.winehq.org/show_bug.cgi?id=34388
-	use teso && PATCHES+=(
-		"${FILESDIR}"/${PN}-1.7.2-crypt32-Skip-unknown-item-when.patch
-	)
-
-	autotools-utils_src_prepare
-
-	if [[ "$(md5sum server/protocol.def)" != "${md5}" ]]; then
-		einfo "server/protocol.def was patched; running tools/make_requests"
-		tools/make_requests || die #432348
-	fi
-	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
-	if ! use run-exes; then
-		sed -i '/^MimeType/d' tools/wine.desktop || die #117785
-	fi
-
-	# hi-res default icon, #472990, http://bugs.winehq.org/show_bug.cgi?id=24652
-	cp "${WORKDIR}"/${WINE_GENTOO}/icons/oic_winlogo.ico dlls/user32/resources/ || die
-
-	l10n_get_locales > po/LINGUAS # otherwise wine doesn't respect LINGUAS
-}
-
-do_configure() {
-	local myeconfargs=( "${myeconfargs[@]}" )
-
-	if use amd64; then
-		if [[ ${ABI} == amd64 ]]; then
-			myeconfargs+=( --enable-win64 )
-		else
-			use netapi && ewarn "Disabling netapi in wine32; see https://bugs.gentoo.org/494394"
-			# We currently don't have 32-bit libnetapi on amd64; #494394
-			myeconfargs+=(
-				--without-netapi
-				--disable-win64
-			)
-		fi
-
-		# Note: using --with-wine64 results in problems with multilib.eclass
-		# CC/LD hackery. We're using separate tools instead.
-	fi
-
-	autotools-utils_src_configure
-}
-
-src_configure() {
-	export LDCONFIG=/bin/true
-	use custom-cflags || strip-flags
-
-	local myeconfargs=( # common
-		--sysconfdir=/etc/wine
-		$(use_with alsa)
-		$(use_with capi)
-		$(use_with lcms cms)
-		$(use_with cups)
-		$(use_with ncurses curses)
-		$(use_with udisks dbus)
-		$(use_with fontconfig)
-		$(use_with ssl gnutls)
-		$(use_with gphoto2 gphoto)
-		$(use_with gsm)
-		$(use_with gstreamer)
-		--without-hal
-		$(use_with jpeg)
-		$(use_with ldap)
-		$(use_with mp3 mpg123)
-		$(use_with netapi)
-		$(use_with nls gettext)
-		$(use_with openal)
-		$(use_with opencl)
-		$(use_with opengl)
-		$(use_with osmesa)
-		$(use_with oss)
-		$(use_with png)
-		$(use_with threads pthread)
-		$(use_with scanner sane)
-		$(use_enable test tests)
-		$(use_with truetype freetype)
-		$(use_with v4l)
-		$(use_with X x)
-		$(use_with xcomposite)
-		$(use_with xinerama)
-		$(use_with xml)
-		$(use_with xml xslt)
-	)
-
-	use pulseaudio && myeconfargs+=( --with-pulse )
-
-	if use amd64 && use abi_x86_32; then
-		# 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
-	fi
-
-	multilib_parallel_foreach_abi do_configure
-}
-
-src_compile() {
-	autotools-multilib_src_compile depend
-	autotools-multilib_src_compile all
-}
-
-src_test() {
-	if [[ $(id -u) == 0 ]]; then
-		ewarn "Skipping tests since they cannot be run under the root user."
-		ewarn "To run the test ${PN} suite, add userpriv to FEATURES in make.conf"
-		return
-	fi
-
-	# FIXME: win32-only; wine64 tests fail with "could not find the Wine loader"
-	multilib_toolchain_setup x86
-	local BUILD_DIR="${S}-${ABI}"
-	cd "${BUILD_DIR}" || die
-	WINEPREFIX="${T}/.wine-${ABI}" Xemake test
-}
-
-src_install() {
-	local DOCS=( ANNOUNCE AUTHORS README )
-	add_locale_docs() {
-		local locale_doc="documentation/README.$1"
-		[[ ! -e ${locale_doc} ]] || DOCS=( "${DOCS[@]}" ${locale_doc} )
-	}
-	l10n_for_each_locale_do add_locale_docs
-	autotools-multilib_src_install
-
-	emake -C "../${WINE_GENTOO}" install DESTDIR="${D}" EPREFIX="${EPREFIX}"
-	if use gecko ; then
-		insinto /usr/share/wine/gecko
-		use abi_x86_32 && doins "${DISTDIR}"/wine_gecko-${GV}-x86.msi
-		use abi_x86_64 && doins "${DISTDIR}"/wine_gecko-${GV}-x86_64.msi
-	fi
-	if use mono ; then
-		insinto /usr/share/wine/mono
-		doins "${DISTDIR}"/wine-mono-${MV}.msi
-	fi
-	if ! use perl ; then
-		rm "${D}"usr/bin/{wine{dump,maker},function_grep.pl} "${D}"usr/share/man/man1/wine{dump,maker}.1 || die
-	fi
-
-	use abi_x86_32 && pax-mark psmr "${D}"usr/bin/wine{,-preloader} #255055
-	use abi_x86_64 && pax-mark psmr "${D}"usr/bin/wine64{,-preloader}
-
-	if use abi_x86_64 && ! use abi_x86_32; then
-		dosym /usr/bin/wine{64,} # 404331
-		dosym /usr/bin/wine{64,}-preloader
-	fi
-
-	# respect LINGUAS when installing man pages, #469418
-	for l in de fr pl; do
-		use linguas_${l} || rm -r "${D}"usr/share/man/${l}*
-	done
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	fdo-mime_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	fdo-mime_desktop_database_update
-}
+wine-1.7.13.ebuild
\ No newline at end of file
diff --git a/app-emulation/wine/wine-1.7.26-r2.ebuild b/app-emulation/wine/wine-1.7.26-r2.ebuild
index 890233f..9620b4e 100644
--- a/app-emulation/wine/wine-1.7.26-r2.ebuild
+++ b/app-emulation/wine/wine-1.7.26-r2.ebuild
@@ -18,7 +18,7 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	MY_P="${PN}-${PV/_/-}"
 	SRC_URI="mirror://sourceforge/${PN}/Source/${MY_P}.tar.bz2"
-	KEYWORDS="-* ~amd64" # ~x86 ~x86-fbsd
+	KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
 	S=${WORKDIR}/${MY_P}
 fi
 
diff --git a/app-emulation/wine/wine-1.7.26-r3.ebuild b/app-emulation/wine/wine-1.7.26-r3.ebuild
index f52263f..aaa6e26 100644
--- a/app-emulation/wine/wine-1.7.26-r3.ebuild
+++ b/app-emulation/wine/wine-1.7.26-r3.ebuild
@@ -18,7 +18,7 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	MY_P="${PN}-${PV/_/-}"
 	SRC_URI="mirror://sourceforge/${PN}/Source/${MY_P}.tar.bz2"
-	KEYWORDS="-* ~amd64" # ~x86 ~x86-fbsd
+	KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
 	S=${WORKDIR}/${MY_P}
 fi
 
diff --git a/app-emulation/wine/wine-1.7.28-r1.ebuild b/app-emulation/wine/wine-1.7.28-r1.ebuild
index 0b13214..1eb4b87 100644
--- a/app-emulation/wine/wine-1.7.28-r1.ebuild
+++ b/app-emulation/wine/wine-1.7.28-r1.ebuild
@@ -94,121 +94,90 @@ COMMON_DEPEND="
 	amd64? (
 		abi_x86_64? ( ${NATIVE_DEPEND} )
 		abi_x86_32? (
-			truetype? ( || (
-				>=app-emulation/emul-linux-x86-xlibs-2.1[development,-abi_x86_32(-)]
+			truetype? (
 				>=media-libs/freetype-2.5.0.1[abi_x86_32(-)]
-			) )
-			ncurses? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+			)
+			ncurses? (
 				>=sys-libs/ncurses-5.9-r3[abi_x86_32(-)]
-			) )
-			udisks? ( || (
-				>=app-emulation/emul-linux-x86-baselibs-20130224[development,-abi_x86_32(-)]
+			)
+			udisks? (
 				>=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)]
-			) )
-			fontconfig? ( || (
-				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
+			)
+			fontconfig? (
 				>=media-libs/fontconfig-2.10.92[abi_x86_32(-)]
-			) )
-			gphoto2? ( || (
-				app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
+			)
+			gphoto2? (
 				>=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)]
-			) )
-			openal? ( || (
-				app-emulation/emul-linux-x86-sdl[development,-abi_x86_32(-)]
+			)
+			openal? (
 				>=media-libs/openal-1.15.1[abi_x86_32(-)]
-			) )
-			X? ( || (
-				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
-				(
+			)
+			X? (
 					>=x11-libs/libXcursor-1.1.14[abi_x86_32(-)]
 					>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
 					>=x11-libs/libXrandr-1.4.2[abi_x86_32(-)]
 					>=x11-libs/libXi-1.7.2[abi_x86_32(-)]
 					>=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)]
-				)
-			) )
-			xinerama? ( || (
-				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
+			)
+			xinerama? (
 				>=x11-libs/libXinerama-1.1.3[abi_x86_32(-)]
-			) )
-			alsa? ( || (
-				app-emulation/emul-linux-x86-soundlibs[alsa,development,-abi_x86_32(-)]
+			)
+			alsa? (
 				>=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)]
-			) )
-			cups? ( || (
-				app-emulation/emul-linux-x86-baselibs
+			)
+			cups? (
 				>=net-print/cups-1.7.1-r1[abi_x86_32(-)]
-			) )
+			)
 			opencl? ( >=virtual/opencl-0-r3[abi_x86_32(-)] )
-			opengl? ( || (
-				app-emulation/emul-linux-x86-opengl[development,-abi_x86_32(-)]
-				(
+			opengl? (
 					>=virtual/glu-9.0-r1[abi_x86_32(-)]
 					>=virtual/opengl-7.0-r1[abi_x86_32(-)]
-				)
-			) )
-			gsm? ( || (
-				app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)]
+			)
+			gsm? (
 				>=media-sound/gsm-1.0.13-r1[abi_x86_32(-)]
-			) )
-			jpeg? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+			)
+			jpeg? (
 				>=virtual/jpeg-0-r2:0[abi_x86_32(-)]
-			) )
-			ldap? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+			)
+			ldap? (
 				>=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)]
-			) )
-			lcms? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+			)
+			lcms? (
 				>=media-libs/lcms-2.5:2[abi_x86_32(-)]
-			) )
-			mp3? ( || (
-				app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)]
+			)
+			mp3? (
 				>=media-sound/mpg123-1.15.4[abi_x86_32(-)]
-			) )
+			)
 			netapi? ( >=net-fs/samba-3.6.23-r1[netapi(+),abi_x86_32(-)] )
-			nls? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+			nls? (
 				>=sys-devel/gettext-0.18.3.2[abi_x86_32(-)]
-			) )
-			odbc? ( || (
-				app-emulation/emul-linux-x86-db[development,-abi_x86_32(-)]
+			)
+			odbc? (
 				>=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)]
-			) )
-			osmesa? ( || (
-				>=app-emulation/emul-linux-x86-opengl-20121028[development,-abi_x86_32(-)]
+			)
+			osmesa? (
 				>=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)]
-			) )
+			)
 			pcap? ( net-libs/libpcap[abi_x86_32(-)] )
-			xml? ( || (
-				>=app-emulation/emul-linux-x86-baselibs-20131008[development,-abi_x86_32(-)]
-				(
+			xml? (
 					>=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)]
 					>=dev-libs/libxslt-1.1.28-r1[abi_x86_32(-)]
-				)
-			) )
-			scanner? ( || (
-				app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
+			)
+			scanner? (
 				>=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)]
-			) )
-			ssl? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+			)
+			ssl? (
 				>=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)]
-			) )
-			png? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+			)
+			png? (
 				>=media-libs/libpng-1.6.10:0[abi_x86_32(-)]
-			) )
-			v4l? ( || (
-				app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
+			)
+			v4l? (
 				>=media-libs/libv4l-0.9.5[abi_x86_32(-)]
-			) )
-			xcomposite? ( || (
-				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
+			)
+			xcomposite? (
 				>=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)]
-			) )
+			)
 		)
 	)"
 
diff --git a/app-emulation/wine/wine-1.7.28-r2.ebuild b/app-emulation/wine/wine-1.7.28-r2.ebuild
index e6c55a0..54fe286 100644
--- a/app-emulation/wine/wine-1.7.28-r2.ebuild
+++ b/app-emulation/wine/wine-1.7.28-r2.ebuild
@@ -94,121 +94,90 @@ COMMON_DEPEND="
 	amd64? (
 		abi_x86_64? ( ${NATIVE_DEPEND} )
 		abi_x86_32? (
-			truetype? ( || (
-				>=app-emulation/emul-linux-x86-xlibs-2.1[development,-abi_x86_32(-)]
+			truetype? (
 				>=media-libs/freetype-2.5.0.1[abi_x86_32(-)]
-			) )
-			ncurses? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+			)
+			ncurses? (
 				>=sys-libs/ncurses-5.9-r3[abi_x86_32(-)]
-			) )
-			udisks? ( || (
-				>=app-emulation/emul-linux-x86-baselibs-20130224[development,-abi_x86_32(-)]
+			)
+			udisks? (
 				>=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)]
-			) )
-			fontconfig? ( || (
-				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
+			)
+			fontconfig? (
 				>=media-libs/fontconfig-2.10.92[abi_x86_32(-)]
-			) )
-			gphoto2? ( || (
-				app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
+			)
+			gphoto2? (
 				>=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)]
-			) )
-			openal? ( || (
-				app-emulation/emul-linux-x86-sdl[development,-abi_x86_32(-)]
+			)
+			openal? (
 				>=media-libs/openal-1.15.1[abi_x86_32(-)]
-			) )
-			X? ( || (
-				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
-				(
+			)
+			X? (
 					>=x11-libs/libXcursor-1.1.14[abi_x86_32(-)]
 					>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
 					>=x11-libs/libXrandr-1.4.2[abi_x86_32(-)]
 					>=x11-libs/libXi-1.7.2[abi_x86_32(-)]
 					>=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)]
-				)
-			) )
-			xinerama? ( || (
-				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
+			)
+			xinerama? (
 				>=x11-libs/libXinerama-1.1.3[abi_x86_32(-)]
-			) )
-			alsa? ( || (
-				app-emulation/emul-linux-x86-soundlibs[alsa,development,-abi_x86_32(-)]
+			)
+			alsa? (
 				>=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)]
-			) )
-			cups? ( || (
-				app-emulation/emul-linux-x86-baselibs
+			)
+			cups? (
 				>=net-print/cups-1.7.1-r1[abi_x86_32(-)]
-			) )
+			)
 			opencl? ( >=virtual/opencl-0-r3[abi_x86_32(-)] )
-			opengl? ( || (
-				app-emulation/emul-linux-x86-opengl[development,-abi_x86_32(-)]
-				(
+			opengl? (
 					>=virtual/glu-9.0-r1[abi_x86_32(-)]
 					>=virtual/opengl-7.0-r1[abi_x86_32(-)]
-				)
-			) )
-			gsm? ( || (
-				app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)]
+			)
+			gsm? (
 				>=media-sound/gsm-1.0.13-r1[abi_x86_32(-)]
-			) )
-			jpeg? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+			)
+			jpeg? (
 				>=virtual/jpeg-0-r2:0[abi_x86_32(-)]
-			) )
-			ldap? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+			)
+			ldap? (
 				>=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)]
-			) )
-			lcms? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+			)
+			lcms? (
 				>=media-libs/lcms-2.5:2[abi_x86_32(-)]
-			) )
-			mp3? ( || (
-				app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)]
+			)
+			mp3? (
 				>=media-sound/mpg123-1.15.4[abi_x86_32(-)]
-			) )
+			)
 			netapi? ( >=net-fs/samba-3.6.23-r1[netapi(+),abi_x86_32(-)] )
-			nls? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+			nls? (
 				>=sys-devel/gettext-0.18.3.2[abi_x86_32(-)]
-			) )
-			odbc? ( || (
-				app-emulation/emul-linux-x86-db[development,-abi_x86_32(-)]
+			)
+			odbc? (
 				>=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)]
-			) )
-			osmesa? ( || (
-				>=app-emulation/emul-linux-x86-opengl-20121028[development,-abi_x86_32(-)]
+			)
+			osmesa? (
 				>=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)]
-			) )
+			)
 			pcap? ( net-libs/libpcap[abi_x86_32(-)] )
-			xml? ( || (
-				>=app-emulation/emul-linux-x86-baselibs-20131008[development,-abi_x86_32(-)]
-				(
+			xml? (
 					>=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)]
 					>=dev-libs/libxslt-1.1.28-r1[abi_x86_32(-)]
-				)
-			) )
-			scanner? ( || (
-				app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
+			)
+			scanner? (
 				>=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)]
-			) )
-			ssl? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+			)
+			ssl? (
 				>=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)]
-			) )
-			png? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+			)
+			png? (
 				>=media-libs/libpng-1.6.10:0[abi_x86_32(-)]
-			) )
-			v4l? ( || (
-				app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
+			)
+			v4l? (
 				>=media-libs/libv4l-0.9.5[abi_x86_32(-)]
-			) )
-			xcomposite? ( || (
-				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
+			)
+			xcomposite? (
 				>=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)]
-			) )
+			)
 		)
 	)"
 
diff --git a/app-emulation/wine/wine-1.7.29.ebuild b/app-emulation/wine/wine-1.7.29.ebuild
index f6e22ef..70261c1 100644
--- a/app-emulation/wine/wine-1.7.29.ebuild
+++ b/app-emulation/wine/wine-1.7.29.ebuild
@@ -98,135 +98,99 @@ COMMON_DEPEND="
 	amd64? (
 		abi_x86_64? ( ${NATIVE_DEPEND} )
 		abi_x86_32? (
-			truetype? ( || (
-				>=app-emulation/emul-linux-x86-xlibs-2.1[development,-abi_x86_32(-)]
+			truetype? (
 				>=media-libs/freetype-2.5.0.1[abi_x86_32(-)]
-			) )
-			ncurses? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+			)
+			ncurses? (
 				>=sys-libs/ncurses-5.9-r3[abi_x86_32(-)]
-			) )
-			udisks? ( || (
-				>=app-emulation/emul-linux-x86-baselibs-20130224[development,-abi_x86_32(-)]
+			)
+			udisks? (
 				>=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)]
-			) )
-			fontconfig? ( || (
-				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
+			)
+			fontconfig? (
 				>=media-libs/fontconfig-2.10.92[abi_x86_32(-)]
-			) )
-			gphoto2? ( || (
-				app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
+			)
+			gphoto2? (
 				>=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)]
-			) )
-			openal? ( || (
-				app-emulation/emul-linux-x86-sdl[development,-abi_x86_32(-)]
+			)
+			openal? (
 				>=media-libs/openal-1.15.1[abi_x86_32(-)]
-			) )
-			gstreamer? ( || (
-				app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
-				(
+			)
+			gstreamer? (
 					>=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)]
 					>=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)]
-				)
-			) )
-			X? ( || (
-				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
-				(
+			)
+			X? (
 					>=x11-libs/libXcursor-1.1.14[abi_x86_32(-)]
 					>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
 					>=x11-libs/libXrandr-1.4.2[abi_x86_32(-)]
 					>=x11-libs/libXi-1.7.2[abi_x86_32(-)]
 					>=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)]
-				)
-			) )
-			xinerama? ( || (
-				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
+			)
+			xinerama? (
 				>=x11-libs/libXinerama-1.1.3[abi_x86_32(-)]
-			) )
-			alsa? ( || (
-				app-emulation/emul-linux-x86-soundlibs[alsa,development,-abi_x86_32(-)]
+			)
+			alsa? (
 				>=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)]
-			) )
-			cups? ( || (
-				app-emulation/emul-linux-x86-baselibs
+			)
+			cups? (
 				>=net-print/cups-1.7.1-r1[abi_x86_32(-)]
-			) )
+			)
 			opencl? ( >=virtual/opencl-0-r3[abi_x86_32(-)] )
-			opengl? ( || (
-				app-emulation/emul-linux-x86-opengl[development,-abi_x86_32(-)]
-				(
+			opengl? (
 					>=virtual/glu-9.0-r1[abi_x86_32(-)]
 					>=virtual/opengl-7.0-r1[abi_x86_32(-)]
-				)
-			) )
-			gsm? ( || (
-				app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)]
+			)
+			gsm? (
 				>=media-sound/gsm-1.0.13-r1[abi_x86_32(-)]
-			) )
-			jpeg? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+			)
+			jpeg? (
 				>=virtual/jpeg-0-r2:0[abi_x86_32(-)]
-			) )
-			ldap? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+			)
+			ldap? (
 				>=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)]
-			) )
-			lcms? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+			)
+			lcms? (
 				>=media-libs/lcms-2.5:2[abi_x86_32(-)]
-			) )
-			mp3? ( || (
-				app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)]
+			)
+			mp3? (
 				>=media-sound/mpg123-1.15.4[abi_x86_32(-)]
-			) )
+			)
 			netapi? ( >=net-fs/samba-3.6.23-r1[netapi(+),abi_x86_32(-)] )
-			nls? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+			nls? (
 				>=sys-devel/gettext-0.18.3.2[abi_x86_32(-)]
-			) )
-			odbc? ( || (
-				app-emulation/emul-linux-x86-db[development,-abi_x86_32(-)]
+			)
+			odbc? (
 				>=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)]
-			) )
-			osmesa? ( || (
-				>=app-emulation/emul-linux-x86-opengl-20121028[development,-abi_x86_32(-)]
+			)
+			osmesa? (
 				>=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)]
-			) )
-			pipelight? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+			)
+			pipelight? (
 				>=sys-apps/attr-2.4.47-r1[abi_x86_32(-)]
-			) )
-			pulseaudio? ( || (
-				app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)]
+			)
+			pulseaudio? (
 				>=media-sound/pulseaudio-5.0[abi_x86_32(-)]
-			) )
-			xml? ( || (
-				>=app-emulation/emul-linux-x86-baselibs-20131008[development,-abi_x86_32(-)]
-				(
+			)
+			xml? (
 					>=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)]
 					>=dev-libs/libxslt-1.1.28-r1[abi_x86_32(-)]
-				)
-			) )
-			scanner? ( || (
-				app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
+			)
+			scanner? (
 				>=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)]
-			) )
-			ssl? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+			)
+			ssl? (
 				>=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)]
-			) )
-			png? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+			)
+			png? (
 				>=media-libs/libpng-1.6.10:0[abi_x86_32(-)]
-			) )
-			v4l? ( || (
-				app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
+			)
+			v4l? (
 				>=media-libs/libv4l-0.9.5[abi_x86_32(-)]
-			) )
-			xcomposite? ( || (
-				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
+			)
+			xcomposite? (
 				>=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)]
-			) )
+			)
 		)
 	)"
 
diff --git a/app-emulation/wine/wine-1.7.33-r1.ebuild b/app-emulation/wine/wine-1.7.33-r1.ebuild
index 11db4ed..a5be3fb 100644
--- a/app-emulation/wine/wine-1.7.33-r1.ebuild
+++ b/app-emulation/wine/wine-1.7.33-r1.ebuild
@@ -94,121 +94,90 @@ COMMON_DEPEND="
 	amd64? (
 		abi_x86_64? ( ${NATIVE_DEPEND} )
 		abi_x86_32? (
-			truetype? ( || (
-				>=app-emulation/emul-linux-x86-xlibs-2.1[development,-abi_x86_32(-)]
+			truetype? (
 				>=media-libs/freetype-2.5.0.1[abi_x86_32(-)]
-			) )
-			ncurses? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+			)
+			ncurses? (
 				>=sys-libs/ncurses-5.9-r3[abi_x86_32(-)]
-			) )
-			udisks? ( || (
-				>=app-emulation/emul-linux-x86-baselibs-20130224[development,-abi_x86_32(-)]
+			)
+			udisks? (
 				>=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)]
-			) )
-			fontconfig? ( || (
-				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
+			)
+			fontconfig? (
 				>=media-libs/fontconfig-2.10.92[abi_x86_32(-)]
-			) )
-			gphoto2? ( || (
-				app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
+			)
+			gphoto2? (
 				>=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)]
-			) )
-			openal? ( || (
-				app-emulation/emul-linux-x86-sdl[development,-abi_x86_32(-)]
+			)
+			openal? (
 				>=media-libs/openal-1.15.1[abi_x86_32(-)]
-			) )
-			X? ( || (
-				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
-				(
+			)
+			X? (
 					>=x11-libs/libXcursor-1.1.14[abi_x86_32(-)]
 					>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
 					>=x11-libs/libXrandr-1.4.2[abi_x86_32(-)]
 					>=x11-libs/libXi-1.7.2[abi_x86_32(-)]
 					>=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)]
-				)
-			) )
-			xinerama? ( || (
-				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
+			)
+			xinerama? (
 				>=x11-libs/libXinerama-1.1.3[abi_x86_32(-)]
-			) )
-			alsa? ( || (
-				app-emulation/emul-linux-x86-soundlibs[alsa,development,-abi_x86_32(-)]
+			)
+			alsa? (
 				>=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)]
-			) )
-			cups? ( || (
-				app-emulation/emul-linux-x86-baselibs
+			)
+			cups? (
 				>=net-print/cups-1.7.1-r1[abi_x86_32(-)]
-			) )
+			)
 			opencl? ( >=virtual/opencl-0-r3[abi_x86_32(-)] )
-			opengl? ( || (
-				app-emulation/emul-linux-x86-opengl[development,-abi_x86_32(-)]
-				(
+			opengl? (
 					>=virtual/glu-9.0-r1[abi_x86_32(-)]
 					>=virtual/opengl-7.0-r1[abi_x86_32(-)]
-				)
-			) )
-			gsm? ( || (
-				app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)]
+			)
+			gsm? (
 				>=media-sound/gsm-1.0.13-r1[abi_x86_32(-)]
-			) )
-			jpeg? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+			)
+			jpeg? (
 				>=virtual/jpeg-0-r2:0[abi_x86_32(-)]
-			) )
-			ldap? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+			)
+			ldap? (
 				>=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)]
-			) )
-			lcms? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+			)
+			lcms? (
 				>=media-libs/lcms-2.5:2[abi_x86_32(-)]
-			) )
-			mp3? ( || (
-				app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)]
+			)
+			mp3? (
 				>=media-sound/mpg123-1.15.4[abi_x86_32(-)]
-			) )
+			)
 			netapi? ( >=net-fs/samba-3.6.23-r1[netapi(+),abi_x86_32(-)] )
-			nls? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+			nls? (
 				>=sys-devel/gettext-0.18.3.2[abi_x86_32(-)]
-			) )
-			odbc? ( || (
-				app-emulation/emul-linux-x86-db[development,-abi_x86_32(-)]
+			)
+			odbc? (
 				>=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)]
-			) )
-			osmesa? ( || (
-				>=app-emulation/emul-linux-x86-opengl-20121028[development,-abi_x86_32(-)]
+			)
+			osmesa? (
 				>=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)]
-			) )
+			)
 			pcap? ( net-libs/libpcap[abi_x86_32(-)] )
-			xml? ( || (
-				>=app-emulation/emul-linux-x86-baselibs-20131008[development,-abi_x86_32(-)]
-				(
+			xml? (
 					>=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)]
 					>=dev-libs/libxslt-1.1.28-r1[abi_x86_32(-)]
-				)
-			) )
-			scanner? ( || (
-				app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
+			)
+			scanner? (
 				>=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)]
-			) )
-			ssl? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+			)
+			ssl? (
 				>=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)]
-			) )
-			png? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+			)
+			png? (
 				>=media-libs/libpng-1.6.10:0[abi_x86_32(-)]
-			) )
-			v4l? ( || (
-				app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
+			)
+			v4l? (
 				>=media-libs/libv4l-0.9.5[abi_x86_32(-)]
-			) )
-			xcomposite? ( || (
-				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
+			)
+			xcomposite? (
 				>=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)]
-			) )
+			)
 		)
 	)"
 
diff --git a/app-emulation/wine/wine-1.7.33-r2.ebuild b/app-emulation/wine/wine-1.7.33-r2.ebuild
index fe813c6..1073957 100644
--- a/app-emulation/wine/wine-1.7.33-r2.ebuild
+++ b/app-emulation/wine/wine-1.7.33-r2.ebuild
@@ -94,121 +94,90 @@ COMMON_DEPEND="
 	amd64? (
 		abi_x86_64? ( ${NATIVE_DEPEND} )
 		abi_x86_32? (
-			truetype? ( || (
-				>=app-emulation/emul-linux-x86-xlibs-2.1[development,-abi_x86_32(-)]
+			truetype? (
 				>=media-libs/freetype-2.5.0.1[abi_x86_32(-)]
-			) )
-			ncurses? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+			)
+			ncurses? (
 				>=sys-libs/ncurses-5.9-r3[abi_x86_32(-)]
-			) )
-			udisks? ( || (
-				>=app-emulation/emul-linux-x86-baselibs-20130224[development,-abi_x86_32(-)]
+			)
+			udisks? (
 				>=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)]
-			) )
-			fontconfig? ( || (
-				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
+			)
+			fontconfig? (
 				>=media-libs/fontconfig-2.10.92[abi_x86_32(-)]
-			) )
-			gphoto2? ( || (
-				app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
+			)
+			gphoto2? (
 				>=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)]
-			) )
-			openal? ( || (
-				app-emulation/emul-linux-x86-sdl[development,-abi_x86_32(-)]
+			)
+			openal? (
 				>=media-libs/openal-1.15.1[abi_x86_32(-)]
-			) )
-			X? ( || (
-				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
-				(
+			)
+			X? (
 					>=x11-libs/libXcursor-1.1.14[abi_x86_32(-)]
 					>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
 					>=x11-libs/libXrandr-1.4.2[abi_x86_32(-)]
 					>=x11-libs/libXi-1.7.2[abi_x86_32(-)]
 					>=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)]
-				)
-			) )
-			xinerama? ( || (
-				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
+			)
+			xinerama? (
 				>=x11-libs/libXinerama-1.1.3[abi_x86_32(-)]
-			) )
-			alsa? ( || (
-				app-emulation/emul-linux-x86-soundlibs[alsa,development,-abi_x86_32(-)]
+			)
+			alsa? (
 				>=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)]
-			) )
-			cups? ( || (
-				app-emulation/emul-linux-x86-baselibs
+			)
+			cups? (
 				>=net-print/cups-1.7.1-r1[abi_x86_32(-)]
-			) )
+			)
 			opencl? ( >=virtual/opencl-0-r3[abi_x86_32(-)] )
-			opengl? ( || (
-				app-emulation/emul-linux-x86-opengl[development,-abi_x86_32(-)]
-				(
+			opengl? (
 					>=virtual/glu-9.0-r1[abi_x86_32(-)]
 					>=virtual/opengl-7.0-r1[abi_x86_32(-)]
-				)
-			) )
-			gsm? ( || (
-				app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)]
+			)
+			gsm? (
 				>=media-sound/gsm-1.0.13-r1[abi_x86_32(-)]
-			) )
-			jpeg? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+			)
+			jpeg? (
 				>=virtual/jpeg-0-r2:0[abi_x86_32(-)]
-			) )
-			ldap? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+			)
+			ldap? (
 				>=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)]
-			) )
-			lcms? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+			)
+			lcms? (
 				>=media-libs/lcms-2.5:2[abi_x86_32(-)]
-			) )
-			mp3? ( || (
-				app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)]
+			)
+			mp3? (
 				>=media-sound/mpg123-1.15.4[abi_x86_32(-)]
-			) )
+			)
 			netapi? ( >=net-fs/samba-3.6.23-r1[netapi(+),abi_x86_32(-)] )
-			nls? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+			nls? (
 				>=sys-devel/gettext-0.18.3.2[abi_x86_32(-)]
-			) )
-			odbc? ( || (
-				app-emulation/emul-linux-x86-db[development,-abi_x86_32(-)]
+			)
+			odbc? (
 				>=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)]
-			) )
-			osmesa? ( || (
-				>=app-emulation/emul-linux-x86-opengl-20121028[development,-abi_x86_32(-)]
+			)
+			osmesa? (
 				>=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)]
-			) )
+			)
 			pcap? ( net-libs/libpcap[abi_x86_32(-)] )
-			xml? ( || (
-				>=app-emulation/emul-linux-x86-baselibs-20131008[development,-abi_x86_32(-)]
-				(
+			xml? (
 					>=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)]
 					>=dev-libs/libxslt-1.1.28-r1[abi_x86_32(-)]
-				)
-			) )
-			scanner? ( || (
-				app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
+			)
+			scanner? (
 				>=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)]
-			) )
-			ssl? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+			)
+			ssl? (
 				>=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)]
-			) )
-			png? ( || (
-				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+			)
+			png? (
 				>=media-libs/libpng-1.6.10:0[abi_x86_32(-)]
-			) )
-			v4l? ( || (
-				app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
+			)
+			v4l? (
 				>=media-libs/libv4l-0.9.5[abi_x86_32(-)]
-			) )
-			xcomposite? ( || (
-				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
+			)
+			xcomposite? (
 				>=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)]
-			) )
+			)
 		)
 	)"
 
diff --git a/app-emulation/wine/wine-1.7.8.ebuild b/app-emulation/wine/wine-1.7.8.ebuild
index 2870975..d9a871c 100644
--- a/app-emulation/wine/wine-1.7.8.ebuild
+++ b/app-emulation/wine/wine-1.7.8.ebuild
@@ -96,111 +96,85 @@ COMMON_DEPEND="
 	amd64? (
 		abi_x86_64? ( ${NATIVE_DEPEND} )
 		abi_x86_32? (
-			truetype? ( || (
-				>=app-emulation/emul-linux-x86-xlibs-2.1[development]
+			truetype? (
 				>=media-libs/freetype-2.0.0[abi_x86_32]
-			) )
-			ncurses? ( || (
-				app-emulation/emul-linux-x86-baselibs[development]
+			)
+			ncurses? (
 				sys-libs/ncurses[abi_x86_32]
-			) )
-			udisks? ( || (
-				>=app-emulation/emul-linux-x86-baselibs-20130224[development]
+			)
+			udisks? (
 				sys-apps/dbus[abi_x86_32]
-			) )
-			fontconfig? ( || (
-				app-emulation/emul-linux-x86-xlibs[development]
+			)
+			fontconfig? (
 				media-libs/fontconfig[abi_x86_32]
-			) )
+			)
 			gphoto2? (
 				app-emulation/emul-linux-x86-medialibs[development]
 			)
-			openal? ( || (
-				app-emulation/emul-linux-x86-sdl[development]
+			openal? (
 				media-libs/openal[abi_x86_32]
-			) )
+			)
 			gstreamer? (
 				app-emulation/emul-linux-x86-gstplugins
 				app-emulation/emul-linux-x86-medialibs[development]
 			)
-			X? ( || (
-				app-emulation/emul-linux-x86-xlibs[development]
-				(
+			X? (
 					x11-libs/libXcursor[abi_x86_32]
 					x11-libs/libXext[abi_x86_32]
 					x11-libs/libXrandr[abi_x86_32]
 					x11-libs/libXi[abi_x86_32]
 					x11-libs/libXxf86vm[abi_x86_32]
-				)
-			) )
-			xinerama? ( || (
-				app-emulation/emul-linux-x86-xlibs[development]
+			)
+			xinerama? (
 				x11-libs/libXinerama[abi_x86_32]
-			) )
-			alsa? ( || (
-				app-emulation/emul-linux-x86-soundlibs[alsa,development]
+			)
+			alsa? (
 				media-libs/alsa-lib[abi_x86_32]
-			) )
+			)
 			cups? ( app-emulation/emul-linux-x86-baselibs )
 			opencl? ( virtual/opencl[abi_x86_32] )
-			opengl? ( || (
-				app-emulation/emul-linux-x86-opengl[development]
-				(
+			opengl? (
 					virtual/glu[abi_x86_32]
 					virtual/opengl[abi_x86_32]
-				)
-			) )
-			gsm? ( || (
-				app-emulation/emul-linux-x86-soundlibs[development]
+			)
+			gsm? (
 				media-sound/gsm[abi_x86_32]
-			) )
-			jpeg? ( || (
-				app-emulation/emul-linux-x86-baselibs[development]
+			)
+			jpeg? (
 				virtual/jpeg:0[abi_x86_32]
-			) )
+			)
 			ldap? ( app-emulation/emul-linux-x86-baselibs[development] )
-			lcms? ( || (
-				app-emulation/emul-linux-x86-baselibs[development]
+			lcms? (
 				media-libs/lcms:2[abi_x86_32]
-			) )
-			mp3? ( || (
-				app-emulation/emul-linux-x86-soundlibs[development]
+			)
+			mp3? (
 				>=media-sound/mpg123-1.5.0[abi_x86_32]
-			) )
-			nls? ( || (
-				app-emulation/emul-linux-x86-baselibs[development]
+			)
+			nls? (
 				sys-devel/gettext[abi_x86_32]
-			) )
+			)
 			odbc? ( app-emulation/emul-linux-x86-db[development] )
-			osmesa? ( || (
-				>=app-emulation/emul-linux-x86-opengl-20121028[development]
+			osmesa? (
 				media-libs/mesa[osmesa,abi_x86_32]
-			) )
-			pulseaudio? ( || (
-				app-emulation/emul-linux-x86-soundlibs[development]
+			)
+			pulseaudio? (
 				>=media-sound/pulseaudio-4.0-r1[abi_x86_32]
-			) )
-			xml? ( || (
-				>=app-emulation/emul-linux-x86-baselibs-20131008[development]
-				(
+			)
+			xml? (
 					dev-libs/libxml2[abi_x86_32]
 					dev-libs/libxslt[abi_x86_32]
-				)
-			) )
+			)
 			scanner? ( app-emulation/emul-linux-x86-medialibs[development] )
 			ssl? ( app-emulation/emul-linux-x86-baselibs[development] )
-			png? ( || (
-				app-emulation/emul-linux-x86-baselibs[development]
+			png? (
 				media-libs/libpng:0[abi_x86_32]
-			) )
-			v4l? ( || (
-				app-emulation/emul-linux-x86-medialibs[development]
+			)
+			v4l? (
 				media-libs/libv4l[abi_x86_32]
-			) )
-			xcomposite? ( || (
-				app-emulation/emul-linux-x86-xlibs[development]
+			)
+			xcomposite? (
 				x11-libs/libXcomposite[abi_x86_32]
-			) )
+			)
 		)
 	)"
 
diff --git a/dev-lang/lci/lci-0.11.1.ebuild b/dev-lang/lci/lci-0.11.1.ebuild
index 586ac7e..b3be420 100644
--- a/dev-lang/lci/lci-0.11.1.ebuild
+++ b/dev-lang/lci/lci-0.11.1.ebuild
@@ -1,6 +1,7 @@
-# By eroen, 2013 - 2015
-# Distributed under the terms of the ISC licence
-# $Header: $
+# By eroen <eroen-overlay@occam.eroen.eu>, 2013 - 2016
+# Permission to use, copy, modify, and/or distribute this software for any
+# purpose with or without fee is hereby granted, provided that the above
+# copyright notice and this permission notice appear in all copies.
 
 EAPI=5
 
@@ -22,7 +23,6 @@ else
 fi
 
 HDEPEND="test? (
-		virtual/python-argparse[${PYTHON_USEDEP}]
 		memtest? ( dev-util/valgrind ) )"
 LIBDEPEND=""
 DEPEND="${LIBDEPEND}"
diff --git a/dev-lang/lci/lci-9999.ebuild b/dev-lang/lci/lci-9999.ebuild
index 586ac7e..b3be420 100644
--- a/dev-lang/lci/lci-9999.ebuild
+++ b/dev-lang/lci/lci-9999.ebuild
@@ -1,6 +1,7 @@
-# By eroen, 2013 - 2015
-# Distributed under the terms of the ISC licence
-# $Header: $
+# By eroen <eroen-overlay@occam.eroen.eu>, 2013 - 2016
+# Permission to use, copy, modify, and/or distribute this software for any
+# purpose with or without fee is hereby granted, provided that the above
+# copyright notice and this permission notice appear in all copies.
 
 EAPI=5
 
@@ -22,7 +23,6 @@ else
 fi
 
 HDEPEND="test? (
-		virtual/python-argparse[${PYTHON_USEDEP}]
 		memtest? ( dev-util/valgrind ) )"
 LIBDEPEND=""
 DEPEND="${LIBDEPEND}"
diff --git a/dev-lang/lci/metadata.xml b/dev-lang/lci/metadata.xml
index 72ab7a5..59a64f1 100644
--- a/dev-lang/lci/metadata.xml
+++ b/dev-lang/lci/metadata.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="person">
+		<email>eroen-overlay@occam.eroen.eu</email>
+		<name>eroen</name>
+	</maintainer>
 	<longdescription lang="en">
-		lci is a LOLCODE interpreter written in C and is designed to be correct,
-		portable, fast, and precisely documented.
+		lci is a LOLCODE interpreter written in C and is designed to be
+		correct, portable, fast, and precisely documented.
 	</longdescription>
 	<use>
 		<flag name="memtest">Perform memory tests with <pkg>dev-util/valgrind</pkg>. Takes a while.</flag>
 	</use>
 </pkgmetadata>
-
diff --git a/dev-python/python-elementary/ChangeLog b/dev-python/python-elementary/ChangeLog
deleted file mode 100644
index 69d4d13..0000000
--- a/dev-python/python-elementary/ChangeLog
+++ /dev/null
@@ -1,8 +0,0 @@
-# ChangeLog for dev-python/python-elementary
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: $
-
-  23 Aug 2009; Peter Volkov <pva@gentoo.org> python-elementary-9999.ebuild,
-  metadata.xml:
-  Initial import.
-
diff --git a/dev-python/python-elementary/Manifest b/dev-python/python-elementary/Manifest
deleted file mode 100644
index cfea8ea..0000000
--- a/dev-python/python-elementary/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-EBUILD python-elementary-9999.ebuild 951 SHA256 e693674dacd76b665a40e59e021fa831c86a2e3589e75ed491513f5ce8253258 SHA512 41244ae17534361a93e363ee28b6e96a3fd27eba5753661c386c8d9e1752d4d800a6b4620cfb031d33a805d5b3bdb838f3d5c534290e85c384fac98f8c0ef1b8 WHIRLPOOL 4e6656ff4d43f6c47650837a3f500aded543ba90d2fdc18e025d22e096b735445ecf73dff1d02bd936b7322920320ca1c9ce69d1f0ae9c412f9fa7af602c7c57
-MISC ChangeLog 240 SHA256 d0586a0861d3911627186f686d70c13c616f90049ae7de7ddce7606fabfd8626 SHA512 6caaf0864bc053180cc8a27faf40c6b09f2ca4cb61ff14751bc0532a616e39a9982b9878b1f33f058b65e6919d3b3b24192bd7e1309d471b1a9fee989116b021 WHIRLPOOL c470553d0256edf304bf4cf66a76a6739332201a0ae2c404948f10ed084f83e6a8e2e4d4b6df3a91b21bc6cecf4e4a1471b78639d29a1f1b662f919892c75817
-MISC metadata.xml 228 SHA256 42ea435327140212f3beb05aafebad5053cbad84532f9bb78987de8540c6459a SHA512 5b1191ceaa7bcaa10b4b28d5b80cbb214da3e5857c2897f7b8001d3ac7ef3491c2dbb8a51583677c79770c106368297c16698d7a10b5ba85ce211412a61ae8bd WHIRLPOOL ed7fa6aacaa62a04fd1d184fc7a86eff8bd65a29664dca293f6723db14d1b8c22e5707cb0c1a0c7405cf2da2e0af1c031f7c9406fda5dfe74df3421b47b1cbf3
diff --git a/dev-python/python-elementary/metadata.xml b/dev-python/python-elementary/metadata.xml
deleted file mode 100644
index 097975e..0000000
--- a/dev-python/python-elementary/metadata.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-</pkgmetadata>
diff --git a/dev-python/python-elementary/python-elementary-9999.ebuild b/dev-python/python-elementary/python-elementary-9999.ebuild
deleted file mode 100644
index d2ac9b9..0000000
--- a/dev-python/python-elementary/python-elementary-9999.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-E_CYTHON=1
-SUPPORT_PYTHON_ABIS=1
-RESTRICT_PYTHON_ABIS="3.*"
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_SUB_PROJECT="legacy/bindings/python"
-	EGIT_URI_APPEND=${PN}
-else
-	#SRC_URI="http://download.enlightenment.org/releases/${P}.tar.bz2"
-	EKEY_STATE="snap"
-fi
-
-inherit enlightenment
-
-DESCRIPTION="Python bindings for elementary library"
-HOMEPAGE="http://www.enlightenment.org/"
-LICENSE="|| ( GPL-3 LGPL-3 )"
-IUSE="static-libs"
-
-RDEPEND=">=media-libs/elementary-9999"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	>=dev-python/python-evas-9999"
-
-src_prepare() {
-	enlightenment_src_prepare
-	python_copy_sources
-}
-
-src_configure() {
-	python_execute_function -s enlightenment_src_configure
-}
-
-src_compile() {
-	python_execute_function -s enlightenment_src_compile
-}
-
-src_install() {
-	python_execute_function -s enlightenment_src_install
-}
diff --git a/dev-python/python-evas/ChangeLog b/dev-python/python-evas/ChangeLog
deleted file mode 100644
index 44b9319..0000000
--- a/dev-python/python-evas/ChangeLog
+++ /dev/null
@@ -1,8 +0,0 @@
-# ChangeLog for dev-python/python-evas
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: $
-
-  23 Aug 2009; Peter Volkov <pva@gentoo.org> python-evas-9999.ebuild,
-  metadata.xml:
-  Initial import.
-
diff --git a/dev-python/python-evas/Manifest b/dev-python/python-evas/Manifest
deleted file mode 100644
index 71a39b0..0000000
--- a/dev-python/python-evas/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-EBUILD python-evas-9999.ebuild 907 SHA256 967c8f7fb8e9c534a9ab81122479bfe49f234623e8c9854b16692b778f2560e0 SHA512 5baf3d83dbff2036ba627933a14d82253d8bace1d734b784f5db237f82f0154585d2e68e9a75649798791fb3473f0bcf3d363f361df26990a7136806bbc57eb4 WHIRLPOOL 83bfc51084a737156ad9a7dd9c97ce9306c113aa2e72211da4e8c4c6a1d33705066e464f7a8ce5ed1a13a85b999f021b722b75e6a605e89c400be429b25f8864
-MISC ChangeLog 228 SHA256 42024ec9c2bcc7f7a66cbd819448277c75da8af51f90db0802eab67e9a0243f6 SHA512 2818adbb63325eef170608cada7997074e215736f9c39109a763e16c002bee8e9b6903c7b9f4945f5e991e71bfb6bcc39a9421d50e1f96395f33f5ce56b83492 WHIRLPOOL 98a718a5e0dd7dac83ae20f33fa9021307900bcbb3271f9832aabe4bd0fe5c2b6a212530a024b1f6337e8e64227b95a150533827210ca1eb2bf096fe3106f83e
-MISC metadata.xml 228 SHA256 42ea435327140212f3beb05aafebad5053cbad84532f9bb78987de8540c6459a SHA512 5b1191ceaa7bcaa10b4b28d5b80cbb214da3e5857c2897f7b8001d3ac7ef3491c2dbb8a51583677c79770c106368297c16698d7a10b5ba85ce211412a61ae8bd WHIRLPOOL ed7fa6aacaa62a04fd1d184fc7a86eff8bd65a29664dca293f6723db14d1b8c22e5707cb0c1a0c7405cf2da2e0af1c031f7c9406fda5dfe74df3421b47b1cbf3
diff --git a/dev-python/python-evas/metadata.xml b/dev-python/python-evas/metadata.xml
deleted file mode 100644
index 097975e..0000000
--- a/dev-python/python-evas/metadata.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-</pkgmetadata>
diff --git a/dev-python/python-evas/python-evas-9999.ebuild b/dev-python/python-evas/python-evas-9999.ebuild
deleted file mode 100644
index ada8221..0000000
--- a/dev-python/python-evas/python-evas-9999.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-E_CYTHON=1
-SUPPORT_PYTHON_ABIS=1
-RESTRICT_PYTHON_ABIS="3.*"
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_SUB_PROJECT="legacy/bindings/python"
-	EGIT_URI_APPEND=${PN}
-else
-	#SRC_URI="http://download.enlightenment.org/releases/${P}.tar.bz2"
-	EKEY_STATE="snap"
-fi
-
-inherit enlightenment
-
-DESCRIPTION="Python bindings for EVAS library"
-HOMEPAGE="http://www.enlightenment.org/"
-
-LICENSE="LGPL-2.1"
-IUSE="static-libs"
-
-RDEPEND=">=media-libs/evas-9999"
-
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.9.0"
-
-src_prepare() {
-	enlightenment_src_prepare
-	python_copy_sources
-}
-
-src_configure() {
-	python_execute_function -s enlightenment_src_configure
-}
-
-src_compile() {
-	python_execute_function -s enlightenment_src_compile
-}
-
-src_install() {
-	python_execute_function -s enlightenment_src_install
-}
diff --git a/games-emulation/psemu-padjoy/psemu-padjoy-0.82.ebuild b/games-emulation/psemu-padjoy/psemu-padjoy-0.82.ebuild
index 9ac8a26..aa3903c 100644
--- a/games-emulation/psemu-padjoy/psemu-padjoy-0.82.ebuild
+++ b/games-emulation/psemu-padjoy/psemu-padjoy-0.82.ebuild
@@ -15,6 +15,7 @@ IUSE=""
 
 DEPEND="amd64? ( app-emulation/emul-linux-x86-gtklibs )
 	!amd64? ( =x11-libs/gtk+-1* )"
+RDEPEND=$DEPEND
 
 S=${WORKDIR}/padJoy/src
 
diff --git a/games-simulation/dwarffortress/dwarffortress-34.11.ebuild b/games-simulation/dwarffortress/dwarffortress-34.11.ebuild
index 3b210f6..19691b5 100644
--- a/games-simulation/dwarffortress/dwarffortress-34.11.ebuild
+++ b/games-simulation/dwarffortress/dwarffortress-34.11.ebuild
@@ -10,7 +10,7 @@ MY_PN="df"
 MY_PV="$(replace_all_version_separators '_')"
 MY_P="${MY_PN}_${MY_PV}"
 
-DESCRIPTION="Part roguelike, part city-building game set in a procedurally generated high fantasy universe."
+DESCRIPTION="Roguelike and city-building in a procedurally generated high fantasy universe."
 HOMEPAGE="http://www.bay12games.com/dwarves/"
 SRC_URI="http://www.bay12games.com/dwarves/${MY_P}_linux.tar.bz2"
 
diff --git a/games-simulation/dwarffortress/dwarffortress-40.03.ebuild b/games-simulation/dwarffortress/dwarffortress-40.03.ebuild
index 3ce5fd9..5052cf5 100644
--- a/games-simulation/dwarffortress/dwarffortress-40.03.ebuild
+++ b/games-simulation/dwarffortress/dwarffortress-40.03.ebuild
@@ -10,7 +10,7 @@ EAPI=5
 
 inherit eutils games
 
-DESCRIPTION="Part roguelike, part city-building game set in a procedurally generated high fantasy universe."
+DESCRIPTION="Roguelike and city-building in a procedurally generated high fantasy universe."
 HOMEPAGE="http://www.bay12games.com/dwarves/"
 SRC_URI="http://www.bay12games.com/dwarves/df_${PV//./_}_linux.tar.bz2"
 
diff --git a/games-simulation/dwarffortress/dwarffortress-40.06.ebuild b/games-simulation/dwarffortress/dwarffortress-40.06.ebuild
index a3e88d4..d2f54d3 100644
--- a/games-simulation/dwarffortress/dwarffortress-40.06.ebuild
+++ b/games-simulation/dwarffortress/dwarffortress-40.06.ebuild
@@ -10,7 +10,7 @@ EAPI=5
 
 inherit eutils games
 
-DESCRIPTION="Part roguelike, part city-building game set in a procedurally generated high fantasy universe."
+DESCRIPTION="Roguelike and city-building in a procedurally generated high fantasy universe."
 HOMEPAGE="http://www.bay12games.com/dwarves/"
 SRC_URI="http://www.bay12games.com/dwarves/df_${PV//./_}_linux.tar.bz2"
 
diff --git a/media-gfx/blender/metadata.xml b/media-gfx/blender/metadata.xml
index de9644e..a8ee785 100644
--- a/media-gfx/blender/metadata.xml
+++ b/media-gfx/blender/metadata.xml
@@ -7,12 +7,9 @@
 	</longdescription>
 
 	<use>
-<<<<<<< current
-=======
-		<flag name="blender-game" restrict="&lt;=media-gfx/blender-2.50">
+		<flag name="blender-game">
 			Adds Game Engine support to Blender.
 		</flag>
->>>>>>> patched
 		<flag name="game-engine" restrict="&gt;=media-gfx/blender-2.50">
 			Adds Game Engine support to Blender.
 		</flag>
@@ -20,12 +17,9 @@
 			Add support for Collada interchange format through
 			<pkg>media-libs/opencollada</pkg>.
 		</flag>
-<<<<<<< current
-=======
 		<flag name='verse'>
 			Adds verse clustering features to Blender.
 		</flag>
->>>>>>> patched
 		<flag name="cycles">
 			Build cycles renderer (requires <pkg>media-libs/openimageio</pkg> and
 			<pkg>dev-libs/boost</pkg>).
diff --git a/profiles/package.use.mask b/profiles/package.use.mask
index 15048d6..98dd850 100644
--- a/profiles/package.use.mask
+++ b/profiles/package.use.mask
@@ -10,3 +10,7 @@ dev-libs/libgraphics:40.14 egg
 
 # Needs work
 >=games-util/dfhack-0.40 stonesense
+
+# media-libs/lcms:0 was dropped from gentoo
+# May 28 18:07:08 2015
+<=app-emulation/wine-1.5.28 lcms