diff options
28 files changed, 566 insertions, 52 deletions
diff --git a/app-emulation/wine/ChangeLog b/app-emulation/wine/ChangeLog index 904ff5f03b6d..6da5b806d25c 100644 --- a/app-emulation/wine/ChangeLog +++ b/app-emulation/wine/ChangeLog @@ -1,6 +1,21 @@ # ChangeLog for app-emulation/wine -# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.525 2014/12/29 06:01:47 tetromino Exp $ +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.526 2015/01/01 21:01:23 ryao Exp $ + +*wine-1.7.33 (01 Jan 2015) + + 01 Jan 2015; Richard Yao <ryao@gentoo.org> +wine-1.7.33.ebuild, metadata.xml, + wine-1.2.3.ebuild, wine-1.3.28.ebuild, wine-1.4.1.ebuild, wine-1.6.2.ebuild, + wine-1.7.0.ebuild, wine-1.7.10.ebuild, wine-1.7.11.ebuild, wine-1.7.12.ebuild, + wine-1.7.13.ebuild, wine-1.7.14.ebuild, wine-1.7.15.ebuild, + wine-1.7.16.ebuild, wine-1.7.17.ebuild, wine-1.7.18.ebuild, + wine-1.7.19-r1.ebuild, wine-1.7.20.ebuild, wine-1.7.21.ebuild, + wine-1.7.22.ebuild, wine-1.7.28.ebuild, wine-1.7.29.ebuild, wine-1.7.3.ebuild, + wine-1.7.4.ebuild, wine-1.7.8.ebuild, wine-1.7.9.ebuild, wine-9999.ebuild: + Version bump, see http://www.winehq.org/announce/1.7.33 for the announcement. + New USE flag pcap. It was originally added in wine 1.7.25, but the requisite + work in the portage tree for multilib compatibility was not done then, so it + was disabled until now. 29 Dec 2014; Alexandre Rostovtsev <tetromino@gentoo.org> wine-1.2.3.ebuild, wine-1.3.28.ebuild, wine-1.4.1.ebuild, -wine-1.6.1.ebuild: diff --git a/app-emulation/wine/metadata.xml b/app-emulation/wine/metadata.xml index 4288bf6969ea..2c9b917d9e74 100644 --- a/app-emulation/wine/metadata.xml +++ b/app-emulation/wine/metadata.xml @@ -16,6 +16,7 @@ Think of Wine as a compatibility layer for running Windows programs. Wine does n <flag name='netapi'>Use libnetapi from <pkg>net-fs/samba</pkg> to support Windows networks in netapi32.dll</flag> <flag name='opencl'>Enable OpenCL support</flag> <flag name='osmesa'>Add support for OpenGL in bitmaps using libOSMesa</flag> + <flag name='pcap'>Support packet capture software (e.g. wireshark)</flag> <flag name='perl'>Install helpers written in perl (winedump/winemaker)</flag> <flag name='pipelight'>Apply unofficial Compholio patches for Pipelight/Silverlight support; use at your own peril</flag> diff --git a/app-emulation/wine/wine-1.2.3.ebuild b/app-emulation/wine/wine-1.2.3.ebuild index ff27d85791dc..b1ab41d246b7 100644 --- a/app-emulation/wine/wine-1.2.3.ebuild +++ b/app-emulation/wine/wine-1.2.3.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.2.3.ebuild,v 1.27 2014/12/29 06:01:47 tetromino Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.2.3.ebuild,v 1.28 2015/01/01 21:01:23 ryao Exp $ EAPI="5" diff --git a/app-emulation/wine/wine-1.3.28.ebuild b/app-emulation/wine/wine-1.3.28.ebuild index 23a3ead1ccb8..b8fa465cda24 100644 --- a/app-emulation/wine/wine-1.3.28.ebuild +++ b/app-emulation/wine/wine-1.3.28.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.28.ebuild,v 1.19 2014/12/29 06:01:47 tetromino Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.28.ebuild,v 1.20 2015/01/01 21:01:23 ryao Exp $ EAPI="5" diff --git a/app-emulation/wine/wine-1.4.1.ebuild b/app-emulation/wine/wine-1.4.1.ebuild index 30b27fca7a55..f366993f966f 100644 --- a/app-emulation/wine/wine-1.4.1.ebuild +++ b/app-emulation/wine/wine-1.4.1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.4.1.ebuild,v 1.14 2014/12/29 06:01:47 tetromino Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.4.1.ebuild,v 1.15 2015/01/01 21:01:23 ryao Exp $ EAPI="5" diff --git a/app-emulation/wine/wine-1.6.2.ebuild b/app-emulation/wine/wine-1.6.2.ebuild index 6a9418ece366..0d9d0a93e759 100644 --- a/app-emulation/wine/wine-1.6.2.ebuild +++ b/app-emulation/wine/wine-1.6.2.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.6.2.ebuild,v 1.7 2014/12/16 14:55:03 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.6.2.ebuild,v 1.8 2015/01/01 21:01:23 ryao Exp $ EAPI="5" diff --git a/app-emulation/wine/wine-1.7.0.ebuild b/app-emulation/wine/wine-1.7.0.ebuild index 0ebe778b7da3..4062567a2437 100644 --- a/app-emulation/wine/wine-1.7.0.ebuild +++ b/app-emulation/wine/wine-1.7.0.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.0.ebuild,v 1.11 2014/12/16 14:55:03 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.0.ebuild,v 1.12 2015/01/01 21:01:23 ryao Exp $ EAPI="5" diff --git a/app-emulation/wine/wine-1.7.10.ebuild b/app-emulation/wine/wine-1.7.10.ebuild index e8114249313a..febffdac02d0 100644 --- a/app-emulation/wine/wine-1.7.10.ebuild +++ b/app-emulation/wine/wine-1.7.10.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.10.ebuild,v 1.5 2014/12/16 14:55:03 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.10.ebuild,v 1.6 2015/01/01 21:01:23 ryao Exp $ EAPI="5" diff --git a/app-emulation/wine/wine-1.7.11.ebuild b/app-emulation/wine/wine-1.7.11.ebuild index 5003e13d9a72..280a80abf941 100644 --- a/app-emulation/wine/wine-1.7.11.ebuild +++ b/app-emulation/wine/wine-1.7.11.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.11.ebuild,v 1.5 2014/12/16 14:55:03 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.11.ebuild,v 1.6 2015/01/01 21:01:23 ryao Exp $ EAPI="5" diff --git a/app-emulation/wine/wine-1.7.12.ebuild b/app-emulation/wine/wine-1.7.12.ebuild index 562cb58c7257..78ad218b6a75 100644 --- a/app-emulation/wine/wine-1.7.12.ebuild +++ b/app-emulation/wine/wine-1.7.12.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.12.ebuild,v 1.5 2014/12/16 14:55:03 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.12.ebuild,v 1.6 2015/01/01 21:01:23 ryao Exp $ EAPI="5" diff --git a/app-emulation/wine/wine-1.7.13.ebuild b/app-emulation/wine/wine-1.7.13.ebuild index a0b093a5c7a3..76b6c6e9466e 100644 --- a/app-emulation/wine/wine-1.7.13.ebuild +++ b/app-emulation/wine/wine-1.7.13.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.13.ebuild,v 1.5 2014/12/16 14:55:03 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.13.ebuild,v 1.6 2015/01/01 21:01:23 ryao Exp $ EAPI="5" diff --git a/app-emulation/wine/wine-1.7.14.ebuild b/app-emulation/wine/wine-1.7.14.ebuild index ab216bce355c..62dc0f974c7c 100644 --- a/app-emulation/wine/wine-1.7.14.ebuild +++ b/app-emulation/wine/wine-1.7.14.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.14.ebuild,v 1.4 2014/12/16 14:55:03 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.14.ebuild,v 1.5 2015/01/01 21:01:23 ryao Exp $ EAPI="5" diff --git a/app-emulation/wine/wine-1.7.15.ebuild b/app-emulation/wine/wine-1.7.15.ebuild index e39dbe9b7bd3..adb11106ce92 100644 --- a/app-emulation/wine/wine-1.7.15.ebuild +++ b/app-emulation/wine/wine-1.7.15.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.15.ebuild,v 1.4 2014/12/16 14:55:03 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.15.ebuild,v 1.5 2015/01/01 21:01:23 ryao Exp $ EAPI="5" diff --git a/app-emulation/wine/wine-1.7.16.ebuild b/app-emulation/wine/wine-1.7.16.ebuild index eeafd0576409..1b7b2feb60f5 100644 --- a/app-emulation/wine/wine-1.7.16.ebuild +++ b/app-emulation/wine/wine-1.7.16.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.16.ebuild,v 1.4 2014/12/16 14:55:03 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.16.ebuild,v 1.5 2015/01/01 21:01:23 ryao Exp $ EAPI="5" diff --git a/app-emulation/wine/wine-1.7.17.ebuild b/app-emulation/wine/wine-1.7.17.ebuild index edb3fdbb3317..2cd41e0c6f36 100644 --- a/app-emulation/wine/wine-1.7.17.ebuild +++ b/app-emulation/wine/wine-1.7.17.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.17.ebuild,v 1.4 2014/12/16 14:55:03 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.17.ebuild,v 1.5 2015/01/01 21:01:23 ryao Exp $ EAPI="5" diff --git a/app-emulation/wine/wine-1.7.18.ebuild b/app-emulation/wine/wine-1.7.18.ebuild index 96e5218b4061..798c909f1c4d 100644 --- a/app-emulation/wine/wine-1.7.18.ebuild +++ b/app-emulation/wine/wine-1.7.18.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.18.ebuild,v 1.4 2014/12/16 14:55:03 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.18.ebuild,v 1.5 2015/01/01 21:01:23 ryao Exp $ EAPI="5" diff --git a/app-emulation/wine/wine-1.7.19-r1.ebuild b/app-emulation/wine/wine-1.7.19-r1.ebuild index e8c1d05af430..e3e8f53c203b 100644 --- a/app-emulation/wine/wine-1.7.19-r1.ebuild +++ b/app-emulation/wine/wine-1.7.19-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.19-r1.ebuild,v 1.6 2014/06/18 19:08:46 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.19-r1.ebuild,v 1.7 2015/01/01 21:01:23 ryao Exp $ EAPI="5" diff --git a/app-emulation/wine/wine-1.7.20.ebuild b/app-emulation/wine/wine-1.7.20.ebuild index 0852e2f2a60a..afee4c3940a0 100644 --- a/app-emulation/wine/wine-1.7.20.ebuild +++ b/app-emulation/wine/wine-1.7.20.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.20.ebuild,v 1.2 2014/06/18 19:08:47 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.20.ebuild,v 1.3 2015/01/01 21:01:23 ryao Exp $ EAPI="5" diff --git a/app-emulation/wine/wine-1.7.21.ebuild b/app-emulation/wine/wine-1.7.21.ebuild index 03d60fcb15ae..c8c534afb7d9 100644 --- a/app-emulation/wine/wine-1.7.21.ebuild +++ b/app-emulation/wine/wine-1.7.21.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.21.ebuild,v 1.1 2014/06/29 00:42:47 tetromino Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.21.ebuild,v 1.2 2015/01/01 21:01:23 ryao Exp $ EAPI="5" diff --git a/app-emulation/wine/wine-1.7.22.ebuild b/app-emulation/wine/wine-1.7.22.ebuild index 89959ec462d9..70f69404e88c 100644 --- a/app-emulation/wine/wine-1.7.22.ebuild +++ b/app-emulation/wine/wine-1.7.22.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.22.ebuild,v 1.1 2014/10/05 13:17:36 ryao Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.22.ebuild,v 1.2 2015/01/01 21:01:23 ryao Exp $ EAPI="5" diff --git a/app-emulation/wine/wine-1.7.28.ebuild b/app-emulation/wine/wine-1.7.28.ebuild index f93fd1f053ee..37ec58490f6d 100644 --- a/app-emulation/wine/wine-1.7.28.ebuild +++ b/app-emulation/wine/wine-1.7.28.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.28.ebuild,v 1.1 2014/10/05 13:17:36 ryao Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.28.ebuild,v 1.2 2015/01/01 21:01:23 ryao Exp $ EAPI="5" diff --git a/app-emulation/wine/wine-1.7.29.ebuild b/app-emulation/wine/wine-1.7.29.ebuild index ed5f8d964566..021ef9048c67 100644 --- a/app-emulation/wine/wine-1.7.29.ebuild +++ b/app-emulation/wine/wine-1.7.29.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.29.ebuild,v 1.1 2014/10/25 20:37:44 ryao Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.29.ebuild,v 1.2 2015/01/01 21:01:23 ryao Exp $ EAPI="5" diff --git a/app-emulation/wine/wine-1.7.3.ebuild b/app-emulation/wine/wine-1.7.3.ebuild index f352eee28d00..e20bbab29aa6 100644 --- a/app-emulation/wine/wine-1.7.3.ebuild +++ b/app-emulation/wine/wine-1.7.3.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.3.ebuild,v 1.8 2014/12/16 14:55:03 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.3.ebuild,v 1.9 2015/01/01 21:01:23 ryao Exp $ EAPI="5" diff --git a/app-emulation/wine/wine-1.7.33.ebuild b/app-emulation/wine/wine-1.7.33.ebuild new file mode 100644 index 000000000000..dfa6477a7a79 --- /dev/null +++ b/app-emulation/wine/wine-1.7.33.ebuild @@ -0,0 +1,498 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.33.ebuild,v 1.1 2015/01/01 21:01:23 ryao Exp $ + +EAPI="5" + +AUTOTOOLS_AUTORECONF=1 +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-utils eutils fdo-mime flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx + +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}/Source/${MY_P}.tar.bz2" + KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd" + S=${WORKDIR}/${MY_P} +fi + +GV="2.34" +MV="4.5.4" +COMPHOLIO_P="wine-staging-${PV}" +WINE_GENTOO="wine-gentoo-2013.06.24" +DESCRIPTION="Free implementation of Windows(tm) on Unix" +HOMEPAGE="http://www.winehq.org/" +SRC_URI="${SRC_URI} + gecko? ( + abi_x86_32? ( mirror://sourceforge/${PN}/Wine%20Gecko/${GV}/wine_gecko-${GV}-x86.msi ) + abi_x86_64? ( mirror://sourceforge/${PN}/Wine%20Gecko/${GV}/wine_gecko-${GV}-x86_64.msi ) + ) + mono? ( mirror://sourceforge/${PN}/Wine%20Mono/${MV}/wine-mono-${MV}.msi ) + pipelight? ( https://github.com/wine-compholio/wine-staging/archive/v${PV}.tar.gz -> ${COMPHOLIO_P}.tar.gz ) + pulseaudio? ( https://github.com/wine-compholio/wine-staging/archive/v${PV}.tar.gz -> ${COMPHOLIO_P}.tar.gz ) + http://dev.gentoo.org/~tetromino/distfiles/${PN}/${WINE_GENTOO}.tar.bz2" + +LICENSE="LGPL-2.1" +SLOT="0" +IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +fontconfig +gecko gphoto2 gsm gstreamer +jpeg lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pipelight +png +prelink pulseaudio +realtime +run-exes samba scanner selinux +ssl test +threads +truetype +udisks v4l +X xcomposite xinerama +xml" +REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 ) + test? ( abi_x86_32 ) + elibc_glibc? ( threads ) + mono? ( abi_x86_32 ) + osmesa? ( opengl )" #286560 + +# FIXME: the test suite is unsuitable for us; many tests require net access +# or fail due to Xvfb's opengl limitations. +RESTRICT="test" + +NATIVE_DEPEND=" + truetype? ( >=media-libs/freetype-2.0.0 ) + capi? ( net-dialup/capi4k-utils ) + ncurses? ( >=sys-libs/ncurses-5.2:= ) + udisks? ( sys-apps/dbus ) + fontconfig? ( media-libs/fontconfig:= ) + gphoto2? ( media-libs/libgphoto2:= ) + openal? ( media-libs/openal:= ) + gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) + X? ( + x11-libs/libXcursor + x11-libs/libXext + x11-libs/libXrandr + x11-libs/libXi + x11-libs/libXxf86vm + ) + xinerama? ( x11-libs/libXinerama ) + alsa? ( media-libs/alsa-lib ) + cups? ( net-print/cups:= ) + opencl? ( virtual/opencl ) + opengl? ( + virtual/glu + virtual/opengl + ) + gsm? ( media-sound/gsm:= ) + jpeg? ( virtual/jpeg:0= ) + ldap? ( net-nds/openldap:= ) + lcms? ( media-libs/lcms:2= ) + mp3? ( >=media-sound/mpg123-1.5.0 ) + netapi? ( net-fs/samba[netapi(+)] ) + nls? ( sys-devel/gettext ) + odbc? ( dev-db/unixODBC:= ) + osmesa? ( media-libs/mesa[osmesa] ) + pcap? ( net-libs/libpcap ) + pipelight? ( sys-apps/attr ) + pulseaudio? ( media-sound/pulseaudio ) + xml? ( dev-libs/libxml2 dev-libs/libxslt ) + scanner? ( media-gfx/sane-backends:= ) + ssl? ( net-libs/gnutls:= ) + png? ( media-libs/libpng:0= ) + v4l? ( media-libs/libv4l ) + xcomposite? ( x11-libs/libXcomposite )" + +COMMON_DEPEND=" + !amd64? ( ${NATIVE_DEPEND} ) + amd64? ( + abi_x86_64? ( ${NATIVE_DEPEND} ) + abi_x86_32? ( + truetype? ( || ( + >=app-emulation/emul-linux-x86-xlibs-2.1[development,-abi_x86_32(-)] + >=media-libs/freetype-2.5.0.1[abi_x86_32(-)] + ) ) + ncurses? ( || ( + app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] + >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)] + ) ) + udisks? ( || ( + >=app-emulation/emul-linux-x86-baselibs-20130224[development,-abi_x86_32(-)] + >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)] + ) ) + fontconfig? ( || ( + app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] + >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] + ) ) + gphoto2? ( || ( + app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] + >=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)] + ) ) + openal? ( || ( + app-emulation/emul-linux-x86-sdl[development,-abi_x86_32(-)] + >=media-libs/openal-1.15.1[abi_x86_32(-)] + ) ) + gstreamer? ( || ( + app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] + ( + >=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)] + >=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)] + ) + ) ) + X? ( || ( + app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] + ( + >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)] + >=x11-libs/libXext-1.3.2[abi_x86_32(-)] + >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)] + >=x11-libs/libXi-1.7.2[abi_x86_32(-)] + >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)] + ) + ) ) + xinerama? ( || ( + app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] + >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)] + ) ) + alsa? ( || ( + app-emulation/emul-linux-x86-soundlibs[alsa,development,-abi_x86_32(-)] + >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)] + ) ) + cups? ( || ( + app-emulation/emul-linux-x86-baselibs + >=net-print/cups-1.7.1-r1[abi_x86_32(-)] + ) ) + opencl? ( >=virtual/opencl-0-r3[abi_x86_32(-)] ) + opengl? ( || ( + app-emulation/emul-linux-x86-opengl[development,-abi_x86_32(-)] + ( + >=virtual/glu-9.0-r1[abi_x86_32(-)] + >=virtual/opengl-7.0-r1[abi_x86_32(-)] + ) + ) ) + gsm? ( || ( + app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] + >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)] + ) ) + jpeg? ( || ( + app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] + >=virtual/jpeg-0-r2:0[abi_x86_32(-)] + ) ) + ldap? ( || ( + app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] + >=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)] + ) ) + lcms? ( || ( + app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] + >=media-libs/lcms-2.5:2[abi_x86_32(-)] + ) ) + mp3? ( || ( + app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] + >=media-sound/mpg123-1.15.4[abi_x86_32(-)] + ) ) + netapi? ( >=net-fs/samba-3.6.23-r1[netapi(+),abi_x86_32(-)] ) + nls? ( || ( + app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] + >=sys-devel/gettext-0.18.3.2[abi_x86_32(-)] + ) ) + odbc? ( || ( + app-emulation/emul-linux-x86-db[development,-abi_x86_32(-)] + >=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)] + ) ) + osmesa? ( || ( + >=app-emulation/emul-linux-x86-opengl-20121028[development,-abi_x86_32(-)] + >=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)] + ) ) + pcap? ( net-libs/libpcap[abi_x86_32(-)] ) + pipelight? ( || ( + app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] + >=sys-apps/attr-2.4.47-r1[abi_x86_32(-)] + ) ) + pulseaudio? ( || ( + app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] + >=media-sound/pulseaudio-5.0[abi_x86_32(-)] + ) ) + xml? ( || ( + >=app-emulation/emul-linux-x86-baselibs-20131008[development,-abi_x86_32(-)] + ( + >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)] + >=dev-libs/libxslt-1.1.28-r1[abi_x86_32(-)] + ) + ) ) + scanner? ( || ( + app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] + >=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)] + ) ) + ssl? ( || ( + app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] + >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)] + ) ) + png? ( || ( + app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] + >=media-libs/libpng-1.6.10:0[abi_x86_32(-)] + ) ) + v4l? ( || ( + app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] + >=media-libs/libv4l-0.9.5[abi_x86_32(-)] + ) ) + xcomposite? ( || ( + app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] + >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)] + ) ) + ) + )" + +RDEPEND="${COMMON_DEPEND} + dos? ( games-emulation/dosbox ) + perl? ( dev-lang/perl dev-perl/XML-Simple ) + samba? ( >=net-fs/samba-3.0.25 ) + selinux? ( sec-policy/selinux-wine ) + udisks? ( sys-fs/udisks:2 ) + pulseaudio? ( realtime? ( sys-auth/rtkit ) )" + +DEPEND="${COMMON_DEPEND} + amd64? ( abi_x86_32? ( !abi_x86_64? ( ${NATIVE_DEPEND} ) ) ) + X? ( + x11-proto/inputproto + x11-proto/xextproto + x11-proto/xf86vidmodeproto + ) + xinerama? ( x11-proto/xineramaproto ) + prelink? ( sys-devel/prelink ) + >=sys-kernel/linux-headers-2.6 + virtual/pkgconfig + virtual/yacc + sys-devel/flex" + +# 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_build_environment_check() { + [[ ${MERGE_TYPE} = "binary" ]] && return 0 + + if use abi_x86_64 && [[ $(( $(gcc-major-version) * 100 + $(gcc-minor-version) )) -lt 404 ]]; then + eerror "You need gcc-4.4+ to build 64-bit wine" + eerror + return 1 + fi + + if use abi_x86_32 && use opencl && [[ x$(eselect opencl show 2> /dev/null) = "xintel" ]]; 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_build_environment_check || die +} + +pkg_setup() { + wine_build_environment_check || die +} + +src_unpack() { + if [[ ${PV} == "9999" ]] ; then + git-2_src_unpack + else + unpack ${MY_P}.tar.bz2 + fi + + use pipelight || use pulseaudio && unpack "${COMPHOLIO_P}.tar.gz" + + unpack "${WINE_GENTOO}.tar.bz2" + + l10n_find_plocales_changes "${S}/po" "" ".po" +} + +src_prepare() { + local md5="$(md5sum server/protocol.def)" + local f + local PATCHES=( + "${FILESDIR}"/${PN}-1.5.26-winegcc.patch #260726 + "${FILESDIR}"/${PN}-1.4_rc2-multilib-portage.patch #395615 + "${FILESDIR}"/${PN}-1.7.12-osmesa-check.patch #429386 + "${FILESDIR}"/${PN}-1.6-memset-O3.patch #480508 + ) + local COMPHOLIO_MAKE_ARGS="-W fonts-Missing_Fonts.ok" + + use pulseaudio || COMPHOLIO_MAKE_ARGS="${COMPHOLIO_MAKE_ARGS} -W winepulse-PulseAudio_Support.ok" + if use gstreamer; then + # See http://bugs.winehq.org/show_bug.cgi?id=30557 + ewarn "Applying experimental patch to fix GStreamer support. Note that" + ewarn "this patch has been reported to cause crashes in certain games." + + PATCHES+=( "${FILESDIR}/${PN}-1.7.28-gstreamer-v4.patch" ) + fi + if use pipelight; then + ewarn "Applying the unofficial Compholio patchset for Pipelight support," + ewarn "which is unsupported by Wine developers. Please don't report bugs" + ewarn "to Wine bugzilla unless you can reproduce them with USE=-pipelight" + + # epatch doesn't support binary patches and we ship our own pulse patches + emake -C "${WORKDIR}/${COMPHOLIO_P}/patches" \ + $(echo ${COMPHOLIO_MAKE_ARGS}) \ + series + + PATCHES+=( $(sed -e "s:^:${WORKDIR}/${COMPHOLIO_P}/patches/:" \ + "${WORKDIR}/${COMPHOLIO_P}/patches/series") ) + + # epatch doesn't support binary patches + ebegin "Applying Compholio font patches" + for f in "${WORKDIR}/${COMPHOLIO_P}/patches/fonts-Missing_Fonts"/*.patch; do + "../${COMPHOLIO_P}/debian/tools/gitapply.sh" < "${f}" \ + || die "Failed to apply ${f}" + done + eend + elif use pulseaudio; then + PATCHES+=( "../${COMPHOLIO_P}/patches/winepulse-PulseAudio_Support"/*.patch ) + fi + autotools-utils_src_prepare + + 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' tools/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 # 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_with gphoto2 gphoto) + $(use_with gsm) + $(use_with gstreamer) + --without-hal + $(use_with jpeg) + $(use_with ldap) + $(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 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 pulseaudio && myconf+=( --with-pulse ) + use pipelight && myconf+=( --with-xattr ) + + 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 + rm "${D}"usr/bin/{wine{dump,maker},function_grep.pl} "${D}"usr/share/man/man1/wine{dump,maker}.1 || 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 +} + +pkg_postrm() { + gnome2_icon_cache_update + fdo-mime_desktop_database_update +} diff --git a/app-emulation/wine/wine-1.7.4.ebuild b/app-emulation/wine/wine-1.7.4.ebuild index 4feb74bd6b67..75ef4e79e358 100644 --- a/app-emulation/wine/wine-1.7.4.ebuild +++ b/app-emulation/wine/wine-1.7.4.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.4.ebuild,v 1.9 2014/12/16 14:55:03 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.4.ebuild,v 1.10 2015/01/01 21:01:23 ryao Exp $ EAPI="5" diff --git a/app-emulation/wine/wine-1.7.8.ebuild b/app-emulation/wine/wine-1.7.8.ebuild index 5abfb66fc62e..7bfbb537cd91 100644 --- a/app-emulation/wine/wine-1.7.8.ebuild +++ b/app-emulation/wine/wine-1.7.8.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.8.ebuild,v 1.7 2014/12/16 14:55:03 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.8.ebuild,v 1.8 2015/01/01 21:01:23 ryao Exp $ EAPI="5" diff --git a/app-emulation/wine/wine-1.7.9.ebuild b/app-emulation/wine/wine-1.7.9.ebuild index f601d8b83d54..d7b3cbb19633 100644 --- a/app-emulation/wine/wine-1.7.9.ebuild +++ b/app-emulation/wine/wine-1.7.9.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.9.ebuild,v 1.5 2014/12/16 14:55:03 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.9.ebuild,v 1.6 2015/01/01 21:01:23 ryao Exp $ EAPI="5" diff --git a/app-emulation/wine/wine-9999.ebuild b/app-emulation/wine/wine-9999.ebuild index 2469ee5f829d..3909223f07d9 100644 --- a/app-emulation/wine/wine-9999.ebuild +++ b/app-emulation/wine/wine-9999.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 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.172 2014/06/29 00:42:47 tetromino Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-9999.ebuild,v 1.173 2015/01/01 21:01:23 ryao Exp $ EAPI="5" |