From 0c8aadc5bd665342c9fa0b1bf2fa8a00e7400887 Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner Date: Sun, 9 May 2021 21:05:58 +0200 Subject: media-gfx/librecad: Fix metainfo install path Drop IUSE=3d in 9999 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 --- media-gfx/librecad/librecad-2.1.3-r5.ebuild | 58 ----------------------------- media-gfx/librecad/librecad-2.1.3-r6.ebuild | 58 +++++++++++++++++++++++++++++ media-gfx/librecad/librecad-9999.ebuild | 14 +++---- media-gfx/librecad/metadata.xml | 15 ++++---- 4 files changed, 72 insertions(+), 73 deletions(-) delete mode 100644 media-gfx/librecad/librecad-2.1.3-r5.ebuild create mode 100644 media-gfx/librecad/librecad-2.1.3-r6.ebuild (limited to 'media-gfx/librecad') diff --git a/media-gfx/librecad/librecad-2.1.3-r5.ebuild b/media-gfx/librecad/librecad-2.1.3-r5.ebuild deleted file mode 100644 index 7b21b0e12ca4..000000000000 --- a/media-gfx/librecad/librecad-2.1.3-r5.ebuild +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 1999-2021 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 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/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-2.1.3-r6.ebuild b/media-gfx/librecad/librecad-2.1.3-r6.ebuild new file mode 100644 index 000000000000..9e36da264e46 --- /dev/null +++ b/media-gfx/librecad/librecad-2.1.3-r6.ebuild @@ -0,0 +1,58 @@ +# Copyright 1999-2021 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 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 +} diff --git a/media-gfx/librecad/librecad-9999.ebuild b/media-gfx/librecad/librecad-9999.ebuild index 04902b991e93..4f1a71b35035 100644 --- a/media-gfx/librecad/librecad-9999.ebuild +++ b/media-gfx/librecad/librecad-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -14,16 +14,13 @@ if [[ ${PV} == *9999* ]]; then else SRC_URI="https://github.com/LibreCAD/LibreCAD/archive/${PV/_/}.tar.gz -> ${P}.tar.gz" S="${WORKDIR}/LibreCAD-${PV}" + KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux" fi LICENSE="GPL-2" SLOT="0" -KEYWORDS="" -IUSE="3d debug doc tools" +IUSE="debug doc tools" -BDEPEND=" - dev-qt/linguist-tools:5 -" RDEPEND=" dev-cpp/muParser dev-libs/boost:= @@ -38,6 +35,9 @@ DEPEND="${RDEPEND} dev-qt/qthelp:5 dev-qt/qtxml:5 " +BDEPEND=" + dev-qt/linguist-tools:5 +" src_configure() { eqmake5 -r @@ -49,7 +49,7 @@ src_install() { insinto /usr/share/${PN} doins -r unix/resources/* use doc && docinto html && dodoc -r librecad/support/doc/* - insinto /usr/share/appdata + insinto /usr/share/metainfo doins unix/appdata/librecad.appdata.xml doicon librecad/res/main/${PN}.png make_desktop_entry ${PN} LibreCAD ${PN} Graphics diff --git a/media-gfx/librecad/metadata.xml b/media-gfx/librecad/metadata.xml index e83f7a4a7026..803bf3514a84 100644 --- a/media-gfx/librecad/metadata.xml +++ b/media-gfx/librecad/metadata.xml @@ -1,12 +1,11 @@ - - - Require all 2D coordinates stored as 3D - Build additional tool programs: tff2lff - - - LibreCAD/LibreCAD - + + + Build additional tool programs: tff2lff + + + LibreCAD/LibreCAD + -- cgit v1.2.3-65-gdbad