gentoo resync : 15.12.2019

4 files changed, 5 insertions, 91 deletions

diff --git a/app-emulation/winetricks/Manifest b/app-emulation/winetricks/Manifest
index 6aa0cb692a60..3615c322cac7 100644
--- a/app-emulation/winetricks/Manifest
+++ b/app-emulation/winetricks/Manifest
@@ -1,7 +1,5 @@
-DIST winetricks-20190310.tar.gz 673467 BLAKE2B b6c6a6d28e49f9b2745ac623f9a9d35bdcaa402c11b3f2055f3d2ef2d13ccff6adcda47261447aff7b70bfcd9bc65ea2a278368616df93f031fe212aa3201a5d SHA512 4f08228306a84cd2e1ecf0df46e951dfc5844716fadab903eca7ed09f15ed2bbba7ca5bf48384f934783be6a85b812129427a296a580561ee5b8483df0e64025
 DIST winetricks-20190912.tar.gz 679544 BLAKE2B 633c407f8560fa3aa38806befded957d0bf1276164483b08fb3ef285fe873531d6362ae6305f5a33a85891d75990e6e0271fe954358e49425c4f36f0f918f48d SHA512 a0017cc08c56a511e523116daf2024b1462460d00b3d07de87720c7912dccab3d953db3653d7d611c5ae3b457a45de8d36688ee703e805c1e1f5be5c0fa7739f
 DIST winetricks-gentoo-2012.11.24.tar.bz2 6398 BLAKE2B 54a4502f6e8ef15d21b02c43e3ce599e32d476c2559246064de14cc4ce2243ff11dde681d24c8a7f4913c3d7a10b855bda47e8fb8ecad31e00d839705416be6f SHA512 59c93b73f3a7b2d11aefcde2ff66659ff1de21ad4b5f232f4b60572f3a48b15a6c49f369b1696862bf1b33fde190bf5598945e9536fb41ddec42d8def4d2be2a
-EBUILD winetricks-20190310.ebuild 1910 BLAKE2B ce6174352c8370e08edb836801010698fc2b717c438e8661818e2f0b6538f3af4ff647b7693e6a56e07b1d7db8732dd3e651d24ecd186e135603c521d8d0c6e0 SHA512 9fec59c039413af08fff8d8ee301607683fd9645f79b1bd4e4fdc52a0e93e40a1cc126dd160a7387722e22bddab1e8a2d90e4afc58558e3d3a7532176b0f7d26
-EBUILD winetricks-20190912.ebuild 1911 BLAKE2B 5cdbf7f9364a82f7319f654fb0a118ab53abba5f8dfa56ac8598431ab501347de75b3d27ae4acf88b863d152761481ac24c1d8494e7a20ec81a7e2ded4c74b7e SHA512 2af034e96ac2f78b298895eb45d993b9a744c1faa1efb80b28bb660b180339de8c3158697900abe898616a675f316442535d9498e4acbafdf169b3b8abd95752
-EBUILD winetricks-99999999.ebuild 1912 BLAKE2B fe3c652325f6d428cacbc22f74ae0fd93e397e8b4b81287e7611608cbf7f3c0261e5844d722ddc1823a94be344b4e3c1d3bafb07e958afd7568cfc1b576f105a SHA512 b10f311f6be55a688021dc83821b0c78e8305271e3bc1a982fab034b9b0c8f489a26df94140c2c4f545d79b0639930f90ea7380cbfccdcc460ee0e88d2a5b946
+EBUILD winetricks-20190912.ebuild 1937 BLAKE2B 231d6da06a48480219664c749f5c032135444bb8490ab49387a37f97ce1b7dfe27a8815bc0cbc3e9e3d74d764af4b0d4d0e395e89ff4a6d698770f3638abc3b8 SHA512 ecaf370db1513bd7119fbbf85710f1a7d22c250e60d51946ddea8efd885136e18012add92bb3283664ecb3995af235a1ee7cccbfee8e215950a9a08141956dd4
+EBUILD winetricks-99999999.ebuild 1939 BLAKE2B 99a9a25d9981607a9f1de4c0c934c1d13659037fb5665c0b8b8c9d249e93cde40f347575b5c58dee10325fc98feeeb257905cff7e08cc4b30c8a4595fb95d715 SHA512 eb76845444cc9e93089371db14d22abe9acc6ec1ddc5d11c9b6a88354b42eeacaade10924354a5f854818b320445b0d0d05e2e89548c7f66994cd6a6b6d635c1
 MISC metadata.xml 713 BLAKE2B 144bf83fd445c85df10c852a798f8e6f049923489e039fceb81989279eba2f869fb5b660482cd2f0be872761bdee3fb1104df207f44daa060dee1aab6cddd9f4 SHA512 f1fc5650abbff4a82a006461932d765d775cdbd630ebcbfdd02488b2f1999d41e89b2a45d6142175e715e186392f4bc4820f501c4064e4a9aa9c8dabbc1ce6a9
