diff options
author | Alexandre Rostovtsev <tetromino@gentoo.org> | 2014-05-17 15:31:17 +0000 |
---|---|---|
committer | Alexandre Rostovtsev <tetromino@gentoo.org> | 2014-05-17 15:31:17 +0000 |
commit | 2d0e10089c0733e30b13d86808166a0c38816189 (patch) | |
tree | f794e47caeb26c63c65ce89773783529b0f601eb /app-emulation | |
parent | Stable for alpha, wrt bug #508862 (diff) | |
download | gentoo-2-2d0e10089c0733e30b13d86808166a0c38816189.tar.gz gentoo-2-2d0e10089c0733e30b13d86808166a0c38816189.tar.bz2 gentoo-2-2d0e10089c0733e30b13d86808166a0c38816189.zip |
Pipelight needs xattrs to be enabled (bug #507950, thanks to Michael Müller).
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key CF0ADD61)
Diffstat (limited to 'app-emulation')
-rw-r--r-- | app-emulation/wine/ChangeLog | 9 | ||||
-rw-r--r-- | app-emulation/wine/wine-1.7.19-r1.ebuild (renamed from app-emulation/wine/wine-1.7.19.ebuild) | 10 | ||||
-rw-r--r-- | app-emulation/wine/wine-9999.ebuild | 10 |
3 files changed, 24 insertions, 5 deletions
diff --git a/app-emulation/wine/ChangeLog b/app-emulation/wine/ChangeLog index 796bc0278a06..4eba6886764f 100644 --- a/app-emulation/wine/ChangeLog +++ b/app-emulation/wine/ChangeLog @@ -1,6 +1,13 @@ # 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.507 2014/05/17 07:32:41 tetromino Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.508 2014/05/17 15:31:17 tetromino Exp $ + +*wine-1.7.19-r1 (17 May 2014) + + 17 May 2014; Alexandre Rostovtsev <tetromino@gentoo.org> -wine-1.7.19.ebuild, + +wine-1.7.19-r1.ebuild, wine-9999.ebuild: + Pipelight needs xattrs to be enabled (bug #507950, thanks to Michael + Müller). *wine-1.7.19 (17 May 2014) diff --git a/app-emulation/wine/wine-1.7.19.ebuild b/app-emulation/wine/wine-1.7.19-r1.ebuild index 259cf414a668..9b8179e65829 100644 --- a/app-emulation/wine/wine-1.7.19.ebuild +++ b/app-emulation/wine/wine-1.7.19-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 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.ebuild,v 1.1 2014/05/17 07:32:41 tetromino Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.19-r1.ebuild,v 1.1 2014/05/17 15:31:17 tetromino Exp $ EAPI="5" @@ -86,6 +86,7 @@ NATIVE_DEPEND=" nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) + pipelight? ( sys-apps/attr ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) @@ -179,6 +180,10 @@ COMMON_DEPEND=" >=app-emulation/emul-linux-x86-opengl-20121028[development] media-libs/mesa[osmesa,abi_x86_32] ) ) + pipelight? ( || ( + app-emulation/emul-linux-x86-baselibs[development] + sys-apps/attr[abi_x86_32] + ) ) pulseaudio? ( || ( app-emulation/emul-linux-x86-soundlibs[development] >=media-sound/pulseaudio-4.0-r1[abi_x86_32] @@ -299,7 +304,7 @@ src_prepare() { "../${COMPHOLIO_PATCHES}/patches/patch-list.patch" ) # epatch doesn't support binary patches - ebegin "Applying Compholio font patches..." + ebegin "Applying Compholio font patches" for f in "${T}/10-Missing_Fonts"/*.patch; do "../${COMPHOLIO_PATCHES}/debian/tools/gitapply.sh" < "${f}" || die "Failed to apply Compholio font patches" done @@ -386,6 +391,7 @@ src_configure() { ) use pulseaudio && myeconfargs+=( --with-pulse ) + use pipelight && myeconfargs+=( --with-xattr ) if use amd64 && use abi_x86_32; then # Avoid crossdev's i686-pc-linux-gnu-pkg-config if building wine32 on amd64; #472038 diff --git a/app-emulation/wine/wine-9999.ebuild b/app-emulation/wine/wine-9999.ebuild index ea8eea6e5f2e..816a19509729 100644 --- a/app-emulation/wine/wine-9999.ebuild +++ b/app-emulation/wine/wine-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 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.165 2014/05/17 07:32:41 tetromino Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-9999.ebuild,v 1.166 2014/05/17 15:31:17 tetromino Exp $ EAPI="5" @@ -86,6 +86,7 @@ NATIVE_DEPEND=" nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) + pipelight? ( sys-apps/attr ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) @@ -179,6 +180,10 @@ COMMON_DEPEND=" >=app-emulation/emul-linux-x86-opengl-20121028[development] media-libs/mesa[osmesa,abi_x86_32] ) ) + pipelight? ( || ( + app-emulation/emul-linux-x86-baselibs[development] + sys-apps/attr[abi_x86_32] + ) ) pulseaudio? ( || ( app-emulation/emul-linux-x86-soundlibs[development] >=media-sound/pulseaudio-4.0-r1[abi_x86_32] @@ -299,7 +304,7 @@ src_prepare() { "../${COMPHOLIO_PATCHES}/patches/patch-list.patch" ) # epatch doesn't support binary patches - ebegin "Applying Compholio font patches..." + ebegin "Applying Compholio font patches" for f in "${T}/10-Missing_Fonts"/*.patch; do "../${COMPHOLIO_PATCHES}/debian/tools/gitapply.sh" < "${f}" || die "Failed to apply Compholio font patches" done @@ -386,6 +391,7 @@ src_configure() { ) use pulseaudio && myeconfargs+=( --with-pulse ) + use pipelight && myeconfargs+=( --with-xattr ) if use amd64 && use abi_x86_32; then # Avoid crossdev's i686-pc-linux-gnu-pkg-config if building wine32 on amd64; #472038 |