app-emulation/wine: EAPI 6 bumps, winbind fix, sysmacros fix, sync ebuilds
authorNP-Hardass <NP-Hardass@gentoo.org>
Fri, 22 Apr 2016 04:27:37 +0000 (00:27 -0400)
committerNP-Hardass <NP-Hardass@gentoo.org>
Fri, 22 Apr 2016 04:48:11 +0000 (00:48 -0400)
Package-Manager: portage-2.2.26

app-emulation/wine/Manifest
app-emulation/wine/wine-1.8-r1.ebuild [new file with mode: 0644]
app-emulation/wine/wine-1.8.1-r1.ebuild [moved from app-emulation/wine/wine-1.8.1.ebuild with 99% similarity]
app-emulation/wine/wine-1.8.ebuild [deleted file]
app-emulation/wine/wine-1.9.4-r1.ebuild [moved from app-emulation/wine/wine-1.9.4.ebuild with 95% similarity]
app-emulation/wine/wine-1.9.5-r1.ebuild [moved from app-emulation/wine/wine-1.9.5.ebuild with 95% similarity]
app-emulation/wine/wine-1.9.6-r1.ebuild [moved from app-emulation/wine/wine-1.9.7.ebuild with 98% similarity]
app-emulation/wine/wine-1.9.7-r1.ebuild [moved from app-emulation/wine/wine-1.9.6.ebuild with 97% similarity]
app-emulation/wine/wine-1.9.8.ebuild

index b2902c9fe5415580784827f3620f61d3e6cf8dd9..13e9093690d3b8669e4b3a2f26442842c6b62516 100644 (file)
@@ -38,7 +38,6 @@ DIST wine-1.7.51.tar.bz2 22639053 SHA256 397fc95b463d6ae1b65ab0477d9fe5d0871e8e2
 DIST wine-1.7.52.tar.bz2 22707539 SHA256 0773b32a0c358323db4c383ceb1e9e28d5d4ed4ea37570af2bcb41fecf0d554b SHA512 834a77553d1352840c747ab5dc3e582b15da4ea65f16f9d58d0cc8afb460b4a0fded859929331dd32d9f4f66ab14bb890cf239d0a283bf9ffd92b48f9d1687de WHIRLPOOL 7e6cc679d994449e7f822c2593d1e8cc87d439df6084ad7d48897f3829b866219a0674e81e1fecdc5629225cd3c6ca2735212e1a0cb9d41a236af4674b62d077
 DIST wine-1.7.53.tar.bz2 22763993 SHA256 efba70b106cde683a50a4b1f42df3d900f8ffc291a3689cb897afcc12cc2c6a3 SHA512 82c53c5a7913f5c3ab38239f6cd4dc5ec16db878b8ff9ff46162f11f72c13a3da9c1dc80e7eddef5eb2b909e7b8cd771294cfdc79d734d643aecfeefb0059401 WHIRLPOOL 054640d64794e0eac3b41c359353a8d322f9ae9a9a01969616fe6f9207d4276909d4fa17c7a2b167d705166490df523b3dcaf738efab0a71bfab26ea59eeafe1
 DIST wine-1.7.54.tar.bz2 22800326 SHA256 e0f311f392815468df774b33312cde80bf1ff3a894c9c2b462825fd49619bb27 SHA512 15c9c80518d41486da416d531f7be101353d379bcd8fd309395d2932eceabb3fa5cd8180066f73d13c6a211495146bb544a8878657cf9ca8e5e14987a038a6c7 WHIRLPOOL b1f6f3e4149307f8c0b3feb443dd7b36e8a5c81b8b7b41f6c39167590fb13057174c95723f262082465fe1696c17d9216ea93ad2f8ce1e8f5c8d7aadc12d5425
