gentoo resync : 31.05.2021

8 files changed, 125 insertions, 9 deletions

diff --git a/sci-electronics/Manifest.gz b/sci-electronics/Manifest.gz
index 985a3d93f6ed..cdc3a2bc1558 100644
--- a/sci-electronics/Manifest.gz
+++ b/sci-electronics/Manifest.gz
diff --git a/sci-electronics/klayout/Manifest b/sci-electronics/klayout/Manifest
index 83980a4c4f9e..ee44e66d59f2 100644
--- a/sci-electronics/klayout/Manifest
+++ b/sci-electronics/klayout/Manifest
@@ -1,6 +1,6 @@
 DIST klayout-0.26.11.tar.gz 54455860 BLAKE2B f2e988ef1a68a0d8e612199d1a930a55c9175bebb8ca4cbbedef425d6367ddd3e56999502e0fb4c38043e2f7bf2c75c3acb18c498124c5850379bbfe283cb218 SHA512 c868830494a7181bbc68f543930aaf87a189b5063d212191305a3d2e119921175ff66aa2f87f9a89e8e9e5d8bf2c47ed32b5cd1fb43b85619ee35d8a3ddc063b
-DIST klayout-0.26.9.tar.gz 54223809 BLAKE2B 3800b0f49a77a73d4310485ba8539698b72c4a8f953723f4caee43a8c189aa044f7c8e617bc67640071e81d94e9edadbba11114b6d6edd4fcd67d02df33ec7d9 SHA512 1a163a055806fb9555aaf6253cb63d6ebe9648f6e165dfd1cbaa6d199652fa98363f6ddae32843cde5f768a8c2f42c8b06fb4691ed64e40979a22a96bd73874b
-EBUILD klayout-0.26.11.ebuild 1856 BLAKE2B 33192b35c2ee433accb4206927092831210f49797237fc22975dea585475aaca52010824b60efcf2562f26d3c32264f2533634d4780bbb6d497e028a540b11f9 SHA512 d17f5201618750a2c38c84717fbc013f6b81cbd60a61adb33baeb8e143d609768594113d458bb77ee5ef44262beae8d1a63bae57c963f2ded01fec5c9ae48261
-EBUILD klayout-0.26.9.ebuild 1853 BLAKE2B ab37bb70c7837205c0b9145782071d1ba47846a7fd5188e4adf869806b3070f336f6890f279f4db2b27fd2d41a73b186c6f3c5fd001db571a28d435b9ce2c7c8 SHA512 f14b7386f2a0b0db78e0ab5334509ac245e790b3f4b88f09e8b5a293976ac8ed75c41283feeea32adf99c3b98ccaa376dfb61fd5be821707728be437dc340479
+DIST klayout-0.27.tar.gz 56917189 BLAKE2B 41a66939d6d7a058f9dc1772ba152ff1c311b146f7e2b37da52447cbd7eacc35a26a5fec1516384619ab0680a145f82a120ee7ee2739a5c8e9648836afa07d13 SHA512 475e2d905bc75a13c924f6cd1d08b566ecde92a28ed6a32b1995452e0446d4c75f7856ce3af4430a3b39a3876a3817923a51f3675c5afb33f4ec749acf15e0b4
+EBUILD klayout-0.26.11.ebuild 1855 BLAKE2B 653a28ceb51d5f422bebab200dd39fab0c3fe345697a6ebce3e6035b6a96d1e75622f73ed4e8562bdfa341fd0467309d3efeeceb3d9617c8b601eea1bbbbbe6c SHA512 4eb5bd656bceb1e6684e73e9b2cba0cc6085866423b055a0bbebbb1d7ec4e69488a87a8d6dde7f97b9e4043bec283b1f1ddff5493fbb514344c7ccd04b43d491
+EBUILD klayout-0.27.ebuild 1856 BLAKE2B 33192b35c2ee433accb4206927092831210f49797237fc22975dea585475aaca52010824b60efcf2562f26d3c32264f2533634d4780bbb6d497e028a540b11f9 SHA512 d17f5201618750a2c38c84717fbc013f6b81cbd60a61adb33baeb8e143d609768594113d458bb77ee5ef44262beae8d1a63bae57c963f2ded01fec5c9ae48261
 EBUILD klayout-9999.ebuild 1856 BLAKE2B 33192b35c2ee433accb4206927092831210f49797237fc22975dea585475aaca52010824b60efcf2562f26d3c32264f2533634d4780bbb6d497e028a540b11f9 SHA512 d17f5201618750a2c38c84717fbc013f6b81cbd60a61adb33baeb8e143d609768594113d458bb77ee5ef44262beae8d1a63bae57c963f2ded01fec5c9ae48261
 MISC metadata.xml 380 BLAKE2B 3961dc3b4b0a6f3de5460e01e434f8ba1e4504247aac8cb40553d0752ece4f4be7e9d5fefee9d61e85681631eb200959b341c6aeda60b89c14119f95a40f4aa6 SHA512 92ee6b53a7dfed04d5a2aef510e0f2f0dcc70903258d5d4cb6ee497521cbb41214b7a45000693a0ecb66029767a48988c45b9b7fb78a09dc813710a9283d2f7d
