diff options
| -rw-r--r-- | app-emulation/wine/ChangeLog | 7 | ||||
| -rw-r--r-- | app-emulation/wine/Manifest | 23 | ||||
| -rw-r--r-- | app-emulation/wine/wine-1.3.0.ebuild | 42 | ||||
| -rw-r--r-- | app-emulation/wine/wine-9999.ebuild | 42 |
4 files changed, 66 insertions, 48 deletions
diff --git a/app-emulation/wine/ChangeLog b/app-emulation/wine/ChangeLog index 449dfcdf95d5..b9ae7ccc648b 100644 --- a/app-emulation/wine/ChangeLog +++ b/app-emulation/wine/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-emulation/wine # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.319 2010/08/03 06:42:00 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.320 2010/08/03 18:43:25 vapier Exp $ + + 03 Aug 2010; Mike Frysinger <vapier@gentoo.org> wine-1.3.0.ebuild, + wine-9999.ebuild: + Add USE=pulseaudio to live versions and tweak multilib deps for USE="win32 + win64" #331001 by Sven. *wine-1.3.0 (03 Aug 2010) diff --git a/app-emulation/wine/Manifest b/app-emulation/wine/Manifest index 4d58d7371eb0..a54b2a0e24e6 100644 --- a/app-emulation/wine/Manifest +++ b/app-emulation/wine/Manifest @@ -52,11 +52,6 @@ DIST wine-1.1.6.tar.bz2 14544064 RMD160 57f57de84e815ed3db4e623d393e80572a4696eb DIST wine-1.1.7.tar.bz2 14623875 RMD160 77f4552f22850ee50602f095c777cd8f679cd231 SHA1 96fee7a5ba23688c5e951586e86639b6d3c6c8e5 SHA256 5c08d548b9d651dc7e88bd9dbb4a52b12d3e4a25eedd1d563ba2a361fe0542f2 DIST wine-1.1.8.tar.bz2 14665390 RMD160 13501a94f3eeeb8e75be25e4dc5c178414d473c3 SHA1 a01bea15352e4c9026109f8ba0cfe66e7167c3d6 SHA256 dbadd980d3ab1d3f188c5972c980312324aedf5681494732a45c0459b17d0c1e DIST wine-1.1.9.tar.bz2 14731804 RMD160 3a366c6b5c8f07d61d67b278000bbe0131fa7d99 SHA1 a9d5938b76198d244f0950e843dd4347661f4e74 SHA256 fed77069751d9a0d026b4f927672237cbd283971e08062932831cb800b3d1eca -DIST wine-1.2-rc1.tar.bz2 17183442 RMD160 1ec7d5d51ce346d678681da16f64f3a94344d02b SHA1 31ea3a75ea560cd486fb58825242ac0a6fc664ca SHA256 2b24f10862eda9803df4c6c1fb17a50da9d4916db2ea9caa56fb1cc10ab2af34 -DIST wine-1.2-rc2.tar.bz2 17158642 RMD160 53daa6202ee9b6c427f6c62c7875b1ec3bc8b594 SHA1 6952b5036f218e0be917184933cf0a252b8f8e86 SHA256 b1e193e46593611ed0e791fc914234fb4c0f73bbc3390314f228e849137ac918 -DIST wine-1.2-rc3.tar.bz2 17377977 RMD160 567031318fe77185c76029d6e65c062d62a933b3 SHA1 cfe848f76a0ea4983bb04b63008b63829f881703 SHA256 af1b19cf0285ce0b422a6356a71aa51166ccd0933295adfa985f25ca6c2ad7b0 -DIST wine-1.2-rc4.tar.bz2 17452041 RMD160 f01ce0e0ddb1428dbc4e7ea667a4b926072230f4 SHA1 808cdd4f8e2d29736393efc42e422f1bae2ca8e5 SHA256 620fcb8e8da0601e65c01206680145705f29599eac41d279d45e36e9ef60048a -DIST wine-1.2-rc5.tar.bz2 17521989 RMD160 2968c6ee533ebcb47d61197185b56b0f8275a232 SHA1 bdae575d50608ec1c0d932070a2a6f7c6c7819d9 SHA256 e76a17f383d99b1d11fc777caad25f03261abe66de1b113d1726f9a841eac08c DIST wine-1.2.tar.bz2 17543630 RMD160 57b8a89cc074e2fa490222eedfa21a9f7a3f6545 SHA1 dc37a32edb274167990ca7820f92c2d85962e37d SHA256 c388724e8f20a6e014a1f95662128a9f9c6ebc90137ca4afc623486c5a7d985f DIST wine-1.3.0.tar.bz2 17764429 RMD160 6ce5c89179f211e74e19dfab57f5a999ca225369 SHA1 955c8cbf6fe85de179e9b6c8bea9940363166e51 SHA256 b4c6edb68a255be39013ff30c330d838e6143786f1fc13ccf9edfd52f0ac5510 DIST wine_gecko-0.1.0.cab 5746895 RMD160 61f85ee39e96f88783541460d2fce31db7cc0183 SHA1 c16f1072dc6b0ced20935662138dcf019a38cd56 SHA256 4ef0bffa49a9abc86f74257aa8d7f5db806e8e8bd780149244149aa3f9292d10 @@ -68,7 +63,6 @@ DIST winepulse-0.35-configure.ac.patch 2826 RMD160 e419d43667be01af9b24a0e46822c DIST winepulse-0.35.patch 101893 RMD160 aea736dda7f64888c61d6c2344f5c030285bccd1 SHA1 ead7a77de53476cd65395ab9fe29ed71b7f4a782 SHA256 117efff86a8d0c50917f1e4d4b133df30c99bccfe4c007d38bda42587ea14c4f DIST winepulse-0.36-winecfg.patch 13060 RMD160 0d1dd1e43155e483996a2df8906b6fa218c78b58 SHA1 c4e606c5044d6f6c2fbfdf6fb0f1e1f3dfabd783 SHA256 6de2d09de1c6fb2dd82522632a2dceb8c9ddc9caaa83123b998512b7d0a4843f DIST winepulse-0.36.patch 101815 RMD160 9a20076436a7e49c317bc624dd71b61c93acddff SHA1 aa6a4c9d4619f8452aad8c457c879769cab8f8fc SHA256 7508b171bfecb461ecb464426cb4bcd9c3ff77645b787fcbf61e27dd34fe1b05 -DIST winepulse-0.37-winecfg.patch 13070 RMD160 3ce0825b49110c5a241a38253dd219eda808af5c SHA1 6b2d9bb0c9fcaa6b2d9c2d20afff4710d6ba35a7 SHA256 88309c2ddb7adef14d44ddb1275a49340db0816fc18e325bc6aec6b4453b69f6 DIST winepulse-0.38-winecfg.patch 13088 RMD160 e7aa8f91c20b6d706fc12e11677440f19890f4c7 SHA1 55b785636d2982f19e0634b26eafffbe46b79c60 SHA256 051ef1cb5598c319152ad28b85733927a711b45e0bfa92f0b0b2331588f5894e EBUILD wine-1.0.1.ebuild 3917 RMD160 e0a33a0e3e616ef7b19ee92a1a7ff096b3f03c6f SHA1 6c088534803f00c86c3ae96f68260b9f0298f183 SHA256 1943c78c27b86a08efcb152ee195289c9a6ba2715c7172033ee85bd39f1c0812 EBUILD wine-1.0.ebuild 3915 RMD160 ccfc74a5b4fca43d04058e9ef5b9d9eef87f2327 SHA1 8251ca43b455ae625df1f1695641dac3e7da6256 SHA256 608efce49d2d6866dce0894b48af38b2d4bf5a5e1477921d500113311aff2c10 @@ -118,19 +112,14 @@ EBUILD wine-1.1.7.ebuild 3949 RMD160 86cd90b5371d33f4da49f1be29a18b96153ff731 SH EBUILD wine-1.1.8.ebuild 3949 RMD160 f15eb40dc5032677d5e81967b1b8c457760e2d1f SHA1 f7eb82932af67073f656dbcee96105f45f877ee1 SHA256 10eae77eecb23da15079c268c3cdf14a0d71af4405866f0d52c157dd19e6e0f8 EBUILD wine-1.1.9.ebuild 3949 RMD160 0ab246600933e04c6316cd85ada3c882f6e72b7f SHA1 22e1aceac6158879cc3242612025987aad9792a5 SHA256 fa0d8060129b7c31d689d489f367f8508ca35f758c3fa022507ff5ae78cd4f94 EBUILD wine-1.2.ebuild 4999 RMD160 d31c8964752fcda5a4bcfcc5c6682d1e63612a86 SHA1 86cddd1c052915d8cccd0f5afaa6ec61b8ea0d51 SHA256 4bf6c532a8cffbb767f2b2d661ad53f3c3cd2073a4192b1e7268e2eaaaa85c78 -EBUILD wine-1.2_rc1.ebuild 5003 RMD160 4899fb51b129c19c6a9bbb729598b73f47eede16 SHA1 2fd25ac04a66db96cf9eeb44bb708bc485bdacb6 SHA256 14353f290ba0666c0f909f5adef08b4533ac87d02c36790a94ea81fae1bfdc5a -EBUILD wine-1.2_rc2.ebuild 5003 RMD160 c8297eafe5937a459a7a725bce8163fe6aeb512e SHA1 51943e4a263ce6028535907cc8758b445ee6374b SHA256 0983f2a899f048c9996b7052421d45a4ecb125a9741822235be56fc94651c902 -EBUILD wine-1.2_rc3.ebuild 5003 RMD160 fbb195f1d3747f19b4f2c0fbed378b97cca03f55 SHA1 37431ab543295f31f0a5998c6b4ba55ab69d3f1f SHA256 2f8aa79a322a7917b5123b8eab115495eccf41858fc0c4f3b057b497b3537453 -EBUILD wine-1.2_rc4.ebuild 5003 RMD160 941e9a116709c18d83889dd0761403eba2ce3b1e SHA1 5d42fa9b6608fa44e7966bbdeebde244a4453666 SHA256 ff82a39a1b96edd3f27f6aeb70984ed4164f8f164d0dfcc17d1a97223b2b069f -EBUILD wine-1.2_rc5.ebuild 5003 RMD160 9129bdcc9176d322c795521f90b73601208ae661 SHA1 9d7cc7516c3d8486a2f36a024b87efe9e5970380 SHA256 2ce914697a3d9e34703b5437403a10d2e76748c7533377b44131b385f72875ec -EBUILD wine-1.3.0.ebuild 5062 RMD160 8cc0a3397104e693d99e5d6c5507b92a71bca22d SHA1 524ec88d143ec52bc53a93b350109f4d950d4406 SHA256 d81d89d5efd486b82da12ecc40e56a200f711f22d3c978d9eb7c3c6d1daa2fc4 -EBUILD wine-9999.ebuild 5062 RMD160 58f3b4e739d459c43f538d9038485658e5d0c375 SHA1 8f9beef94b86ba7c124a2834a84b7eb1f5cbb904 SHA256 c65a474255983a1772a5e7f0ac2dc6dc4506b6859245859c9f6bf3e76fb6734a -MISC ChangeLog 60088 RMD160 f949e3aa10244c80eae9c4bfacf66e03c3578d38 SHA1 709a3006849290fd5a5cb440fdad71366bb32f4e SHA256 edaab7d090c08ed112542519526d2d52c022b7af6e62d2f5a5cf13803b104c8d +EBUILD wine-1.3.0.ebuild 5539 RMD160 c48f20e6a8060f462dd6282d85d1a046aa5666da SHA1 8123b9ae562677b798e6e6dfb8895b68117f5192 SHA256 7df36e054ce115f2a52ebb69845e0dc3b6b659f073901ac2df0e7cf12956005d +EBUILD wine-9999.ebuild 5539 RMD160 02964948225ac4f0e7b4b47978b91567edd31197 SHA1 5aa8d88305084971a8df10ad36bba518b838a11d SHA256 53af6a7ac33675cdbb820908468c9e342a9f712aba0a1531c382440a0701ef82 +MISC ChangeLog 60281 RMD160 df4539aa873b13dcb68434580df984d4855290e9 SHA1 1a4b9de9dcd7c7b25d3c44bc4cced4b3f0ec64e8 SHA256 a5bff6d45fa409ac5b09e033d6356530e6364405d2454da5c679f30190bba2ac MISC metadata.xml 1417 RMD160 6956a69da8c1a72542e91d63b9e194247df3b781 SHA1 0a050a0047bbd4d750b57600b6f608c7411a7d0b SHA256 dc1c6fda02c66f6edf0b3095b1edc57e3730eece0b7eb4d15e67e0daa1bc9c50 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.15 (GNU/Linux) -iF4EAREIAAYFAkxXukwACgkQTwhj9JtAlp4GhgD7BKSVLuyXqLJHIx1eOiCAx2kz -KfuLU3knsCM7+sCqdx4BAJuc/qls20NbrOvnVk28dNslJMqT8FggtVFe4tM8QJgM -=lYGF +iF4EAREIAAYFAkxYY2YACgkQTwhj9JtAlp78MAD9Hc9FzRoB30Z6no2uDbf5PGXr +d31DyU2t4dr2G539BRgBAIkDttjjLnocdu/RAk4fXtcIPPgXSxp2uVnf973A7z+J +=5tbA -----END PGP SIGNATURE----- diff --git a/app-emulation/wine/wine-1.3.0.ebuild b/app-emulation/wine/wine-1.3.0.ebuild index 860c900d1dd4..0d2def033ec7 100644 --- a/app-emulation/wine/wine-1.3.0.ebuild +++ b/app-emulation/wine/wine-1.3.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 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.1 2010/08/03 06:42:00 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.0.ebuild,v 1.2 2010/08/03 18:43:25 vapier Exp $ EAPI="2" @@ -8,27 +8,42 @@ inherit eutils flag-o-matic multilib if [[ ${PV} == "9999" ]] ; then EGIT_REPO_URI="git://source.winehq.org/git/wine.git" - inherit git + inherit git autotools SRC_URI="" #KEYWORDS="" else + AUTOTOOLS_AUTO_DEPEND="no" + inherit autotools MY_P="${PN}-${PV/_/-}" SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2" KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd" S=${WORKDIR}/${MY_P} fi +pulse_patches() { echo "$1"/winepulse-{0.36,0.35-configure.ac,0.38-winecfg}.patch ; } GV="1.0.0-x86" DESCRIPTION="free implementation of Windows(tm) on Unix" HOMEPAGE="http://www.winehq.org/" SRC_URI="${SRC_URI} - gecko? ( mirror://sourceforge/wine/wine_gecko-${GV}.cab )" + gecko? ( mirror://sourceforge/wine/wine_gecko-${GV}.cab ) + pulseaudio? ( `pulse_patches http://art.ified.ca/downloads/winepulse` )" LICENSE="LGPL-2.1" SLOT="0" -IUSE="alsa capi cups custom-cflags dbus esd fontconfig +gecko gnutls gphoto2 gsm hal jack jpeg lcms ldap mp3 nas ncurses openal +opengl +oss +perl png samba scanner ssl test +threads +truetype +win32 +win64 +X xcomposite xinerama xml" +IUSE="alsa capi cups custom-cflags dbus esd fontconfig +gecko gnutls gphoto2 gsm hal jack jpeg lcms ldap mp3 nas ncurses openal +opengl +oss +perl png pulseaudio samba scanner ssl test +threads +truetype +win32 +win64 +X xcomposite xinerama xml" RESTRICT="test" #72375 +MLIB_DEPS="amd64? ( + truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) + X? ( + >=app-emulation/emul-linux-x86-xlibs-2.1 + >=app-emulation/emul-linux-x86-soundlibs-2.1 + ) + openal? ( app-emulation/emul-linux-x86-sdl ) + opengl? ( app-emulation/emul-linux-x86-opengl ) + app-emulation/emul-linux-x86-baselibs + >=sys-kernel/linux-headers-2.6 + )" RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) perl? ( dev-lang/perl dev-perl/XML-Simple ) capi? ( net-dialup/capi4k-utils ) @@ -54,6 +69,7 @@ RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) nas? ( media-libs/nas ) cups? ( net-print/cups ) opengl? ( virtual/opengl ) + pulseaudio? ( media-sound/pulseaudio ${AUTOTOOLS_DEPEND} ) gsm? ( media-sound/gsm ) jpeg? ( media-libs/jpeg ) ldap? ( net-nds/openldap ) @@ -64,17 +80,8 @@ RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) - !win64? ( amd64? ( - truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) - X? ( - >=app-emulation/emul-linux-x86-xlibs-2.1 - >=app-emulation/emul-linux-x86-soundlibs-2.1 - ) - openal? ( app-emulation/emul-linux-x86-sdl ) - opengl? ( app-emulation/emul-linux-x86-opengl ) - app-emulation/emul-linux-x86-baselibs - >=sys-kernel/linux-headers-2.6 - ) ) + !win64? ( ${MLIB_DEPS} ) + win32? ( ${MLIB_DEPS} ) xcomposite? ( x11-libs/libXcomposite ) " DEPEND="${RDEPEND} X? ( @@ -99,6 +106,10 @@ src_unpack() { } src_prepare() { + if use pulseaudio ; then + EPATCH_OPTS=-p1 epatch `pulse_patches "${DISTDIR}"` + eautoreconf + fi epatch "${FILESDIR}"/${PN}-1.1.15-winegcc.patch #260726 epatch_user #282735 sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die @@ -135,6 +146,7 @@ do_configure() { $(use_with oss) \ $(use_with png) \ $(use_with threads pthread) \ + $(use pulseaudio && use_with pulseaudio pulse) \ $(use_with scanner sane) \ $(use_enable test tests) \ $(use_with truetype freetype) \ diff --git a/app-emulation/wine/wine-9999.ebuild b/app-emulation/wine/wine-9999.ebuild index 5c56cc98035a..185d987f618e 100644 --- a/app-emulation/wine/wine-9999.ebuild +++ b/app-emulation/wine/wine-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 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.56 2010/07/24 04:42:23 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-9999.ebuild,v 1.57 2010/08/03 18:43:25 vapier Exp $ EAPI="2" @@ -8,27 +8,42 @@ inherit eutils flag-o-matic multilib if [[ ${PV} == "9999" ]] ; then EGIT_REPO_URI="git://source.winehq.org/git/wine.git" - inherit git + inherit git autotools SRC_URI="" #KEYWORDS="" else + AUTOTOOLS_AUTO_DEPEND="no" + inherit autotools MY_P="${PN}-${PV/_/-}" SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2" KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd" S=${WORKDIR}/${MY_P} fi +pulse_patches() { echo "$1"/winepulse-{0.36,0.35-configure.ac,0.38-winecfg}.patch ; } GV="1.0.0-x86" DESCRIPTION="free implementation of Windows(tm) on Unix" HOMEPAGE="http://www.winehq.org/" SRC_URI="${SRC_URI} - gecko? ( mirror://sourceforge/wine/wine_gecko-${GV}.cab )" + gecko? ( mirror://sourceforge/wine/wine_gecko-${GV}.cab ) + pulseaudio? ( `pulse_patches http://art.ified.ca/downloads/winepulse` )" LICENSE="LGPL-2.1" SLOT="0" -IUSE="alsa capi cups custom-cflags dbus esd fontconfig +gecko gnutls gphoto2 gsm hal jack jpeg lcms ldap mp3 nas ncurses openal +opengl +oss +perl png samba scanner ssl test +threads +truetype +win32 +win64 +X xcomposite xinerama xml" +IUSE="alsa capi cups custom-cflags dbus esd fontconfig +gecko gnutls gphoto2 gsm hal jack jpeg lcms ldap mp3 nas ncurses openal +opengl +oss +perl png pulseaudio samba scanner ssl test +threads +truetype +win32 +win64 +X xcomposite xinerama xml" RESTRICT="test" #72375 +MLIB_DEPS="amd64? ( + truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) + X? ( + >=app-emulation/emul-linux-x86-xlibs-2.1 + >=app-emulation/emul-linux-x86-soundlibs-2.1 + ) + openal? ( app-emulation/emul-linux-x86-sdl ) + opengl? ( app-emulation/emul-linux-x86-opengl ) + app-emulation/emul-linux-x86-baselibs + >=sys-kernel/linux-headers-2.6 + )" RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) perl? ( dev-lang/perl dev-perl/XML-Simple ) capi? ( net-dialup/capi4k-utils ) @@ -54,6 +69,7 @@ RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) nas? ( media-libs/nas ) cups? ( net-print/cups ) opengl? ( virtual/opengl ) + pulseaudio? ( media-sound/pulseaudio ${AUTOTOOLS_DEPEND} ) gsm? ( media-sound/gsm ) jpeg? ( media-libs/jpeg ) ldap? ( net-nds/openldap ) @@ -64,17 +80,8 @@ RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) - !win64? ( amd64? ( - truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) - X? ( - >=app-emulation/emul-linux-x86-xlibs-2.1 - >=app-emulation/emul-linux-x86-soundlibs-2.1 - ) - openal? ( app-emulation/emul-linux-x86-sdl ) - opengl? ( app-emulation/emul-linux-x86-opengl ) - app-emulation/emul-linux-x86-baselibs - >=sys-kernel/linux-headers-2.6 - ) ) + !win64? ( ${MLIB_DEPS} ) + win32? ( ${MLIB_DEPS} ) xcomposite? ( x11-libs/libXcomposite ) " DEPEND="${RDEPEND} X? ( @@ -99,6 +106,10 @@ src_unpack() { } src_prepare() { + if use pulseaudio ; then + EPATCH_OPTS=-p1 epatch `pulse_patches "${DISTDIR}"` + eautoreconf + fi epatch "${FILESDIR}"/${PN}-1.1.15-winegcc.patch #260726 epatch_user #282735 sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die @@ -135,6 +146,7 @@ do_configure() { $(use_with oss) \ $(use_with png) \ $(use_with threads pthread) \ + $(use pulseaudio && use_with pulseaudio pulse) \ $(use_with scanner sane) \ $(use_enable test tests) \ $(use_with truetype freetype) \ |