diff options
| author |   Alexandre Rostovtsev <tetromino@gentoo.org> | 2013-12-17 12:33:21 +0000 |
|---|---|---|
| committer | Alexandre Rostovtsev <tetromino@gentoo.org> | 2013-12-17 12:33:21 +0000 |
| commit | b1553ae63af119beb5c2c343cf4b805251b0836c (patch) | |
| tree | b05e6ffe840494eec00e62da3c30f089ce23a46d /app-emulation/wine/wine-1.7.8.ebuild | |
| parent | Version bump. (diff) | |
| download | historical-b1553ae63af119beb5c2c343cf4b805251b0836c.tar.gz historical-b1553ae63af119beb5c2c343cf4b805251b0836c.tar.bz2 historical-b1553ae63af119beb5c2c343cf4b805251b0836c.zip | |
Fix dependencies and ensure NATIVE_DEPEND is always considered in DEPEND (bug #492986, thanks to Jeffrey Thomas Piercy and Nikos Chantziaras).
Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xCF0ADD61
Diffstat (limited to 'app-emulation/wine/wine-1.7.8.ebuild')
| -rw-r--r-- | app-emulation/wine/wine-1.7.8.ebuild | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/app-emulation/wine/wine-1.7.8.ebuild b/app-emulation/wine/wine-1.7.8.ebuild index 47c27c5621bf..ec129f3779fa 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-2013 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.2 2013/12/16 14:31:56 tetromino Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.8.ebuild,v 1.3 2013/12/17 12:33:14 tetromino Exp $ EAPI="5" @@ -34,7 +34,7 @@ SRC_URI="${SRC_URI} 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 ) - http://dev.gentoo.org/~tetromino/distfiles/${PN}/${PULSE_PATCHES}.tar.bz2 + pulseaudio? ( http://dev.gentoo.org/~tetromino/distfiles/${PN}/${PULSE_PATCHES}.tar.bz2 ) http://dev.gentoo.org/~tetromino/distfiles/${PN}/${WINE_GENTOO}.tar.bz2" LICENSE="LGPL-2.1" @@ -173,6 +173,10 @@ COMMON_DEPEND=" >=app-emulation/emul-linux-x86-opengl-20121028[development] media-libs/mesa[osmesa,abi_x86_32] ) ) + pulseaudio? ( || ( + app-emulation/emul-linux-x86-soundlibs[development] + >=media-sound/pulseaudio-4.0-r1[abi_x86_32] + ) ) xml? ( >=app-emulation/emul-linux-x86-baselibs-20131008[development] ) scanner? ( app-emulation/emul-linux-x86-medialibs[development] ) ssl? ( app-emulation/emul-linux-x86-baselibs[development] ) @@ -190,24 +194,17 @@ COMMON_DEPEND=" ) ) ) )" -[[ ${PV} == "9999" ]] || COMMON_DEPEND="${COMMON_DEPEND} - amd64? ( abi_x86_32? ( pulseaudio? ( - || ( - app-emulation/emul-linux-x86-soundlibs[development] - >=media-sound/pulseaudio-4.0-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 )" -[[ ${PV} == "9999" ]] || RDEPEND="${RDEPEND} + 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 |