gentoo resync : 03.03.2021

3 files changed, 40 insertions, 11 deletions

diff --git a/sci-electronics/fritzing/Manifest b/sci-electronics/fritzing/Manifest
index c610df9550c4..caa41d1497e4 100644
--- a/sci-electronics/fritzing/Manifest
+++ b/sci-electronics/fritzing/Manifest
@@ -1,6 +1,7 @@
 AUX fritzing-0.9.4-fix-libgit2-version.patch 818 BLAKE2B 559efc56933460e541850e73eec1f872e3c83757e6e5e6edb8a9adf120f9e1988024d32af92d80eeedad9bce9f8f954caa5bd2c08da6c5fb7a3b6fd8a2110c01 SHA512 344597d2a1d95909bffabd852a199219d1112ec020c5f1b4bc7a46c3ed522ce931f5abef54b68dcd53dbbb52eb890262fcd67dea1947b56ef9b9d7eaebedd6e3
 AUX fritzing-0.9.4-move-parts-db-path.patch 2345 BLAKE2B c95d68d115614152817bd3905a2d0b9efdd5a358bfa242455b626d670c2382affe5ef42bcef71446c567dba28be1fed7b66102d6d82db66d86154e8374f3283d SHA512 851f4e049564a488502a93d2730484a258b042147a6645ce40195a31c97cb92b7d79e7c03751cf6337b4d9558c263f5149e7e969ecedd97abcd0e8824adb551b
+AUX fritzing-0.9.4-quazip1.patch 645 BLAKE2B 2f0fe077ab6c880479be0d9682a9812e93cccf71e4c5879bd3a3270799cc1db82ad3836d6714c79e6e553cc31463c30dc4a93c2f86d4c98057db019579fed5dc SHA512 af588ea11e1bb8695ff37166a4ac5972c4e6302e44f09db24645d8b34005c14773293d4899f2b3d9ddba713a5ff6d3fcfab0c122d6016c43e5c3c1e3439ab853
 DIST fritzing-0.9.4.tar.gz 11430102 BLAKE2B 20232b3c33308edcab188c61597f87d8a21d9b786eeab4e398c1add6e263562d1b0df95634850d5271decfa380d7b2b0c18c7f19f8b8544f330687e4cffa3700 SHA512 b148d8b93d2e452c975ca3acfd2ad5de4259f99da69c5890ebeea30730674526d480ee3830f61f6057e83b7720f07fce80ef3a74d4b718be691a92d656b755e0
 DIST fritzing-parts-0.9.4.tar.gz 17662003 BLAKE2B a67f4f1297793131d25e6b9c853e987fc0c5ecebd5f57b3675b7f9c4539f867ad18fc6e854c7a2bef1669e05dbc13dcc93df9b9befb8991ca64b2bc3e2a71b84 SHA512 f6f6c396eaf0b61dd56ece22f6bb8fce4369503729fd8f5550643e74a60aaad75abce9e391d63d52f12e4f3420296791fdf9832f7c8507dad2cf623e1bd8340f
-EBUILD fritzing-0.9.4-r1.ebuild 2032 BLAKE2B 3e0d0a7aee78e3671c88339da9db47aa3878c01348277f64e7a4ee734ea0b25b5ffa1d185986bce9f231a3defcb052850c3736cf2f08913ec94bda8e0de2c6d2 SHA512 9ab0db399ba1bd9572e893b9716458330a3a4f83b7e44bb54a15f836c8f8422fddd3d3052fdbb70b52283441e517953c0869e598d6bf9a9963ad3315c68491fd
+EBUILD fritzing-0.9.4-r2.ebuild 1994 BLAKE2B 3a3b9a5bd329df66279c1bef6bd0364bd339e13837d5e18ed530668d142d476ec26bf0ea122f2ebed657766ff5dbc6405d75065d6c06f4191a4cc7aff1366311 SHA512 8f6bf52bfcd502810746312d3fc60e30e6e6c203a1de6b2ffec43e4621d82b0f105b02d63d1b7de69f4059418ad703b613f0c6a85c4f21f05764b9753bf46e42
 MISC metadata.xml 253 BLAKE2B a86bd7fc6589eb44b2b6a4e64f250eedc4cb069c0a0b59ca015f85f482e706304ac2ac00632eac9d39f2015a5fa19dc21c758bc69eaa9f736a1cae97c7bb1a09 SHA512 2a945da80f439b52e18112fa5d1dea6a1bb2f7d39d46c7c4ab8a1a7722c954ff3d859bb7d4e12e6f682289c025350a1353af39a12a8bbb8aa2124834cf667028
