gentoo resync : 30.05.2020

4 files changed, 69 insertions, 18 deletions

diff --git a/media-gfx/librecad/Manifest b/media-gfx/librecad/Manifest
index eebd1f41bd99..aa34257c0292 100644
--- a/media-gfx/librecad/Manifest
+++ b/media-gfx/librecad/Manifest
@@ -1,7 +1,8 @@
 AUX librecad-2.1.3-gcc-9.patch 8494 BLAKE2B 85f7cfd7822d27c4b76b6cc9b71f9667b912ef80229e2a70110155d4b52f0e203b186ffb6a0be160d6d2aadcaf241994d7f78d81a096d7540c46b946ed7cb892 SHA512 5adb8086244ec18e78f503b7522ea79213b629d297bb07fad0c21ae1e205731fd544aff7e979f1cc5709542a23311c771d61f13f4ba09f34baff9a24deae5eed
 AUX librecad-2.1.3-qt-5.11.patch 1396 BLAKE2B 80e637b724df81dce60c17354bed56a2329dd4c3f445b40ea18a4a49614f2ee34114e1b6cc008b29e2dbd7b65c53340aaa447173f6f4d23d80e1a8809131aae7 SHA512 5e4ae43ac89fc8acf779fec9e062cac3896f0e41b0bf7fdab91ef128ab1a20a4ecda71ef332d9af7403f11a813323cc509e0682e5ffdf97786599271a2711f25
+AUX librecad-2.1.3-qt-5.15.patch 1270 BLAKE2B 0947b13ff328e4f1c3ac04d846e7ed372d76d4858cecff5fe4ff8fc8c3c1558cd0e9ac53354e1f0b5b1d137db09c8205f034df9356b9b9e3206a611608fb8166 SHA512 b1a5afe1d22b7725c7d10a10bed5e52495cda7699ff20bd0f75bbfe28f7131a3d9cd5ec0a1ae7fd329196d2f88bb4b8336301fdb6efa073d773f31340a062ba0
 DIST librecad-2.1.3.tar.gz 22415288 BLAKE2B fb920113a7e4b2e9e7e3425f77364c36f6be676a3cd109798786b06d31698fd11437bc7f50cb843ca02d761730e83db7fde475d1bce6a65336a845b5b0114918 SHA512 246cffcc1ea3389997b4a738ab5e3d78e8c1096817ecb1ca28f38d601bc5d1a95f60798ac82308914a34da7b5dbc302b8363cf8b58a97221fdc8ee63010adc6c
 EBUILD librecad-2.1.3-r4.ebuild 1102 BLAKE2B 8f9a34ce4d164d741fd9c053a956eb28b289d2287f1a627ac11362b47799390753db65e32ace5b57bd2ad0c9f2b84223f86fd9fd77160c0f85a31915b7041c1b SHA512 907a94b6d98f6dfc49e33d2fcb1611b76cbb5f309b22c4ed5ae51ffaaefab146379b39e42849f7bcc97bb7a0f394e31b6df82bd720537ddc387aeaced110a40b
-EBUILD librecad-2.1.3-r5.ebuild 1132 BLAKE2B 1f2f4506ac904e51304f45ce788d4a1b610419297ea0666b481e6bb7f759777b6ad2dbaf777d17707ebe844fa525e76e2faad4e138883c917f5e1ab2688a7229 SHA512 dd4a522f66341db71ef068212781ce482d79220faa9e554c8f5c6e0ff4e95f754214d6e6e0e69ce0b0e151081750de164807d37d6c3d85a1d9602a50e7b87c98
-EBUILD librecad-9999.ebuild 997 BLAKE2B c2f46819e1188ac08ff278385f696c578dac20c707b666d5fe297c2ff19b3f8c37f048e8c3083acacf4f7165378ed5f5de37209b6eff50fd73b8970dd7377b18 SHA512 8e8633998807024c30de31be9eb996b5a6abb1ab416247258e35b1497ea9824b7035556201b3a9c8c546cb3402406344353cfca37ce5d2fbe268bfaafe693b77
+EBUILD librecad-2.1.3-r5.ebuild 1206 BLAKE2B 5934d1af4efa6668916303c85aed2654ab43458a23532167997a2f31bdcfd356c4914ab4ea75e3f77699abae115bdbf6555629038f3d4eb25b132e69f9147100 SHA512 56eae3cd2e47f5f45f496a581f454dff497b2b447afde848b57fae0fa145223191844a872620a012c0b489dc382213d61af8efa13e4baf72a5bc5b31690e0f48
+EBUILD librecad-9999.ebuild 1143 BLAKE2B 640a03b64ac56e00a3821dc9278efc0cfbb4eb7ca3ca83d428242aff78a0ab1d783b705cef0af939537a281b57db4d1ce640f3baa1eda7086b52a4fad481a77a SHA512 173a061d72db9ec980e13173d7d8caf7583d57a794cbb3c72a42553d4546cc28f45c5ae8ceab19ef71a838739c717a3c75e6506cada23a123c060fa89c04000c
 MISC metadata.xml 408 BLAKE2B 40e860453480281f8a148bfe527530c836bf21801a435f787c4d07ab1005dc9492a96c3dc0fc7dc4362fe35626f653052f0058eaef84336c59c8910256cfeaf5 SHA512 e08b9546617943ae66186e4b99c53c900a98a1950f429f84b525791c8030b1ec1786b4dfafe983537915ed597e3e9fe089bfc6f701a57af9c453293a2db2c2f6
