public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "NP Hardass" <np-hardass@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/wine/
Date: Thu, 11 Aug 2016 04:29:06 +0000 (UTC)	[thread overview]
Message-ID: <1470889739.4f94144dd03977f46ba7838c83584b78692107cb.np-hardass@gentoo> (raw)

commit:     4f94144dd03977f46ba7838c83584b78692107cb
Author:     NP-Hardass <NP-Hardass <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 11 02:03:09 2016 +0000
Commit:     NP Hardass <np-hardass <AT> gentoo <DOT> org>
CommitDate: Thu Aug 11 04:28:59 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f94144d

app-emulation/wine: Version bump to 1.9.16

Package-Manager: portage-2.3.0

 app-emulation/wine/Manifest           |   3 +
 app-emulation/wine/wine-1.9.16.ebuild | 531 ++++++++++++++++++++++++++++++++++
 2 files changed, 534 insertions(+)

diff --git a/app-emulation/wine/Manifest b/app-emulation/wine/Manifest
index 24f177c..a018be2 100644
--- a/app-emulation/wine/Manifest
+++ b/app-emulation/wine/Manifest
@@ -9,6 +9,7 @@ DIST wine-1.9.12.tar.bz2 23240036 SHA256 7eff10e855127b1fcbcdb1e1d89795f4a025f8b
 DIST wine-1.9.13.tar.bz2 23299453 SHA256 9b678019d71f28f1e570f7f40e43fcdd52a0d4276123679f2dfea8665f37c0d9 SHA512 f8966384fcfb33d7d63091ae067d828da28dee41b17389d3fa1942aa6bad5e506332400f75486438299accb36f2d94ce0f4b6f7030733ffd72fa3b8cf1f1ab87 WHIRLPOOL 1d7abe1bcbdbda2a727d315bd2ecd181b344ef8b00cd753e57464386a8ad03d959317c065f80aa9920be369c1c3e3abf3186face69ff0bf85f96bf40beee7f54
 DIST wine-1.9.14.tar.bz2 23307687 SHA256 7fbe961caf171d95e1ae109e361f3a9e7cb9f6c9321775e961be2bc12892c52c SHA512 d4226fc8a421f32b00597ef62c1dc6acd39f1854584f8f41f69d48568565862419485ac97277b9caaaf6835095db77f7d93b04578f9a8eb07ca39fcd85d3f3f0 WHIRLPOOL 1ecc667b6429fc984880ef9a36b5cb14cdd3cc9cd04579afc6876628194153f714be260f3a711441b2c988a6d4751c03244062f49ca37d547d2d2d4eb12b32b5
 DIST wine-1.9.15.tar.bz2 23357574 SHA256 cf992ac991b0e49fd0b186305021acf6e612d5df18d30e3d5808fa6f6731adda SHA512 39eda9c0123453321d414690db5ca5849326bf44d116a353296e88026fa618535a306b9e0c6666ea6716dc8d44f81a2caeae11be80f15448b67bde2be9e1210a WHIRLPOOL cdaa74399ef4849a297a9d8040333500e1007ca8374b76e0677ba8b21e087feac262cf449f90826f4cd417989742670f86eed4c2fb5ef4345e8b955e8213fbef
+DIST wine-1.9.16.tar.bz2 23419636 SHA256 e120d6673aada93935c6661b75c2edc835a45a8e658b80934c36434b56940f04 SHA512 6848d53064d2eaea207ed4e5440104408cb6a6b9c62241788abce31b8d115529428427a1e3bf0e94eac43b71bd8641597060b6ea7391d1a87b36ff557a964018 WHIRLPOOL 055abf278ada0dae4eaa73b70c9426664533e941b024be688ce0a1e24a88527104cf986e8cabed9bcc17758219d93d7b218c80ba68ea3449785c22ba6d222409
 DIST wine-1.9.4.tar.bz2 22974777 SHA256 75c1eab6b980870b367a73db6e57eb0dc9242c2be8546f94084577a0ed0bbbb8 SHA512 e7b35290ec8f451163a08e841c559698a6b7264b320058e38ac788bdde66042efbb88511b30fa38383844425eaf0b6f4ed4b8412feb843ed405cb510a4a9000c WHIRLPOOL 875e11e9163df8c3473aa7b79deb5c6783a2068e678c4008cacf730d81c2f141490264a10f4345ceadd7aba100d3fc71bdfda7858f89d966d339cc2772cd8190
 DIST wine-1.9.5.tar.bz2 23034629 SHA256 fb526308e7ac5e202c0f0b663d4c7a943419d9eec766af6831caf23914300f09 SHA512 cae779353bff61c215d0969288afe6e6e5192cdf0f86f8b15073861f0a22cb6b508ceb084e9b2cb5c5c658abfec5751edf9cb48930bc97c43ecbd6953427fc07 WHIRLPOOL 7f0c29b13b67660d364b2bbc86982a92f73409cfca3e8a31817c39df36d9ad476a9762f135d85fbb947746367277576a97fb6a012f346c11454c43ef75ac9fa7
 DIST wine-1.9.6.tar.bz2 23071838 SHA256 3d2b862feefd89eca954c1cbc16a28e0ce851aeea1555bc1842ffc9aab2c1557 SHA512 d56d5b18a26b4902ac0138a4358f91a027f929a3ae70346e48b529eb7f09f7f1971bdae52d6a37dabbb598771ee5754b320e39c6ef26700202bf6be90b8b101b WHIRLPOOL 544ad527ceeb9339fd7fb35d847451dbdac79da6226cf15fb2c4be01eed3babe4c5e343236c5005553084ff83ce4e274305b5f91b2bf03a6a27d695c4ece280c
