Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-libs/qscintilla/
Date: Mon, 27 Nov 2017 23:58:45
Message-Id: 1511827044.438bdf60f5fb7c5a48a6cb9e924f5d61db514cd6.asturm@gentoo
1 commit: 438bdf60f5fb7c5a48a6cb9e924f5d61db514cd6
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Mon Nov 20 17:04:27 2017 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Mon Nov 27 23:57:24 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=438bdf60
7
8 x11-libs/qscintilla: Drop old
9
10 Package-Manager: Portage-2.3.13, Repoman-2.3.4
11
12 x11-libs/qscintilla/Manifest | 1 -
13 x11-libs/qscintilla/qscintilla-2.9.4.ebuild | 91 -----------------------------
14 2 files changed, 92 deletions(-)
15
16 diff --git a/x11-libs/qscintilla/Manifest b/x11-libs/qscintilla/Manifest
17 index e59930c4912..1e4c660b045 100644
18 --- a/x11-libs/qscintilla/Manifest
19 +++ b/x11-libs/qscintilla/Manifest
20 @@ -1,3 +1,2 @@
21 DIST QScintilla_gpl-2.10.1.tar.gz 2663446 BLAKE2B 720ce990b4e3dd65d47cd26b473bffc07240d76b2c10d393cba41331c6f160472d87b9b22985fd45b5b8064d5358b3b25f0decfe8759542a9c987381249bca42 SHA512 ea9b95ca371a8af9262493ab59ecaef77e1697ba21d1d594aab39e836917884fd829aa4f6c4e72cce60b0d3f40eac654157cc507d027945f0034881855123ccc
22 DIST QScintilla_gpl-2.10.2.tar.gz 2665138 BLAKE2B 1c6349ea717997681e678cdfa6cc590a6a1cfbe652f2dd52d57fefff71229251c46cd4554b546d2e272deb7c3f970c44f657966ad08e45279813215a775c637d SHA512 755f486d62275acb5908262c4a50ad31dd9d8fca0501eb1eeec1aa2181872f8d16179b42f4213b207fd6b46fd8a72d25af7ce6c5cc10eabb363a92c0600ca972
23 -DIST QScintilla_gpl-2.9.4.tar.gz 2557199 SHA256 8b3a23023e9f0573caed6f9cee86f898d87b768ee15b8c211a423783a4cfa4e6 SHA512 5a2eebbe523a0f2f1c7bc63ce5ee9cb8793a597d00eea5b638f18f90d6e798e92c281be23ee5e7072d5afced9e1fccb6ae51526a3623d373d57c3db64d026b16 WHIRLPOOL 68aacdcd0fc7102494ccae1f0ea3e222845bdd3f9bef603d89fe50d50dba6ac77471228a84c1c281a46ccf74bdb6902aa3bb21f89388ec5408bdde5876cf8655
24
25 diff --git a/x11-libs/qscintilla/qscintilla-2.9.4.ebuild b/x11-libs/qscintilla/qscintilla-2.9.4.ebuild
26 deleted file mode 100644
27 index 66c07763353..00000000000
28 --- a/x11-libs/qscintilla/qscintilla-2.9.4.ebuild
29 +++ /dev/null
30 @@ -1,91 +0,0 @@
31 -# Copyright 1999-2017 Gentoo Foundation
32 -# Distributed under the terms of the GNU General Public License v2
33 -
34 -EAPI=6
35 -
36 -inherit flag-o-matic qmake-utils
37 -
38 -MY_P=QScintilla_gpl-${PV}
39 -
40 -DESCRIPTION="A Qt port of Neil Hodgson's Scintilla C++ editor class"
41 -HOMEPAGE="https://www.riverbankcomputing.com/software/qscintilla/intro"
42 -SRC_URI="mirror://sourceforge/pyqt/${MY_P}.tar.gz"
43 -
44 -LICENSE="GPL-3"
45 -SLOT="0/12"
46 -KEYWORDS="~alpha amd64 ~arm ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
47 -IUSE="designer doc +qt4 qt5"
48 -
49 -REQUIRED_USE="^^ ( qt4 qt5 )"
50 -
51 -DEPEND="
52 - qt4? (
53 - dev-qt/qtcore:4
54 - dev-qt/qtgui:4
55 - designer? ( dev-qt/designer:4 )
56 - )
57 - qt5? (
58 - dev-qt/qtcore:5
59 - dev-qt/qtgui:5
60 - dev-qt/qtprintsupport:5
61 - dev-qt/qtwidgets:5
62 - designer? ( dev-qt/designer:5 )
63 - )
64 -"
65 -RDEPEND="${DEPEND}"
66 -
67 -S=${WORKDIR}/${MY_P}
68 -
69 -src_unpack() {
70 - default
71 -
72 - # Sub-slot sanity check
73 - local subslot=${SLOT#*/}
74 - local version=$(sed -nre 's:.*VERSION\s*=\s*([0-9\.]+):\1:p' "${S}"/Qt4Qt5/qscintilla.pro)
75 - local major=${version%%.*}
76 - if [[ ${subslot} != ${major} ]]; then
77 - eerror
78 - eerror "Ebuild sub-slot (${subslot}) does not match QScintilla major version (${major})"
79 - eerror "Please update SLOT variable as follows:"
80 - eerror " SLOT=\"${SLOT%%/*}/${major}\""
81 - eerror
82 - die "sub-slot sanity check failed"
83 - fi
84 -}
85 -
86 -qsci_run_in() {
87 - pushd "$1" >/dev/null || die
88 - shift || die
89 - "$@" || die
90 - popd >/dev/null || die
91 -}
92 -
93 -src_configure() {
94 - local my_eqmake=eqmake$(usex qt5 5 4)
95 -
96 - qsci_run_in Qt4Qt5 ${my_eqmake}
97 -
98 - if use designer; then
99 - # prevent building against system version (bug 466120)
100 - append-cxxflags -I../Qt4Qt5
101 - append-ldflags -L../Qt4Qt5
102 -
103 - qsci_run_in designer-Qt4Qt5 ${my_eqmake}
104 - fi
105 -}
106 -
107 -src_compile() {
108 - qsci_run_in Qt4Qt5 emake
109 -
110 - use designer && qsci_run_in designer-Qt4Qt5 emake
111 -}
112 -
113 -src_install() {
114 - qsci_run_in Qt4Qt5 emake INSTALL_ROOT="${D}" install
115 -
116 - use designer && qsci_run_in designer-Qt4Qt5 emake INSTALL_ROOT="${D}" install
117 -
118 - DOCS=( ChangeLog NEWS )
119 - use doc && HTML_DOCS=( doc/html-Qt4Qt5/. )
120 - einstalldocs
121 -}