diff --git a/sci-electronics/fritzing/files/fritzing-0.9.4-quazip1.patch b/sci-electronics/fritzing/files/fritzing-0.9.4-quazip1.patch
new file mode 100644
index 000000000000..d218c10d90a0
--- /dev/null
+++ b/sci-electronics/fritzing/files/fritzing-0.9.4-quazip1.patch
@@ -0,0 +1,28 @@
+Fix build with QuaZip-1.0.
+
+--- a/phoenix.pro
++++ b/phoenix.pro
+@@ -194,8 +194,8 @@
+ include(pri/qtsysteminfo.pri)
+ 
+ contains(DEFINES, QUAZIP_INSTALLED) {
+-    INCLUDEPATH += /usr/include/quazip
+-    LIBS += -lquazip
++    CONFIG += link_pkgconfig
++    PKGCONFIG += quazip1-qt5
+ } else {
+     include(pri/quazip.pri)
+ }
+--- a/src/utils/folderutils.cpp
++++ b/src/utils/folderutils.cpp
+@@ -35,8 +35,8 @@
+ 
+ #include "../debugdialog.h"
+ #ifdef QUAZIP_INSTALLED
+-#include <quazip/quazip.h>
+-#include <quazip/quazipfile.h>
++#include <quazip.h>
++#include <quazipfile.h>
+ #else
+ #include "../lib/quazip/quazip.h"
+ #include "../lib/quazip/quazipfile.h"
diff --git a/sci-electronics/fritzing/fritzing-0.9.4-r1.ebuild b/sci-electronics/fritzing/fritzing-0.9.4-r2.ebuild
index 09faeeae4604..8a0a7c564b1e 100644
--- a/sci-electronics/fritzing/fritzing-0.9.4-r1.ebuild
+++ b/sci-electronics/fritzing/fritzing-0.9.4-r2.ebuild
@@ -20,6 +20,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
 RDEPEND="
+	dev-libs/quazip:0=
+	dev-libs/libgit2:=
 	dev-qt/qtconcurrent:5
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5
@@ -30,27 +32,27 @@ RDEPEND="
 	dev-qt/qtsvg:5
 	dev-qt/qtwidgets:5
 	dev-qt/qtxml:5
-	dev-libs/quazip:0
-	dev-libs/libgit2:=
 "
-DEPEND="
-	${RDEPEND}
+DEPEND="${RDEPEND}
 	dev-libs/boost
 "
 
 S="${WORKDIR}/${PN}-app-${MY_PV}"
 
-DOCS=( "README.md" )
+DOCS=( README.md )
 
 PATCHES=(
 	"${FILESDIR}/${P}-fix-libgit2-version.patch"
 	"${FILESDIR}/${P}-move-parts-db-path.patch"
+	"${FILESDIR}/${P}-quazip1.patch"
 )
 
 src_prepare() {
-	# fix build with newer quazip - bug #597988
-	sed -i -e "s/#include <quazip/&5/" src/utils/folderutils.cpp || die
-	sed -i -e "s|/usr/include/quazip|&5|" -e "s/-lquazip/&5/" phoenix.pro || die
+	xdg_src_prepare
+
+	if has_version "<dev-libs/quazip-1.0"; then
+		sed -e "/PKGCONFIG/s/quazip1-qt5/quazip/" -i phoenix.pro || die
+	fi
 
 	# Get a rid of the bundled libs
 	# Bug 412555 and
@@ -65,8 +67,6 @@ src_prepare() {
 
 	# Add correct git version
 	sed -i -e "s:GIT_VERSION = \$\$system.*$:GIT_VERSION = ${MY_PV}:" pri/gitversion.pri || die
-
-	default
 }
 
 src_configure() {