@@ -21,6 +22,7 @@ DIST wine-d3d9-1.9.12.tar.gz 46410 SHA256 e7285e15f9ce44aa210d5910facc818fbcc734
 DIST wine-d3d9-1.9.13.tar.gz 53490 SHA256 2e1c9962bd08a939f4c14f867b7566bc0ccd480628ff1418ecaa61cec6a555db SHA512 bd2e6cc975411cae56606141468bc1785f4e480d2578666d2d1aef8e7ffac51b4361067f3412e9dd147fd4c82dcccd60ff5847ced5b6d141b8c370ced1e78d40 WHIRLPOOL c5d15fd09937315e870e3548e4852becccf48ef24988a8f7e48c3afe24c5bb9f029d1da3509f237500a9569de475fef5bfa78be7207ee37cf82ad45b427a45b3
 DIST wine-d3d9-1.9.14.tar.gz 77130 SHA256 94cc4ddc639e6c541e77f807aa6ea678b5105e06e089250c6d4b37f455da7f34 SHA512 3195a6a8c2dacb4d34548f9408f12d9af8048cd41d8cba797178fc9728cc99c61e47e8ceba6801a6d9829363483064f62a07390648150f80e9e68122c9d1d5fc WHIRLPOOL 36270bf08bdd054d756594fc3d404cbb4bfe175c45d83bae75257d103d298d9e62a22c5cc69bb0dc528d4b8133fc8ad02fcb0f97157b549e4fbbd99cfab5c960
 DIST wine-d3d9-1.9.15.tar.gz 46418 SHA256 e6d8029e37c4afa8018f595ae8ee23a547782a614d5605352301685889996388 SHA512 6ad990ebd023d0125146c3b785cf38862368c3034daac6dad1a2e3a04737c5a31fbc81b562e4571ea386f515a04b50d42699b783ab15d9e3b19b12b1a7148c08 WHIRLPOOL 01a37e81fbbf99bbeab7b3c06eaadd52e8d4cf6459958465aa53d76b1717fb8bda356bae3f36c790bca29f38f80546c8d32a376f5fcb4d35f1593b647c9f5109
+DIST wine-d3d9-1.9.16.tar.gz 46413 SHA256 bf45d4ccd900147bacb7f66c7fcc28dac9d3d7a0b3c0708a0ad05f519c5a5cec SHA512 fbd5b4c9ff342740404ad4ec0f059ffed470b60f87a8b56617cf7af83a357f93dcb19f6e0ab7203bd5e0e3821cb6c6ea3b4455fbda22f09cbbd679152f259aa6 WHIRLPOOL ad70b1a683672fc83913b83b8686b2abeceaca0fc8922cb88c5a3101712cc40fbd1d9fc78af0acc48cd50c239a7e0e84f2f7776218b868b53c90a60e1f3254b1
 DIST wine-d3d9-1.9.9.tar.gz 45615 SHA256 cc6575ef97c6ff74d11d370f6af012c82b33697cb5d120d93d3d501623ef4856 SHA512 142e4c11c392a7999093c6703e3e506c365633e7ae4c2426d164e411e5d28fd0c7b00acffc0ca35c755d8ff6d8585072f6a3d3bcb8b5e32417db5597f236c4d0 WHIRLPOOL d56f84a455dc643f756fedfffdc73640cb34aa8164df747fe44f204dd7165d7b000c22de8c33c9978ad97b32b8b6d285551de8607acf75b5f079cb7eeeadb05e
 DIST wine-gentoo-2015.03.07.tar.bz2 85419 SHA256 f13f93dc49bbc33a294c4d511b6e01aec2d38bff77a1e44d07668291add1ab04 SHA512 bae1d2d5575d340d01f44008104f0e5ec0c4a4982995dec37d501594cd21d07a2b4ad4465c4273646d5bf6521996b4b82471097864be75342abe3e7d478a56bd WHIRLPOOL 0f254dd692e87a1f71dd19f6c1c8c59b8a91b994e75912a2e6e3ba5e875b85119fe497a331a95c2ce33bbf5f064143d23ee00275da92c494227de0807c9abb06
 DIST wine-mono-4.5.6.msi 53705216 SHA256 ac681f737f83742d786706529eb85f4bc8d6bdddd8dcdfa9e2e336b71973bc25 SHA512 4d8df04c1d0da09d1abe423dd271e5dd14a193d607fb54e214d2e340827f7c33829342d1580b6907d7cf466e70993d743c6e1ca9a026d4b6225dd7c1fc8b1386 WHIRLPOOL 9a68e502da0be6768e92d88f2ccace607300f3a331e0f9e1b6d60e9c6c2d4eb635b902f03e13aad73461dd5f0c2691c7b41958356ebb7f445e8def4282c675d3
