gentoo resync : 29.12.2022

3 files changed, 2 insertions, 113 deletions

diff --git a/media-gfx/openscad/Manifest b/media-gfx/openscad/Manifest
index 703b9f11acf7..4026b2420161 100644
--- a/media-gfx/openscad/Manifest
+++ b/media-gfx/openscad/Manifest
@@ -2,7 +2,6 @@ AUX 50openscad-gentoo.el 167 BLAKE2B 36292439057e2b9a5993c73cf5d46e5b6b0b56695f4
 AUX openscad-2021.01-0001-Gentoo-specific-Disable-ccache-building.patch 790 BLAKE2B b08a024f81a29d7fb4e0860977b814d2ec6ce6dcbf8ab87655f5d36f51ea3bbce6559369363c33ca7593cbc3284de920f71be3c38e3ab7b5efa83d3466132b79 SHA512 2af887d7b085c49203e72ad41cb5c0e32b772a8abd35843485434cb11b263ba8a727a0ebc34c7138bff1e6852245f2bdaf7d91711184a5f16ed22603578a0892
 AUX openscad-2021.01-0002-fix-to-find-lib3mf-2.patch 1396 BLAKE2B a43872dd83427f28a48528fbac534924796db769bd0213ba1b6fca41a65c766aa3355aa9ee3f7d68dcbbf3d578cee984f2ad61f599fdf9551ef55724f460f4db SHA512 ffbf402976054c1e7294a0d661e0648bdb359cf57e676d818cf1140644b7a0d0943f5adf1d2f511ad17ca45a35e31785aae584dc7607f13bfc9d94795fc3812b
 DIST openscad-2021.01.tar.gz 15817555 BLAKE2B 417857d704fa3c14312641ebda983eb85a1e3bc0d517a235fa3bd2523fce6f93c1ea526c330179bc35f03e6c73d3cd7c4c57cd71480088c21bfc99bb020ab7cd SHA512 8deaa26bf4c295c12da38f323d2b2e6f827851337f5bc1cc9c79afc083c9f913c19a263086e6e853bf2c8434c1ccc705ea22ddb02dc99d39bb1e5e03fc58d128
-EBUILD openscad-2021.01-r2.ebuild 2320 BLAKE2B 0e7bff7f92167eec53b96c8f71bb4bd3f6b336f9d632769ea98dad42af97519ef1003f760bc6dd2c8136fe515441c85cf298cfee4252b6f375cb828013815bd6 SHA512 54c9581deddb740d81b9cc17b4b0d3f6107935312208032da8c56ee13c0d7c81557c7500d73f562f8f2dcce2a783ac339bfed53c3c79c54f3dfe6eba661713f6
-EBUILD openscad-2021.01-r3.ebuild 2237 BLAKE2B 3253f0b6a454ef2387eef612f480fe51c39b174fd4926ba10979b1c179445cff60c783f7863b05f7ceb1cce5212c5bfc6c77152da192623a7717381d1fb2ecc7 SHA512 683b082cf5e8202bf220ff940f9b38f88ea6f613a5e953b7eed0140777c15d21b2909145924503e68404cd56e76ffb31caac23a37c18a26f3bc416fa1944d14c
+EBUILD openscad-2021.01-r3.ebuild 2235 BLAKE2B b25634d8dfcefc9ba34f3a41033a95384a932147760d3f0c905d686a150188bbbc0b9d17958bb1d309785ecee2dd3d50228261431401a672f1ab68e8e3518e95 SHA512 4b7a65b0e9c32ce2d1d58b6850d06ff40564c1ed70e2ca832ff1dea86bb8b3503dd0b006a38962cdab3ae664f4686973d7136dfaa03021510c09a7ec071b8d9f
 EBUILD openscad-9999.ebuild 2508 BLAKE2B f3842eee85e9da815b3dda59c553f4cd97193bd7732d2bd65820b7283a2e8699c352cf8643b67fc3c4e8e411628b2262998d65ede1ca1154c4c0cec3edcd4f5c SHA512 a214cdebcb5be8a052b78b9b34741cf0680d262ce07a740803ee9a351a63d0e0f03fd733d754c4cdc161ffa35e6713eb8cd2ffe7627014e0851d647360eeb418
 MISC metadata.xml 1348 BLAKE2B b15a74a20ef94a6a47de57826c5279a4e8c388a52bf9d1058a1ba0b347fcd77e0c8b79a42515f5411d0991fb8fb71c604f792dd2a2addaaca78bc85dbfc7a611 SHA512 fea109a00324f0bdcaae855e18fba456a449bb8192e633cfd5806fa1040fe3bba24f75493e0012d54afe8828073fc4d02ae01533b45648e05c575777b23572d1
