Bump, see http://www.winehq.org/announce/1.5.1 for the announcement.

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

3 files changed, 241 insertions, 11 deletions

diff --git a/app-emulation/wine/ChangeLog b/app-emulation/wine/ChangeLog
index b90f3f0d05fa..0b9068e93ee7 100644
--- a/app-emulation/wine/ChangeLog
+++ b/app-emulation/wine/ChangeLog
@@ -1,6 +1,11 @@
 # 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.408 2012/03/27 18:25:58 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.409 2012/04/03 06:39:17 tetromino Exp $
+
+*wine-1.5.1 (03 Apr 2012)
+
+  03 Apr 2012; Alexandre Rostovtsev <tetromino@gentoo.org> +wine-1.5.1.ebuild:
+  Bump, see http://www.winehq.org/announce/1.5.1 for the announcement.
 
   27 Mar 2012; Samuli Suominen <ssuominen@gentoo.org> wine-1.3.36.ebuild,
   wine-1.3.37.ebuild, wine-1.4_rc1.ebuild, wine-1.4_rc2.ebuild,
diff --git a/app-emulation/wine/Manifest b/app-emulation/wine/Manifest
index e30a506752de..7db81f59585d 100644
--- a/app-emulation/wine/Manifest
+++ b/app-emulation/wine/Manifest
@@ -1,5 +1,5 @@
 -----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
@@ -54,6 +54,7 @@ DIST wine-1.4-rc5.tar.bz2 19999127 RMD160 8908f1830de2939c0ae1ceee7538f179a7d74b
 DIST wine-1.4-rc6.tar.bz2 20021214 RMD160 3e8520522889126492394b09bc505a0fe7587d98 SHA1 ef9ed84a843e801b8ab2166824abf3d000c33eeb SHA256 b6b8df555853767875a145d00ae34150c78221bec876739227db69212d70f4e0
 DIST wine-1.4.tar.bz2 20035856 RMD160 ee523c4cf15984197487432790c0e5bbba3ec495 SHA1 ce5d56b9b949c01dde663ab39739ffcfb41a73c4 SHA256 99a437bb8bd350bb1499d59183635e58217e73d631379c43cfd0d6020428ee65
 DIST wine-1.5.0.tar.bz2 20132171 RMD160 1a4c40ce3c20df1f467475c598da5f88266ae95e SHA1 23dd5efa2a36b357b8fd4a5cd554770ef4b68dbc SHA256 ad15143d2f8b38e2b5b8569b46efd09f9d13ce558dad431e17c471ca1412742b
+DIST wine-1.5.1.tar.bz2 20078739 RMD160 5f99f9ab2cfd3ceb4648dffde20714deb2d80fa2 SHA1 0f44ea5f9fbdc07186c77dfa619bd4d0f1b07825 SHA256 6dc578f9afb3c9a0f2b773bbe09af20578ac6fa514dd0712ecc5d05c766045e6
 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
@@ -118,17 +119,14 @@ EBUILD wine-1.4_rc4.ebuild 6124 RMD160 53ca9800d7c5d05a0392bb40302b466dee2b3648
 EBUILD wine-1.4_rc5.ebuild 6124 RMD160 395dd4c98b1fd02b3cc72c88bac7e6a0f98a83b9 SHA1 6e20a44d6ef8b829bc312459290841449bc7d201 SHA256 c10d7c809ddfde78606de67f4bb63226042a3f76f673242dddcdffd53fca6388
 EBUILD wine-1.4_rc6.ebuild 6124 RMD160 35db39b801a416dde3405baa44e586fa67aa56ee SHA1 454818e4bbd7b105e9ff5c032058afb82391c781 SHA256 c54fb86cc2cb5eac6c2549f4175ea4b7051baf3a97ac1dc900f117aebb3a8bbe
 EBUILD wine-1.5.0.ebuild 6122 RMD160 1845128cbf0eff7d9510deaf0684c2f3140d4909 SHA1 5ccbb6e6f4c5122c7e675255b39e8d34918aa54a SHA256 33dcb0cc21e6e258fefc84d57c88e74d56447873a5eaa0406f8284387bb9b496
+EBUILD wine-1.5.1.ebuild 6122 RMD160 441710c223ac801c9b4af343ccaa53f9ba070515 SHA1 556deb2cd3543c7378cd1b6a59f0bfe373a38980 SHA256 f2213d33be3f37e6498c7d872166d51f374c165bc09c7dd95fe974ba086d9428
 EBUILD wine-9999.ebuild 6123 RMD160 492a4efd02afcaf8f481d1d1dec4abb6abf7a3d1 SHA1 f188b7ef1639debdc4d06735a97cb9a8b1470caa SHA256 fb77db618cc826a4a8469da30a2d12f34055243d5c0a314df1a4c55f409a8ed1
-MISC ChangeLog 85623 RMD160 e2b7731288bf50ec1dc6dd3da197b271016ffdec SHA1 995a8e0ad8a6f6d90203b4bd7a71dbc1bb2073f1 SHA256 4a6fc0d46dde63f0dc95f1f024bd7b65438fa39b48ad602d005e385cbf17d079
+MISC ChangeLog 85801 RMD160 a7629d7a1a57070bc94fb84b02b4568b42ec8b4a SHA1 b3522d3ba9187af34f7ced14f5cccd7dd16719ad SHA256 d987cf4e0dc47f9ed0a5c3355c8e7a5056a368c0c265ea7dfbe94e44ecac3ba3
 MISC metadata.xml 1558 RMD160 54a67744e1e3b273da447b7501bedbd995de7464 SHA1 831b9f52b00d99bac3f10073c9c59be2fd721542 SHA256 fa58b3b055a5f848f6861fa85ca2d5cb922ba9723a8a26d7e69dd78481209616
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPcgZAAAoJEEdUh39IaPFNfscH/R199EmAymYEO36MGDjJBbiK
-HCZRxRF7o2vp9bs6cgApfrVXKnWFP0X8z31QBy2zIMdqHoajyTeOTjnpqrivLbRf
-DsLtuf+BorrEfB2D8jaIpmk4KRy1gaZ2Ge5g53aNaXiozwoImZKZol/lbL2A5xBj
-LwJ5LwVDfyAUD940bAzYJcN6zMef5s03EK5R7/anfkbFSi6mfGH45P80F33NbWqu
-V+Xrn4RqOjQSMXkLEeO/Xny7mEKd8QZXiXq4acktGltscrM45LpoKZeTMINN9KPz
-IjlNwZd8ogqJ2Ic8JNHeyGXiuV39sWuxDjbZiSii8CtiMbNuFJNNQL4tOSBvgDU=
-=p4si
+iF4EAREIAAYFAk96myUACgkQdjK8w9WeBnBYawEAmSEWcV98+xVt2ZA/XrQNx9Fy
+SotQWONHl5+SdObZdUoA/2ZD9KHSyntuJjhmSeXnyFcVNfx1CmioI5L5897WI0f1
+=h03p
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/wine/wine-1.5.1.ebuild b/app-emulation/wine/wine-1.5.1.ebuild
new file mode 100644
index 000000000000..1e6804562082
--- /dev/null
+++ b/app-emulation/wine/wine-1.5.1.ebuild
@@ -0,0 +1,227 @@
+# 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.5.1.ebuild,v 1.1 2012/04/03 06:39:17 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.5"
+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:0
+	)
+	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 )
+	dev-util/pkgconfig
+	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
+}