@@ -37,6 +39,7 @@ DIST wine-staging-1.9.12.tar.gz 9966292 SHA256 2e48bf66c599128c5fb1049444b699da8
 DIST wine-staging-1.9.13.tar.gz 9928798 SHA256 582a896602254e4bb21cbf85f14ca3977a368a6b30fab94dbcbd17877c914252 SHA512 f6e4c3ff51df749695295eeb4945e86d0ce0eea544fb9ba0fdf9f94a8b60e347e706e3cd68f80450f74b740367e405eeb76732b12b7b2ebd519806f4c23b38f3 WHIRLPOOL 20ee971a4cd3aede47bbbec2c4dabf7081fb7a34eec87ab882cce22aa797471cd4a7da6906326b27c9059b37ab6e4291b2ce39f21023aa5986372af6725d84fc
 DIST wine-staging-1.9.14.tar.gz 9920839 SHA256 fd9e1d52d96bd405e2aa7d2d6537e31f86fee20102cb5a0ef8b452afd70667ed SHA512 8ee27a8d953ca925083bdd4a108fa940516f66f2b7d8699e63262d3a0ef5a0666a7f75e8833ad13c33ac1c397a5a9ee541df65658da64ccca93fc504f977db33 WHIRLPOOL a83add20ed265903975170a36dff3dbcaaec15e034643eeeac11365761412f67047667344be2ea532b260111893f650c75a7339fb8966cca15648ffd3f796b23
 DIST wine-staging-1.9.15.tar.gz 9926094 SHA256 10b836e4f78b7da1693cf1199f1b16c160a844a6372733817be31de67ea85150 SHA512 7eb1774381925944abe6bcbe1a8e1810b4d7f51d1f3c15bcdc15084420bfdb6f90b8edbbc0876ad87e896471ab9c9f21d14420c3ecb485aa8ead4256ff8ca60b WHIRLPOOL bcb9e7f15437a03baed57aeb082267b47a06504246f029bf31ead117a258b1b26dd70924427c0cda1526f7fab5ac1eb17a756fb5c1b2f87d8f8727923a185d4e
+DIST wine-staging-1.9.16.tar.gz 9919553 SHA256 24b0386b3bd04a2e48b5233487b2b3479d6e4042b44378ad3b9f1e04c5082a1d SHA512 bc5b1d3526fd56755a7874417eba86757295745252a0a157c14f0d02f211e1bc11530c47387f68d69b5fdb4028365e55dbd01028c36475d71d9b6d7a585ff391 WHIRLPOOL 233c8f49d379a1c59d62676fcfb332b2dc006d4424eb9440cfb9e8ec1b99c92d2f7bf8da5fe46f10f60d3d90db448ee84c3cda3c54727a6a0c14c0daa3845790
 DIST wine-staging-1.9.4.tar.gz 9719676 SHA256 1b3c6bb3e21e549fb8657cd9a2117946b7e78140b400c614dd41b041b6dc2674 SHA512 2c81b9f0315ed4f68d1874482805c9b6d3f2f9611f6dd1477ad0632d17f66e7f5e75720e5c7cef3a873876541c9d7d212fa8803a57cbec415aca32793a734634 WHIRLPOOL 0a66f53327976dd63532b9350d64461df3dcb0ea2fdc63d3498eac94d92387cf4bd53054c693c4a902f7fbba8ad0f2fdf59682e8622f3920a9a426344c656f54
 DIST wine-staging-1.9.5.tar.gz 9889302 SHA256 e12c5fb741e6c5b55b99c37d6bba1746b0f40317f27198406e63f260ede3600c SHA512 aaaf08449e956f5f2b42440f8becf7233a22f2f807041b5524fae3c25c80078b86a84e6000803e014a5d2fc089e3df78cb66f0d1fe35675ae0f4ffdfa7ba3f10 WHIRLPOOL 692da1ec383b7efbcb12c8fa4078ed9b4143eb101baa06523f5bd85c749f0b87fe9a550e4d60e3c33e3d896782c9bc957f61171d01dcadbc8847ecbbc57c40ff
 DIST wine-staging-1.9.6.tar.gz 9959130 SHA256 e9eb9990aa7f3f07931bfe158c883ebad595e58239855c7f6c01758b4d195db9 SHA512 508b5cd553a8b4a293e9250af670de693992c6f6e71e9e3759408b1e8745985030fbcb78c83ae6669e73e48caf95c3a6f0c92da0a96791912d7e6c4d29a26bd2 WHIRLPOOL 2ebc3ca7ea38d2fda310567083f28b76c4f0120dce659152ccacf95eb07de3dfe8950eb9b306b1a91b30ded8e3914f5852f7928e735659c2b02eb50d82fe0fca