-DIST wine-1.7.55-gstreamer-v5.patch.bz2 5800 SHA256 9ce03b6bc404dec4ed82208dcaa5cbe282c6df7da51392369fcb933de9273c2c SHA512 2f73c44ca66462cc64570645771fd4b3289525393098ef499ba7199745f836c313572145e3f3d259f9f1c6b7c876e15b2f909a914dd1e21eaa79d9671b40f105 WHIRLPOOL 444e456fb82de3b59342eb6d3a28805a3f068e70e6417a16489c784932c486e812807698f29dee5d9715d22bd1e31c733ed649d7396746008a552bc78ee27e55
 DIST wine-1.7.55.tar.bz2 22814631 SHA256 a148f6c9cb45a75ef1a15e60a7db9c22fce985e0e58fe1350e7931dfe5d36119 SHA512 f47025017836ce1bbf2ed69c7d7421bd8a2f33ff94ced4a5caf92f4fabdf336119c80a28aeb8ba1ebe0239871a6ac62d8af8435d220c317624c17aabc2100dd7 WHIRLPOOL c5575d2ef687caccbdb5cc09a0c6a4ba9f65ec9674cbe3f23ecfced62710dcb0019a11ff66f2ec4c2eafdb30d9891abad158ac4f865cc580a2878067de7304d7
 DIST wine-1.7.8.tar.bz2 21463503 SHA256 30e17f5f863a09416f3d229666566b318dbb40f683d4ca6630012c60bb511804 SHA512 1fdaddb7909f818050854bf351d20f445cf6a5906b1bcc789c96ee8d5058c90815a91bbbc6444f3e4527748764f03ab5297585c174b433093a3354a827402fea WHIRLPOOL 3b5b18384ff04b80b936160c2c6e03676d69663c023f484981305c9272d0601b74cda5c5f7d56008b3900d702b1a4fe1929f16b1fba304a6480b076ffede663a
 DIST wine-1.7.9.tar.bz2 21323337 SHA256 79f99ecc24696915439c474c4953bb77652ab53f16b41daa4da270fe43279c5a SHA512 29f8aa715ebe47c8a06bd5f6a80cac3fb75b2ca7aa81648cc8aed5461cfd825e4da68b6209ca672dce42b968521cfd9bffffaadd2d85b904b55d99687a1c83d0 WHIRLPOOL 333fee72b2a0e9d6ab8a003712c38166bd27aaff384a2b940c089ecc846f7669c59efbeb5cdc2fc87a46d63b0d29d0335873bb7c22f05913bad430b81990241a
