gentoo resync : 30.05.2020

3 files changed, 28 insertions, 26 deletions

diff --git a/sci-electronics/qelectrotech/Manifest b/sci-electronics/qelectrotech/Manifest
index 21c50bc14d8f..e0a22db95db1 100644
--- a/sci-electronics/qelectrotech/Manifest
+++ b/sci-electronics/qelectrotech/Manifest
@@ -1,5 +1,5 @@
 AUX qelectrotech-0.3-fix-paths.patch 2304 BLAKE2B 113afe4cd025baecc3ddd4060179d3b81da32ac172eb452bb74215cc9a2e227bd7f31474452fb4055cc9d4cbda5cd0eea856929b191917a263a7e9ac20de9483 SHA512 3d57c172bf63faa3bd5ead082be1c3143330bae8ebdde580a5b5a860d5419371a05082f4b69e39054629e9f39f258b26ec65f773238b8b7b4b892176ad998c31
 DIST qelectrotech-0.61-src.tar.gz 9083192 BLAKE2B 25966e70f7f297ed55b539472970698f0947985c377cd90648d03fce8bf73c1bdede97e1104163147c5e60bb8ad05c55718f182528e6131adef6efeaf76f8e82 SHA512 b07d28520bef5773f5f93595c53a839a160c5927a7534ec30eba451fd33ab090909fc1971f28aea53538ff8e20ca45eff0b6597f3ab103b00b89eaa65067f918
-EBUILD qelectrotech-0.61.ebuild 1150 BLAKE2B 3867c7d0b2c0ddc46008135237e4ad085aa8dacb65a272965d3fd78fd1465a4fbffdff9d36dd325c597185067d8f5ce152d5551e777ca1673868bf3e476d4588 SHA512 80c1b055560b335dc855b3f7da70b32d0d1cd64cd6353d3bd81f36e9d010dca30251cb9cf0b548e846abab42591e9f25effee2fb2377429245858332e238d978
-EBUILD qelectrotech-9999.ebuild 1140 BLAKE2B 6b8d5a31d843e36140c2ba4d978e4c81c93a9fc2e592c4e00f04c1a47381469415741757f6c5aea1ee4a3eaedf417d48496ad920513a47483a19a30882378aac SHA512 59201435121eb4efe6d68a194c221ac97738c6fb871ffdb9b3ae06ceb7e1ade5d62f0f34380e0145537e61b7cb0991af0abfbe24c49b5a0208596fe063f162b4
+EBUILD qelectrotech-0.61.ebuild 1155 BLAKE2B aa15c747e85a3419d77d576e2dbc9b060f3ac1970427dd743b969a216093eb5a550d6fbf9920eb1358e5330e1dfdab41ae7648f1deb04e5a8360593aaed2334f SHA512 620c5a75269d85fa56fb2bc573041853e722c65d709331b3642edd9683067bea30011eff09402b4045a2a5ba110527b48143a7c07f14bc899d1203b45f9c4daa
+EBUILD qelectrotech-9999.ebuild 1145 BLAKE2B 0edf8738be0e8c3ef882f2b41e6d837d26e650ee326e07d8be9e10e3b985f65d4e280986cfa2939babec73070bc4847722aca09cf4d769a0b55ec8be156401d0 SHA512 192b771c178173be45a4c59d2f39a00892fe68b3e83ee13605ea69015e001dbf9cbde20c159e93715ee8686f818a45f71fe70f386f3d773169d0a003fa447970
 MISC metadata.xml 247 BLAKE2B 1428e575bd9b69424c4711499480493ae371840c146149819dc41c38335cbd16d7ce50ce8f6b7be1b77db73092ed6900a9a2d8032cc790058a56e533b01f562d SHA512 b43c8e84c3c753b49b203921a5aca792639a36d6efdbe16c069ff9abfbce0585718bb3824c03abdd7bd19ada13fb0a98a378c85ed369ac5fdc53ad3b3d5465d2
