gentoo resync : 11.05.2021

5 files changed, 54 insertions, 24 deletions

diff --git a/media-gfx/librecad/Manifest b/media-gfx/librecad/Manifest
index a72819c97ba3..8bce2373af92 100644
--- a/media-gfx/librecad/Manifest
+++ b/media-gfx/librecad/Manifest
@@ -1,7 +1,8 @@
+AUX librecad-2.1.3-boost-1.76.patch 1032 BLAKE2B 9c8893627fd43cb831d48e9f86472c0e0029cfa155f08e3813f12f7f2750a91eac1d384ad149ee87585437d26426242e6f69364cabb33d30db74d220494b0395 SHA512 7751fc6ec2106f4b0a8f9d1fdd676ec4e2098d79e52e6365c5e857bc0e96adde30c66320f6b2625c0ecec7e4bff0352683b467a5e699b57c6ad87f494bd1bcb8
 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-r5.ebuild 1205 BLAKE2B d67aacabb6f255121b05dc70ae105fdf4e1065ec70965c55e5c7e4d37883a67c01e0826129051514fe9faa2e45402329eb34c980eed41a04d7e4006d6fb0a3e2 SHA512 f7d5a84c94cbe86a9e21c9f97a51680dfc3c0c0897e31ac2b454eadcd0bda469bc6a32f9349a2eaac05d8ce76304d0244336eb2170675618b1e2d6df3378aae7
