[gentoo-commits] repo/gentoo:master commit in: media-gfx/librecad/, media-gfx/librecad/files/

[Andreas Sturmlechner]

commit:     6c6192cedb2b10882654040e34fb7e7fca82b8c9
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 30 23:37:29 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jul  1 00:03:40 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c6192ce

media-gfx/librecad: Fix build with Qt5, EAPI-6 bump

Thanks-to: Fabio Rossi <rossi.f <AT> inwind.it>
Closes: https://bugs.gentoo.org/659466
Package-Manager: Portage-2.3.41, Repoman-2.3.9

 media-gfx/librecad/Manifest                        |  1 +
 .../librecad/files/librecad-2.1.3-qt-5.11.patch    | 40 ++++++++++++++++++++++
 ...brecad-9999.ebuild => librecad-2.1.3-r4.ebuild} | 28 +++++++--------
 media-gfx/librecad/librecad-9999.ebuild            | 24 +++++--------
 4 files changed, 62 insertions(+), 31 deletions(-)

diff --git a/media-gfx/librecad/Manifest b/media-gfx/librecad/Manifest
index ea786b1cebf..af31055f733 100644
--- a/media-gfx/librecad/Manifest
+++ b/media-gfx/librecad/Manifest
@@ -1 +1,2 @@
+DIST librecad-2.1.3.tar.gz 22415288 BLAKE2B fb920113a7e4b2e9e7e3425f77364c36f6be676a3cd109798786b06d31698fd11437bc7f50cb843ca02d761730e83db7fde475d1bce6a65336a845b5b0114918 SHA512 246cffcc1ea3389997b4a738ab5e3d78e8c1096817ecb1ca28f38d601bc5d1a95f60798ac82308914a34da7b5dbc302b8363cf8b58a97221fdc8ee63010adc6c
 DIST librecad-2.1.3.zip 26086377 BLAKE2B 7f137c1f6c80f10b803ffbe8a739c230664d81003e47dc0f7b82509fdf0534e5fe046cbc6efaa75149daeaf6f0fa217c1fd08e4de83c74361c99108b6b8fd53a SHA512 9a41c17b512ccbc1a0ebb0e6da8e7297663490479f042fadaffda819e371afc7fa49b789449df9fd4e36a2e2b6f95b9b5be19df47cf3c4252111db2a7ed7f009

diff --git a/media-gfx/librecad/files/librecad-2.1.3-qt-5.11.patch b/media-gfx/librecad/files/librecad-2.1.3-qt-5.11.patch
new file mode 100644
index 00000000000..0c61a66d8a1
--- /dev/null
+++ b/media-gfx/librecad/files/librecad-2.1.3-qt-5.11.patch
@@ -0,0 +1,40 @@
+From 6c392e903e162b9283e88f53006e929663f2e883 Mon Sep 17 00:00:00 2001
+From: Jiri Slaby <jslaby@××××.cz>
+Date: Mon, 11 Jun 2018 10:44:00 +0200
+Subject: [PATCH] fix build with Qt 5.11
+
+The new Qt removed some implicit inclusions of headers. To avoid build
+errors, add explicit includes of those we use in the sources.
+
+Signed-off-by: Jiri Slaby <jslaby@××××.cz>
+---
+ librecad/src/ui/forms/qg_commandwidget.cpp | 1 +
+ librecad/src/ui/generic/colorwizard.cpp    | 1 +
+ librecad/src/ui/generic/widgetcreator.cpp  | 2 ++
+ 3 files changed, 4 insertions(+)
+
+diff --git a/librecad/src/ui/forms/qg_commandwidget.cpp b/librecad/src/ui/forms/qg_commandwidget.cpp
+index 835e47d67..2c878e833 100644
+--- a/librecad/src/ui/forms/qg_commandwidget.cpp
++++ b/librecad/src/ui/forms/qg_commandwidget.cpp
+@@ -27,6 +27,7 @@
+ **
+ **********************************************************************/
+ #include "qg_commandwidget.h"
++#include <QAction>
+ #include <QKeyEvent>
+ #include <algorithm>
+
+diff --git a/librecad/src/ui/generic/widgetcreator.cpp b/librecad/src/ui/generic/widgetcreator.cpp
+index 7c35144ff..d51190842 100644
+--- a/librecad/src/ui/generic/widgetcreator.cpp
++++ b/librecad/src/ui/generic/widgetcreator.cpp
+@@ -27,6 +27,8 @@
+ #include "widgetcreator.h"
+ #include "ui_widgetcreator.h"
+ 
++#include <QAction>
++#include <QActionGroup>
+ #include <QSettings>
+ #include <QLineEdit>
+ #include <QPushButton>