diff --git a/app-emulation/wine/wine-1.9.16.ebuild b/app-emulation/wine/wine-1.9.16.ebuild
new file mode 100644
index 0000000..8bedf34
--- /dev/null
+++ b/app-emulation/wine/wine-1.9.16.ebuild
@@ -0,0 +1,531 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv te th tr uk wa zh_CN zh_TW"
+PLOCALE_BACKUP="en"
+
+inherit autotools eutils fdo-mime flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx versionator
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="git://source.winehq.org/git/wine.git http://source.winehq.org/git/wine.git"
+	EGIT_BRANCH="master"
+	inherit git-r3
+	SRC_URI=""
+	#KEYWORDS=""
+else
+	MAJOR_V=$(get_version_component_range 1-2)
+	SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}/${P}.tar.bz2"
+	KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
+fi
+
+VANILLA_GV="2.47"
+VANILLA_MV="4.6.3"
+STAGING_GV="2.47"
+STAGING_MV="4.6.3"
+[[ ${MAJOR_V} == "1.8" ]] && SUFFIX="-unofficial"
+STAGING_P="wine-staging-${PV}"
+STAGING_DIR="${WORKDIR}/${STAGING_P}${SUFFIX}"
+D3D9_P="wine-d3d9-${PV}"
+D3D9_DIR="${WORKDIR}/wine-d3d9-patches-${D3D9_P}"
+WINE_GENTOO="wine-gentoo-2015.03.07"
+DESCRIPTION="Free implementation of Windows(tm) on Unix"
+HOMEPAGE="http://www.winehq.org/"
+SRC_URI="${SRC_URI}
+	!staging? (
+		gecko? (
+			abi_x86_32? ( https://dl.winehq.org/wine/wine-gecko/${VANILLA_GV}/wine_gecko-${VANILLA_GV}-x86.msi )
+			abi_x86_64? ( https://dl.winehq.org/wine/wine-gecko/${VANILLA_GV}/wine_gecko-${VANILLA_GV}-x86_64.msi )
+		)
+		mono? ( https://dl.winehq.org/wine/wine-mono/${VANILLA_MV}/wine-mono-${VANILLA_MV}.msi )
+	)
+	staging? (
+		gecko? (
+			abi_x86_32? ( https://dl.winehq.org/wine/wine-gecko/${STAGING_GV}/wine_gecko-${STAGING_GV}-x86.msi )
+			abi_x86_64? ( https://dl.winehq.org/wine/wine-gecko/${STAGING_GV}/wine_gecko-${STAGING_GV}-x86_64.msi )
+		)
+		mono? ( https://dl.winehq.org/wine/wine-mono/${STAGING_MV}/wine-mono-${STAGING_MV}.msi )
+	)
+	https://dev.gentoo.org/~tetromino/distfiles/${PN}/${WINE_GENTOO}.tar.bz2"
+
+if [[ ${PV} == "9999" ]] ; then
+	STAGING_EGIT_REPO_URI="git://github.com/wine-compholio/wine-staging.git"
+	D3D9_EGIT_REPO_URI="git://github.com/sarnex/wine-d3d9-patches.git"
+else
+	SRC_URI="${SRC_URI}
+	staging? ( https://github.com/wine-compholio/wine-staging/archive/v${PV}${SUFFIX}.tar.gz -> ${STAGING_P}.tar.gz )
+	d3d9? ( https://github.com/sarnex/wine-d3d9-patches/archive/${D3D9_P}.tar.gz )"
+fi
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags d3d9 dos elibc_glibc +fontconfig +gecko gphoto2 gsm gstreamer +jpeg kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pipelight +png prelink pulseaudio +realtime +run-exes s3tc samba scanner selinux +ssl staging test themes +threads +truetype +udisks v4l vaapi +X +xcomposite xinerama +xml"
+REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
+	X? ( truetype )
+	elibc_glibc? ( threads )
+	osmesa? ( opengl )
+	pipelight? ( staging )
+	s3tc? ( staging )
+	test? ( abi_x86_32 )
+	themes? ( staging )
+	vaapi? ( staging )" # osmesa-opengl #286560 # X-truetype #551124
+
+# FIXME: the test suite is unsuitable for us; many tests require net access
+# or fail due to Xvfb's opengl limitations.
+RESTRICT="test"
+
+COMMON_DEPEND="
+	X? (
+		x11-libs/libXcursor[${MULTILIB_USEDEP}]
+		x11-libs/libXext[${MULTILIB_USEDEP}]
+		x11-libs/libXrandr[${MULTILIB_USEDEP}]
+		x11-libs/libXi[${MULTILIB_USEDEP}]
+		x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
+	)
+	alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
+	capi? ( net-libs/libcapi[${MULTILIB_USEDEP}] )
+	cups? ( net-print/cups:=[${MULTILIB_USEDEP}] )
+	d3d9? (
+		media-libs/mesa[d3d9,egl,${MULTILIB_USEDEP}]
+		x11-libs/libX11[${MULTILIB_USEDEP}]
+		x11-libs/libXext[${MULTILIB_USEDEP}]
+		x11-libs/libxcb[${MULTILIB_USEDEP}]
+	)
+	fontconfig? ( media-libs/fontconfig:=[${MULTILIB_USEDEP}] )
+	gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] )
+	gsm? ( media-sound/gsm:=[${MULTILIB_USEDEP}] )
+	gstreamer? (
+		media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
+		media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}]
+	)
+	jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] )
+	lcms? ( media-libs/lcms:2=[${MULTILIB_USEDEP}] )
+	ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] )
+	mp3? ( >=media-sound/mpg123-1.5.0[${MULTILIB_USEDEP}] )
+	ncurses? ( >=sys-libs/ncurses-5.2:0=[${MULTILIB_USEDEP}] )
+	netapi? ( net-fs/samba[netapi(+),${MULTILIB_USEDEP}] )
+	nls? ( sys-devel/gettext[${MULTILIB_USEDEP}] )
+	odbc? ( dev-db/unixODBC:=[${MULTILIB_USEDEP}] )
+	openal? ( media-libs/openal:=[${MULTILIB_USEDEP}] )
+	opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
+	opengl? (
+		virtual/glu[${MULTILIB_USEDEP}]
+		virtual/opengl[${MULTILIB_USEDEP}]
+	)
+	osmesa? ( media-libs/mesa[osmesa,${MULTILIB_USEDEP}] )
+	pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] )
+	png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] )
+	pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )
+	scanner? ( media-gfx/sane-backends:=[${MULTILIB_USEDEP}] )
+	ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] )
+	staging? ( sys-apps/attr[${MULTILIB_USEDEP}] )
+	themes? (
+		dev-libs/glib:2[${MULTILIB_USEDEP}]
+		x11-libs/cairo[${MULTILIB_USEDEP}]
+		x11-libs/gtk+:3[${MULTILIB_USEDEP}]
+	)
+	truetype? ( >=media-libs/freetype-2.0.0[${MULTILIB_USEDEP}] )
+	udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
+	v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
+	vaapi? ( x11-libs/libva[X,${MULTILIB_USEDEP}] )
+	xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
+	xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
+	xml? (
+		dev-libs/libxml2[${MULTILIB_USEDEP}]
+		dev-libs/libxslt[${MULTILIB_USEDEP}]
+	)
+	abi_x86_32? (
+		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+		!<app-emulation/emul-linux-x86-baselibs-20140508-r14
+		!app-emulation/emul-linux-x86-db[-abi_x86_32(-)]
+		!<app-emulation/emul-linux-x86-db-20140508-r3
+		!app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)]
+		!<app-emulation/emul-linux-x86-medialibs-20140508-r6
+		!app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)]
+		!<app-emulation/emul-linux-x86-opengl-20140508-r1
+		!app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)]
+		!<app-emulation/emul-linux-x86-sdl-20140508-r1
+		!app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)]
+		!<app-emulation/emul-linux-x86-soundlibs-20140508
+		!app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
+		!<app-emulation/emul-linux-x86-xlibs-20140508
+	)"
+
+RDEPEND="${COMMON_DEPEND}
+	dos? ( >=games-emulation/dosbox-0.74_p20160629 )
+	perl? (
+		dev-lang/perl
+		dev-perl/XML-Simple
+	)
+	pulseaudio? (
+		realtime? ( sys-auth/rtkit )
+	)
+	s3tc? ( >=media-libs/libtxc_dxtn-1.0.1-r1[${MULTILIB_USEDEP}] )
+	samba? ( >=net-fs/samba-3.0.25[winbind] )
+	selinux? ( sec-policy/selinux-wine )
+	udisks? ( sys-fs/udisks:2 )"
+
+# tools/make_requests requires perl
+DEPEND="${COMMON_DEPEND}
+	sys-devel/flex
+	>=sys-kernel/linux-headers-2.6
+	virtual/pkgconfig
+	virtual/yacc
+	X? (
+		x11-proto/inputproto
+		x11-proto/xextproto
+		x11-proto/xf86vidmodeproto
+	)
+	prelink? ( sys-devel/prelink )
+	staging? (
+		dev-lang/perl
+		dev-perl/XML-Simple
+	)
+	xinerama? ( x11-proto/xineramaproto )"
+
+# These use a non-standard "Wine" category, which is provided by
+# /etc/xdg/applications-merged/wine.menu
+QA_DESKTOP_FILE="usr/share/applications/wine-browsedrive.desktop
+usr/share/applications/wine-notepad.desktop
+usr/share/applications/wine-uninstaller.desktop
+usr/share/applications/wine-winecfg.desktop"
+
+wine_compiler_check() {
+	[[ ${MERGE_TYPE} = "binary" ]] && return 0
+
+	# GCC-specific bugs
+	if tc-is-gcc; then
+		# bug #549768
+		if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then
+			ebegin "Checking for gcc-5 ms_abi compiler bug"
+			$(tc-getCC) -O2 "${FILESDIR}"/pr66838.c -o "${T}"/pr66838 || die
+			# Run in subshell to prevent "Aborted" message
+			( "${T}"/pr66838 || false ) >/dev/null 2>&1
+			if ! eend $?; then
+				eerror "64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0"
+				eerror "due to compiler bugs; please re-emerge the latest gcc-5.2.x ebuild,"
+				eerror "or use gcc-config to select a different compiler version."
+				eerror "See https://bugs.gentoo.org/549768"
+				eerror
+				return 1
+			fi
+		fi
+		# bug #574044
+		if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then
+			ebegin "Checking for gcc-5-3 stack realignment compiler bug"
+			# Compile in subshell to prevent "Aborted" message
+			( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${FILESDIR}"/pr69140.c -o "${T}"/pr69140 ) >/dev/null 2>&1
+			if ! eend $?; then
+				eerror "Wine cannot be built with this version of gcc-5.3"
+				eerror "due to compiler bugs; please re-emerge the latest gcc-5.3.x ebuild,"
+				eerror "or use gcc-config to select a different compiler version."
+				eerror "See https://bugs.gentoo.org/574044"
+				eerror
+				return 1
+			fi
+		fi
+	fi
+
+	# Ensure compiler support
+	if use abi_x86_64; then
+		ebegin "Checking for 64-bit compiler with builtin_ms_va_list support"
+		# Compile in subshell to prevent "Aborted" message
+		( $(tc-getCC) -O2 "${FILESDIR}"/builtin_ms_va_list.c -o "${T}"/builtin_ms_va_list >/dev/null 2>&1)
+		if ! eend $?; then
+			eerror "This version of $(tc-getCC) does not support builtin_ms_va_list, can't enable 64-bit wine"
+			eerror
+			eerror "You need gcc-4.4+ or clang 3.8+ to build 64-bit wine"
+			eerror
+			return 1
+		fi
+	fi
+}
+
+wine_build_environment_check() {
+	[[ ${MERGE_TYPE} = "binary" ]] && return 0
+
+	if use abi_x86_32 && use opencl && [[ "$(eselect opencl show 2> /dev/null)" == "intel" ]]; then
+		eerror "You cannot build wine with USE=opencl because intel-ocl-sdk is 64-bit only."
+		eerror "See https://bugs.gentoo.org/487864 for more details."
+		eerror
+		return 1
+	fi
+}
+
+pkg_pretend() {
+	wine_compiler_check || die
+	wine_build_environment_check || die
+
+	# Verify OSS support
+	if use oss && ! use kernel_FreeBSD; then
+		if ! has_version ">=media-sound/oss-4"; then
+			eerror "You cannot build wine with USE=oss without having support from a"
+			eerror "FreeBSD kernel or >=media-sound/oss-4 (only available through external repos)"
+			eerror
+			die
+		fi
+	fi
+}
+
+pkg_setup() {
+	wine_build_environment_check || die
+	if ! use staging; then
+		GV=${VANILLA_GV}
+		MV=${VANILLA_MV}
+	else
+		GV=${STAGING_GV}
+		MV=${STAGING_MV}
+	fi
+}
+
+src_unpack() {
+	if [[ ${PV} == "9999" ]] ; then
+		git-r3_src_unpack
+		if use staging; then
+			local WINE_COMMIT=${EGIT_VERSION}
+
+			git-r3_fetch "${STAGING_EGIT_REPO_URI}"
+			git-r3_checkout "${STAGING_EGIT_REPO_URI}" "${STAGING_DIR}"
+
+			local STAGING_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die
+
+			if [[ "${WINE_COMMIT}" != "${STAGING_COMMIT}" ]]; then
+				einfo "The current Staging patchset is not guaranteed to apply on this WINE commit."
+				einfo "If src_prepare fails, try emerging with the env var EGIT_COMMIT."
+				einfo "Example: EGIT_COMMIT=${STAGING_COMMIT} emerge -1 wine"
+			fi
+		fi
+		if use d3d9; then
+			git-r3_fetch "${D3D9_EGIT_REPO_URI}"
+			git-r3_checkout "${D3D9_EGIT_REPO_URI}" "${D3D9_DIR}"
+		fi
+	fi
+
+	default
+
+	l10n_find_plocales_changes "${S}/po" "" ".po"
+}
+
+src_prepare() {
+	local md5="$(md5sum server/protocol.def)"
+	local PATCHES=(
+		"${FILESDIR}"/${PN}-1.5.26-winegcc.patch #260726
+		"${FILESDIR}"/${PN}-1.9.5-multilib-portage.patch #395615
+		"${FILESDIR}"/${PN}-1.7.12-osmesa-check.patch #429386
+		"${FILESDIR}"/${PN}-1.6-memset-O3.patch #480508
+	)
+	if use staging; then
+		ewarn "Applying the Wine-Staging patchset. Any bug reports to the"
+		ewarn "Wine bugzilla should explicitly state that staging was used."
+
+		local STAGING_EXCLUDE=""
+		use pipelight || STAGING_EXCLUDE="${STAGING_EXCLUDE} -W Pipelight"
+
+		# Launch wine-staging patcher in a subshell, using epatch as a backend, and gitapply.sh as a backend for binary patches
+		ebegin "Running Wine-Staging patch installer"
+		(
+			set -- DESTDIR="${S}" --backend=epatch --no-autoconf --all ${STAGING_EXCLUDE}
+			cd "${STAGING_DIR}/patches"
+			source "${STAGING_DIR}/patches/patchinstall.sh"
+		)
+		eend $? || die "Failed to apply Wine-Staging patches"
+
+		# To differentiate unofficial staging releases
+		if [[ ! -z ${SUFFIX} ]]; then
+			sed -i "s/(Staging)/(Staging [Unofficial])/" libs/wine/Makefile.in || die
+		fi
+	fi
+	if use d3d9; then
+		if use staging; then
+			PATCHES+=( "${D3D9_DIR}/staging-helper.patch" )
+		else
+			PATCHES+=( "${D3D9_DIR}/d3d9-helper.patch" )
+		fi
+		PATCHES+=( "${D3D9_DIR}/wine-d3d9.patch" )
+	fi
+
+	default
+	eautoreconf
+
+	# Modification of the server protocol requires regenerating the server requests
+	if [[ "$(md5sum server/protocol.def)" != "${md5}" ]]; then
+		einfo "server/protocol.def was patched; running tools/make_requests"
+		tools/make_requests || die #432348
+	fi
+	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
+	if ! use run-exes; then
+		sed -i '/^MimeType/d' loader/wine.desktop || die #117785
+	fi
+
+	# hi-res default icon, #472990, http://bugs.winehq.org/show_bug.cgi?id=24652
+	cp "${WORKDIR}"/${WINE_GENTOO}/icons/oic_winlogo.ico dlls/user32/resources/ || die
+
+	l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
+}
+
+src_configure() {
+	export LDCONFIG=/bin/true
+	use custom-cflags || strip-flags
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local myconf=(
+		--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 ssl gnutls)
+		$(use_enable gecko mshtml)
+		$(use_with gphoto2 gphoto)
+		$(use_with gsm)
+		$(use_with gstreamer)
+		--without-hal
+		$(use_with jpeg)
+		$(use_with ldap)
+		$(use_enable mono mscoree)
+		$(use_with mp3 mpg123)
+		$(use_with netapi)
+		$(use_with nls gettext)
+		$(use_with openal)
+		$(use_with opencl)
+		$(use_with opengl)
+		$(use_with osmesa)
+		$(use_with oss)
+		$(use_with pcap)
+		$(use_with png)
+		$(use_with pulseaudio pulse)
+		$(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)
+	)
+
+	use staging && myconf+=(
+		--with-xattr
+		$(use_with themes gtk3)
+		$(use_with vaapi va)
+	)
+	use d3d9 && myconf+=( $(use_with d3d9 d3dadapter) )
+
+	local PKG_CONFIG AR RANLIB
+	# Avoid crossdev's i686-pc-linux-gnu-pkg-config if building wine32 on amd64; #472038
+	# set AR and RANLIB to make QA scripts happy; #483342
+	tc-export PKG_CONFIG AR RANLIB
+
+	if use amd64; then
+		if [[ ${ABI} == amd64 ]]; then
+			myconf+=( --enable-win64 )
+		else
+			myconf+=( --disable-win64 )
+		fi
+
+		# Note: using --with-wine64 results in problems with multilib.eclass
+		# CC/LD hackery. We're using separate tools instead.
+	fi
+
+	ECONF_SOURCE=${S} \
+	econf "${myconf[@]}"
+	emake depend
+}
+
+multilib_src_test() {
+	# FIXME: win32-only; wine64 tests fail with "could not find the Wine loader"
+	if [[ ${ABI} == x86 ]]; then
+		if [[ $(id -u) == 0 ]]; then
+			ewarn "Skipping tests since they cannot be run under the root user."
+			ewarn "To run the test ${PN} suite, add userpriv to FEATURES in make.conf"
+			return
+		fi
+
+		WINEPREFIX="${T}/.wine-${ABI}" \
+		Xemake test
+	fi
+}
+
+multilib_src_install_all() {
+	local DOCS=( ANNOUNCE AUTHORS README )
+	local l
+	add_locale_docs() {
+		local locale_doc="documentation/README.$1"
+		[[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
+	}
+	l10n_for_each_locale_do add_locale_docs
+
+	einstalldocs
+	prune_libtool_files --all
+
+	emake -C "../${WINE_GENTOO}" install DESTDIR="${D}" EPREFIX="${EPREFIX}"
+	if use gecko ; then
+		insinto /usr/share/wine/gecko
+		use abi_x86_32 && doins "${DISTDIR}"/wine_gecko-${GV}-x86.msi
+		use abi_x86_64 && doins "${DISTDIR}"/wine_gecko-${GV}-x86_64.msi
+	fi
+	if use mono ; then
+		insinto /usr/share/wine/mono
+		doins "${DISTDIR}"/wine-mono-${MV}.msi
+	fi
+	if ! use perl ; then # winedump calls function_grep.pl, and winemaker is a perl script
+		rm "${D}"usr/bin/{wine{dump,maker},function_grep.pl} "${D}"usr/share/man/man1/wine{dump,maker}.1 || die
+	fi
+
+	# Remove wineconsole if neither backend is installed #551124
+	if ! use X && ! use ncurses; then
+		rm	"${D}"/usr/{bin/,man/man1/}wineconsole* || die
+		use abi_x86_32 && rm "${D}"/usr/lib32/wine/{,fakedlls/}wineconsole.exe* || die
+		use abi_x86_64 && rm "${D}"/usr/lib64/wine/{,fakedlls/}wineconsole.exe* || die
+	fi
+
+	use abi_x86_32 && pax-mark psmr "${D}"usr/bin/wine{,-preloader} #255055
+	use abi_x86_64 && pax-mark psmr "${D}"usr/bin/wine64{,-preloader}
+
+	if use abi_x86_64 && ! use abi_x86_32; then
+		dosym /usr/bin/wine{64,} # 404331
+		dosym /usr/bin/wine{64,}-preloader
+	fi
+
+	# respect LINGUAS when installing man pages, #469418
+	for l in de fr pl; do
+		use linguas_${l} || rm -r "${D}"usr/share/man/${l}*
+	done
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	fdo-mime_desktop_database_update
+
+	if ! use gecko; then
+		ewarn "Without Wine Gecko, wine prefixes will not have a default"
+		ewarn "implementation of iexplore.  Many older windows applications"
+		ewarn "rely upon the existence of an iexplore implementation, so"
+		ewarn "you will likely need to install an external one, like via winetricks"
+	fi
+	if ! use mono; then
+		ewarn "Without Wine Mono, wine prefixes will not have a default"
+		ewarn "implementation of .NET.  Many windows applications rely upon"
+		ewarn "the existence of a .NET implementation, so you will likely need"
+		ewarn "to install an external one, like via winetricks"
+	fi
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	fdo-mime_desktop_database_update
+}


             reply	other threads:[~2016-08-11  4:29 UTC|newest]

Thread overview: 86+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-08-11  4:29 NP Hardass [this message]
  -- strict thread matches above, loose matches on Subject: below --
2018-01-05 18:39 [gentoo-commits] repo/gentoo:master commit in: app-emulation/wine/ Ulrich Müller
2017-08-23 17:10 Michał Górny
2017-04-29 20:52 NP Hardass
2017-03-23  9:24 NP Hardass
2017-03-23  9:24 NP Hardass
2017-03-23  9:24 NP Hardass
2017-03-23  9:24 NP Hardass
2017-03-13  4:52 NP Hardass
2017-03-13  4:52 NP Hardass
2017-03-13  0:47 NP Hardass
2017-03-12 21:26 NP Hardass
2017-01-25 23:02 NP Hardass
2017-01-19  0:09 NP Hardass
2017-01-09 18:52 NP Hardass
2017-01-09 18:50 NP Hardass
2017-01-09 18:09 NP Hardass
2017-01-02 17:36 Lars Wendler
2016-12-31  2:23 NP Hardass
2016-12-31  2:23 NP Hardass
2016-12-31  2:23 NP Hardass
2016-12-30 22:43 NP Hardass
2016-11-29 21:23 Austin English
2016-10-03 16:38 NP Hardass
2016-09-20 16:05 NP Hardass
2016-09-19 21:18 NP Hardass
2016-09-12  2:01 NP Hardass
2016-09-06 21:31 NP Hardass
2016-09-06 21:31 NP Hardass
2016-09-06 21:31 NP Hardass
2016-09-05  3:31 NP Hardass
2016-08-24 19:07 NP Hardass
2016-08-24 19:07 NP Hardass
2016-08-24 19:07 NP Hardass
2016-08-11  4:29 NP Hardass
2016-08-11  4:29 NP Hardass
2016-07-24 23:27 NP Hardass
2016-07-24 23:27 NP Hardass
2016-07-19  4:47 NP Hardass
2016-07-11 17:49 NP Hardass
2016-07-10 21:58 NP Hardass
2016-07-10 17:42 NP Hardass
2016-07-10 13:10 NP Hardass
2016-06-26  3:45 Austin English
2016-06-07 17:13 NP Hardass
2016-06-07  3:20 Austin English
2016-06-06 19:28 Pacho Ramos
2016-06-01  5:32 NP Hardass
2016-06-01  5:32 NP Hardass
2016-05-13  1:50 NP Hardass
2016-05-13  1:50 NP Hardass
2016-05-13  1:50 NP Hardass
2016-04-24 22:11 NP Hardass
2016-04-22  4:48 NP Hardass
2016-04-22  4:48 NP Hardass
2016-04-22  4:48 NP Hardass
2016-04-22  4:48 NP Hardass
2016-04-19 17:08 NP Hardass
2016-04-19 17:08 NP Hardass
2016-04-19 17:08 NP Hardass
2016-04-10 22:55 NP Hardass
2016-04-09 18:15 NP Hardass
2016-04-09 18:15 NP Hardass
2016-04-09  6:01 NP Hardass
2016-04-09  6:01 NP Hardass
2016-03-13  3:05 NP Hardass
2016-03-12 21:36 NP Hardass
2016-03-11 21:20 NP Hardass
2016-03-06  2:57 NP Hardass
2016-03-06  2:57 NP Hardass
2016-01-30  5:34 NP Hardass
2016-01-24  9:22 NP Hardass
2016-01-19  2:04 NP Hardass
2016-01-19  2:04 NP Hardass
2016-01-19  2:04 NP Hardass
2015-12-31 23:37 NP Hardass
2015-11-17 17:56 NP Hardass
2015-11-16  7:58 NP Hardass
2015-11-15 22:12 NP Hardass
2015-11-15 19:38 NP Hardass
2015-11-14  0:26 NP Hardass
2015-09-09  0:23 NP Hardass
2015-09-08 22:17 NP Hardass
2015-08-31  0:16 Alexandre Rostovtsev
2015-08-26  4:44 Alexandre Rostovtsev
2015-08-26  4:44 Alexandre Rostovtsev

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1470889739.4f94144dd03977f46ba7838c83584b78692107cb.np-hardass@gentoo \
    --to=np-hardass@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox