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

4 files changed, 3 insertions, 83 deletions

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