Version bump, see http://www.winehq.org/announce/1.3.36 for the announcement. Rename dbus USE flag to udisks to reflect what it actually does in >=1.3.36.

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

4 files changed, 224 insertions, 6 deletions

diff --git a/app-emulation/wine/ChangeLog b/app-emulation/wine/ChangeLog
index 00508fd6f3ef..12beb6ea4392 100644
--- a/app-emulation/wine/ChangeLog
+++ b/app-emulation/wine/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-emulation/wine
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.391 2011/12/20 19:35:12 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.392 2011/12/31 04:40:13 tetromino Exp $
+
+*wine-1.3.36 (31 Dec 2011)
+
+  31 Dec 2011; Alexandre Rostovtsev <tetromino@gentoo.org> +wine-1.3.36.ebuild,
+  metadata.xml:
+  Version bump, see http://www.winehq.org/announce/1.3.36 for the announcement.
+  Rename dbus USE flag to udisks to reflect what it actually does in >=1.3.36.
 
   20 Dec 2011; Mike Frysinger <vapier@gentoo.org> wine-1.3.9.ebuild,
   wine-1.3.10.ebuild, wine-1.3.11.ebuild, wine-1.3.12.ebuild,
diff --git a/app-emulation/wine/Manifest b/app-emulation/wine/Manifest
index 0d33e8560c64..8d3039ac367c 100644
--- a/app-emulation/wine/Manifest
+++ b/app-emulation/wine/Manifest
@@ -36,6 +36,7 @@ DIST wine-1.3.32.tar.bz2 19678422 RMD160 b45edf8b0a70c24666a3ed7a701bafb14f734d8
 DIST wine-1.3.33.tar.bz2 19809247 RMD160 4f24203fdd8f4bc0c3402f0c184e3bb7a172d280 SHA1 d9ae9efa9543e1467708cf47c991affe87a45cf7 SHA256 d49b96e3f999a7380898c3c09cf3d920c369756cb735d9c05295b5bb73c19f8c
 DIST wine-1.3.34.tar.bz2 19846255 RMD160 cf37c130b5682c4012bc97c7583e4be3f3869483 SHA1 f5df0e9dec23375269121cffba5ac7e863259de8 SHA256 ac597a63c289bfedd75dcdc1cfaf342ad816669167868ad97490d0c08b7f1c52
 DIST wine-1.3.35.tar.bz2 19847696 RMD160 1aae89a1d254cfce13784e799ab6639163327844 SHA1 f59ea14a478b5cb5ae00203ae4d7a5e14f020bb7 SHA256 e23e4da5efebc11206198e9cf2a2638851db4e00a1af0abccd8b6369e99c288b
+DIST wine-1.3.36.tar.bz2 19788661 RMD160 e541b1e1b60c65d640c858715d20e84566991b1c SHA1 6ad7d18063fea0fdeb2caf20a21ae53ffba13f24 SHA256 a4a1c5224dbf47f10a2a7c601f610e21c7f7be33639eeb4e68b389d4318e9180
 DIST wine-1.3.4.tar.bz2 18079846 RMD160 ebbbf31aac547ee25ecf6c0171e29ae312c853d8 SHA1 7dbb1716cf83b61232f64bcc25e7e2d109321e49 SHA256 449387f5672cc535548740eef90403afd5d3cd678d3686bccf62813958825fdc
 DIST wine-1.3.5.tar.bz2 18175097 RMD160 026114f86f87abab1cd962b0bcef8ab6f345e8fc SHA1 52b151855087dce69a8b3405d2ad93b24f96c6fb SHA256 bb2d44c1ae488b972f03e8f97c44fe1608240984075ccf75952edddf1dd2b79e
 DIST wine-1.3.6.tar.bz2 18243096 RMD160 d1f9f1dade12f878e90fa01f5a59cc13056d8b06 SHA1 247a416b608fc317bce9fe0644a3103c8abf97d6 SHA256 9a4b7b9d8358b81bb32ed376e817ae86a531bce39663537a1f77d4b4cfa44d27
