commit: a04fa13da2cbe6705dd8a105847ad0a84c8d5982
Author: Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 14 10:01:37 2015 +0000
Commit: Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Sun Jun 14 10:01:37 2015 +0000
URL:
https://gitweb.gentoo.org/proj/multilib-portage.git/commit/?id=a04fa13d
Fix typo and Manifest
app-emulation/wine/Manifest | 3 +-
app-emulation/wine/wine-1.7.44 | 554 ----------------------------------
app-emulation/wine/wine-1.7.44.ebuild | 238 +++++++++++----
3 files changed, 179 insertions(+), 616 deletions(-)
diff --git a/app-emulation/wine/Manifest b/app-emulation/wine/Manifest
index ae18722..7218a04 100644
--- a/app-emulation/wine/Manifest
+++ b/app-emulation/wine/Manifest
@@ -15,8 +15,7 @@ DIST wine-mono-4.5.6.msi 53705216 SHA256
ac681f737f83742d786706529eb85f4bc8d6bdd
DIST wine-staging-1.7.44.tar.gz 9194166 SHA256
ae2db1fe506c936f9e3c5664584126d58db8305c47b8155c636b8a8843a0ae20 SHA512
e01ff7d458a3162ad19577d127660bcf953c048201a2f98aa23fc5bf19e232af3e155e64e2d0fac33fdf01a9508be6e45a663e4151ee5b50b6ea2ce56a1e0beb
WHIRLPOOL
915426aab0142a4142938a119339541f7a72d6a3e1c7fbd46c0dc9ad7178a56951e5a996f4b13f50bf7581a13607d15e3ae9796cd39974e069928c358400cc3f
DIST wine_gecko-2.36-x86.msi 29718016 SHA256
afa457ce8f9885225b6e549dd6f154713ce15bf063c23e38c1327d2f869e128a SHA512
6099240fb76368ed9bb6b775d5972b6124972ace92ccfe1051caeb8884d9e12d40c35220419f0d02443584bf2d82799dfca8206410d171470ce15903703924f0
WHIRLPOOL
4b8fc20a8b228268f3407ca425427a2d91f81ff9e6f0860d4f3eb156c97e3ec1ea83ca3510ee10bfb37598f91c3323a46ba75eace3334632b26cbd45959dc908
DIST wine_gecko-2.36-x86_64.msi 31222784 SHA256
701b84004bf584a2dae7c1296121172c933321cb795c3817b64435fd3364ed44 SHA512
814b13268beeac4d0ace4ab62dbc29ccd92fc13a135499b8ea5a14355992d576268e1e401b28906e8379a826159c5bb051ad274a1e64dd0d5424d495f8e10e10
WHIRLPOOL
dbd0e275bdca2ff7a1930daa62d23fd438a90f71b0fed1096b34b8d00a3f51cb91468ce61acaa9361a57deb9f3cfe70a21d16fc23de95cb4e0f7f957d4727010
-EBUILD wine-1.7.44.ebuild 14490 SHA256
0f257e976d937e8d3d47608404344729caac8446b87402336c851952dd48eac1 SHA512
b29f934277c5c34cd65acd2f022a16b5d2b6e820c82d2bf2d488ce635885096b5663f8a6b1e92134d8c8e2b1741b05da4966f656196b607c75d24abfd97fdf15
WHIRLPOOL
8725f5e77b6e2533336d1520af05ea9f68c23d043648ed3e72d0662df166ff3271eb81aa1f88647f2d569f3a147920c44374692a4d69ad7a2f48eedfbba5c1cc
+EBUILD wine-1.7.44.ebuild 17695 SHA256
6e19335cbebbaff4a2a60305861777958d576ed1b9ee71b415ce258e24a05cc8 SHA512
5c05ce1bbd0e8ee7c5b6e580b966f4c9c4daf4d653876e35338b5b7d787aab4851e8f9fdca16f52e0e4d42246a0f9e7a5595ac229c7d16660493f7f39008c91e
WHIRLPOOL
2ab8ca1ec1a56387b98173e690c50387ba39c8e6d6cfe3a387f6c7f1afcba3b5b44d674b1c1523a1515ca853039e42ac83a63e20a6ec662d73e41be1b4873b74
MISC ChangeLog 30468 SHA256
438db6db8b27622f90e810a4c26bb0f6e4ae913e385c74850fde7c340c9be13c SHA512
9da54315c5d5079cfde0165bab881d1a2975f5be3b19fd238b8f03bd67c32edd305078c98553080c0a61cf9305eb9cba295879c1cc90265d98778101cbccdf12
WHIRLPOOL
57f06acb41c6ea74e234dcf41c2ef6804566cb84cecaa3260ed7684dca969dedffebeedc3b145b2949b04b56a883c3bbf33395742152fb301d35b4445e2160a1
MISC ChangeLog-2012 100362 SHA256
8e70fc54e7945c1f41e3e0b64fef6b9a7fe89acdaf8c79a06a16048fe8d2e26c SHA512
ca875e847ba100e1f19774b31a2b45a81d776275e3d11944be8a7b01dfcdbf4265b1a340d691bc4fe4054fea006059a06ed52bc0516b1f8b44a1772a1c813278
WHIRLPOOL
36ec708601a25cb8fa93b471112538480b6ef82cc4e6703b3d045f883078b49209ceaeef7bafa8417b881c2d11df84df9c83d1985d0d687a11f3db3de5abb014
MISC metadata.xml 2752 SHA256
0ad7fdfbcd95595e81b123dbb53b5a6e2fbae28c7182da46102a64fef5cc0cee SHA512
d5ae4bdb065bea44750e4186e1a857bc71990baf313d738dcfb4777c4fe772d11fb20eadb16cc46c0019ae5be323ed4fa5b851e7c700f4e6b8f096ab882c6a6b
WHIRLPOOL
e548500294da01e91a33a9b203259e801aeef5ef95ea41ebc803f17f874c70b8e0a2b3997d7762d28750e27517d6f3256b5392c024f91a62b91ba7ed1d68e8d0
-MISC wine-1.7.44 17695 SHA256
6e19335cbebbaff4a2a60305861777958d576ed1b9ee71b415ce258e24a05cc8 SHA512
5c05ce1bbd0e8ee7c5b6e580b966f4c9c4daf4d653876e35338b5b7d787aab4851e8f9fdca16f52e0e4d42246a0f9e7a5595ac229c7d16660493f7f39008c91e
WHIRLPOOL
2ab8ca1ec1a56387b98173e690c50387ba39c8e6d6cfe3a387f6c7f1afcba3b5b44d674b1c1523a1515ca853039e42ac83a63e20a6ec662d73e41be1b4873b74
diff --git a/app-emulation/wine/wine-1.7.44 b/app-emulation/wine/wine-1.7.44
deleted file mode 100644
index ccb52fd..0000000
--- a/app-emulation/wine/wine-1.7.44
+++ /dev/null
@@ -1,554 +0,0 @@
-# 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.43.ebuild,v 1.1
2015/05/18 04:59:26 tetromino 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
http://source.winehq.org/git/wine.git";
- EGIT_BRANCH="master"
- inherit git-r3
- 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.36"
-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.34-gstreamer-v5"
-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 )
- gstreamer? (
http://dev.gentoo.org/~tetromino/distfiles/${PN}/${GST_P}.patch.bz2 )
- http://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 )
- pulseaudio? (
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"
-
-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 )
- staging? ( 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 )
- vaapi? ( x11-libs/libva[X] )
- 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(-)] )
- pulseaudio? ( || (
-
app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)]
- >=media-sound/pulseaudio-5.0[abi_x86_32(-)]
- ) )
- staging? ( || (
-
app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
- >=sys-apps/attr-2.4.47-r1[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(-)]
- ) )
- vaapi? ( x11-libs/libva[X,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 )
- 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}
- amd64? ( abi_x86_32? ( !abi_x86_64? ( ${NATIVE_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 [[ $(gcc-major-version) = 5 ]]; then
- eerror "You need gcc-4.x to build wine; see
https://bugs.gentoo.org/549768";
- eerror
- return 1
- 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 || use pulseaudio; then
- EGIT_REPO_URI=${STAGING_EGIT_REPO_URI}
- unset ${PN}_LIVE_REPO;
- EGIT_CHECKOUT_DIR=${STAGING_DIR} git-r3_src_unpack
- fi
- else
- unpack ${MY_P}.tar.bz2
- use staging || use pulseaudio && 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.39-gstreamer-v5-staging-pre.patch"
- "${WORKDIR}/${GST_P}.patch"
-
"${FILESDIR}/${PN}-1.7.39-gstreamer-v5-staging-post.patch" )
- else
- PATCHES+=( "${WORKDIR}/${GST_P}.patch" )
- fi
- fi
- if use staging; then
- ewarn "Applying the unofficial Wine-Staging patchset which is
unsupported"
- ewarn "by Wine developers. Please don't report bugs to Wine
bugzilla"
- ewarn "unless you can reproduce them with USE=-staging"
-
- 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 $?
- elif use pulseaudio; then
- PATCHES+=(
"${STAGING_DIR}/patches/winepulse-PulseAudio_Support"/*.patch )
- 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' 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_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 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)
- )
-
- if use pulseaudio || use staging; then
- myconf+=( $(use_with pulseaudio pulse) )
- fi
- 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
-}
diff --git a/app-emulation/wine/wine-1.7.44.ebuild
b/app-emulation/wine/wine-1.7.44.ebuild
index 24a54ca..ccb52fd 100644
--- a/app-emulation/wine/wine-1.7.44.ebuild
+++ b/app-emulation/wine/wine-1.7.44.ebuild
@@ -1,6 +1,6 @@
# 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.44.ebuild,v 1.1
2015/05/31 22:07:17 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.43.ebuild,v 1.1
2015/05/18 04:59:26 tetromino Exp $
EAPI="5"
@@ -64,70 +64,187 @@ REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
# or fail due to Xvfb's opengl limitations.
RESTRICT="test"
-COMMON_DEPEND="
- truetype? ( >=media-libs/freetype-2.0.0[${MULTILIB_USEDEP}] )
+NATIVE_DEPEND="
+ truetype? ( >=media-libs/freetype-2.0.0 )
capi? ( net-dialup/capi4k-utils )
- ncurses? ( >=sys-libs/ncurses-5.2:=[${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}]
- )
+ 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[${MULTILIB_USEDEP}]
- x11-libs/libXext[${MULTILIB_USEDEP}]
- x11-libs/libXrandr[${MULTILIB_USEDEP}]
- x11-libs/libXi[${MULTILIB_USEDEP}]
- x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
+ x11-libs/libXcursor
+ x11-libs/libXext
+ x11-libs/libXrandr
+ x11-libs/libXi
+ x11-libs/libXxf86vm
)
- xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
- alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
- cups? ( net-print/cups:=[${MULTILIB_USEDEP}] )
- opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
+ xinerama? ( x11-libs/libXinerama )
+ alsa? ( media-libs/alsa-lib )
+ cups? ( net-print/cups:= )
+ opencl? ( virtual/opencl )
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}]
+ virtual/glu
+ virtual/opengl
)
- 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
+ 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 )
+ staging? ( 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 )
+ vaapi? ( x11-libs/libva[X] )
+ 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(-)] )
+ pulseaudio? ( || (
+
app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)]
+ >=media-sound/pulseaudio-5.0[abi_x86_32(-)]
+ ) )
+ staging? ( || (
+
app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+ >=sys-apps/attr-2.4.47-r1[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(-)]
+ ) )
+ vaapi? ( x11-libs/libva[X,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}
@@ -141,6 +258,7 @@ RDEPEND="${COMMON_DEPEND}
# tools/make_requests requires perl
DEPEND="${COMMON_DEPEND}
+ amd64? ( abi_x86_32? ( !abi_x86_64? ( ${NATIVE_DEPEND} ) ) )
staging? ( dev-lang/perl dev-perl/XML-Simple )
X? (
x11-proto/inputproto
