Version bump #349641 by Emulatorman. Also update pulseaudio patches.

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

5 files changed, 439 insertions, 15 deletions

diff --git a/app-emulation/wine/ChangeLog b/app-emulation/wine/ChangeLog
index 9fc0c57d8ded..edf0b210cca3 100644
--- a/app-emulation/wine/ChangeLog
+++ b/app-emulation/wine/ChangeLog
@@ -1,6 +1,13 @@
 # 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.340 2010/12/02 21:47:09 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.341 2010/12/25 00:17:58 vapier Exp $
+
+*wine-1.3.10 (25 Dec 2010)
+*wine-1.3.9 (25 Dec 2010)
+
+  25 Dec 2010; Mike Frysinger <vapier@gentoo.org> +wine-1.3.9.ebuild,
+  +wine-1.3.10.ebuild, wine-9999.ebuild:
+  Version bump #349641 by Emulatorman. Also update pulseaudio patches.
 
 *wine-1.3.8 (02 Dec 2010)
 
diff --git a/app-emulation/wine/Manifest b/app-emulation/wine/Manifest
index d0aeaead8121..d2b4f13cfa32 100644
--- a/app-emulation/wine/Manifest
+++ b/app-emulation/wine/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX wine-1.1.15-configure-host.patch 314 RMD160 1c8d09d5265a23b1931eba949a614eaeff251ac7 SHA1 af887b963cf154e8bcf1e9b8b19731bbdda5f487 SHA256 c281217f6e221a6235485918750907b02aa1e40fa68e45133cc4c14ebb40bfe9
 AUX wine-1.1.15-winegcc.patch 1556 RMD160 ca7e0df0a45507e7d31ed81c5712111b83ed9bfa SHA1 4b155fe7cb5e831b7f92757d52aa1ab12569b232 SHA256 dbd89db561d7583faf317d795b8c11231575d885e21c6414add39079604dbd0d
 AUX wine-gentoo-no-ssp.patch 532 RMD160 fd5de0dd965ec58aa53f0ec1fb74ce7cd498a24e SHA1 6fc776bd96438c65a44a03c8adb3fedb0aaa70bf SHA256 6408ae3ed9bacc895677a5b2302bc27afc549ea99f54a9ab4594afb34c629e9e
@@ -8,6 +5,7 @@ DIST wine-1.2.1.tar.bz2 17629106 RMD160 8652ac4f7c4fd2b3da22a840706b3adcb9901467
 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-1.3.1.tar.bz2 17871968 RMD160 e4e62e7b063a467df88a2644841fa8db192bcb70 SHA1 f2e88dd990c553a434b9156c8bfd90583d27c0b8 SHA256 bd9c088c56ce431a2a9d8cf098b837edfb1f0d4bcfe182c03f366cf84e2cf0ae
+DIST wine-1.3.10.tar.bz2 18366433 RMD160 c897d5b55febca451db42de7ca4d020ff08acd69 SHA1 90de64bb15cdb83aac3af9258a95730a114030ed SHA256 f7a2c0565ba7fd765f9498cf023ffb75c96caa999ae25ae16416eb09899b5038
 DIST wine-1.3.2.tar.bz2 17906953 RMD160 dfb03ab39e9b01a182c2751be955ae56bdb852e7 SHA1 876043a93aa834f926a26235b34e72364bc9876e SHA256 eacefbc88bd2b7d3c934239809ba1df8076f455823c3dfd54f9f5892385161c5
 DIST wine-1.3.3.tar.bz2 18043631 RMD160 af7044275f62cd81f9491af0639c3868e163693f SHA1 b19455987f0a71adf691046898a1ca6b3ed7d155 SHA256 455b6ec2f881f54d89d3e6dd9d04318a9eeb3c40f8c66b53e5bf73fc4765fcce
 DIST wine-1.3.4.tar.bz2 18079846 RMD160 ebbbf31aac547ee25ecf6c0171e29ae312c853d8 SHA1 7dbb1716cf83b61232f64bcc25e7e2d109321e49 SHA256 449387f5672cc535548740eef90403afd5d3cd678d3686bccf62813958825fdc
