Bump, see http://www.winehq.org/announce/1.5.2 for the announcement. Drop 1.4 release candidates since they are unlikely to be of much interest now.

Package-Manager: portage-2.2.0_alpha100/cvs/Linux x86_64

8 files changed, 18 insertions, 1112 deletions

diff --git a/app-emulation/wine/ChangeLog b/app-emulation/wine/ChangeLog
index 0b9068e93ee7..897d9d335d11 100644
--- a/app-emulation/wine/ChangeLog
+++ b/app-emulation/wine/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-emulation/wine
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.409 2012/04/03 06:39:17 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.410 2012/04/14 01:51:23 tetromino Exp $
+
+*wine-1.5.2 (14 Apr 2012)
+
+  14 Apr 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  -wine-1.4_rc1.ebuild, -wine-1.4_rc2.ebuild, -wine-1.4_rc3.ebuild,
+  -wine-1.4_rc4.ebuild, -wine-1.4_rc5.ebuild, -wine-1.4_rc6.ebuild,
+  +wine-1.5.2.ebuild:
+  Bump, see http://www.winehq.org/announce/1.5.2 for the announcement. Drop 1.4
+  release candidates since they are unlikely to be of much interest now.
 
 *wine-1.5.1 (03 Apr 2012)
 
diff --git a/app-emulation/wine/Manifest b/app-emulation/wine/Manifest
index 7db81f59585d..511694d6963a 100644
--- a/app-emulation/wine/Manifest
+++ b/app-emulation/wine/Manifest
@@ -46,15 +46,10 @@ DIST wine-1.3.6.tar.bz2 18243096 RMD160 d1f9f1dade12f878e90fa01f5a59cc13056d8b06
 DIST wine-1.3.7.tar.bz2 18379692 RMD160 316535442fc2f29d30a2952ff612cc70ae9f19c9 SHA1 3f46e6d73e4917d13fbc102e6f35aba9b9412a40 SHA256 13cf54ec8b83d49abd6888b543ab359661d70af9df3e30ab70d7e54b6b5cd025
 DIST wine-1.3.8.tar.bz2 18315298 RMD160 1b579d124523fe4698431c8de11f4cdfa3034821 SHA1 d36e7d8c0d8d5e2f86d47b175e197e9623660495 SHA256 6eebf60c143cbe4328a8566331a6b887cf8612000f051e55d4b9d99e6a17bfdb
 DIST wine-1.3.9.tar.bz2 18378516 RMD160 07803597faf46e9ac748560642a537b56dd1a845 SHA1 68f2172b3cd7674e0f7bb746eae065a7b542db9f SHA256 a920b0805814d53435fdc575efe618b39c2b18d30af416f80d2fb4763d2587fa
-DIST wine-1.4-rc1.tar.bz2 19901330 RMD160 249f42a1736b405ed11031a9bdc62bb3c55556cf SHA1 aab0c651c018b4861437601af1a7346ab8288c8c SHA256 246618343816ee24ea7be70ac46209ba2a9591717d68af6a22605e6f30ba3bae
-DIST wine-1.4-rc2.tar.bz2 19904340 RMD160 55b5b782395351c3669adad16fccc7efa93dd92c SHA1 294360d2f47f73ea96be1317e92ac0b1ab88cdd7 SHA256 1111274431b0c4a6c0783e5bc1d4759b6795ac822b33c9ef8a53eea5045edd91
-DIST wine-1.4-rc3.tar.bz2 19929191 RMD160 a6ee6488f51cc7b33c425e440c278562b5d3b5c6 SHA1 1cce9110f23d5893dc4c12a3a116964e336e75c0 SHA256 2ebb5a19cc7bcdb25d1381dae03f59b7d1a35014f734bc45f91214c3cf405606
-DIST wine-1.4-rc4.tar.bz2 19947129 RMD160 dcf033043322705a169de6a90032845c3c5b5f63 SHA1 776eab51a0f24fccadffab00889b50d6a929cb8d SHA256 3105c4f7e0a3c326c3dc82257b6af96dd5db6cc2afbe4b8a936563d2da04d1ec
-DIST wine-1.4-rc5.tar.bz2 19999127 RMD160 8908f1830de2939c0ae1ceee7538f179a7d74b8a SHA1 891e4131de1e3d34ec6c66a150aca6fc01e101ec SHA256 247c58fb6a6543ccb29b1b6faa3538cda7642fe21f67093363c1f06c470eb1b2
-DIST wine-1.4-rc6.tar.bz2 20021214 RMD160 3e8520522889126492394b09bc505a0fe7587d98 SHA1 ef9ed84a843e801b8ab2166824abf3d000c33eeb SHA256 b6b8df555853767875a145d00ae34150c78221bec876739227db69212d70f4e0
 DIST wine-1.4.tar.bz2 20035856 RMD160 ee523c4cf15984197487432790c0e5bbba3ec495 SHA1 ce5d56b9b949c01dde663ab39739ffcfb41a73c4 SHA256 99a437bb8bd350bb1499d59183635e58217e73d631379c43cfd0d6020428ee65
 DIST wine-1.5.0.tar.bz2 20132171 RMD160 1a4c40ce3c20df1f467475c598da5f88266ae95e SHA1 23dd5efa2a36b357b8fd4a5cd554770ef4b68dbc SHA256 ad15143d2f8b38e2b5b8569b46efd09f9d13ce558dad431e17c471ca1412742b
 DIST wine-1.5.1.tar.bz2 20078739 RMD160 5f99f9ab2cfd3ceb4648dffde20714deb2d80fa2 SHA1 0f44ea5f9fbdc07186c77dfa619bd4d0f1b07825 SHA256 6dc578f9afb3c9a0f2b773bbe09af20578ac6fa514dd0712ecc5d05c766045e6
+DIST wine-1.5.2.tar.bz2 20104652 RMD160 8746571a7939429b7c18459eadee9b4a9a2a6ec8 SHA1 e8154685124e2f825d66fab38b335e8ff4af1a09 SHA256 8ee6fdaf716b5a1c7ccf9be9dc6d9b7546944e79351c4806b2fa596da418342f
 DIST wine_gecko-1.0.0-x86.cab 8119486 RMD160 57618dbffa7b7226dcd44f86c3c569ab8a5ff938 SHA1 afa22c52bca4ca77dcb9edb3c9936eb23793de01 SHA256 7ddf697677506fb164c52771864e32dd69a359ed855b2efbc51340de2376c99c
 DIST wine_gecko-1.1.0-x86.cab 8868851 RMD160 1867734d6ab35f4e66f717789832e69aac06e93b SHA1 1b6c637207b6f032ae8a52841db9659433482714 SHA256 1786e1fd38a0361a3956864f74ebac20452c012316f296ad8d86840e31be0b29
 DIST wine_gecko-1.1.0-x86_64.cab 8940997 RMD160 76364b01b6756db79989feea9de14aeec4ba4675 SHA1 55b4b60cd2a48631d6236fb411c3a94d806d9906 SHA256 b8bea5b6400d191c05b2295c79285309fe331283648457bed48f7e2387773b7a
