Update to EAPI4 and require USE=threads on glibc-based systems (bug #286560, #396395, and other duplicates). Drop esd support since media-sound/esound has been masked for removal.

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

1 files changed, 11 insertions, 11 deletions

diff --git a/app-emulation/wine/wine-1.3.13.ebuild b/app-emulation/wine/wine-1.3.13.ebuild
index b2b7ef01de39..d27b4c6a52b1 100644
--- a/app-emulation/wine/wine-1.3.13.ebuild
+++ b/app-emulation/wine/wine-1.3.13.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2011 Gentoo Foundation
+# 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.3.13.ebuild,v 1.15 2011/12/20 19:35:12 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.13.ebuild,v 1.16 2012/01/14 03:20:51 tetromino Exp $
 
-EAPI="2"
+EAPI="4"
 
 inherit eutils flag-o-matic multilib
 
@@ -29,7 +29,8 @@ SRC_URI="${SRC_URI}
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-IUSE="alsa capi cups custom-cflags dbus esd fontconfig +gecko gnutls gphoto2 gsm gstreamer hardened jack jpeg lcms ldap mp3 nas ncurses nls openal opencl +opengl +oss +perl png samba scanner ssl test +threads +truetype v4l +win32 +win64 +X xcomposite xinerama xml"
+IUSE="alsa capi cups custom-cflags dbus elibc_glibc fontconfig +gecko gnutls gphoto2 gsm gstreamer hardened jack jpeg lcms ldap mp3 nas ncurses nls openal opencl +opengl +oss +perl png samba scanner ssl test +threads +truetype v4l +win32 +win64 +X xcomposite xinerama xml"
+REQUIRED_USE="elibc_glibc? ( threads )" #286560
 RESTRICT="test" #72375
 
 MLIB_DEPS="amd64? (
@@ -67,7 +68,6 @@ RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts )
 	)
 	xinerama? ( x11-libs/libXinerama )
 	alsa? ( media-libs/alsa-lib )
-	esd? ( media-sound/esound )
 	nas? ( media-libs/nas )
 	cups? ( net-print/cups )
 	opencl? ( virtual/opencl )
@@ -131,7 +131,7 @@ do_configure() {
 		$(use_with lcms cms) \
 		$(use_with cups) \
 		$(use_with ncurses curses) \
-		$(use_with esd) \
+		--without-esd \
 		$(use_with fontconfig) \
 		$(use_with gnutls) \
 		$(use_with gphoto2 gphoto) \
@@ -162,7 +162,7 @@ do_configure() {
 		$(use_with xml xslt) \
 		$2
 
-	emake -j1 depend || die "depend"
+	emake -j1 depend
 
 	popd >/dev/null
 }
@@ -183,7 +183,7 @@ src_compile() {
 	for b in 64 32 ; do
 		local builddir="${WORKDIR}/wine${b}"
 		[[ -d ${builddir} ]] || continue
-		emake -C "${builddir}" all || die
+		emake -C "${builddir}" all
 	done
 }
 
@@ -192,13 +192,13 @@ src_install() {
 	for b in 64 32 ; do
 		local builddir="${WORKDIR}/wine${b}"
 		[[ -d ${builddir} ]] || continue
-		emake -C "${builddir}" install DESTDIR="${D}" || die
+		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.cab || die
-		use win64 && { doins "${DISTDIR}"/wine_gecko-${GV}-x86_64.cab || die ; }
+		doins "${DISTDIR}"/wine_gecko-${GV}-x86.cab
+		use win64 && doins "${DISTDIR}"/wine_gecko-${GV}-x86_64.cab
 	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