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

["Andreas Sturmlechner" <asturm@gentoo.org>]

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

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 <asturm <AT> gentoo.org>

 ...{librecad-2.1.3-r5.ebuild => librecad-2.1.3-r6.ebuild} |  2 +-
 media-gfx/librecad/librecad-9999.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-9999.ebuild b/media-gfx/librecad/librecad-9999.ebuild
index 04902b991e9..4f1a71b3503 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 e83f7a4a702..803bf3514a8 100644
--- a/media-gfx/librecad/metadata.xml
+++ b/media-gfx/librecad/metadata.xml
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
-  <use>
-    <flag name="3d">Require all 2D coordinates stored as 3D</flag>
-    <flag name="tools">Build additional tool programs: tff2lff</flag>
-  </use>
-  <upstream>
-    <remote-id type="github">LibreCAD/LibreCAD</remote-id>
-  </upstream>
+	<!-- maintainer-needed -->
+	<use>
+		<flag name="tools">Build additional tool programs: tff2lff</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">LibreCAD/LibreCAD</remote-id>
+	</upstream>
 </pkgmetadata>