@@ -88,6 +89,7 @@ EBUILD wine-1.3.32.ebuild 5471 RMD160 1fbaa55d5b08250a706db3fbdc8d04aed074417d S
 EBUILD wine-1.3.33.ebuild 5471 RMD160 28aac3cecf15b9ef2e88772f873878ad2e3c0b82 SHA1 c85faecdbe3db9c1f671b18295d7622c4ea998ae SHA256 31cfee1b5bc21bae9e386c2a6b72a73d3e73dfeb8e643e4fa4d36bb3f20c8492
 EBUILD wine-1.3.34.ebuild 5471 RMD160 a7d90ebd0cce7323857d76d240bb964b2ae101fc SHA1 d6f40e86549c40b507242525c1cd7fc201eb96d3 SHA256 c950838757d63f386c7e7857dcb018d3456eaf32c69439b627442477fa106040
 EBUILD wine-1.3.35.ebuild 5471 RMD160 16fdfbb08ebe6fbb732288039270d598c0cbd6b6 SHA1 269e4dc46a9f06848c7869399c75db418cfa6d8a SHA256 e98720626f15b01ab4860a78da4e0242fa2f994e368b9436f8747ad585f748a0
+EBUILD wine-1.3.36.ebuild 5525 RMD160 998469d597982ef6e867ba6bb9dd8db1c94f5ae8 SHA1 c7b44e8e21ee7b2939445fb5ef3600e801dd7e7a SHA256 6e21dac68b8fdb12eb0ff92f6bd24b1450796640cbd3f639913a77c04766288e
 EBUILD wine-1.3.4.ebuild 5431 RMD160 60ff53e513d99cb59b4ca65189ff855b7498dc92 SHA1 1e84baf1925298dec79aded88d5136a56d997d64 SHA256 092f49c98c49f761f42e4dbfe14c3d196a26e0e95d62328db714a76d4c2008a4
 EBUILD wine-1.3.5.ebuild 5431 RMD160 321e6dad515e0cdb1f3f01993705976eebfe7327 SHA1 9d6a26fc8eab59a9ecf695130142df0690f43ede SHA256 adda457f7ebdad6abbad40508bd22b9da9bd5bebbc332390ff398e6fe8dc8666
 EBUILD wine-1.3.6.ebuild 5532 RMD160 1bbcfe57e94ae18dff334d5c3c56b8f80a6600dc SHA1 4ee2f9b0a8b65b45f0e2c68d9d5eec5f6020782f SHA256 1854cd2e0159ec285b9c594b6219798b50a409968674689f84824c6cc089723f
@@ -95,12 +97,12 @@ EBUILD wine-1.3.7.ebuild 5532 RMD160 07ec7829151126b9d6a91152bf0c7bd787d99bab SH
 EBUILD wine-1.3.8.ebuild 5532 RMD160 1835d32b102f8386570c3f136c72768d7e616c8e SHA1 7ea7ac53e32c575bcb4aaa26ef394cee66ebadde SHA256 b52572a30de0148908ff5571d966613111453bb37e2310abe760fd9d1d2e2ee8
 EBUILD wine-1.3.9.ebuild 5590 RMD160 4dd88ea3b9d2363a56a14d60f9159ed9a2d08721 SHA1 0276879922960c64598474ea07aaff4081d7408c SHA256 2c01211516050f7c3d396e35a86742c4fcc2e347da61d84f3e84d8eb8b8ee5a4
 EBUILD wine-9999.ebuild 5470 RMD160 d9eae3a5a711caa48c0c159575713b760cbd154e SHA1 daf5575846aab4a5644387d054eaaaf362d0aef5 SHA256 1dccb83bfb7c529222477dfa2a4392aa0ab6e5faa57e035009aa074eab28f741
-MISC ChangeLog 79719 RMD160 bb8fe6ae2cd91509b6f712d69e708cd471c72529 SHA1 8a9320a78763a6789cd4039d6ed647ca9bb5edc0 SHA256 7245543e61271b351f72ed695e7c25e8b8e796480884ffa473ecf548a21f6d44
-MISC metadata.xml 1467 RMD160 75238f47773b9e1bbb13302d4d1acea09ebb8ec6 SHA1 2fc298194ff9ce8e5497ca93cc80151f1f077194 SHA256 99660c18aa56702f9d1e6d5be5238473954618a79275a371bfc0c7768a4e7e04
+MISC ChangeLog 80006 RMD160 b51f598338fa93f341876a6e1aa6aeca433e5c57 SHA1 8573fd3785593d179c8a8ffb26d26fcf6e51b7af SHA256 e58a550d6e9496a81512eb86274c6938a3e4be46c328bba41ee64321c86799d3
+MISC metadata.xml 1558 RMD160 54a67744e1e3b273da447b7501bedbd995de7464 SHA1 831b9f52b00d99bac3f10073c9c59be2fd721542 SHA256 fa58b3b055a5f848f6861fa85ca2d5cb922ba9723a8a26d7e69dd78481209616
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk7w44EACgkQaC/OocHi7JbbXQD/XMTmrqqWlSQPlrAI3YUFQaDJ
-EzedEfI37r9IPrdpxC0A/1/FJXaecwNKwsj7HfAtgJ8H0xkedPGsg6JFlPQfLDa7
-=pk5O
+iF4EAREIAAYFAk7+kjMACgkQdjK8w9WeBnBU8wD7BRk3H1hJCRDP0qwEsJ7n7meK
+LjZz8Zh+T6lLRSH8ZJgA/jwJUzckpYjcJKBjMAVI8JNXTWgbk+G4hb5vk8+WMvVS
+=AklO
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/wine/metadata.xml b/app-emulation/wine/metadata.xml
index 311346b9d7ce..a3a8dbe67320 100644
--- a/app-emulation/wine/metadata.xml
+++ b/app-emulation/wine/metadata.xml
@@ -16,6 +16,7 @@ Think of Wine as a compatibility layer for running Windows programs. Wine does n
 	<flag name='samba'>Add support for NTLM auth. see
 		http://wiki.winehq.org/NtlmAuthSetupGuide and
 		http://wiki.winehq.org/NtlmSigningAndSealing</flag>
