subject:"\[gentoo\-commits\] repo\/gentoo\:master commit in\: media\-gfx\/librecad\/"

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

2023-03-17 Thread Sam James

commit: 249d97d258bf1d7a95b4dc9b07c1893485f69bc5
Author: Sam James  gentoo  org>
AuthorDate: Fri Mar 17 18:26:23 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Mar 17 18:26:23 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=249d97d2

media-gfx/librecad: Stabilize 2.2.0 amd64, #901897

Signed-off-by: Sam James  gentoo.org>

 media-gfx/librecad/librecad-2.2.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/librecad/librecad-2.2.0.ebuild 
b/media-gfx/librecad/librecad-2.2.0.ebuild
index c88fba56a795..092799ec110b 100644
--- a/media-gfx/librecad/librecad-2.2.0.ebuild
+++ b/media-gfx/librecad/librecad-2.2.0.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == ** ]]; then
 else
SRC_URI="https://github.com/LibreCAD/LibreCAD/archive/${PV/_/}.tar.gz 
-> ${P}.tar.gz"
S="${WORKDIR}/LibreCAD-${PV}"
-   KEYWORDS="~amd64 ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
+   KEYWORDS="amd64 ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="GPL-2"

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

2023-03-17 Thread Sam James

commit: 98d00c34225572aab181d37341ba67fac6568971
Author: Sam James  gentoo  org>
AuthorDate: Fri Mar 17 17:21:35 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Mar 17 17:21:35 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=98d00c34

media-gfx/librecad: Stabilize 2.2.0 x86, #901897

Signed-off-by: Sam James  gentoo.org>

 media-gfx/librecad/librecad-2.2.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/librecad/librecad-2.2.0.ebuild 
b/media-gfx/librecad/librecad-2.2.0.ebuild
index 6764913d807a..c88fba56a795 100644
--- a/media-gfx/librecad/librecad-2.2.0.ebuild
+++ b/media-gfx/librecad/librecad-2.2.0.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == ** ]]; then
 else
SRC_URI="https://github.com/LibreCAD/LibreCAD/archive/${PV/_/}.tar.gz 
-> ${P}.tar.gz"
S="${WORKDIR}/LibreCAD-${PV}"
-   KEYWORDS="~amd64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+   KEYWORDS="~amd64 ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="GPL-2"

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

2023-02-05 Thread Joonas Niilola

commit: 12765a7445225ad3acaeb6f3683c8f25ed4e18ca
Author: Alexander Golubev  gmail  com>
AuthorDate: Tue Jan 24 00:35:58 2023 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Sun Feb  5 09:12:52 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=12765a74

media-gfx/librecad: add 2.2.0

Closes: https://bugs.gentoo.org/887977
Signed-off-by: Alexander Golubev  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/29234
Signed-off-by: Joonas Niilola  gentoo.org>

 media-gfx/librecad/Manifest  |  1 +
 media-gfx/librecad/librecad-2.2.0.ebuild | 85 
 2 files changed, 86 insertions(+)

diff --git a/media-gfx/librecad/Manifest b/media-gfx/librecad/Manifest
index 2a3edced4862..293932e7bd13 100644
--- a/media-gfx/librecad/Manifest
+++ b/media-gfx/librecad/Manifest
@@ -1,2 +1,3 @@
 DIST librecad-2.1.3.tar.gz 22415288 BLAKE2B 
fb920113a7e4b2e9e7e3425f77364c36f6be676a3cd109798786b06d31698fd11437bc7f50cb843ca02d761730e83db7fde475d1bce6a65336a845b5b0114918
 SHA512 
246cffcc1ea3389997b4a738ab5e3d78e8c1096817ecb1ca28f38d601bc5d1a95f60798ac82308914a34da7b5dbc302b8363cf8b58a97221fdc8ee63010adc6c
+DIST librecad-2.2.0.tar.gz 13837301 BLAKE2B 
ede9181b6805455d10773b70a8262ffb5a1c48f353dbfd1b80f705ba3194be700e9a486cdf528c4e8015b327a75a29c81b832186024d48229a6cc5fd9ca2dc12
 SHA512 
df33eac311b5232d6fc0480be1b1c9d257a33ba22f9b7897af4c1761978c87c07a962ae3ea37e8728661a788152157fc621aae65d60d44ae37b2028919cc96a2
 DIST librecad-gentoo-CVE-patches-2.1.3.tar.gz 11687 BLAKE2B 
4676fa60033e6d0ace35bbebfae569366a50ec46c2dc5b90bace9564e1f6c2020f733f63981788b6f5288fb0c57760215e7b35f294656c21787ebdefa8447fa0
 SHA512 
b485b41ab1d6eb61750c11a9b327fc70d28cd0cf689b3cd815b4982d3d800737f402522d9c3d416f1e43422166e7de4f97055de238cc2fe80cc45f11fa3377e6

