gentoo auto-resync : 27:10:2023 - 14:48:06

9 files changed, 136 insertions, 83 deletions

diff --git a/sci-electronics/Manifest.gz b/sci-electronics/Manifest.gz
index 12ccbf3225cf..f4682277002d 100644
--- a/sci-electronics/Manifest.gz
+++ b/sci-electronics/Manifest.gz
diff --git a/sci-electronics/fritzing/Manifest b/sci-electronics/fritzing/Manifest
index be85607c710e..bf1977a368d7 100644
--- a/sci-electronics/fritzing/Manifest
+++ b/sci-electronics/fritzing/Manifest
@@ -1,7 +1,12 @@
 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
+AUX fritzing-0.9.6-dropping-register-keyword.patch 952 BLAKE2B e27664d226060d1cf34c56d99daf49b7160af0e8f3eeba50ae1c0ddbdcd96b95bd5677332594831356f34e6ab4f3a8c315571969171357f1445ea4cadcad79e5 SHA512 692bb9485c91a8da654aec8b05da2d01ff86131ce47a596119ca99e25c2b212776c11bf2a0ccdcc5f2ff2a1b265e4e1eadb74d969bb46d00ede13461e9d12ad0
+AUX fritzing-0.9.6-quazip-qt5.patch 662 BLAKE2B aa027d5bfcd6fccbd0a07949bf505b42d07e50f7a36b4b0bbd86bbdb929baa3cd2314a071118f753a6f8d721e72a4522d5e80177f2c2558e0a9094eea0f5e556 SHA512 fa130813e293dc72395333b8037e37ab10f783c310879fa0b4e0ae10abb01082f9c3fe66403f2afc559d50b7b4f3385d4acb0e68cde347b2f54bac6ae1884748
 DIST fritzing-0.9.4.tar.gz 11430102 BLAKE2B 20232b3c33308edcab188c61597f87d8a21d9b786eeab4e398c1add6e263562d1b0df95634850d5271decfa380d7b2b0c18c7f19f8b8544f330687e4cffa3700 SHA512 b148d8b93d2e452c975ca3acfd2ad5de4259f99da69c5890ebeea30730674526d480ee3830f61f6057e83b7720f07fce80ef3a74d4b718be691a92d656b755e0
+DIST fritzing-0.9.6.tar.gz 11521767 BLAKE2B 01c6ea87108b70161350b79c4878c288935c3f0a37464cf3c4e276a746edb2bbcb2c3b7bcf0b3a879232f5f79fd15b573f930b8cea96924b04b1e5b3ddade542 SHA512 d91fcf79760b9570513e8315bcb29fcd1d53684920e8563539669a0dedd164e35031e53da7ea2c12e95e564b3f95a05ce953082ffdfa54f4e4f99c50a4991a52
 DIST fritzing-parts-0.9.4.tar.gz 17662003 BLAKE2B a67f4f1297793131d25e6b9c853e987fc0c5ecebd5f57b3675b7f9c4539f867ad18fc6e854c7a2bef1669e05dbc13dcc93df9b9befb8991ca64b2bc3e2a71b84 SHA512 f6f6c396eaf0b61dd56ece22f6bb8fce4369503729fd8f5550643e74a60aaad75abce9e391d63d52f12e4f3420296791fdf9832f7c8507dad2cf623e1bd8340f
+DIST fritzing-parts-0.9.6.tar.gz 14982269 BLAKE2B 0f017a2a3eb654ed26d647faa463024c52aab58df7a487c75e1636efb288dc9fad9aa8499404f381012287e6e3312a569ed2f171d20b2d5df85440d97673fe9c SHA512 d39096bcb89e2aa04c285aaddd575a54a08d016d859399133eab89d69ed37d5e5e5a5a9e838cad5879835bcdcdd9c3b484179104e04d8f96d4eef1004047162b
 EBUILD fritzing-0.9.4-r3.ebuild 2002 BLAKE2B aa702c9514e25478631ff42d2fd1e2e15231c29cd7e25726b64feb67c5d8750e63aa770ac12785071d49922009dba5bc786dc3a7f3617e0b214fcbda2582553c SHA512 dfa8e64efc4095bfaa06a7b171eeb38ea99853b1d76f2ef2d1dd4eaabc5dffbe7b4f80b6d25699b705dac09c204ea8f92a872e9f7e8e3b2a96221f2efa7b6bb4