@@ -15,6 +13,7 @@ DIST wine-1.3.5.tar.bz2 18175097 RMD160 026114f86f87abab1cd962b0bcef8ab6f345e8fc
 DIST wine-1.3.6.tar.bz2 18243096 RMD160 d1f9f1dade12f878e90fa01f5a59cc13056d8b06 SHA1 247a416b608fc317bce9fe0644a3103c8abf97d6 SHA256 9a4b7b9d8358b81bb32ed376e817ae86a531bce39663537a1f77d4b4cfa44d27
 DIST wine-1.3.7.tar.bz2 18379692 RMD160 316535442fc2f29d30a2952ff612cc70ae9f19c9 SHA1 3f46e6d73e4917d13fbc102e6f35aba9b9412a40 SHA256 13cf54ec8b83d49abd6888b543ab359661d70af9df3e30ab70d7e54b6b5cd025
 DIST wine-1.3.8.tar.bz2 18315298 RMD160 1b579d124523fe4698431c8de11f4cdfa3034821 SHA1 d36e7d8c0d8d5e2f86d47b175e197e9623660495 SHA256 6eebf60c143cbe4328a8566331a6b887cf8612000f051e55d4b9d99e6a17bfdb
+DIST wine-1.3.9.tar.bz2 18378516 RMD160 07803597faf46e9ac748560642a537b56dd1a845 SHA1 68f2172b3cd7674e0f7bb746eae065a7b542db9f SHA256 a920b0805814d53435fdc575efe618b39c2b18d30af416f80d2fb4763d2587fa
 DIST wine_gecko-1.0.0-x86.cab 8119486 RMD160 57618dbffa7b7226dcd44f86c3c569ab8a5ff938 SHA1 afa22c52bca4ca77dcb9edb3c9936eb23793de01 SHA256 7ddf697677506fb164c52771864e32dd69a359ed855b2efbc51340de2376c99c
 DIST wine_gecko-1.1.0-x86.cab 8868851 RMD160 1867734d6ab35f4e66f717789832e69aac06e93b SHA1 1b6c637207b6f032ae8a52841db9659433482714 SHA256 1786e1fd38a0361a3956864f74ebac20452c012316f296ad8d86840e31be0b29
 DIST wine_gecko-1.1.0-x86_64.cab 8940997 RMD160 76364b01b6756db79989feea9de14aeec4ba4675 SHA1 55b4b60cd2a48631d6236fb411c3a94d806d9906 SHA256 b8bea5b6400d191c05b2295c79285309fe331283648457bed48f7e2387773b7a
@@ -23,10 +22,12 @@ DIST winepulse-0.36.patch 101815 RMD160 9a20076436a7e49c317bc624dd71b61c93acddff
 DIST winepulse-0.38-winecfg.patch 13088 RMD160 e7aa8f91c20b6d706fc12e11677440f19890f4c7 SHA1 55b785636d2982f19e0634b26eafffbe46b79c60 SHA256 051ef1cb5598c319152ad28b85733927a711b45e0bfa92f0b0b2331588f5894e
 DIST winepulse-0.39-configure.ac.patch 2795 RMD160 ff5b0d3c766eebe25d56919499f8856d9c85c6db SHA1 2b8eb3dcfc5ecfb54eefd1a661c2a92f5af32f68 SHA256 0cfe6eaa1bb94d15ed9ba59bc1c2197dc99b31519de1bb0d911a5abed7b21657
 DIST winepulse-0.39.patch 102058 RMD160 a7d662dfe043f9b57a16bee6c4002c065943a8a0 SHA1 0896028c7092836a684b4f446694bc1bdfd4bfb3 SHA256 13691f6caf9372d9a1613f92aff67d7efe6930b2866fe90af6fb017608810e2b
