Drop USE="esd jack nas" to match upstream, and drop USE=pulseaudio as it should be...

diff --git a/app-emulation/wine/ChangeLog b/app-emulation/wine/ChangeLog
index 33ffde0073317a2ab76a73fc8eef880c499c2af0..0ac7d62c4b076809edf4f3510620e32abf6948d0 100644 (file)
--- a/app-emulation/wine/ChangeLog
+++ b/app-emulation/wine/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-emulation/wine
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.375 2011/07/11 03:37:08 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.376 2011/08/07 13:25:43 vapier Exp $
+
+  07 Aug 2011; Mike Frysinger <vapier@gentoo.org> wine-9999.ebuild:
+  Drop USE="esd jack nas" to match upstream, and drop USE=pulseaudio as it
+  should be obsoleted by latest code.
 
 *wine-1.3.24 (11 Jul 2011)
 

diff --git a/app-emulation/wine/wine-9999.ebuild b/app-emulation/wine/wine-9999.ebuild
index 9b7b29aaa52fe7e532b784794293980b5815cef4..3dcd73959f29d9e04621cbe7aee8be8fde5f4315 100644 (file)
--- a/app-emulation/wine/wine-9999.ebuild
+++ b/app-emulation/wine/wine-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-9999.ebuild,v 1.86 2011/07/11 03:34:37 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-9999.ebuild,v 1.87 2011/08/07 13:25:43 vapier Exp $
 
 EAPI="2"
 
@@ -20,7 +20,6 @@ else
        S=${WORKDIR}/${MY_P}
 fi
 
-pulse_patches() { echo "$1"/winepulse-{0.40,configure.ac-1.3.22,winecfg-1.3.11}.patch ; }
 GV="1.2.0"
 DESCRIPTION="free implementation of Windows(tm) on Unix"
 HOMEPAGE="http://www.winehq.org/"
@@ -28,20 +27,16 @@ SRC_URI="${SRC_URI}
        gecko? (
                mirror://sourceforge/wine/wine_gecko-${GV}-x86.msi
                win64? ( mirror://sourceforge/wine/wine_gecko-${GV}-x86_64.msi )
-       )
-       pulseaudio? ( `pulse_patches http://art.ified.ca/downloads/winepulse` )"
+       )"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-IUSE="alsa capi cups custom-cflags dbus esd fontconfig +gecko gnutls gphoto2 gsm gstreamer hal jack jpeg lcms ldap mp3 nas ncurses nls openal opencl +opengl +oss +perl png pulseaudio samba scanner ssl test +threads +truetype v4l +win32 +win64 +X xcomposite xinerama xml"
+IUSE="alsa capi cups custom-cflags dbus fontconfig +gecko gnutls gphoto2 gsm gstreamer hal jpeg lcms ldap mp3 ncurses nls openal opencl +opengl +oss +perl png samba scanner ssl test +threads +truetype v4l +win32 +win64 +X xcomposite xinerama xml"
 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[pulseaudio?]
-       )
+       X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 )
        openal? ( app-emulation/emul-linux-x86-sdl )
        opengl? ( app-emulation/emul-linux-x86-opengl )
        v4l? ( app-emulation/emul-linux-x86-medialibs )
@@ -54,7 +49,6 @@ RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts )
        ncurses? ( >=sys-libs/ncurses-5.2 )
        fontconfig? ( media-libs/fontconfig )
        gphoto2? ( media-libs/libgphoto2 )
-       jack? ( media-sound/jack-audio-connection-kit )
        openal? ( media-libs/openal )
        dbus? ( sys-apps/dbus )
        gnutls? ( net-libs/gnutls )
@@ -70,12 +64,9 @@ 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? ( x11-drivers/nvidia-drivers >=dev-util/nvidia-cuda-toolkit-3.1 )
        opengl? ( virtual/opengl )
-       pulseaudio? ( media-sound/pulseaudio )
        gsm? ( media-sound/gsm )
        jpeg? ( virtual/jpeg )
        ldap? ( net-nds/openldap )
@@ -92,7 +83,6 @@ RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts )
        win32? ( ${MLIB_DEPS} )
        xcomposite? ( x11-libs/libXcomposite ) "
 DEPEND="${RDEPEND}
-       pulseaudio? ( ${AUTOTOOLS_DEPEND} )
        X? (
                x11-proto/inputproto
                x11-proto/xextproto
@@ -116,10 +106,6 @@ src_unpack() {
 }
 
 src_prepare() {
-       if use pulseaudio ; then
-               EPATCH_OPTS=-p1 epatch `pulse_patches "${DISTDIR}"`
-               eautoreconf
-       fi
        epatch "${FILESDIR}"/${PN}-1.1.15-winegcc.patch #260726
        epatch_user #282735
        sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
@@ -139,18 +125,15 @@ do_configure() {
                $(use_with lcms cms) \
                $(use_with cups) \
                $(use_with ncurses curses) \
-               $(use_with esd) \
                $(use_with fontconfig) \
                $(use_with gnutls) \
                $(use_with gphoto2 gphoto) \
                $(use_with gsm) \
                $(use_with gstreamer) \
                $(! use dbus && echo --without-hal || use_with hal) \
-               $(use_with jack) \
                $(use_with jpeg) \
                $(use_with ldap) \
                $(use_with mp3 mpg123) \
-               $(use_with nas) \
                $(use_with nls gettextpo) \
                $(use_with openal) \
                $(use_with opencl) \
@@ -159,7 +142,6 @@ do_configure() {
                $(use_with oss) \
                $(use_with png) \
                $(use_with threads pthread) \
-               $(use pulseaudio && use_with pulseaudio pulse) \
                $(use_with scanner sane) \
                $(use_enable test tests) \
                $(use_with truetype freetype) \