@@ -112,21 +107,16 @@ EBUILD wine-1.3.7.ebuild 5527 RMD160 eb1a3b43c2a2885490264055a8c598ec4892460d SH
 EBUILD wine-1.3.8.ebuild 5527 RMD160 f828be20c01fa246386409799686f4266f8cbefb SHA1 7c72540a5bbc343b35a6fb4ff337d356a59d29ff SHA256 d796b39d1fe3fe206b017873b77df46a3b2ec5421ed724ec248c12362ff2019c
 EBUILD wine-1.3.9.ebuild 5585 RMD160 a7d8040c83ddd3452b076df37dc324fd6ff57e3b SHA1 95ef0b9b9d7b2ae2d72b6aeb2aee02fa1cbf24d6 SHA256 c1c6e9f2e660f38ab74441593a1114e057e5265bfcc87b42d7b2dbaaf65e5397
 EBUILD wine-1.4.ebuild 6120 RMD160 455ae1230d7e68926aaeafce1e1ef93347c538cf SHA1 93e8deda2c46ed078ab3d985c0f917350b19cb4c SHA256 8c0375919e05a3c1799bcf9cc9e541bcfaf8f5b291ea3d4c80c2c0489a3114eb
-EBUILD wine-1.4_rc1.ebuild 5559 RMD160 66439d28f6128aecca6e21d5b5fa062c70a8cb38 SHA1 f9de48558c4693b56177ec53472bcd8b12606f08 SHA256 5d9a5501fba4b235d1cff4e328b31ec15bdbaea3c2a25b7ea1ba142d58f545a9
-EBUILD wine-1.4_rc2.ebuild 5695 RMD160 8be046b05f5527ae5507a42eec33680965f30ea4 SHA1 c055fa3a517e25d394540d5caf08bb3cd58ef8eb SHA256 262b4f1a9a3db9dbdb21e959de417c1060dd4a375036b141137aa3da95c75e11
-EBUILD wine-1.4_rc3.ebuild 5695 RMD160 ccb9fef7395cd02012e1e8586712d6ddb155323d SHA1 2c54ce8097b95b0d7e4a70535db0bfd801eb4398 SHA256 0d401877ac5c8eaad3942255e97d976fa552e8f15659608d77cbb9ff05c52850
-EBUILD wine-1.4_rc4.ebuild 6124 RMD160 53ca9800d7c5d05a0392bb40302b466dee2b3648 SHA1 0ae21fbdf1eb0ab35a941c48095d70e987f9dc64 SHA256 6434e0cdc93a6a5d2e59b3c48d13c0588b2331f6e44de27637cc6a97b2f5461d
-EBUILD wine-1.4_rc5.ebuild 6124 RMD160 395dd4c98b1fd02b3cc72c88bac7e6a0f98a83b9 SHA1 6e20a44d6ef8b829bc312459290841449bc7d201 SHA256 c10d7c809ddfde78606de67f4bb63226042a3f76f673242dddcdffd53fca6388
-EBUILD wine-1.4_rc6.ebuild 6124 RMD160 35db39b801a416dde3405baa44e586fa67aa56ee SHA1 454818e4bbd7b105e9ff5c032058afb82391c781 SHA256 c54fb86cc2cb5eac6c2549f4175ea4b7051baf3a97ac1dc900f117aebb3a8bbe
 EBUILD wine-1.5.0.ebuild 6122 RMD160 1845128cbf0eff7d9510deaf0684c2f3140d4909 SHA1 5ccbb6e6f4c5122c7e675255b39e8d34918aa54a SHA256 33dcb0cc21e6e258fefc84d57c88e74d56447873a5eaa0406f8284387bb9b496
 EBUILD wine-1.5.1.ebuild 6122 RMD160 441710c223ac801c9b4af343ccaa53f9ba070515 SHA1 556deb2cd3543c7378cd1b6a59f0bfe373a38980 SHA256 f2213d33be3f37e6498c7d872166d51f374c165bc09c7dd95fe974ba086d9428
+EBUILD wine-1.5.2.ebuild 6122 RMD160 8a0b0988bf1baf53f473a7bc2055c54512673a8b SHA1 a256fe7f4fb56c0bd4cdc549c0024612e3c97bc8 SHA256 9e8826043d47bbf691efc1ff886482310c7e1b0e10d339ea6ea0143343f771cd
 EBUILD wine-9999.ebuild 6123 RMD160 492a4efd02afcaf8f481d1d1dec4abb6abf7a3d1 SHA1 f188b7ef1639debdc4d06735a97cb9a8b1470caa SHA256 fb77db618cc826a4a8469da30a2d12f34055243d5c0a314df1a4c55f409a8ed1
