Merge pull request 'fixes2' (#59) from ktrace/calculate-overlay:fixes2 into develop

Reviewed-on: calculate/calculate-overlay#59

games-util/steam-launcher/steam-launcher-1.0.0.76.ebuild

@@ -12,7 +12,7 @@ DESCRIPTION="Installer, launcher and supplementary files for Valve's Steam clien
 HOMEPAGE="https://steampowered.com"
 SRC_URI="https://repo.steampowered.com/steam/archive/stable/steam_${PV}.tar.gz"
 
-LICENSE="ValveSteamLicense MIT"
+LICENSE="Steam MIT"
 SLOT="0"
 KEYWORDS="amd64 ~x86"
 IUSE="+joystick +steamruntime +udev"

media-libs/libjpeg8/libjpeg8-2.1.4.ebuild

@@ -16,29 +16,19 @@ SRC_URI="mirror://sourceforge/${PN}/${PN}-${PV}.tar.gz
 LICENSE="BSD IJG ZLIB"
 SLOT="0/0.2"
 if [[ $(ver_cut 3) -lt 90 ]] ; then
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 fi
 IUSE="cpu_flags_arm_neon"
 
 ASM_DEPEND="|| ( dev-lang/nasm dev-lang/yasm )"
-COMMON_DEPEND="
-	!media-libs/jpeg:0
-	!media-libs/jpeg:62
-"
-DEPEND="
-	${COMMON_DEPEND}
-"
-RDEPEND="
-	${COMMON_DEPEND}
-"
+DEPEND=""
+RDEPEND=""
 BDEPEND="
 	amd64? ( ${ASM_DEPEND} )
 	x86? ( ${ASM_DEPEND} )
 	amd64-linux? ( ${ASM_DEPEND} )
 	x86-linux? ( ${ASM_DEPEND} )
-	x64-macos? ( ${ASM_DEPEND} )
 "
-#	x64-cygwin? ( ${ASM_DEPEND} )
 
 S=${WORKDIR}/${PN}-${PV}
 
@@ -99,7 +89,6 @@ src_configure() {
 
 src_install() {
 	insinto /usr/lib64/
-	doins ${WORKDIR}/libjpeg-turbo-${PV}_build/libjpeg.so.8.2.2
-	doins ${WORKDIR}/libjpeg-turbo-${PV}_build/libjpeg.so.8
+	doins "${WORKDIR}/libjpeg-turbo-${PV}_build/libjpeg.so.8.2.2"
+	doins "${WORKDIR}/libjpeg-turbo-${PV}_build/libjpeg.so.8"
 }
-