gentoo Easter resync : 12.04.2020

3 files changed, 2 insertions, 62 deletions

diff --git a/sys-boot/woeusb/Manifest b/sys-boot/woeusb/Manifest
index d92d1591a26d..a0c48fbbbafd 100644
--- a/sys-boot/woeusb/Manifest
+++ b/sys-boot/woeusb/Manifest
@@ -1,5 +1,3 @@
-DIST woeusb-3.3.0.tar.gz 386251 BLAKE2B 9767fc3ab3ae438ff126c05a197cb41550704b93f3b508ad88b7a39c74777fdd863794970ebc839f79f8b2f1da9f6041bb355783ec1040e31814fead8185439c SHA512 8cac015df2309e4978f38adae9b9da04d896301f8d9d971d3d21801b24c3287d7d405bc4b2b1e0ff285497b5777462eb8cd6ce7dce079daf49b4d5d313a449a3
 DIST woeusb-3.3.1.tar.gz 386399 BLAKE2B 1423ecca39018c674b0eea36de732f54cfcdd14b8cc465e6d3c0639192cbd8355436b7a39ba453b19fa6f1c5b1f6938ef12f49710bc2a4af0f2eaed967e03ce7 SHA512 e3460efabaee199eb5ffc73ca99fe2d9141ed3a5f72acd2f8910b093b2b3a93928ee4eeb27d634293448f036101d8bf24aef65dc338c80e6e3e1738004594d52
-EBUILD woeusb-3.3.0.ebuild 1036 BLAKE2B 4da72a0ecf963952b371e4b7382e1a84043d13f963e58918b76b3e0febcade04f550d4cd74f87a40df8443607753ecdf0d5510e7499d697175eaa426eb5337a9 SHA512 1e4739778602432b4362626a6c794f2d27ad61f03d6994d4e7ca87beb5efac097f643b3cbdccfa18fd7948b5d8949693b88989754011d38fcd30d355db9f38e2
-EBUILD woeusb-3.3.1.ebuild 1049 BLAKE2B 9b3a60f862fdc2f4ba2036a299516ae595f6ce022597b1a5822eb0d123c59219821de41be42e8868a5f784c66f838a19653ea2e228efead445681ca0e811fc15 SHA512 73f5c8fbc3c3c9c5e93bfc381c57f349a91133cbdde98f581e55445de38d930185783c30d5dfff1abbd7b2d75146c1491aa9aff4e3de1c2e0a5283a1f09cfae4
+EBUILD woeusb-3.3.1.ebuild 1047 BLAKE2B 53560251d0e8cc1a50bd04fc86e4022c7056ec411f7783255198f079d36d4e1c90c3e6980751decaa81ba85327aa22e72834ec0c938770134e811ca7e2e1741a SHA512 a8f12e189cd110e7d8e5f7fb9da13b53b2478f29d07e9aca11cfb5f142fc6ed792285a1b4a73dad47e2197ea265c5983d7ed3da56e96ff11e026a376d63bd037
 MISC metadata.xml 280 BLAKE2B 6e0485a0da47b477f5276aa17735ff1e9b269dbac220b12c615a80a2ad5a7a6f88aa5bcc9bd715355b5687ba50d78bb0cc45d1ef0ba82c52111691b895cffc8e SHA512 af2aa2fda44a73779e31b805313371a2cb6b9ab2846289a73083074fbff99ea1e7da2fefeaccf13b5f11c4c55b6ccb38390f21eab3f4ac1a61e00914ae38fff9
diff --git a/sys-boot/woeusb/woeusb-3.3.0.ebuild b/sys-boot/woeusb/woeusb-3.3.0.ebuild
deleted file mode 100644
index 573d9db62c74..000000000000
--- a/sys-boot/woeusb/woeusb-3.3.0.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-WX_GTK_VER="3.0-gtk3"
-
-inherit autotools wxwidgets
-
-DESCRIPTION="Creates windows installer on usb media from an iso image"
-HOMEPAGE="https://github.com/slacka/WoeUSB"
-SRC_URI="https://github.com/slacka/WoeUSB/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="minimal"
-
-RDEPEND="
-	sys-apps/util-linux
-	sys-block/parted
-	sys-fs/dosfstools
-	sys-fs/ntfs3g
-	sys-boot/grub:2[grub_platforms_pc]
-	!minimal? ( x11-libs/wxGTK:${WX_GTK_VER}[X] )
-"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/WoeUSB-${PV}"
-
-src_prepare() {
-	default
-	find . -type f -print0 | xargs -0 sed -i "s/@@WOEUSB_VERSION@@/${PV}/" || die
-	if ! use minimal; then
-		setup-wxwidgets
-		eautoreconf
-	fi
-}
-
-src_configure() {
-	! use minimal && default
-}
-
-src_compile() {
-	! use minimal && default
-}
-
-src_test() {
-	! use minimal && default
-}
-
-src_install() {
-	if use minimal; then
-		dosbin src/woeusb
-		einstalldocs
-	else
-		default
-	fi
-}
diff --git a/sys-boot/woeusb/woeusb-3.3.1.ebuild b/sys-boot/woeusb/woeusb-3.3.1.ebuild
index 2828715f8b07..a07611f43779 100644
--- a/sys-boot/woeusb/woeusb-3.3.1.ebuild
+++ b/sys-boot/woeusb/woeusb-3.3.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/slacka/WoeUSB/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="minimal"
 
 RDEPEND="