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

["Slawek Lis" <slis@gentoo.org>]

commit:     54efa1134353a0745cb87fc2229b39a606d31fea
Author:     Slawomir Lis <slis <AT> gentoo <DOT> org>
AuthorDate: Mon Sep  5 12:24:40 2016 +0000
Commit:     Slawek Lis <slis <AT> gentoo <DOT> org>
CommitDate: Mon Sep  5 12:25:29 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=54efa113

media-gfx/librecad: version bump to 2.1.1

Reported in bug 592234

Reported-by: poncho <AT> spahan.ch

Package-Manager: portage-2.3.0

 media-gfx/librecad/Manifest                   |  1 +
 media-gfx/librecad/files/iota-fix-2.1.1.patch | 10 ++++
 media-gfx/librecad/librecad-2.1.1.ebuild      | 70 +++++++++++++++++++++++++++
 3 files changed, 81 insertions(+)

diff --git a/media-gfx/librecad/Manifest b/media-gfx/librecad/Manifest
index 514b5dd..654dd1a 100644
--- a/media-gfx/librecad/Manifest
+++ b/media-gfx/librecad/Manifest
@@ -4,3 +4,4 @@ DIST librecad-2.0.6.zip 17401781 SHA256 09a58f9a4b578eb7381f299414344f82c6e32015
 DIST librecad-2.0.7.zip 17457197 SHA256 36d2fa1c60324bb743f0ddde0b9da1dc6b57a370422de714adef27a0cd32d9d2 SHA512 afbe094dd565e2b058c5b1c28e88b76b883d1b9f20f60047e5a7771ec5d353e6a3e73abee8e4d7ac5f916ead7fb15719cf7bab034d670f7d7f54ca394d314803 WHIRLPOOL 5d196be5e54e4ceb7f2650015f35bf6ba77440b7a81d51f68a9a15408d399779f5c61289a5adaacbf1538735f7f0761152371291bab8bc8c8fb8109c3e1ddfc3
 DIST librecad-2.0.8.zip 23469997 SHA256 3f3affbff85fd16746a0e551777c4f234d2b03384d04edf9483d36db1c7144a3 SHA512 d0dd1fdcaafbb7b83a8d0791e132633e9a72648d7d8d7ffdfc02bb092348472a05917df7ea1f2096404afabc92d586b75f6cafa3bc54da535bcaf005c96ed8a7 WHIRLPOOL 14ae2c433345b5081c92426913744d57f2fa4a97621fb55143995365381d5fbed6c8ad6a1f3a6d215dc4791e3493259b3e09801bfb288a85de7db87f010aae49
 DIST librecad-2.0.9.zip 25524745 SHA256 3fd92e8249642462d41d688446393ee5e79f68b7b0d9878388c6c194af2cb43a SHA512 e2029389b2ced67a94d9411cb2f49f524ac12542409bc7829a043af9611dd51544fc431e364f4dcfb1a8b645b2bc6eb86fc74294726a65ee687f69bd7eb8f700 WHIRLPOOL 20aaa38cd92547bae6cee4b696f5b7f3699438481c5051af6112c6b1661ffb018509ff1fdcfb4591e8828c8ffcfcc5a3002c594dbcf95beba93e9768c5133c02
+DIST librecad-2.1.1.zip 26085717 SHA256 a5d27119ff137611c090fb174890ed1312c56897fb1482327d676da148fbd7dc SHA512 82b27e75fddae798da0e30e0c560d3769dfddab936e33a3585fd3e871eccf88e51c28d5ed938a530cb65c2e2ecfc593772ca83a2d23dd29126aa8225595f3d01 WHIRLPOOL 50ac34d0bdf1cd55ee6f7a959c1c1430197ac8acb7739755887b726349e39c9a1fe32ef25cab285aeaf649057701256f6210750c986ddb67ed3f338c80e300ed

diff --git a/media-gfx/librecad/files/iota-fix-2.1.1.patch b/media-gfx/librecad/files/iota-fix-2.1.1.patch
new file mode 100644
index 00000000..12506f4
--- /dev/null
+++ b/media-gfx/librecad/files/iota-fix-2.1.1.patch
@@ -0,0 +1,10 @@
+--- librecad/src/lib/engine/rs_spline.cpp.old	2016-06-20 20:43:27.000000000 +0200
++++ librecad/src/lib/engine/rs_spline.cpp	2016-09-05 13:23:25.459841304 +0200
+@@ -26,6 +26,7 @@
+ 
+ #include<iostream>
+ #include<cmath>
++#include<numeric>
+ #include "rs_spline.h"
+ 
+ 

diff --git a/media-gfx/librecad/librecad-2.1.1.ebuild b/media-gfx/librecad/librecad-2.1.1.ebuild
new file mode 100644
index 00000000..359ab6c
--- /dev/null
+++ b/media-gfx/librecad/librecad-2.1.1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils qmake-utils
+
+DESCRIPTION="Generic 2D CAD program"
+HOMEPAGE="http://www.librecad.org/"
+SRC_URI="https://github.com/LibreCAD/LibreCAD/archive/${PV/_/}.zip -> ${P}.zip"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+IUSE="3d debug doc tools qt4 +qt5"
+REQUIRED_USE="|| ( qt4 qt5 )"
+
+DEPEND="
+	qt4? (
+		dev-qt/qtcore:4
+		dev-qt/qtgui:4
+		dev-qt/qtsvg:4
+		dev-qt/qthelp:4
+	)
+	qt5? (
+		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
+	)
+	dev-libs/boost:=
+	dev-cpp/muParser
+	media-libs/freetype:2"
+
+RDEPEND="${DEPEND}"
+S="${WORKDIR}/LibreCAD-${PV}"
+
+src_prepare() {
+	epatch "${FILESDIR}/iota-fix-2.1.1.patch"
+
+	# currently RS_VECTOR3D causes an internal compiler error on GCC-4.8
+	if ! use 3d; then
+		sed -i -e '/RS_VECTOR2D/ s/^#//' librecad/src/src.pro || die
+	fi
+}
+
+src_configure() {
+	if use qt4; then
+		eqmake4 -r
+	else
+		eqmake5 -r
+	fi
+}
+
+src_install() {
+	dobin unix/librecad
+	use tools && dobin unix/ttf2lff
+	insinto /usr/share/${PN}
+	doins -r unix/resources/*
+	use doc && insinto html && dodoc -r librecad/support/doc/*
+	insinto /usr/share/appdata
+	doins unix/appdata/librecad.appdata.xml
+	doicon librecad/res/main/${PN}.png
+	make_desktop_entry ${PN} LibreCAD ${PN} Graphics
+}