From 802c3491919735bc805fedfd101901f5b64a77b8 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 16 Nov 2016 21:19:12 +0000 Subject: adjust steam to work nice with gcc 5.4.0 --- app-emulation/steam/files/redcore-steam | 2 +- app-emulation/steam/steam-1.0.0.45-r7.ebuild | 49 ---------------------------- app-emulation/steam/steam-1.0.0.45-r8.ebuild | 49 ++++++++++++++++++++++++++++ 3 files changed, 50 insertions(+), 50 deletions(-) delete mode 100644 app-emulation/steam/steam-1.0.0.45-r7.ebuild create mode 100644 app-emulation/steam/steam-1.0.0.45-r8.ebuild diff --git a/app-emulation/steam/files/redcore-steam b/app-emulation/steam/files/redcore-steam index f83f5115..f357bc0b 100755 --- a/app-emulation/steam/files/redcore-steam +++ b/app-emulation/steam/files/redcore-steam @@ -17,7 +17,7 @@ remove_some_bundled_libs () { } preload_some_system_libs () { - export LD_PRELOAD='/usr/lib32/gcc/x86_64-pc-linux-gnu/4.9.3/32/libstdc++.so.6 /usr/lib32/gcc/x86_64-pc-linux-gnu/4.9.3/32/libgcc_s.so.1 /usr/lib64/gcc/x86_64-pc-linux-gnu/4.9.3/libgcc_s.so.1 /usr/lib64/gcc/x86_64-pc-linux-gnu/4.9.3/32/libstdc++.so.6' + export LD_PRELOAD='/usr/lib32/gcc/x86_64-pc-linux-gnu/5.4.0/32/libstdc++.so.6 /usr/lib32/gcc/x86_64-pc-linux-gnu/5.4.0/32/libgcc_s.so.1 /usr/lib64/gcc/x86_64-pc-linux-gnu/5.4.0/libgcc_s.so.1 /usr/lib64/gcc/x86_64-pc-linux-gnu/5.4.0/32/libstdc++.so.6' # steam must be told where nvidia opengl libs live on gentoo systems # but this will break optimus, so check if we detect bbswitch in here # if we do, we do not preload nvidia opengl, as it will break steam diff --git a/app-emulation/steam/steam-1.0.0.45-r7.ebuild b/app-emulation/steam/steam-1.0.0.45-r7.ebuild deleted file mode 100644 index e4a19487..00000000 --- a/app-emulation/steam/steam-1.0.0.45-r7.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - - -EAPI=5 - -inherit eutils - -DESCRIPTION="Digital distribution client bootstrap package" -HOMEPAGE="http://steampowered.com/" -SRC_URI="http://repo.steampowered.com/${PN}/pool/${PN}/s/${PN}/${PN}_${PV}.tar.gz" - -LICENSE="custom" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -RDEPEND=" - virtual/ttf-fonts - dev-util/desktop-file-utils - x11-themes/hicolor-icon-theme - net-misc/curl - sys-apps/dbus - media-libs/freetype - x11-libs/gdk-pixbuf - gnome-extra/zenity - amd64? ( - >=media-libs/alsa-lib-1.0.28[abi_x86_32(-)] - >=media-libs/mesa-10.0.4[abi_x86_32(-)] - >=x11-libs/libX11-1.6.2[abi_x86_32(-)] - ) - x86? ( - media-libs/alsa-lib - media-libs/mesa - x11-libs/libX11 - )" - -S=${WORKDIR}/${PN} - -src_prepare() { - epatch "${FILESDIR}"/redcore-${PN}.patch -} - -src_install() { - emake DESTDIR="${D}" install || die "make install failed" - exeinto /usr/bin || die - doexe ${FILESDIR}/redcore-steam || die - rm -rf "${D}"/usr/bin/steamdeps || die - dosym /bin/true /usr/bin/steamdeps || die -} diff --git a/app-emulation/steam/steam-1.0.0.45-r8.ebuild b/app-emulation/steam/steam-1.0.0.45-r8.ebuild new file mode 100644 index 00000000..e4a19487 --- /dev/null +++ b/app-emulation/steam/steam-1.0.0.45-r8.ebuild @@ -0,0 +1,49 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + + +EAPI=5 + +inherit eutils + +DESCRIPTION="Digital distribution client bootstrap package" +HOMEPAGE="http://steampowered.com/" +SRC_URI="http://repo.steampowered.com/${PN}/pool/${PN}/s/${PN}/${PN}_${PV}.tar.gz" + +LICENSE="custom" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +RDEPEND=" + virtual/ttf-fonts + dev-util/desktop-file-utils + x11-themes/hicolor-icon-theme + net-misc/curl + sys-apps/dbus + media-libs/freetype + x11-libs/gdk-pixbuf + gnome-extra/zenity + amd64? ( + >=media-libs/alsa-lib-1.0.28[abi_x86_32(-)] + >=media-libs/mesa-10.0.4[abi_x86_32(-)] + >=x11-libs/libX11-1.6.2[abi_x86_32(-)] + ) + x86? ( + media-libs/alsa-lib + media-libs/mesa + x11-libs/libX11 + )" + +S=${WORKDIR}/${PN} + +src_prepare() { + epatch "${FILESDIR}"/redcore-${PN}.patch +} + +src_install() { + emake DESTDIR="${D}" install || die "make install failed" + exeinto /usr/bin || die + doexe ${FILESDIR}/redcore-steam || die + rm -rf "${D}"/usr/bin/steamdeps || die + dosym /bin/true /usr/bin/steamdeps || die +} -- cgit v1.2.3