gentoo resync : 28.04.2021

4 files changed, 2 insertions, 114 deletions

diff --git a/sci-electronics/qelectrotech/Manifest b/sci-electronics/qelectrotech/Manifest
index 9196388f89ff..754862e5d319 100644
--- a/sci-electronics/qelectrotech/Manifest
+++ b/sci-electronics/qelectrotech/Manifest
@@ -1,9 +1,6 @@
-AUX qelectrotech-0.3-fix-paths.patch 2304 BLAKE2B 113afe4cd025baecc3ddd4060179d3b81da32ac172eb452bb74215cc9a2e227bd7f31474452fb4055cc9d4cbda5cd0eea856929b191917a263a7e9ac20de9483 SHA512 3d57c172bf63faa3bd5ead082be1c3143330bae8ebdde580a5b5a860d5419371a05082f4b69e39054629e9f39f258b26ec65f773238b8b7b4b892176ad998c31
 AUX qelectrotech-0.80-fix-paths.patch 2412 BLAKE2B 66ec413d1f69f1621dc9776afa91f78b7fa0d17aece0ea0a122616503319ec98df653b166f81196b8d891f327e024a8e19207e3c9ef8567038d186b1440babb2 SHA512 828d0677b1d5a0ef4049d3fc7c9fbc47dfa810252c881a5f1c7e2841f9676710b69ce1a001cd6b44e28980445782affd948cd8626e43e37f020a2247ac31f3e5
 AUX qelectrotech-0.80-nomancompress.patch 436 BLAKE2B 9f8d5491c4076e8cf1fea993180cddaf7a1f6d34556a75131c2a4799bd54228ce5936145c30f0edf33626c90eb9fcb3134ccde0685ce6091706617ccd408dd99 SHA512 6de49a59a605bff6f9eb3d375f698adbb15deec77a3d2283ba53fe63e73ec23098baa6dc5530f0f2c9f92de8f400d66e71c6024d7929f1b2a343720afe54597a
-DIST qelectrotech-0.70.tar.gz 10870717 BLAKE2B 21af2000080526cc75e67d80d514286a294a805073beb97d142758449e1290db56e741b70eeb9c38adbdb770fc548eb0fba18429bceaa8cd88bcba5335c3fca9 SHA512 db5b74ce9ac64e55a463c821ee43a2cde8cc4dc4a7be79c8a39512e54dfb85653e20981b5879ecc6e5949c1c1196ad5b7cae9780bf16de0b4d7b2381731173bd
 DIST qelectrotech-0.80.tar.gz 13835653 BLAKE2B 1efb22c9683c01c3cc449a3c1deef1990825b16f11dc15d93e2d7c0afd026486ee9772e0d8637efcb576fb20a8dc79235cdcabc94d293b9bf8c2028818645734 SHA512 732101130e77849ed0a56bcc7b519a1ca032e8f203951a50e1dd5fd488e96f1ab69ed0854176604f1947636b3d8fda1ac8aebbcfe01e63dfa263d8f646224f53
-EBUILD qelectrotech-0.70.ebuild 1148 BLAKE2B f815517770d377e6488137a0e013cc012608a27ede5e7fdd02b2f6d7e624e38c263cbbd38190f9040dc7fd6a84c205d16e1d02daddf383a2cbe7c52494312ee4 SHA512 b96df75832dacb6e02b5affbd75bb6dc3c45c6a4a77fb22722d1d3fc051e20a6229cd988eb0045d56bc408a24e0a2f4d78415f465e5fa704b899f59f3912aeb4
-EBUILD qelectrotech-0.80.ebuild 1425 BLAKE2B 67b317692aeb9d48882736cea9c85738474121d00259c35e8880f187b7af8eb6627736630d0876c2e606984d3360e8841cb8f0d91a1d6cbc5ab0098cb588062b SHA512 665b0922358d5f1cd8ef8eb87d38015e06bf67b74927cf4757f1bc88b1d60985a980f34d4ee2927570db91f797ee9f54557a1ce7c9dcc93a80a99cc8323f0250
+EBUILD qelectrotech-0.80.ebuild 1423 BLAKE2B 3def2ac1e87731b367926980c294fec104dd6257283da104fb1546b557c98887dd17307f2bc0cda0b268b917bd999f8ca6c76dbafe13c93a1abebc0dabd8ef99 SHA512 8b32aa90a8caf060d78c6a0799a397431438a7e5582428a342be2cd0f39996b81a347206b79f7b225b49c22f692a3ac7abdcc9205e719291a9982c95de5a7b3a
 EBUILD qelectrotech-9999.ebuild 1437 BLAKE2B 3ee887677a71db332885adb0b8e5ba8065b7bf771cba3820bc028aa9354ff6cc5bb9c85342d2a0fc30d233913a112737a028f3d7bff0251d2297995432fcf796 SHA512 1c1a5125793c5122ff1cc1df095bbc06ab32616375c4fbc5fabc1a070e5e7d873b14ccb2eb5ce88f1866d9a6b86ee02939cdbde0c4f866f8d88b709c207bda61
 MISC metadata.xml 247 BLAKE2B 1428e575bd9b69424c4711499480493ae371840c146149819dc41c38335cbd16d7ce50ce8f6b7be1b77db73092ed6900a9a2d8032cc790058a56e533b01f562d SHA512 b43c8e84c3c753b49b203921a5aca792639a36d6efdbe16c069ff9abfbce0585718bb3824c03abdd7bd19ada13fb0a98a378c85ed369ac5fdc53ad3b3d5465d2