diff --git a/sci-electronics/klayout/klayout-0.26.11.ebuild b/sci-electronics/klayout/klayout-0.26.11.ebuild
index 046760b5f1c2..6eb043c6d1be 100644
--- a/sci-electronics/klayout/klayout-0.26.11.ebuild
+++ b/sci-electronics/klayout/klayout-0.26.11.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} = 9999* ]]; then
 	EGIT_CHECKOUT_DIR=${WORKDIR}/all/${P}
 else
 	SRC_URI="https://www.klayout.org/downloads/source/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 ~x86"
 fi
 
 DESCRIPTION="Viewer and editor for GDS and OASIS integrated circuit layouts"
diff --git a/sci-electronics/klayout/klayout-0.26.9.ebuild b/sci-electronics/klayout/klayout-0.27.ebuild
index 20fa38ada7f9..046760b5f1c2 100644
--- a/sci-electronics/klayout/klayout-0.26.9.ebuild
+++ b/sci-electronics/klayout/klayout-0.27.ebuild
@@ -7,7 +7,7 @@ RUBY_OPTIONAL=no
 USE_RUBY="ruby26"
 # note: define maximally ONE implementation here
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 
 inherit toolchain-funcs python-single-r1 ruby-ng
 
@@ -17,7 +17,7 @@ if [[ ${PV} = 9999* ]]; then
 	EGIT_CHECKOUT_DIR=${WORKDIR}/all/${P}
 else
 	SRC_URI="https://www.klayout.org/downloads/source/${P}.tar.gz"
-	KEYWORDS="amd64 ~x86"
+	KEYWORDS="~amd64 ~x86"
 fi
 
 DESCRIPTION="Viewer and editor for GDS and OASIS integrated circuit layouts"
diff --git a/sci-electronics/librepcb/Manifest b/sci-electronics/librepcb/Manifest
index d8c0343f1e64..b61dcf0151ea 100644
--- a/sci-electronics/librepcb/Manifest
+++ b/sci-electronics/librepcb/Manifest
@@ -1,3 +1,6 @@
+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
-EBUILD librepcb-0.1.3.ebuild 948 BLAKE2B 54ea0908b371f979cfa70ac2098f2d6870afb648a9b2d5cac4d0db4230e52684e7d131936960549471ec77360b8d4a7e996c55a53b87fd92ddfe0c61d14162e1 SHA512 586b81f4d3710cdd41432bb0cf61898e126cd639809ee25b4184d9df975f48537af607cd9e1535e03e7a7444c4e1b752e13091c66dce62d9c9755b2ab4ef847d
+DIST librepcb-0.1.5-source.zip 13111207 BLAKE2B 3a8c5f8b310971e1a6bd5b1fa8eb8059cd1c571e9ab369bf80c946ccbd320c258d5e8c65bea3b5a5bc4d85a38cac8205d5bbfbaad6aebf0a031315b73e9b99f4 SHA512 ed8c8fc154a03082bcbfe414bdb934870d09cf137811036a3ce59d70e1ad0b582fea64c31037c84e76a939bf1d087caabb9aa349578b525bce882e853a969653
+EBUILD librepcb-0.1.3.ebuild 965 BLAKE2B e0deb76d90054abdb78b4c4daf014be24add7a1bf0f5e2cdc56624af1723243bc43d46f5d17995659b3268fa0535b396464b83a90bf6374d2c195dd280f5503d SHA512 b330f566302d600c20807c24ae826fba6652ae99947fdccc14e46b27aad12d7d45690d8055c7fe511ad90ae5ab488abba051d53775d836cd12309be5a78b8f9a
+EBUILD librepcb-0.1.5.ebuild 1195 BLAKE2B 7cd91cf9229a1b90f03fc36dba98a1fb6cea4b4a9a2cab876ff5a9831c73a0db7878c2bb0efcc4a7b82d98d437d80ed3e8696d4a85893a1b8a33257cda91c24a SHA512 a3c2ee3cfc5dafe2d77633d4885a03acd62dd9a228cc5b40e5432fab0f7ef37ed4535273872e76a1488d826acddde1220dc8adf3579410cf7bac429fd5eef446
 MISC metadata.xml 168 BLAKE2B 5f277cc66dbafa7e7985433f84b0f9a656a176a9b901862e2a8353ca2d4526797dded9696e835b9696c7f72324e94959cfb5a22de49a7e3e61604153886037ab SHA512 00eec08786156434460f5ed77b647579546cf1a86341a4f2c9c9c84326468c2c21dc5101c4277103b19266bb6f788823f4ddf3b9d044da26326d79bf2ac9a274
