Gentoo Archives: gentoo-commits

From: Matthew Smith <matthew@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/solvespace/
Date: Fri, 09 Sep 2022 09:48:18
Message-Id: 1662716809.8f69a95f6f46feeff7754c31fc20b274e01efe3c.matthew@gentoo
1 commit: 8f69a95f6f46feeff7754c31fc20b274e01efe3c
2 Author: Matthew Smith <matthew <AT> gentoo <DOT> org>
3 AuthorDate: Fri Sep 9 08:59:21 2022 +0000
4 Commit: Matthew Smith <matthew <AT> gentoo <DOT> org>
5 CommitDate: Fri Sep 9 09:46:49 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f69a95f
7
8 media-gfx/solvespace: drop 3.0-r2
9
10 Signed-off-by: Matthew Smith <matthew <AT> gentoo.org>
11
12 media-gfx/solvespace/Manifest | 1 -
13 media-gfx/solvespace/solvespace-3.0-r2.ebuild | 79 ---------------------------
14 2 files changed, 80 deletions(-)
15
16 diff --git a/media-gfx/solvespace/Manifest b/media-gfx/solvespace/Manifest
17 index d513304e32b5..8c62f42851b8 100644
18 --- a/media-gfx/solvespace/Manifest
19 +++ b/media-gfx/solvespace/Manifest
20 @@ -1,4 +1,3 @@
21 DIST libdxfrw-0.6.3-0b7b7b709d9299565db603f878214656ef5e9ddf.tar.gz 691804 BLAKE2B 84c90a591fac71144e9e13aace7c1a00dfc1bd6f27b0bcde6b60541f5b5d3ccc04ae1c759f60cb467445cc884840d04bf4613b5cc553fbbf6951cac33a084d50 SHA512 9ab498aa7f369be79d800e8ca5ec55fa54be79d0778937b81d4c8da776b3419cb8a75400b54b205efc338da32e2e781afd0bed1bd8efed1a0b212dc8682a2615
22 DIST mimalloc-2.0.6-f819dbb4e4813fab464aee16770f39f11476bfea.tar.gz 1129745 BLAKE2B 95ea6e64afaa6931e18a22db45ba39d554917e109028adb624120442329bb458d24d7f22a233931c5e15b8b0ce4cc5130b0d4cba0db270a9c84453afd70c33e9 SHA512 b02a76d8a7668a4d3dc8c761473f609060b834761918b58d2143d54dbeb4c342e213010f9402d1c55035b04860936c2f8df73b84e111f5e90b3d58db62c5f85f
23 -DIST solvespace-3.0.tar.gz 2734860 BLAKE2B 2efc9d98723c60abdb1c76ac086c40ff2f9b8bc9c315978731493d115fa55a080176ef48d930e3b503c0de0604dbfd2bc3bd99a581f359eb07a23034d09f84bf SHA512 b07b41fac1d67c5350082600a2f09e3fa611a1273e0c93ff93d11a7a1dbf550ff33465686eaff04fdb8350d1fe854ab0301d8723ef31cc65c687ba59cb89187f
24 DIST solvespace-3.1.tar.gz 2764243 BLAKE2B 764637f84a187c6a86cf65cd672466f48e1e5abd9d335945fc47f2ea48f7d22a94f6840a6019f2380e8416e903bb55f97d9adb18fa6f2e7a94933c2a5b51ef6c SHA512 76794c4b103036f423471c72209521c273b40edcf9a725d2407e757b8dded033863f58640f1bcdf19d7dd1b296334f8745a632875e06604fa4d5b261dd23ba98
25
26 diff --git a/media-gfx/solvespace/solvespace-3.0-r2.ebuild b/media-gfx/solvespace/solvespace-3.0-r2.ebuild
27 deleted file mode 100644
28 index f94aea515954..000000000000
29 --- a/media-gfx/solvespace/solvespace-3.0-r2.ebuild
30 +++ /dev/null
31 @@ -1,79 +0,0 @@
32 -# Copyright 1999-2022 Gentoo Authors
33 -# Distributed under the terms of the GNU General Public License v2
34 -
35 -EAPI=8
36 -
37 -# solvespace's libdxfrw is quite heavily modified and incompatible with
38 -# the upstream libdxfrw.
39 -DXFRW_COMMIT="0b7b7b709d9299565db603f878214656ef5e9ddf"
40 -DXFRW_PV="0.6.3"
41 -DXFRW_P="libdxfrw-${DXFRW_PV}-${DXFRW_COMMIT}"
42 -
43 -inherit cmake toolchain-funcs xdg
44 -
45 -DESCRIPTION="Parametric 2d/3d CAD"
46 -HOMEPAGE="http://solvespace.com"
47 -SRC_URI="https://github.com/solvespace/solvespace/archive/v${PV}.tar.gz -> ${P}.tar.gz
48 - https://github.com/solvespace/libdxfrw/archive/${DXFRW_COMMIT}.tar.gz -> ${DXFRW_P}.tar.gz"
49 -
50 -# licenses
51 -# + SolveSpace (GPL-3+)
52 -# |- Bitstream Vera (BitstreamVera)
53 -# + libdxfrw (GPL-2+)
54 -
55 -IUSE="openmp"
56 -KEYWORDS="amd64 ~x86"
57 -LICENSE="BitstreamVera GPL-2+ GPL-3+"
58 -SLOT="0"
59 -
60 -RDEPEND="
61 - dev-cpp/atkmm:0
62 - dev-cpp/glibmm:2
63 - dev-cpp/gtkmm:3.0[X]
64 - dev-cpp/pangomm:1.4
65 - dev-libs/glib:2
66 - dev-libs/json-c:=
67 - dev-libs/libsigc++:2
68 - dev-libs/libspnav[X]
69 - dev-libs/mimalloc:=
70 - media-libs/fontconfig
71 - media-libs/freetype:2[X]
72 - media-libs/libpng:0=
73 - sys-libs/zlib
74 - virtual/opengl
75 - x11-libs/cairo[X]
76 - x11-libs/gtk+:3[X]
77 -"
78 -DEPEND="${RDEPEND}"
79 -BDEPEND="virtual/pkgconfig"
80 -
81 -PATCHES=( "${FILESDIR}"/${PN}-3.0-use-system-mimalloc.patch )
82 -
83 -# This is shown to the user in the UI and --version.
84 -MY_HASH="0e0b0252e23dd5bd4ae82ababcc54c44aee036d6"
85 -
86 -pkg_pretend() {
87 - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
88 -}
89 -
90 -pkg_setup() {
91 - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
92 -}
93 -
94 -src_prepare() {
95 - rm -r extlib/libdxfrw || die
96 - mv "${WORKDIR}"/libdxfrw-${DXFRW_COMMIT} extlib/libdxfrw || die
97 -
98 - sed -i '/include(GetGitCommitHash)/d' CMakeLists.txt || die
99 -
100 - cmake_src_prepare
101 -}
102 -
103 -src_configure() {
104 - local mycmakeargs=(
105 - -DENABLE_OPENMP=$(usex openmp)
106 - -DGIT_COMMIT_HASH=${MY_HASH}
107 - )
108 -
109 - cmake_src_configure
110 -}