diff options
Diffstat (limited to 'app-emulation')
43 files changed, 462 insertions, 434 deletions
diff --git a/app-emulation/wine/ChangeLog b/app-emulation/wine/ChangeLog index 3cce60b4ba3a..8eda016a0970 100644 --- a/app-emulation/wine/ChangeLog +++ b/app-emulation/wine/ChangeLog @@ -1,6 +1,24 @@ # 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.394 2012/01/13 00:08:55 tetromino Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.395 2012/01/14 03:20:51 tetromino Exp $ + + 14 Jan 2012; Alexandre Rostovtsev <tetromino@gentoo.org> wine-1.2.ebuild, + wine-1.2.1.ebuild, wine-1.2.2.ebuild, wine-1.2.3.ebuild, wine-1.3.0.ebuild, + wine-1.3.1.ebuild, wine-1.3.2.ebuild, wine-1.3.3.ebuild, wine-1.3.4.ebuild, + wine-1.3.5.ebuild, wine-1.3.6.ebuild, wine-1.3.7.ebuild, wine-1.3.8.ebuild, + wine-1.3.9.ebuild, wine-1.3.10.ebuild, wine-1.3.11.ebuild, + wine-1.3.12.ebuild, wine-1.3.13.ebuild, wine-1.3.14.ebuild, + wine-1.3.15.ebuild, wine-1.3.16.ebuild, wine-1.3.17.ebuild, + wine-1.3.18.ebuild, wine-1.3.19.ebuild, wine-1.3.20.ebuild, + wine-1.3.21.ebuild, wine-1.3.22.ebuild, wine-1.3.23.ebuild, + wine-1.3.24.ebuild, wine-1.3.25.ebuild, wine-1.3.26.ebuild, + wine-1.3.27.ebuild, wine-1.3.28.ebuild, wine-1.3.29.ebuild, + wine-1.3.30.ebuild, wine-1.3.31.ebuild, wine-1.3.32.ebuild, + wine-1.3.33.ebuild, wine-1.3.34.ebuild, wine-1.3.35.ebuild, + wine-1.3.36.ebuild, wine-9999.ebuild: + 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. 13 Jan 2012; Alexandre Rostovtsev <tetromino@gentoo.org> wine-1.2.3.ebuild, +files/wine-1.2.3-msxml3-libxml2-headers.patch: diff --git a/app-emulation/wine/wine-1.2.1.ebuild b/app-emulation/wine/wine-1.2.1.ebuild index 7d9064ed0636..7209372d968c 100644 --- a/app-emulation/wine/wine-1.2.1.ebuild +++ b/app-emulation/wine/wine-1.2.1.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.2.1.ebuild,v 1.13 2011/12/02 23:32:04 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.2.1.ebuild,v 1.14 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 hardened jack jpeg lcms ldap mp3 nas ncurses openal +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 elibc_glibc fontconfig +gecko gnutls gphoto2 gsm hardened jack jpeg lcms ldap mp3 nas ncurses openal +opengl +oss +perl png pulseaudio 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? ( @@ -66,7 +67,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 ) opengl? ( virtual/opengl ) @@ -134,7 +134,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) \ @@ -163,7 +163,7 @@ do_configure() { $(use_with xml xslt) \ $2 - emake -j1 depend || die "depend" + emake -j1 depend popd >/dev/null } @@ -184,7 +184,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 } @@ -193,12 +193,12 @@ 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}.cab || die + doins "${DISTDIR}"/wine_gecko-${GV}.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 diff --git a/app-emulation/wine/wine-1.2.2.ebuild b/app-emulation/wine/wine-1.2.2.ebuild index 0eaf2426af4d..dddd32e502ea 100644 --- a/app-emulation/wine/wine-1.2.2.ebuild +++ b/app-emulation/wine/wine-1.2.2.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.2.2.ebuild,v 1.12 2011/09/18 09:08:12 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.2.2.ebuild,v 1.13 2012/01/14 03:20:51 tetromino Exp $ -EAPI="2" +EAPI="4" inherit eutils flag-o-matic multilib @@ -30,7 +30,8 @@ SRC_URI="${SRC_URI} LICENSE="LGPL-2.1" SLOT="0" -IUSE="alsa capi cups custom-cflags dbus esd fontconfig +gecko gnutls gphoto2 gsm hardened jack jpeg lcms ldap mp3 nas ncurses openal +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 elibc_glibc fontconfig +gecko gnutls gphoto2 gsm hardened jack jpeg lcms ldap mp3 nas ncurses openal +opengl +oss +perl png pulseaudio 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 ) opengl? ( virtual/opengl ) @@ -135,7 +135,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) \ @@ -164,7 +164,7 @@ do_configure() { $(use_with xml xslt) \ $2 - emake -j1 depend || die "depend" + emake -j1 depend popd >/dev/null } @@ -185,7 +185,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 } @@ -194,12 +194,12 @@ 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}.cab || die + doins "${DISTDIR}"/wine_gecko-${GV}.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 diff --git a/app-emulation/wine/wine-1.2.3.ebuild b/app-emulation/wine/wine-1.2.3.ebuild index 939200d74eb1..d7c05ed09ffc 100644 --- a/app-emulation/wine/wine-1.2.3.ebuild +++ b/app-emulation/wine/wine-1.2.3.ebuild @@ -1,8 +1,8 @@ # 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.2.3.ebuild,v 1.11 2012/01/13 00:08:55 tetromino Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.2.3.ebuild,v 1.12 2012/01/14 03:20:51 tetromino Exp $ -EAPI="2" +EAPI="4" inherit eutils flag-o-matic multilib @@ -30,7 +30,8 @@ SRC_URI="${SRC_URI} LICENSE="LGPL-2.1" SLOT="0" -IUSE="alsa capi cups custom-cflags dbus esd fontconfig +gecko gnutls gphoto2 gsm hardened jack jpeg lcms ldap mp3 nas ncurses openal +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 elibc_glibc fontconfig +gecko gnutls gphoto2 gsm hardened jack jpeg lcms ldap mp3 nas ncurses openal +opengl +oss +perl png pulseaudio 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 ) opengl? ( virtual/opengl ) @@ -136,7 +136,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) \ @@ -165,7 +165,7 @@ do_configure() { $(use_with xml xslt) \ $2 - emake -j1 depend || die "depend" + emake -j1 depend popd >/dev/null } @@ -186,7 +186,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 } @@ -195,12 +195,12 @@ 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}.cab || die + doins "${DISTDIR}"/wine_gecko-${GV}.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 diff --git a/app-emulation/wine/wine-1.2.ebuild b/app-emulation/wine/wine-1.2.ebuild index 721a100094c3..017b9ffecc1b 100644 --- a/app-emulation/wine/wine-1.2.ebuild +++ b/app-emulation/wine/wine-1.2.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.2.ebuild,v 1.16 2011/09/18 09:08:12 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.2.ebuild,v 1.17 2012/01/14 03:20:51 tetromino Exp $ -EAPI="2" +EAPI="4" AUTOTOOLS_AUTO_DEPEND="no" inherit eutils flag-o-matic multilib autotools @@ -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 hardened jack jpeg lcms ldap mp3 nas ncurses openal +opengl +oss +perl png pulseaudio samba scanner ssl test +threads +truetype v4l win64 +X xcomposite xinerama xml" +IUSE="alsa capi cups custom-cflags dbus elibc_glibc fontconfig +gecko gnutls gphoto2 gsm hardened jack jpeg lcms ldap mp3 nas ncurses openal +opengl +oss +perl png pulseaudio samba scanner ssl test +threads +truetype v4l win64 +X xcomposite xinerama xml" +REQUIRED_USE="elibc_glibc? ( threads )" #286560 RESTRICT="test" #72375 RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) @@ -52,7 +53,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 ) opengl? ( virtual/opengl ) @@ -131,7 +131,7 @@ src_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) \ @@ -158,22 +158,17 @@ src_configure() { $(use_with xcomposite) \ $(use_with xinerama) \ $(use_with xml) \ - $(use_with xml xslt) \ - || die "configure failed" + $(use_with xml xslt) - emake -j1 depend || die "depend" -} - -src_compile() { - emake all || die "all" + emake -j1 depend } src_install() { - emake DESTDIR="${D}" install || die + emake DESTDIR="${D}" install dodoc ANNOUNCE AUTHORS README if use gecko ; then insinto /usr/share/wine/gecko - doins "${DISTDIR}"/wine_gecko-${GV}.cab || die + doins "${DISTDIR}"/wine_gecko-${GV}.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 diff --git a/app-emulation/wine/wine-1.3.0.ebuild b/app-emulation/wine/wine-1.3.0.ebuild index d16f6e78c6e7..fa661dac4f24 100644 --- a/app-emulation/wine/wine-1.3.0.ebuild +++ b/app-emulation/wine/wine-1.3.0.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.0.ebuild,v 1.18 2011/12/02 23:32:04 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.0.ebuild,v 1.19 2012/01/14 03:20:51 tetromino Exp $ -EAPI="2" +EAPI="4" inherit eutils flag-o-matic multilib @@ -26,7 +26,8 @@ SRC_URI="${SRC_URI} LICENSE="LGPL-2.1" SLOT="0" -IUSE="alsa capi cups custom-cflags dbus esd fontconfig +gecko gnutls gphoto2 gsm hardened jack jpeg lcms ldap mp3 nas ncurses openal +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 hardened jack jpeg lcms ldap mp3 nas ncurses openal +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? ( @@ -63,7 +64,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 ) opengl? ( virtual/opengl ) @@ -125,7 +125,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) \ @@ -153,7 +153,7 @@ do_configure() { $(use_with xml xslt) \ $2 - emake -j1 depend || die "depend" + emake -j1 depend popd >/dev/null } @@ -174,7 +174,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 } @@ -183,12 +183,12 @@ 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}.cab || die + doins "${DISTDIR}"/wine_gecko-${GV}.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 diff --git a/app-emulation/wine/wine-1.3.1.ebuild b/app-emulation/wine/wine-1.3.1.ebuild index ae8f87d64dc3..1b5bab8583fd 100644 --- a/app-emulation/wine/wine-1.3.1.ebuild +++ b/app-emulation/wine/wine-1.3.1.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.1.ebuild,v 1.16 2011/12/02 23:32:04 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.1.ebuild,v 1.17 2012/01/14 03:20:51 tetromino Exp $ -EAPI="2" +EAPI="4" inherit eutils flag-o-matic multilib @@ -26,7 +26,8 @@ SRC_URI="${SRC_URI} LICENSE="LGPL-2.1" SLOT="0" -IUSE="alsa capi cups custom-cflags dbus esd fontconfig +gecko gnutls gphoto2 gsm hardened jack jpeg lcms ldap mp3 nas ncurses openal +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 hardened jack jpeg lcms ldap mp3 nas ncurses openal +opengl +oss +perl png samba scanner ssl test +threads +truetype v4l +win32 +win64 +X xcomposite xinerama xml" +REQUIRED_USE="elibc_glibc? ( threads )" RESTRICT="test" #72375 MLIB_DEPS="amd64? ( @@ -63,7 +64,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 ) opengl? ( virtual/opengl ) @@ -125,7 +125,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) \ @@ -153,7 +153,7 @@ do_configure() { $(use_with xml xslt) \ $2 - emake -j1 depend || die "depend" + emake -j1 depend popd >/dev/null } @@ -174,7 +174,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 } @@ -183,7 +183,7 @@ 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 diff --git a/app-emulation/wine/wine-1.3.10.ebuild b/app-emulation/wine/wine-1.3.10.ebuild index 4ae86871907e..653bd8ea5a7c 100644 --- a/app-emulation/wine/wine-1.3.10.ebuild +++ b/app-emulation/wine/wine-1.3.10.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.10.ebuild,v 1.18 2011/12/20 19:35:12 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.10.ebuild,v 1.19 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 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 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 ) @@ -130,7 +130,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) \ @@ -160,7 +160,7 @@ do_configure() { $(use_with xml xslt) \ $2 - emake -j1 depend || die "depend" + emake -j1 depend popd >/dev/null } @@ -181,7 +181,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 } @@ -190,13 +190,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 diff --git a/app-emulation/wine/wine-1.3.11.ebuild b/app-emulation/wine/wine-1.3.11.ebuild index f55b9e8fb9c5..d6b50d6ff0e7 100644 --- a/app-emulation/wine/wine-1.3.11.ebuild +++ b/app-emulation/wine/wine-1.3.11.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.11.ebuild,v 1.17 2011/12/20 19:35:12 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.11.ebuild,v 1.18 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 diff --git a/app-emulation/wine/wine-1.3.12.ebuild b/app-emulation/wine/wine-1.3.12.ebuild index 65ed200aa7ff..3d1c4a9a1c9a 100644 --- a/app-emulation/wine/wine-1.3.12.ebuild +++ b/app-emulation/wine/wine-1.3.12.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.12.ebuild,v 1.15 2011/12/20 19:35:12 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.12.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 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 diff --git a/app-emulation/wine/wine-1.3.14.ebuild b/app-emulation/wine/wine-1.3.14.ebuild index b73fe529aa7c..e95007955dda 100644 --- a/app-emulation/wine/wine-1.3.14.ebuild +++ b/app-emulation/wine/wine-1.3.14.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.14.ebuild,v 1.16 2011/12/20 19:35:12 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.14.ebuild,v 1.17 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 diff --git a/app-emulation/wine/wine-1.3.15.ebuild b/app-emulation/wine/wine-1.3.15.ebuild index 3ce61ef39bdb..6f7160f65e77 100644 --- a/app-emulation/wine/wine-1.3.15.ebuild +++ b/app-emulation/wine/wine-1.3.15.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.15.ebuild,v 1.15 2011/12/20 19:35:12 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.15.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 diff --git a/app-emulation/wine/wine-1.3.16.ebuild b/app-emulation/wine/wine-1.3.16.ebuild index 4dd7ba5912fd..dba354d4ff26 100644 --- a/app-emulation/wine/wine-1.3.16.ebuild +++ b/app-emulation/wine/wine-1.3.16.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.16.ebuild,v 1.16 2011/12/20 19:35:12 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.16.ebuild,v 1.17 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.msi || die - use win64 && { doins "${DISTDIR}"/wine_gecko-${GV}-x86_64.msi || die ; } + 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 diff --git a/app-emulation/wine/wine-1.3.17.ebuild b/app-emulation/wine/wine-1.3.17.ebuild index 25046c796f33..1e03a31d026c 100644 --- a/app-emulation/wine/wine-1.3.17.ebuild +++ b/app-emulation/wine/wine-1.3.17.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.17.ebuild,v 1.16 2011/12/20 19:35:12 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.17.ebuild,v 1.17 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.msi || die - use win64 && { doins "${DISTDIR}"/wine_gecko-${GV}-x86_64.msi || die ; } + 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 diff --git a/app-emulation/wine/wine-1.3.18.ebuild b/app-emulation/wine/wine-1.3.18.ebuild index 69470ae4c648..2367a3aba2c7 100644 --- a/app-emulation/wine/wine-1.3.18.ebuild +++ b/app-emulation/wine/wine-1.3.18.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.18.ebuild,v 1.16 2011/12/20 19:35:12 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.18.ebuild,v 1.17 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.msi || die - use win64 && { doins "${DISTDIR}"/wine_gecko-${GV}-x86_64.msi || die ; } + 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 diff --git a/app-emulation/wine/wine-1.3.19.ebuild b/app-emulation/wine/wine-1.3.19.ebuild index 4fa4019bb864..afc33fa493a5 100644 --- a/app-emulation/wine/wine-1.3.19.ebuild +++ b/app-emulation/wine/wine-1.3.19.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.19.ebuild,v 1.15 2011/12/20 19:35:12 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.19.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.msi || die - use win64 && { doins "${DISTDIR}"/wine_gecko-${GV}-x86_64.msi || die ; } + 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 diff --git a/app-emulation/wine/wine-1.3.2.ebuild b/app-emulation/wine/wine-1.3.2.ebuild index 887bf8360e58..6e4c71b5b187 100644 --- a/app-emulation/wine/wine-1.3.2.ebuild +++ b/app-emulation/wine/wine-1.3.2.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.2.ebuild,v 1.18 2011/12/02 23:32:04 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.2.ebuild,v 1.19 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 hardened jack jpeg lcms ldap mp3 nas ncurses openal +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 hardened jack jpeg lcms ldap mp3 nas ncurses openal +opengl +oss +perl png samba scanner ssl test +threads +truetype v4l +win32 +win64 +X xcomposite xinerama xml" +REQUIRED_USE="elibc_glibc? ( threads )" RESTRICT="test" #72375 MLIB_DEPS="amd64? ( @@ -66,7 +67,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 ) opengl? ( virtual/opengl ) @@ -128,7 +128,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) \ @@ -156,7 +156,7 @@ do_configure() { $(use_with xml xslt) \ $2 - emake -j1 depend || die "depend" + emake -j1 depend popd >/dev/null } @@ -177,7 +177,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 } @@ -186,13 +186,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 diff --git a/app-emulation/wine/wine-1.3.20.ebuild b/app-emulation/wine/wine-1.3.20.ebuild index 7c5ff95bfea0..0a77d10eeef8 100644 --- a/app-emulation/wine/wine-1.3.20.ebuild +++ b/app-emulation/wine/wine-1.3.20.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.20.ebuild,v 1.14 2011/12/20 19:35:12 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.20.ebuild,v 1.15 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.msi || die - use win64 && { doins "${DISTDIR}"/wine_gecko-${GV}-x86_64.msi || die ; } + 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 diff --git a/app-emulation/wine/wine-1.3.21.ebuild b/app-emulation/wine/wine-1.3.21.ebuild index 8acd252052b0..f1b846cab6d8 100644 --- a/app-emulation/wine/wine-1.3.21.ebuild +++ b/app-emulation/wine/wine-1.3.21.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.21.ebuild,v 1.14 2011/12/20 19:35:12 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.21.ebuild,v 1.15 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.msi || die - use win64 && { doins "${DISTDIR}"/wine_gecko-${GV}-x86_64.msi || die ; } + 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 diff --git a/app-emulation/wine/wine-1.3.22.ebuild b/app-emulation/wine/wine-1.3.22.ebuild index 596ca088d0d4..986438cecf5b 100644 --- a/app-emulation/wine/wine-1.3.22.ebuild +++ b/app-emulation/wine/wine-1.3.22.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.22.ebuild,v 1.14 2011/12/20 19:35:12 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.22.ebuild,v 1.15 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.msi || die - use win64 && { doins "${DISTDIR}"/wine_gecko-${GV}-x86_64.msi || die ; } + 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 diff --git a/app-emulation/wine/wine-1.3.23.ebuild b/app-emulation/wine/wine-1.3.23.ebuild index fd38a3555814..142d035ea7e5 100644 --- a/app-emulation/wine/wine-1.3.23.ebuild +++ b/app-emulation/wine/wine-1.3.23.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.23.ebuild,v 1.14 2011/12/20 19:35:12 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.23.ebuild,v 1.15 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.msi || die - use win64 && { doins "${DISTDIR}"/wine_gecko-${GV}-x86_64.msi || die ; } + 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 diff --git a/app-emulation/wine/wine-1.3.24.ebuild b/app-emulation/wine/wine-1.3.24.ebuild index 0ec17512b8bc..cfcf19090970 100644 --- a/app-emulation/wine/wine-1.3.24.ebuild +++ b/app-emulation/wine/wine-1.3.24.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.24.ebuild,v 1.8 2011/12/20 19:35:12 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.24.ebuild,v 1.9 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.msi || die - use win64 && { doins "${DISTDIR}"/wine_gecko-${GV}-x86_64.msi || die ; } + 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 diff --git a/app-emulation/wine/wine-1.3.25.ebuild b/app-emulation/wine/wine-1.3.25.ebuild index fab35c23ee37..4116bf0ee602 100644 --- a/app-emulation/wine/wine-1.3.25.ebuild +++ b/app-emulation/wine/wine-1.3.25.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.25.ebuild,v 1.9 2011/12/20 19:35:12 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.25.ebuild,v 1.10 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 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 v4l +win32 +win64 +X xcomposite xinerama xml" +IUSE="alsa capi cups custom-cflags dbus 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 v4l +win32 +win64 +X xcomposite xinerama xml" +REQUIRED_USE="elibc_glibc? ( threads )" #286560 RESTRICT="test" #72375 MLIB_DEPS="amd64? ( @@ -156,7 +157,7 @@ do_configure() { $(use_with xml xslt) \ $2 - emake -j1 depend || die "depend" + emake -j1 depend popd >/dev/null } @@ -177,7 +178,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 } @@ -186,13 +187,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.msi || die - use win64 && { doins "${DISTDIR}"/wine_gecko-${GV}-x86_64.msi || die ; } + 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 diff --git a/app-emulation/wine/wine-1.3.26.ebuild b/app-emulation/wine/wine-1.3.26.ebuild index 64c9c90f5857..13908985289c 100644 --- a/app-emulation/wine/wine-1.3.26.ebuild +++ b/app-emulation/wine/wine-1.3.26.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.26.ebuild,v 1.9 2011/12/20 19:35:12 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.26.ebuild,v 1.10 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 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 v4l +win32 +win64 +X xcomposite xinerama xml" +IUSE="alsa capi cups custom-cflags dbus 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 v4l +win32 +win64 +X xcomposite xinerama xml" +REQUIRED_USE="elibc_glibc? ( threads )" #286560 RESTRICT="test" #72375 MLIB_DEPS="amd64? ( @@ -156,7 +157,7 @@ do_configure() { $(use_with xml xslt) \ $2 - emake -j1 depend || die "depend" + emake -j1 depend popd >/dev/null } @@ -177,7 +178,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 } @@ -186,13 +187,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.msi || die - use win64 && { doins "${DISTDIR}"/wine_gecko-${GV}-x86_64.msi || die ; } + 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 diff --git a/app-emulation/wine/wine-1.3.27.ebuild b/app-emulation/wine/wine-1.3.27.ebuild index c6121523a649..4cc41d2ee583 100644 --- a/app-emulation/wine/wine-1.3.27.ebuild +++ b/app-emulation/wine/wine-1.3.27.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.27.ebuild,v 1.5 2011/12/20 19:35:12 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.27.ebuild,v 1.6 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 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 v4l +win32 +win64 +X xcomposite xinerama xml" +IUSE="alsa capi cups custom-cflags dbus 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 v4l +win32 +win64 +X xcomposite xinerama xml" +REQUIRED_USE="elibc_glibc? ( threads )" #286560 RESTRICT="test" #72375 MLIB_DEPS="amd64? ( @@ -156,7 +157,7 @@ do_configure() { $(use_with xml xslt) \ $2 - emake -j1 depend || die "depend" + emake -j1 depend popd >/dev/null } @@ -177,7 +178,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 } @@ -186,13 +187,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.msi || die - use win64 && { doins "${DISTDIR}"/wine_gecko-${GV}-x86_64.msi || die ; } + 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 diff --git a/app-emulation/wine/wine-1.3.28.ebuild b/app-emulation/wine/wine-1.3.28.ebuild index 73cc1c92a4dd..02c022df4545 100644 --- a/app-emulation/wine/wine-1.3.28.ebuild +++ b/app-emulation/wine/wine-1.3.28.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.28.ebuild,v 1.4 2011/12/20 19:35:12 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.28.ebuild,v 1.5 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 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 v4l +win32 +win64 +X xcomposite xinerama xml" +IUSE="alsa capi cups custom-cflags dbus 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 v4l +win32 +win64 +X xcomposite xinerama xml" +REQUIRED_USE="elibc_glibc? ( threads )" #286560 RESTRICT="test" #72375 MLIB_DEPS="amd64? ( @@ -156,7 +157,7 @@ do_configure() { $(use_with xml xslt) \ $2 - emake -j1 depend || die "depend" + emake -j1 depend popd >/dev/null } @@ -177,7 +178,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 } @@ -186,13 +187,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.msi || die - use win64 && { doins "${DISTDIR}"/wine_gecko-${GV}-x86_64.msi || die ; } + 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 diff --git a/app-emulation/wine/wine-1.3.29.ebuild b/app-emulation/wine/wine-1.3.29.ebuild index 30ab296ddb94..e99fd7392821 100644 --- a/app-emulation/wine/wine-1.3.29.ebuild +++ b/app-emulation/wine/wine-1.3.29.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.29.ebuild,v 1.3 2011/12/20 19:35:12 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.29.ebuild,v 1.4 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 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 v4l +win32 +win64 +X xcomposite xinerama xml" +IUSE="alsa capi cups custom-cflags dbus 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 v4l +win32 +win64 +X xcomposite xinerama xml" +REQUIRED_USE="elibc_glibc? ( threads )" #286560 RESTRICT="test" #72375 MLIB_DEPS="amd64? ( @@ -156,7 +157,7 @@ do_configure() { $(use_with xml xslt) \ $2 - emake -j1 depend || die "depend" + emake -j1 depend popd >/dev/null } @@ -177,7 +178,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 } @@ -186,13 +187,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.msi || die - use win64 && { doins "${DISTDIR}"/wine_gecko-${GV}-x86_64.msi || die ; } + 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 diff --git a/app-emulation/wine/wine-1.3.3.ebuild b/app-emulation/wine/wine-1.3.3.ebuild index 9384c3fad075..0e0338f876fd 100644 --- a/app-emulation/wine/wine-1.3.3.ebuild +++ b/app-emulation/wine/wine-1.3.3.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.3.ebuild,v 1.15 2011/12/02 23:32:06 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.3.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 hardened jack jpeg lcms ldap mp3 nas ncurses openal +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 hardened jack jpeg lcms ldap mp3 nas ncurses openal +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? ( @@ -66,7 +67,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 ) opengl? ( virtual/opengl ) @@ -128,7 +128,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) \ @@ -156,7 +156,7 @@ do_configure() { $(use_with xml xslt) \ $2 - emake -j1 depend || die "depend" + emake -j1 depend popd >/dev/null } @@ -177,7 +177,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 } @@ -186,13 +186,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 diff --git a/app-emulation/wine/wine-1.3.30.ebuild b/app-emulation/wine/wine-1.3.30.ebuild index cd8140f5e32b..4ac895dcf86f 100644 --- a/app-emulation/wine/wine-1.3.30.ebuild +++ b/app-emulation/wine/wine-1.3.30.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.30.ebuild,v 1.3 2011/12/20 19:35:12 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.30.ebuild,v 1.4 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 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 v4l +win32 +win64 +X xcomposite xinerama xml" +IUSE="alsa capi cups custom-cflags dbus 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 v4l +win32 +win64 +X xcomposite xinerama xml" +REQUIRED_USE="elibc_glibc? ( threads )" #286560 RESTRICT="test" #72375 MLIB_DEPS="amd64? ( @@ -156,7 +157,7 @@ do_configure() { $(use_with xml xslt) \ $2 - emake -j1 depend || die "depend" + emake -j1 depend popd >/dev/null } @@ -177,7 +178,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 } @@ -186,13 +187,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.msi || die - use win64 && { doins "${DISTDIR}"/wine_gecko-${GV}-x86_64.msi || die ; } + 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 diff --git a/app-emulation/wine/wine-1.3.31.ebuild b/app-emulation/wine/wine-1.3.31.ebuild index 431cb4c25d9d..709c094acdaf 100644 --- a/app-emulation/wine/wine-1.3.31.ebuild +++ b/app-emulation/wine/wine-1.3.31.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.31.ebuild,v 1.3 2011/12/20 19:35:12 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.31.ebuild,v 1.4 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 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 v4l +win32 +win64 +X xcomposite xinerama xml" +IUSE="alsa capi cups custom-cflags dbus 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 v4l +win32 +win64 +X xcomposite xinerama xml" +REQUIRED_USE="elibc_glibc? ( threads )" #286560 RESTRICT="test" #72375 MLIB_DEPS="amd64? ( @@ -156,7 +157,7 @@ do_configure() { $(use_with xml xslt) \ $2 - emake -j1 depend || die "depend" + emake -j1 depend popd >/dev/null } @@ -177,7 +178,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 } @@ -186,13 +187,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.msi || die - use win64 && { doins "${DISTDIR}"/wine_gecko-${GV}-x86_64.msi || die ; } + 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 diff --git a/app-emulation/wine/wine-1.3.32.ebuild b/app-emulation/wine/wine-1.3.32.ebuild index 41f0acc961b0..16b879d21ded 100644 --- a/app-emulation/wine/wine-1.3.32.ebuild +++ b/app-emulation/wine/wine-1.3.32.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.32.ebuild,v 1.3 2011/12/20 19:35:12 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.32.ebuild,v 1.4 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 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 v4l +win32 +win64 +X xcomposite xinerama xml" +IUSE="alsa capi cups custom-cflags dbus 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 v4l +win32 +win64 +X xcomposite xinerama xml" +REQUIRED_USE="elibc_glibc? ( threads )" #286560 RESTRICT="test" #72375 MLIB_DEPS="amd64? ( @@ -156,7 +157,7 @@ do_configure() { $(use_with xml xslt) \ $2 - emake -j1 depend || die "depend" + emake -j1 depend popd >/dev/null } @@ -177,7 +178,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 } @@ -186,13 +187,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.msi || die - use win64 && { doins "${DISTDIR}"/wine_gecko-${GV}-x86_64.msi || die ; } + 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 diff --git a/app-emulation/wine/wine-1.3.33.ebuild b/app-emulation/wine/wine-1.3.33.ebuild index 9e5696a7cfa8..ca806ac8848b 100644 --- a/app-emulation/wine/wine-1.3.33.ebuild +++ b/app-emulation/wine/wine-1.3.33.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.33.ebuild,v 1.3 2011/12/20 19:35:12 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.33.ebuild,v 1.4 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 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 v4l +win32 +win64 +X xcomposite xinerama xml" +IUSE="alsa capi cups custom-cflags dbus 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 v4l +win32 +win64 +X xcomposite xinerama xml" +REQUIRED_USE="elibc_glibc? ( threads )" #286560 RESTRICT="test" #72375 MLIB_DEPS="amd64? ( @@ -156,7 +157,7 @@ do_configure() { $(use_with xml xslt) \ $2 - emake -j1 depend || die "depend" + emake -j1 depend popd >/dev/null } @@ -177,7 +178,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 } @@ -186,13 +187,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.msi || die - use win64 && { doins "${DISTDIR}"/wine_gecko-${GV}-x86_64.msi || die ; } + 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 diff --git a/app-emulation/wine/wine-1.3.34.ebuild b/app-emulation/wine/wine-1.3.34.ebuild index c005b60ab22a..4c3491467a09 100644 --- a/app-emulation/wine/wine-1.3.34.ebuild +++ b/app-emulation/wine/wine-1.3.34.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.34.ebuild,v 1.3 2011/12/20 19:35:12 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.34.ebuild,v 1.4 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 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 v4l +win32 +win64 +X xcomposite xinerama xml" +IUSE="alsa capi cups custom-cflags dbus 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 v4l +win32 +win64 +X xcomposite xinerama xml" +REQUIRED_USE="elibc_glibc? ( threads )" #286560 RESTRICT="test" #72375 MLIB_DEPS="amd64? ( @@ -156,7 +157,7 @@ do_configure() { $(use_with xml xslt) \ $2 - emake -j1 depend || die "depend" + emake -j1 depend popd >/dev/null } @@ -177,7 +178,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 } @@ -186,13 +187,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.msi || die - use win64 && { doins "${DISTDIR}"/wine_gecko-${GV}-x86_64.msi || die ; } + 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 diff --git a/app-emulation/wine/wine-1.3.35.ebuild b/app-emulation/wine/wine-1.3.35.ebuild index d75fb828ca0e..98e0cb518781 100644 --- a/app-emulation/wine/wine-1.3.35.ebuild +++ b/app-emulation/wine/wine-1.3.35.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.35.ebuild,v 1.2 2011/12/20 19:35:12 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.35.ebuild,v 1.3 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 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 v4l +win32 +win64 +X xcomposite xinerama xml" +IUSE="alsa capi cups custom-cflags dbus 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 v4l +win32 +win64 +X xcomposite xinerama xml" +REQUIRED_USE="elibc_glibc? ( threads )" #286560 RESTRICT="test" #72375 MLIB_DEPS="amd64? ( @@ -156,7 +157,7 @@ do_configure() { $(use_with xml xslt) \ $2 - emake -j1 depend || die "depend" + emake -j1 depend popd >/dev/null } @@ -177,7 +178,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 } @@ -186,13 +187,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.msi || die - use win64 && { doins "${DISTDIR}"/wine_gecko-${GV}-x86_64.msi || die ; } + 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 diff --git a/app-emulation/wine/wine-1.3.36.ebuild b/app-emulation/wine/wine-1.3.36.ebuild index fce65a5a6076..e3a08ea5c5ae 100644 --- a/app-emulation/wine/wine-1.3.36.ebuild +++ b/app-emulation/wine/wine-1.3.36.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.36.ebuild,v 1.1 2011/12/31 04:40:13 tetromino Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.36.ebuild,v 1.2 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 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" +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? ( @@ -160,10 +161,11 @@ do_configure() { $(use_with xml xslt) \ $2 - emake -j1 depend || die "depend" + emake -j1 depend popd >/dev/null } + src_configure() { export LDCONFIG=/bin/true use custom-cflags || strip-flags @@ -181,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 } @@ -190,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.msi || die - use win64 && { doins "${DISTDIR}"/wine_gecko-${GV}-x86_64.msi || die ; } + 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 diff --git a/app-emulation/wine/wine-1.3.4.ebuild b/app-emulation/wine/wine-1.3.4.ebuild index 8a3a19968b3c..6b9d7b64b170 100644 --- a/app-emulation/wine/wine-1.3.4.ebuild +++ b/app-emulation/wine/wine-1.3.4.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.4.ebuild,v 1.14 2011/12/02 23:32:04 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.4.ebuild,v 1.15 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 hardened jack jpeg lcms ldap mp3 nas ncurses openal +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 hardened jack jpeg lcms ldap mp3 nas ncurses openal +opengl +oss +perl png samba scanner ssl test +threads +truetype v4l +win32 +win64 +X xcomposite xinerama xml" +REQUIRED_USE="elibc_glibc? ( threads )" RESTRICT="test" #72375 MLIB_DEPS="amd64? ( @@ -66,7 +67,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 ) opengl? ( virtual/opengl ) @@ -128,7 +128,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) \ @@ -156,7 +156,7 @@ do_configure() { $(use_with xml xslt) \ $2 - emake -j1 depend || die "depend" + emake -j1 depend popd >/dev/null } @@ -177,7 +177,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 } @@ -186,13 +186,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 diff --git a/app-emulation/wine/wine-1.3.5.ebuild b/app-emulation/wine/wine-1.3.5.ebuild index dbe5b321e308..841bff1fcba9 100644 --- a/app-emulation/wine/wine-1.3.5.ebuild +++ b/app-emulation/wine/wine-1.3.5.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.5.ebuild,v 1.13 2011/12/02 23:32:04 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.5.ebuild,v 1.14 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 hardened jack jpeg lcms ldap mp3 nas ncurses openal +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 hardened jack jpeg lcms ldap mp3 nas ncurses openal +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? ( @@ -66,7 +67,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 ) opengl? ( virtual/opengl ) @@ -128,7 +128,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) \ @@ -156,7 +156,7 @@ do_configure() { $(use_with xml xslt) \ $2 - emake -j1 depend || die "depend" + emake -j1 depend popd >/dev/null } @@ -177,7 +177,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 } @@ -186,13 +186,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 diff --git a/app-emulation/wine/wine-1.3.6.ebuild b/app-emulation/wine/wine-1.3.6.ebuild index d3a69eabea6a..452105aac1b9 100644 --- a/app-emulation/wine/wine-1.3.6.ebuild +++ b/app-emulation/wine/wine-1.3.6.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.6.ebuild,v 1.13 2011/12/02 23:32:04 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.6.ebuild,v 1.14 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 openal +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 openal +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 ) opengl? ( virtual/opengl ) @@ -129,7 +129,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) \ @@ -158,7 +158,7 @@ do_configure() { $(use_with xml xslt) \ $2 - emake -j1 depend || die "depend" + emake -j1 depend popd >/dev/null } @@ -179,7 +179,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 } @@ -188,13 +188,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 diff --git a/app-emulation/wine/wine-1.3.7.ebuild b/app-emulation/wine/wine-1.3.7.ebuild index 31da4e5f016b..b8ce96ba995f 100644 --- a/app-emulation/wine/wine-1.3.7.ebuild +++ b/app-emulation/wine/wine-1.3.7.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.7.ebuild,v 1.12 2011/12/02 23:32:04 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.7.ebuild,v 1.13 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 openal +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 openal +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 ) opengl? ( virtual/opengl ) @@ -129,7 +129,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) \ @@ -158,7 +158,7 @@ do_configure() { $(use_with xml xslt) \ $2 - emake -j1 depend || die "depend" + emake -j1 depend popd >/dev/null } @@ -179,7 +179,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 } @@ -188,13 +188,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 diff --git a/app-emulation/wine/wine-1.3.8.ebuild b/app-emulation/wine/wine-1.3.8.ebuild index 8f77de7a0d1e..96a23b5336c9 100644 --- a/app-emulation/wine/wine-1.3.8.ebuild +++ b/app-emulation/wine/wine-1.3.8.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.8.ebuild,v 1.12 2011/12/02 23:32:04 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.8.ebuild,v 1.13 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 openal +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 openal +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 ) opengl? ( virtual/opengl ) @@ -129,7 +129,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) \ @@ -158,7 +158,7 @@ do_configure() { $(use_with xml xslt) \ $2 - emake -j1 depend || die "depend" + emake -j1 depend popd >/dev/null } @@ -179,7 +179,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 } @@ -188,13 +188,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 diff --git a/app-emulation/wine/wine-1.3.9.ebuild b/app-emulation/wine/wine-1.3.9.ebuild index 64ed3ca6e12b..b0d2543d899f 100644 --- a/app-emulation/wine/wine-1.3.9.ebuild +++ b/app-emulation/wine/wine-1.3.9.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.9.ebuild,v 1.17 2011/12/20 19:35:12 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.9.ebuild,v 1.18 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 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 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 ) @@ -130,7 +130,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) \ @@ -160,7 +160,7 @@ do_configure() { $(use_with xml xslt) \ $2 - emake -j1 depend || die "depend" + emake -j1 depend popd >/dev/null } @@ -181,7 +181,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 } @@ -190,13 +190,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 diff --git a/app-emulation/wine/wine-9999.ebuild b/app-emulation/wine/wine-9999.ebuild index adbd421a2ed0..4332d3bad60f 100644 --- a/app-emulation/wine/wine-9999.ebuild +++ b/app-emulation/wine/wine-9999.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-9999.ebuild,v 1.99 2011/12/31 06:42:09 tetromino Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-9999.ebuild,v 1.100 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 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" +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? ( @@ -160,10 +161,11 @@ do_configure() { $(use_with xml xslt) \ $2 - emake -j1 depend || die "depend" + emake -j1 depend popd >/dev/null } + src_configure() { export LDCONFIG=/bin/true use custom-cflags || strip-flags @@ -181,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 } @@ -190,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.msi || die - use win64 && { doins "${DISTDIR}"/wine_gecko-${GV}-x86_64.msi || die ; } + 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 |