Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/librecad/
Date: Mon, 15 Jan 2018 22:01:37
Message-Id: 1516053679.ff6616c7cc53ae69c9b56ccf8b97b79d9c4baf8a.asturm@gentoo
1 commit: ff6616c7cc53ae69c9b56ccf8b97b79d9c4baf8a
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Mon Jan 15 21:54:35 2018 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Mon Jan 15 22:01:19 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff6616c7
7
8 media-gfx/librecad: Sync with 2.1.3-r2 ebuild
9
10 Bug: https://bugs.gentoo.org/631808
11 Package-Manager: Portage-2.3.19, Repoman-2.3.6
12
13 media-gfx/librecad/librecad-9999.ebuild | 25 +++++++------------------
14 1 file changed, 7 insertions(+), 18 deletions(-)
15
16 diff --git a/media-gfx/librecad/librecad-9999.ebuild b/media-gfx/librecad/librecad-9999.ebuild
17 index 4a1f2d51dc4..6122e6f4f0f 100644
18 --- a/media-gfx/librecad/librecad-9999.ebuild
19 +++ b/media-gfx/librecad/librecad-9999.ebuild
20 @@ -1,4 +1,4 @@
21 -# Copyright 1999-2015 Gentoo Foundation
22 +# Copyright 1999-2018 Gentoo Foundation
23 # Distributed under the terms of the GNU General Public License v2
24
25 EAPI=5
26 @@ -13,16 +13,11 @@ EGIT_REPO_URI="https://github.com/LibreCAD/LibreCAD.git"
27 LICENSE="GPL-2"
28 SLOT="0"
29 KEYWORDS=""
30 +
31 IUSE="3d debug doc tools qt4 +qt5"
32 -REQUIRED_USE="|| ( qt4 qt5 )"
33 +REQUIRED_USE="qt5"
34
35 DEPEND="
36 - qt4? (
37 - dev-qt/qtcore:4
38 - dev-qt/qtgui:4
39 - dev-qt/qtsvg:4
40 - dev-qt/qthelp:4
41 - )
42 qt5? (
43 dev-qt/qtcore:5
44 dev-qt/qtgui:5
45 @@ -32,10 +27,9 @@ DEPEND="
46 dev-qt/qtwidgets:5
47 dev-qt/qtxml:5
48 )
49 -
50 - dev-libs/boost
51 + dev-libs/boost:=
52 dev-cpp/muParser
53 - media-libs/freetype"
54 + media-libs/freetype:2"
55
56 RDEPEND="${DEPEND}"
57 S="${WORKDIR}/librecad-${PV}"
58 @@ -46,12 +40,7 @@ src_prepare() {
59 }
60
61 src_configure() {
62 - if use qt4
63 - then
64 - eqmake4 -r
65 - else
66 - eqmake5 -r
67 - fi
68 + eqmake5 -r
69 }
70
71 src_install() {
72 @@ -61,7 +50,7 @@ src_install() {
73 doins -r unix/appdata
74 insinto /usr/share/${PN}
75 doins -r unix/resources/*
76 - use doc && dohtml -r librecad/support/doc/*
77 + use doc && insinto html && dodoc -r librecad/support/doc/*
78 insinto /usr/share/appdata
79 doins unix/appdata/librecad.appdata.xml
80 doicon librecad/res/main/${PN}.png