Gentoo Archives: gentoo-commits

From: Andrew Ammerlaan <andrewammerlaan@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/proj/guru:master commit in: sci-electronics/kactus2/, sci-electronics/kactus2/files/
Date: Wed, 22 Jun 2022 17:39:20
Message-Id: 1655906073.bf39d533a557ec5019b6f46aa334f9af7b8f3092.andrewammerlaan@gentoo
1 commit: bf39d533a557ec5019b6f46aa334f9af7b8f3092
2 Author: Huang Rui <vowstar <AT> gmail <DOT> com>
3 AuthorDate: Wed Jun 22 13:54:25 2022 +0000
4 Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
5 CommitDate: Wed Jun 22 13:54:33 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=bf39d533
7
8 sci-electronics/kactus2: drop 3.8.0
9
10 Closes: https://bugs.gentoo.org/848027
11 Closes: https://bugs.gentoo.org/817305
12 Closes: https://bugs.gentoo.org/781677
13 Closes: https://bugs.gentoo.org/781674
14 Closes: https://bugs.gentoo.org/781671
15 Closes: https://bugs.gentoo.org/781635
16 Signed-off-by: Huang Rui <vowstar <AT> gmail.com>
17
18 sci-electronics/kactus2/Manifest | 1 -
19 .../kactus2/files/kactus2-3.8.0-install.patch | 30 --------------
20 sci-electronics/kactus2/kactus2-3.8.0.ebuild | 47 ----------------------
21 3 files changed, 78 deletions(-)
22
23 diff --git a/sci-electronics/kactus2/Manifest b/sci-electronics/kactus2/Manifest
24 index 93c3530ee..a78a46fe6 100644
25 --- a/sci-electronics/kactus2/Manifest
26 +++ b/sci-electronics/kactus2/Manifest
27 @@ -1,2 +1 @@
28 DIST kactus2-3.10.0.tar.gz 27887683 BLAKE2B 3addb9d2112fcd79891748ad35bd9e1b93acff1d04bcb75612d4e8018f30c6f015e496860e66e0e8ade3397339de31f700e91d35b18f2eccbd2621b8751d477b SHA512 a54396f6e305bbc8f70a1af4a5ca0cdc28fc6a95ea1f44c8f9bcd16b7f4a161ad738edd14840ee2356aba4d7e2f198d6ee3ced1f0e5ef32a5717f2ea61cfb5bd
29 -DIST kactus2-3.8.0.tar.gz 19410435 BLAKE2B 2117a7ea5118c59f5b96a449348ba2425646038eb756c5423301d3deba15765005aafae3241c943b7adfaa728edeac3f0963b1cad7c23892b68bbd6ed7de78c0 SHA512 426021465f296c63ff70738b7a56547ac6e5b46ed06b165da2bbcd7239ff9e65c099721ebfb5e7f90b0afa9f5621d7825ff7e216bcc4786f0431f1e98d95eee8
30
31 diff --git a/sci-electronics/kactus2/files/kactus2-3.8.0-install.patch b/sci-electronics/kactus2/files/kactus2-3.8.0-install.patch
32 deleted file mode 100644
33 index 0cce3b501..000000000
34 --- a/sci-electronics/kactus2/files/kactus2-3.8.0-install.patch
35 +++ /dev/null
36 @@ -1,30 +0,0 @@
37 ---- a/.qmake.conf
38 -+++ b/.qmake.conf
39 -@@ -2,9 +2,14 @@
40 - LOCAL_INSTALL_DIR=""
41 -
42 - isEmpty(LOCAL_INSTALL_DIR) {
43 -+ # Get the bitness of the system.
44 -+ UNAME = $$system(uname -m)
45 -+
46 - # Select paths for binaries in accordance with convention.
47 - bin_path = /usr/bin
48 -- lib_path = /usr/lib
49 -+ # Lib path depend on the bitness of the system.
50 -+ equals(UNAME, x86_64): lib_path = /usr/lib64
51 -+ !equals(UNAME, x86_64): lib_path = /usr/lib
52 - plugin_path = /usr/share/kactus2/plugins
53 -
54 - # Files and destination path for possible settings file upgrades.
55 -@@ -23,9 +28,8 @@ isEmpty(LOCAL_INSTALL_DIR) {
56 - unix:config.path = /etc/xdg/TUT
57 -
58 - # Copying stuff, exact locations seem to depend on the bitness of the system.
59 -- UNAME = $$system(uname -m)
60 -- equals(UNAME, x86_64): unix:config.extra = cp ./Administrative/releaseFiles/DefaultSettingsLinux.ini /etc/xdg/TUT/Kactus2.ini; (test -d /usr/lib64 && ln -f -s /usr/bin/kactus2 /usr/lib64/libKactus2.so) || (test -d /lib/x86_64-linux-gnu && ln -f -s /usr/bin/kactus2 /lib/x86_64-linux-gnu/libKactus2.so)
61 -- !equals(UNAME, x86_64): unix:config.extra = cp ./Administrative/releaseFiles/DefaultSettingsLinux.ini /etc/xdg/TUT/Kactus2.ini; ln -f -s /usr/bin/kactus2 /usr/lib/libKactus2.so
62 -+ equals(UNAME, x86_64): unix:config.extra = mkdir -p $(INSTALL_ROOT)/etc/xdg/TUT; cp ./Administrative/releaseFiles/DefaultSettingsLinux.ini $(INSTALL_ROOT)/etc/xdg/TUT/Kactus2.ini; (test -d $(INSTALL_ROOT)/usr/lib64 && ln -f -s $(INSTALL_ROOT)/usr/bin/kactus2 $(INSTALL_ROOT)/usr/lib64/libKactus2.so) || (test -d $(INSTALL_ROOT)/lib/x86_64-linux-gnu && ln -f -s $(INSTALL_ROOT)/usr/bin/kactus2 $(INSTALL_ROOT)/lib/x86_64-linux-gnu/libKactus2.so)
63 -+ !equals(UNAME, x86_64): unix:config.extra = mkdir -p $(INSTALL_ROOT)/etc/xdg/TUT; cp ./Administrative/releaseFiles/DefaultSettingsLinux.ini $(INSTALL_ROOT)/etc/xdg/TUT/Kactus2.ini; ln -f -s $(INSTALL_ROOT)/usr/bin/kactus2 $(INSTALL_ROOT)/usr/lib/libKactus2.so
64 -
65 - # Files and destination path for the IP-XACT files coming with an installation.
66 - unix:library.path = /usr/share/kactus2/library
67
68 diff --git a/sci-electronics/kactus2/kactus2-3.8.0.ebuild b/sci-electronics/kactus2/kactus2-3.8.0.ebuild
69 deleted file mode 100644
70 index e6a6e0224..000000000
71 --- a/sci-electronics/kactus2/kactus2-3.8.0.ebuild
72 +++ /dev/null
73 @@ -1,47 +0,0 @@
74 -# Copyright 1999-2022 Gentoo Authors
75 -# Distributed under the terms of the GNU General Public License v2
76 -
77 -EAPI="7"
78 -
79 -inherit xdg
80 -
81 -DESCRIPTION="A open source IP-XACT-based tool"
82 -HOMEPAGE="
83 - https://research.tuni.fi/system-on-chip/tools/
84 - https://github.com/kactus2/kactus2dev
85 -"
86 -
87 -if [[ "${PV}" == "9999" ]] ; then
88 - inherit git-r3
89 - EGIT_REPO_URI="https://github.com/${PN}/${PN}dev.git"
90 -else
91 - SRC_URI="https://github.com/${PN}/${PN}dev/archive/v${PV}.tar.gz -> ${P}.tar.gz"
92 - KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~sparc ~x86"
93 - S="${WORKDIR}/${PN}dev-${PV}"
94 -fi
95 -
96 -LICENSE="GPL-2"
97 -SLOT="0"
98 -
99 -RDEPEND="
100 - dev-qt/qtcore:5
101 - dev-qt/qtgui:5
102 - dev-qt/qthelp:5
103 - dev-qt/qtprintsupport:5
104 - dev-qt/qtsvg:5
105 - dev-qt/qtwidgets:5
106 - dev-qt/qtxml:5
107 -"
108 -
109 -DEPEND="
110 - ${RDEPEND}
111 -"
112 -
113 -PATCHES=(
114 - "${FILESDIR}"/${PN}-3.8.0-install.patch # Fix install problem
115 -)
116 -
117 -src_install() {
118 - # Can't use default, set INSTALL_ROOT and workaround parallel install bug
119 - emake -j1 INSTALL_ROOT="${D}" install
120 -}