gentoo resync : 25.08.2020

3 files changed, 76 insertions, 19 deletions

diff --git a/sci-electronics/qelectrotech/Manifest b/sci-electronics/qelectrotech/Manifest
index e0a22db95db1..6fb3177c13b6 100644
--- a/sci-electronics/qelectrotech/Manifest
+++ b/sci-electronics/qelectrotech/Manifest
@@ -1,5 +1,7 @@
 AUX qelectrotech-0.3-fix-paths.patch 2304 BLAKE2B 113afe4cd025baecc3ddd4060179d3b81da32ac172eb452bb74215cc9a2e227bd7f31474452fb4055cc9d4cbda5cd0eea856929b191917a263a7e9ac20de9483 SHA512 3d57c172bf63faa3bd5ead082be1c3143330bae8ebdde580a5b5a860d5419371a05082f4b69e39054629e9f39f258b26ec65f773238b8b7b4b892176ad998c31
 DIST qelectrotech-0.61-src.tar.gz 9083192 BLAKE2B 25966e70f7f297ed55b539472970698f0947985c377cd90648d03fce8bf73c1bdede97e1104163147c5e60bb8ad05c55718f182528e6131adef6efeaf76f8e82 SHA512 b07d28520bef5773f5f93595c53a839a160c5927a7534ec30eba451fd33ab090909fc1971f28aea53538ff8e20ca45eff0b6597f3ab103b00b89eaa65067f918
+DIST qelectrotech-0.70.tar.gz 10870717 BLAKE2B 21af2000080526cc75e67d80d514286a294a805073beb97d142758449e1290db56e741b70eeb9c38adbdb770fc548eb0fba18429bceaa8cd88bcba5335c3fca9 SHA512 db5b74ce9ac64e55a463c821ee43a2cde8cc4dc4a7be79c8a39512e54dfb85653e20981b5879ecc6e5949c1c1196ad5b7cae9780bf16de0b4d7b2381731173bd
 EBUILD qelectrotech-0.61.ebuild 1155 BLAKE2B aa15c747e85a3419d77d576e2dbc9b060f3ac1970427dd743b969a216093eb5a550d6fbf9920eb1358e5330e1dfdab41ae7648f1deb04e5a8360593aaed2334f SHA512 620c5a75269d85fa56fb2bc573041853e722c65d709331b3642edd9683067bea30011eff09402b4045a2a5ba110527b48143a7c07f14bc899d1203b45f9c4daa
-EBUILD qelectrotech-9999.ebuild 1145 BLAKE2B 0edf8738be0e8c3ef882f2b41e6d837d26e650ee326e07d8be9e10e3b985f65d4e280986cfa2939babec73070bc4847722aca09cf4d769a0b55ec8be156401d0 SHA512 192b771c178173be45a4c59d2f39a00892fe68b3e83ee13605ea69015e001dbf9cbde20c159e93715ee8686f818a45f71fe70f386f3d773169d0a003fa447970
+EBUILD qelectrotech-0.70.ebuild 1150 BLAKE2B a702ebbe768db66eb7700db96a4518b70186db48ef669c78ab944ae2ce56b9c85b367dffb3ab33642c0147a15488aea02e1be8afb965142aaa809d47d25c624b SHA512 042f8ade40b93d9bfc68937bb1d89e0f8c2b90c3741c4d4e6ce0f78e88cfaa5e3dd4897a7ea89c5790a553ef8df764cd359c2a5b554ce10f910262e816e4618b
+EBUILD qelectrotech-9999.ebuild 1139 BLAKE2B 827b5184d0117228521a770808c2f00aafeec19e5bfc5623d7ba23bbee6ebb2f81b80be2b4c85ec5599613ba903725dd54f011c1e16de9a9d3b886dd2e6692a6 SHA512 0b8e91434bfec88cf0a0822fc8085a8d9eadc3277a955c06df2a59a37d395d43e6e6ed84ee0cdeba9191271d9569eda6012b01245fea1573fe4453bd8ea7b808
 MISC metadata.xml 247 BLAKE2B 1428e575bd9b69424c4711499480493ae371840c146149819dc41c38335cbd16d7ce50ce8f6b7be1b77db73092ed6900a9a2d8032cc790058a56e533b01f562d SHA512 b43c8e84c3c753b49b203921a5aca792639a36d6efdbe16c069ff9abfbce0585718bb3824c03abdd7bd19ada13fb0a98a378c85ed369ac5fdc53ad3b3d5465d2
