Bump, see http://www.winehq.org/announce/1.4-rc4 for the announcement. Add /usr/bin/wine and wine-preloader symlinks for win64-only installs (bug #404331, thanks to Zhang Hongjiu). Add odbc USE flag to pull in unixODBC runtime dep (bug #404507, thanks to Andreas Sturmlechner). Use pax-mark (bug #375797, thanks to Anthony Basile) and mark win64 binaries (bug #404329, thanks to Zhang Hongjiu). Add a die in src_configure when intel opencl is selected to help with bug #403947 (thanks to candrews and Kacper Kowalik).

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

4 files changed, 266 insertions, 13 deletions

diff --git a/app-emulation/wine/ChangeLog b/app-emulation/wine/ChangeLog
index dee4e8e1c032..c409903e2acb 100644
--- a/app-emulation/wine/ChangeLog
+++ b/app-emulation/wine/ChangeLog
@@ -1,6 +1,18 @@
 # 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.401 2012/02/15 16:46:38 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.402 2012/02/21 04:17:24 tetromino Exp $
+
+*wine-1.4_rc4 (21 Feb 2012)
+
+  21 Feb 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  +wine-1.4_rc4.ebuild, wine-9999.ebuild:
+  Bump, see http://www.winehq.org/announce/1.4-rc4 for the announcement. Add
+  /usr/bin/wine and wine-preloader symlinks for win64-only installs (bug
+  #404331, thanks to Zhang Hongjiu). Add odbc USE flag to pull in unixODBC
+  runtime dep (bug #404507, thanks to Andreas Sturmlechner). Use pax-mark (bug
+  #375797, thanks to Anthony Basile) and mark win64 binaries (bug #404329,
+  thanks to Zhang Hongjiu). Add a die in src_configure when intel opencl is
+  selected to help with bug #403947 (thanks to candrews and Kacper Kowalik).
 
 *wine-1.4_rc3 (15 Feb 2012)
 
diff --git a/app-emulation/wine/Manifest b/app-emulation/wine/Manifest
index b47077b2d298..2b8ebe48ff74 100644
--- a/app-emulation/wine/Manifest
+++ b/app-emulation/wine/Manifest
@@ -49,6 +49,7 @@ DIST wine-1.3.9.tar.bz2 18378516 RMD160 07803597faf46e9ac748560642a537b56dd1a845
 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-1.4-rc3.tar.bz2 19929191 RMD160 a6ee6488f51cc7b33c425e440c278562b5d3b5c6 SHA1 1cce9110f23d5893dc4c12a3a116964e336e75c0 SHA256 2ebb5a19cc7bcdb25d1381dae03f59b7d1a35014f734bc45f91214c3cf405606
+DIST wine-1.4-rc4.tar.bz2 19947129 RMD160 dcf033043322705a169de6a90032845c3c5b5f63 SHA1 776eab51a0f24fccadffab00889b50d6a929cb8d SHA256 3105c4f7e0a3c326c3dc82257b6af96dd5db6cc2afbe4b8a936563d2da04d1ec
 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
@@ -106,13 +107,14 @@ EBUILD wine-1.3.9.ebuild 5568 RMD160 f48129920b292abe3bc6c80a45dc73534401ebf4 SH
 EBUILD wine-1.4_rc1.ebuild 5534 RMD160 a4ef8840df0b248edbd680e7629edbfd5c6f5461 SHA1 9bc2556d97843c74a0667a2e51e3a96766a70132 SHA256 d19b48903aa42c681e15aba4090aee06dd09d22429917dc7a30e6857853da145
 EBUILD wine-1.4_rc2.ebuild 5669 RMD160 4b2346ed1c6b1cd917eb8fb0c5499f131b7cc16d SHA1 7767c1823f5de71969519561f46ca10de53ff329 SHA256 ac94ad0a2a170578fa8e52afc22985763d6e4eea22dcfe28feac457c79a34ea2
 EBUILD wine-1.4_rc3.ebuild 5673 RMD160 171c480f8184bce22a85448ca547b3a394359d75 SHA1 c823c8074074e72269a9add851442782512df6bb SHA256 94985b515d8a66749f305601fce2a3f310e504de9f3044aa01473eef5dfc4a17
-EBUILD wine-9999.ebuild 5672 RMD160 6049dc1ebeffab0ffd96cd722beea245be8fd2cf SHA1 d9607e06e0099f61980f460c34034e5517f96d1f SHA256 b2196322dc7766f47efea6d7f48d2f01672bbb66145fe72818965e06a17f7be0
-MISC ChangeLog 82767 RMD160 92fa9d36e7509459f0723d380824841fc827ebbb SHA1 2b16bc58de71546539e6b536fe84903ac491a7e1 SHA256 4985223377a0048ecc3adce1ce85c8a2fb3eb2252f5e8ee73ebb0ceda34734ff
+EBUILD wine-1.4_rc4.ebuild 6102 RMD160 8b221113baa5f6a2a4bae789dfb90cbd7e7e2913 SHA1 98cc71ee725375d03868bc1f848d00a1667808d5 SHA256 4a8160764dc10e489111984c22bac1f2ee46e01d8c249eff32d403f11dc7924a
+EBUILD wine-9999.ebuild 6101 RMD160 17396e7408e6da1e64d9fe69c524701e0c1641e5 SHA1 fcae4eb6db1b011486674123b733b4ffd672971f SHA256 0d7085384c42ba547446091944e24500817ef39efd814d82d46f2adde73b2dc4
+MISC ChangeLog 83430 RMD160 3be36cf409b33e7f8fac7a8bef049a6644f2aaed SHA1 89cddb97c4850a8ae002462b62f6e7718e30fd86 SHA256 997609f592ec02332cfe54624760baa0432dcd914c96ecba367d5a382e03853f
 MISC metadata.xml 1558 RMD160 54a67744e1e3b273da447b7501bedbd995de7464 SHA1 831b9f52b00d99bac3f10073c9c59be2fd721542 SHA256 fa58b3b055a5f848f6861fa85ca2d5cb922ba9723a8a26d7e69dd78481209616
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk874XQACgkQdjK8w9WeBnDnagD+Nzt+bOBWDEXSyDm8hoTtZca2
-eDRxapxWcgbfG0Aw/EIA/3+UcaQPMRyevL22sR4ZsR+1lT+UwTszCqv1LC53FBed
-=cZwQ
+iF4EAREIAAYFAk9DGtoACgkQdjK8w9WeBnAlPgD/SSaJWWFQKaROlF/XSchu8SUG
+0QuZgXwvfbbHTCsE8S8A/AgZQ5fCA/7UeA4VCKfXlRp/iSx1vPszHQqzyEZxp8Q8
+=igSM
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/wine/wine-1.4_rc4.ebuild b/app-emulation/wine/wine-1.4_rc4.ebuild
new file mode 100644
index 000000000000..bd35325c696e
--- /dev/null
+++ b/app-emulation/wine/wine-1.4_rc4.ebuild
@@ -0,0 +1,226 @@
+# 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_rc4.ebuild,v 1.1 2012/02/21 04:17:24 tetromino Exp $
+
+EAPI="4"
+
+inherit autotools eutils flag-o-matic multilib pax-utils
+
+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 odbc openal opencl +opengl +oss +perl png samba scanner selinux 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 )
+	odbc? ( app-emulation/emul-linux-x86-db )
+	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 )
+	odbc? ( dev-db/unixODBC )
+	samba? ( >=net-fs/samba-3.0.25 )
+	selinux? ( sec-policy/selinux-wine )
+	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 use win32 && use opencl; then
+		[[ x$(eselect opencl show) = "xintel" ]] &&
+			die "Cannot build wine[opencl,win32]: intel-ocl-sdk is 64-bit only" # 403947
+	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
+
+	if use win32 || ! use win64; then
+		pax-mark psmr "${D}"usr/bin/wine{,-preloader} #255055
+	fi
+	use win64 && pax-mark psmr "${D}"usr/bin/wine64{,-preloader}
+
+	if use win64 && ! use win32; then
+		dosym /usr/bin/wine{64,} # 404331
+		dosym /usr/bin/wine{64,}-preloader
+	fi
+}
diff --git a/app-emulation/wine/wine-9999.ebuild b/app-emulation/wine/wine-9999.ebuild
index 450778006356..971f9db921f5 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.102 2012/02/15 16:46:38 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-9999.ebuild,v 1.103 2012/02/21 04:17:24 tetromino Exp $
 
 EAPI="4"
 