diff --git a/app-emulation/winetricks/winetricks-20190310.ebuild b/app-emulation/winetricks/winetricks-20190310.ebuild
deleted file mode 100644
index dab00adc9eb3..000000000000
--- a/app-emulation/winetricks/winetricks-20190310.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop xdg
-
-if [[ ${PV} == "99999999" ]] ; then
-	EGIT_REPO_URI="https://github.com/Winetricks/${PN}.git"
-	inherit git-r3
-	SRC_URI=""
-else
-	SRC_URI="https://github.com/Winetricks/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 x86"
-fi
-
-wtg="winetricks-gentoo-2012.11.24"
-
-SRC_URI="${SRC_URI}
-	gtk? ( https://dev.gentoo.org/~chiitoo/distfiles/${wtg}.tar.bz2 )
-	kde? ( https://dev.gentoo.org/~chiitoo/distfiles/${wtg}.tar.bz2 )
-"
-
-DESCRIPTION="Easy way to install DLLs needed to work around problems in Wine"
-HOMEPAGE="https://github.com/Winetricks/winetricks https://wiki.winehq.org/Winetricks"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-IUSE="gtk kde rar test"
-
-BDEPEND="
-	test? (
-		dev-python/bashate
-		dev-util/checkbashisms
-		dev-util/shellcheck
-	)
-"
-DEPEND=""
-RDEPEND="${DEPEND}
-	app-arch/cabextract
-	app-arch/p7zip
-	app-arch/unzip
-	net-misc/wget
-	virtual/wine
-	x11-misc/xdg-utils
-	gtk? ( gnome-extra/zenity )
-	kde? ( kde-apps/kdialog )
-	rar? ( app-arch/unrar )
-"
-
-# Test targets include syntax checks only, not the "heavy duty" tests
-# that would require a lot of disk space, as well as network access.
-
-# This uses a non-standard "Wine" category, which is provided by
-# '/etc/xdg/menus/applications-merged/wine.menu' from the
-# 'app-emulation/wine-desktop-common' package.
-# https://bugs.gentoo.org/451552
-QA_DESKTOP_FILE="usr/share/applications/winetricks.desktop"
-
-src_unpack() {
-	if [[ ${PV} == "99999999" ]]; then
-		git-r3_src_unpack
-
-		if use gtk || use kde; then
-			unpack ${wtg}.tar.bz2
-		fi
-
-	else
-		default
-	fi
-}
-
-src_test() {
-	./tests/shell-checks || die "Test(s) failed."
-}
-
-src_install() {
-	default
-
-	if use gtk || use kde; then
-		cd "${WORKDIR}/${wtg}" || die
-		domenu winetricks.desktop
-		insinto /usr/share/icons/hicolor/scalable/apps
-		doins wine-winetricks.svg
-	fi
-}
diff --git a/app-emulation/winetricks/winetricks-20190912.ebuild b/app-emulation/winetricks/winetricks-20190912.ebuild
index 3daf509e39bf..3cb7eb82c4b2 100644
--- a/app-emulation/winetricks/winetricks-20190912.ebuild
+++ b/app-emulation/winetricks/winetricks-20190912.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == "99999999" ]] ; then
 	SRC_URI=""
 else
 	SRC_URI="https://github.com/Winetricks/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 wtg="winetricks-gentoo-2012.11.24"
@@ -27,6 +27,7 @@ HOMEPAGE="https://github.com/Winetricks/winetricks https://wiki.winehq.org/Winet
 LICENSE="LGPL-2.1+"
 SLOT="0"
 IUSE="gtk kde rar test"
+RESTRICT="!test? ( test )"
 
 BDEPEND="
 	test? (
diff --git a/app-emulation/winetricks/winetricks-99999999.ebuild b/app-emulation/winetricks/winetricks-99999999.ebuild
index 900a5b539221..b189cfcbaca7 100644
--- a/app-emulation/winetricks/winetricks-99999999.ebuild
+++ b/app-emulation/winetricks/winetricks-99999999.ebuild
@@ -27,6 +27,7 @@ HOMEPAGE="https://github.com/Winetricks/winetricks https://wiki.winehq.org/Winet
 LICENSE="LGPL-2.1+"
 SLOT="0"
 IUSE="gtk kde rar test"
+RESTRICT="!test? ( test )"
 
 BDEPEND="
 	test? (