Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-electronics/qelectrotech/files/, sci-electronics/qelectrotech/
Date: Sun, 28 Feb 2021 21:36:59
Message-Id: 1614548183.da37447a27e961ef6bde9e773ae002e28e6285e0.asturm@gentoo
1 commit: da37447a27e961ef6bde9e773ae002e28e6285e0
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Sun Feb 28 20:21:21 2021 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Sun Feb 28 21:36:23 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da37447a
7
8 sci-electronics/qelectrotech: 0.80 version bump
9
10 Closes: https://bugs.gentoo.org/746647
11 Package-Manager: Portage-3.0.16, Repoman-3.0.2
12 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
13
14 sci-electronics/qelectrotech/Manifest | 1 +
15 .../files/qelectrotech-0.80-fix-paths.patch | 50 ++++++++++++++++++++++
16 .../files/qelectrotech-0.80-nomancompress.patch | 10 +++++
17 ...rotech-9999.ebuild => qelectrotech-0.80.ebuild} | 22 ++++++++--
18 .../qelectrotech/qelectrotech-9999.ebuild | 22 ++++++++--
19 5 files changed, 97 insertions(+), 8 deletions(-)
20
21 diff --git a/sci-electronics/qelectrotech/Manifest b/sci-electronics/qelectrotech/Manifest
22 index 23a90bc85d6..88b1688f9cd 100644
23 --- a/sci-electronics/qelectrotech/Manifest
24 +++ b/sci-electronics/qelectrotech/Manifest
25 @@ -1 +1,2 @@
26 DIST qelectrotech-0.70.tar.gz 10870717 BLAKE2B 21af2000080526cc75e67d80d514286a294a805073beb97d142758449e1290db56e741b70eeb9c38adbdb770fc548eb0fba18429bceaa8cd88bcba5335c3fca9 SHA512 db5b74ce9ac64e55a463c821ee43a2cde8cc4dc4a7be79c8a39512e54dfb85653e20981b5879ecc6e5949c1c1196ad5b7cae9780bf16de0b4d7b2381731173bd
27 +DIST qelectrotech-0.80.tar.gz 13835653 BLAKE2B 1efb22c9683c01c3cc449a3c1deef1990825b16f11dc15d93e2d7c0afd026486ee9772e0d8637efcb576fb20a8dc79235cdcabc94d293b9bf8c2028818645734 SHA512 732101130e77849ed0a56bcc7b519a1ca032e8f203951a50e1dd5fd488e96f1ab69ed0854176604f1947636b3d8fda1ac8aebbcfe01e63dfa263d8f646224f53
28
29 diff --git a/sci-electronics/qelectrotech/files/qelectrotech-0.80-fix-paths.patch b/sci-electronics/qelectrotech/files/qelectrotech-0.80-fix-paths.patch
30 new file mode 100644
31 index 00000000000..30ef9b6089b
32 --- /dev/null
33 +++ b/sci-electronics/qelectrotech/files/qelectrotech-0.80-fix-paths.patch
34 @@ -0,0 +1,50 @@
35 +--- a/qelectrotech.pro 2021-02-21 10:15:38.000000000 +0100
36 ++++ b/qelectrotech.pro 2021-02-28 21:12:15.934876464 +0100
37 +@@ -5,21 +5,21 @@
38 + # Chemins utilises pour la compilation et l'installation de QET
39 + unix {
40 + # Chemins UNIX
41 +- COMPIL_PREFIX = '/usr/local/'
42 +- INSTALL_PREFIX = '/usr/local/'
43 ++ COMPIL_PREFIX = '/usr/'
44 ++ INSTALL_PREFIX = '/usr/'
45 + QET_BINARY_PATH = 'bin/'
46 + QET_COMMON_COLLECTION_PATH = 'share/qelectrotech/elements/'
47 + QET_COMMON_TBT_PATH = 'share/qelectrotech/titleblocks/'
48 + QET_LANG_PATH = 'share/qelectrotech/lang/'
49 + QET_EXAMPLES_PATH = 'share/qelectrotech/examples/'
50 + QET_LICENSE_PATH = 'doc/qelectrotech/'
51 +- QET_MIME_XML_PATH = '../share/mime/application/'
52 +- QET_MIME_DESKTOP_PATH = '../share/mimelnk/application/'
53 +- QET_MIME_PACKAGE_PATH = '../share/mime/packages/'
54 ++ QET_MIME_XML_PATH = 'share/mime/application/'
55 ++ QET_MIME_DESKTOP_PATH = 'share/mimelnk/application/'
56 ++ QET_MIME_PACKAGE_PATH = 'share/mime/packages/'
57 + QET_DESKTOP_PATH = 'share/applications/'
58 + QET_ICONS_PATH = 'share/icons/hicolor/'
59 +- QET_MAN_PATH = 'man/'
60 +- QET_APPDATA_PATH = 'share/appdata'
61 ++ QET_MAN_PATH = 'share/man/'
62 ++ QET_APPDATA_PATH = 'share/metainfo'
63 + }
64 + win32 {
65 + # Chemins Windows
66 +@@ -252,9 +252,6 @@
67 + examples.path = $$join(INSTALL_PREFIX,,,$${QET_EXAMPLES_PATH})
68 + examples.files = examples/*
69 +
70 +-copyright.path = $$join(INSTALL_PREFIX,,,$${QET_LICENSE_PATH})
71 +-copyright.files = LICENSE ELEMENTS.LICENSE CREDIT README ChangeLog
72 +-
73 + mime_xml.path = $$join(INSTALL_PREFIX,,,$${QET_MIME_XML_PATH})
74 + mime_xml.files = misc/x-qet-*.xml
75 +
76 +@@ -284,7 +281,7 @@
77 + man.extra = sh man/compress_man_pages.sh
78 +
79 + # L'installation comprend la copie du binaire, des elements, des fichiers de langue et du fichier LICENSE
80 +-INSTALLS += target elements tbt lang copyright
81 ++INSTALLS += target elements tbt lang
82 + # Sous Unix, on installe egalement l'icone, un fichier .desktop, des fichiers mime et les pages de manuel
83 + unix {
84 + INSTALLS += desktop mime_xml mime_desktop mime_package icons man examples appdata
85
86 diff --git a/sci-electronics/qelectrotech/files/qelectrotech-0.80-nomancompress.patch b/sci-electronics/qelectrotech/files/qelectrotech-0.80-nomancompress.patch
87 new file mode 100644
88 index 00000000000..9e63a451289
89 --- /dev/null
90 +++ b/sci-electronics/qelectrotech/files/qelectrotech-0.80-nomancompress.patch
91 @@ -0,0 +1,10 @@
92 +--- a/qelectrotech.pro 2021-02-21 10:15:38.000000000 +0100
93 ++++ b/qelectrotech.pro 2021-02-28 21:41:02.221285171 +0100
94 +@@ -278,7 +278,6 @@
95 +
96 + man.path = $$join(INSTALL_PREFIX,,,$${QET_MAN_PATH})
97 + man.files = man/files/*
98 +-man.extra = sh man/compress_man_pages.sh
99 +
100 + # L'installation comprend la copie du binaire, des elements, des fichiers de langue et du fichier LICENSE
101 + INSTALLS += target elements tbt lang
102
103 diff --git a/sci-electronics/qelectrotech/qelectrotech-9999.ebuild b/sci-electronics/qelectrotech/qelectrotech-0.80.ebuild
104 similarity index 66%
105 copy from sci-electronics/qelectrotech/qelectrotech-9999.ebuild
106 copy to sci-electronics/qelectrotech/qelectrotech-0.80.ebuild
107 index ac7b517d39f..135799c10be 100644
108 --- a/sci-electronics/qelectrotech/qelectrotech-9999.ebuild
109 +++ b/sci-electronics/qelectrotech/qelectrotech-0.80.ebuild
110 @@ -1,4 +1,4 @@
111 -# Copyright 2001-2020 Gentoo Authors
112 +# Copyright 2001-2021 Gentoo Authors
113 # Distributed under the terms of the GNU General Public License v2
114
115 EAPI=7
116 @@ -12,8 +12,8 @@ if [[ ${PV} == *9999* ]]; then
117 EGIT_REPO_URI="https://git.tuxfamily.org/qet/qet.git/"
118 inherit git-r3
119 else
120 - MY_P=${PN}-${PV%0}-src
121 - SRC_URI="https://download.tuxfamily.org/qet/tags/20180823/${MY_P}.tar.gz"
122 + MY_P=qet-${PV/%0/.0}
123 + SRC_URI="https://git.tuxfamily.org/qet/qet.git/snapshot/${MY_P}.tar.gz -> ${P}.tar.gz"
124 KEYWORDS="~amd64 ~x86"
125 S="${WORKDIR}"/${MY_P}
126 fi
127 @@ -23,9 +23,11 @@ SLOT="0"
128 IUSE="doc"
129
130 BDEPEND="
131 + virtual/pkgconfig
132 doc? ( app-doc/doxygen )
133 "
134 RDEPEND="
135 + dev-db/sqlite:3
136 dev-qt/qtconcurrent:5
137 dev-qt/qtcore:5
138 dev-qt/qtgui:5
139 @@ -42,7 +44,19 @@ DEPEND="${RDEPEND}"
140
141 DOCS=( CREDIT ChangeLog README )
142
143 -PATCHES=( "${FILESDIR}/${PN}-0.3-fix-paths.patch" )
144 +PATCHES=(
145 + "${FILESDIR}/${P}-fix-paths.patch"
146 + "${FILESDIR}/${P}-nomancompress.patch"
147 +)
148 +
149 +src_prepare() {
150 + xdg_src_prepare
151 +
152 + if [[ ${PV} != *9999* ]]; then
153 + sed -e "/^DEFINES.*GIT_COMMIT_SHA/s/^/#DONT /" -i ${PN}.pro || die
154 + sed -e "/qInfo.*GIT_COMMIT_SHA/d" -i sources/machine_info.cpp || die
155 + fi
156 +}
157
158 src_configure() {
159 eqmake5 ${PN}.pro
160
161 diff --git a/sci-electronics/qelectrotech/qelectrotech-9999.ebuild b/sci-electronics/qelectrotech/qelectrotech-9999.ebuild
162 index ac7b517d39f..17b3beea624 100644
163 --- a/sci-electronics/qelectrotech/qelectrotech-9999.ebuild
164 +++ b/sci-electronics/qelectrotech/qelectrotech-9999.ebuild
165 @@ -1,4 +1,4 @@
166 -# Copyright 2001-2020 Gentoo Authors
167 +# Copyright 2001-2021 Gentoo Authors
168 # Distributed under the terms of the GNU General Public License v2
169
170 EAPI=7
171 @@ -12,8 +12,8 @@ if [[ ${PV} == *9999* ]]; then
172 EGIT_REPO_URI="https://git.tuxfamily.org/qet/qet.git/"
173 inherit git-r3
174 else
175 - MY_P=${PN}-${PV%0}-src
176 - SRC_URI="https://download.tuxfamily.org/qet/tags/20180823/${MY_P}.tar.gz"
177 + MY_P=qet-${PV/%0/.0}
178 + SRC_URI="https://git.tuxfamily.org/qet/qet.git/snapshot/${MY_P}.tar.gz -> ${P}.tar.gz"
179 KEYWORDS="~amd64 ~x86"
180 S="${WORKDIR}"/${MY_P}
181 fi
182 @@ -23,9 +23,11 @@ SLOT="0"
183 IUSE="doc"
184
185 BDEPEND="
186 + virtual/pkgconfig
187 doc? ( app-doc/doxygen )
188 "
189 RDEPEND="
190 + dev-db/sqlite:3
191 dev-qt/qtconcurrent:5
192 dev-qt/qtcore:5
193 dev-qt/qtgui:5
194 @@ -42,7 +44,19 @@ DEPEND="${RDEPEND}"
195
196 DOCS=( CREDIT ChangeLog README )
197
198 -PATCHES=( "${FILESDIR}/${PN}-0.3-fix-paths.patch" )
199 +PATCHES=(
200 + "${FILESDIR}/${PN}-0.80-fix-paths.patch"
201 + "${FILESDIR}/${PN}-0.80-nomancompress.patch"
202 +)
203 +
204 +src_prepare() {
205 + xdg_src_prepare
206 +
207 + if [[ ${PV} != *9999* ]]; then
208 + sed -e "/^DEFINES.*GIT_COMMIT_SHA/s/^/#DONT /" -i ${PN}.pro || die
209 + sed -e "/qInfo.*GIT_COMMIT_SHA/d" -i sources/machine_info.cpp || die
210 + fi
211 +}
212
213 src_configure() {
214 eqmake5 ${PN}.pro