diff --git a/media-gfx/librecad/librecad-9999.ebuild b/media-gfx/librecad/librecad-2.1.3-r4.ebuild
similarity index 67%
copy from media-gfx/librecad/librecad-9999.ebuild
copy to media-gfx/librecad/librecad-2.1.3-r4.ebuild
index 2ab7e7f06f7..f7542aac6ff 100644
--- a/media-gfx/librecad/librecad-9999.ebuild
+++ b/media-gfx/librecad/librecad-2.1.3-r4.ebuild
@@ -1,40 +1,38 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-inherit eutils git-r3 qmake-utils
+inherit desktop qmake-utils
 
 DESCRIPTION="Generic 2D CAD program"
 HOMEPAGE="https://www.librecad.org/"
-SRC_URI=""
-EGIT_REPO_URI="https://github.com/LibreCAD/LibreCAD.git"
+SRC_URI="https://github.com/LibreCAD/LibreCAD/archive/${PV/_/}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 
 IUSE="3d debug doc tools"
 
-DEPEND="
+RDEPEND="
 	dev-cpp/muParser
 	dev-libs/boost:=
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5
-	dev-qt/qthelp:5
 	dev-qt/qtprintsupport:5
 	dev-qt/qtsvg:5
 	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
 	media-libs/freetype:2"
+DEPEND="${RDEPEND}
+	dev-qt/linguist-tools:5
+	dev-qt/qthelp:5
+	dev-qt/qtxml:5
+"
 
-RDEPEND="${DEPEND}"
-S="${WORKDIR}/librecad-${PV}"
+S="${WORKDIR}/LibreCAD-${PV}"
 
-src_prepare() {
-	# currently RS_VECTOR3D causes an internal compiler error on GCC-4.8
-	use 3d || sed -i -e '/RS_VECTOR2D/ s/^#//' librecad/src/src.pro || die
-}
+PATCHES=( "${FILESDIR}/${P}-qt-5.11.patch" )
 
 src_configure() {
 	eqmake5 -r
@@ -43,8 +41,6 @@ src_configure() {
 src_install() {
 	dobin unix/librecad
 	use tools && dobin unix/ttf2lff
-	insinto /usr/share
-	doins -r unix/appdata
 	insinto /usr/share/${PN}
 	doins -r unix/resources/*
 	use doc && docinto html && dodoc -r librecad/support/doc/*

diff --git a/media-gfx/librecad/librecad-9999.ebuild b/media-gfx/librecad/librecad-9999.ebuild
index 2ab7e7f06f7..4c0e87ee95e 100644
--- a/media-gfx/librecad/librecad-9999.ebuild
+++ b/media-gfx/librecad/librecad-9999.ebuild
@@ -1,13 +1,12 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-inherit eutils git-r3 qmake-utils
+inherit desktop git-r3 qmake-utils
 
 DESCRIPTION="Generic 2D CAD program"
 HOMEPAGE="https://www.librecad.org/"
-SRC_URI=""
 EGIT_REPO_URI="https://github.com/LibreCAD/LibreCAD.git"
 
 LICENSE="GPL-2"
@@ -16,25 +15,22 @@ KEYWORDS=""
 
 IUSE="3d debug doc tools"
 
-DEPEND="
+RDEPEND="
 	dev-cpp/muParser
 	dev-libs/boost:=
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5
-	dev-qt/qthelp:5
 	dev-qt/qtprintsupport:5
 	dev-qt/qtsvg:5
 	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
 	media-libs/freetype:2"
+DEPEND="${RDEPEND}
+	dev-qt/linguist-tools:5
+	dev-qt/qthelp:5
+	dev-qt/qtxml:5
+"
 
-RDEPEND="${DEPEND}"
-S="${WORKDIR}/librecad-${PV}"
-
-src_prepare() {
-	# currently RS_VECTOR3D causes an internal compiler error on GCC-4.8
-	use 3d || sed -i -e '/RS_VECTOR2D/ s/^#//' librecad/src/src.pro || die
-}
+S="${WORKDIR}/LibreCAD-${PV}"
 
 src_configure() {
 	eqmake5 -r
@@ -43,8 +39,6 @@ src_configure() {
 src_install() {
 	dobin unix/librecad
 	use tools && dobin unix/ttf2lff
-	insinto /usr/share
-	doins -r unix/appdata
 	insinto /usr/share/${PN}
 	doins -r unix/resources/*
 	use doc && docinto html && dodoc -r librecad/support/doc/*