-MISC ChangeLog 85801 RMD160 a7629d7a1a57070bc94fb84b02b4568b42ec8b4a SHA1 b3522d3ba9187af34f7ced14f5cccd7dd16719ad SHA256 d987cf4e0dc47f9ed0a5c3355c8e7a5056a368c0c265ea7dfbe94e44ecac3ba3
+MISC ChangeLog 86199 RMD160 4967c950a8b8a4c705e4d1ab215b1be0aa0c618a SHA1 0073fcf8349ad060aa54619bff183b77214efa41 SHA256 d23a5ffca6522a4f5361ce2efe1276947019c23fa14f5e53141a6509fcbebd08
 MISC metadata.xml 1558 RMD160 54a67744e1e3b273da447b7501bedbd995de7464 SHA1 831b9f52b00d99bac3f10073c9c59be2fd721542 SHA256 fa58b3b055a5f848f6861fa85ca2d5cb922ba9723a8a26d7e69dd78481209616
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAk96myUACgkQdjK8w9WeBnBYawEAmSEWcV98+xVt2ZA/XrQNx9Fy
-SotQWONHl5+SdObZdUoA/2ZD9KHSyntuJjhmSeXnyFcVNfx1CmioI5L5897WI0f1
-=h03p
+iF4EAREIAAYFAk+I2CAACgkQdjK8w9WeBnAbiAD7B2MPpf9++Vv8fOcmjS2SniH+
+t1dObQGAxiorDztmNAMBAIvNRzTGdreiPTumTf4ZfRxZLdr3dNG7iOo4AW6GmNDU
+=Ha++
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/wine/wine-1.4_rc1.ebuild b/app-emulation/wine/wine-1.4_rc1.ebuild
deleted file mode 100644
index a7927287e5c1..000000000000
--- a/app-emulation/wine/wine-1.4_rc1.ebuild
+++ /dev/null
@@ -1,211 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.4_rc1.ebuild,v 1.4 2012/03/27 18:25:58 ssuominen Exp $
-
-EAPI="4"
-
-inherit eutils flag-o-matic multilib
-
-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}/${MY_P}.tar.bz2"
-	KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
-	S=${WORKDIR}/${MY_P}
-fi
-
-GV="1.4"
-DESCRIPTION="free implementation of Windows(tm) on Unix"
-HOMEPAGE="http://www.winehq.org/"
-SRC_URI="${SRC_URI}
-	gecko? (
-		mirror://sourceforge/wine/wine_gecko-${GV}-x86.msi
-		win64? ( mirror://sourceforge/wine/wine_gecko-${GV}-x86_64.msi )
-	)"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-IUSE="alsa capi cups custom-cflags elibc_glibc fontconfig +gecko gnutls gphoto2 gsm gstreamer hardened jpeg lcms ldap mp3 ncurses nls openal opencl +opengl +oss +perl png samba scanner ssl test +threads +truetype udisks v4l +win32 +win64 +X xcomposite xinerama xml"
-REQUIRED_USE="elibc_glibc? ( threads )" #286560
-RESTRICT="test" #72375
-
-MLIB_DEPS="amd64? (
-	truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 )
-	X? (
-		>=app-emulation/emul-linux-x86-xlibs-2.1
-		>=app-emulation/emul-linux-x86-soundlibs-2.1
-	)
-	mp3? ( app-emulation/emul-linux-x86-soundlibs )
-	openal? ( app-emulation/emul-linux-x86-sdl )
-	opengl? ( app-emulation/emul-linux-x86-opengl )
-	scanner? ( app-emulation/emul-linux-x86-medialibs )
-	v4l? ( app-emulation/emul-linux-x86-medialibs )
-	app-emulation/emul-linux-x86-baselibs
-	>=sys-kernel/linux-headers-2.6
-	)"
-RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts )
-	perl? ( dev-lang/perl dev-perl/XML-Simple )
-	capi? ( net-dialup/capi4k-utils )
-	ncurses? ( >=sys-libs/ncurses-5.2 )
-	fontconfig? ( media-libs/fontconfig )
-	gphoto2? ( media-libs/libgphoto2 )
-	openal? ( media-libs/openal )
-	udisks? (
-		sys-apps/dbus
-		sys-fs/udisks:0
-	)
-	gnutls? ( net-libs/gnutls )
-	gstreamer? ( media-libs/gstreamer media-libs/gst-plugins-base )
-	X? (
-		x11-libs/libXcursor
-		x11-libs/libXrandr
-		x11-libs/libXi
-		x11-libs/libXmu
-		x11-libs/libXxf86vm
-		x11-apps/xmessage
-	)
-	xinerama? ( x11-libs/libXinerama )
-	alsa? ( media-libs/alsa-lib )
-	cups? ( net-print/cups )
-	opencl? ( virtual/opencl )
-	opengl? ( virtual/opengl )
-	gsm? ( media-sound/gsm )
-	jpeg? ( virtual/jpeg )
-	ldap? ( net-nds/openldap )
-	lcms? ( =media-libs/lcms-1* )
-	mp3? ( >=media-sound/mpg123-1.5.0 )
-	nls? ( sys-devel/gettext )
-	samba? ( >=net-fs/samba-3.0.25 )
-	xml? ( dev-libs/libxml2 dev-libs/libxslt )
-	scanner? ( media-gfx/sane-backends )
-	ssl? ( dev-libs/openssl )
-	png? ( media-libs/libpng )
-	v4l? ( media-libs/libv4l )
-	!win64? ( ${MLIB_DEPS} )
-	win32? ( ${MLIB_DEPS} )
-	xcomposite? ( x11-libs/libXcomposite )"
-DEPEND="${RDEPEND}
-	X? (
-		x11-proto/inputproto
-		x11-proto/xextproto
-		x11-proto/xf86vidmodeproto
-	)
-	xinerama? ( x11-proto/xineramaproto )
-	!hardened? ( sys-devel/prelink )
-	dev-util/pkgconfig
-	virtual/yacc
-	sys-devel/flex"
-
-src_unpack() {
-	if use win64 ; then
-		[[ $(( $(gcc-major-version) * 100 + $(gcc-minor-version) )) -lt 404 ]] \
-			&& die "you need gcc-4.4+ to build 64bit wine"
-	fi
-
-	if [[ ${PV} == "9999" ]] ; then
-		git-2_src_unpack
-	else
-		unpack ${MY_P}.tar.bz2
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.1.15-winegcc.patch #260726
-	epatch_user #282735
-	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
-	sed -i '/^MimeType/d' tools/wine.desktop || die #117785
-}
-
-do_configure() {
-	local builddir="${WORKDIR}/wine$1"
-	mkdir -p "${builddir}"
-	pushd "${builddir}" >/dev/null
-
-	ECONF_SOURCE=${S} \
-	econf \
-		--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 gnutls) \
-		$(use_with gphoto2 gphoto) \
-		$(use_with gsm) \
-		$(use_with gstreamer) \
-		--without-hal \
-		$(use_with jpeg) \
-		$(use_with ldap) \
-		$(use_with mp3 mpg123) \
-		$(use_with nls gettext) \
-		$(use_with openal) \
-		$(use_with opencl) \
-		$(use_with opengl) \
-		$(use_with ssl openssl) \
-		$(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) \
-		$2
-
-	emake -j1 depend
-
-	popd >/dev/null
-}
-
-src_configure() {
-	export LDCONFIG=/bin/true
-	use custom-cflags || strip-flags
-
-	if use win64 ; then
-		do_configure 64 --enable-win64
-		use win32 && ABI=x86 do_configure 32 --with-wine64=../wine64
-	else
-		ABI=x86 do_configure 32 --disable-win64
-	fi
-}
-
-src_compile() {
-	local b
-	for b in 64 32 ; do
-		local builddir="${WORKDIR}/wine${b}"
-		[[ -d ${builddir} ]] || continue
-		emake -C "${builddir}" all
-	done
-}
-
-src_install() {
-	local b
-	for b in 64 32 ; do
-		local builddir="${WORKDIR}/wine${b}"
-		[[ -d ${builddir} ]] || continue
-		emake -C "${builddir}" install DESTDIR="${D}"
-	done
-	dodoc ANNOUNCE AUTHORS README
-	if use gecko ; then
-		insinto /usr/share/wine/gecko
-		doins "${DISTDIR}"/wine_gecko-${GV}-x86.msi
-		use win64 && doins "${DISTDIR}"/wine_gecko-${GV}-x86_64.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
-}
-
-pkg_postinst() {
-	paxctl -psmr "${ROOT}"/usr/bin/wine{,-preloader} 2>/dev/null #255055
-}
diff --git a/app-emulation/wine/wine-1.4_rc2.ebuild b/app-emulation/wine/wine-1.4_rc2.ebuild
deleted file mode 100644
index 9ebdde97fb57..000000000000
--- a/app-emulation/wine/wine-1.4_rc2.ebuild
+++ /dev/null
@@ -1,214 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.4_rc2.ebuild,v 1.4 2012/03/27 18:25:58 ssuominen Exp $
-
-EAPI="4"
-
-inherit autotools eutils flag-o-matic multilib
-
-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}/${MY_P}.tar.bz2"
-	KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
-	S=${WORKDIR}/${MY_P}
-fi
-
-GV="1.4"
-DESCRIPTION="free implementation of Windows(tm) on Unix"
-HOMEPAGE="http://www.winehq.org/"
-SRC_URI="${SRC_URI}
-	gecko? (
-		mirror://sourceforge/wine/wine_gecko-${GV}-x86.msi
-		win64? ( mirror://sourceforge/wine/wine_gecko-${GV}-x86_64.msi )
-	)"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-IUSE="alsa capi cups custom-cflags elibc_glibc fontconfig +gecko gnutls gphoto2 gsm gstreamer hardened jpeg lcms ldap mp3 ncurses nls openal opencl +opengl +oss +perl png samba scanner selinux ssl test +threads +truetype udisks v4l +win32 +win64 +X xcomposite xinerama xml"
-REQUIRED_USE="elibc_glibc? ( threads )" #286560
-RESTRICT="test" #72375
-
-MLIB_DEPS="amd64? (
-	truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 )
-	X? (
-		>=app-emulation/emul-linux-x86-xlibs-2.1
-		>=app-emulation/emul-linux-x86-soundlibs-2.1
-	)
-	mp3? ( app-emulation/emul-linux-x86-soundlibs )
-	openal? ( app-emulation/emul-linux-x86-sdl )
-	opengl? ( app-emulation/emul-linux-x86-opengl )
-	scanner? ( app-emulation/emul-linux-x86-medialibs )
-	v4l? ( app-emulation/emul-linux-x86-medialibs )
-	app-emulation/emul-linux-x86-baselibs
-	>=sys-kernel/linux-headers-2.6
-	)"
-RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts )
-	perl? ( dev-lang/perl dev-perl/XML-Simple )
-	capi? ( net-dialup/capi4k-utils )
-	ncurses? ( >=sys-libs/ncurses-5.2 )
-	fontconfig? ( media-libs/fontconfig )
-	gphoto2? ( media-libs/libgphoto2 )
-	openal? ( media-libs/openal )
-	udisks? (
-		sys-apps/dbus
-		sys-fs/udisks:0
-	)
-	gnutls? ( net-libs/gnutls )
-	gstreamer? ( media-libs/gstreamer media-libs/gst-plugins-base )
-	X? (
-		x11-libs/libXcursor
-		x11-libs/libXrandr
-		x11-libs/libXi
-		x11-libs/libXmu
-		x11-libs/libXxf86vm
-		x11-apps/xmessage
-	)
-	xinerama? ( x11-libs/libXinerama )
-	alsa? ( media-libs/alsa-lib )
-	cups? ( net-print/cups )
-	opencl? ( virtual/opencl )
-	opengl? ( virtual/opengl )
-	gsm? ( media-sound/gsm )
-	jpeg? ( virtual/jpeg )
-	ldap? ( net-nds/openldap )
-	lcms? ( =media-libs/lcms-1* )
-	mp3? ( >=media-sound/mpg123-1.5.0 )
-	nls? ( sys-devel/gettext )
-	samba? ( >=net-fs/samba-3.0.25 )
-	selinux? ( sec-policy/selinux-wine )
-	xml? ( dev-libs/libxml2 dev-libs/libxslt )
-	scanner? ( media-gfx/sane-backends )
-	ssl? ( dev-libs/openssl )
-	png? ( media-libs/libpng )
-	v4l? ( media-libs/libv4l )
-	!win64? ( ${MLIB_DEPS} )
-	win32? ( ${MLIB_DEPS} )
-	xcomposite? ( x11-libs/libXcomposite )"
-DEPEND="${RDEPEND}
-	X? (
-		x11-proto/inputproto
-		x11-proto/xextproto
-		x11-proto/xf86vidmodeproto
-	)
-	xinerama? ( x11-proto/xineramaproto )
-	!hardened? ( sys-devel/prelink )
-	dev-util/pkgconfig
-	virtual/yacc
-	sys-devel/flex"
-
-src_unpack() {
-	if use win64 ; then
-		[[ $(( $(gcc-major-version) * 100 + $(gcc-minor-version) )) -lt 404 ]] \
-			&& die "you need gcc-4.4+ to build 64bit wine"
-	fi
-
-	if [[ ${PV} == "9999" ]] ; then
-		git-2_src_unpack
-	else
-		unpack ${MY_P}.tar.bz2
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.1.15-winegcc.patch #260726
-	epatch "${FILESDIR}"/${PN}-1.4_rc2-multilib-portage.patch #395615
-	epatch_user #282735
-	eautoreconf
-	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
-	sed -i '/^MimeType/d' tools/wine.desktop || die #117785
-}
-
-do_configure() {
-	local builddir="${WORKDIR}/wine$1"
-	mkdir -p "${builddir}"
-	pushd "${builddir}" >/dev/null
-
-	ECONF_SOURCE=${S} \
-	econf \
-		--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 gnutls) \
-		$(use_with gphoto2 gphoto) \
-		$(use_with gsm) \
-		$(use_with gstreamer) \
-		--without-hal \
-		$(use_with jpeg) \
-		$(use_with ldap) \
-		$(use_with mp3 mpg123) \
-		$(use_with nls gettext) \
-		$(use_with openal) \
-		$(use_with opencl) \
-		$(use_with opengl) \
-		$(use_with ssl openssl) \
-		$(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) \
-		$2
-
-	emake -j1 depend
-
-	popd >/dev/null
-}
-
-src_configure() {
-	export LDCONFIG=/bin/true
-	use custom-cflags || strip-flags
-
-	if use win64 ; then
-		do_configure 64 --enable-win64
-		use win32 && ABI=x86 do_configure 32 --with-wine64=../wine64
-	else
-		ABI=x86 do_configure 32 --disable-win64
-	fi
-}
-
-src_compile() {
-	local b
-	for b in 64 32 ; do
-		local builddir="${WORKDIR}/wine${b}"
-		[[ -d ${builddir} ]] || continue
-		emake -C "${builddir}" all
-	done
-}
-
-src_install() {
-	local b
-	for b in 64 32 ; do
-		local builddir="${WORKDIR}/wine${b}"
-		[[ -d ${builddir} ]] || continue
-		emake -C "${builddir}" install DESTDIR="${D}"
-	done
-	dodoc ANNOUNCE AUTHORS README
-	if use gecko ; then
-		insinto /usr/share/wine/gecko
-		doins "${DISTDIR}"/wine_gecko-${GV}-x86.msi
-		use win64 && doins "${DISTDIR}"/wine_gecko-${GV}-x86_64.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
-}
-
-pkg_postinst() {
-	paxctl -psmr "${ROOT}"/usr/bin/wine{,-preloader} 2>/dev/null #255055
-}
diff --git a/app-emulation/wine/wine-1.4_rc3.ebuild b/app-emulation/wine/wine-1.4_rc3.ebuild
deleted file mode 100644
index b6af014520b9..000000000000
--- a/app-emulation/wine/wine-1.4_rc3.ebuild
+++ /dev/null
@@ -1,214 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.4_rc3.ebuild,v 1.3 2012/03/27 18:25:58 ssuominen Exp $
-
-EAPI="4"
-
-inherit autotools eutils flag-o-matic multilib
-
-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}/${MY_P}.tar.bz2"
-	KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
-	S=${WORKDIR}/${MY_P}
-fi
-
-GV="1.4"
-DESCRIPTION="free implementation of Windows(tm) on Unix"
-HOMEPAGE="http://www.winehq.org/"
-SRC_URI="${SRC_URI}
-	gecko? (
-		mirror://sourceforge/wine/wine_gecko-${GV}-x86.msi
-		win64? ( mirror://sourceforge/wine/wine_gecko-${GV}-x86_64.msi )
-	)"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-IUSE="alsa capi cups custom-cflags elibc_glibc fontconfig +gecko gnutls gphoto2 gsm gstreamer hardened jpeg lcms ldap mp3 ncurses nls openal opencl +opengl +oss +perl png samba scanner selinux ssl test +threads +truetype udisks v4l +win32 +win64 +X xcomposite xinerama xml"
-REQUIRED_USE="elibc_glibc? ( threads )" #286560
-RESTRICT="test" #72375
-
-MLIB_DEPS="amd64? (
-	truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 )
-	X? (
-		>=app-emulation/emul-linux-x86-xlibs-2.1
-		>=app-emulation/emul-linux-x86-soundlibs-2.1
-	)
-	mp3? ( app-emulation/emul-linux-x86-soundlibs )
-	openal? ( app-emulation/emul-linux-x86-sdl )
-	opengl? ( app-emulation/emul-linux-x86-opengl )
-	scanner? ( app-emulation/emul-linux-x86-medialibs )
-	v4l? ( app-emulation/emul-linux-x86-medialibs )
-	app-emulation/emul-linux-x86-baselibs
-	>=sys-kernel/linux-headers-2.6
-	)"
-RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts )
-	perl? ( dev-lang/perl dev-perl/XML-Simple )
-	capi? ( net-dialup/capi4k-utils )
-	ncurses? ( >=sys-libs/ncurses-5.2 )
-	fontconfig? ( media-libs/fontconfig )
-	gphoto2? ( media-libs/libgphoto2 )
-	openal? ( media-libs/openal )
-	udisks? (
-		sys-apps/dbus
-		sys-fs/udisks:0
-	)
-	gnutls? ( net-libs/gnutls )
-	gstreamer? ( media-libs/gstreamer media-libs/gst-plugins-base )
-	X? (
-		x11-libs/libXcursor
-		x11-libs/libXrandr
-		x11-libs/libXi
-		x11-libs/libXmu
-		x11-libs/libXxf86vm
-		x11-apps/xmessage
-	)
-	xinerama? ( x11-libs/libXinerama )
-	alsa? ( media-libs/alsa-lib )
-	cups? ( net-print/cups )
-	opencl? ( virtual/opencl )
-	opengl? ( virtual/opengl )
-	gsm? ( media-sound/gsm )
-	jpeg? ( virtual/jpeg )
-	ldap? ( net-nds/openldap )
-	lcms? ( =media-libs/lcms-1* )
-	mp3? ( >=media-sound/mpg123-1.5.0 )
-	nls? ( sys-devel/gettext )
-	samba? ( >=net-fs/samba-3.0.25 )
-	selinux? ( sec-policy/selinux-wine )
-	xml? ( dev-libs/libxml2 dev-libs/libxslt )
-	scanner? ( media-gfx/sane-backends )
-	ssl? ( dev-libs/openssl )
-	png? ( media-libs/libpng )
-	v4l? ( media-libs/libv4l )
-	!win64? ( ${MLIB_DEPS} )
-	win32? ( ${MLIB_DEPS} )
-	xcomposite? ( x11-libs/libXcomposite )"
-DEPEND="${RDEPEND}
-	X? (
-		x11-proto/inputproto
-		x11-proto/xextproto
-		x11-proto/xf86vidmodeproto
-	)
-	xinerama? ( x11-proto/xineramaproto )
-	!hardened? ( sys-devel/prelink )
-	dev-util/pkgconfig
-	virtual/yacc
-	sys-devel/flex"
-
-src_unpack() {
-	if use win64 ; then
-		[[ $(( $(gcc-major-version) * 100 + $(gcc-minor-version) )) -lt 404 ]] \
-			&& die "you need gcc-4.4+ to build 64bit wine"
-	fi
-
-	if [[ ${PV} == "9999" ]] ; then
-		git-2_src_unpack
-	else
-		unpack ${MY_P}.tar.bz2
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.1.15-winegcc.patch #260726
-	epatch "${FILESDIR}"/${PN}-1.4_rc2-multilib-portage.patch #395615
-	epatch_user #282735
-	eautoreconf
-	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
-	sed -i '/^MimeType/d' tools/wine.desktop || die #117785
-}
-
-do_configure() {
-	local builddir="${WORKDIR}/wine$1"
-	mkdir -p "${builddir}"
-	pushd "${builddir}" >/dev/null
-
-	ECONF_SOURCE=${S} \
-	econf \
-		--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 gnutls) \
-		$(use_with gphoto2 gphoto) \
-		$(use_with gsm) \
-		$(use_with gstreamer) \
-		--without-hal \
-		$(use_with jpeg) \
-		$(use_with ldap) \
-		$(use_with mp3 mpg123) \
-		$(use_with nls gettext) \
-		$(use_with openal) \
-		$(use_with opencl) \
-		$(use_with opengl) \
-		$(use_with ssl openssl) \
-		$(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) \
-		$2
-
-	emake -j1 depend
-
-	popd >/dev/null
-}
-
-src_configure() {
-	export LDCONFIG=/bin/true
-	use custom-cflags || strip-flags
-
-	if use win64 ; then
-		do_configure 64 --enable-win64
-		use win32 && ABI=x86 do_configure 32 --with-wine64=../wine64
-	else
-		ABI=x86 do_configure 32 --disable-win64
-	fi
-}
-
-src_compile() {
-	local b
-	for b in 64 32 ; do
-		local builddir="${WORKDIR}/wine${b}"
-		[[ -d ${builddir} ]] || continue
-		emake -C "${builddir}" all
-	done
-}
-
-src_install() {
-	local b
-	for b in 64 32 ; do
-		local builddir="${WORKDIR}/wine${b}"
-		[[ -d ${builddir} ]] || continue
-		emake -C "${builddir}" install DESTDIR="${D}"
-	done
-	dodoc ANNOUNCE AUTHORS README
-	if use gecko ; then
-		insinto /usr/share/wine/gecko
-		doins "${DISTDIR}"/wine_gecko-${GV}-x86.msi
-		use win64 && doins "${DISTDIR}"/wine_gecko-${GV}-x86_64.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
-}
-
-pkg_postinst() {
-	paxctl -psmr "${ROOT}"/usr/bin/wine{,-preloader} 2>/dev/null #255055
-}
diff --git a/app-emulation/wine/wine-1.4_rc4.ebuild b/app-emulation/wine/wine-1.4_rc4.ebuild
deleted file mode 100644
index 26193d2383c5..000000000000
--- a/app-emulation/wine/wine-1.4_rc4.ebuild
+++ /dev/null
@@ -1,227 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.4_rc4.ebuild,v 1.3 2012/03/27 18:25:58 ssuominen Exp $
-
-EAPI="4"
-
-inherit autotools eutils flag-o-matic multilib pax-utils
-
-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}/${MY_P}.tar.bz2"
-	KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
-	S=${WORKDIR}/${MY_P}
-fi
-
-GV="1.4"
-DESCRIPTION="free implementation of Windows(tm) on Unix"
-HOMEPAGE="http://www.winehq.org/"
-SRC_URI="${SRC_URI}
-	gecko? (
-		mirror://sourceforge/wine/wine_gecko-${GV}-x86.msi
-		win64? ( mirror://sourceforge/wine/wine_gecko-${GV}-x86_64.msi )
-	)"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-IUSE="alsa capi cups custom-cflags elibc_glibc fontconfig +gecko gnutls gphoto2 gsm gstreamer hardened jpeg lcms ldap mp3 ncurses nls odbc openal opencl +opengl +oss +perl png samba scanner selinux ssl test +threads +truetype udisks v4l +win32 +win64 +X xcomposite xinerama xml"
-REQUIRED_USE="elibc_glibc? ( threads )" #286560
-RESTRICT="test" #72375
-
-MLIB_DEPS="amd64? (
-	truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 )
-	X? (
-		>=app-emulation/emul-linux-x86-xlibs-2.1
-		>=app-emulation/emul-linux-x86-soundlibs-2.1
-	)
-	mp3? ( app-emulation/emul-linux-x86-soundlibs )
-	odbc? ( app-emulation/emul-linux-x86-db )
-	openal? ( app-emulation/emul-linux-x86-sdl )
-	opengl? ( app-emulation/emul-linux-x86-opengl )
-	scanner? ( app-emulation/emul-linux-x86-medialibs )
-	v4l? ( app-emulation/emul-linux-x86-medialibs )
-	app-emulation/emul-linux-x86-baselibs
-	>=sys-kernel/linux-headers-2.6
-	)"
-RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts )
-	perl? ( dev-lang/perl dev-perl/XML-Simple )
-	capi? ( net-dialup/capi4k-utils )
-	ncurses? ( >=sys-libs/ncurses-5.2 )
-	fontconfig? ( media-libs/fontconfig )
-	gphoto2? ( media-libs/libgphoto2 )
-	openal? ( media-libs/openal )
-	udisks? (
-		sys-apps/dbus
-		sys-fs/udisks:0
-	)
-	gnutls? ( net-libs/gnutls )
-	gstreamer? ( media-libs/gstreamer media-libs/gst-plugins-base )
-	X? (
-		x11-libs/libXcursor
-		x11-libs/libXrandr
-		x11-libs/libXi
-		x11-libs/libXmu
-		x11-libs/libXxf86vm
-		x11-apps/xmessage
-	)
-	xinerama? ( x11-libs/libXinerama )
-	alsa? ( media-libs/alsa-lib )
-	cups? ( net-print/cups )
-	opencl? ( virtual/opencl )
-	opengl? ( virtual/opengl )
-	gsm? ( media-sound/gsm )
-	jpeg? ( virtual/jpeg )
-	ldap? ( net-nds/openldap )
-	lcms? ( =media-libs/lcms-1* )
-	mp3? ( >=media-sound/mpg123-1.5.0 )
-	nls? ( sys-devel/gettext )
-	odbc? ( dev-db/unixODBC )
-	samba? ( >=net-fs/samba-3.0.25 )
-	selinux? ( sec-policy/selinux-wine )
-	xml? ( dev-libs/libxml2 dev-libs/libxslt )
-	scanner? ( media-gfx/sane-backends )
-	ssl? ( dev-libs/openssl )
-	png? ( media-libs/libpng )
-	v4l? ( media-libs/libv4l )
-	!win64? ( ${MLIB_DEPS} )
-	win32? ( ${MLIB_DEPS} )
-	xcomposite? ( x11-libs/libXcomposite )"
-DEPEND="${RDEPEND}
-	X? (
-		x11-proto/inputproto
-		x11-proto/xextproto
-		x11-proto/xf86vidmodeproto
-	)
-	xinerama? ( x11-proto/xineramaproto )
-	!hardened? ( sys-devel/prelink )
-	dev-util/pkgconfig
-	virtual/yacc
-	sys-devel/flex"
-
-src_unpack() {
-	if use win64 ; then
-		[[ $(( $(gcc-major-version) * 100 + $(gcc-minor-version) )) -lt 404 ]] \
-			&& die "you need gcc-4.4+ to build 64bit wine"
-	fi
-
-	if use win32 && use opencl; then
-		[[ x$(eselect opencl show) = "xintel" ]] &&
-			die "Cannot build wine[opencl,win32]: intel-ocl-sdk is 64-bit only" # 403947
-	fi
-
-	if [[ ${PV} == "9999" ]] ; then
-		git-2_src_unpack
-	else
-		unpack ${MY_P}.tar.bz2
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.1.15-winegcc.patch #260726
-	epatch "${FILESDIR}"/${PN}-1.4_rc2-multilib-portage.patch #395615
-	epatch_user #282735
-	eautoreconf
-	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
-	sed -i '/^MimeType/d' tools/wine.desktop || die #117785
-}
-
-do_configure() {
-	local builddir="${WORKDIR}/wine$1"
-	mkdir -p "${builddir}"
-	pushd "${builddir}" >/dev/null
-
-	ECONF_SOURCE=${S} \
-	econf \
-		--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 gnutls) \
-		$(use_with gphoto2 gphoto) \
-		$(use_with gsm) \
-		$(use_with gstreamer) \
-		--without-hal \
-		$(use_with jpeg) \
-		$(use_with ldap) \
-		$(use_with mp3 mpg123) \
-		$(use_with nls gettext) \
-		$(use_with openal) \
-		$(use_with opencl) \
-		$(use_with opengl) \
-		$(use_with ssl openssl) \
-		$(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) \
-		$2
-
-	emake -j1 depend
-
-	popd >/dev/null
-}
-
-src_configure() {
-	export LDCONFIG=/bin/true
-	use custom-cflags || strip-flags
-
-	if use win64 ; then
-		do_configure 64 --enable-win64
-		use win32 && ABI=x86 do_configure 32 --with-wine64=../wine64
-	else
-		ABI=x86 do_configure 32 --disable-win64
-	fi
-}
-
-src_compile() {
-	local b
-	for b in 64 32 ; do
-		local builddir="${WORKDIR}/wine${b}"
-		[[ -d ${builddir} ]] || continue
-		emake -C "${builddir}" all
-	done
-}
-
-src_install() {
-	local b
-	for b in 64 32 ; do
-		local builddir="${WORKDIR}/wine${b}"
-		[[ -d ${builddir} ]] || continue
-		emake -C "${builddir}" install DESTDIR="${D}"
-	done
-	dodoc ANNOUNCE AUTHORS README
-	if use gecko ; then
-		insinto /usr/share/wine/gecko
-		doins "${DISTDIR}"/wine_gecko-${GV}-x86.msi
-		use win64 && doins "${DISTDIR}"/wine_gecko-${GV}-x86_64.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
-
-	if use win32 || ! use win64; then
-		pax-mark psmr "${D}"usr/bin/wine{,-preloader} #255055
-	fi
-	use win64 && pax-mark psmr "${D}"usr/bin/wine64{,-preloader}
-
-	if use win64 && ! use win32; then
-		dosym /usr/bin/wine{64,} # 404331
-		dosym /usr/bin/wine{64,}-preloader
-	fi
-}
diff --git a/app-emulation/wine/wine-1.4_rc6.ebuild b/app-emulation/wine/wine-1.4_rc6.ebuild
deleted file mode 100644
index 742e26c4fbb8..000000000000
--- a/app-emulation/wine/wine-1.4_rc6.ebuild
+++ /dev/null
@@ -1,227 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.4_rc6.ebuild,v 1.2 2012/03/27 18:25:58 ssuominen Exp $
-
-EAPI="4"
-
-inherit autotools eutils flag-o-matic multilib pax-utils
-
-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}/${MY_P}.tar.bz2"
-	KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
-	S=${WORKDIR}/${MY_P}
-fi
-
-GV="1.4"
-DESCRIPTION="free implementation of Windows(tm) on Unix"
-HOMEPAGE="http://www.winehq.org/"
-SRC_URI="${SRC_URI}
-	gecko? (
-		mirror://sourceforge/wine/wine_gecko-${GV}-x86.msi
-		win64? ( mirror://sourceforge/wine/wine_gecko-${GV}-x86_64.msi )
-	)"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-IUSE="alsa capi cups custom-cflags elibc_glibc fontconfig +gecko gnutls gphoto2 gsm gstreamer hardened jpeg lcms ldap mp3 ncurses nls odbc openal opencl +opengl +oss +perl png samba scanner selinux ssl test +threads +truetype udisks v4l +win32 +win64 +X xcomposite xinerama xml"
-REQUIRED_USE="elibc_glibc? ( threads )" #286560
-RESTRICT="test" #72375
-
-MLIB_DEPS="amd64? (
-	truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 )
-	X? (
-		>=app-emulation/emul-linux-x86-xlibs-2.1
-		>=app-emulation/emul-linux-x86-soundlibs-2.1
-	)
-	mp3? ( app-emulation/emul-linux-x86-soundlibs )
-	odbc? ( app-emulation/emul-linux-x86-db )
-	openal? ( app-emulation/emul-linux-x86-sdl )
-	opengl? ( app-emulation/emul-linux-x86-opengl )
-	scanner? ( app-emulation/emul-linux-x86-medialibs )
-	v4l? ( app-emulation/emul-linux-x86-medialibs )
-	app-emulation/emul-linux-x86-baselibs
-	>=sys-kernel/linux-headers-2.6
-	)"
-RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts )
-	perl? ( dev-lang/perl dev-perl/XML-Simple )
-	capi? ( net-dialup/capi4k-utils )
-	ncurses? ( >=sys-libs/ncurses-5.2 )
-	fontconfig? ( media-libs/fontconfig )
-	gphoto2? ( media-libs/libgphoto2 )
-	openal? ( media-libs/openal )
-	udisks? (
-		sys-apps/dbus
-		sys-fs/udisks:0
-	)
-	gnutls? ( net-libs/gnutls )
-	gstreamer? ( media-libs/gstreamer media-libs/gst-plugins-base )
-	X? (
-		x11-libs/libXcursor
-		x11-libs/libXrandr
-		x11-libs/libXi
-		x11-libs/libXmu
-		x11-libs/libXxf86vm
-		x11-apps/xmessage
-	)
-	xinerama? ( x11-libs/libXinerama )
-	alsa? ( media-libs/alsa-lib )
-	cups? ( net-print/cups )
-	opencl? ( virtual/opencl )
-	opengl? ( virtual/opengl )
-	gsm? ( media-sound/gsm )
-	jpeg? ( virtual/jpeg )
-	ldap? ( net-nds/openldap )
-	lcms? ( =media-libs/lcms-1* )
-	mp3? ( >=media-sound/mpg123-1.5.0 )
-	nls? ( sys-devel/gettext )
-	odbc? ( dev-db/unixODBC )
-	samba? ( >=net-fs/samba-3.0.25 )
-	selinux? ( sec-policy/selinux-wine )
-	xml? ( dev-libs/libxml2 dev-libs/libxslt )
-	scanner? ( media-gfx/sane-backends )
-	ssl? ( dev-libs/openssl )
-	png? ( media-libs/libpng )
-	v4l? ( media-libs/libv4l )
-	!win64? ( ${MLIB_DEPS} )
-	win32? ( ${MLIB_DEPS} )
-	xcomposite? ( x11-libs/libXcomposite )"
-DEPEND="${RDEPEND}
-	X? (
-		x11-proto/inputproto
-		x11-proto/xextproto
-		x11-proto/xf86vidmodeproto
-	)
-	xinerama? ( x11-proto/xineramaproto )
-	!hardened? ( sys-devel/prelink )
-	dev-util/pkgconfig
-	virtual/yacc
-	sys-devel/flex"
-
-src_unpack() {
-	if use win64 ; then
-		[[ $(( $(gcc-major-version) * 100 + $(gcc-minor-version) )) -lt 404 ]] \
-			&& die "you need gcc-4.4+ to build 64bit wine"
-	fi
-
-	if use win32 && use opencl; then
-		[[ x$(eselect opencl show) = "xintel" ]] &&
-			die "Cannot build wine[opencl,win32]: intel-ocl-sdk is 64-bit only" # 403947
-	fi
-
-	if [[ ${PV} == "9999" ]] ; then
-		git-2_src_unpack
-	else
-		unpack ${MY_P}.tar.bz2
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.1.15-winegcc.patch #260726
-	epatch "${FILESDIR}"/${PN}-1.4_rc2-multilib-portage.patch #395615
-	epatch_user #282735
-	eautoreconf
-	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
-	sed -i '/^MimeType/d' tools/wine.desktop || die #117785
-}
-
-do_configure() {
-	local builddir="${WORKDIR}/wine$1"
-	mkdir -p "${builddir}"
-	pushd "${builddir}" >/dev/null
-
-	ECONF_SOURCE=${S} \
-	econf \
-		--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 gnutls) \
-		$(use_with gphoto2 gphoto) \
-		$(use_with gsm) \
-		$(use_with gstreamer) \
-		--without-hal \
-		$(use_with jpeg) \
-		$(use_with ldap) \
-		$(use_with mp3 mpg123) \
-		$(use_with nls gettext) \
-		$(use_with openal) \
-		$(use_with opencl) \
-		$(use_with opengl) \
-		$(use_with ssl openssl) \
-		$(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) \
-		$2
-
-	emake -j1 depend
-
-	popd >/dev/null
-}
-
-src_configure() {
-	export LDCONFIG=/bin/true
-	use custom-cflags || strip-flags
-
-	if use win64 ; then
-		do_configure 64 --enable-win64
-		use win32 && ABI=x86 do_configure 32 --with-wine64=../wine64
-	else
-		ABI=x86 do_configure 32 --disable-win64
-	fi
-}
-
-src_compile() {
-	local b
-	for b in 64 32 ; do
-		local builddir="${WORKDIR}/wine${b}"
-		[[ -d ${builddir} ]] || continue
-		emake -C "${builddir}" all
-	done
-}
-
-src_install() {
-	local b
-	for b in 64 32 ; do
-		local builddir="${WORKDIR}/wine${b}"
-		[[ -d ${builddir} ]] || continue
-		emake -C "${builddir}" install DESTDIR="${D}"
-	done
-	dodoc ANNOUNCE AUTHORS README
-	if use gecko ; then
-		insinto /usr/share/wine/gecko
-		doins "${DISTDIR}"/wine_gecko-${GV}-x86.msi
-		use win64 && doins "${DISTDIR}"/wine_gecko-${GV}-x86_64.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
-
-	if use win32 || ! use win64; then
-		pax-mark psmr "${D}"usr/bin/wine{,-preloader} #255055
-	fi
-	use win64 && pax-mark psmr "${D}"usr/bin/wine64{,-preloader}
-
-	if use win64 && ! use win32; then
-		dosym /usr/bin/wine{64,} # 404331
-		dosym /usr/bin/wine{64,}-preloader
-	fi
-}
diff --git a/app-emulation/wine/wine-1.4_rc5.ebuild b/app-emulation/wine/wine-1.5.2.ebuild
index 7361b2d4c23a..acd6f6bb88f4 100644
--- a/app-emulation/wine/wine-1.4_rc5.ebuild
+++ b/app-emulation/wine/wine-1.5.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.4_rc5.ebuild,v 1.3 2012/03/27 18:25:58 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.5.2.ebuild,v 1.1 2012/04/14 01:51:23 tetromino Exp $
 
 EAPI="4"
 
@@ -18,7 +18,7 @@ else
 	S=${WORKDIR}/${MY_P}
 fi
 
-GV="1.4"
+GV="1.5"
 DESCRIPTION="free implementation of Windows(tm) on Unix"
 HOMEPAGE="http://www.winehq.org/"
 SRC_URI="${SRC_URI}