diff --git a/media-gfx/librecad/librecad-2.2.0.ebuild 
b/media-gfx/librecad/librecad-2.2.0.ebuild
new file mode 100644
index ..6764913d807a
--- /dev/null
+++ b/media-gfx/librecad/librecad-2.2.0.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PLOCALES="ar ca cs da de el en en_au es es_ar es_bo es_cl es_co es_cr es_do 
es_ec es_gt es_hn es_mx es_ni es_pa es_pe es_pr es_py es_sv es_us es_uy es_ve 
et eu fi fr gl hi hu id_ID it ja ko lv mk nl no pa pl pt_br pt_pt ro_ro ru sk 
sl sq_al sv ta tr uk zh_cn zh_tw"
+
+inherit desktop edo plocale qmake-utils
+
+DESCRIPTION="Generic 2D CAD program"
+HOMEPAGE="https://www.librecad.org/;
+
+if [[ ${PV} == ** ]]; 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}"
+   KEYWORDS="~amd64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="debug doc tools"
+
+RDEPEND="
+   dev-cpp/muParser
+   dev-libs/boost:=
+   dev-qt/qtcore:5
+   dev-qt/qtgui:5
+   dev-qt/qtprintsupport:5
+   dev-qt/qtsvg:5
+   dev-qt/qtwidgets:5
+   media-libs/freetype:2
+"
+DEPEND="${RDEPEND}
+   dev-qt/qthelp:5
+   dev-qt/qtxml:5
+"
+BDEPEND="
+   dev-qt/linguist-tools:5
+"
+
+src_prepare() {
+   default
+
+   # Stock script doesn't work correctly on gentoo (see bug #847394)
+   # and also it compiles all translations regardles of selected locales.
+   # To avoid this just comment out locale building and do it manually
+   sed -i -e '/LRELEASE/s!^!# !' scripts/postprocess-unix.sh || die
+
+   plocale_find_changes 'librecad/ts' 'librecad_' '.ts'
+}
+
+src_configure() {
+   eqmake5 -r
+}
+
+src_compile() {
+   default
+
+   build_locale() {
+   local lrelease="$(qt5_get_bindir)/lrelease"
+   edo "${lrelease}" "librecad/ts/librecad_${1}.ts" \
+   -qm "unix/resources/qm/librecad_${1}.qm"
+   edo "${lrelease}" "plugins/ts/plugins_${1}.ts" \
+   -qm "unix/resources/qm/plugins_${1}.qm"
+   }
+
+   plocale_for_each_locale build_locale
+   # We want the en locale to be always present. Otherwise it could
+   # be impossible to select the English command set which is quite 
crucial.
+   has en $(plocale_get_locales) || build_locale en
+}
+
+src_install() {
+   dobin unix/librecad
+   use tools && dobin unix/ttf2lff
+   insinto /usr/share/${PN}
+   doins -r unix/resources/*
+   use doc && docinto html && dodoc -r librecad/support/doc/*
+   insinto /usr/share/metainfo
+   doins unix/appdata/org.librecad.librecad.appdata.xml
+   doicon librecad/res/main/${PN}.png
+   make_desktop_entry ${PN} LibreCAD ${PN} Graphics
+}

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

2023-01-24 Thread John Helmert III

commit: 4d28e84965281e2132f116892a7ea278ba5206c6
Author: John Helmert III  gentoo  org>
AuthorDate: Wed Jan 25 04:27:09 2023 +
Commit: John Helmert III  gentoo  org>
CommitDate: Wed Jan 25 04:27:09 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d28e849

media-gfx/librecad: drop 2.1.3-r6

Bug: https://bugs.gentoo.org/825362
Bug: https://bugs.gentoo.org/832210
Signed-off-by: John Helmert III  gentoo.org>

 media-gfx/librecad/librecad-2.1.3-r6.ebuild | 58 -
 1 file changed, 58 deletions(-)

diff --git a/media-gfx/librecad/librecad-2.1.3-r6.ebuild 
b/media-gfx/librecad/librecad-2.1.3-r6.ebuild
deleted file mode 100644
index f068df1cafc4..
--- a/media-gfx/librecad/librecad-2.1.3-r6.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop qmake-utils
-
-DESCRIPTION="Generic 2D CAD program"
-HOMEPAGE="https://www.librecad.org/;
-SRC_URI="https://github.com/LibreCAD/LibreCAD/archive/${PV/_/}.tar.gz -> 
${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
-IUSE="debug doc tools"
-
-RDEPEND="
-   dev-cpp/muParser
-   dev-libs/boost:=
-   dev-qt/qtcore:5
-   dev-qt/qtgui:5
-   dev-qt/qtprintsupport:5
-   dev-qt/qtsvg:5
-   dev-qt/qtwidgets:5
-   media-libs/freetype:2
-"
-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"
-   "${FILESDIR}/${P}-boost-1.76.patch" # bug 788706, upstream PR#1345
-)
-
-src_configure() {
-   eqmake5 -r
-}
-
-src_install() {
-   dobin unix/librecad
-   use tools && dobin unix/ttf2lff
-   insinto /usr/share/${PN}
-   doins -r unix/resources/*
-   use doc && docinto html && dodoc -r librecad/support/doc/*
-   insinto /usr/share/metainfo
-   doins unix/appdata/librecad.appdata.xml
-   doicon librecad/res/main/${PN}.png
-   make_desktop_entry ${PN} LibreCAD ${PN} Graphics
-}

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

2022-11-27 Thread Joonas Niilola

commit: ae3b58318840afcd6c3dfa9d8b9310c68136527f
Author: Alexander Golubev  gmail  com>
AuthorDate: Mon Nov  7 08:11:20 2022 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Mon Nov 28 07:05:29 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ae3b5831

media-gfx/librecad: several improvements

* bump to EAPI=8
* fix tranlation install
* fix live ebuild installation
* patch several CVEs

Bug: https://bugs.gentoo.org/847394
Bug: https://bugs.gentoo.org/852941
Bug: https://bugs.gentoo.org/825362
Bug: https://bugs.gentoo.org/832210
Closes: https://bugs.gentoo.org/878925
Signed-off-by: Alexander Golubev  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/28164
Signed-off-by: Joonas Niilola  gentoo.org>

 media-gfx/librecad/Manifest |  1 +
 media-gfx/librecad/librecad-2.1.3-r7.ebuild | 99 +
 media-gfx/librecad/librecad-.ebuild | 37 +--
 3 files changed, 133 insertions(+), 4 deletions(-)

diff --git a/media-gfx/librecad/Manifest b/media-gfx/librecad/Manifest
index fcff5ba5ec8f..2a3edced4862 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-gentoo-CVE-patches-2.1.3.tar.gz 11687 BLAKE2B 
4676fa60033e6d0ace35bbebfae569366a50ec46c2dc5b90bace9564e1f6c2020f733f63981788b6f5288fb0c57760215e7b35f294656c21787ebdefa8447fa0
 SHA512 
b485b41ab1d6eb61750c11a9b327fc70d28cd0cf689b3cd815b4982d3d800737f402522d9c3d416f1e43422166e7de4f97055de238cc2fe80cc45f11fa3377e6

diff --git a/media-gfx/librecad/librecad-2.1.3-r7.ebuild 
b/media-gfx/librecad/librecad-2.1.3-r7.ebuild
new file mode 100644
index ..3f3a914a5304
--- /dev/null
+++ b/media-gfx/librecad/librecad-2.1.3-r7.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PLOCALES="ar ca cs da de el en en_au es es_ar es_bo es_cl es_co es_cr es_do 
es_ec es_gt es_hn es_mx es_ni es_pa es_pe es_pr es_py es_sv es_us es_uy es_ve 
et eu fi fr gl hi hu id_ID it ja ko lv nl no pa pl pt_br pt_pt ro_ro ru sk sl 
sq_al sv ta tr uk zh_cn zh_tw"
+
+inherit desktop edo plocale qmake-utils
+
+DESCRIPTION="Generic 2D CAD program"
+HOMEPAGE="https://www.librecad.org/;
+
+if [[ ${PV} == ** ]]; 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
+   
https://github.com/Fat-Zer/librecad-gentoo-CVE-patches/archive/v${PV/_/}.tar.gz 
-> librecad-gentoo-CVE-patches-${PV}.tar.gz
+   "
+   S="${WORKDIR}/LibreCAD-${PV}"
+   KEYWORDS="~amd64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="debug doc tools"
+
+RDEPEND="
+   dev-cpp/muParser
+   dev-libs/boost:=
+   dev-qt/qtcore:5
+   dev-qt/qtgui:5
+   dev-qt/qtprintsupport:5
+   dev-qt/qtsvg:5
+   dev-qt/qtwidgets:5
+   media-libs/freetype:2
+"
+DEPEND="${RDEPEND}
+   dev-qt/qthelp:5
+   dev-qt/qtxml:5
+"
+BDEPEND="
+   dev-qt/linguist-tools:5
+"
+
+PATCHES=(
+   "${FILESDIR}/${P}-qt-5.11.patch"
+   "${FILESDIR}/${P}-gcc-9.patch"
+   "${FILESDIR}/${P}-qt-5.15.patch"
+   "${FILESDIR}/${P}-boost-1.76.patch" # bug 788706, upstream PR#1345
+)
+
+src_prepare() {
+   default
+
+   # Note: the CVE patches are borrowed from debian packaging; some of the
+   # patches are too big for the tree; move them to a separate repo/
+   # see bug #825362 and bug #832210
+   eapply "${WORKDIR}/librecad-gentoo-CVE-patches-${PV}"
+
+   # Stock script doesn't work correctly on gentoo (see bug #847394)
+   # and also it compiles all translations regardles of selected locales.
+   # To avoid this just comment out locale building and do it manually
+   sed -i -e '/LRELEASE/s!^!# !' scripts/postprocess-unix.sh || die
+
+   plocale_find_changes 'librecad/ts' 'librecad_' '.ts'
+}
+
+src_configure() {
+   eqmake5 -r
+}
+
+src_compile() {
+   default
+
+   build_locale() {
+   local lrelease="$(qt5_get_bindir)/lrelease"
+   edo "${lrelease}" "librecad/ts/librecad_${1}.ts" \
+   -qm "unix/resources/qm/librecad_${1}.qm"
+   edo "${lrelease}" "plugins/ts/plugins_${1}.ts" \
+   -qm "unix/resources/qm/plugins_${1}.qm"
+   }
+
+   plocale_for_each_locale build_locale
+   # We want the en locale to be always present. Otherwise it could
+   # be impossible to select the English command set which is quite 
crucial.
+   has en

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

2022-01-22 Thread Yixun Lan

commit: abc195f85e1771cb4a78bf52a0861a7e92649605
Author: Jer Sun  gmail  com>
AuthorDate: Fri Jan 21 03:26:28 2022 +
Commit: Yixun Lan  gentoo  org>
CommitDate: Sat Jan 22 08:37:58 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=abc195f8

media-gfx/librecad: keyword ~riscv

Tested librecad on unmatched hardware.

Closes: https://bugs.gentoo.org/831661
Closes: https://github.com/gentoo/gentoo/pull/23892
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Jer Sun  gmail.com>
Signed-off-by: Yixun Lan  gentoo.org>

 media-gfx/librecad/librecad-2.1.3-r6.ebuild | 4 ++--
 media-gfx/librecad/librecad-.ebuild | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/media-gfx/librecad/librecad-2.1.3-r6.ebuild 
b/media-gfx/librecad/librecad-2.1.3-r6.ebuild
index 9e36da264e46..f068df1cafc4 100644
--- a/media-gfx/librecad/librecad-2.1.3-r6.ebuild
+++ b/media-gfx/librecad/librecad-2.1.3-r6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ 
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 ~riscv x86 ~amd64-linux ~x86-linux"
 IUSE="debug doc tools"
 
 RDEPEND="

diff --git a/media-gfx/librecad/librecad-.ebuild 
b/media-gfx/librecad/librecad-.ebuild
index 4f1a71b35035..445cd8eabb8a 100644
--- a/media-gfx/librecad/librecad-.ebuild
+++ b/media-gfx/librecad/librecad-.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == ** ]]; 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"
+   KEYWORDS="~amd64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="GPL-2"

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

2021-05-09 Thread Andreas Sturmlechner

commit: 0c8aadc5bd665342c9fa0b1bf2fa8a00e7400887
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun May  9 19:05:58 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun May  9 19:12:11 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c8aadc5

media-gfx/librecad: Fix metainfo install path

Drop IUSE=3d in  too, amazingly, a follow-up to 3a46e048.

Closes: https://bugs.gentoo.org/726036
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 ...{librecad-2.1.3-r5.ebuild => librecad-2.1.3-r6.ebuild} |  2 +-
 media-gfx/librecad/librecad-.ebuild   | 14 +++---
 media-gfx/librecad/metadata.xml   | 15 +++
 3 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/media-gfx/librecad/librecad-2.1.3-r5.ebuild 
b/media-gfx/librecad/librecad-2.1.3-r6.ebuild
similarity index 97%
rename from media-gfx/librecad/librecad-2.1.3-r5.ebuild
rename to media-gfx/librecad/librecad-2.1.3-r6.ebuild
index 7b21b0e12ca..9e36da264e4 100644
--- a/media-gfx/librecad/librecad-2.1.3-r5.ebuild
+++ b/media-gfx/librecad/librecad-2.1.3-r6.ebuild
@@ -51,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-.ebuild 
b/media-gfx/librecad/librecad-.ebuild
index 04902b991e9..4f1a71b3503 100644
--- a/media-gfx/librecad/librecad-.ebuild
+++ b/media-gfx/librecad/librecad-.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} == ** ]]; 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 e83f7a4a702..803bf3514a8 100644
--- a/media-gfx/librecad/metadata.xml
+++ b/media-gfx/librecad/metadata.xml
@@ -1,12 +1,11 @@
 
 http://www.gentoo.org/dtd/metadata.dtd;>
 
-  
-  
-Require all 2D coordinates stored as 3D
-Build additional tool programs: tff2lff
-  
-  
-LibreCAD/LibreCAD
-  
+   
+   
+   Build additional tool programs: 
tff2lff
+   
+   
+   LibreCAD/LibreCAD
+

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

2021-05-09 Thread Andreas Sturmlechner

commit: f26b020e95bf497d99a8398226cf08288f93909b
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun May  9 18:38:38 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun May  9 19:12:11 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f26b020e

media-gfx/librecad: Fix build with >=dev-libs/boost-1.76

Closes: https://bugs.gentoo.org/788706
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../librecad/files/librecad-2.1.3-boost-1.76.patch | 29 ++
 media-gfx/librecad/librecad-2.1.3-r5.ebuild| 11 
 2 files changed, 35 insertions(+), 5 deletions(-)

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 000..2500bab79b1
--- /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 
+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 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 
+ #include 
+ #include 
++#if BOOST_VERSION > 104500
++#include 
++#endif
+ #endif
+ 
+ namespace{

diff --git a/media-gfx/librecad/librecad-2.1.3-r5.ebuild 
b/media-gfx/librecad/librecad-2.1.3-r5.ebuild
index bc56b908be4..7b21b0e12ca 100644
--- a/media-gfx/librecad/librecad-2.1.3-r5.ebuild
+++ b/media-gfx/librecad/librecad-2.1.3-r5.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() {

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

2020-06-05 Thread Andreas Sturmlechner

commit: c24cdf0184821e1b3318d7593af4e56752cd10ad
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Fri Jun  5 09:30:03 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Jun  5 09:43:20 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c24cdf01

media-gfx/librecad: Drop broken 2.1.3-r4

Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-gfx/librecad/librecad-2.1.3-r4.ebuild | 51 -
 1 file changed, 51 deletions(-)

diff --git a/media-gfx/librecad/librecad-2.1.3-r4.ebuild 
b/media-gfx/librecad/librecad-2.1.3-r4.ebuild
deleted file mode 100644
index f5656b76120..000
--- a/media-gfx/librecad/librecad-2.1.3-r4.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit desktop qmake-utils
-
-DESCRIPTION="Generic 2D CAD program"
-HOMEPAGE="https://www.librecad.org/;
-SRC_URI="https://github.com/LibreCAD/LibreCAD/archive/${PV/_/}.tar.gz -> 
${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc64 x86 ~amd64-linux ~x86-linux"
-
-IUSE="3d debug doc tools"
-
-RDEPEND="
-   dev-cpp/muParser
-   dev-libs/boost:=
-   dev-qt/qtcore:5
-   dev-qt/qtgui:5
-   dev-qt/qtprintsupport:5
-   dev-qt/qtsvg:5
-   dev-qt/qtwidgets:5
-   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" )
-
-src_configure() {
-   eqmake5 -r
-}
-
-src_install() {
-   dobin unix/librecad
-   use tools && dobin unix/ttf2lff
-   insinto /usr/share/${PN}
-   doins -r unix/resources/*
-   use doc && docinto 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
-}

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

2020-05-29 Thread Agostino Sarubbo

commit: 93663c32f90aa1cc9d5c61b18e3a2022b7fde625
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Fri May 29 07:36:52 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Fri May 29 07:36:52 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=93663c32

media-gfx/librecad: amd64 stable wrt bug #699716

Package-Manager: Portage-2.3.99, Repoman-2.3.22
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 media-gfx/librecad/librecad-2.1.3-r5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/librecad/librecad-2.1.3-r5.ebuild 
b/media-gfx/librecad/librecad-2.1.3-r5.ebuild
index 1c3ced1015e..054af7f65e7 100644
--- a/media-gfx/librecad/librecad-2.1.3-r5.ebuild
+++ b/media-gfx/librecad/librecad-2.1.3-r5.ebuild
@@ -11,7 +11,7 @@ 
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="

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

2020-05-20 Thread Andreas Sturmlechner

commit: 953c12e77b526a4ae94ad14228d1a9e0b883e9cd
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed May 20 12:06:32 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed May 20 12:24:51 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=953c12e7

media-gfx/librecad: Fix live ebuild by adding a release switch

Reported-by: Jérôme Borme  laposte.net>
Closes: https://bugs.gentoo.org/705804
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-gfx/librecad/librecad-.ebuild | 13 +
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/media-gfx/librecad/librecad-.ebuild 
b/media-gfx/librecad/librecad-.ebuild
index f24977427ab..04902b991e9 100644
--- a/media-gfx/librecad/librecad-.ebuild
+++ b/media-gfx/librecad/librecad-.ebuild
@@ -3,11 +3,18 @@
 
 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} == ** ]]; 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"
@@ -32,8 +39,6 @@ DEPEND="${RDEPEND}
dev-qt/qtxml:5
 "
 
-S="${WORKDIR}/LibreCAD-${PV}"
-
 src_configure() {
eqmake5 -r
 }

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

2020-05-20 Thread Andreas Sturmlechner

commit: 1ad32a5cbbbae69877bb1db250ccfcaa7545dd45
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed May 20 11:54:22 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed May 20 12:24:51 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ad32a5c

media-gfx/librecad: EAPI-7 bump

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-gfx/librecad/librecad-2.1.3-r5.ebuild | 17 +++--
 media-gfx/librecad/librecad-.ebuild | 12 +++-
 2 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/media-gfx/librecad/librecad-2.1.3-r5.ebuild 
b/media-gfx/librecad/librecad-2.1.3-r5.ebuild
index 5bb715ffa4e..b9ce27bf50e 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
 
@@ -12,9 +12,11 @@ 
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"
-
 IUSE="debug doc tools"
 
+BDEPEND="
+   dev-qt/linguist-tools:5
+"
 RDEPEND="
dev-cpp/muParser
dev-libs/boost:=
@@ -23,16 +25,19 @@ 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"
+)
 
 src_configure() {
eqmake5 -r

diff --git a/media-gfx/librecad/librecad-.ebuild 
b/media-gfx/librecad/librecad-.ebuild
index 4c0e87ee95e..f24977427ab 100644
--- a/media-gfx/librecad/librecad-.ebuild
+++ b/media-gfx/librecad/librecad-.ebuild
@@ -1,7 +1,7 @@
-# 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
 
@@ -12,9 +12,11 @@ EGIT_REPO_URI="https://github.com/LibreCAD/LibreCAD.git;
 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,9 +25,9 @@ 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
 "

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

2020-05-20 Thread Andreas Sturmlechner

commit: 778c32d5d85ee0f3240c3c77da0a1ba95fdb74f2
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed May 20 12:22:22 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed May 20 12:24:52 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=778c32d5

media-gfx/librecad: Fix build with Qt 5.15

Bug: https://bugs.gentoo.org/699716
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../librecad/files/librecad-2.1.3-qt-5.15.patch| 37 ++
 media-gfx/librecad/librecad-2.1.3-r5.ebuild|  1 +
 2 files changed, 38 insertions(+)

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 000..a1cfe62408f
--- /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 
+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 
+ #include 
+ #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 
++#include 
+ 
+ #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 b9ce27bf50e..1c3ced1015e 100644
--- a/media-gfx/librecad/librecad-2.1.3-r5.ebuild
+++ b/media-gfx/librecad/librecad-2.1.3-r5.ebuild
@@ -37,6 +37,7 @@ 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
 )
 
 src_configure() {

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

2019-08-15 Thread Slawek Lis

commit: 431e3685b3b65d0660a958fbee48dd2b42196b75
Author: Slawomir Lis  gentoo  org>
AuthorDate: Thu Aug 15 19:38:16 2019 +
Commit: Slawek Lis  gentoo  org>
CommitDate: Thu Aug 15 19:38:16 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=431e3685

media-gfx/librecad: Patch for compilation errors with gcc-9

Merged commit d0a0ef284b7fcc5c0d65b92c30855f62b637653f from librecad repo

Closes: https://bugs.gentoo.org/685906
Package-Manager: Portage-2.3.71, Repoman-2.3.16
Signed-off-by: Slawek Lis  gentoo.org>

 .../librecad/files/librecad-2.1.3-gcc-9.patch  | 209 +
 media-gfx/librecad/librecad-2.1.3-r5.ebuild|  51 +
 2 files changed, 260 insertions(+)

diff --git a/media-gfx/librecad/files/librecad-2.1.3-gcc-9.patch 
b/media-gfx/librecad/files/librecad-2.1.3-gcc-9.patch
new file mode 100644
index 000..f8214f29fab
--- /dev/null
+++ b/media-gfx/librecad/files/librecad-2.1.3-gcc-9.patch
@@ -0,0 +1,209 @@
+diff --git a/librecad/src/actions/rs_actiondrawcircletan1_2p.cpp 
b/librecad/src/actions/rs_actiondrawcircletan1_2p.cpp
+index c14da00e4..f305408aa 100644
+--- a/librecad/src/actions/rs_actiondrawcircletan1_2p.cpp
 b/librecad/src/actions/rs_actiondrawcircletan1_2p.cpp
+@@ -36,11 +36,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
MA  02110-1301, USA.
+ #include "rs_preview.h"
+ #include "rs_debug.h"
+ 
+-namespace{
+-//list of entity types supported by current action
+-auto enTypeList={RS2::EntityLine, RS2::EntityArc, RS2::EntityCircle};
+-}
+-
+ struct RS_ActionDrawCircleTan1_2P::Points {
+   std::vector points;
+   RS_CircleData cData;
+diff --git a/librecad/src/actions/rs_actiondrawcircletan1_2p.h 
b/librecad/src/actions/rs_actiondrawcircletan1_2p.h
+index a6f40a6ea..b5976c9f6 100644
+--- a/librecad/src/actions/rs_actiondrawcircletan1_2p.h
 b/librecad/src/actions/rs_actiondrawcircletan1_2p.h
+@@ -79,6 +79,9 @@ class RS_ActionDrawCircleTan1_2P : public 
RS_PreviewActionInterface {
+ private:
+   struct Points;
+   std::unique_ptr pPoints;
++
++//list of entity types supported by current action
++const std::initializer_list enTypeList {RS2::EntityLine, 
RS2::EntityArc, RS2::EntityCircle};
+ };
+ 
+ #endif
+diff --git a/librecad/src/actions/rs_actiondrawcircletan2.cpp 
b/librecad/src/actions/rs_actiondrawcircletan2.cpp
+index d0558f05b..820e42266 100644
+--- a/librecad/src/actions/rs_actiondrawcircletan2.cpp
 b/librecad/src/actions/rs_actiondrawcircletan2.cpp
+@@ -33,10 +33,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
MA  02110-1301, USA.
+ #include "rs_preview.h"
+ #include "rs_debug.h"
+ 
+-namespace {
+-auto enTypeList={RS2::EntityLine, RS2::EntityArc, RS2::EntityCircle};
+-}
+-
+ struct RS_ActionDrawCircleTan2::Points {
+   RS_CircleData cData;
+   RS_Vector coord;
+diff --git a/librecad/src/actions/rs_actiondrawcircletan2.h 
b/librecad/src/actions/rs_actiondrawcircletan2.h
+index bed568970..5b2040e90 100644
+--- a/librecad/src/actions/rs_actiondrawcircletan2.h
 b/librecad/src/actions/rs_actiondrawcircletan2.h
+@@ -77,6 +77,9 @@ class RS_ActionDrawCircleTan2 : public 
RS_PreviewActionInterface {
+ private:
+   struct Points;
+   std::unique_ptr pPoints;
++
++//list of entity types supported by current action
++const std::initializer_list enTypeList {RS2::EntityLine, 
RS2::EntityArc, RS2::EntityCircle};
+ };
+ 
+ #endif
+diff --git a/librecad/src/actions/rs_actiondrawcircletan2_1p.cpp 
b/librecad/src/actions/rs_actiondrawcircletan2_1p.cpp
+index 324c16686..51cd29a19 100644
+--- a/librecad/src/actions/rs_actiondrawcircletan2_1p.cpp
 b/librecad/src/actions/rs_actiondrawcircletan2_1p.cpp
+@@ -35,10 +35,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
MA  02110-1301, USA.
+ #include "rs_preview.h"
+ #include "rs_debug.h"
+ 
+-namespace {
+-auto enTypeList={RS2::EntityLine, RS2::EntityArc, RS2::EntityCircle};
+-}
+-
+ struct RS_ActionDrawCircleTan2_1P::Points {
+   RS_Vector point;
+   RS_CircleData cData;
+diff --git a/librecad/src/actions/rs_actiondrawcircletan2_1p.h 
b/librecad/src/actions/rs_actiondrawcircletan2_1p.h
+index 40c239037..e44a56c36 100644
+--- a/librecad/src/actions/rs_actiondrawcircletan2_1p.h
 b/librecad/src/actions/rs_actiondrawcircletan2_1p.h
+@@ -73,6 +73,9 @@ class RS_ActionDrawCircleTan2_1P : public 
RS_PreviewActionInterface {
+ private:
+   struct Points;
+   std::unique_ptr pPoints;
++
++//list of entity types supported by current action
++const std::initializer_list enTypeList {RS2::EntityLine, 
RS2::EntityArc, RS2::EntityCircle};
+ };
+ 
+ #endif
+diff --git a/librecad/src/actions/rs_actiondrawcircletan3.cpp 
b/librecad/src/actions/rs_actiondrawcircletan3.cpp
+index 026ed30e5..eaca13d63 100644
+--- a/librecad/src/actions/rs_actiondrawcircletan3.cpp
 b/librecad/src/actions/rs_actiondrawcircletan3.cpp
+@@ -35,10 +35,6 @@ Foundation, Inc., 51 Franklin

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

2019-08-15 Thread Slawek Lis

commit: 3a46e048cded5c8f32e6db2575fd99dded163bcf
Author: Slawomir Lis  gentoo  org>
AuthorDate: Thu Aug 15 19:41:44 2019 +
Commit: Slawek Lis  gentoo  org>
CommitDate: Thu Aug 15 19:43:17 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a46e048

media-gfx/librecad: Removed unused flag 3d

Use flag "3d" seems to not being used. Removed.

Closes: https://bugs.gentoo.org/667050

Package-Manager: Portage-2.3.71, Repoman-2.3.16
Signed-off-by: Slawek Lis  gentoo.org>

 media-gfx/librecad/librecad-2.1.3-r5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/librecad/librecad-2.1.3-r5.ebuild 
b/media-gfx/librecad/librecad-2.1.3-r5.ebuild
index 2c3fc115cc9..5bb715ffa4e 100644
--- a/media-gfx/librecad/librecad-2.1.3-r5.ebuild
+++ b/media-gfx/librecad/librecad-2.1.3-r5.ebuild
@@ -13,7 +13,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 
-IUSE="3d debug doc tools"
+IUSE="debug doc tools"
 
 RDEPEND="
dev-cpp/muParser

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

2019-02-02 Thread Sergei Trofimovich

commit: acfb6de0edf1e89d6258b73c7836afcfa9d36902
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sat Feb  2 21:06:40 2019 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sat Feb  2 21:06:40 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=acfb6de0

media-gfx/librecad: keyworded 2.1.3-r4 for ppc64, bug #676870

Package-Manager: Portage-2.3.59, Repoman-2.3.12
RepoMan-Options: --include-arches="ppc64"
Signed-off-by: Sergei Trofimovich  gentoo.org>

 media-gfx/librecad/librecad-2.1.3-r4.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-gfx/librecad/librecad-2.1.3-r4.ebuild 
b/media-gfx/librecad/librecad-2.1.3-r4.ebuild
index 874bb483159..f5656b76120 100644
--- a/media-gfx/librecad/librecad-2.1.3-r4.ebuild
+++ b/media-gfx/librecad/librecad-2.1.3-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ 
SRC_URI="https://github.com/LibreCAD/LibreCAD/archive/${PV/_/}.tar.gz -> ${P}.ta
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc64 x86 ~amd64-linux ~x86-linux"
 
 IUSE="3d debug doc tools"

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

2018-12-16 Thread Andreas Sturmlechner

commit: d04606727ad800134313cf65927aa7101f936efd
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Dec 16 23:10:47 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Dec 16 23:53:21 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d0460672

media-gfx/librecad: Drop 2.1.3-r2

Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-gfx/librecad/Manifest |  1 -
 media-gfx/librecad/librecad-2.1.3-r2.ebuild | 56 -
 2 files changed, 57 deletions(-)

diff --git a/media-gfx/librecad/Manifest b/media-gfx/librecad/Manifest
index af31055f733..fcff5ba5ec8 100644
--- a/media-gfx/librecad/Manifest
+++ b/media-gfx/librecad/Manifest
@@ -1,2 +1 @@
 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/librecad-2.1.3-r2.ebuild 
b/media-gfx/librecad/librecad-2.1.3-r2.ebuild
deleted file mode 100644
index aedbfb3814e..000
--- a/media-gfx/librecad/librecad-2.1.3-r2.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils qmake-utils
-
-DESCRIPTION="Generic 2D CAD program"
-HOMEPAGE="https://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"
-
-DEPEND="
-   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"
-
-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() {
-   eqmake5 -r
-}
-
-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
-}

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

2018-09-09 Thread Mikle Kolyada

commit: 47676f41dfc9a7cd32c7b61b7859c015ed36bf90
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Sun Sep  9 08:27:02 2018 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Sun Sep  9 08:27:02 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=47676f41

media-gfx/librecad: amd64 stable wrt bug #664560

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 media-gfx/librecad/librecad-2.1.3-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/librecad/librecad-2.1.3-r4.ebuild 
b/media-gfx/librecad/librecad-2.1.3-r4.ebuild
index 5e3ef74458b..874bb483159 100644
--- a/media-gfx/librecad/librecad-2.1.3-r4.ebuild
+++ b/media-gfx/librecad/librecad-2.1.3-r4.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://github.com/LibreCAD/LibreCAD/archive/${PV/_/}.tar.gz -> ${P}.ta
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 
 IUSE="3d debug doc tools"

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

2018-09-02 Thread Thomas Deutschmann

commit: d25b06fb7699e0f2c1756a28596837520c6e651a
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Sun Sep  2 23:19:00 2018 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Sun Sep  2 23:19:00 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d25b06fb

media-gfx/librecad: x86 stable (bug #664560)

Package-Manager: Portage-2.3.48, Repoman-2.3.10

 media-gfx/librecad/librecad-2.1.3-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/librecad/librecad-2.1.3-r4.ebuild 
b/media-gfx/librecad/librecad-2.1.3-r4.ebuild
index f7542aac6ff..5e3ef74458b 100644
--- a/media-gfx/librecad/librecad-2.1.3-r4.ebuild
+++ b/media-gfx/librecad/librecad-2.1.3-r4.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://github.com/LibreCAD/LibreCAD/archive/${PV/_/}.tar.gz -> ${P}.ta
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 x86 ~amd64-linux ~x86-linux"
 
 IUSE="3d debug doc tools"

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

2018-06-30 Thread Andreas Sturmlechner

commit: 6c6192cedb2b10882654040e34fb7e7fca82b8c9
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Jun 30 23:37:29 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Jul  1 00:03:40 2018 +
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  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-.ebuild => librecad-2.1.3-r4.ebuild} | 28 +++
 media-gfx/librecad/librecad-.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 000..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 
+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 
+---
+ 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 
+ #include 
+ #include 
+
+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 
++#include 
+ #include 
+ #include 
+ #include 

diff --git a/media-gfx/librecad/librecad-.ebuild 
b/media-gfx/librecad/librecad-2.1.3-r4.ebuild
similarity index 67%
copy from media-gfx/librecad/librecad-.ebuild
copy to media-gfx/librecad/librecad-2.1.3-r4.ebuild
index 2ab7e7f06f7..f7542aac6ff 100644
--- a/media-gfx/librecad/librecad-.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
-

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

2018-06-30 Thread Andreas Sturmlechner

commit: c3c966fc1c2175b8a6cddce6a7ecabad340e0a9c
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Jun 30 23:40:07 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Jul  1 00:03:40 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c3c966fc

media-gfx/librecad: Drop 2.1.3-r3

Package-Manager: Portage-2.3.41, Repoman-2.3.9

 media-gfx/librecad/librecad-2.1.3-r3.ebuild | 56 -
 1 file changed, 56 deletions(-)

diff --git a/media-gfx/librecad/librecad-2.1.3-r3.ebuild 
b/media-gfx/librecad/librecad-2.1.3-r3.ebuild
deleted file mode 100644
index 52d397d7a4b..000
--- a/media-gfx/librecad/librecad-2.1.3-r3.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils qmake-utils
-
-DESCRIPTION="Generic 2D CAD program"
-HOMEPAGE="https://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"
-
-DEPEND="
-   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"
-
-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() {
-   eqmake5 -r
-}
-
-src_install() {
-   dobin unix/librecad
-   use tools && dobin unix/ttf2lff
-   insinto /usr/share/${PN}
-   doins -r unix/resources/*
-   use doc && docinto 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
-}

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

2018-06-03 Thread Aaron Bauman

commit: 6e5918ccb6194822a1c87026c99d03dcd428af38
Author: Michael Mair-Keimberger  gmail  com>
AuthorDate: Sun Jun  3 09:25:52 2018 +
Commit: Aaron Bauman  gentoo  org>
CommitDate: Sun Jun  3 13:48:19 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e5918cc

media-gfx/librecad: use HTTPs

 media-gfx/librecad/librecad-2.1.3-r2.ebuild | 2 +-
 media-gfx/librecad/librecad-2.1.3-r3.ebuild | 2 +-
 media-gfx/librecad/librecad-.ebuild | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/media-gfx/librecad/librecad-2.1.3-r2.ebuild 
b/media-gfx/librecad/librecad-2.1.3-r2.ebuild
index f7735d744d3..aedbfb3814e 100644
--- a/media-gfx/librecad/librecad-2.1.3-r2.ebuild
+++ b/media-gfx/librecad/librecad-2.1.3-r2.ebuild
@@ -6,7 +6,7 @@ EAPI=5
 inherit eutils qmake-utils
 
 DESCRIPTION="Generic 2D CAD program"
-HOMEPAGE="http://www.librecad.org/;
+HOMEPAGE="https://www.librecad.org/;
 SRC_URI="https://github.com/LibreCAD/LibreCAD/archive/${PV/_/}.zip -> ${P}.zip"
 
 LICENSE="GPL-2"

diff --git a/media-gfx/librecad/librecad-2.1.3-r3.ebuild 
b/media-gfx/librecad/librecad-2.1.3-r3.ebuild
index 20902c58015..52d397d7a4b 100644
--- a/media-gfx/librecad/librecad-2.1.3-r3.ebuild
+++ b/media-gfx/librecad/librecad-2.1.3-r3.ebuild
@@ -6,7 +6,7 @@ EAPI=5
 inherit eutils qmake-utils
 
 DESCRIPTION="Generic 2D CAD program"
-HOMEPAGE="http://www.librecad.org/;
+HOMEPAGE="https://www.librecad.org/;
 SRC_URI="https://github.com/LibreCAD/LibreCAD/archive/${PV/_/}.zip -> ${P}.zip"
 
 LICENSE="GPL-2"

diff --git a/media-gfx/librecad/librecad-.ebuild 
b/media-gfx/librecad/librecad-.ebuild
index efb61a9472a..2ab7e7f06f7 100644
--- a/media-gfx/librecad/librecad-.ebuild
+++ b/media-gfx/librecad/librecad-.ebuild
@@ -6,7 +6,7 @@ EAPI=5
 inherit eutils git-r3 qmake-utils
 
 DESCRIPTION="Generic 2D CAD program"
-HOMEPAGE="http://www.librecad.org/;
+HOMEPAGE="https://www.librecad.org/;
 SRC_URI=""
 EGIT_REPO_URI="https://github.com/LibreCAD/LibreCAD.git;

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

2018-01-22 Thread Jeroen Roovers

commit: a2e67413ffef6eafd1e28ec3ecfaedd12ceb6dc5
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Mon Jan 22 08:39:55 2018 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Mon Jan 22 08:40:08 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a2e67413

media-gfx/librecad: insinto -> docinto (bug #637950).

Package-Manager: Portage-2.3.20, Repoman-2.3.6

 ...{librecad-.ebuild => librecad-2.1.3-r3.ebuild} | 19 ++-
 media-gfx/librecad/librecad-.ebuild   |  2 +-
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/media-gfx/librecad/librecad-.ebuild 
b/media-gfx/librecad/librecad-2.1.3-r3.ebuild
similarity index 69%
copy from media-gfx/librecad/librecad-.ebuild
copy to media-gfx/librecad/librecad-2.1.3-r3.ebuild
index de157dedc9e..20902c58015 100644
--- a/media-gfx/librecad/librecad-.ebuild
+++ b/media-gfx/librecad/librecad-2.1.3-r3.ebuild
@@ -3,16 +3,15 @@
 
 EAPI=5
 
-inherit eutils git-r3 qmake-utils
+inherit eutils qmake-utils
 
 DESCRIPTION="Generic 2D CAD program"
 HOMEPAGE="http://www.librecad.org/;
-SRC_URI=""
-EGIT_REPO_URI="https://github.com/LibreCAD/LibreCAD.git;
+SRC_URI="https://github.com/LibreCAD/LibreCAD/archive/${PV/_/}.zip -> ${P}.zip"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 
 IUSE="3d debug doc tools"
 
@@ -29,11 +28,15 @@ DEPEND="
media-libs/freetype:2"
 
 RDEPEND="${DEPEND}"
-S="${WORKDIR}/librecad-${PV}"
+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
-   use 3d || sed -i -e '/RS_VECTOR2D/ s/^#//' librecad/src/src.pro || die
+   if ! use 3d; then
+   sed -i -e '/RS_VECTOR2D/ s/^#//' librecad/src/src.pro || die
+   fi
 }
 
 src_configure() {
@@ -43,11 +46,9 @@ 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 && insinto html && dodoc -r librecad/support/doc/*
+   use doc && docinto html && dodoc -r librecad/support/doc/*
insinto /usr/share/appdata
doins unix/appdata/librecad.appdata.xml
doicon librecad/res/main/${PN}.png

diff --git a/media-gfx/librecad/librecad-.ebuild 
b/media-gfx/librecad/librecad-.ebuild
index de157dedc9e..efb61a9472a 100644
--- a/media-gfx/librecad/librecad-.ebuild
+++ b/media-gfx/librecad/librecad-.ebuild
@@ -47,7 +47,7 @@ src_install() {
doins -r unix/appdata
insinto /usr/share/${PN}
doins -r unix/resources/*
-   use doc && insinto html && dodoc -r librecad/support/doc/*
+   use doc && docinto html && dodoc -r librecad/support/doc/*
insinto /usr/share/appdata
doins unix/appdata/librecad.appdata.xml
doicon librecad/res/main/${PN}.png

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

2018-01-15 Thread Andreas Sturmlechner

commit: 6bf635ea3c75979708107db54345938de099e5b8
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon Jan 15 21:56:50 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon Jan 15 22:01:19 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6bf635ea

media-gfx/librecad: Drop bogus qt4 and qt5 USE flags

Bug: https://bugs.gentoo.org/631808
Package-Manager: Portage-2.3.19, Repoman-2.3.6

 media-gfx/librecad/librecad-2.1.3-r2.ebuild | 21 +
 media-gfx/librecad/librecad-.ebuild | 21 +
 2 files changed, 18 insertions(+), 24 deletions(-)

diff --git a/media-gfx/librecad/librecad-2.1.3-r2.ebuild 
b/media-gfx/librecad/librecad-2.1.3-r2.ebuild
index f6bcfbe65bc..f7735d744d3 100644
--- a/media-gfx/librecad/librecad-2.1.3-r2.ebuild
+++ b/media-gfx/librecad/librecad-2.1.3-r2.ebuild
@@ -13,21 +13,18 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 
-IUSE="3d debug doc tools qt4 +qt5"
-REQUIRED_USE="qt5"
+IUSE="3d debug doc tools"
 
 DEPEND="
-   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
+   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"
 
 RDEPEND="${DEPEND}"

diff --git a/media-gfx/librecad/librecad-.ebuild 
b/media-gfx/librecad/librecad-.ebuild
index 6122e6f4f0f..de157dedc9e 100644
--- a/media-gfx/librecad/librecad-.ebuild
+++ b/media-gfx/librecad/librecad-.ebuild
@@ -14,21 +14,18 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
 
-IUSE="3d debug doc tools qt4 +qt5"
-REQUIRED_USE="qt5"
+IUSE="3d debug doc tools"
 
 DEPEND="
-   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
+   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"
 
 RDEPEND="${DEPEND}"

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

2018-01-15 Thread Andreas Sturmlechner

commit: 26baf411d8389b060345bd6be4b91003bcd77f8c
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon Jan 15 21:59:53 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon Jan 15 22:01:19 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=26baf411

media-gfx/librecad: Drop 2.1.3-r1

Closes: https://bugs.gentoo.org/631808
Package-Manager: Portage-2.3.19, Repoman-2.3.6

 media-gfx/librecad/librecad-2.1.3-r1.ebuild | 69 -
 1 file changed, 69 deletions(-)

diff --git a/media-gfx/librecad/librecad-2.1.3-r1.ebuild 
b/media-gfx/librecad/librecad-2.1.3-r1.ebuild
deleted file mode 100644
index 0c5f0aeb256..000
--- a/media-gfx/librecad/librecad-2.1.3-r1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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 && docinto 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
-}

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

2018-01-15 Thread Andreas Sturmlechner

commit: ff6616c7cc53ae69c9b56ccf8b97b79d9c4baf8a
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon Jan 15 21:54:35 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon Jan 15 22:01:19 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff6616c7

media-gfx/librecad: Sync with 2.1.3-r2 ebuild

Bug: https://bugs.gentoo.org/631808
Package-Manager: Portage-2.3.19, Repoman-2.3.6

 media-gfx/librecad/librecad-.ebuild | 25 +++--
 1 file changed, 7 insertions(+), 18 deletions(-)

diff --git a/media-gfx/librecad/librecad-.ebuild 
b/media-gfx/librecad/librecad-.ebuild
index 4a1f2d51dc4..6122e6f4f0f 100644
--- a/media-gfx/librecad/librecad-.ebuild
+++ b/media-gfx/librecad/librecad-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,16 +13,11 @@ EGIT_REPO_URI="https://github.com/LibreCAD/LibreCAD.git;
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
+
 IUSE="3d debug doc tools qt4 +qt5"
-REQUIRED_USE="|| ( qt4 qt5 )"
+REQUIRED_USE="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
@@ -32,10 +27,9 @@ DEPEND="
dev-qt/qtwidgets:5
dev-qt/qtxml:5
)
-
-   dev-libs/boost
+   dev-libs/boost:=
dev-cpp/muParser
-   media-libs/freetype"
+   media-libs/freetype:2"
 
 RDEPEND="${DEPEND}"
 S="${WORKDIR}/librecad-${PV}"
@@ -46,12 +40,7 @@ src_prepare() {
 }
 
 src_configure() {
-   if use qt4
-   then
-   eqmake4 -r
-   else
-   eqmake5 -r
-   fi
+   eqmake5 -r
 }
 
 src_install() {
@@ -61,7 +50,7 @@ src_install() {
doins -r unix/appdata
insinto /usr/share/${PN}
doins -r unix/resources/*
-   use doc && dohtml -r librecad/support/doc/*
+   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

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

2018-01-15 Thread Tobias Klausmann

commit: 4b0438cc3905fc6af9e80f5508ccd64d2e9b1ad7
Author: Tobias Klausmann  gentoo  org>
AuthorDate: Mon Jan 15 19:02:37 2018 +
Commit: Tobias Klausmann  gentoo  org>
CommitDate: Mon Jan 15 19:02:37 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b0438cc

media-gfx/librecad-2.1.3-r2: amd64 stable

Gentoo-Bug: http://bugs.gentoo.org/643316

 media-gfx/librecad/librecad-2.1.3-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/librecad/librecad-2.1.3-r2.ebuild 
b/media-gfx/librecad/librecad-2.1.3-r2.ebuild
index dfd56d2aaf2..f6bcfbe65bc 100644
--- a/media-gfx/librecad/librecad-2.1.3-r2.ebuild
+++ b/media-gfx/librecad/librecad-2.1.3-r2.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://github.com/LibreCAD/LibreCAD/archive/${PV/_/}.zip -> ${P}.zip"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 
 IUSE="3d debug doc tools qt4 +qt5"
 REQUIRED_USE="qt5"

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

2017-11-26 Thread Slawek Lis

commit: 706e2bd000f5e2e01db5abfd0fb2866ac646da1d
Author: Slawomir Lis  gentoo  org>
AuthorDate: Mon Nov 27 06:30:29 2017 +
Commit: Slawek Lis  gentoo  org>
CommitDate: Mon Nov 27 06:49:46 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=706e2bd0

media-gfx/librecad: dropped old version, with unsupported qt4

Dropped versions: 2.0.3, 2.0.9, 2.1.1
Related bug: https://bugs.gentoo.org/631808

Package-Manager: Portage-2.3.16, Repoman-2.3.6

 media-gfx/librecad/Manifest   |  3 --
 media-gfx/librecad/files/iota-fix-2.1.1.patch | 10 
 media-gfx/librecad/librecad-2.0.3.ebuild  | 37 --
 media-gfx/librecad/librecad-2.0.9-r1.ebuild   | 67 --
 media-gfx/librecad/librecad-2.1.1.ebuild  | 69 ---
 5 files changed, 186 deletions(-)

diff --git a/media-gfx/librecad/Manifest b/media-gfx/librecad/Manifest
index cc4f479ec31..e972fbdaa29 100644
--- a/media-gfx/librecad/Manifest
+++ b/media-gfx/librecad/Manifest
@@ -1,4 +1 @@
-DIST librecad-2.0.3.zip 16590256 SHA256 
4221348541c46c6e9698c1fa3471a14a81376e022a009a164a7f0d0035da4643 SHA512 
c40952ae967d83197645bef65dac6e050ddeacf536401b2b99cd18d753462af086ac2a410c6746a92c094ad76fd9177a900c21531ed7b7fcdf1e4b0f7f070e00
 WHIRLPOOL 
c2e1d33b17b7a47ffd9b3795ad292b22cb1225aceacf052494745243630b0537e21701930b9433ea235c462d65581efc2b5ccda3b37712d4ab639ab9bcc6a97d
-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
 DIST librecad-2.1.3.zip 26086377 SHA256 
f05af030c71192109c1472c6fd24696fcb564b2eb83ff9789b88bec2e93c10a3 SHA512 
9a41c17b512ccbc1a0ebb0e6da8e7297663490479f042fadaffda819e371afc7fa49b789449df9fd4e36a2e2b6f95b9b5be19df47cf3c4252111db2a7ed7f009
 WHIRLPOOL 
a0209b3513fd5f10e608795e34267d5efc7338996ba6cc485cbd9084200cb87fb8b51ab3f224520fc8c693c5ac3db8d049dde68011e8005922ad9c761625971c

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

diff --git a/media-gfx/librecad/librecad-2.0.3.ebuild 
b/media-gfx/librecad/librecad-2.0.3.ebuild
deleted file mode 100644
index c1767e4ccf7..000
--- a/media-gfx/librecad/librecad-2.0.3.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils qt4-r2
-
-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"
-IUSE="debug doc tools"
-
-DEPEND="
-   dev-cpp/muParser
-   dev-qt/qtgui:4
-   dev-qt/qthelp:4
-   dev-qt/qtsvg:4
-   dev-libs/boost
-   media-libs/freetype
-   "
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/LibreCAD-${PV}"
-
-src_install() {
-   dobin unix/librecad
-   use tools && dobin unix/ttf2lff
-   insinto /usr/share/${PN}
-   doins -r unix/resources/*
-   use doc && dohtml -r librecad/support/doc/*
-   doicon librecad/res/main/${PN}.png
-   make_desktop_entry ${PN} LibreCAD ${PN} Graphics
-}

diff --git a/media-gfx/librecad/librecad-2.0.9-r1.ebuild 
b/media-gfx/librecad/librecad-2.0.9-r1.ebuild
deleted file mode 100644
index c1bc2045685..000
--- a/media-gfx/librecad/librecad-2.0.9-r1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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
-

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

2017-11-26 Thread Slawek Lis

commit: 1def1ab69db8cc2d7cf8fdcd9fc06018d1f4479e
Author: Slawomir Lis  gentoo  org>
AuthorDate: Mon Nov 27 06:48:37 2017 +
Commit: Slawek Lis  gentoo  org>
CommitDate: Mon Nov 27 06:49:49 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1def1ab6

media-gfx/librecad: updated to version without qt4

librecad-2.1.3-r1 is marked stable, so new revision without qt4 added.
Reported in https://bugs.gentoo.org/631808

Package-Manager: Portage-2.3.16, Repoman-2.3.6

 media-gfx/librecad/librecad-2.1.3-r2.ebuild | 59 +
 1 file changed, 59 insertions(+)

diff --git a/media-gfx/librecad/librecad-2.1.3-r2.ebuild 
b/media-gfx/librecad/librecad-2.1.3-r2.ebuild
new file mode 100644
index 000..517916041bd
--- /dev/null
+++ b/media-gfx/librecad/librecad-2.1.3-r2.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+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="qt5"
+
+DEPEND="
+   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() {
+   eqmake5 -r
+}
+
+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
+}

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

2017-11-18 Thread Jeroen Roovers

commit: fd7d2d6d079e6dcd4f5e942046eb638997d8e9dd
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Sat Nov 18 13:07:55 2017 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Sat Nov 18 13:07:55 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd7d2d6d

media-gfx/librecad: Fix installing HTML files (bug #637950 by globus).

Package-Manager: Portage-2.3.14, Repoman-2.3.6
RepoMan-Options: --force

 media-gfx/librecad/{librecad-2.1.3.ebuild => librecad-2.1.3-r1.ebuild} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/librecad/librecad-2.1.3.ebuild 
b/media-gfx/librecad/librecad-2.1.3-r1.ebuild
similarity index 95%
rename from media-gfx/librecad/librecad-2.1.3.ebuild
rename to media-gfx/librecad/librecad-2.1.3-r1.ebuild
index 545c5595cac..0c5f0aeb256 100644
--- a/media-gfx/librecad/librecad-2.1.3.ebuild
+++ b/media-gfx/librecad/librecad-2.1.3-r1.ebuild
@@ -61,7 +61,7 @@ src_install() {
use tools && dobin unix/ttf2lff
insinto /usr/share/${PN}
doins -r unix/resources/*
-   use doc && insinto html && dodoc -r librecad/support/doc/*
+   use doc && docinto html && dodoc -r librecad/support/doc/*
insinto /usr/share/appdata
doins unix/appdata/librecad.appdata.xml
doicon librecad/res/main/${PN}.png

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

2017-10-31 Thread Andreas Hüttel

commit: 99e31d7df188eec0b6d9c1233250e4752f9beea5
Author: Andreas K. Hüttel  gentoo  org>
AuthorDate: Tue Oct 31 18:04:53 2017 +
Commit: Andreas Hüttel  gentoo  org>
CommitDate: Tue Oct 31 18:06:56 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=99e31d7d

media-gfx/librecad: amd64 stable, bug 632436

Last arch, closing.

Closes: https://bugs.gentoo.org/632436
Package-Manager: Portage-2.3.13, Repoman-2.3.4

 media-gfx/librecad/librecad-2.1.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/librecad/librecad-2.1.3.ebuild 
b/media-gfx/librecad/librecad-2.1.3.ebuild
index b2e66a3c306..545c5595cac 100644
--- a/media-gfx/librecad/librecad-2.1.3.ebuild
+++ b/media-gfx/librecad/librecad-2.1.3.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://github.com/LibreCAD/LibreCAD/archive/${PV/_/}.zip -> ${P}.zip"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 
 IUSE="3d debug doc tools qt4 +qt5"
 REQUIRED_USE="|| ( qt4 qt5 )"

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

2017-10-26 Thread Thomas Deutschmann

commit: b40bfaca6e90532e87d586b1176d82f9b22c4d6f
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Thu Oct 26 18:40:11 2017 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Thu Oct 26 18:53:43 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b40bfaca

media-gfx/librecad: x86 stable (bug #632436)

Package-Manager: Portage-2.3.11, Repoman-2.3.3

 media-gfx/librecad/librecad-2.1.3.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-gfx/librecad/librecad-2.1.3.ebuild 
b/media-gfx/librecad/librecad-2.1.3.ebuild
index 5a20c3bc2c4..b2e66a3c306 100644
--- a/media-gfx/librecad/librecad-2.1.3.ebuild
+++ b/media-gfx/librecad/librecad-2.1.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,7 +11,7 @@ 
SRC_URI="https://github.com/LibreCAD/LibreCAD/archive/${PV/_/}.zip -> ${P}.zip"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 x86 ~amd64-linux ~x86-linux"
 
 IUSE="3d debug doc tools qt4 +qt5"
 REQUIRED_USE="|| ( qt4 qt5 )"

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

2016-12-28 Thread Patrice Clement

commit: 8d4c14696b3fe14bd8770226c6b47828ad624abe
Author: Michael Mair-Keimberger (asterix)  gmail 
 com>
AuthorDate: Tue Dec 27 19:59:45 2016 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Wed Dec 28 13:28:58 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d4c1469

media-gfx/librecad: remove unused patch.

Closes: https://github.com/gentoo/gentoo/pull/3254

 media-gfx/librecad/files/gcc_cpp0x.patch | 13 -
 1 file changed, 13 deletions(-)

diff --git a/media-gfx/librecad/files/gcc_cpp0x.patch 
b/media-gfx/librecad/files/gcc_cpp0x.patch
deleted file mode 100644
index 1d145a5..
--- a/media-gfx/librecad/files/gcc_cpp0x.patch
+++ /dev/null
@@ -1,13 +0,0 @@
 LibreCAD-2.0.2/common.pri  2014-01-09 18:31:10.0 +
-+++ LibreCAD-2.0.2/common.pri.gcc462014-01-24 09:27:48.886665241 +
-@@ -59,8 +59,8 @@
- 
- # c++11 is now obligatory for LibreCAD
- message(We will be using CPP11 features)
--QMAKE_CXXFLAGS_DEBUG += -std=c++11 -g
--QMAKE_CXXFLAGS += -std=c++11 -g
-+QMAKE_CXXFLAGS_DEBUG += -std=c++0x -g
-+QMAKE_CXXFLAGS += -std=c++0x -g
- 
- # svg support
- QT += svg

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

2016-11-21 Thread Slawek Lis

commit: 431247085c5ce58bcabc5e0969b986ca308f40ea
Author: Slawomir Lis  gentoo  org>
AuthorDate: Tue Nov 22 06:37:21 2016 +
Commit: Slawek Lis  gentoo  org>
CommitDate: Tue Nov 22 06:37:21 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=43124708

media-gfx/librecad: drop old versions

Package-Manager: portage-2.3.2

 media-gfx/librecad/Manifest  |  4 --
 media-gfx/librecad/librecad-2.0.5.ebuild | 38 --
 media-gfx/librecad/librecad-2.0.6.ebuild | 38 --
 media-gfx/librecad/librecad-2.0.7.ebuild | 38 --
 media-gfx/librecad/librecad-2.0.8.ebuild | 67 
 5 files changed, 185 deletions(-)

diff --git a/media-gfx/librecad/Manifest b/media-gfx/librecad/Manifest
index 604d39e..cc4f479 100644
--- a/media-gfx/librecad/Manifest
+++ b/media-gfx/librecad/Manifest
@@ -1,8 +1,4 @@
 DIST librecad-2.0.3.zip 16590256 SHA256 
4221348541c46c6e9698c1fa3471a14a81376e022a009a164a7f0d0035da4643 SHA512 
c40952ae967d83197645bef65dac6e050ddeacf536401b2b99cd18d753462af086ac2a410c6746a92c094ad76fd9177a900c21531ed7b7fcdf1e4b0f7f070e00
 WHIRLPOOL 
c2e1d33b17b7a47ffd9b3795ad292b22cb1225aceacf052494745243630b0537e21701930b9433ea235c462d65581efc2b5ccda3b37712d4ab639ab9bcc6a97d
-DIST librecad-2.0.5.zip 16743868 SHA256 
00fba891ccf90328f122c081e9a55f5cf6a908932b92b4414f4ee3b186b48f87 SHA512 
afacc5dd833d8a9daba0e9a93f9578f066ada6dff3de4676d8604bbfbce6fba5615c75f498b9ee242b3a7bfcb2746b97a3fbd6b97526990b4ad39757344e3cc5
 WHIRLPOOL 
5b79ebecec469083a5b13b3e71b76fd116baf935d09c04e979efd583ec58fd17a3bef9e707b3603bba3256527a845f9be4a10271daeaec3fee09ce7fe82fca36
-DIST librecad-2.0.6.zip 17401781 SHA256 
09a58f9a4b578eb7381f299414344f82c6e320156c20b3ff1e9e1ae5f2770a30 SHA512 
0f8452674659adc943d87aa3d70763682b3e5e7c82530afee98d50dfa4977e8f2e0efcd224087eed68a51727a234d58b8740b00ed0941b6af78dc2938ed15241
 WHIRLPOOL 
6bb40ae33f28b5ad6adfc91334741d3fe50c6a7f42b0e253554bfacd8f4e7152a495b9e62b8760f28de8c69c77aed73750e094db96d2757fad7cd58ed3200897
-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
 DIST librecad-2.1.3.zip 26086377 SHA256 
f05af030c71192109c1472c6fd24696fcb564b2eb83ff9789b88bec2e93c10a3 SHA512 
9a41c17b512ccbc1a0ebb0e6da8e7297663490479f042fadaffda819e371afc7fa49b789449df9fd4e36a2e2b6f95b9b5be19df47cf3c4252111db2a7ed7f009
 WHIRLPOOL 
a0209b3513fd5f10e608795e34267d5efc7338996ba6cc485cbd9084200cb87fb8b51ab3f224520fc8c693c5ac3db8d049dde68011e8005922ad9c761625971c

diff --git a/media-gfx/librecad/librecad-2.0.5.ebuild 
b/media-gfx/librecad/librecad-2.0.5.ebuild
deleted file mode 100644
index 55dcce5..
--- a/media-gfx/librecad/librecad-2.0.5.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils qt4-r2
-
-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"
-IUSE="debug doc tools"
-
-DEPEND="
-   dev-cpp/muParser
-   dev-qt/qtgui:4
-   dev-qt/qthelp:4
-   dev-qt/qtsvg:4
-   dev-libs/boost
-   media-libs/freetype
-   "
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/LibreCAD-${PV}"
-
-src_install() {
-   dobin unix/librecad
-   use tools && dobin unix/ttf2lff
-   insinto /usr/share/${PN}
-   doins -r unix/resources/*
-   use doc &&

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

2016-11-21 Thread Slawek Lis

commit: b4042737fc6ec488c63446a7a15b9a4e4f1151eb
Author: Slawomir Lis  gentoo  org>
AuthorDate: Tue Nov 22 06:34:16 2016 +
Commit: Slawek Lis  gentoo  org>
CommitDate: Tue Nov 22 06:34:16 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b4042737

media-gfx/librecad: version bump to 2.1.3

This also should fix a bug 597704

Package-Manager: portage-2.3.2

 media-gfx/librecad/Manifest  |  1 +
 media-gfx/librecad/librecad-2.1.3.ebuild | 70 
 2 files changed, 71 insertions(+)

diff --git a/media-gfx/librecad/Manifest b/media-gfx/librecad/Manifest
index 654dd1a..604d39e 100644
--- a/media-gfx/librecad/Manifest
+++ b/media-gfx/librecad/Manifest
@@ -5,3 +5,4 @@ DIST librecad-2.0.7.zip 17457197 SHA256 
36d2fa1c60324bb743f0ddde0b9da1dc6b57a370
 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
+DIST librecad-2.1.3.zip 26086377 SHA256 
f05af030c71192109c1472c6fd24696fcb564b2eb83ff9789b88bec2e93c10a3 SHA512 
9a41c17b512ccbc1a0ebb0e6da8e7297663490479f042fadaffda819e371afc7fa49b789449df9fd4e36a2e2b6f95b9b5be19df47cf3c4252111db2a7ed7f009
 WHIRLPOOL 
a0209b3513fd5f10e608795e34267d5efc7338996ba6cc485cbd9084200cb87fb8b51ab3f224520fc8c693c5ac3db8d049dde68011e8005922ad9c761625971c

diff --git a/media-gfx/librecad/librecad-2.1.3.ebuild 
b/media-gfx/librecad/librecad-2.1.3.ebuild
new file mode 100644
index ..323b447
--- /dev/null
+++ b/media-gfx/librecad/librecad-2.1.3.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
+}

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

2016-09-05 Thread Slawek Lis

commit: 54efa1134353a0745cb87fc2229b39a606d31fea
Author: Slawomir Lis  gentoo  org>
AuthorDate: Mon Sep  5 12:24:40 2016 +
Commit: Slawek Lis  gentoo  org>
CommitDate: Mon Sep  5 12:25:29 2016 +
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  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 ..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.0 
+0200
 librecad/src/lib/engine/rs_spline.cpp  2016-09-05 13:23:25.459841304 
+0200
+@@ -26,6 +26,7 @@
+ 
+ #include
+ #include
++#include
+ #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 ..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
+}

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

2016-04-07 Thread Sergei Trofimovich

commit: 6edca6b364c1751cd0834bfaf61e9669a715b1c8
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Thu Apr  7 20:24:37 2016 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Thu Apr  7 20:25:10 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6edca6b3

media-gfx/librecad: fix typo: 'instinto' -> 'insinto'

Package-Manager: portage-2.2.28

 media-gfx/librecad/{librecad-2.0.9.ebuild => librecad-2.0.9-r1.ebuild} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/librecad/librecad-2.0.9.ebuild 
b/media-gfx/librecad/librecad-2.0.9-r1.ebuild
similarity index 95%
rename from media-gfx/librecad/librecad-2.0.9.ebuild
rename to media-gfx/librecad/librecad-2.0.9-r1.ebuild
index 587b962..d25fc87 100644
--- a/media-gfx/librecad/librecad-2.0.9.ebuild
+++ b/media-gfx/librecad/librecad-2.0.9-r1.ebuild
@@ -60,7 +60,7 @@ src_install() {
use tools && dobin unix/ttf2lff
insinto /usr/share/${PN}
doins -r unix/resources/*
-   use doc && instinto html && dodoc -r librecad/support/doc/*
+   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

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

2016-01-19 Thread Patrice Clement

commit: 4423efc4c2250a9957ecff78ee67a15868d1162e
Author: Dongxu Li  gmail  com>
AuthorDate: Wed Jan 13 18:42:30 2016 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Wed Jan 13 18:42:30 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4423efc4

media-gfx/librecad: version bump 2.0.9

 media-gfx/librecad/Manifest  |  1 +
 media-gfx/librecad/librecad-2.0.9.ebuild | 67 
 2 files changed, 68 insertions(+)

diff --git a/media-gfx/librecad/Manifest b/media-gfx/librecad/Manifest
index e00e88f..514b5dd 100644
--- a/media-gfx/librecad/Manifest
+++ b/media-gfx/librecad/Manifest
@@ -3,3 +3,4 @@ DIST librecad-2.0.5.zip 16743868 SHA256 
00fba891ccf90328f122c081e9a55f5cf6a90893
 DIST librecad-2.0.6.zip 17401781 SHA256 
09a58f9a4b578eb7381f299414344f82c6e320156c20b3ff1e9e1ae5f2770a30 SHA512 
0f8452674659adc943d87aa3d70763682b3e5e7c82530afee98d50dfa4977e8f2e0efcd224087eed68a51727a234d58b8740b00ed0941b6af78dc2938ed15241
 WHIRLPOOL 
6bb40ae33f28b5ad6adfc91334741d3fe50c6a7f42b0e253554bfacd8f4e7152a495b9e62b8760f28de8c69c77aed73750e094db96d2757fad7cd58ed3200897
 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

diff --git a/media-gfx/librecad/librecad-2.0.9.ebuild 
b/media-gfx/librecad/librecad-2.0.9.ebuild
new file mode 100644
index 000..01275c7
--- /dev/null
+++ b/media-gfx/librecad/librecad-2.0.9.ebuild
@@ -0,0 +1,67 @@
+# 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"
+
+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
+}
+
+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 && dohtml -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
+}

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

2016-01-19 Thread Patrice Clement

commit: 56601a92791068ea2ae37ff172561e16f4a429b1
Author: Dongxu Li  gmail  com>
AuthorDate: Sun Jan 17 06:40:53 2016 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Sun Jan 17 06:40:53 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=56601a92

media-gfx/librecad: depends slots

 media-gfx/librecad/librecad-2.0.9.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-gfx/librecad/librecad-2.0.9.ebuild 
b/media-gfx/librecad/librecad-2.0.9.ebuild
index fb31be3..587b962 100644
--- a/media-gfx/librecad/librecad-2.0.9.ebuild
+++ b/media-gfx/librecad/librecad-2.0.9.ebuild
@@ -33,9 +33,9 @@ DEPEND="
dev-qt/qtwidgets:5
dev-qt/qtxml:5
)
-   dev-libs/boost
+   dev-libs/boost:=
dev-cpp/muParser
-   media-libs/freetype"
+   media-libs/freetype:2"
 
 RDEPEND="${DEPEND}"
 S="${WORKDIR}/LibreCAD-${PV}"

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

2016-01-19 Thread Patrice Clement

commit: 9b1cdc9741e6a0950bd9690aed3a40db19e72f86
Author: Dongxu Li  gmail  com>
AuthorDate: Thu Jan 14 15:04:36 2016 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Thu Jan 14 15:04:36 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9b1cdc97

media-gfx/librecad: cleanup

 media-gfx/librecad/librecad-2.0.9.ebuild | 11 ++-
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/media-gfx/librecad/librecad-2.0.9.ebuild 
b/media-gfx/librecad/librecad-2.0.9.ebuild
index 01275c7..fb31be3 100644
--- a/media-gfx/librecad/librecad-2.0.9.ebuild
+++ b/media-gfx/librecad/librecad-2.0.9.ebuild
@@ -42,12 +42,13 @@ 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
+   if ! use 3d; then
+   sed -i -e '/RS_VECTOR2D/ s/^#//' librecad/src/src.pro || die
+   fi
 }
 
 src_configure() {
-   if use qt4
-   then
+   if use qt4; then
eqmake4 -r
else
eqmake5 -r
@@ -59,9 +60,9 @@ src_install() {
use tools && dobin unix/ttf2lff
insinto /usr/share/${PN}
doins -r unix/resources/*
-   use doc && dohtml -r librecad/support/doc/*
+   use doc && instinto html && dodoc -r librecad/support/doc/*
insinto /usr/share/appdata
doins unix/appdata/librecad.appdata.xml
-   doicon librecad/res/main/"${PN}".png
+   doicon librecad/res/main/${PN}.png
make_desktop_entry ${PN} LibreCAD ${PN} Graphics
 }

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

2015-09-13 Thread Anthony G. Basile

commit: 3997f2f30bee1019944f8e5f0fe37bcc2fc2e16b
Author: Anthony G. Basile  gentoo  org>
AuthorDate: Sun Sep 13 20:31:29 2015 +
Commit: Anthony G. Basile  gentoo  org>
CommitDate: Sun Sep 13 20:31:29 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3997f2f3

media-gfx/librecad: fix manifest

Package-Manager: portage-2.2.20.1

 media-gfx/librecad/Manifest | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/librecad/Manifest b/media-gfx/librecad/Manifest
index 56e5c32..e00e88f 100644
--- a/media-gfx/librecad/Manifest
+++ b/media-gfx/librecad/Manifest
@@ -2,4 +2,4 @@ DIST librecad-2.0.3.zip 16590256 SHA256 
4221348541c46c6e9698c1fa3471a14a81376e02
 DIST librecad-2.0.5.zip 16743868 SHA256 
00fba891ccf90328f122c081e9a55f5cf6a908932b92b4414f4ee3b186b48f87 SHA512 
afacc5dd833d8a9daba0e9a93f9578f066ada6dff3de4676d8604bbfbce6fba5615c75f498b9ee242b3a7bfcb2746b97a3fbd6b97526990b4ad39757344e3cc5
 WHIRLPOOL 
5b79ebecec469083a5b13b3e71b76fd116baf935d09c04e979efd583ec58fd17a3bef9e707b3603bba3256527a845f9be4a10271daeaec3fee09ce7fe82fca36
 DIST librecad-2.0.6.zip 17401781 SHA256 
09a58f9a4b578eb7381f299414344f82c6e320156c20b3ff1e9e1ae5f2770a30 SHA512 
0f8452674659adc943d87aa3d70763682b3e5e7c82530afee98d50dfa4977e8f2e0efcd224087eed68a51727a234d58b8740b00ed0941b6af78dc2938ed15241
 WHIRLPOOL 
6bb40ae33f28b5ad6adfc91334741d3fe50c6a7f42b0e253554bfacd8f4e7152a495b9e62b8760f28de8c69c77aed73750e094db96d2757fad7cd58ed3200897
 DIST librecad-2.0.7.zip 17457197 SHA256 
36d2fa1c60324bb743f0ddde0b9da1dc6b57a370422de714adef27a0cd32d9d2 SHA512 
afbe094dd565e2b058c5b1c28e88b76b883d1b9f20f60047e5a7771ec5d353e6a3e73abee8e4d7ac5f916ead7fb15719cf7bab034d670f7d7f54ca394d314803
 WHIRLPOOL 
5d196be5e54e4ceb7f2650015f35bf6ba77440b7a81d51f68a9a15408d399779f5c61289a5adaacbf1538735f7f0761152371291bab8bc8c8fb8109c3e1ddfc3
-DIST librecad-2.0.8.zip 178976 SHA256 
fb285c97f8d13cec6630fa36828c4064a5bf49d5fc8fb8a86efa2369825a5b56 SHA512 
42713ad616fdd1cec701c8f35015126795476de491e88bf2dda14f8a1038c112cf0db80fbfcc72285f796c5c530db763df995eed5a650836ca521f820031f703
 WHIRLPOOL 
aaa5669a2711ce2078f46ca5ab3c4edae5ae726c640829b761b269b41891f40d5fd003a21fe1e93463df5cf9405c34c5c3e8a302e16ac3e3068d3066f737662a
+DIST librecad-2.0.8.zip 23469997 SHA256 
3f3affbff85fd16746a0e551777c4f234d2b03384d04edf9483d36db1c7144a3 SHA512 
d0dd1fdcaafbb7b83a8d0791e132633e9a72648d7d8d7ffdfc02bb092348472a05917df7ea1f2096404afabc92d586b75f6cafa3bc54da535bcaf005c96ed8a7
 WHIRLPOOL 
14ae2c433345b5081c92426913744d57f2fa4a97621fb55143995365381d5fbed6c8ad6a1f3a6d215dc4791e3493259b3e09801bfb288a85de7db87f010aae49

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

2015-09-13 Thread Slawek Lis

commit: 3b1b257c61f7c7eaa1bbcee342dd70221fb35573
Author: Sławomir Lis  gentoo  org>
AuthorDate: Sun Sep 13 19:25:22 2015 +
Commit: Slawek Lis  gentoo  org>
CommitDate: Sun Sep 13 19:26:18 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b1b257c

restoring stable version

Package-Manager: portage-2.2.20.1
RepoMan-Options: --force

 media-gfx/librecad/Manifest  |  3 ++-
 media-gfx/librecad/librecad-2.0.3.ebuild | 38 
 2 files changed, 40 insertions(+), 1 deletion(-)

diff --git a/media-gfx/librecad/Manifest b/media-gfx/librecad/Manifest
index b31d576..56e5c32 100644
--- a/media-gfx/librecad/Manifest
+++ b/media-gfx/librecad/Manifest
@@ -1,4 +1,5 @@
+DIST librecad-2.0.3.zip 16590256 SHA256 
4221348541c46c6e9698c1fa3471a14a81376e022a009a164a7f0d0035da4643 SHA512 
c40952ae967d83197645bef65dac6e050ddeacf536401b2b99cd18d753462af086ac2a410c6746a92c094ad76fd9177a900c21531ed7b7fcdf1e4b0f7f070e00
 WHIRLPOOL 
c2e1d33b17b7a47ffd9b3795ad292b22cb1225aceacf052494745243630b0537e21701930b9433ea235c462d65581efc2b5ccda3b37712d4ab639ab9bcc6a97d
 DIST librecad-2.0.5.zip 16743868 SHA256 
00fba891ccf90328f122c081e9a55f5cf6a908932b92b4414f4ee3b186b48f87 SHA512 
afacc5dd833d8a9daba0e9a93f9578f066ada6dff3de4676d8604bbfbce6fba5615c75f498b9ee242b3a7bfcb2746b97a3fbd6b97526990b4ad39757344e3cc5
 WHIRLPOOL 
5b79ebecec469083a5b13b3e71b76fd116baf935d09c04e979efd583ec58fd17a3bef9e707b3603bba3256527a845f9be4a10271daeaec3fee09ce7fe82fca36
 DIST librecad-2.0.6.zip 17401781 SHA256 
09a58f9a4b578eb7381f299414344f82c6e320156c20b3ff1e9e1ae5f2770a30 SHA512 
0f8452674659adc943d87aa3d70763682b3e5e7c82530afee98d50dfa4977e8f2e0efcd224087eed68a51727a234d58b8740b00ed0941b6af78dc2938ed15241
 WHIRLPOOL 
6bb40ae33f28b5ad6adfc91334741d3fe50c6a7f42b0e253554bfacd8f4e7152a495b9e62b8760f28de8c69c77aed73750e094db96d2757fad7cd58ed3200897
 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.8.zip 178976 SHA256 
fb285c97f8d13cec6630fa36828c4064a5bf49d5fc8fb8a86efa2369825a5b56 SHA512 
42713ad616fdd1cec701c8f35015126795476de491e88bf2dda14f8a1038c112cf0db80fbfcc72285f796c5c530db763df995eed5a650836ca521f820031f703
 WHIRLPOOL 
aaa5669a2711ce2078f46ca5ab3c4edae5ae726c640829b761b269b41891f40d5fd003a21fe1e93463df5cf9405c34c5c3e8a302e16ac3e3068d3066f737662a

diff --git a/media-gfx/librecad/librecad-2.0.3.ebuild 
b/media-gfx/librecad/librecad-2.0.3.ebuild
new file mode 100644
index 000..85a61fb
--- /dev/null
+++ b/media-gfx/librecad/librecad-2.0.3.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils qt4-r2
+
+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"
+IUSE="debug doc tools"
+
+DEPEND="
+   dev-cpp/muParser
+   dev-qt/qtgui:4
+   dev-qt/qthelp:4
+   dev-qt/qtsvg:4
+   dev-libs/boost
+   media-libs/freetype
+   "
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/LibreCAD-${PV}"
+
+src_install() {
+   dobin unix/librecad
+   use tools && dobin unix/ttf2lff
+   insinto /usr/share/${PN}
+   doins -r unix/resources/*
+   use doc && dohtml -r librecad/support/doc/*
+   doicon librecad/res/main/${PN}.png
+   make_desktop_entry ${PN} LibreCAD ${PN} Graphics
+}

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

2015-09-08 Thread Slawek Lis

commit: c7c422d3d93efb17ef1d2253b2013ad3b201614c
Author: Sławomir Lis  gentoo  org>
AuthorDate: Tue Sep  8 06:30:53 2015 +
Commit: Slawek Lis  gentoo  org>
CommitDate: Tue Sep  8 06:30:53 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c7c422d3

version bump (thanks to dxli)

Pull request at: https://github.com/gentoo/gentoo/pull/46

Package-Manager: portage-2.2.20.1

 media-gfx/librecad/Manifest  |  1 +
 media-gfx/librecad/librecad-2.0.8.ebuild | 67 ++
 media-gfx/librecad/librecad-.ebuild  | 70 
 media-gfx/librecad/metadata.xml  |  3 +-
 4 files changed, 140 insertions(+), 1 deletion(-)

diff --git a/media-gfx/librecad/Manifest b/media-gfx/librecad/Manifest
index e1de478..b31d576 100644
--- a/media-gfx/librecad/Manifest
+++ b/media-gfx/librecad/Manifest
@@ -1,3 +1,4 @@
 DIST librecad-2.0.5.zip 16743868 SHA256 
00fba891ccf90328f122c081e9a55f5cf6a908932b92b4414f4ee3b186b48f87 SHA512 
afacc5dd833d8a9daba0e9a93f9578f066ada6dff3de4676d8604bbfbce6fba5615c75f498b9ee242b3a7bfcb2746b97a3fbd6b97526990b4ad39757344e3cc5
 WHIRLPOOL 
5b79ebecec469083a5b13b3e71b76fd116baf935d09c04e979efd583ec58fd17a3bef9e707b3603bba3256527a845f9be4a10271daeaec3fee09ce7fe82fca36
 DIST librecad-2.0.6.zip 17401781 SHA256 
09a58f9a4b578eb7381f299414344f82c6e320156c20b3ff1e9e1ae5f2770a30 SHA512 
0f8452674659adc943d87aa3d70763682b3e5e7c82530afee98d50dfa4977e8f2e0efcd224087eed68a51727a234d58b8740b00ed0941b6af78dc2938ed15241
 WHIRLPOOL 
6bb40ae33f28b5ad6adfc91334741d3fe50c6a7f42b0e253554bfacd8f4e7152a495b9e62b8760f28de8c69c77aed73750e094db96d2757fad7cd58ed3200897
 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

diff --git a/media-gfx/librecad/librecad-2.0.8.ebuild 
b/media-gfx/librecad/librecad-2.0.8.ebuild
new file mode 100644
index 000..f2f3812
--- /dev/null
+++ b/media-gfx/librecad/librecad-2.0.8.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2015 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"
+
+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
+}
+
+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 && dohtml -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
+}

diff --git a/media-gfx/librecad/librecad-.ebuild 
b/media-gfx/librecad/librecad-.ebuild
new file mode 100644
index 000..0c9ba9b
--- /dev/null
+++ b/media-gfx/librecad/librecad-.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils git-r3 qmake-utils
+
+DESCRIPTION="Generic 2D CAD program"
+HOMEPAGE="http://www.librecad.org/;
+SRC_URI=""
+EGIT_REPO_URI="https://github.com/LibreCAD/LibreCAD.git;
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS=""
+IUSE="3d debug doc tools qt4 +qt5"

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

2015-09-01 Thread Slawek Lis

commit: e694a96fa462af9c8e1bb76bd2ea66e7dc55d7cb
Author: Sławomir Lis  gentoo  org>
AuthorDate: Wed Sep  2 05:57:44 2015 +
Commit: Slawek Lis  gentoo  org>
CommitDate: Wed Sep  2 05:57:44 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e694a96f

version bump (#555806)

Package-Manager: portage-2.2.20.1

 media-gfx/librecad/Manifest|  3 +-
 media-gfx/librecad/librecad-2.0.3.ebuild   | 38 --
 ...librecad-2.0.4.ebuild => librecad-2.0.7.ebuild} |  2 +-
 3 files changed, 2 insertions(+), 41 deletions(-)

diff --git a/media-gfx/librecad/Manifest b/media-gfx/librecad/Manifest
index 4ad4b45..e1de478 100644
--- a/media-gfx/librecad/Manifest
+++ b/media-gfx/librecad/Manifest
@@ -1,4 +1,3 @@
-DIST librecad-2.0.3.zip 16590256 SHA256 
4221348541c46c6e9698c1fa3471a14a81376e022a009a164a7f0d0035da4643 SHA512 
c40952ae967d83197645bef65dac6e050ddeacf536401b2b99cd18d753462af086ac2a410c6746a92c094ad76fd9177a900c21531ed7b7fcdf1e4b0f7f070e00
 WHIRLPOOL 
c2e1d33b17b7a47ffd9b3795ad292b22cb1225aceacf052494745243630b0537e21701930b9433ea235c462d65581efc2b5ccda3b37712d4ab639ab9bcc6a97d
-DIST librecad-2.0.4.zip 16658203 SHA256 
3a3252ec978cf6001f9e7686955d45f413359ed2963ae01f113d6839720e3e19 SHA512 
bd68738167a121e63c9d7738155b6b74e5faee910839b70a49619c62f1f8b3c1c3eab43cf8d89a538b1952c7f327dbc284a0a246d45597dae64e332ddb8fe077
 WHIRLPOOL 
6d201862426d52f3a89473add5ba8172f4f5b3dd82e89609eb98d5f1e013c9ef64a66d18141ad2c9d67a6354eec4637c0cdf3450cfcedae89237d79484aae96d
 DIST librecad-2.0.5.zip 16743868 SHA256 
00fba891ccf90328f122c081e9a55f5cf6a908932b92b4414f4ee3b186b48f87 SHA512 
afacc5dd833d8a9daba0e9a93f9578f066ada6dff3de4676d8604bbfbce6fba5615c75f498b9ee242b3a7bfcb2746b97a3fbd6b97526990b4ad39757344e3cc5
 WHIRLPOOL 
5b79ebecec469083a5b13b3e71b76fd116baf935d09c04e979efd583ec58fd17a3bef9e707b3603bba3256527a845f9be4a10271daeaec3fee09ce7fe82fca36
 DIST librecad-2.0.6.zip 17401781 SHA256 
09a58f9a4b578eb7381f299414344f82c6e320156c20b3ff1e9e1ae5f2770a30 SHA512 
0f8452674659adc943d87aa3d70763682b3e5e7c82530afee98d50dfa4977e8f2e0efcd224087eed68a51727a234d58b8740b00ed0941b6af78dc2938ed15241
 WHIRLPOOL 
6bb40ae33f28b5ad6adfc91334741d3fe50c6a7f42b0e253554bfacd8f4e7152a495b9e62b8760f28de8c69c77aed73750e094db96d2757fad7cd58ed3200897
+DIST librecad-2.0.7.zip 17457197 SHA256 
36d2fa1c60324bb743f0ddde0b9da1dc6b57a370422de714adef27a0cd32d9d2 SHA512 
afbe094dd565e2b058c5b1c28e88b76b883d1b9f20f60047e5a7771ec5d353e6a3e73abee8e4d7ac5f916ead7fb15719cf7bab034d670f7d7f54ca394d314803
 WHIRLPOOL 
5d196be5e54e4ceb7f2650015f35bf6ba77440b7a81d51f68a9a15408d399779f5c61289a5adaacbf1538735f7f0761152371291bab8bc8c8fb8109c3e1ddfc3

diff --git a/media-gfx/librecad/librecad-2.0.3.ebuild 
b/media-gfx/librecad/librecad-2.0.3.ebuild
deleted file mode 100644
index 85a61fb..000
--- a/media-gfx/librecad/librecad-2.0.3.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils qt4-r2
-
-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"
-IUSE="debug doc tools"
-
-DEPEND="
-   dev-cpp/muParser
-   dev-qt/qtgui:4
-   dev-qt/qthelp:4
-   dev-qt/qtsvg:4
-   dev-libs/boost
-   media-libs/freetype
-   "
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/LibreCAD-${PV}"
-
-src_install() {
-   dobin unix/librecad
-   use tools && dobin unix/ttf2lff
-   insinto /usr/share/${PN}
-   doins -r unix/resources/*
-   use doc && dohtml -r librecad/support/doc/*
-   doicon librecad/res/main/${PN}.png
-   make_desktop_entry ${PN} LibreCAD ${PN} Graphics
-}

diff --git a/media-gfx/librecad/librecad-2.0.4.ebuild 
b/media-gfx/librecad/librecad-2.0.7.ebuild
similarity index 94%
rename from media-gfx/librecad/librecad-2.0.4.ebuild
rename to media-gfx/librecad/librecad-2.0.7.ebuild
index 55dcce5..2379ae9 100644
--- a/media-gfx/librecad/librecad-2.0.4.ebuild
+++ b/media-gfx/librecad/librecad-2.0.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

44 matches

Mail list logo