gentoo auto-resync : 25:01:2023 - 08:07:03

4 files changed, 3 insertions, 62 deletions

diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index cbb9be84b516..8dd1c03ef50d 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/librecad/Manifest b/media-gfx/librecad/Manifest
index d172c9d09e58..28197b74ac0f 100644
--- a/media-gfx/librecad/Manifest
+++ b/media-gfx/librecad/Manifest
@@ -4,7 +4,6 @@ AUX librecad-2.1.3-qt-5.11.patch 1396 BLAKE2B 80e637b724df81dce60c17354bed56a232
 AUX librecad-2.1.3-qt-5.15.patch 1270 BLAKE2B 0947b13ff328e4f1c3ac04d846e7ed372d76d4858cecff5fe4ff8fc8c3c1558cd0e9ac53354e1f0b5b1d137db09c8205f034df9356b9b9e3206a611608fb8166 SHA512 b1a5afe1d22b7725c7d10a10bed5e52495cda7699ff20bd0f75bbfe28f7131a3d9cd5ec0a1ae7fd329196d2f88bb4b8336301fdb6efa073d773f31340a062ba0
 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
-EBUILD librecad-2.1.3-r6.ebuild 1254 BLAKE2B d6d75d7b1aadc436b633af6cd4134fffccf7571c3b8c065b80790986d025eb37adcd5afd66102d6bbe8aaa9d712eb28ebf54a293f57907e32ec55a2efff0bca3 SHA512 82b25277f0de277d7884d52520e67503c413ad8ad65b8df64024f5dcdf8704a481c11ede8185014964b7aaa9e0abe3e775043c6e976c5eae8c43cbc9e14e8e7a
-EBUILD librecad-2.1.3-r7.ebuild 2881 BLAKE2B 4ba5c21b94eca93d8f454581c8433a117a77ddc59e6224c51a98cd1346444f051d7cc5f801809f59eb81d09dcb3cae89de642b169528cfa7ce02359197c4b1e3 SHA512 0bf665ee3102468ef462e5d44f6198e32c6e88bb27e49f9c8eb11df73c1f3dd48bee451510b3f4e50e5143c2e17296baa9e196f2126efe94f1b1dcdc968dcd7b
+EBUILD librecad-2.1.3-r7.ebuild 2879 BLAKE2B 4b9da167e4db48da0c8a41bf43c3d5fcadabea9f57a82270fec85b18da2dd6823d60be0eea3bd4bad7f4324599c47fd4b020276f3a4a28f7be5a2d13004a5f8a SHA512 3ed191982b167c0cabdd28e5ab7702784e0da508f358a066507bde711cb5917c885de435985ea0636e96d1f94586f76c007607a7ec1e1f90cb14646724988546
 EBUILD librecad-9999.ebuild 2357 BLAKE2B f1b84cd8486d81b2a11216448be1e7c36d8d4347bfe09297a472b31278fa9e7aeeb4d9f325ed234ac05a0ae6065280efd159b7847195bd868d0991f6101f6c04 SHA512 ca46b07e00004e93ff1fcc2be9ea55049fa92154ce26eca11d033476d66b401653106dfe0fd835e07421d67d651a9af27a9cc505a440f85b43d3ba0c76d17d40
 MISC metadata.xml 333 BLAKE2B 2790ea3fb043f1d8393fd715b4669edab3229e1de59e27cc70f3fd3cc13f83964ad1dc6a5534af981111b4ba1a2c7d29501015459e300905574fbc59fce88ee2 SHA512 bf932b64f53780d10e7e64845f4d50f1726f9d57e4625cb94ed2dcc761a0d7f409731b9e9cd1475880b283b43d7b0b979493b984cb243f09954a38f39baac5b9
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..000000000000
--- 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
-}
diff --git a/media-gfx/librecad/librecad-2.1.3-r7.ebuild b/media-gfx/librecad/librecad-2.1.3-r7.ebuild
index 3f3a914a5304..3edea50eab0b 100644
--- a/media-gfx/librecad/librecad-2.1.3-r7.ebuild
+++ b/media-gfx/librecad/librecad-2.1.3-r7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -17,7 +17,7 @@ else
 		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"
+	KEYWORDS="amd64 ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="GPL-2"