commit: 68d0e9047c87b8ac1d980f6f557e1868c73edb9c Author: James Le Cuirot <chewi <AT> gentoo <DOT> org> AuthorDate: Sat Aug 22 20:02:51 2020 +0000 Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> CommitDate: Sat Aug 22 20:02:51 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68d0e904
app-emulation/gallium-nine-standalone: Drop old 0.5 Package-Manager: Portage-3.0.4, Repoman-3.0.1 Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org> app-emulation/gallium-nine-standalone/Manifest | 1 - .../gallium-nine-standalone/files/0.5-flags.patch | 28 ------ .../gallium-nine-standalone-0.5.ebuild | 109 --------------------- 3 files changed, 138 deletions(-) diff --git a/app-emulation/gallium-nine-standalone/Manifest b/app-emulation/gallium-nine-standalone/Manifest index bb32fe0d3fb..071df4f33d3 100644 --- a/app-emulation/gallium-nine-standalone/Manifest +++ b/app-emulation/gallium-nine-standalone/Manifest @@ -1,2 +1 @@ -DIST gallium-nine-standalone-0.5.tar.gz 69056 BLAKE2B 6acfd500a31e480e2e09e751097beaa2bc94c574edd2b313adb707dc65447be1868ed190bf13549cc38eae945d421242a5d3b2c068486ad35347903e27e0bf80 SHA512 6223a851536c67d32e3a834d7a3c7b93fb59c226b127e1ee1b5a72a7cc93172173f5004ca4944a842015650ef80e8427a684109ae5a4a9e9ef838961e0767c78 DIST gallium-nine-standalone-0.7.tar.gz 67699 BLAKE2B 85520de46e0e821f63d89691e322c3001ae853a0058a5077b484da6a1596a7ed03d2e2b7dc2686661fd21d34b33e10f4549437ce5790f18e1e6cc77c894e9d1e SHA512 9007564347bb6677f3d4eff83f744d39487c09b543489f02dcf7606917ecd9b72decf8176d9daecb6039b8998e97f737d9f7a71a5052f4d5c73f2e99e92af43c diff --git a/app-emulation/gallium-nine-standalone/files/0.5-flags.patch b/app-emulation/gallium-nine-standalone/files/0.5-flags.patch deleted file mode 100644 index 7c0e883d697..00000000000 --- a/app-emulation/gallium-nine-standalone/files/0.5-flags.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff -Naur a/tools/cross-wine32.in b/tools/cross-wine32.in ---- a/tools/cross-wine32.in 2019-09-25 13:25:24.000000000 +0100 -+++ b/tools/cross-wine32.in 2019-09-30 23:05:00.121344967 +0100 -@@ -5,8 +5,8 @@ - pkgconfig = '@PKG_CONFIG@' - - [properties] --c_args = ['-m32'] --c_link_args = ['-m32', '-mwindows'] -+c_args = @CFLAGS@ + ['-m32'] -+c_link_args = @LDFLAGS@ + ['-m32', '-mwindows'] - needs_exe_wrapper = true - - [host_machine] -diff -Naur a/tools/cross-wine64.in b/tools/cross-wine64.in ---- a/tools/cross-wine64.in 2019-09-25 13:25:24.000000000 +0100 -+++ b/tools/cross-wine64.in 2019-09-30 23:04:57.340283350 +0100 -@@ -5,8 +5,8 @@ - pkgconfig = '@PKG_CONFIG@' - - [properties] --c_args = ['-m64'] --c_link_args = ['-m64', '-mwindows'] -+c_args = @CFLAGS@ + ['-m64'] -+c_link_args = @LDFLAGS@ + ['-m64', '-mwindows'] - needs_exe_wrapper = true - - [host_machine] diff --git a/app-emulation/gallium-nine-standalone/gallium-nine-standalone-0.5.ebuild b/app-emulation/gallium-nine-standalone/gallium-nine-standalone-0.5.ebuild deleted file mode 100644 index 1cede2d1420..00000000000 --- a/app-emulation/gallium-nine-standalone/gallium-nine-standalone-0.5.ebuild +++ /dev/null @@ -1,109 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit meson multilib-minimal toolchain-funcs - -MY_PN="wine-nine-standalone" -DESCRIPTION="A standalone version of the WINE parts of Gallium Nine" -HOMEPAGE="https://github.com/iXit/wine-nine-standalone"; - -if [[ $PV = 9999* ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/iXit/${MY_PN}.git"; -else - SRC_URI="https://github.com/iXit/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - S="${WORKDIR}/${MY_PN}-${PV}" - KEYWORDS="-* ~amd64 ~x86" -fi - -LICENSE="LGPL-2.1+" -SLOT="0" - -# We don't put Wine in RDEPEND because you can also use this with -# Steam's Proton. - -RDEPEND=" - media-libs/mesa[d3d9,dri3,X(+),${MULTILIB_USEDEP}] - x11-libs/libX11[${MULTILIB_USEDEP}] - x11-libs/libxcb[${MULTILIB_USEDEP}] -" - -DEPEND=" - ${RDEPEND} - virtual/pkgconfig - virtual/wine[${MULTILIB_USEDEP}] - >=dev-util/meson-0.50.1 -" - -PATCHES=( - "${FILESDIR}"/0.5-flags.patch - "${FILESDIR}"/0.3-nine-dll-path.patch -) - -bits() { - if [[ ${ABI} = amd64 ]]; then - echo 64 - else - echo 32 - fi -} - -src_prepare() { - default - - # Upstream includes a bootstrap.sh script with hardcoded CHOSTs to - # create the Meson cross files. We improve on that here but also - # inject CFLAGS and LDFLAGS, partly to simply respect these, and - # partly to allow d3d9-nine.dll to be loaded from a location outside - # WINEPREFIX. This avoids the need for the nine-install.sh script, - # which doesn't play well with our multi-Wine environment. - bootstrap_nine() { - local file=tools/cross-wine$(bits) - local g9dll=\"Z:${EPREFIX}/usr/$(get_libdir)/d3d9-nine.dll.so\" - - sed \ - -e "s!@PKG_CONFIG@!$(tc-getPKG_CONFIG)!" \ - -e "s!@CFLAGS@!$(_meson_env_array "${CFLAGS} '-DG9DLL=${g9dll}'")!" \ - -e "s!@LDFLAGS@!$(_meson_env_array "${LDFLAGS}")!" \ - ${file}.in > ${file} || die - } - - multilib_foreach_abi bootstrap_nine -} - -multilib_src_configure() { - # We override bindir because otherwise the 32-bit exe is overwritten - # by the 64-bit exe and we need both of them. - local emesonargs=( - --cross-file "${S}/tools/cross-wine$(bits)" - --bindir "$(get_libdir)" - -Ddistro-independent=false - -Ddri2=false - ) - meson_src_configure -} - -multilib_src_compile() { - meson_src_compile -} - -multilib_src_install() { - meson_src_install -} - -pkg_postinst() { - local bits=$(bits) - - einfo "Don't remove the Z: drive from your WINEPREFIX as this relies on it." - einfo - einfo "To set up the ${bits}-bit library, launch your preferred Wine as follows:" - einfo " wine${bits/32} ${EPREFIX}/usr/$(get_libdir)/ninewinecfg.exe.so" - - if use abi_x86_64 && use abi_x86_32; then - einfo - einfo "To set up the 32-bit library, launch your preferred Wine as follows:" - einfo " wine ${EPREFIX}/usr/$(ABI=x86 get_libdir)/ninewinecfg.exe.so" - fi -}
