gentoo resync : 28.04.2021

3 files changed, 2 insertions, 97 deletions

diff --git a/app-emulation/winetricks/Manifest b/app-emulation/winetricks/Manifest
index f880028979ff..dac327d23335 100644
--- a/app-emulation/winetricks/Manifest
+++ b/app-emulation/winetricks/Manifest
@@ -1,7 +1,5 @@
-DIST winetricks-20200412.tar.gz 684548 BLAKE2B e29eba0c73ec0649523dac0f0efd145a5c9fe60d94ae98bc55ec430f511cc5bdf3149d87289973a85a373f2f91c3bd5521470853e06f5ec4af83fc810aa4fdc5 SHA512 d6ca5628b7d296b3168ef088ca0b03aff8b73da8a139061ca64fac0685ec29bf2b7e075b89226f8ce3af511947eac45d4c72cfb1199e6b72666fc67547b77588
 DIST winetricks-20210206.tar.gz 690837 BLAKE2B a1d068e9659f6b176873af49994f1e0ca884eaa1ac9b8f5dd6d7abe79a2b8b827a2334efa7862547b17cca5bcfc285ce2d65ac0e5736cddcc777d4df2dbc7af9 SHA512 57f2ce5fe531eb6ee9a578ca565fadf5ef2e6e1379abee640ee9dc0d6000c92ce983c7507002bc6ace613d6d0dd03260ede11f7bf267adf19eb67900a0449f58
 DIST winetricks-gentoo-2012.11.24.tar.bz2 6398 BLAKE2B 54a4502f6e8ef15d21b02c43e3ce599e32d476c2559246064de14cc4ce2243ff11dde681d24c8a7f4913c3d7a10b855bda47e8fb8ecad31e00d839705416be6f SHA512 59c93b73f3a7b2d11aefcde2ff66659ff1de21ad4b5f232f4b60572f3a48b15a6c49f369b1696862bf1b33fde190bf5598945e9536fb41ddec42d8def4d2be2a
-EBUILD winetricks-20200412.ebuild 2051 BLAKE2B d37bffe1f2386eb52a2cd1697b7e9c8ea67807ac400fa4474b22e76a83aeeae04176215d9fa64845e1627723d9ba3c18c03c6b0e020e1db3a50fb04ce378e50b SHA512 bde6f11832da7d9efcbdf226ed7f37b9a2b7da1eb79001dc00ea398c5eadc41f0bc5821d19cbdbf9a1c4df80a395dc5cf718b2e51ad051a64141a41758eacc5e
-EBUILD winetricks-20210206.ebuild 1997 BLAKE2B fc9bd9fd39e90ed9786dcb37910a0f2150b012460f7feba37bafedcf7df7e78146e1de812a42314aa7a9c048f796f25cb1be470fb9201719dfbf6884d8a80d58 SHA512 0b132794ce98987a5da0a4167fd14c29866278ee949521509f1f981762f1306bf2f1dbb92d42c0354af89e28790c8f5bc6d78d467aba6b8bba15a49822fe878c
+EBUILD winetricks-20210206.ebuild 1995 BLAKE2B 7a4780f3c9933c400c7170c620a163a08bdb661bd4ccf60d47c149a91b8345d9185b344a0cfa970c764037dacdcce6121840ec31543d69bc9e84aa0305d50ed9 SHA512 480611faae5e4d492be18a62601ef68857842c08c4d902f209fc6d354232648db9bffeadccc3fdd4375a832ac58f87f07ddf2cc53e04e72e57f729bafa1d18df
 EBUILD winetricks-99999999.ebuild 1997 BLAKE2B fc9bd9fd39e90ed9786dcb37910a0f2150b012460f7feba37bafedcf7df7e78146e1de812a42314aa7a9c048f796f25cb1be470fb9201719dfbf6884d8a80d58 SHA512 0b132794ce98987a5da0a4167fd14c29866278ee949521509f1f981762f1306bf2f1dbb92d42c0354af89e28790c8f5bc6d78d467aba6b8bba15a49822fe878c
 MISC metadata.xml 715 BLAKE2B 64777067da16d6553a5a05cf2e6d62859c554230c16d599fbb5665a66e3f7ecfa49c4045d965ae1671b724e1b15ee25c08d51aaa48b28820a3845112d9fc5994 SHA512 552c5af325f62bef5f3c4e1dc7e8b6a829fc3339de8603b1fb7af17f9c7b8c0f28fdea4cf28bcca52bbaacddfa9f876260104bec8ed5478b912ed312f75d7f14
diff --git a/app-emulation/winetricks/winetricks-20200412.ebuild b/app-emulation/winetricks/winetricks-20200412.ebuild
deleted file mode 100644
index aa2e4efcf322..000000000000
--- a/app-emulation/winetricks/winetricks-20200412.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2020 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"
-RESTRICT="!test? ( test )"
-
-# dev-util/shellcheck is not available for x86
-RESTRICT+=" x86? ( test )"
-
-BDEPEND="
-	test? (
-		dev-python/bashate
-		dev-util/checkbashisms
-		|| (
-			dev-util/shellcheck-bin
-			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-20210206.ebuild b/app-emulation/winetricks/winetricks-20210206.ebuild
index 89dcbb57c973..60fe34b12e54 100644
--- a/app-emulation/winetricks/winetricks-20210206.ebuild
+++ b/app-emulation/winetricks/winetricks-20210206.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"