diff --git a/app-emulation/wine/wine-1.8-r1.ebuild b/app-emulation/wine/wine-1.8-r1.ebuild
new file mode 100644 (file)
index 0000000..71ab536
--- /dev/null
@@ -0,0 +1,450 @@
+# 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
+
+GV="2.40"
+MV="4.5.6"
+STAGING_P="wine-staging-${PV}"
+STAGING_DIR="${WORKDIR}/${STAGING_P}"
+WINE_GENTOO="wine-gentoo-2015.03.07"
+GST_P="wine-1.8-gstreamer-1.0"
+DESCRIPTION="Free implementation of Windows(tm) on Unix"
+HOMEPAGE="http://www.winehq.org/"
+SRC_URI="${SRC_URI}
+       gecko? (
+               abi_x86_32? ( https://dl.winehq.org/wine/wine-gecko/${GV}/wine_gecko-${GV}-x86.msi )
+               abi_x86_64? ( https://dl.winehq.org/wine/wine-gecko/${GV}/wine_gecko-${GV}-x86_64.msi )
+       )
+       mono? ( https://dl.winehq.org/wine/wine-mono/${MV}/wine-mono-${MV}.msi )
+       https://dev.gentoo.org/~np-hardass/distfiles/${PN}/${GST_P}.patch.bz2
+       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"
+else
+       SRC_URI="${SRC_URI}
+       staging? ( https://github.com/wine-compholio/wine-staging/archive/v${PV}.tar.gz -> ${STAGING_P}.tar.gz )"
+fi
+
+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 s3tc samba scanner selinux +ssl staging test +threads +truetype +udisks v4l vaapi +X +xcomposite xinerama +xml"
+REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
+       test? ( abi_x86_32 )
+       elibc_glibc? ( threads )
+       mono? ( abi_x86_32 )
+       pipelight? ( staging )
+       s3tc? ( staging )
+       vaapi? ( staging )
+       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"
+
+COMMON_DEPEND="
+       truetype? ( >=media-libs/freetype-2.0.0[${MULTILIB_USEDEP}] )
+       capi? ( net-dialup/capi4k-utils )
+       ncurses? ( >=sys-libs/ncurses-5.2:0=[${MULTILIB_USEDEP}] )
+       udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
+       fontconfig? ( media-libs/fontconfig:=[${MULTILIB_USEDEP}] )
+       gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] )
+       openal? ( media-libs/openal:=[${MULTILIB_USEDEP}] )
+       gstreamer? (
+               media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
+               media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}]
+       )
+       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}]
+       )
+       xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
+       alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
+       cups? ( net-print/cups:=[${MULTILIB_USEDEP}] )
+       opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
+       opengl? (
+               virtual/glu[${MULTILIB_USEDEP}]
+               virtual/opengl[${MULTILIB_USEDEP}]
+       )
+       gsm? ( media-sound/gsm:=[${MULTILIB_USEDEP}] )
+       jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] )
+       ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] )
+       lcms? ( media-libs/lcms:2=[${MULTILIB_USEDEP}] )
+       mp3? ( >=media-sound/mpg123-1.5.0[${MULTILIB_USEDEP}] )
+       netapi? ( net-fs/samba[netapi(+),${MULTILIB_USEDEP}] )
+       nls? ( sys-devel/gettext[${MULTILIB_USEDEP}] )
+       odbc? ( dev-db/unixODBC:=[${MULTILIB_USEDEP}] )
+       osmesa? ( media-libs/mesa[osmesa,${MULTILIB_USEDEP}] )
+       pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] )
+       pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )
+       staging? ( sys-apps/attr[${MULTILIB_USEDEP}] )
+       xml? (
+               dev-libs/libxml2[${MULTILIB_USEDEP}]
+               dev-libs/libxslt[${MULTILIB_USEDEP}]
+       )
+       scanner? ( media-gfx/sane-backends:=[${MULTILIB_USEDEP}] )
+       ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] )
+       png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] )
+       v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
+       vaapi? ( x11-libs/libva[X,${MULTILIB_USEDEP}] )
+       xcomposite? ( x11-libs/libXcomposite[${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 )
+       perl? ( dev-lang/perl dev-perl/XML-Simple )
+       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 )
+       pulseaudio? ( realtime? ( sys-auth/rtkit ) )"
+
+# tools/make_requests requires perl
+DEPEND="${COMMON_DEPEND}
+       staging? ( dev-lang/perl dev-perl/XML-Simple )
+       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
+
+       # bug #549768
+       if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then
+               einfo "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
+               if ! ( "${T}"/pr66838 || false ) >/dev/null 2>&1; 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
+               einfo "Checking for gcc-5-3 stack realignment compiler bug ..."
+               # Compile in subshell to prevent "Aborted" message
+               if ! ( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${FILESDIR}"/pr69140.c -o "${T}"/pr69140 || false ) >/dev/null 2>&1; then
+                       eerror "Wine cannot be built with this version of gcc-5.3"
+                       eerror "due to compiler bugs; please use gcc-config to select a"
+                       eerror "different compiler version."
+                       eerror "See https://bugs.gentoo.org/574044"
+                       eerror
+                       return 1
+               fi
+       fi
+
+       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-r3_src_unpack
+               if use staging; then
+                       local WINE_COMMIT=${EGIT_VERSION}
+
+                       EGIT_REPO_URI=${STAGING_EGIT_REPO_URI}
+                       unset ${PN}_LIVE_{REPO,BRANCH,COMMIT} EGIT_COMMIT;
+
+                       EGIT_CHECKOUT_DIR=${STAGING_DIR} git-r3_src_unpack
+
+                       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
+       else
+               unpack ${P}.tar.bz2
+               use staging && unpack "${STAGING_P}.tar.gz"
+       fi
+
+       unpack "${WINE_GENTOO}.tar.bz2"
+       unpack "${GST_P}.patch.bz2"
+
+       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.4_rc2-multilib-portage.patch #395615
+               "${FILESDIR}"/${PN}-1.7.12-osmesa-check.patch #429386
+               "${FILESDIR}"/${PN}-1.6-memset-O3.patch #480508
+               "${WORKDIR}/${GST_P}.patch"
+               "${FILESDIR}"/${PN}-sysmacros.patch #580046
+       )
+       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 $?
+       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 # 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 vaapi va)
+       )
+
+       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
+
+       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
+
+       if use gstreamer; then
+               ewarn "This package uses a Gentoo specific patchset to provide"
+               ewarn "GStreamer 1.0 support.  Any bugs related to GStreamer should"
+               ewarn "be filed at Gentoo's bugzilla, not upstream's."
+       fi
+}
+
+pkg_postrm() {
+       gnome2_icon_cache_update
+       fdo-mime_desktop_database_update
+}
similarity index 99%
rename from app-emulation/wine/wine-1.8.1.ebuild
rename to app-emulation/wine/wine-1.8.1-r1.ebuild
index eef63643142abf1b95778cd8e0660c8fbca5cc2d..7b7d61b78df2d1b98ff2e49de1c3f4291e3a02fd 100644 (file)
@@ -132,7 +132,7 @@ RDEPEND="${COMMON_DEPEND}
        dos? ( games-emulation/dosbox )
        perl? ( dev-lang/perl dev-perl/XML-Simple )
        s3tc? ( >=media-libs/libtxc_dxtn-1.0.1-r1[${MULTILIB_USEDEP}] )
