Gentoo Archives: gentoo-commits

From: Davide Pesavento <pesa@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-libs/qscintilla/
Date: Mon, 23 Dec 2019 00:09:54
Message-Id: 1577059781.cc5c08824aed4d4abd1ce2d4a15cfc327274fa76.pesa@gentoo
1 commit: cc5c08824aed4d4abd1ce2d4a15cfc327274fa76
2 Author: Davide Pesavento <pesa <AT> gentoo <DOT> org>
3 AuthorDate: Mon Dec 23 00:09:41 2019 +0000
4 Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
5 CommitDate: Mon Dec 23 00:09:41 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc5c0882
7
8 x11-libs/qscintilla: drop 2.11.1
9
10 Package-Manager: Portage-2.3.82, Repoman-2.3.20
11 Signed-off-by: Davide Pesavento <pesa <AT> gentoo.org>
12
13 x11-libs/qscintilla/Manifest | 1 -
14 x11-libs/qscintilla/qscintilla-2.11.1.ebuild | 82 ----------------------------
15 2 files changed, 83 deletions(-)
16
17 diff --git a/x11-libs/qscintilla/Manifest b/x11-libs/qscintilla/Manifest
18 index c9fd8e685d5..afe4c275980 100644
19 --- a/x11-libs/qscintilla/Manifest
20 +++ b/x11-libs/qscintilla/Manifest
21 @@ -1,3 +1,2 @@
22 DIST QScintilla-2.11.3.tar.gz 3006383 BLAKE2B 6238aaff44d6136a64e8c38e38c4886357eb72aa4067f54eda1e876040c41ebce8577e244b81a062e9020c4d142439f5612ca88055d0ba87172ff5b8893938d7 SHA512 83406ef2f425c6288fcac52b01417853186ba860e33e14b236801271e034c327cbb00817cb7247e98bafc1844aeff9f24ec4878ac8ec4bd52d0d2d9778f6b884
23 DIST QScintilla_gpl-2.10.8.tar.gz 2736054 BLAKE2B 4bc7a2bc1974f8e10a96b7716a8e35d4854e9eeb8040734f99b796bddd9679ee2539f6517743689f9d7deff9ce523cdbb2f77ccd65eaadfc947dcc7a1337d918 SHA512 c0a216737dbda6bc390225196b37a43e4884c9cd67e6e81fc1b1b952683fe88dbfe7caf3c66d94a378f37502e1f08cbdf788426248e73f5f66ec65982b7652b5
24 -DIST QScintilla_gpl-2.11.1.tar.gz 2932060 BLAKE2B 9f2f9fd89667cc04c95d0a36e4a615dcf3c1c11a5446e19a43104513894b76bc7478f2aed7e8c94ce413f940327deb09e51507bee1fa35c79c176e01e6b74767 SHA512 40b600aa8eec17bc99491a08aeaee72bf498a66f0257d310a8df2667de82805715b9c859885c092acfb03ba8f69433a6517d0d4bb324bf99bd9db461172c08d5
25
26 diff --git a/x11-libs/qscintilla/qscintilla-2.11.1.ebuild b/x11-libs/qscintilla/qscintilla-2.11.1.ebuild
27 deleted file mode 100644
28 index ae3d709bc0d..00000000000
29 --- a/x11-libs/qscintilla/qscintilla-2.11.1.ebuild
30 +++ /dev/null
31 @@ -1,82 +0,0 @@
32 -# Copyright 1999-2019 Gentoo Authors
33 -# Distributed under the terms of the GNU General Public License v2
34 -
35 -EAPI=7
36 -
37 -inherit flag-o-matic qmake-utils
38 -
39 -DESCRIPTION="Qt port of Neil Hodgson's Scintilla C++ editor control"
40 -HOMEPAGE="https://www.riverbankcomputing.com/software/qscintilla/intro"
41 -
42 -MY_PN=QScintilla
43 -MY_P=${MY_PN}_gpl-${PV/_pre/.dev}
44 -if [[ ${PV} == *_pre* ]]; then
45 - SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.gz"
46 -else
47 - SRC_URI="https://www.riverbankcomputing.com/static/Downloads/${MY_PN}/${PV}/${MY_P}.tar.gz"
48 -fi
49 -
50 -LICENSE="GPL-3"
51 -SLOT="0/15"
52 -KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
53 -IUSE="designer doc"
54 -
55 -RDEPEND="
56 - dev-qt/qtcore:5
57 - dev-qt/qtgui:5
58 - dev-qt/qtprintsupport:5
59 - dev-qt/qtwidgets:5
60 - designer? ( dev-qt/designer:5 )
61 -"
62 -DEPEND="${RDEPEND}"
63 -
64 -S=${WORKDIR}/${MY_P}
65 -
66 -src_unpack() {
67 - default
68 -
69 - # Sub-slot sanity check
70 - local subslot=${SLOT#*/}
71 - local version=$(sed -nre 's:.*VERSION\s*=\s*([0-9\.]+):\1:p' "${S}"/Qt4Qt5/qscintilla.pro || die)
72 - local major=${version%%.*}
73 - if [[ ${subslot} != ${major} ]]; then
74 - eerror
75 - eerror "Ebuild sub-slot (${subslot}) does not match QScintilla major version (${major})"
76 - eerror "Please update SLOT variable as follows:"
77 - eerror " SLOT=\"${SLOT%%/*}/${major}\""
78 - eerror
79 - die "sub-slot sanity check failed"
80 - fi
81 -}
82 -
83 -qsci_run_in() {
84 - pushd "$1" >/dev/null || die
85 - shift || die
86 - "$@" || die
87 - popd >/dev/null || die
88 -}
89 -
90 -src_configure() {
91 - if use designer; then
92 - # prevent building against system version (bug 466120)
93 - append-cxxflags -I../Qt4Qt5
94 - append-ldflags -L../Qt4Qt5
95 - fi
96 -
97 - qsci_run_in Qt4Qt5 eqmake5
98 - use designer && qsci_run_in designer-Qt4Qt5 eqmake5
99 -}
100 -
101 -src_compile() {
102 - qsci_run_in Qt4Qt5 emake
103 - use designer && qsci_run_in designer-Qt4Qt5 emake
104 -}
105 -
106 -src_install() {
107 - qsci_run_in Qt4Qt5 emake INSTALL_ROOT="${D}" install
108 - use designer && qsci_run_in designer-Qt4Qt5 emake INSTALL_ROOT="${D}" install
109 -
110 - DOCS=( ChangeLog NEWS )
111 - use doc && HTML_DOCS=( doc/html-Qt4Qt5/. )
112 - einstalldocs
113 -}