gentoo resync : 28.04.2021

3 files changed, 11 insertions, 79 deletions

diff --git a/games-util/dfarc/Manifest b/games-util/dfarc/Manifest
index 9c336d90b160..65f12edfffdb 100644
--- a/games-util/dfarc/Manifest
+++ b/games-util/dfarc/Manifest
@@ -1,6 +1,4 @@
 AUX dfarc-3.12-nowindres.patch 648 BLAKE2B 0bc6d823c7bc44ff69730473a55542d974e1695086fef27a6b235306c20978b4645e00878123cadfa10202301b52f3e6731384c9bba140c76312e6cf9ab31b9d SHA512 1ac6a7b889a271b70a2ab606dfa7475c3053aca5f72192cae2b161db9d7ef955df74e7cf94e2db4ac89bee3ada433e20a4dc8ec37f836a12e2810ab61351bdc4
-DIST dfarc-3.12.tar.gz 329925 BLAKE2B ebebfdf42fbd8bcc53696777f5fb06a54635e269dafb59c888990250343e0bca0b20d46b051e753b047f008061ef74070456d83ee72eb37018a2bc1b386d1c9f SHA512 e87e89e67e383c3d25a6620edc38c6ab6f90b9df52b84d6e6de20af1ac3b50588b3037575f2f89a14c90c14151053c08a7bb97143f24471e33326f3f2d2574ab
 DIST dfarc-3.14.tar.gz 336910 BLAKE2B 50f0ad1af2d91a562ba6a7b1e0e5e1821c900fe8ab3cf48f3585ca10ea12d9f7e3125ae85bc2e31c1539bf13d5a950e30a467b05259a7df6e2bda35544820933 SHA512 536c1cb5d1c8bf7012920e39d69fafbb790da78acb89a18f8ab1a3ad985220c74da61adda238e39395b4d7fd8fc62894fb5579691b744fe17600a8fccabc3c13
-EBUILD dfarc-3.12-r1.ebuild 878 BLAKE2B 1015af2a3ad1bd03aed5659c3cd9e09040d4d6830dffa96bd75feeafa5e64ee1c88745b042edda83f4c0f978c804856c8e025ed027c8c99b24494a29e3b04b9a SHA512 dcbeb8a65243501a72dbf861adee7ba1efd771b9d7777992286674e7d5cbfc0db50be9e689e7083760cb5cf57e1545ec410a47d33ce73a8d39126b23e7ac5a1a
-EBUILD dfarc-3.14.ebuild 884 BLAKE2B 1ad3f1122cf29b8927f49b6d95ab151faf58649344027cf94bf313dd9951c082eea85d676f2b4039b14b2d5558e39cd58cd9513eed3a693f7cac48e813825d9d SHA512 9a5b85d95ba5999e289409f17883a1b1a9c9f88a33e872fb2cb73bf40a19193db821094eaeeaa36146cf9f68b0ea69ae47c0bdc8c145cafba0960aa4706f2565
+EBUILD dfarc-3.14.ebuild 733 BLAKE2B 2e3cb497ca21e37cc6abef84269b5964782b528444757f318cc97bf3bdcf851d1a81f10f24002570c058acebaa5989302ae35085070f14ceefed1fdb5783a5af SHA512 53243014fbd0581fd1b1adedccbb56547a5536c76f41d70130f203332b03a4678dbd653069e900263c1b82e3a1811a5a9a9eeb7f5154ab1347cccac84f4c7ceb
 MISC metadata.xml 253 BLAKE2B 443ca9c8d4f6801169382e87a0ecd1385c56e65229209e7200f9d313ef380e92ae8d7dc3c38e5989a4166289f22607a20b1e13bb960fff6b3d9f78629d8ab020 SHA512 61c4689cbc649d84a00be211b7b5b98dd03e1d3f813eff370df549f2998cd4343f391c18b57cf20e4a8f4dd2311e3bfa04eb60f356f2bbac78f0b68f5091f254
diff --git a/games-util/dfarc/dfarc-3.12-r1.ebuild b/games-util/dfarc/dfarc-3.12-r1.ebuild
deleted file mode 100644
index c996a7d3172d..000000000000
--- a/games-util/dfarc/dfarc-3.12-r1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-WX_GTK_VER="3.0"
-inherit eutils gnome2-utils wxwidgets xdg
-
-DESCRIPTION="Frontend and .dmod installer for GNU FreeDink"
-HOMEPAGE="http://www.freedink.org/"
-SRC_URI="mirror://gnu/freedink/${P}.tar.gz"
-
-LICENSE="GPL-3 BZIP2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="nls"
-
-RDEPEND="
-	app-arch/bzip2
-	x11-misc/xdg-utils
-	x11-libs/wxGTK:${WX_GTK_VER}[X]
-"
-DEPEND="${RDEPEND}
-	nls? ( >=dev-util/intltool-0.31 )
-"
-
-PATCHES=( "${FILESDIR}"/${P}-nowindres.patch )
-
-src_configure() {
-	econf \
-		$(use_enable nls) \
-		--disable-desktopfiles
-}
-
-src_install() {
-	default
-	dodoc TRANSLATIONS.txt
-}
-
-pkg_preinst() {
-	xdg_pkg_preinst
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_icon_cache_update
-}
diff --git a/games-util/dfarc/dfarc-3.14.ebuild b/games-util/dfarc/dfarc-3.14.ebuild
index 96118b386c92..3215e6fa9c25 100644
--- a/games-util/dfarc/dfarc-3.14.ebuild
+++ b/games-util/dfarc/dfarc-3.14.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
+
 WX_GTK_VER="3.0"
-inherit eutils gnome2-utils wxwidgets xdg
+inherit wxwidgets xdg
 
 DESCRIPTION="Frontend and .dmod installer for GNU FreeDink"
 HOMEPAGE="http://www.freedink.org/"
@@ -17,36 +18,21 @@ IUSE="nls"
 RDEPEND="
 	app-arch/bzip2
 	x11-misc/xdg-utils
-	x11-libs/wxGTK:${WX_GTK_VER}[X]
-"
-DEPEND="${RDEPEND}
-	nls? ( >=dev-util/intltool-0.31 )
-"
+	x11-libs/wxGTK:${WX_GTK_VER}[X]"
+DEPEND="${RDEPEND}"
+BDEPEND="nls? ( dev-util/intltool )"
 
 PATCHES=( "${FILESDIR}"/${PN}-3.12-nowindres.patch )
 
 src_configure() {
+	setup-wxwidgets
 	econf \
 		$(use_enable nls) \
-		--disable-desktopfiles
+		--disable-desktopfiles \
+		--with-wx-config="${WX_CONFIG}"
 }
 
 src_install() {
 	default
 	dodoc TRANSLATIONS.txt
 }
-
-pkg_preinst() {
-	xdg_pkg_preinst
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_icon_cache_update
-}