diff --git a/sci-electronics/librepcb/files/librepcb-0.1.5-quazip1.x.patch b/sci-electronics/librepcb/files/librepcb-0.1.5-quazip1.x.patch
new file mode 100644
index 000000000000..4e77ff9435ab
--- /dev/null
+++ b/sci-electronics/librepcb/files/librepcb-0.1.5-quazip1.x.patch
@@ -0,0 +1,57 @@
+From 7e01cb556ce5daee19b0270dded8eca9fcb1ea60 Mon Sep 17 00:00:00 2001
+From: Victor Kustov <ktrace@yandex.ru>
+Date: Tue, 25 May 2021 01:52:57 +0300
+Subject: [PATCH] Fix for quazip 1.x usage
+
+---
+ libs/librepcb/common/common.pro                         | 2 +-
+ libs/librepcb/common/fileio/transactionalfilesystem.cpp | 6 +++---
+ libs/librepcb/common/network/filedownload.cpp           | 2 +-
+ 3 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/libs/librepcb/common/common.pro b/libs/librepcb/common/common.pro
+index 6a6b623..d6ce077 100644
+--- a/libs/librepcb/common/common.pro
++++ b/libs/librepcb/common/common.pro
+@@ -333,7 +333,7 @@ FORMS += \
+ 
+ # quazip
+ contains(UNBUNDLE, quazip) {
+-    PKGCONFIG += quazip
++    PKGCONFIG += quazip1-qt5
+ } else {
+     INCLUDEPATH += ../../quazip
+ }
+diff --git a/libs/librepcb/common/fileio/transactionalfilesystem.cpp b/libs/librepcb/common/fileio/transactionalfilesystem.cpp
+index c98c84e..7b4927b 100644
+--- a/libs/librepcb/common/fileio/transactionalfilesystem.cpp
++++ b/libs/librepcb/common/fileio/transactionalfilesystem.cpp
+@@ -27,9 +27,9 @@
+ #include "sexpression.h"
+ 
+ #ifdef SYSTEM_QUAZIP
+-#include <quazip5/quazip.h>
+-#include <quazip5/quazipdir.h>
+-#include <quazip5/quazipfile.h>
++#include <quazip.h>
++#include <quazipdir.h>
++#include <quazipfile.h>
+ #else
+ #include <quazip/quazip.h>
+ #include <quazip/quazipdir.h>
+diff --git a/libs/librepcb/common/network/filedownload.cpp b/libs/librepcb/common/network/filedownload.cpp
+index 110fae3..718a137 100644
+--- a/libs/librepcb/common/network/filedownload.cpp
++++ b/libs/librepcb/common/network/filedownload.cpp
+@@ -27,7 +27,7 @@
+ #include <QtCore>
+ 
+ #ifdef SYSTEM_QUAZIP
+-#include <quazip5/JlCompress.h>
++#include <JlCompress.h>
+ #else
+ #include <quazip/JlCompress.h>
+ #endif
+-- 
+2.26.3
+
diff --git a/sci-electronics/librepcb/librepcb-0.1.3.ebuild b/sci-electronics/librepcb/librepcb-0.1.3.ebuild
index fe132f053703..610277aedbe6 100644
--- a/sci-electronics/librepcb/librepcb-0.1.3.ebuild
+++ b/sci-electronics/librepcb/librepcb-0.1.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -30,7 +30,8 @@ RDEPEND="
 	dev-qt/qtxml:5
 	sys-libs/zlib"
 
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+	dev-qt/qttest:5"
 
 src_configure() {
 	eqmake5 -r PREFIX="/usr"
diff --git a/sci-electronics/librepcb/librepcb-0.1.5.ebuild b/sci-electronics/librepcb/librepcb-0.1.5.ebuild
new file mode 100644
index 000000000000..84229df8b492
--- /dev/null
+++ b/sci-electronics/librepcb/librepcb-0.1.5.ebuild
@@ -0,0 +1,55 @@
+# Copyright 2009-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit qmake-utils 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-libs/quazip:=
+	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}-quazip1.x.patch )
+
+src_configure() {
+	local pro_lst
+	for pro_lst in $(find libs/librepcb/ -type f -name "*.pro" || die)
+	do
+		sed -e 's:target.path = $${PREFIX}/lib:target.path = $${PREFIX}/'$(get_libdir)':' -i ${pro_lst} || die "Can't fix ${pro_lst} file"
+	done
+	eqmake5 -r PREFIX="/usr" UNBUNDLE+="quazip"
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+}
+
+src_test() {
+	cd "${S}"/output
+	virtx ./librepcb-unittests --gtest_filter=-SystemInfoTest.testGetUsername
+}