-EBUILD librecad-9999.ebuild 1143 BLAKE2B 640a03b64ac56e00a3821dc9278efc0cfbb4eb7ca3ca83d428242aff78a0ab1d783b705cef0af939537a281b57db4d1ce640f3baa1eda7086b52a4fad481a77a SHA512 173a061d72db9ec980e13173d7d8caf7583d57a794cbb3c72a42553d4546cc28f45c5ae8ceab19ef71a838739c717a3c75e6506cada23a123c060fa89c04000c
-MISC metadata.xml 408 BLAKE2B 40e860453480281f8a148bfe527530c836bf21801a435f787c4d07ab1005dc9492a96c3dc0fc7dc4362fe35626f653052f0058eaef84336c59c8910256cfeaf5 SHA512 e08b9546617943ae66186e4b99c53c900a98a1950f429f84b525791c8030b1ec1786b4dfafe983537915ed597e3e9fe089bfc6f701a57af9c453293a2db2c2f6
+EBUILD librecad-2.1.3-r6.ebuild 1247 BLAKE2B 8e485f4201300cd7f2f0bdfeac80ffe6f817bd8ffd84ebb09bb25040ebd117f5a8dc9479dbe9774eb404472019a75afa0040dd6040fc54928901b76b715ed155 SHA512 647bb8b6030ac9cd5a5f1bc45b411a4df611bad6f17d43272c5b0b673335371d44637d7902c224424fe4fe14aa92d5dcb6d891fcacd8b7a23a428cdaf3119e8b
+EBUILD librecad-9999.ebuild 1184 BLAKE2B 885ffdfa84fe6474aa6e8b37c155b3541368ccdc74a300d9051cb8660d089366c0438c7da072025ef1c337d498df31e816e3588056b61d1b769c38f5e20a6c27 SHA512 97c0ba730cd9887409ce3f0b413e966402cb12d988fae0a0bcf1486842260492e89a5c7fb707f77bc99993f8c9b319cebbf89d8d88743cfc39db6c567723f6b1
+MISC metadata.xml 332 BLAKE2B 6919c32bb2d72857076de2a52a3fc5fc726288fa5d15b5f151f314eee2c0551b9c3bc3325d8f2b9e042c6313cd970449755b558c9f5a6afcf13754ec69f536ef SHA512 e123c1f0a7aa74e2a3d505203f16a7fb114a5b4a83e32c5a802f8d69646be45a2e008974c89b4c8006edab8279181ea69868b19315112125ab4f84ad449d8c22
diff --git a/media-gfx/librecad/files/librecad-2.1.3-boost-1.76.patch b/media-gfx/librecad/files/librecad-2.1.3-boost-1.76.patch
new file mode 100644
index 000000000000..2500bab79b19
--- /dev/null
+++ b/media-gfx/librecad/files/librecad-2.1.3-boost-1.76.patch
@@ -0,0 +1,29 @@
+From 1fd07fcd847659d518efa0897a9f603de83fe362 Mon Sep 17 00:00:00 2001
+From: Jiri Slaby <jslaby@suse.cz>
+Date: Tue, 4 May 2021 09:25:03 +0200
+Subject: [PATCH] add boost tuple include to fix build
+
+With boost 1.76, we see:
+lib/engine/rs_ellipse.cpp:70:15: error: 'tuple' in namespace 'boost::math' does not name a template type
+   70 |  boost::math::tuple<double, double, double> operator()(double const& z) const {
+      |               ^~~~~
+
+Fix this by including the proper boost header.
+---
+ librecad/src/lib/engine/rs_ellipse.cpp | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/librecad/src/lib/engine/rs_ellipse.cpp b/librecad/src/lib/engine/rs_ellipse.cpp
+index 291f734ea..d47bf6ca4 100644
+--- a/librecad/src/lib/engine/rs_ellipse.cpp
++++ b/librecad/src/lib/engine/rs_ellipse.cpp
+@@ -48,6 +48,9 @@
+ #include <boost/version.hpp>
+ #include <boost/math/tools/roots.hpp>
+ #include <boost/math/special_functions/ellint_2.hpp>
++#if BOOST_VERSION > 104500
++#include <boost/math/tools/tuple.hpp>
++#endif
+ #endif
+ 
+ namespace{
diff --git a/media-gfx/librecad/librecad-2.1.3-r5.ebuild b/media-gfx/librecad/librecad-2.1.3-r6.ebuild
index bc56b908be42..9e36da264e46 100644
--- a/media-gfx/librecad/librecad-2.1.3-r5.ebuild
+++ b/media-gfx/librecad/librecad-2.1.3-r6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,9 +14,6 @@ SLOT="0"
 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:=
@@ -31,13 +28,17 @@ DEPEND="${RDEPEND}
 	dev-qt/qthelp:5
 	dev-qt/qtxml:5
 "
+BDEPEND="
+	dev-qt/linguist-tools:5
+"
 
 S="${WORKDIR}/LibreCAD-${PV}"
 
 PATCHES=(
 	"${FILESDIR}/${P}-qt-5.11.patch"
 	"${FILESDIR}/${P}-gcc-9.patch"
-	"${FILESDIR}/${P}-qt-5.15.patch" # pending upstream PR#1224
+	"${FILESDIR}/${P}-qt-5.15.patch"
+	"${FILESDIR}/${P}-boost-1.76.patch" # bug 788706, upstream PR#1345
 )
 
 src_configure() {
@@ -50,7 +51,7 @@ src_install() {
 	insinto /usr/share/${PN}
 	doins -r unix/resources/*
 	use doc && docinto html && dodoc -r librecad/support/doc/*
-	insinto /usr/share/appdata
+	insinto /usr/share/metainfo
 	doins unix/appdata/librecad.appdata.xml
 	doicon librecad/res/main/${PN}.png
 	make_desktop_entry ${PN} LibreCAD ${PN} Graphics
diff --git a/media-gfx/librecad/librecad-9999.ebuild b/media-gfx/librecad/librecad-9999.ebuild
index 04902b991e93..4f1a71b35035 100644
--- a/media-gfx/librecad/librecad-9999.ebuild
+++ b/media-gfx/librecad/librecad-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,16 +14,13 @@ if [[ ${PV} == *9999* ]]; then
 else
 	SRC_URI="https://github.com/LibreCAD/LibreCAD/archive/${PV/_/}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/LibreCAD-${PV}"
+	KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS=""
-IUSE="3d debug doc tools"
+IUSE="debug doc tools"
 
-BDEPEND="
-	dev-qt/linguist-tools:5
-"
 RDEPEND="
 	dev-cpp/muParser
 	dev-libs/boost:=
@@ -38,6 +35,9 @@ DEPEND="${RDEPEND}
 	dev-qt/qthelp:5
 	dev-qt/qtxml:5
 "
+BDEPEND="
+	dev-qt/linguist-tools:5
+"
 
 src_configure() {
 	eqmake5 -r
@@ -49,7 +49,7 @@ src_install() {
 	insinto /usr/share/${PN}
 	doins -r unix/resources/*
 	use doc && docinto html && dodoc -r librecad/support/doc/*
-	insinto /usr/share/appdata
+	insinto /usr/share/metainfo
 	doins unix/appdata/librecad.appdata.xml
 	doicon librecad/res/main/${PN}.png
 	make_desktop_entry ${PN} LibreCAD ${PN} Graphics
diff --git a/media-gfx/librecad/metadata.xml b/media-gfx/librecad/metadata.xml
index e83f7a4a7026..803bf3514a84 100644
--- a/media-gfx/librecad/metadata.xml
+++ b/media-gfx/librecad/metadata.xml
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
-  <use>
-    <flag name="3d">Require all 2D coordinates stored as 3D</flag>
-    <flag name="tools">Build additional tool programs: tff2lff</flag>
-  </use>
-  <upstream>
-    <remote-id type="github">LibreCAD/LibreCAD</remote-id>
-  </upstream>
+	<!-- maintainer-needed -->
+	<use>
+		<flag name="tools">Build additional tool programs: tff2lff</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">LibreCAD/LibreCAD</remote-id>
+	</upstream>
 </pkgmetadata>