-       samba? ( >=net-fs/samba-3.0.25 )
+       samba? ( >=net-fs/samba-3.0.25[winbind] )
        selinux? ( sec-policy/selinux-wine )
        udisks? ( sys-fs/udisks:2 )
        pulseaudio? ( realtime? ( sys-auth/rtkit ) )"
@@ -219,8 +219,7 @@ src_unpack() {
                        local WINE_COMMIT=${EGIT_VERSION}
 
                        EGIT_REPO_URI=${STAGING_EGIT_REPO_URI}
-                       unset ${PN}_LIVE_REPO;
-                       unset EGIT_COMMIT;
+                       unset ${PN}_LIVE_{REPO,BRANCH,COMMIT} EGIT_COMMIT;
 
                        EGIT_CHECKOUT_DIR=${STAGING_DIR} git-r3_src_unpack
 
@@ -251,6 +250,7 @@ src_prepare() {
                "${FILESDIR}"/${PN}-1.7.12-osmesa-check.patch #429386
                "${FILESDIR}"/${PN}-1.6-memset-O3.patch #480508
                "${WORKDIR}/${GST_P}.patch"
+               "${FILESDIR}"/${PN}-sysmacros.patch #580046
        )
        if use staging; then
                ewarn "Applying the Wine-Staging patchset. Any bug reports to the"
diff --git a/app-emulation/wine/wine-1.8.ebuild b/app-emulation/wine/wine-1.8.ebuild
deleted file mode 100644 (file)
index d28d9ba..0000000
+++ /dev/null
@@ -1,451 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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 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
-
-GV="2.40"
-MV="4.5.6"
-STAGING_P="wine-staging-${PV}"
-STAGING_DIR="${WORKDIR}/${STAGING_P}"
-WINE_GENTOO="wine-gentoo-2015.03.07"
-GST_P="wine-1.7.55-gstreamer-v5"
-DESCRIPTION="Free implementation of Windows(tm) on Unix"
-HOMEPAGE="http://www.winehq.org/"
-SRC_URI="${SRC_URI}
-       gecko? (
-               abi_x86_32? ( https://dl.winehq.org/wine/wine-gecko/${GV}/wine_gecko-${GV}-x86.msi )
-               abi_x86_64? ( https://dl.winehq.org/wine/wine-gecko/${GV}/wine_gecko-${GV}-x86_64.msi )
-       )
-       mono? ( https://dl.winehq.org/wine/wine-mono/${MV}/wine-mono-${MV}.msi )
-       gstreamer? ( https://dev.gentoo.org/~np-hardass/distfiles/${PN}/${GST_P}.patch.bz2 )
-       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"
-else
-       SRC_URI="${SRC_URI}
-       staging? ( https://github.com/wine-compholio/wine-staging/archive/v${PV}.tar.gz -> ${STAGING_P}.tar.gz )"
-fi
-
-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 s3tc samba scanner selinux +ssl staging test +threads +truetype +udisks v4l vaapi +X +xcomposite xinerama +xml"
-REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
-       test? ( abi_x86_32 )
-       elibc_glibc? ( threads )
-       mono? ( abi_x86_32 )
-       pipelight? ( staging )
-       s3tc? ( staging )
-       vaapi? ( staging )
-       osmesa? ( opengl )" #286560
-       #?? ( gstreamer staging ) #Should be fixed by pre/post patchset
-
-# 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="
-       truetype? ( >=media-libs/freetype-2.0.0[${MULTILIB_USEDEP}] )
-       capi? ( net-dialup/capi4k-utils )
-       ncurses? ( >=sys-libs/ncurses-5.2:0=[${MULTILIB_USEDEP}] )
-       udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
-       fontconfig? ( media-libs/fontconfig:=[${MULTILIB_USEDEP}] )
-       gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] )
-       openal? ( media-libs/openal:=[${MULTILIB_USEDEP}] )
-       gstreamer? (
-               media-libs/gstreamer:0.10[${MULTILIB_USEDEP}]
-               media-libs/gst-plugins-base:0.10[${MULTILIB_USEDEP}]
-       )
-       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}]
-       )
-       xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
-       alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
-       cups? ( net-print/cups:=[${MULTILIB_USEDEP}] )
-       opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
-       opengl? (
-               virtual/glu[${MULTILIB_USEDEP}]
-               virtual/opengl[${MULTILIB_USEDEP}]
-       )
-       gsm? ( media-sound/gsm:=[${MULTILIB_USEDEP}] )
-       jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] )
-       ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] )
-       lcms? ( media-libs/lcms:2=[${MULTILIB_USEDEP}] )
-       mp3? ( >=media-sound/mpg123-1.5.0[${MULTILIB_USEDEP}] )
-       netapi? ( net-fs/samba[netapi(+),${MULTILIB_USEDEP}] )
-       nls? ( sys-devel/gettext[${MULTILIB_USEDEP}] )
-       odbc? ( dev-db/unixODBC:=[${MULTILIB_USEDEP}] )
-       osmesa? ( media-libs/mesa[osmesa,${MULTILIB_USEDEP}] )
-       pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] )
-       pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )
-       staging? ( sys-apps/attr[${MULTILIB_USEDEP}] )
-       xml? (
-               dev-libs/libxml2[${MULTILIB_USEDEP}]
-               dev-libs/libxslt[${MULTILIB_USEDEP}]
-       )
-       scanner? ( media-gfx/sane-backends:=[${MULTILIB_USEDEP}] )
-       ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] )
-       png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] )
-       v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
-       vaapi? ( x11-libs/libva[X,${MULTILIB_USEDEP}] )
-       xcomposite? ( x11-libs/libXcomposite[${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 )
-       perl? ( dev-lang/perl dev-perl/XML-Simple )
-       s3tc? ( >=media-libs/libtxc_dxtn-1.0.1-r1[${MULTILIB_USEDEP}] )
-       samba? ( >=net-fs/samba-3.0.25 )
-       selinux? ( sec-policy/selinux-wine )
-       udisks? ( sys-fs/udisks:2 )
-       pulseaudio? ( realtime? ( sys-auth/rtkit ) )"
-
-# tools/make_requests requires perl
-DEPEND="${COMMON_DEPEND}
-       staging? ( dev-lang/perl dev-perl/XML-Simple )
-       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
-
-       # bug #549768
-       if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then
-               einfo "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
-               if ! ( "${T}"/pr66838 || false ) >/dev/null 2>&1; 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
-               einfo "Checking for gcc-5-3 stack realignment compiler bug ..."
-               # Compile in subshell to prevent "Aborted" message
-               if ! ( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${FILESDIR}"/pr69140.c -o "${T}"/pr69140 || false ) >/dev/null 2>&1; then
-                       eerror "Wine cannot be built with this version of gcc-5.3"
-                       eerror "due to compiler bugs; please use gcc-config to select a"
-                       eerror "different compiler version."
-                       eerror "See https://bugs.gentoo.org/574044"
-                       eerror
-                       return 1
-               fi
-       fi
-
-       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-r3_src_unpack
-               if use staging; then
-                       EGIT_REPO_URI=${STAGING_EGIT_REPO_URI}
-                       unset ${PN}_LIVE_REPO;
-                       EGIT_CHECKOUT_DIR=${STAGING_DIR} git-r3_src_unpack
-               fi
-       else
-               unpack ${P}.tar.bz2
-               use staging && unpack "${STAGING_P}.tar.gz"
-       fi
-
-       unpack "${WINE_GENTOO}.tar.bz2"
-       use gstreamer && unpack "${GST_P}.patch.bz2"
-
-       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.4_rc2-multilib-portage.patch #395615
-               "${FILESDIR}"/${PN}-1.7.12-osmesa-check.patch #429386
-               "${FILESDIR}"/${PN}-1.6-memset-O3.patch #480508
-       )
-       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."
-
-               # Wine-Staging 1.7.38 "ntdll: Fix race-condition when threads are killed
-               # during shutdown" patch and "Added patch to implement shared memory
-               # wineserver communication for various user32 functions" prevents the
-               # gstreamer patch from applying cleanly.
-               # So undo the staging patch, apply gstreamer, then re-apply rebased staging
-               # patch on top.
-               if use staging; then
-                       PATCHES+=(
-                               "${FILESDIR}/${PN}-1.7.55-gstreamer-v5-staging-pre.patch"
-                               "${WORKDIR}/${GST_P}.patch"
-                               "${FILESDIR}/${PN}-1.7.55-gstreamer-v5-staging-post.patch" )
-               else
-                       PATCHES+=( "${WORKDIR}/${GST_P}.patch" )
-               fi
-       fi
-       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 $?
-       fi
-       autotools-utils_src_prepare
-
-       # 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 # 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 vaapi va)
-       )
-
-       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
-
-       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
-}
similarity index 95%
rename from app-emulation/wine/wine-1.9.4.ebuild
rename to app-emulation/wine/wine-1.9.4-r1.ebuild
index 70ad7280bfa10ddb0672d17b397906edc3baf01e..9273ab1484a6cf183dcd9597c928c4029bb09a40 100644 (file)
@@ -2,13 +2,12 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="5"
+EAPI=6
 
