Updating liguros repo

7 files changed, 44 insertions, 53 deletions

diff --git a/dev-go/go-bindata/Manifest b/dev-go/go-bindata/Manifest
index e89354dd767c..bab3f4c9d656 100644
--- a/dev-go/go-bindata/Manifest
+++ b/dev-go/go-bindata/Manifest
@@ -1 +1 @@
-DIST go-bindata-3.1.3.tar.gz 21280 BLAKE2B cf54b50113006f02eeab47312fcf1eaa1e4b820847ee9c579318a5aac0b720648f73cbf3d2d41e120ea79b65dc3dcfa32accaff16ed4610bcf9a9dd317e9d819 SHA512 870f939cfb07b43c54000d39fa37e8151ca5c20d13eac9bde59e7ec3e2693d8386a1ea4b5372171dac42f8a4f69a754445cb9a4fa51a7a7ba9ec54f3e8a2a2f6
+DIST go-bindata-3.21.0.tar.gz 15615959 BLAKE2B b635869202025992a7f92645de7aa96fadd18f5c99d5e312a1e645712940d05342e192401eb5aec04aac72c50b17d1fe370ef317356d47a40141cec3dc8f01a7 SHA512 004b9f0389d26f82d1419e8e8ad249d33583e85c4b4aaa4e36215bd5289a24146a237bcb55b9d51ff29c1b01ebd822ff60dcf205cb73d34f810e6838df172265
diff --git a/dev-go/go-bindata/go-bindata-3.1.3.ebuild b/dev-go/go-bindata/go-bindata-3.1.3.ebuild
deleted file mode 100644
index 10d5d8179d7e..000000000000
--- a/dev-go/go-bindata/go-bindata-3.1.3.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 2020 Liguros Authors
-# Distributed under the terms of the GNU General Public License v2
-EAPI=7
-inherit golang-build golang-vcs-snapshot
-
-EGO_PN="github.com/go-bindata/go-bindata/..."
-KEYWORDS="amd64 ~arm ~arm64"
-
-DESCRIPTION="A small utility which generates Go code from any file"
-HOMEPAGE="https://github.com/go-bindata/go-bindata"
-SRC_URI="https://github.com/go-bindata/go-bindata/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="CC-PD"
-SLOT="0/${PVR}"
-
-src_install() {
-	GOBIN=${S}/bin \
-		golang-build_src_install
-	dobin bin/*
-}
diff --git a/dev-go/go-bindata/go-bindata-3.21.0.ebuild b/dev-go/go-bindata/go-bindata-3.21.0.ebuild
new file mode 100644
index 000000000000..02d914964278
--- /dev/null
+++ b/dev-go/go-bindata/go-bindata-3.21.0.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2020 Go Overlay Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# NOTE: The original github.com/jteeuwen/go-bindata is no more maintained.
+#       Instead, we use a fork which is API compatible.
+#       For more details, see https://github.com/Dr-Terrible/go-overlay/issues/76
+GOLANG_PKG_IMPORTPATH="github.com/kevinburke"
+GOLANG_PKG_ARCHIVEPREFIX="v"
+GOLANG_PKG_IS_MULTIPLE=1
+GOLANG_PKG_HAVE_TEST=1
+
+inherit golang-single
+
+DESCRIPTION="A small utility for embedding binary data in a GoLang program."
+
+LICENSE="CC0-1.0"
+SLOT="0"
+KEYWORDS="amd64 arm arm64 x86"
diff --git a/dev-go/go-bindata/metadata.xml b/dev-go/go-bindata/metadata.xml
index 8c1d74d431e9..0afda6620771 100644
--- a/dev-go/go-bindata/metadata.xml
+++ b/dev-go/go-bindata/metadata.xml
@@ -1,12 +1,18 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>dev@liguros.net</email>
-    <name>Development</name>
-  </maintainer>
+	<maintainer type="person">
+		<email>toffanin.mauro@gmail.com</email>
+		<name>Mauro Toffanin</name>
+		<description>Maintainer. Assign bugs to him</description>
+	</maintainer>
 	<upstream>
-		<remote-id type="github">jteeuwen/go-bindata</remote-id>
+		<bugs-to>https://github.com/jteeuwen/go-bindata/issues</bugs-to>
 	</upstream>
-	<origin>ports</origin>
+	<longdescription lang="en">
+		This package converts any file into managable Go source code. Useful for
+		embedding binary data into a go program. The file data is optionally
+		gzip compressed before being converted to a raw byte slice.
+	</longdescription>
+	<origin>go-overlay</origin>
 </pkgmetadata>
diff --git a/games-util/steam-launcher/Manifest b/games-util/steam-launcher/Manifest
index baad77293f63..3a93a1410923 100644
--- a/games-util/steam-launcher/Manifest
+++ b/games-util/steam-launcher/Manifest
@@ -1 +1 @@
-DIST steam_1.0.0.67.tar.gz 2959520 BLAKE2B 1a47f1d5a1fea7ba01c250f8765b2ee8bea87f0cd242ae52bdc78b51fb05c43c333efb667d3e7cf7b401a2fa5131efce176cead3c5ecdb214257fb2da75a36cf SHA512 74af8019b9d216c02860654e9a0162b1089b979e63bbe13645be2ee79414f896e9e57cbb85d762725756e99ed6333a75c8712a827dd88de2b3631bc119b6b0b8
+DIST steam_1.0.0.64.tar.gz 3013735 BLAKE2B f8e19a768ecc507fa503ad774ce2bbf31f79f8bbaf205d687153a523761cb067ae83b718a0954ec6389dbdc7b97001932163efd888de7c73a12e1dec7e429dab SHA512 4a287b993d0ba6f49041d116512a28ca827eeac280808b70542d304f0de2d489be1f75d66d614f65ae11686a78e0d026b12e983ead7843e9ad0a28f1d21bdf4c
diff --git a/games-util/steam-launcher/metadata.xml b/games-util/steam-launcher/metadata.xml
deleted file mode 100644
index 907f2c278497..000000000000
--- a/games-util/steam-launcher/metadata.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>dev@kicherer.org</email>
-		<name>Mario Kicherer</name>
-	</maintainer>
-	<longdescription>
-		This ebuild installs common files for the Steam environment,
-		like bootstrap archive and icons, but not the client itself.
-	</longdescription>
-	<upstream>
-		<bugs-to>https://github.com/anyc/steam-overlay</bugs-to>
-	</upstream>
-	<use>
-		<flag name='steamruntime'>Use the official steam runtime libraries</flag>
-	</use>
-	<origin>steam-overlay</origin>
-</pkgmetadata>
diff --git a/games-util/steam-launcher/steam-launcher-1.0.0.67.ebuild b/games-util/steam-launcher/steam-launcher-1.0.0.64.ebuild
index 87f35fafd126..350d9e8c7d5b 100644
--- a/games-util/steam-launcher/steam-launcher-1.0.0.67.ebuild
+++ b/games-util/steam-launcher/steam-launcher-1.0.0.64.ebuild
@@ -6,16 +6,16 @@ EAPI=7
 # Please report bugs/suggestions on: https://github.com/anyc/steam-overlay
 # or come to #gentoo-gamerlay in freenode IRC
 
-inherit linux-info prefix xdg-utils
+inherit linux-info prefix udev xdg-utils
 
 DESCRIPTION="Installer, launcher and supplementary files for Valve's Steam client"
 HOMEPAGE="https://steampowered.com"
-SRC_URI="https://repo.steampowered.com/steam/archive/precise/steam_${PV}.tar.gz"
+SRC_URI="https://repo-steampowered-com.steamos.cloud/steam/pool/steam/s/steam/steam_${PV}.tar.gz"
 
 LICENSE="ValveSteamLicense MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="+joystick +steamruntime +udev"
+IUSE="+steamruntime"
 RESTRICT="bindist mirror test"
 
 RDEPEND="
@@ -27,9 +27,6 @@ RDEPEND="
 			x11-terms/xterm
 			)
 
-		joystick? (
-			udev? ( games-util/game-device-udev-rules )
-		)
 		steamruntime? (
 			virtual/opengl[abi_x86_32]
 			x11-libs/libX11[abi_x86_32]
@@ -89,6 +86,9 @@ 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" \
@@ -110,11 +110,14 @@ src_install() {
 
 	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
 
 	elog "Execute ${EPREFIX}/usr/bin/steam to download and install the actual"
 	elog "client into your home folder. After installation, the script"