gentoo resync : 14.05.2020

3 files changed, 2 insertions, 62 deletions

diff --git a/app-emulation/q4wine/Manifest b/app-emulation/q4wine/Manifest
index be63c36c7847..be88863d6cb3 100644
--- a/app-emulation/q4wine/Manifest
+++ b/app-emulation/q4wine/Manifest
@@ -1,5 +1,3 @@
-DIST q4wine-1.3.11.tar.bz2 2868845 BLAKE2B 98893b1f65bcb8b8f301d7046a650658a9537849818fddf4803471a626f24d8c812867daec1f167b1fa5cdce9f9c0c50323d715ea06c51f3d52f85904257d2b0 SHA512 95ac66632bc46b10659e1d0e5f3c68b73934a85ddcc6582abd367d28f9949ad0ca732a5596db800bbc76b40ae7cf05fd95febf6d8b44db20cf710c2c1e23288f
 DIST q4wine-1.3.12.tar.bz2 2875348 BLAKE2B 0656574542c218163a0d7bef6d09459e7816a936f1d4c2fcf3ee15416aca23f6c97895b7f2f34e9a40b64f904cad579062ab173cc93f00c543a1ae861bf3f179 SHA512 c384c5c57b3bbea9f5ba2940e990c7ff28c9f410c9abd33fe1f17973b67bdf85dad4c74809ad3a225eaea49796221ab04e2e29dd81ea8ef7015e9b7adf9ab44e
-EBUILD q4wine-1.3.11.ebuild 1186 BLAKE2B a185558ed4c5b63edeb7c1b4f64d3e757b69c7864babb85bf10ea5ea58b1b2b0f55cf16c7df650d86653852d7bc7b44c905f8520339e09a29e353a17b4111160 SHA512 448eada5f0367e444b2a8549f6a04bfbb38a4e5576173b3a447ba8fe907388be1bf8a125cbd3986c5239bd5b9718ff18ef87b482f9714cef7aec1657f3e57456
-EBUILD q4wine-1.3.12.ebuild 1186 BLAKE2B b5d77827028ad5cac653d30c2d270ee79c576ce905c5230f493da47ea29f7a1d35cd124d6947c5e400a72afddae96386dc8e608ff50f85bf1f2270ca7d40995c SHA512 72966d0b270051327c8fb9e865352774c2124a906c1993d856cc09df3d6289f00d748abd832b9a6dade069e90f407858b4d5a4a76b39c2fb21c0631e9b62b35f
+EBUILD q4wine-1.3.12.ebuild 1184 BLAKE2B a1cf884f08c002e48b9a7a0b6ef5b5a6acf7720f1b53aee37529b458164a78c8917aeb4fc59e24104f974210c0ec80434f35a814f2e3578241fdea65025ac213 SHA512 7657a3600286e4fe64ae7ef940764108a6f21cdb84ca779e548179c17fc1ed744436b79e0c588c18f70aee04991e3c615968022dbf35dade7aa4c9d238315bab
 MISC metadata.xml 641 BLAKE2B af03073e86a430ccc228ba18c2dd18d4fe8d07438e5beec07f3712807a792829096cb3eeaa4e912a80c2634a1bb16ef20ddbc08684fc4fdf2b14d839cd520733 SHA512 707f77ef56bb3bcbe4bda434f1262f77c0b337a8789508e0df04d2cd791959ca7dc67b74ac81b6e248023f3da83c86bcf7f185ca689ab7b3bf346250850df8ed
diff --git a/app-emulation/q4wine/q4wine-1.3.11.ebuild b/app-emulation/q4wine/q4wine-1.3.11.ebuild
deleted file mode 100644
index 4604dd003e7c..000000000000
--- a/app-emulation/q4wine/q4wine-1.3.11.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit xdg cmake
-
-# Upstream names the package PV-rX. We change that to
-# PV_pX so we can use portage revisions.
-MY_P=${PN}-${PV/_p/-r}
-
-DESCRIPTION="Qt GUI configuration tool for Wine"
-HOMEPAGE="https://q4wine.brezblock.org.ua/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-IUSE="+dbus debug +ico +iso +wineappdb"
-
-BDEPEND="
-	dev-qt/linguist-tools:5
-"
-DEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtsingleapplication[qt5(+),X]
-	dev-qt/qtsql:5[sqlite]
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	dbus? ( dev-qt/qtdbus:5 )
-	ico? ( >=media-gfx/icoutils-0.26.0 )
-"
-RDEPEND="${DEPEND}
-	app-admin/sudo
-	>=sys-apps/which-2.19
-	iso? ( sys-fs/fuseiso )
-"
-
-S="${WORKDIR}"/${MY_P}
-
-DOCS=( AUTHORS ChangeLog README )
-
-src_configure() {
-	local mycmakeargs=(
-		-DDEBUG=$(usex debug ON OFF)
-		-DWITH_ICOUTILS=$(usex ico ON OFF)
-		-DWITH_SYSTEM_SINGLEAPP=ON
-		-DWITH_WINEAPPDB=$(usex wineappdb ON OFF)
-		-DUSE_BZIP2=OFF
-		-DUSE_GZIP=OFF
-		-DWITH_DBUS=$(usex dbus ON OFF)
-	)
-	cmake_src_configure
-}
diff --git a/app-emulation/q4wine/q4wine-1.3.12.ebuild b/app-emulation/q4wine/q4wine-1.3.12.ebuild
index 879806eac12d..81b76c34c437 100644
--- a/app-emulation/q4wine/q4wine-1.3.12.ebuild
+++ b/app-emulation/q4wine/q4wine-1.3.12.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+dbus debug +ico +iso +wineappdb"
 
 BDEPEND="