-inherit autotools eutils flag-o-matic multilib
+inherit autotools eutils flag-o-matic multilib pax-utils
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="git://source.winehq.org/git/wine.git"
@@ -29,7 +29,7 @@ SRC_URI="${SRC_URI}
 
 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 selinux ssl test +threads +truetype udisks v4l +win32 +win64 +X xcomposite xinerama xml"
+IUSE="alsa capi cups custom-cflags elibc_glibc fontconfig +gecko gnutls gphoto2 gsm gstreamer hardened jpeg lcms ldap mp3 ncurses nls odbc openal opencl +opengl +oss +perl png samba scanner selinux ssl test +threads +truetype udisks v4l +win32 +win64 +X xcomposite xinerama xml"
 REQUIRED_USE="elibc_glibc? ( threads )" #286560
 RESTRICT="test" #72375
 
@@ -40,6 +40,7 @@ MLIB_DEPS="amd64? (
 		>=app-emulation/emul-linux-x86-soundlibs-2.1
 	)
 	mp3? ( app-emulation/emul-linux-x86-soundlibs )
+	odbc? ( app-emulation/emul-linux-x86-db )
 	openal? ( app-emulation/emul-linux-x86-sdl )
 	opengl? ( app-emulation/emul-linux-x86-opengl )
 	scanner? ( app-emulation/emul-linux-x86-medialibs )
@@ -79,6 +80,7 @@ RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts )
 	lcms? ( =media-libs/lcms-1* )
 	mp3? ( >=media-sound/mpg123-1.5.0 )
 	nls? ( sys-devel/gettext )
+	odbc? ( dev-db/unixODBC )
 	samba? ( >=net-fs/samba-3.0.25 )
 	selinux? ( sec-policy/selinux-wine )
 	xml? ( dev-libs/libxml2 dev-libs/libxslt )
@@ -106,6 +108,11 @@ src_unpack() {
 			&& die "you need gcc-4.4+ to build 64bit wine"
 	fi
 
+	if use win32 && use opencl; then
+		[[ x$(eselect opencl show) = "xintel" ]] &&
+			die "Cannot build wine[opencl,win32]: intel-ocl-sdk is 64-bit only" # 403947
+	fi
+
 	if [[ ${PV} == "9999" ]] ; then
 		git-2_src_unpack
 	else
@@ -204,10 +211,16 @@ src_install() {
 		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
+		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
+	if use win32 || ! use win64; then
+		pax-mark psmr "${D}"usr/bin/wine{,-preloader} #255055
+	fi
+	use win64 && pax-mark psmr "${D}"usr/bin/wine64{,-preloader}
+
+	if use win64 && ! use win32; then
+		dosym /usr/bin/wine{64,} # 404331
+		dosym /usr/bin/wine{64,}-preloader
+	fi
 }