+	<flag name='udisks'>Support dynamic storage devices using <pkg>sys-fs/udisks</pkg></flag>
 	<flag name='win32'>Build a 32bit version of Wine (won't run Win64 binaries)</flag>
 	<flag name='win64'>Build a 64bit version of Wine (won't run Win32 binaries)</flag>
 </use>
diff --git a/app-emulation/wine/wine-1.3.36.ebuild b/app-emulation/wine/wine-1.3.36.ebuild
new file mode 100644
index 000000000000..fce65a5a6076
--- /dev/null
+++ b/app-emulation/wine/wine-1.3.36.ebuild
@@ -0,0 +1,208 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.36.ebuild,v 1.1 2011/12/31 04:40:13 tetromino 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-2
+	SRC_URI=""
+	#KEYWORDS=""
+else
+	MY_P="${PN}-${PV/_/-}"
+	SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
+	KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
+	S=${WORKDIR}/${MY_P}
+fi
+
+GV="1.4"
+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.msi
+		win64? ( mirror://sourceforge/wine/wine_gecko-${GV}-x86_64.msi )
+	)"
+
+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"
+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
+	)
+	mp3? ( app-emulation/emul-linux-x86-soundlibs )
+	openal? ( app-emulation/emul-linux-x86-sdl )
+	opengl? ( app-emulation/emul-linux-x86-opengl )
+	scanner? ( app-emulation/emul-linux-x86-medialibs )
+	v4l? ( app-emulation/emul-linux-x86-medialibs )
+	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 )
+	openal? ( media-libs/openal )
+	udisks? (
+		sys-apps/dbus
+		sys-fs/udisks
+	)
+	gnutls? ( net-libs/gnutls )
+	gstreamer? ( media-libs/gstreamer media-libs/gst-plugins-base )
+	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 )
+	cups? ( net-print/cups )
+	opencl? ( virtual/opencl )
+	opengl? ( virtual/opengl )
+	gsm? ( media-sound/gsm )
+	jpeg? ( virtual/jpeg )
+	ldap? ( net-nds/openldap )
+	lcms? ( =media-libs/lcms-1* )
+	mp3? ( >=media-sound/mpg123-1.5.0 )
+	nls? ( sys-devel/gettext )
+	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 )
+	v4l? ( media-libs/libv4l )
+	!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 )
+	!hardened? ( sys-devel/prelink )
+	virtual/yacc
+	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-2_src_unpack
+	else
+		unpack ${MY_P}.tar.bz2
+	fi
+}
+
+src_prepare() {
+	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 udisks dbus) \
+		$(use_with fontconfig) \
+		$(use_with gnutls) \
+		$(use_with gphoto2 gphoto) \
+		$(use_with gsm) \
+		$(use_with gstreamer) \
+		--without-hal \
+		$(use_with jpeg) \
+		$(use_with ldap) \
+		$(use_with mp3 mpg123) \
+		$(use_with nls gettext) \
+		$(use_with openal) \
+		$(use_with opencl) \
+		$(use_with opengl) \
+		$(use_with ssl openssl) \
+		$(use_with oss) \
+		$(use_with png) \
+		$(use_with threads pthread) \
+		$(use_with scanner sane) \
+		$(use_enable test tests) \
+		$(use_with truetype freetype) \
+		$(use_with v4l) \
+		$(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.msi || die
+		use win64 && { doins "${DISTDIR}"/wine_gecko-${GV}-x86_64.msi || 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
+}