diff --git a/media-gfx/librecad/files/librecad-2.1.3-qt-5.15.patch b/media-gfx/librecad/files/librecad-2.1.3-qt-5.15.patch
new file mode 100644
index 000000000000..a1cfe62408f9
--- /dev/null
+++ b/media-gfx/librecad/files/librecad-2.1.3-qt-5.15.patch
@@ -0,0 +1,37 @@
+From 81741a875847c806c05f0f3a4610e69b3c3002aa Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Wed, 20 May 2020 14:12:15 +0200
+Subject: [PATCH] Fix build with Qt 5.15 (missing QPainterPath include)
+
+---
+ librecad/src/lib/engine/lc_splinepoints.cpp | 1 +
+ librecad/src/lib/gui/rs_painterqt.h         | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/librecad/src/lib/engine/lc_splinepoints.cpp b/librecad/src/lib/engine/lc_splinepoints.cpp
+index 5eaed81b..e6324ec1 100644
+--- a/librecad/src/lib/engine/lc_splinepoints.cpp
++++ b/librecad/src/lib/engine/lc_splinepoints.cpp
+@@ -21,6 +21,7 @@ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ **********************************************************************/
+ 
++#include <QPainterPath>
+ #include <QPolygonF>
+ #include "lc_splinepoints.h"
+ 
+diff --git a/librecad/src/lib/gui/rs_painterqt.h b/librecad/src/lib/gui/rs_painterqt.h
+index 878753cb..a0b432e0 100644
+--- a/librecad/src/lib/gui/rs_painterqt.h
++++ b/librecad/src/lib/gui/rs_painterqt.h
+@@ -29,6 +29,7 @@
+ #define RS_PAINTERQT_H
+ 
+ #include <QPainter>
++#include <QPainterPath>
+ 
+ #include "rs_painter.h"
+ #include "rs_pen.h"
+-- 
+2.26.2
+
diff --git a/media-gfx/librecad/librecad-2.1.3-r5.ebuild b/media-gfx/librecad/librecad-2.1.3-r5.ebuild
index 5bb715ffa4ee..054af7f65e7a 100644
--- a/media-gfx/librecad/librecad-2.1.3-r5.ebuild
+++ b/media-gfx/librecad/librecad-2.1.3-r5.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit desktop qmake-utils
 
@@ -11,10 +11,12 @@ SRC_URI="https://github.com/LibreCAD/LibreCAD/archive/${PV/_/}.tar.gz -> ${P}.ta
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-
+KEYWORDS="amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug doc tools"
 
+BDEPEND="
+	dev-qt/linguist-tools:5
+"
 RDEPEND="
 	dev-cpp/muParser
 	dev-libs/boost:=
@@ -23,16 +25,20 @@ RDEPEND="
 	dev-qt/qtprintsupport:5
 	dev-qt/qtsvg:5
 	dev-qt/qtwidgets:5
-	media-libs/freetype:2"
+	media-libs/freetype:2
+"
 DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5
 	dev-qt/qthelp:5
 	dev-qt/qtxml:5
 "
 
 S="${WORKDIR}/LibreCAD-${PV}"
 
-PATCHES=( "${FILESDIR}/${P}-qt-5.11.patch" "${FILESDIR}/${P}-gcc-9.patch" )
+PATCHES=(
+	"${FILESDIR}/${P}-qt-5.11.patch"
+	"${FILESDIR}/${P}-gcc-9.patch"
+	"${FILESDIR}/${P}-qt-5.15.patch" # pending upstream PR#1224
+)
 
 src_configure() {
 	eqmake5 -r
diff --git a/media-gfx/librecad/librecad-9999.ebuild b/media-gfx/librecad/librecad-9999.ebuild
index 4c0e87ee95e3..04902b991e93 100644
--- a/media-gfx/librecad/librecad-9999.ebuild
+++ b/media-gfx/librecad/librecad-9999.ebuild
@@ -1,20 +1,29 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit desktop git-r3 qmake-utils
+inherit desktop qmake-utils
 
 DESCRIPTION="Generic 2D CAD program"
 HOMEPAGE="https://www.librecad.org/"
-EGIT_REPO_URI="https://github.com/LibreCAD/LibreCAD.git"
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/LibreCAD/LibreCAD.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/LibreCAD/LibreCAD/archive/${PV/_/}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/LibreCAD-${PV}"
+fi
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-
 IUSE="3d debug doc tools"
 
+BDEPEND="
+	dev-qt/linguist-tools:5
+"
 RDEPEND="
 	dev-cpp/muParser
 	dev-libs/boost:=
@@ -23,15 +32,13 @@ RDEPEND="
 	dev-qt/qtprintsupport:5
 	dev-qt/qtsvg:5
 	dev-qt/qtwidgets:5
-	media-libs/freetype:2"
+	media-libs/freetype:2
+"
 DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5
 	dev-qt/qthelp:5
 	dev-qt/qtxml:5
 "
 
-S="${WORKDIR}/LibreCAD-${PV}"
-
 src_configure() {
 	eqmake5 -r
 }