+DIST winepulse-0.40-configure.ac.patch 2574 RMD160 8b9b9afb42ce7a19dee50409fffacfbafba213db SHA1 a007a7fb526572d265e8a1ff45b35fa7341ddbcf SHA256 0b37dca095200e60ffc18754131b0cc70e395da440835feccafc5c5ab9b40d65
 EBUILD wine-1.2.1.ebuild 5536 RMD160 99fdafdf934ea1239f84d7c0c94be81647e9a233 SHA1 e910121ce9533be9a6e4120e936b910108d0ed07 SHA256 1dcc12e3ce7eae192636e97bdbbeff17f3a9aa4c715d6c1e0704b8aee0ea51dc
 EBUILD wine-1.2.ebuild 4997 RMD160 a5ba7b4731f6b3533934329478c2b41eb791e47d SHA1 bed521201b392e858b95006c62b71b5ea61faa69 SHA256 0cb78756056d7a410cc935c727f2457245bdaba4907eb775fbb060fd68484272
 EBUILD wine-1.3.0.ebuild 5539 RMD160 56ef4baa960ed9592a76cf9854646ac9515fb5b4 SHA1 78aa824c6fe17400c35904621edfbff18832a2cc SHA256 e016158a7be074e10de3433ced2ed81d53ed4103af3521f89851c65064fb04b8
 EBUILD wine-1.3.1.ebuild 5539 RMD160 16d0457c41243abe611c44b563a8d100dbb85c34 SHA1 d9fd658703a88d279a5ffb59dcb43e95c2c6d7bb SHA256 6383ee6a7012c61edf012a370bbe6ba85011723123e7a92a4cae34bd5280cb13
+EBUILD wine-1.3.10.ebuild 5787 RMD160 78c283967b3fb2dcbef807786b14abc7bfcb7c79 SHA1 0413430a2d8ab51793c78fbd2ed2b48b023f3d00 SHA256 909ae36f01e1f18b72606bc02d9081c6defdd55aa152f513aac7125d4a8e6ace
 EBUILD wine-1.3.2.ebuild 5688 RMD160 2e4d32456a4eb96ea1f1824a7ccee1c2adcdf7e8 SHA1 65012e5a4135d57750af34e1fe82dac1dffa2b56 SHA256 89fd9f17719c9907e53b94bb4bb361e17fac0a9cb8ca6b5ccbd78335d1ef6a30
 EBUILD wine-1.3.3.ebuild 5688 RMD160 cf9b269c302f56321898af275e72d6c170a6c92c SHA1 891525b3a8abcdfdccea9005edde34ef6ae457ae SHA256 295a7033ab1baba5137752ccfaeafaa0818d0f401c65507650011e60c005a9bc
 EBUILD wine-1.3.4.ebuild 5688 RMD160 1a98f376eb42ee7ba36297a593c7624eb03183f3 SHA1 726e434a132576c9a3cfc79f2eeb69d82d2267fa SHA256 5574c644c439faf8de78c4ff3e220e38d77e37fb7df25ff25a8aabdb0f6d0c86
@@ -34,13 +35,7 @@ EBUILD wine-1.3.5.ebuild 5688 RMD160 38eb335deb7faee7db1f9e6d4947882227c229c9 SH
 EBUILD wine-1.3.6.ebuild 5786 RMD160 200db3a989f398fe202ccf4427ceecce09dbb55a SHA1 b8fb530dc15734e403204819ed931ca3a0a46522 SHA256 5f30031053cface2eaa332ee2f85df9f05c25319cbfb8a94f472266e46dd4605
 EBUILD wine-1.3.7.ebuild 5786 RMD160 3e7ec67f45f4e28e025880098f4fba1bcf035888 SHA1 2f8ae6975a1dd5cedccf012a3ce6433572670656 SHA256 8157acf36476415259e30ea41b4e7ede21fbcb1f84649cbc2e18f96ddc75cced
 EBUILD wine-1.3.8.ebuild 5786 RMD160 9b1f30703ec8eff7d3ca409db8045e48ec79f971 SHA1 3696bb862d629a426d997b9dad45348df72e671f SHA256 45686314f94cbda44d4b1f7f9ff655c77433db7afcee7024a13ab724ea312c84