diff --git a/sci-electronics/qelectrotech/files/qelectrotech-0.3-fix-paths.patch b/sci-electronics/qelectrotech/files/qelectrotech-0.3-fix-paths.patch
deleted file mode 100644
index c55c19ce5d29..000000000000
--- a/sci-electronics/qelectrotech/files/qelectrotech-0.3-fix-paths.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-diff -Naur qelectrotech-0.3-src.orig/qelectrotech.pro qelectrotech-0.3-src/qelectrotech.pro
---- qelectrotech-0.3-src.orig/qelectrotech.pro	2013-12-22 17:27:31.919047334 +0100
-+++ qelectrotech-0.3-src/qelectrotech.pro	2013-12-22 17:29:28.576908241 +0100
-@@ -5,20 +5,20 @@
- # Chemins utilises pour la compilation et l'installation de QET
- unix {
- 	# Chemins UNIX
--	COMPIL_PREFIX              = '/usr/local/'
--	INSTALL_PREFIX             = '/usr/local/'
-+	COMPIL_PREFIX              = '/usr/'
-+	INSTALL_PREFIX             = '/usr/'
- 	QET_BINARY_PATH            = 'bin/'
- 	QET_COMMON_COLLECTION_PATH = 'share/qelectrotech/elements/'
- 	QET_COMMON_TBT_PATH        = 'share/qelectrotech/titleblocks/'
- 	QET_LANG_PATH              = 'share/qelectrotech/lang/'
- 	QET_EXAMPLES_PATH          = 'share/qelectrotech/examples/'
- 	QET_LICENSE_PATH           = 'doc/qelectrotech/'
--	QET_MIME_XML_PATH          = '../share/mime/application/'
--	QET_MIME_DESKTOP_PATH      = '../share/mimelnk/application/'
--	QET_MIME_PACKAGE_PATH      = '../share/mime/packages/'
-+	QET_MIME_XML_PATH          = 'share/mime/application/'
-+	QET_MIME_DESKTOP_PATH      = 'share/mimelnk/application/'
-+	QET_MIME_PACKAGE_PATH      = 'share/mime/packages/'
- 	QET_DESKTOP_PATH           = 'share/applications/'
- 	QET_ICONS_PATH             = 'share/icons/hicolor/'
--	QET_MAN_PATH               = 'man/'
-+	QET_MAN_PATH               = 'share/man/'
- 	QET_APPDATA_PATH           = 'share/appdata'
- }
- win32 {
-@@ -108,9 +108,6 @@
- examples.path      = $$join(INSTALL_PREFIX,,,$${QET_EXAMPLES_PATH})
- examples.files     = examples/*
- 
--copyright.path     = $$join(INSTALL_PREFIX,,,$${QET_LICENSE_PATH})
--copyright.files    = LICENSE ELEMENTS.LICENSE CREDIT README ChangeLog
--
- mime_xml.path      = $$join(INSTALL_PREFIX,,,$${QET_MIME_XML_PATH})
- mime_xml.files     = misc/x-qet-*.xml
- 
-@@ -140,7 +137,7 @@
- man.extra          = sh man/compress_man_pages.sh
- 
- # L'installation comprend la copie du binaire, des elements, des fichiers de langue et du fichier LICENSE
--INSTALLS += target elements tbt lang copyright
-+INSTALLS += target elements tbt lang
- # Sous Unix, on installe egalement l'icone, un fichier .desktop, des fichiers mime et les pages de manuel
- unix {
- 	INSTALLS += desktop mime_xml mime_desktop mime_package icons man examples appdata
diff --git a/sci-electronics/qelectrotech/qelectrotech-0.70.ebuild b/sci-electronics/qelectrotech/qelectrotech-0.70.ebuild
deleted file mode 100644
index cddb5f1a5ac9..000000000000
--- a/sci-electronics/qelectrotech/qelectrotech-0.70.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# 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-0.80.ebuild b/sci-electronics/qelectrotech/qelectrotech-0.80.ebuild
index 135799c10bea..68f5ed0ee26b 100644
--- a/sci-electronics/qelectrotech/qelectrotech-0.80.ebuild
+++ b/sci-electronics/qelectrotech/qelectrotech-0.80.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999* ]]; then
 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"
+	KEYWORDS="amd64 x86"
 	S="${WORKDIR}"/${MY_P}
 fi