diff --git a/games-util/steam-launcher/Manifest b/games-util/steam-launcher/Manifest index 3a93a1410..2a009356f 100644 --- a/games-util/steam-launcher/Manifest +++ b/games-util/steam-launcher/Manifest @@ -1 +1 @@ -DIST steam_1.0.0.64.tar.gz 3013735 BLAKE2B f8e19a768ecc507fa503ad774ce2bbf31f79f8bbaf205d687153a523761cb067ae83b718a0954ec6389dbdc7b97001932163efd888de7c73a12e1dec7e429dab SHA512 4a287b993d0ba6f49041d116512a28ca827eeac280808b70542d304f0de2d489be1f75d66d614f65ae11686a78e0d026b12e983ead7843e9ad0a28f1d21bdf4c +DIST steam_1.0.0.71.tar.gz 3432069 BLAKE2B 10cea5d3f31cd55401d68831f95a593e62a41b274cfd6e1da10585249a43e7e21f8d281e9df2b3407ceccbbec401be5d75a9951c5787cef49686acc8431e14a0 SHA512 20205ccd14dd1b48b85a3288cdce39116a601260e70b9d5811cb1786be766f235153d199e64dd4e794553c5957ce41e9b671cf044f2bdddbb0f99f0c1e08b83e diff --git a/games-util/steam-launcher/files/steam-wrapper.sh b/games-util/steam-launcher/files/steam-wrapper.sh index 6fbec6ff3..d7160231a 100644 --- a/games-util/steam-launcher/files/steam-wrapper.sh +++ b/games-util/steam-launcher/files/steam-wrapper.sh @@ -19,14 +19,9 @@ unset IFS # Add paths to occasionally needed libraries not found in /usr/lib. export LD_LIBRARY_PATH+="${LD_LIBRARY_PATH+:}@@GENTOO_LD_LIBRARY_PATH@@" -# Steam appends /usr/lib32 to LD_LIBRARY_PATH. We need to make sure -# that OpenGL implementation dir goes before that, so we need to -# append it to user's LD_LIBRARY_PATH ourselves. But that's needed -# only with the new eselect-opengl that uses 000opengl file. -if [[ -f "/etc/env.d/000opengl" ]]; then - . "/etc/env.d/000opengl" - # Append only when LDPATH is non-empty -- i.e. using nvidia or ati. - [[ -n "${LDPATH}" ]] && LD_LIBRARY_PATH+=":${LDPATH}" -fi +# Steam renames LD_LIBRARY_PATH to SYSTEM_LD_LIBRARY_PATH and it then becomes +# ineffective against games. We unfortunately therefore have to force the value +# through via STEAM_RUNTIME_LIBRARY_PATH instead. +export STEAM_RUNTIME_LIBRARY_PATH="${LD_LIBRARY_PATH}" . "${0%/*}"/../lib/steam/bin_steam.sh diff --git a/games-util/steam-launcher/metadata.xml b/games-util/steam-launcher/metadata.xml new file mode 100644 index 000000000..4e5179a38 --- /dev/null +++ b/games-util/steam-launcher/metadata.xml @@ -0,0 +1,18 @@ + + + + + dev@kicherer.org + Mario Kicherer + + + This ebuild installs common files for the Steam environment, + like bootstrap archive and icons, but not the client itself. + + + https://github.com/anyc/steam-overlay + + + Use the official steam runtime libraries + + diff --git a/games-util/steam-launcher/steam-launcher-1.0.0.64.ebuild b/games-util/steam-launcher/steam-launcher-1.0.0.71.ebuild similarity index 82% rename from games-util/steam-launcher/steam-launcher-1.0.0.64.ebuild rename to games-util/steam-launcher/steam-launcher-1.0.0.71.ebuild index 350d9e8c7..a497eed39 100644 --- a/games-util/steam-launcher/steam-launcher-1.0.0.64.ebuild +++ b/games-util/steam-launcher/steam-launcher-1.0.0.71.ebuild @@ -1,21 +1,21 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 # Please report bugs/suggestions on: https://github.com/anyc/steam-overlay -# or come to #gentoo-gamerlay in freenode IRC +# or come to #gentoo-games in Libera Chat IRC -inherit linux-info prefix udev xdg-utils +inherit desktop linux-info prefix xdg DESCRIPTION="Installer, launcher and supplementary files for Valve's Steam client" HOMEPAGE="https://steampowered.com" -SRC_URI="https://repo-steampowered-com.steamos.cloud/steam/pool/steam/s/steam/steam_${PV}.tar.gz" +SRC_URI="https://repo.steampowered.com/steam/archive/stable/steam_${PV}.tar.gz" LICENSE="ValveSteamLicense MIT" SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="+steamruntime" +KEYWORDS="~amd64" +IUSE="+joystick +steamruntime +udev" RESTRICT="bindist mirror test" RDEPEND=" @@ -27,6 +27,9 @@ RDEPEND=" x11-terms/xterm ) + joystick? ( + udev? ( games-util/game-device-udev-rules ) + ) steamruntime? ( virtual/opengl[abi_x86_32] x11-libs/libX11[abi_x86_32] @@ -35,7 +38,7 @@ RDEPEND=" x11-libs/libXdmcp[abi_x86_32] ) !steamruntime? ( - >=games-util/steam-client-meta-0-r20190331[steamruntime?] + >=games-util/steam-client-meta-0-r20210608[steamruntime?] ) amd64? ( @@ -83,12 +86,8 @@ native_path_entries() { path_entries false "${@}"; } multilib_path_entries() { path_entries true "${@}"; } src_prepare() { - xdg_environment_reset default - sed -i 's:TAG+="uaccess":\0, TAG+="udev-acl":g' \ - subprojects/steam-devices/*.rules || die - sed \ -e "s#@@PVR@@#${PVR}#g" \ -e "s#@@GENTOO_LD_LIBRARY_PATH@@#$(multilib_path_entries debiancompat fltk)#g" \ @@ -101,23 +100,20 @@ src_prepare() { } src_install() { - emake install-{icons,bootstrap,desktop} \ + emake install-{icons,bootstrap} \ DESTDIR="${D}" PREFIX="${EPREFIX}/usr" newbin steam-wrapper.sh steam exeinto /usr/lib/steam doexe bin_steam.sh + domenu steam.desktop dodoc README debian/changelog doman steam.6 - - udev_dorules subprojects/steam-devices/60-steam-{input,vr}.rules } pkg_postinst() { - xdg_icon_cache_update - xdg_desktop_database_update - udev_reload + xdg_pkg_postinst elog "Execute ${EPREFIX}/usr/bin/steam to download and install the actual" elog "client into your home folder. After installation, the script" @@ -146,8 +142,3 @@ pkg_postinst() { ewarn "The Steam client and the games are _not_ controlled by Portage." ewarn "Updates are handled by the client itself." } - -pkg_postrm() { - xdg_icon_cache_update - xdg_desktop_database_update -} diff --git a/profiles/default/package.keywords/calculate b/profiles/default/package.keywords/calculate index ce1040d4f..01cb91bb6 100644 --- a/profiles/default/package.keywords/calculate +++ b/profiles/default/package.keywords/calculate @@ -1,7 +1,5 @@ ~app-crypt/shim-signed-0.2 amd64 -~dev-python/soaplib-1.0.0 amd64 -~games-util/steam-launcher-1.0.0.64 amd64 -~media-gfx/displaycal-3.8.9.3 amd64 +~games-util/steam-launcher-1.0.0.71 amd64 ~net-im/viber-13.3.1.22 amd64 ~net-misc/modem-manager-gui-0.0.18 amd64 ~net-p2p/opentracker-20170428 amd64