Bump, see http://www.winehq.org/announce/1.4-rc2 for the announcement. Add patch by Thomas Sachau to (hopefully) finally fix bug #395615.

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

5 files changed, 274 insertions, 19 deletions

diff --git a/app-emulation/wine/ChangeLog b/app-emulation/wine/ChangeLog
index 0ab41c95e32d..c49b61ffe41b 100644
--- a/app-emulation/wine/ChangeLog
+++ b/app-emulation/wine/ChangeLog
@@ -1,6 +1,14 @@
 # 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.398 2012/01/28 22:53:52 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.399 2012/02/05 21:15:05 tetromino Exp $
+
+*wine-1.4_rc2 (05 Feb 2012)
+
+  05 Feb 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  +wine-1.4_rc2.ebuild, +files/wine-1.4_rc2-multilib-portage.patch,
+  wine-9999.ebuild:
+  Bump, see http://www.winehq.org/announce/1.4-rc2 for the announcement. Add
+  patch by Thomas Sachau to (hopefully) finally fix bug #395615.
 
   28 Jan 2012; Mike Frysinger <vapier@gentoo.org> wine-1.4_rc1.ebuild:
   Drop manual flag filtering #395615.
diff --git a/app-emulation/wine/Manifest b/app-emulation/wine/Manifest
index 3e4cc8add037..f73287813d8f 100644
--- a/app-emulation/wine/Manifest
+++ b/app-emulation/wine/Manifest
@@ -1,8 +1,9 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX wine-1.1.15-winegcc.patch 1556 RMD160 ca7e0df0a45507e7d31ed81c5712111b83ed9bfa SHA1 4b155fe7cb5e831b7f92757d52aa1ab12569b232 SHA256 dbd89db561d7583faf317d795b8c11231575d885e21c6414add39079604dbd0d
 AUX wine-1.2.3-msxml3-libxml2-headers.patch 14328 RMD160 84409dda4e680967048dceaf057c007d5e78d3c9 SHA1 a396cafc13e6b72e5fb101433d54a87cde0ae20d SHA256 0a046e532343f9a4508307434a2f39e0a3a50a66c165b69e56dd671488d4ba7d
+AUX wine-1.4_rc2-multilib-portage.patch 1256 RMD160 6445df9cc97ad523f54de256f37810366a0693fd SHA1 8d0d794f74952a53d38c75a8cb586f784a3b9357 SHA256 9d0acd304d11d1bf73f56699754aaa1bfe1facba90648ee330fdbe08d9ff4938
 DIST wine-1.2.1.tar.bz2 17629106 RMD160 8652ac4f7c4fd2b3da22a840706b3adcb9901467 SHA1 02df427698de8a6d937e722923c8ac1cf886ca27 SHA256 43d1c4d8441221708e6e15ddcddf113308ce875c87f5a8c0f380c6a5b8b63701
 DIST wine-1.2.2.tar.bz2 17665449 RMD160 0388547d56d0676354406d52e62de0b843d8be5d SHA1 8b37c8e0230dd6a665d310054f4e36dcbdab7330 SHA256 c3daead3d40a7c00111200a8e9271d4647369ee4eee2d5d866c2032ef37c09db
 DIST wine-1.2.3.tar.bz2 17651336 RMD160 5bc41a4623ee087e57ebd424a15c6743d0874194 SHA1 072184c492cc9d137138407732de3bb62ba6c091 SHA256 3fd8d3f2b466d07eb90b8198cdc9ec3005917a4533db7b8c6c69058a2e57c61f
@@ -46,6 +47,7 @@ DIST wine-1.3.7.tar.bz2 18379692 RMD160 316535442fc2f29d30a2952ff612cc70ae9f19c9
 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-1.4-rc1.tar.bz2 19901330 RMD160 249f42a1736b405ed11031a9bdc62bb3c55556cf SHA1 aab0c651c018b4861437601af1a7346ab8288c8c SHA256 246618343816ee24ea7be70ac46209ba2a9591717d68af6a22605e6f30ba3bae
+DIST wine-1.4-rc2.tar.bz2 19904340 RMD160 55b5b782395351c3669adad16fccc7efa93dd92c SHA1 294360d2f47f73ea96be1317e92ac0b1ab88cdd7 SHA256 1111274431b0c4a6c0783e5bc1d4759b6795ac822b33c9ef8a53eea5045edd91
 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
