gentoo resync : 12.05.2022

3 files changed, 46 insertions, 21 deletions

diff --git a/sci-electronics/librepcb/Manifest b/sci-electronics/librepcb/Manifest
index 9d33addd443b..450a45c3376f 100644
--- a/sci-electronics/librepcb/Manifest
+++ b/sci-electronics/librepcb/Manifest
@@ -1,6 +1,7 @@
 AUX librepcb-0.1.5-quazip1.x.patch 1799 BLAKE2B f883e5eec392aa2aa4e739d3057e36a558a691298bd89fdb2da7e80ac0b0ecc13dc76073544675cf6bc8998f9a7d92ea7e57f107568c9a5b8ebffefb76357152 SHA512 82b5adecd94e22148205f95a514ccb3ccce720b10925549c806f58cd59be42dc6912aef2c8c275c6b87cf02f48d200c847ec6e27525be050b824b90c7bb994b2
-DIST librepcb-0.1.3-source.zip 12148919 BLAKE2B 2be3455c9be3e60a7cb314292e2a6ffe10d98f0c647d9c79f223ee5c5ef50675685d914889f772448dba699742d3bcd5b6636d489e630c8033912f3c9f223715 SHA512 28d45800bbbbcee8d30973c1a1e1e561c0fe2c65339eda4f6170779d921a9f5b2f5fb8c1cda00477e59976b88a3c368bb4985f31331bb16f761823642138c78b
+AUX librepcb-0.1.6-muparser-fix.patch 1058 BLAKE2B 2d3885fc9e3f178cef352a276fa141f873478938c8b7136d11f69a2fabc73e7ec548c24ae9bd1cdcfc229b94f30368dd48f7b2e85ca065caa69fd1e266e34f7e SHA512 1443b14b562608e729bd75f49d8e1fc962afb3bd1562382bb39f060531f40769ab99ad485547ab2d2ab4b892702242c057fdad6158dbc9d33cce02dcc3566596
 DIST librepcb-0.1.5-source.zip 13111207 BLAKE2B 3a8c5f8b310971e1a6bd5b1fa8eb8059cd1c571e9ab369bf80c946ccbd320c258d5e8c65bea3b5a5bc4d85a38cac8205d5bbfbaad6aebf0a031315b73e9b99f4 SHA512 ed8c8fc154a03082bcbfe414bdb934870d09cf137811036a3ce59d70e1ad0b582fea64c31037c84e76a939bf1d087caabb9aa349578b525bce882e853a969653
-EBUILD librepcb-0.1.3.ebuild 965 BLAKE2B e0deb76d90054abdb78b4c4daf014be24add7a1bf0f5e2cdc56624af1723243bc43d46f5d17995659b3268fa0535b396464b83a90bf6374d2c195dd280f5503d SHA512 b330f566302d600c20807c24ae826fba6652ae99947fdccc14e46b27aad12d7d45690d8055c7fe511ad90ae5ab488abba051d53775d836cd12309be5a78b8f9a
+DIST librepcb-0.1.6-source.zip 12671974 BLAKE2B bed8d6134159ec663dd88f9933ef0dad6d3bca70776537bf2e16397f0e4fd968a41661d95a118008fcf9d7d6d2432ebac81d78153b3c3ce8d69c64fb59aaf70e SHA512 a51ac2830d65bbd10be8904ecdcc6a7781d80c95e1423ed5bd04fcd009a0b7135ff3a49a87afe9e99006ae1f6ae44f2341021e5733675f2f20b05525860da5d7
 EBUILD librepcb-0.1.5.ebuild 1195 BLAKE2B 7cd91cf9229a1b90f03fc36dba98a1fb6cea4b4a9a2cab876ff5a9831c73a0db7878c2bb0efcc4a7b82d98d437d80ed3e8696d4a85893a1b8a33257cda91c24a SHA512 a3c2ee3cfc5dafe2d77633d4885a03acd62dd9a228cc5b40e5432fab0f7ef37ed4535273872e76a1488d826acddde1220dc8adf3579410cf7bac429fd5eef446
+EBUILD librepcb-0.1.6.ebuild 1004 BLAKE2B b54f9ab05d2e1b253500117404cc17c25a10c9c5e928c014d111267747aa2f6750187e3c75c9ae20cc161d8a9d4b348c3aefc3b3800a60d452da0d2dd98e6928 SHA512 92e9b00f21d367cb4b7488af8579608d6e27376c5cf7e90ed4c67f02c2cd8177af38ed88211dd0750b6caaa47860d7c47a6cc8eb4ce50ec7fc28bc6c9a603f57
 MISC metadata.xml 169 BLAKE2B 25149b73446be31f3ea3dd3a6394230987e7d4c601d1605fd3827b37bd99b3301c2e0edb95d0f59a4577ed27919f43c2cc02b1edf62c4012b935a82e709e0c05 SHA512 55c53f74b001bae56ba8c54581a4168335b6b3a28dac23a2102b76795d5fd41de33b8b3e1ec03f9acc6e7a3a77e93b1a6ff3e3967c3156dcbf22b5b5a6245ef5
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
new file mode 100644
index 000000000000..2abb26b18b59
--- /dev/null
+++ b/sci-electronics/librepcb/files/librepcb-0.1.6-muparser-fix.patch
@@ -0,0 +1,28 @@
+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.3.ebuild b/sci-electronics/librepcb/librepcb-0.1.6.ebuild
index 610277aedbe6..e8eb15331383 100644
--- a/sci-electronics/librepcb/librepcb-0.1.3.ebuild
+++ b/sci-electronics/librepcb/librepcb-0.1.6.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 2009-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit qmake-utils xdg-utils
+inherit cmake virtualx xdg
 
 DESCRIPTION="Free EDA software to develop printed circuit boards"
 HOMEPAGE="https://librepcb.org/"
@@ -12,13 +12,14 @@ SRC_URI="https://download.librepcb.org/releases/${PV}/${P}-source.zip"
 LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE=""
 
 BDEPEND="
 	app-arch/unzip
 	dev-qt/linguist-tools:5"
 
 RDEPEND="
+	dev-cpp/muParser:=
+	dev-libs/quazip:=
 	dev-qt/qtcore:5
 	dev-qt/qtconcurrent:5
 	dev-qt/qtgui:5
@@ -26,6 +27,7 @@ RDEPEND="
 	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"
@@ -33,22 +35,16 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	dev-qt/qttest:5"
 
-src_configure() {
-	eqmake5 -r PREFIX="/usr"
-}
+PATCHES=( "${FILESDIR}"/${P}-muparser-fix.patch )
 
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
+src_configure() {
+	local mycmakeargs+=(
+		-DUNBUNDLE_QUAZIP=ON
+		-DUNBUNDLE_MUPARSER=ON )
+	cmake_src_configure
 }
 
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
+src_test() {
+	cd "${BUILD_DIR}"/tests/unittests || die
+	virtx ./librepcb-unittests --gtest_filter=-SystemInfoTest.testGetUsername
 }