diff --git a/sci-electronics/qelectrotech/qelectrotech-0.70.ebuild b/sci-electronics/qelectrotech/qelectrotech-0.70.ebuild
new file mode 100644
index 000000000000..85e3e238086e
--- /dev/null
+++ b/sci-electronics/qelectrotech/qelectrotech-0.70.ebuild
@@ -0,0 +1,60 @@
+# Copyright 2001-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit qmake-utils xdg
+
+DESCRIPTION="Qt5 application to design electric diagrams"
+HOMEPAGE="https://qelectrotech.org/"
+
+if [[ ${PV} = *9999* ]]; then
+	inherit subversion
+	ESVN_REPO_URI="svn://svn.tuxfamily.org/svnroot/qet/qet/trunk"
+else
+	MY_P=qet-${PV/%0/.0}
+	SRC_URI="https://git.tuxfamily.org/qet/qet.git/snapshot/${MY_P}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+	S="${WORKDIR}"/${MY_P}
+fi
+
+LICENSE="CC-BY-3.0 GPL-2+"
+SLOT="0"
+IUSE="doc"
+
+BDEPEND="
+	doc? ( app-doc/doxygen )
+"
+RDEPEND="
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtsql:5[sqlite]
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	kde-frameworks/kcoreaddons:5
+	kde-frameworks/kwidgetsaddons:5
+"
+DEPEND="${RDEPEND}"
+
+DOCS=( CREDIT ChangeLog README )
+
+PATCHES=( "${FILESDIR}/${PN}-0.3-fix-paths.patch" )
+
+src_configure() {
+	eqmake5 ${PN}.pro
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+
+	if use doc; then
+		doxygen Doxyfile || die
+		local HTML_DOCS=( doc/html/. )
+	fi
+
+	einstalldocs
+}
diff --git a/sci-electronics/qelectrotech/qelectrotech-9999.ebuild b/sci-electronics/qelectrotech/qelectrotech-9999.ebuild
index 3f4b1b8d7a2d..bd14b719e6f5 100644
--- a/sci-electronics/qelectrotech/qelectrotech-9999.ebuild
+++ b/sci-electronics/qelectrotech/qelectrotech-9999.ebuild
@@ -3,16 +3,23 @@
 
 EAPI=7
 
-MY_P=${PN}-${PV%0}-src
-inherit qmake-utils subversion xdg-utils
+inherit qmake-utils xdg
 
 DESCRIPTION="Qt5 application to design electric diagrams"
 HOMEPAGE="https://qelectrotech.org/"
-ESVN_REPO_URI="svn://svn.tuxfamily.org/svnroot/qet/qet/trunk"
+
+if [[ ${PV} = *9999* ]]; then
+	inherit subversion
+	ESVN_REPO_URI="svn://svn.tuxfamily.org/svnroot/qet/qet/trunk"
+else
+	MY_P=${PN}-${PV%0}-src
+	SRC_URI="https://download.tuxfamily.org/qet/tags/20180823/${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+	S="${WORKDIR}"/${MY_P}
+fi
 
 LICENSE="CC-BY-3.0 GPL-2+"
 SLOT="0"
-KEYWORDS=""
 IUSE="doc"
 
 BDEPEND="
@@ -28,11 +35,11 @@ RDEPEND="
 	dev-qt/qtsvg:5
 	dev-qt/qtwidgets:5
 	dev-qt/qtxml:5
+	kde-frameworks/kcoreaddons:5
+	kde-frameworks/kwidgetsaddons:5
 "
 DEPEND="${RDEPEND}"
 
-S=${WORKDIR}/${MY_P}
-
 DOCS=( CREDIT ChangeLog README )
 
 PATCHES=( "${FILESDIR}/${PN}-0.3-fix-paths.patch" )
@@ -51,15 +58,3 @@ src_install() {
 
 	einstalldocs
 }
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	xdg_icon_cache_update
-}