-EBUILD wine-9999.ebuild 5786 RMD160 c19e91a2ac54c57742b1838fc1ab89236dc76f69 SHA1 e40d66e6b86f51600984121a0e9744edef3efeb7 SHA256 31c605fc7ef7d332e66a52698b057d32884658ec322c9aaa610e80f6cc84cf49
-MISC ChangeLog 65646 RMD160 fae6bf476b1265d5ae31c6cfc6c7cf9882489b3f SHA1 0e924f687891e25c81acfc3ec2a33807a03c8cb8 SHA256 9dd0d75dc7a50a9226acd89aa145bf0d835b4528052df0c9fb0664e435781817
+EBUILD wine-1.3.9.ebuild 5786 RMD160 99dc0463e46a1f686814bf8303d9a3c9a131b0b8 SHA1 fcbd550805a32a780c9b9d7dc93c1dbb24d85ae7 SHA256 273d037b67ec7f2ea769fcbd15599ad019542a406102698a670f36ae26160cf7
+EBUILD wine-9999.ebuild 5786 RMD160 e9b017b75b75454f76a7f99ec79a6a08712132ea SHA1 53002d0a780ba1293c1d2f7bb31ef154c854535d SHA256 c196749d597c13821ddfab87e75a64d03956b0a1218ea605c80f92cf95cd10cd
+MISC ChangeLog 65883 RMD160 729f8446207e36e0ff65c6084155bc7dff6f31e0 SHA1 d1187ba8737779a0aa6db31c87d1c1dc837e0e70 SHA256 b47afe75a2ca75fbd8777240ab5464910c66c0838404b9fff4f6d1316edd6410
 MISC metadata.xml 1417 RMD160 6956a69da8c1a72542e91d63b9e194247df3b781 SHA1 0a050a0047bbd4d750b57600b6f608c7411a7d0b SHA256 dc1c6fda02c66f6edf0b3095b1edc57e3730eece0b7eb4d15e67e0daa1bc9c50
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
-
-iF4EAREIAAYFAkz4Er8ACgkQTwhj9JtAlp6IIgEArvKG/iRBp4xxoGleMfM1YjRB
-qblPH+YOG3WQysiwnNYBAMn89uOZtM6LhomSfErTAsZYS/gtLq6XM24LIme4h/Ut
-=Pcra
------END PGP SIGNATURE-----
diff --git a/app-emulation/wine/wine-1.3.10.ebuild b/app-emulation/wine/wine-1.3.10.ebuild
new file mode 100644
index 000000000000..f349a7e1b29d
--- /dev/null
+++ b/app-emulation/wine/wine-1.3.10.ebuild
@@ -0,0 +1,211 @@
+# 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.10.ebuild,v 1.1 2010/12/25 00:17:58 vapier Exp $
+
+EAPI="2"
+
+inherit eutils flag-o-matic multilib
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="git://source.winehq.org/git/wine.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.39,0.40-configure.ac,0.38-winecfg}.patch ; }
+GV="1.1.0"
+DESCRIPTION="free implementation of Windows(tm) on Unix"
+HOMEPAGE="http://www.winehq.org/"
+SRC_URI="${SRC_URI}
+	gecko? (
+		mirror://sourceforge/wine/wine_gecko-${GV}-x86.cab
+		win64? ( mirror://sourceforge/wine/wine_gecko-${GV}-x86_64.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 gstreamer 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 )
+	ncurses? ( >=sys-libs/ncurses-5.2 )
+	fontconfig? ( media-libs/fontconfig )
+	gphoto2? ( media-libs/libgphoto2 )
+	jack? ( media-sound/jack-audio-connection-kit )
+	openal? ( media-libs/openal )
+	dbus? ( sys-apps/dbus )
+	gnutls? ( net-libs/gnutls )
+	gstreamer? ( media-libs/gstreamer media-libs/gst-plugins-base )
+	hal? ( sys-apps/hal )
+	X? (
+		x11-libs/libXcursor
+		x11-libs/libXrandr
+		x11-libs/libXi
+		x11-libs/libXmu
+		x11-libs/libXxf86vm
+		x11-apps/xmessage
+	)
+	xinerama? ( x11-libs/libXinerama )
+	alsa? ( media-libs/alsa-lib )
+	esd? ( media-sound/esound )
+	nas? ( media-libs/nas )
+	cups? ( net-print/cups )
+	opengl? ( virtual/opengl )
+	pulseaudio? ( media-sound/pulseaudio ${AUTOTOOLS_DEPEND} )
+	gsm? ( media-sound/gsm )
+	jpeg? ( virtual/jpeg )
+	ldap? ( net-nds/openldap )
+	lcms? ( =media-libs/lcms-1* )
+	mp3? ( >=media-sound/mpg123-1.5.0 )
+	samba? ( >=net-fs/samba-3.0.25 )
+	xml? ( dev-libs/libxml2 dev-libs/libxslt )
+	scanner? ( media-gfx/sane-backends )
+	ssl? ( dev-libs/openssl )
+	png? ( media-libs/libpng )
+	!win64? ( ${MLIB_DEPS} )
+	win32? ( ${MLIB_DEPS} )
+	xcomposite? ( x11-libs/libXcomposite ) "
+DEPEND="${RDEPEND}
+	X? (
+		x11-proto/inputproto
+		x11-proto/xextproto
+		x11-proto/xf86vidmodeproto
+	)
+	xinerama? ( x11-proto/xineramaproto )
+	sys-devel/bison
+	sys-devel/flex"
+
+src_unpack() {
+	if use win64 ; then
+		[[ $(( $(gcc-major-version) * 100 + $(gcc-minor-version) )) -lt 404 ]] \
+			&& die "you need gcc-4.4+ to build 64bit wine"
+	fi
+
+	if [[ ${PV} == "9999" ]] ; then
+		git_src_unpack
+	else
+		unpack ${MY_P}.tar.bz2
+	fi
+}
+
+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
+	sed -i '/^MimeType/d' tools/wine.desktop || die #117785
+}
+
+do_configure() {
+	local builddir="${WORKDIR}/wine$1"
+	mkdir -p "${builddir}"
+	pushd "${builddir}" >/dev/null
+
+	ECONF_SOURCE=${S} \
+	econf \
+		--sysconfdir=/etc/wine \
+		$(use_with alsa) \
+		$(use_with capi) \
+		$(use_with lcms cms) \
+		$(use_with cups) \
+		$(use_with ncurses curses) \
+		$(use_with esd) \
+		$(use_with fontconfig) \
+		$(use_with gnutls) \
+		$(use_with gphoto2 gphoto) \
+		$(use_with gsm) \
+		$(use_with gstreamer) \
+		$(! use dbus && echo --without-hal || use_with hal) \
+		$(use_with jack) \
+		$(use_with jpeg) \
+		$(use_with ldap) \
+		$(use_with mp3 mpg123) \
+		$(use_with nas) \
+		$(use_with openal) \
+		$(use_with opengl) \
+		$(use_with ssl openssl) \
+		$(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) \
+		$(use_with X x) \
+		$(use_with xcomposite) \
+		$(use_with xinerama) \
+		$(use_with xml) \
+		$(use_with xml xslt) \
+		$2
+
+	emake -j1 depend || die "depend"
+
+	popd >/dev/null
+}
+src_configure() {
+	export LDCONFIG=/bin/true
+	use custom-cflags || strip-flags
+
+	if use win64 ; then
+		do_configure 64 --enable-win64
+		use win32 && ABI=x86 do_configure 32 --with-wine64=../wine64
+	else
+		ABI=x86 do_configure 32 --disable-win64
+	fi
+}
+
+src_compile() {
+	local b
+	for b in 64 32 ; do
+		local builddir="${WORKDIR}/wine${b}"
+		[[ -d ${builddir} ]] || continue
+		emake -C "${builddir}" all || die
+	done
+}
+
+src_install() {
+	local b
+	for b in 64 32 ; do
+		local builddir="${WORKDIR}/wine${b}"
+		[[ -d ${builddir} ]] || continue
+		emake -C "${builddir}" install DESTDIR="${D}" || die
+	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 ; }
+	fi
+	if ! use perl ; then
+		rm "${D}"/usr/bin/{wine{dump,maker},function_grep.pl} "${D}"/usr/share/man/man1/wine{dump,maker}.1 || die
+	fi
+}
+
+pkg_postinst() {
+	paxctl -psmr "${ROOT}"/usr/bin/wine{,-preloader} 2>/dev/null #255055
+}
diff --git a/app-emulation/wine/wine-1.3.9.ebuild b/app-emulation/wine/wine-1.3.9.ebuild
new file mode 100644
index 000000000000..f6d90e2fbe1d
--- /dev/null
+++ b/app-emulation/wine/wine-1.3.9.ebuild
@@ -0,0 +1,211 @@
+# 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.9.ebuild,v 1.1 2010/12/25 00:17:58 vapier Exp $
+
+EAPI="2"
+
+inherit eutils flag-o-matic multilib
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="git://source.winehq.org/git/wine.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.39,0.40-configure.ac,0.38-winecfg}.patch ; }
+GV="1.1.0"
+DESCRIPTION="free implementation of Windows(tm) on Unix"
+HOMEPAGE="http://www.winehq.org/"
+SRC_URI="${SRC_URI}
+	gecko? (
+		mirror://sourceforge/wine/wine_gecko-${GV}-x86.cab
+		win64? ( mirror://sourceforge/wine/wine_gecko-${GV}-x86_64.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 gstreamer 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 )
+	ncurses? ( >=sys-libs/ncurses-5.2 )
+	fontconfig? ( media-libs/fontconfig )
+	gphoto2? ( media-libs/libgphoto2 )
+	jack? ( media-sound/jack-audio-connection-kit )
+	openal? ( media-libs/openal )
+	dbus? ( sys-apps/dbus )
+	gnutls? ( net-libs/gnutls )
+	gstreamer? ( media-libs/gstreamer media-libs/gst-plugins-base )
+	hal? ( sys-apps/hal )
+	X? (
+		x11-libs/libXcursor
+		x11-libs/libXrandr
+		x11-libs/libXi
+		x11-libs/libXmu
+		x11-libs/libXxf86vm
+		x11-apps/xmessage
+	)
+	xinerama? ( x11-libs/libXinerama )
+	alsa? ( media-libs/alsa-lib )
+	esd? ( media-sound/esound )
+	nas? ( media-libs/nas )
+	cups? ( net-print/cups )
+	opengl? ( virtual/opengl )
+	pulseaudio? ( media-sound/pulseaudio ${AUTOTOOLS_DEPEND} )
+	gsm? ( media-sound/gsm )
+	jpeg? ( virtual/jpeg )
+	ldap? ( net-nds/openldap )
+	lcms? ( =media-libs/lcms-1* )
+	mp3? ( >=media-sound/mpg123-1.5.0 )
+	samba? ( >=net-fs/samba-3.0.25 )
+	xml? ( dev-libs/libxml2 dev-libs/libxslt )
+	scanner? ( media-gfx/sane-backends )
+	ssl? ( dev-libs/openssl )
+	png? ( media-libs/libpng )
+	!win64? ( ${MLIB_DEPS} )
+	win32? ( ${MLIB_DEPS} )
+	xcomposite? ( x11-libs/libXcomposite ) "
+DEPEND="${RDEPEND}
+	X? (
+		x11-proto/inputproto
+		x11-proto/xextproto
+		x11-proto/xf86vidmodeproto
+	)
+	xinerama? ( x11-proto/xineramaproto )
+	sys-devel/bison
+	sys-devel/flex"
+
+src_unpack() {
+	if use win64 ; then
+		[[ $(( $(gcc-major-version) * 100 + $(gcc-minor-version) )) -lt 404 ]] \
+			&& die "you need gcc-4.4+ to build 64bit wine"
+	fi
+
+	if [[ ${PV} == "9999" ]] ; then
+		git_src_unpack
+	else
+		unpack ${MY_P}.tar.bz2
+	fi
+}
+
+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
+	sed -i '/^MimeType/d' tools/wine.desktop || die #117785
+}
+
+do_configure() {
+	local builddir="${WORKDIR}/wine$1"
+	mkdir -p "${builddir}"
+	pushd "${builddir}" >/dev/null
+
+	ECONF_SOURCE=${S} \
+	econf \
+		--sysconfdir=/etc/wine \
+		$(use_with alsa) \
+		$(use_with capi) \
+		$(use_with lcms cms) \
+		$(use_with cups) \
+		$(use_with ncurses curses) \
+		$(use_with esd) \
+		$(use_with fontconfig) \
+		$(use_with gnutls) \
+		$(use_with gphoto2 gphoto) \
+		$(use_with gsm) \
+		$(use_with gstreamer) \
+		$(! use dbus && echo --without-hal || use_with hal) \
+		$(use_with jack) \
+		$(use_with jpeg) \
+		$(use_with ldap) \
+		$(use_with mp3 mpg123) \
+		$(use_with nas) \
+		$(use_with openal) \
+		$(use_with opengl) \
+		$(use_with ssl openssl) \
+		$(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) \
+		$(use_with X x) \
+		$(use_with xcomposite) \
+		$(use_with xinerama) \
+		$(use_with xml) \
+		$(use_with xml xslt) \
+		$2
+
+	emake -j1 depend || die "depend"
+
+	popd >/dev/null
+}
+src_configure() {
+	export LDCONFIG=/bin/true
+	use custom-cflags || strip-flags
+
+	if use win64 ; then
+		do_configure 64 --enable-win64
+		use win32 && ABI=x86 do_configure 32 --with-wine64=../wine64
+	else
+		ABI=x86 do_configure 32 --disable-win64
+	fi
+}
+
+src_compile() {
+	local b
+	for b in 64 32 ; do
+		local builddir="${WORKDIR}/wine${b}"
+		[[ -d ${builddir} ]] || continue
+		emake -C "${builddir}" all || die
+	done
+}
+
+src_install() {
+	local b
+	for b in 64 32 ; do
+		local builddir="${WORKDIR}/wine${b}"
+		[[ -d ${builddir} ]] || continue
+		emake -C "${builddir}" install DESTDIR="${D}" || die
+	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 ; }
+	fi
+	if ! use perl ; then
+		rm "${D}"/usr/bin/{wine{dump,maker},function_grep.pl} "${D}"/usr/share/man/man1/wine{dump,maker}.1 || die
+	fi
+}
+
+pkg_postinst() {
+	paxctl -psmr "${ROOT}"/usr/bin/wine{,-preloader} 2>/dev/null #255055
+}
diff --git a/app-emulation/wine/wine-9999.ebuild b/app-emulation/wine/wine-9999.ebuild
index 57cd67f59b9d..90d8cead26b0 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.66 2010/11/19 09:03:23 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-9999.ebuild,v 1.67 2010/12/25 00:17:58 vapier Exp $
 
 EAPI="2"
 
@@ -20,7 +20,7 @@ else
 	S=${WORKDIR}/${MY_P}
 fi
 
-pulse_patches() { echo "$1"/winepulse-{0.39,0.39-configure.ac,0.38-winecfg}.patch ; }
+pulse_patches() { echo "$1"/winepulse-{0.39,0.40-configure.ac,0.38-winecfg}.patch ; }
 GV="1.1.0"
 DESCRIPTION="free implementation of Windows(tm) on Unix"
 HOMEPAGE="http://www.winehq.org/"