@@ -101,23 +103,14 @@ EBUILD wine-1.3.7.ebuild 5510 RMD160 d3ec49932ca26f333251f8bf067de2e8d4aedf4e SH
 EBUILD wine-1.3.8.ebuild 5510 RMD160 ad4ef9400c783f96643a6b08903ff61fb44b8159 SHA1 55db95125b39f233f376c4dd164f758fc68a03df SHA256 323b09936524801303e964becdc2279e2e5e417ec2bb5f8d207d38c5137eeb13
 EBUILD wine-1.3.9.ebuild 5568 RMD160 f48129920b292abe3bc6c80a45dc73534401ebf4 SHA1 637b7d7b11cd0390f5ba47e7b24f571ad6d8657f SHA256 0140f2676f9032703a6a809c5e3d2b37a99152e1c2b560548fba26ec3589034b
 EBUILD wine-1.4_rc1.ebuild 5534 RMD160 a4ef8840df0b248edbd680e7629edbfd5c6f5461 SHA1 9bc2556d97843c74a0667a2e51e3a96766a70132 SHA256 d19b48903aa42c681e15aba4090aee06dd09d22429917dc7a30e6857853da145
-EBUILD wine-9999.ebuild 5536 RMD160 0bc2ec4dd92e9b732b9c3357a61ea47ba6a9b5c1 SHA1 dc719cddd51e9bbd64f27e305453dc34e0aac260 SHA256 fffca90fb089f60b8a0c42fc1be39fe89f8ade22dc524d916c4a08ec0a704a50
-MISC ChangeLog 82095 RMD160 8f33c94dbd9e5c3329a6a7d9b9a00a0c1ab0498d SHA1 b4b987784ae4fe2dd288a8ee3a8505bff226ead4 SHA256 757b78dbc79f37368e1a0e9142ac31da1c6b4270092440ef364c27f4950fd52c
+EBUILD wine-1.4_rc2.ebuild 5627 RMD160 46bcfd940cead9537b966dbab81ac7569c7f25b4 SHA1 7168ee6d27dba1a32b0333f4fcfe79d7bd5acd3c SHA256 55e4128ba0c36234c2b9c9228d34c46100157a1663fc6964e70e7ae8d4e81e4b
+EBUILD wine-9999.ebuild 5626 RMD160 5a05e1fa00319369bbab80cb49db0059894ff441 SHA1 8d53e260afa9c18f2d18e8d839bdb9767d4464db SHA256 09bb07bb755cee93ce5d5e1a84733239b52dde5f6c5ae7e2284f08b3c755ac67
+MISC ChangeLog 82417 RMD160 d750813f400de0f5e4a50f7656f9bacc0eaf8c19 SHA1 9b239e0452ce0a9d5ccc8699fc2f0053248453e7 SHA256 065918b62f6d27af44c3f9a57fa93c491151e82c74cba029ad7c1a23ec2952dd
 MISC metadata.xml 1558 RMD160 54a67744e1e3b273da447b7501bedbd995de7464 SHA1 831b9f52b00d99bac3f10073c9c59be2fd721542 SHA256 fa58b3b055a5f848f6861fa85ca2d5cb922ba9723a8a26d7e69dd78481209616
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBAgAGBQJPJHzKAAoJELEHsLL7fEFWODAP/1am0HwHnCLKncB/Wv8oOPQF
-u0khGCBfdNKt2+VpymmkXm7lXR3vfSFz+fa6jGc9ZTFxE1SWGY8SlIdz1uVlGCBP
-cVD+dXiR9KVuT3//5lTctpGQVpo2CKLnz4RswGyKMjuFCs1a3OAtQ4rvkgwszS3Q
-6+oet1oLG/9ViG13I3gOkDwEj21kqnJ6MKTHo9Ke8PLFm8Rp5qhJjwGYORZ/+ba2
-Vc4g0OQamjBS3mXRCDmlbC1DltMKksnIKAkCpxtunO1vjTaLnTX705h5wHO1Hzr7
-3JygHHaGp531ydftOiVGhp0yX5RKBdEOOVz4voBeLUDK7X7ALfFNhxLXB+T8aQAn
-+vkFHBqqWi98O4UQsofFG9ZLQwDhl4r0nWBJBYWZRanoxLh8CuCQUROC6OhMVCQB
-szm9Zcwax7hnfg37eQUHL/SMFG0Q5Mca/u3p4rZiGCzi1TwvR493m0Ipqx/o9GtN
-7yWec5Anye2QlYrk7XBN87CQ/PnWXbTfJhhyCpLPMHJSiiFQ3amZeqtyLim2NsNH
-uzBVvCaJKjvyt2+YKEDU4TxUtJ+pUy9zSueQMLF+Qa5JJ/czyuUiTiBopEOorOyi
-Yjm1tdefROKCNdry2gAsYZvFYBONfj0zGPW3FcPLkIa3Y2k9RkcD7yA16zpznZWI
-Fzj/zg8fs2J8MDXg7zqy
-=YcFk
+iF4EAREIAAYFAk8u8V8ACgkQdjK8w9WeBnDQ9gEAs8+V9YeysCeYl25ZT6aobhkX
+yO0ViESP6da816wbt7kA/3LI8TV7OoGYHPPFgSoCTc0mCpvfMy/oWo2UixvT28Qb
+=iy8x
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/wine/files/wine-1.4_rc2-multilib-portage.patch b/app-emulation/wine/files/wine-1.4_rc2-multilib-portage.patch
new file mode 100644
index 000000000000..be6ffc56d7cc
--- /dev/null
+++ b/app-emulation/wine/files/wine-1.4_rc2-multilib-portage.patch
@@ -0,0 +1,40 @@
+https://bugs.gentoo.org/show_bug.cgi?id=395615
+
+Explicitly add the required -m32/m64 to *FLAGS; this overrides any 
+arch-specific -m* flags that may have been appended by multilib-portage.
+
+Even though -m32/m64 is now added to *FLAGS, -m32/m64 still has to be
+explicitly added to CC and CXX due to wine's build system. For example,
+winegcc saves the build-time value of CC and uses it at runtime.
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -133,12 +133,18 @@
+     then
+       CC="$CC -m64"
+       CXX="$CXX -m64"
++      CFLAGS="$CFLAGS -m64"
++      LDFLAGS="$LDFLAGS -m64"
++      CXXFLAGS="$CXXFLAGS -m64"
+       host_cpu="x86_64"
+       notice_platform="64-bit "
+       AC_SUBST(TARGETFLAGS,"-m64")
+     else
+       CC="$CC -m32"
+       CXX="$CXX -m32"
++      CFLAGS="$CFLAGS -m32"
++      LDFLAGS="$LDFLAGS -m32"
++      CXXFLAGS="$CXXFLAGS -m32"
+       host_cpu="i386"
+       notice_platform="32-bit "
+       AC_SUBST(TARGETFLAGS,"-m32")
+@@ -150,6 +156,9 @@
+     then
+       CC="$CC -m32"
+       CXX="$CXX -m32"
++      CFLAGS="$CFLAGS -m32"
++      LDFLAGS="$LDFLAGS -m32"
++      CXXFLAGS="$CXXFLAGS -m32"
+       AC_MSG_CHECKING([whether $CC works])
+       AC_LINK_IFELSE([AC_LANG_PROGRAM()],AC_MSG_RESULT([yes]),
+                      [AC_MSG_RESULT([no])
diff --git a/app-emulation/wine/wine-1.4_rc2.ebuild b/app-emulation/wine/wine-1.4_rc2.ebuild
new file mode 100644
index 000000000000..61ed6b604b50
--- /dev/null
+++ b/app-emulation/wine/wine-1.4_rc2.ebuild
@@ -0,0 +1,212 @@
+# 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.4_rc2.ebuild,v 1.1 2012/02/05 21:15:05 tetromino Exp $
+
+EAPI="4"
+
+inherit autotools 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 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? (
+	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 "${FILESDIR}"/${PN}-1.4_rc2-multilib-portage.patch #395615
+	epatch_user #282735
+	eautoreconf
+	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
+
+	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
+	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}"
+	done
+	dodoc ANNOUNCE AUTHORS README
+	if use gecko ; then
+		insinto /usr/share/wine/gecko
+		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
+	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 4332d3bad60f..74ef0574ac1d 100644
--- a/app-emulation/wine/wine-9999.ebuild
+++ b/app-emulation/wine/wine-9999.ebuild
@@ -1,10 +1,10 @@
 # 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.100 2012/01/14 03:20:51 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-9999.ebuild,v 1.101 2012/02/05 21:15:05 tetromino Exp $
 
 EAPI="4"
 
-inherit eutils flag-o-matic multilib
+inherit autotools eutils flag-o-matic multilib
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="git://source.winehq.org/git/wine.git"
@@ -114,7 +114,9 @@ src_unpack() {
 
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-1.1.15-winegcc.patch #260726
+	epatch "${FILESDIR}"/${PN}-1.4_rc2-multilib-portage.patch #395615
 	epatch_user #282735
+	eautoreconf
 	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
 	sed -i '/^MimeType/d' tools/wine.desktop || die #117785
 }