diff --git a/media-gfx/openscad/openscad-2021.01-r2.ebuild b/media-gfx/openscad/openscad-2021.01-r2.ebuild
deleted file mode 100644
index 2dce8f8df45c..000000000000
--- a/media-gfx/openscad/openscad-2021.01-r2.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit elisp-common qmake-utils xdg
-
-SITEFILE="50${PN}-gentoo.el"
-
-DESCRIPTION="The Programmers Solid 3D CAD Modeller"
-HOMEPAGE="https://www.openscad.org/"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.src.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="emacs"
-# tests are not fully working and need cmake which isn't yet
-# officially supported.
-RESTRICT="test"
-
-RDEPEND="
-	dev-cpp/eigen:3
-	dev-libs/boost:=
-	dev-libs/double-conversion:=
-	dev-libs/glib:2
-	dev-libs/gmp:0=
-	dev-libs/hidapi
-	dev-libs/libspnav
-	dev-libs/libxml2
-	dev-libs/libzip:=
-	dev-libs/mpfr:0=
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5[-gles2-only]
-	dev-qt/qtmultimedia:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtopengl:5
-	dev-qt/qtwidgets:5
-	media-gfx/opencsg:=
-	media-libs/fontconfig
-	media-libs/freetype
-	>=media-libs/glew-2.0.0:0=
-	media-libs/harfbuzz:=
-	media-libs/lib3mf
-	sci-mathematics/cgal:=
-	x11-libs/cairo
-	>=x11-libs/qscintilla-2.10.3:=
-	emacs? ( >=app-editors/emacs-23.1:* )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-util/itstool
-	sys-devel/bison
-	sys-devel/flex
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-PATCHES=( "${FILESDIR}"/${P}-0001-Gentoo-specific-Disable-ccache-building.patch )
-
-src_prepare() {
-	default
-	if has_version ">=media-libs/lib3mf-2"; then
-		eapply "${FILESDIR}/${P}-0002-fix-to-find-lib3mf-2.patch"
-	fi
-}
-
-src_configure() {
-	if has ccache ${FEATURES}; then
-		eqmake5 "PREFIX = ${ESYSROOT}/usr" "CONFIG += ccache" "${PN}.pro"
-	else
-		eqmake5 "PREFIX = ${ESYSROOT}/usr" "${PN}.pro"
-	fi
-}
-
-src_compile() {
-	default
-
-	if use emacs ; then
-		elisp-compile contrib/*.el
-	fi
-}
-
-src_install() {
-	emake install INSTALL_ROOT="${D}"
-
-	if use emacs; then
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-		elisp-install ${PN} contrib/*.el contrib/*.elc
-	fi
-
-	mv -i "${ED}"/usr/share/openscad/locale "${ED}"/usr/share || die "failed to move locales"
-	ln -sf ../locale "${ED}"/usr/share/openscad/locale || die
-
-	einstalldocs
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
diff --git a/media-gfx/openscad/openscad-2021.01-r3.ebuild b/media-gfx/openscad/openscad-2021.01-r3.ebuild
index 2bb8a63e134f..41f8b9baca99 100644
--- a/media-gfx/openscad/openscad-2021.01-r3.ebuild
+++ b/media-gfx/openscad/openscad-2021.01-r3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.src.tar.gz -
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="emacs"
 # tests are not fully working and need cmake which isn't yet
 # officially supported.