1 |
commit: 6e56663ad2f11eb0e3c0032dee225f75725bf3e5 |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Apr 26 03:27:52 2018 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Apr 26 03:30:00 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e56663a |
7 |
|
8 |
x11-libs/qscintilla: Drop 2.10.{1,2} with Qt4-support |
9 |
|
10 |
Closes: https://bugs.gentoo.org/634970 |
11 |
Package-Manager: Portage-2.3.28, Repoman-2.3.9 |
12 |
|
13 |
x11-libs/qscintilla/Manifest | 2 - |
14 |
x11-libs/qscintilla/qscintilla-2.10.1.ebuild | 100 --------------------------- |
15 |
x11-libs/qscintilla/qscintilla-2.10.2.ebuild | 100 --------------------------- |
16 |
3 files changed, 202 deletions(-) |
17 |
|
18 |
diff --git a/x11-libs/qscintilla/Manifest b/x11-libs/qscintilla/Manifest |
19 |
index b8473672244..4f7edbb1cb0 100644 |
20 |
--- a/x11-libs/qscintilla/Manifest |
21 |
+++ b/x11-libs/qscintilla/Manifest |
22 |
@@ -1,4 +1,2 @@ |
23 |
-DIST QScintilla_gpl-2.10.1.tar.gz 2663446 BLAKE2B 720ce990b4e3dd65d47cd26b473bffc07240d76b2c10d393cba41331c6f160472d87b9b22985fd45b5b8064d5358b3b25f0decfe8759542a9c987381249bca42 SHA512 ea9b95ca371a8af9262493ab59ecaef77e1697ba21d1d594aab39e836917884fd829aa4f6c4e72cce60b0d3f40eac654157cc507d027945f0034881855123ccc |
24 |
-DIST QScintilla_gpl-2.10.2.tar.gz 2665138 BLAKE2B 1c6349ea717997681e678cdfa6cc590a6a1cfbe652f2dd52d57fefff71229251c46cd4554b546d2e272deb7c3f970c44f657966ad08e45279813215a775c637d SHA512 755f486d62275acb5908262c4a50ad31dd9d8fca0501eb1eeec1aa2181872f8d16179b42f4213b207fd6b46fd8a72d25af7ce6c5cc10eabb363a92c0600ca972 |
25 |
DIST QScintilla_gpl-2.10.3.tar.gz 2721287 BLAKE2B cc85eea17e563ae5f4a130d26ca88bec3e1a6cbff7bc0af096c63789384d03149105641d6324f53b37a2bd8ab4681a285ccb76e6063a06e5db30d070d3fd8219 SHA512 a1b9d6869797ec074e4e0727164804779792fb77b2230aae80e6d6b5fb3a3ff9d84e17d775d18ab74c97b78bac454511fd2cb49be1fa36f71d9097abf88045b6 |
26 |
DIST QScintilla_gpl-2.10.4.tar.gz 2721322 BLAKE2B df50dd0a34db96dd57147ddc399d4a30751b1bb4922dc1b8b3c3c1989e810937dc8345f92128e8a606b1edc04fde4b930a424ab8344818c9899c8fe496793a77 SHA512 dee6684f68173784d098931554c839a30e129b89f980cd9704f818c44eb7023199bd3682e4b342091fa3e0ce577ec576d34046477bdd1d7fc58ca5dd2ba947a3 |
27 |
|
28 |
diff --git a/x11-libs/qscintilla/qscintilla-2.10.1.ebuild b/x11-libs/qscintilla/qscintilla-2.10.1.ebuild |
29 |
deleted file mode 100644 |
30 |
index 5c8d5a899dc..00000000000 |
31 |
--- a/x11-libs/qscintilla/qscintilla-2.10.1.ebuild |
32 |
+++ /dev/null |
33 |
@@ -1,100 +0,0 @@ |
34 |
-# Copyright 1999-2017 Gentoo Foundation |
35 |
-# Distributed under the terms of the GNU General Public License v2 |
36 |
- |
37 |
-EAPI=6 |
38 |
- |
39 |
-inherit flag-o-matic multibuild qmake-utils |
40 |
- |
41 |
-MY_P=QScintilla_gpl-${PV/_pre/.dev} |
42 |
- |
43 |
-DESCRIPTION="A Qt port of Neil Hodgson's Scintilla C++ editor class" |
44 |
-HOMEPAGE="https://www.riverbankcomputing.com/software/qscintilla/intro" |
45 |
-SRC_URI="mirror://sourceforge/pyqt/${MY_P}.tar.gz" |
46 |
- |
47 |
-LICENSE="GPL-3" |
48 |
-SLOT="0/13" |
49 |
-KEYWORDS="~alpha amd64 ~arm ~ia64 ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux" |
50 |
-IUSE="designer doc +qt4 qt5" |
51 |
- |
52 |
-REQUIRED_USE="|| ( qt4 qt5 )" |
53 |
- |
54 |
-DEPEND=" |
55 |
- qt4? ( |
56 |
- dev-qt/qtcore:4 |
57 |
- dev-qt/qtgui:4 |
58 |
- designer? ( dev-qt/designer:4 ) |
59 |
- ) |
60 |
- qt5? ( |
61 |
- dev-qt/qtcore:5 |
62 |
- dev-qt/qtgui:5 |
63 |
- dev-qt/qtprintsupport:5 |
64 |
- dev-qt/qtwidgets:5 |
65 |
- designer? ( dev-qt/designer:5 ) |
66 |
- ) |
67 |
-" |
68 |
-RDEPEND="${DEPEND}" |
69 |
- |
70 |
-S=${WORKDIR}/${MY_P} |
71 |
- |
72 |
-src_unpack() { |
73 |
- default |
74 |
- |
75 |
- # Sub-slot sanity check |
76 |
- local subslot=${SLOT#*/} |
77 |
- local version=$(sed -nre 's:.*VERSION\s*=\s*([0-9\.]+):\1:p' "${S}"/Qt4Qt5/qscintilla.pro) |
78 |
- local major=${version%%.*} |
79 |
- if [[ ${subslot} != ${major} ]]; then |
80 |
- eerror |
81 |
- eerror "Ebuild sub-slot (${subslot}) does not match QScintilla major version (${major})" |
82 |
- eerror "Please update SLOT variable as follows:" |
83 |
- eerror " SLOT=\"${SLOT%%/*}/${major}\"" |
84 |
- eerror |
85 |
- die "sub-slot sanity check failed" |
86 |
- fi |
87 |
- |
88 |
- MULTIBUILD_VARIANTS=( $(usev qt4) $(usev qt5) ) |
89 |
- multibuild_copy_sources |
90 |
-} |
91 |
- |
92 |
-qsci_run_in() { |
93 |
- pushd "$1" >/dev/null || die |
94 |
- shift || die |
95 |
- "$@" || die |
96 |
- popd >/dev/null || die |
97 |
-} |
98 |
- |
99 |
-src_configure() { |
100 |
- use qt4 && append-cxxflags -std=gnu++0x |
101 |
- |
102 |
- if use designer; then |
103 |
- # prevent building against system version (bug 466120) |
104 |
- append-cxxflags -I../Qt4Qt5 |
105 |
- append-ldflags -L../Qt4Qt5 |
106 |
- fi |
107 |
- |
108 |
- qsci_configure() { |
109 |
- qsci_run_in Qt4Qt5 eqmake${MULTIBUILD_VARIANT#qt} |
110 |
- use designer && qsci_run_in designer-Qt4Qt5 eqmake${MULTIBUILD_VARIANT#qt} |
111 |
- } |
112 |
- multibuild_foreach_variant run_in_build_dir qsci_configure |
113 |
-} |
114 |
- |
115 |
-src_compile() { |
116 |
- qsci_compile() { |
117 |
- qsci_run_in Qt4Qt5 emake |
118 |
- use designer && qsci_run_in designer-Qt4Qt5 emake |
119 |
- } |
120 |
- multibuild_foreach_variant run_in_build_dir qsci_compile |
121 |
-} |
122 |
- |
123 |
-src_install() { |
124 |
- qsci_install() { |
125 |
- qsci_run_in Qt4Qt5 emake INSTALL_ROOT="${D}" install |
126 |
- use designer && qsci_run_in designer-Qt4Qt5 emake INSTALL_ROOT="${D}" install |
127 |
- } |
128 |
- multibuild_foreach_variant run_in_build_dir qsci_install |
129 |
- |
130 |
- DOCS=( ChangeLog NEWS ) |
131 |
- use doc && HTML_DOCS=( doc/html-Qt4Qt5/. ) |
132 |
- einstalldocs |
133 |
-} |
134 |
|
135 |
diff --git a/x11-libs/qscintilla/qscintilla-2.10.2.ebuild b/x11-libs/qscintilla/qscintilla-2.10.2.ebuild |
136 |
deleted file mode 100644 |
137 |
index eb99746332b..00000000000 |
138 |
--- a/x11-libs/qscintilla/qscintilla-2.10.2.ebuild |
139 |
+++ /dev/null |
140 |
@@ -1,100 +0,0 @@ |
141 |
-# Copyright 1999-2017 Gentoo Foundation |
142 |
-# Distributed under the terms of the GNU General Public License v2 |
143 |
- |
144 |
-EAPI=6 |
145 |
- |
146 |
-inherit flag-o-matic multibuild qmake-utils |
147 |
- |
148 |
-MY_P=QScintilla_gpl-${PV/_pre/.dev} |
149 |
- |
150 |
-DESCRIPTION="A Qt port of Neil Hodgson's Scintilla C++ editor class" |
151 |
-HOMEPAGE="https://www.riverbankcomputing.com/software/qscintilla/intro" |
152 |
-SRC_URI="mirror://sourceforge/pyqt/${MY_P}.tar.gz" |
153 |
- |
154 |
-LICENSE="GPL-3" |
155 |
-SLOT="0/13" |
156 |
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" |
157 |
-IUSE="designer doc +qt4 qt5" |
158 |
- |
159 |
-REQUIRED_USE="|| ( qt4 qt5 )" |
160 |
- |
161 |
-DEPEND=" |
162 |
- qt4? ( |
163 |
- dev-qt/qtcore:4 |
164 |
- dev-qt/qtgui:4 |
165 |
- designer? ( dev-qt/designer:4 ) |
166 |
- ) |
167 |
- qt5? ( |
168 |
- dev-qt/qtcore:5 |
169 |
- dev-qt/qtgui:5 |
170 |
- dev-qt/qtprintsupport:5 |
171 |
- dev-qt/qtwidgets:5 |
172 |
- designer? ( dev-qt/designer:5 ) |
173 |
- ) |
174 |
-" |
175 |
-RDEPEND="${DEPEND}" |
176 |
- |
177 |
-S=${WORKDIR}/${MY_P} |
178 |
- |
179 |
-src_unpack() { |
180 |
- default |
181 |
- |
182 |
- # Sub-slot sanity check |
183 |
- local subslot=${SLOT#*/} |
184 |
- local version=$(sed -nre 's:.*VERSION\s*=\s*([0-9\.]+):\1:p' "${S}"/Qt4Qt5/qscintilla.pro) |
185 |
- local major=${version%%.*} |
186 |
- if [[ ${subslot} != ${major} ]]; then |
187 |
- eerror |
188 |
- eerror "Ebuild sub-slot (${subslot}) does not match QScintilla major version (${major})" |
189 |
- eerror "Please update SLOT variable as follows:" |
190 |
- eerror " SLOT=\"${SLOT%%/*}/${major}\"" |
191 |
- eerror |
192 |
- die "sub-slot sanity check failed" |
193 |
- fi |
194 |
- |
195 |
- MULTIBUILD_VARIANTS=( $(usev qt4) $(usev qt5) ) |
196 |
- multibuild_copy_sources |
197 |
-} |
198 |
- |
199 |
-qsci_run_in() { |
200 |
- pushd "$1" >/dev/null || die |
201 |
- shift || die |
202 |
- "$@" || die |
203 |
- popd >/dev/null || die |
204 |
-} |
205 |
- |
206 |
-src_configure() { |
207 |
- use qt4 && append-cxxflags -std=gnu++0x |
208 |
- |
209 |
- if use designer; then |
210 |
- # prevent building against system version (bug 466120) |
211 |
- append-cxxflags -I../Qt4Qt5 |
212 |
- append-ldflags -L../Qt4Qt5 |
213 |
- fi |
214 |
- |
215 |
- qsci_configure() { |
216 |
- qsci_run_in Qt4Qt5 eqmake${MULTIBUILD_VARIANT#qt} |
217 |
- use designer && qsci_run_in designer-Qt4Qt5 eqmake${MULTIBUILD_VARIANT#qt} |
218 |
- } |
219 |
- multibuild_foreach_variant run_in_build_dir qsci_configure |
220 |
-} |
221 |
- |
222 |
-src_compile() { |
223 |
- qsci_compile() { |
224 |
- qsci_run_in Qt4Qt5 emake |
225 |
- use designer && qsci_run_in designer-Qt4Qt5 emake |
226 |
- } |
227 |
- multibuild_foreach_variant run_in_build_dir qsci_compile |
228 |
-} |
229 |
- |
230 |
-src_install() { |
231 |
- qsci_install() { |
232 |
- qsci_run_in Qt4Qt5 emake INSTALL_ROOT="${D}" install |
233 |
- use designer && qsci_run_in designer-Qt4Qt5 emake INSTALL_ROOT="${D}" install |
234 |
- } |
235 |
- multibuild_foreach_variant run_in_build_dir qsci_install |
236 |
- |
237 |
- DOCS=( ChangeLog NEWS ) |
238 |
- use doc && HTML_DOCS=( doc/html-Qt4Qt5/. ) |
239 |
- einstalldocs |
240 |
-} |