Version bump, see http://www.winehq.org/announce/1.3.35 for the announcement.

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

3 files changed, 216 insertions, 5 deletions

diff --git a/app-emulation/wine/ChangeLog b/app-emulation/wine/ChangeLog
index 652ec79f76c7..12f5455dfde1 100644
--- a/app-emulation/wine/ChangeLog
+++ b/app-emulation/wine/ChangeLog
@@ -1,6 +1,11 @@
 # 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.389 2011/12/02 23:32:04 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.390 2011/12/18 04:47:29 tetromino Exp $
+
+*wine-1.3.35 (18 Dec 2011)
+
+  18 Dec 2011; Alexandre Rostovtsev <tetromino@gentoo.org> +wine-1.3.35.ebuild:
+  Version bump, see http://www.winehq.org/announce/1.3.35 for the announcement.
 
   02 Dec 2011; Mike Frysinger <vapier@gentoo.org>
   -files/wine-1.1.15-configure-host.patch, wine-1.2.1.ebuild,
diff --git a/app-emulation/wine/Manifest b/app-emulation/wine/Manifest
index 5bc0e2fb3a14..1d137d0f05d0 100644
--- a/app-emulation/wine/Manifest
+++ b/app-emulation/wine/Manifest
@@ -35,6 +35,7 @@ DIST wine-1.3.31.tar.bz2 19637263 RMD160 976a48106c347507ab7202ddb1e997a7b19c57a
 DIST wine-1.3.32.tar.bz2 19678422 RMD160 b45edf8b0a70c24666a3ed7a701bafb14f734d88 SHA1 6881f41443efc13fd8bbb7cea828cc8e6e7da42b SHA256 fe1691ef8e9c5c4afeb345ad0f0b364d055cfe67a7e64b0a4a44da4d85cfa8b6
 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.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
@@ -86,6 +87,7 @@ EBUILD wine-1.3.31.ebuild 5520 RMD160 6720679b5bd25e8dd7172a64b39a71be5c2ae82c S
 EBUILD wine-1.3.32.ebuild 5518 RMD160 a3e693be25ed46a608a4e447abc672397fa30fcd SHA1 5c368fb5e7fdd8581bf24eced75e5b6fd76ca259 SHA256 e264cb4ace45166322761640755dd6375c396d5a371b0fffdbf80215f5c63d63
 EBUILD wine-1.3.33.ebuild 5518 RMD160 d055717ab6945625d2fbcf0d16444b27a9e9985d SHA1 7df2c00196685d9644838bc89dee0d151ba2066e SHA256 faa48dd7609434301c43d537ae24d784be81798faab75d4f2714bedf29d2e56a
 EBUILD wine-1.3.34.ebuild 5518 RMD160 6affd73c2ee94ab0a5264b7a807ec9c571b94118 SHA1 e21dfd1e50542af7ca342ecc44a991c5eeb12a72 SHA256 1236b514bf91c32bb24b165b3ef841b5a7286950810c30cdc6fba95280ab4b7b
+EBUILD wine-1.3.35.ebuild 5521 RMD160 e76ceecf9d092d993e210c89ca9bb23bbfee76cc SHA1 34b255bec1ccc790733e5298036854cc4fc07edb SHA256 559d9a0ab113a4fae7f3df60e7f9c304cc053018dcf2ace2d9b1ad3414d5d0bd
 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
@@ -93,12 +95,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 5637 RMD160 4cd60634248e36a72689f6ed4fd86ef1ba361c25 SHA1 bc6f053ea103dab9dce20d2591bf9afbc435324c SHA256 2319dfa021629934a757e0b0fd086742b397e7f45954f03804f2989ddd55f149
 EBUILD wine-9999.ebuild 5517 RMD160 1ab17669eb6f1768a2ae7b97bea502b672e57d5d SHA1 a0f32018f0c75baacb2992f3f37e30ae91837500 SHA256 0434d62f761946872ac0ad6741e1e3c4c5378a985e1bc23d5c67e96248381f75
-MISC ChangeLog 78847 RMD160 dc43fcc5e324851531595f1d8bc23d51d4676208 SHA1 a205e0cf8bc5b09d2f06318dd813fc6355ed2def SHA256 5afdc11c4efaceb3b7b77fa4846f03eae6fc5235acf75afe45a61aefcbf25045
+MISC ChangeLog 79039 RMD160 4d12c51abba51fb340a773b0092be2af54523adb SHA1 b2d4a269236feb22ddda1525473dbf1b86402583 SHA256 8151ae61a2007b6a65fa0e9f0aa533133e35658971d916cd14fcbf09ac31a9d7
 MISC metadata.xml 1467 RMD160 75238f47773b9e1bbb13302d4d1acea09ebb8ec6 SHA1 2fc298194ff9ce8e5497ca93cc80151f1f077194 SHA256 99660c18aa56702f9d1e6d5be5238473954618a79275a371bfc0c7768a4e7e04
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk7ZYAQACgkQaC/OocHi7JaUCwD8Dmv1THDhRa0h+hm2cdQCf24q
-Pffw1FBDuIXZMGhSr7IA/3oW6ZVNf7p760+DqmT2/8ftE+1PNMLX8mT4bB+aY+TY
-=sZMU
+iF4EAREIAAYFAk7tcGcACgkQdjK8w9WeBnBE2AD+OxCbwQAcwAPKeA+zeD99CxrV
+65ZhvQj4//eqmax/2tMBALcdhc1VmtpBIDn9amRqT+YCWjngLxTerWlNnNPuEbht
+=WMuT
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/wine/wine-1.3.35.ebuild b/app-emulation/wine/wine-1.3.35.ebuild
new file mode 100644
index 000000000000..a626dc55910c
--- /dev/null
+++ b/app-emulation/wine/wine-1.3.35.ebuild
@@ -0,0 +1,204 @@
+# 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.35.ebuild,v 1.1 2011/12/18 04:47:29 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 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"
+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 )
+	dbus? ( sys-apps/dbus )
+	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? ( x11-drivers/nvidia-drivers >=dev-util/nvidia-cuda-toolkit-3.1 )
+	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 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
+}