diff --git a/sci-electronics/qelectrotech/qelectrotech-0.61.ebuild b/sci-electronics/qelectrotech/qelectrotech-0.61.ebuild
index 5a06d6c2f6a8..38d8540b0f54 100644
--- a/sci-electronics/qelectrotech/qelectrotech-0.61.ebuild
+++ b/sci-electronics/qelectrotech/qelectrotech-0.61.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-
-inherit gnome2-utils qmake-utils xdg-utils
+EAPI=7
 
 MY_P=${PN}-${PV%0}-src
+inherit qmake-utils xdg-utils
 
 DESCRIPTION="Qt5 application to design electric diagrams"
 HOMEPAGE="https://qelectrotech.org/"
@@ -16,6 +15,9 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="doc"
 
+BDEPEND="
+	doc? ( app-doc/doxygen )
+"
 RDEPEND="
 	dev-qt/qtconcurrent:5
 	dev-qt/qtcore:5
@@ -27,13 +29,12 @@ RDEPEND="
 	dev-qt/qtwidgets:5
 	dev-qt/qtxml:5
 "
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )
-"
+DEPEND="${RDEPEND}"
 
 S=${WORKDIR}/${MY_P}
 
 DOCS=( CREDIT ChangeLog README )
+
 PATCHES=( "${FILESDIR}/${PN}-0.3-fix-paths.patch" )
 
 src_configure() {
@@ -43,22 +44,22 @@ src_configure() {
 src_install() {
 	emake INSTALL_ROOT="${D}" install
 
-	einstalldocs
-
 	if use doc; then
 		doxygen Doxyfile || die
-		dodoc -r doc/html
+		local HTML_DOCS=( doc/html/. )
 	fi
+
+	einstalldocs
 }
 
 pkg_postinst() {
 	xdg_desktop_database_update
 	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 }
 
 pkg_postrm() {
 	xdg_desktop_database_update
 	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 }
diff --git a/sci-electronics/qelectrotech/qelectrotech-9999.ebuild b/sci-electronics/qelectrotech/qelectrotech-9999.ebuild
index beb66ed5e787..3f4b1b8d7a2d 100644
--- a/sci-electronics/qelectrotech/qelectrotech-9999.ebuild
+++ b/sci-electronics/qelectrotech/qelectrotech-9999.ebuild
@@ -1,11 +1,10 @@
-# Copyright 2001-2018 Gentoo Authors
+# Copyright 2001-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-
-inherit gnome2-utils qmake-utils subversion xdg-utils
+EAPI=7
 
 MY_P=${PN}-${PV%0}-src
+inherit qmake-utils subversion xdg-utils
 
 DESCRIPTION="Qt5 application to design electric diagrams"
 HOMEPAGE="https://qelectrotech.org/"
@@ -16,6 +15,9 @@ SLOT="0"
 KEYWORDS=""
 IUSE="doc"
 
+BDEPEND="
+	doc? ( app-doc/doxygen )
+"
 RDEPEND="
 	dev-qt/qtconcurrent:5
 	dev-qt/qtcore:5
@@ -27,13 +29,12 @@ RDEPEND="
 	dev-qt/qtwidgets:5
 	dev-qt/qtxml:5
 "
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )
-"
+DEPEND="${RDEPEND}"
 
 S=${WORKDIR}/${MY_P}
 
 DOCS=( CREDIT ChangeLog README )
+
 PATCHES=( "${FILESDIR}/${PN}-0.3-fix-paths.patch" )
 
 src_configure() {
@@ -43,22 +44,22 @@ src_configure() {
 src_install() {
 	emake INSTALL_ROOT="${D}" install
 
-	einstalldocs
-
 	if use doc; then
 		doxygen Doxyfile || die
-		dodoc -r doc/html
+		local HTML_DOCS=( doc/html/. )
 	fi
+
+	einstalldocs
 }
 
 pkg_postinst() {
 	xdg_desktop_database_update
 	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 }
 
 pkg_postrm() {
 	xdg_desktop_database_update
 	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 }