+EBUILD fritzing-0.9.6.ebuild 1785 BLAKE2B ae865d1b7266c854c58ad4fe472886d03d7727a8f5b0739b34b8e6cfd7c5447a0ced161d67a767f6e4c254647bba187d26f104a113d1b2e8aa7e4ca1ec9ef4ee SHA512 6096457c4eb08ed62b2a1eea542d6866335972c8c25068d7929c2efce2d08fbad20c129eb8a89f742b04b97b8b5c8122af18f337f571f8b89f7cbfefbf526584
 MISC metadata.xml 254 BLAKE2B 9edd3c3a62e897c3ca28044d6104110726e1d92b0f7e9c0409ac5800eaa638e3d6d46acd09c8ee196fd932a4d1cfcdccdc5a127976f448121954fd9d7dd793b8 SHA512 7bef4d8bb64ab101097fb37465de7cdcd4c14d94d5a9e8ee8fd8f45514d91e8195555b096c8aec70431f65bc2a95dcf360cf3f670ddf03821fe585557ddfd0c6
diff --git a/sci-electronics/fritzing/files/fritzing-0.9.6-dropping-register-keyword.patch b/sci-electronics/fritzing/files/fritzing-0.9.6-dropping-register-keyword.patch
new file mode 100644
index 000000000000..e7e9d6d27ac5
--- /dev/null
+++ b/sci-electronics/fritzing/files/fritzing-0.9.6-dropping-register-keyword.patch
@@ -0,0 +1,25 @@
+https://github.com/fritzing/fritzing-app/pull/4033
+From: Brahmajit Das <brahmajit.xyz@gmail.com>
+Date: Fri, 16 Jun 2023 06:29:28 +0000
+Subject: [PATCH] clipablewire.cpp: Dropping usage of register storage class
+
+The register storage class has been depreacted in C++14 and completely
+removed in C++17. Thus resulting in buils errors such as:
+
+clipablewire.cpp:55:2: error: ISO C++17 does not allow register storage class specifier [-Wregister]
+
+Refer: https://en.cppreference.com/w/cpp/language/storage_duration
+Bug: https://bugs.gentoo.org/898070
+Signed-off-by: Brahmajit Das <brahmajit.xyz@gmail.com>
+--- a/src/items/clipablewire.cpp
++++ b/src/items/clipablewire.cpp
+@@ -50,7 +50,7 @@ static double connectorRectClipInset = 0.5;
+ int CrossingsTest( double pgon[][2], int numverts, double point[2] )
+ {
+ #ifdef	WINDING
+-	register int	crossings ;
++	int	crossings ;
+ #endif
+ 	int	j, yflag0, yflag1, inside_flag, xflag0 ;
+ 	double ty, tx, *vtx0, *vtx1 ;
+
diff --git a/sci-electronics/fritzing/files/fritzing-0.9.6-quazip-qt5.patch b/sci-electronics/fritzing/files/fritzing-0.9.6-quazip-qt5.patch
new file mode 100644
index 000000000000..9d3853c516ab
--- /dev/null
+++ b/sci-electronics/fritzing/files/fritzing-0.9.6-quazip-qt5.patch
@@ -0,0 +1,28 @@
+Fix build with QuaZip-1.0.
+
+--- a/phoenix.pro
++++ b/phoenix.pro
+@@ -194,8 +194,9 @@
+ include(test/version.pri)
+ 
+ contains(DEFINES, QUAZIP_INSTALLED) {
+     !build_pass:message("using installed QuaZIP library")
+-    LIBS += -lquazip5
++    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 <quazip5/quazip.h>
+-#include <quazip5/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.6.ebuild b/sci-electronics/fritzing/fritzing-0.9.6.ebuild
new file mode 100644
index 000000000000..4fb515cfa82f
--- /dev/null
+++ b/sci-electronics/fritzing/fritzing-0.9.6.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit qmake-utils xdg
+
+PARTS_P="${PN}-parts-${PV}"
+PARTS_COMMIT="667a5360e53e8951e5ca6c952ae928f7077a9d5e"
+
+DESCRIPTION="Electronic Design Automation"
+HOMEPAGE="
+	https://fritzing.org/
+	https://github.com/fritzing/fritzing-app/
+"
+SRC_URI="
+	https://github.com/fritzing/fritzing-app/archive/${PV}.tar.gz -> ${P}.tar.gz
+	https://github.com/fritzing/fritzing-parts/archive/${PARTS_COMMIT}.tar.gz -> ${PARTS_P}.tar.gz
+"
+S="${WORKDIR}/${PN}-app-${PV}"
+
+LICENSE="CC-BY-SA-3.0 GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-libs/quazip:0=[qt5(+)]
+	dev-libs/libgit2:=
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtserialport:5
+	dev-qt/qtsql:5[sqlite]
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+"
+DEPEND="${RDEPEND}
+	dev-libs/boost
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.9.4-move-parts-db-path.patch"
+	"${FILESDIR}/${PN}-0.9.6-quazip-qt5.patch"
+	"${FILESDIR}/${PN}-0.9.6-dropping-register-keyword.patch"
+)
+
+src_prepare() {
+	default
+
+	# Get a rid of the bundled libs
+	# Bug 412555 and
+	# https://code.google.com/p/fritzing/issues/detail?id=1898
+	rm -r src/lib/quazip/ pri/quazip.pri || die
+
+	# Use system libgit
+	sed -i -e 's:LIBGIT_STATIC.*:LIBGIT_STATIC = false:' phoenix.pro || die
+
+	# Add correct git version
+	sed -i -e "s:GIT_VERSION = \$\$system.*$:GIT_VERSION = ${PV}:" pri/gitversion.pri || die
+}
+
+src_configure() {
+	eqmake5 'DEFINES=QUAZIP_INSTALLED PARTS_COMMIT=\\\"'"${PARTS_COMMIT}"'\\\"' phoenix.pro
+}
+
+src_install() {
+	PARTS_DIR="${WORKDIR}/fritzing-parts-${PARTS_COMMIT}"
+	INSTALL_ROOT="${D}" default
+	insinto /usr/share/fritzing/fritzing-parts
+	doins -r ${PARTS_DIR}/*
+	einstalldocs
+}
diff --git a/sci-electronics/librepcb/Manifest b/sci-electronics/librepcb/Manifest
index 8f80f9a2eddb..bbbbbb177c23 100644
--- a/sci-electronics/librepcb/Manifest
+++ b/sci-electronics/librepcb/Manifest
@@ -1,8 +1,5 @@
-AUX librepcb-0.1.6-muparser-fix.patch 1058 BLAKE2B 2d3885fc9e3f178cef352a276fa141f873478938c8b7136d11f69a2fabc73e7ec548c24ae9bd1cdcfc229b94f30368dd48f7b2e85ca065caa69fd1e266e34f7e SHA512 1443b14b562608e729bd75f49d8e1fc962afb3bd1562382bb39f060531f40769ab99ad485547ab2d2ab4b892702242c057fdad6158dbc9d33cce02dcc3566596
-DIST librepcb-0.1.6-source.zip 12671974 BLAKE2B bed8d6134159ec663dd88f9933ef0dad6d3bca70776537bf2e16397f0e4fd968a41661d95a118008fcf9d7d6d2432ebac81d78153b3c3ce8d69c64fb59aaf70e SHA512 a51ac2830d65bbd10be8904ecdcc6a7781d80c95e1423ed5bd04fcd009a0b7135ff3a49a87afe9e99006ae1f6ae44f2341021e5733675f2f20b05525860da5d7
 DIST librepcb-0.1.7-source.zip 13112342 BLAKE2B 53b6dad94febee84b60df1d848936f44093698c9965d4b24815395ff564a5634ab84f38574e7a1b6891f2cdd99b5162eb3747bbfdde2dfc2d680cff76a4e1cc1 SHA512 285ad661b9c528b1aa05c9a0482034af26e9344eb08a119ffabbadf518957a9784ccb9582bcfabcf5bf8982c33b6286b39722c0d59072df983925b3949b3e6c5
 DIST librepcb-1.0.0-source.zip 14000096 BLAKE2B 5b78bb0bd32de78207a95916bc7a7ff85b58f3b4b67e6faf9180bae852ce11416ac3740c04eb30b57073a21eb24d8041136e1ef17f5614e3f7d340e7b813b03d SHA512 7bc056be37fd39d873f6a40cf04c529e95dfc2b69d1cc8246ccbba0932a67c0f017e939c206cf0656b4657cb5c99c10c7e19b9dc4969d54d0a80014029da9439
-EBUILD librepcb-0.1.6-r1.ebuild 1012 BLAKE2B 9bb9ab11d6e24b1f674733175b8f4b66fb7bcef82a15c660eb9ba7bde245f3c26b806a708dd80a116eef92f1b877b6fe7fd8fef80bbd5879636c4243f4500dd3 SHA512 21a02f8bd46567e2483e0c5b2fafc34ee950fabb109f8355c33247f1d700dbea699cfc123ec6cf1699db88fa02b4c814d135bbbf637a36e56e9fc9b4260eb5f2
 EBUILD librepcb-0.1.7.ebuild 1443 BLAKE2B d30668d5b3f96f8db385af33146dcebca6e2d2fa1e510d4ef08316e8ccc59406872536ee735ff81deea1fde4a5c8f4df90261b7eb67be1620176957278cf7905 SHA512 85c0c1b1da5008e55530a15859e8273a7be063681659c2aba1aea183c45107856fc8dddec89a3c998e6bdd296232bfaf5ce7998646cd6370ead0f01a6de447e3
-EBUILD librepcb-1.0.0.ebuild 1657 BLAKE2B f9622dd7d9e1deefa68feaa6179c092313b907d0712cbb65ca99f0544e0a513ded8f94a473bc4c7163cca3b11eb225b9b80d3ca50bd2ef723a9f8acee169ffd3 SHA512 662dd3d7fdc44e7222f3c166aebfe00f7772f7b7ea26f61a3f79e8061078cc097a256753e18d70ba97873d5fafd278f1a4d431b76808fedca94e5ae09867595f
+EBUILD librepcb-1.0.0-r1.ebuild 1684 BLAKE2B 15f9fb512cb8e47b7037cb39d775ca8aed5b83889f2e358eae74c42aef088b0bb2e491ae879608a415176dca72b5632fa914d88f9e7c4a7b23754b0621dc901f SHA512 86733fb360f4e175ca853b877d68f4a0b59e21e7d313565895ec65af3cca161e109f52604a37c2baeb55a56109c48a572f02596c3da75569241075de47a5065b
 MISC metadata.xml 1316 BLAKE2B 0e2933c46eed63177cc16902e0c9235cd77640af852a5b2242db98b4dda997a3d9ede5e79b95d860b162ab6055a67935c828309ea32e81e4e2551e2f37d0e3bd SHA512 e5dc0108675528726309169119d7c09fcc7da55d68981314bf61fed0a14109bf69363eabf9360164f55b6912a7d1d451aabfc21d73e209c638561a37e74fa61d
diff --git a/sci-electronics/librepcb/files/librepcb-0.1.6-muparser-fix.patch b/sci-electronics/librepcb/files/librepcb-0.1.6-muparser-fix.patch
deleted file mode 100644
index 2abb26b18b59..000000000000
--- a/sci-electronics/librepcb/files/librepcb-0.1.6-muparser-fix.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff --git a/./libs/librepcb/common/utils/mathparser.cpp.orig b/./libs/librepcb/common/utils/mathparser.cpp
-index 618de36..e0903de 100644
---- a/./libs/librepcb/common/utils/mathparser.cpp.orig
-+++ b/./libs/librepcb/common/utils/mathparser.cpp
-@@ -22,7 +22,7 @@
-  ******************************************************************************/
- #include "mathparser.h"
- 
--#include "muparser/include/muParser.h"
-+#include <muParser.h>
- 
- /*******************************************************************************
-  *  Namespace
-diff --git a/./cmake/FindMuParser.cmake.orig b/./cmake/FindMuParser.cmake
---- a/./cmake/FindMuParser.cmake.orig	2021-11-03 01:04:32.000000000 +0300
-+++ b/./cmake/FindMuParser.cmake	2022-04-24 18:01:23.996260205 +0300
-@@ -37,6 +37,11 @@
- if(muparser_FOUND)
-   message(STATUS "Using system MuParser")
- 
-+  # Add uppercase alias if only the lowercase target is defined
-+  if(NOT TARGET MuParser::MuParser)
-+    add_library(MuParser::MuParser ALIAS muparser::muparser)
-+  endif()
-+
-   # Stop here, we're done
-   return()
- endif()
diff --git a/sci-electronics/librepcb/librepcb-0.1.6-r1.ebuild b/sci-electronics/librepcb/librepcb-0.1.6-r1.ebuild
deleted file mode 100644
index ff7207a0da95..000000000000
--- a/sci-electronics/librepcb/librepcb-0.1.6-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 2009-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake virtualx xdg
-
-DESCRIPTION="Free EDA software to develop printed circuit boards"
-HOMEPAGE="https://librepcb.org/"
-SRC_URI="https://download.librepcb.org/releases/${PV}/${P}-source.zip"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64"
-
-BDEPEND="
-	app-arch/unzip
-	dev-qt/linguist-tools:5"
-
-RDEPEND="
-	dev-cpp/muParser:=
-	dev-libs/quazip:=[qt5(+)]
-	dev-qt/qtcore:5
-	dev-qt/qtconcurrent:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5[ssl]
-	dev-qt/qtopengl:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtsql:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	sys-libs/zlib"
-
-DEPEND="${RDEPEND}
-	dev-qt/qttest:5"
-
-PATCHES=( "${FILESDIR}"/${P}-muparser-fix.patch )
-
-src_configure() {
-	local mycmakeargs+=(
-		-DUNBUNDLE_QUAZIP=ON
-		-DUNBUNDLE_MUPARSER=ON )
-	cmake_src_configure
-}
-
-src_test() {
-	cd "${BUILD_DIR}"/tests/unittests || die
-	virtx ./librepcb-unittests --gtest_filter=-SystemInfoTest.testGetUsername
-}
diff --git a/sci-electronics/librepcb/librepcb-1.0.0.ebuild b/sci-electronics/librepcb/librepcb-1.0.0-r1.ebuild
index 62236602ab39..ba797def47ac 100644
--- a/sci-electronics/librepcb/librepcb-1.0.0.ebuild
+++ b/sci-electronics/librepcb/librepcb-1.0.0-r1.ebuild
@@ -22,12 +22,13 @@ BDEPEND="
 RDEPEND="
 	dev-cpp/muParser:=
 	dev-libs/quazip:=[qt5(+)]
-	dev-qt/qtcore:5
 	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
 	dev-qt/qtgui:5
 	dev-qt/qtnetwork:5[ssl]
 	dev-qt/qtopengl:5
 	dev-qt/qtprintsupport:5
+	dev-qt/qtquickcontrols2:5
 	dev-qt/qtsql:5
 	dev-qt/qtsvg:5
 	dev-qt/qtwidgets:5