-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 versionator
+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"
@@ -24,8 +23,9 @@ fi
 
 GV="2.44"
 MV="4.5.6"
+[[ ${MAJOR_V} == "1.8" ]] && SUFFIX="-unofficial"
 STAGING_P="wine-staging-${PV}"
-STAGING_DIR="${WORKDIR}/${STAGING_P}"
+STAGING_DIR="${WORKDIR}/${STAGING_P}${SUFFIX}"
 WINE_GENTOO="wine-gentoo-2015.03.07"
 DESCRIPTION="Free implementation of Windows(tm) on Unix"
 HOMEPAGE="http://www.winehq.org/"
@@ -41,7 +41,7 @@ if [[ ${PV} == "9999" ]] ; then
        STAGING_EGIT_REPO_URI="git://github.com/wine-compholio/wine-staging.git"
 else
        SRC_URI="${SRC_URI}
-       staging? ( https://github.com/wine-compholio/wine-staging/archive/v${PV}.tar.gz -> ${STAGING_P}.tar.gz )"
+       staging? ( https://github.com/wine-compholio/wine-staging/archive/v${PV}${SUFFIX}.tar.gz -> ${STAGING_P}.tar.gz )"
 fi
 
 LICENSE="LGPL-2.1"
@@ -130,7 +130,7 @@ RDEPEND="${COMMON_DEPEND}
        dos? ( games-emulation/dosbox )
        perl? ( dev-lang/perl dev-perl/XML-Simple )
        s3tc? ( >=media-libs/libtxc_dxtn-1.0.1-r1[${MULTILIB_USEDEP}] )
-       samba? ( >=net-fs/samba-3.0.25 )
+       samba? ( >=net-fs/samba-3.0.25[winbind] )
        selinux? ( sec-policy/selinux-wine )
        udisks? ( sys-fs/udisks:2 )
        pulseaudio? ( realtime? ( sys-auth/rtkit ) )"
@@ -217,8 +217,7 @@ src_unpack() {
                        local WINE_COMMIT=${EGIT_VERSION}
 
                        EGIT_REPO_URI=${STAGING_EGIT_REPO_URI}
-                       unset ${PN}_LIVE_REPO;
-                       unset EGIT_COMMIT;
+                       unset ${PN}_LIVE_{REPO,BRANCH,COMMIT} EGIT_COMMIT;
 
                        EGIT_CHECKOUT_DIR=${STAGING_DIR} git-r3_src_unpack
 
@@ -247,6 +246,7 @@ src_prepare() {
                "${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
+               "${FILESDIR}"/${PN}-sysmacros.patch #580046
        )
        if use staging; then
                ewarn "Applying the Wine-Staging patchset. Any bug reports to the"
@@ -263,8 +263,15 @@ src_prepare() {
                        source "${STAGING_DIR}/patches/patchinstall.sh"
                )
                eend $?
+
+               # To differentiate unofficial staging releases
+               if [[ ! -z ${SUFFIX} ]]; then
+                       sed -i "s/(Staging)/(Staging [Unofficial])/" libs/wine/Makefile.in || die
+               fi
        fi
-       autotools-utils_src_prepare
+
+       default
+       eautoreconf
 
        # Modification of the server protocol requires regenerating the server requests
        if [[ "$(md5sum server/protocol.def)" != "${md5}" ]]; then
similarity index 95%
rename from app-emulation/wine/wine-1.9.5.ebuild
rename to app-emulation/wine/wine-1.9.5-r1.ebuild
index 6f64997b75fc2245e084ca9362cb34f100709a90..3502990efd2c7093db3a5538cb2fc4a4d3236487 100644 (file)
@@ -2,13 +2,12 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="5"
+EAPI=6
 
-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 versionator
+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"
@@ -24,8 +23,9 @@ fi
 
 GV="2.44"
 MV="4.6.0"
+[[ ${MAJOR_V} == "1.8" ]] && SUFFIX="-unofficial"
 STAGING_P="wine-staging-${PV}"
-STAGING_DIR="${WORKDIR}/${STAGING_P}"
+STAGING_DIR="${WORKDIR}/${STAGING_P}${SUFFIX}"
 WINE_GENTOO="wine-gentoo-2015.03.07"
 DESCRIPTION="Free implementation of Windows(tm) on Unix"
 HOMEPAGE="http://www.winehq.org/"
@@ -41,7 +41,7 @@ if [[ ${PV} == "9999" ]] ; then
        STAGING_EGIT_REPO_URI="git://github.com/wine-compholio/wine-staging.git"
 else
        SRC_URI="${SRC_URI}
-       staging? ( https://github.com/wine-compholio/wine-staging/archive/v${PV}.tar.gz -> ${STAGING_P}.tar.gz )"
+       staging? ( https://github.com/wine-compholio/wine-staging/archive/v${PV}${SUFFIX}.tar.gz -> ${STAGING_P}.tar.gz )"
 fi
 
 LICENSE="LGPL-2.1"
@@ -129,7 +129,7 @@ RDEPEND="${COMMON_DEPEND}
        dos? ( games-emulation/dosbox )
        perl? ( dev-lang/perl dev-perl/XML-Simple )
        s3tc? ( >=media-libs/libtxc_dxtn-1.0.1-r1[${MULTILIB_USEDEP}] )
-       samba? ( >=net-fs/samba-3.0.25 )
+       samba? ( >=net-fs/samba-3.0.25[winbind] )
        selinux? ( sec-policy/selinux-wine )
        udisks? ( sys-fs/udisks:2 )
        pulseaudio? ( realtime? ( sys-auth/rtkit ) )"
@@ -216,8 +216,7 @@ src_unpack() {
                        local WINE_COMMIT=${EGIT_VERSION}
 
                        EGIT_REPO_URI=${STAGING_EGIT_REPO_URI}
-                       unset ${PN}_LIVE_REPO;
-                       unset EGIT_COMMIT;
+                       unset ${PN}_LIVE_{REPO,BRANCH,COMMIT} EGIT_COMMIT;
 
                        EGIT_CHECKOUT_DIR=${STAGING_DIR} git-r3_src_unpack
 
@@ -246,6 +245,7 @@ src_prepare() {
                "${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
+               "${FILESDIR}"/${PN}-sysmacros.patch #580046
        )
        if use staging; then
                ewarn "Applying the Wine-Staging patchset. Any bug reports to the"
@@ -265,8 +265,15 @@ src_prepare() {
                        source "${STAGING_DIR}/patches/patchinstall.sh"
                )
                eend $?
+
+               # To differentiate unofficial staging releases
+               if [[ ! -z ${SUFFIX} ]]; then
+                       sed -i "s/(Staging)/(Staging [Unofficial])/" libs/wine/Makefile.in || die
+               fi
        fi
-       autotools-utils_src_prepare
+
+       default
+       eautoreconf
 
        # Modification of the server protocol requires regenerating the server requests
        if [[ "$(md5sum server/protocol.def)" != "${md5}" ]]; then
similarity index 98%
rename from app-emulation/wine/wine-1.9.7.ebuild
rename to app-emulation/wine/wine-1.9.6-r1.ebuild
index 4ee12eed1a38d93404fc8e168c539d1250d6a097..a7c141c75a61d9cf355e80633befc0589f65cef9 100644 (file)
@@ -2,13 +2,12 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="5"
+EAPI=6
 
-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 versionator
+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"
@@ -130,7 +129,7 @@ RDEPEND="${COMMON_DEPEND}
        dos? ( games-emulation/dosbox )
        perl? ( dev-lang/perl dev-perl/XML-Simple )
        s3tc? ( >=media-libs/libtxc_dxtn-1.0.1-r1[${MULTILIB_USEDEP}] )
-       samba? ( >=net-fs/samba-3.0.25 )
+       samba? ( >=net-fs/samba-3.0.25[winbind] )
        selinux? ( sec-policy/selinux-wine )
        udisks? ( sys-fs/udisks:2 )
        pulseaudio? ( realtime? ( sys-auth/rtkit ) )"
@@ -217,8 +216,7 @@ src_unpack() {
                        local WINE_COMMIT=${EGIT_VERSION}
 
                        EGIT_REPO_URI=${STAGING_EGIT_REPO_URI}
-                       unset ${PN}_LIVE_REPO;
-                       unset EGIT_COMMIT;
+                       unset ${PN}_LIVE_{REPO,BRANCH,COMMIT} EGIT_COMMIT;
 
                        EGIT_CHECKOUT_DIR=${STAGING_DIR} git-r3_src_unpack
 
@@ -271,7 +269,8 @@ src_prepare() {
                fi
        fi
 
-       autotools-utils_src_prepare
+       default
+       eautoreconf
 
        # Modification of the server protocol requires regenerating the server requests
        if [[ "$(md5sum server/protocol.def)" != "${md5}" ]]; then
similarity index 97%
rename from app-emulation/wine/wine-1.9.6.ebuild
rename to app-emulation/wine/wine-1.9.7-r1.ebuild
index 8a68ba0c01b585a6bcd7503c479dee50980a0fed..a7c141c75a61d9cf355e80633befc0589f65cef9 100644 (file)
@@ -2,13 +2,12 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="5"
+EAPI=6
 
-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 versionator
+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"
@@ -130,7 +129,7 @@ RDEPEND="${COMMON_DEPEND}
        dos? ( games-emulation/dosbox )
        perl? ( dev-lang/perl dev-perl/XML-Simple )
        s3tc? ( >=media-libs/libtxc_dxtn-1.0.1-r1[${MULTILIB_USEDEP}] )
-       samba? ( >=net-fs/samba-3.0.25 )
+       samba? ( >=net-fs/samba-3.0.25[winbind] )
        selinux? ( sec-policy/selinux-wine )
        udisks? ( sys-fs/udisks:2 )
        pulseaudio? ( realtime? ( sys-auth/rtkit ) )"
@@ -217,8 +216,7 @@ src_unpack() {
                        local WINE_COMMIT=${EGIT_VERSION}
 
                        EGIT_REPO_URI=${STAGING_EGIT_REPO_URI}
-                       unset ${PN}_LIVE_REPO;
-                       unset EGIT_COMMIT;
+                       unset ${PN}_LIVE_{REPO,BRANCH,COMMIT} EGIT_COMMIT;
 
                        EGIT_CHECKOUT_DIR=${STAGING_DIR} git-r3_src_unpack
 
@@ -247,6 +245,7 @@ src_prepare() {
                "${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
+               "${FILESDIR}"/${PN}-sysmacros.patch #580046
        )
        if use staging; then
                ewarn "Applying the Wine-Staging patchset. Any bug reports to the"
@@ -270,7 +269,8 @@ src_prepare() {
                fi
        fi
 
-       autotools-utils_src_prepare
+       default
+       eautoreconf
 
        # Modification of the server protocol requires regenerating the server requests
        if [[ "$(md5sum server/protocol.def)" != "${md5}" ]]; then
index 52e3575243973bb1a5898022f225cb1298d789e8..1ff9d2b5f72dd67a6d4e7de82bd80eb3dd5374f8 100644 (file)
@@ -216,8 +216,7 @@ src_unpack() {
                        local WINE_COMMIT=${EGIT_VERSION}
 
                        EGIT_REPO_URI=${STAGING_EGIT_REPO_URI}
-                       unset ${PN}_LIVE_REPO;
-                       unset EGIT_COMMIT;
+                       unset ${PN}_LIVE_{REPO,BRANCH,COMMIT} EGIT_COMMIT;
 
                        EGIT_CHECKOUT_DIR=${STAGING_DIR} git-r3_src_unpack