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: Sun, 26 Feb 2017 01:51:13
Message-Id: 1488073853.5029d048170884b9f4051e6a9c3b81ed3b5b9fcd.pesa@gentoo
1 commit: 5029d048170884b9f4051e6a9c3b81ed3b5b9fcd
2 Author: Davide Pesavento <pesa <AT> gentoo <DOT> org>
3 AuthorDate: Sun Feb 26 01:50:53 2017 +0000
4 Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
5 CommitDate: Sun Feb 26 01:50:53 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5029d048
7
8 x11-libs/qscintilla: version bump (p.masked)
9
10 Finally supports side-by-side installation of qt4 and qt5 variants.
11
12 Package-Manager: Portage-2.3.3, Repoman-2.3.1
13
14 x11-libs/qscintilla/Manifest | 1 +
15 x11-libs/qscintilla/qscintilla-2.10.ebuild | 100 +++++++++++++++++++++++++++++
16 2 files changed, 101 insertions(+)
17
18 diff --git a/x11-libs/qscintilla/Manifest b/x11-libs/qscintilla/Manifest
19 index 7bebb5af12..80af86f450 100644
20 --- a/x11-libs/qscintilla/Manifest
21 +++ b/x11-libs/qscintilla/Manifest
22 @@ -1,2 +1,3 @@
23 +DIST QScintilla_gpl-2.10.tar.gz 2662004 SHA256 16be30577bc178470936c458551f2512cc068aff6e7a7de6ed244e28c045f6ec SHA512 fe33471de0807bc4e0d6b86e78eac70531a20c96b5c3269111d4c89eca7ccae5e55752fc2a5c8f20f37220a3ccfb6e9d7d718c02058dd8b40075d40da211a93b WHIRLPOOL 40973a8f925e7a2545b8960ad09547ea62ac7e67ac964a00f775dd62259f8cfe7420a7bfb18e4cfce83ecfa67af68a43742ebee36e89fa89e4bc9b6204601429
24 DIST QScintilla_gpl-2.9.2.tar.gz 2491222 SHA256 f2c8ccdc9d3dbb90764ceed53ea096da9bb13b6260da1324e6ab4ecea29e620a SHA512 28f88111d7eb6a016a4b87f04d2b7f5d6481b521a3361a526b3b45a56240f5c8de10310e819234fcba773c6df73bf398ae2dce622976a8e760f506be1defb7c8 WHIRLPOOL a04420c66fd417e5304c92a1ee3c1998f6849bccb9088dae96ed48c06cab0a9b1c012f073aafb1e05aaee46564de9ac89ae07145f3ded35cf47beac78065650a
25 DIST QScintilla_gpl-2.9.4.tar.gz 2557199 SHA256 8b3a23023e9f0573caed6f9cee86f898d87b768ee15b8c211a423783a4cfa4e6 SHA512 5a2eebbe523a0f2f1c7bc63ce5ee9cb8793a597d00eea5b638f18f90d6e798e92c281be23ee5e7072d5afced9e1fccb6ae51526a3623d373d57c3db64d026b16 WHIRLPOOL 68aacdcd0fc7102494ccae1f0ea3e222845bdd3f9bef603d89fe50d50dba6ac77471228a84c1c281a46ccf74bdb6902aa3bb21f89388ec5408bdde5876cf8655
26
27 diff --git a/x11-libs/qscintilla/qscintilla-2.10.ebuild b/x11-libs/qscintilla/qscintilla-2.10.ebuild
28 new file mode 100644
29 index 0000000000..0a2c0de126
30 --- /dev/null
31 +++ b/x11-libs/qscintilla/qscintilla-2.10.ebuild
32 @@ -0,0 +1,100 @@
33 +# Copyright 1999-2017 Gentoo Foundation
34 +# Distributed under the terms of the GNU General Public License v2
35 +# $Id$
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 + if use designer; then
102 + # prevent building against system version (bug 466120)
103 + append-cxxflags -I../Qt4Qt5
104 + append-ldflags -L../Qt4Qt5
105 + fi
106 +
107 + configure() {
108 + qsci_run_in Qt4Qt5 eqmake${MULTIBUILD_VARIANT#qt}
109 + use designer && qsci_run_in designer-Qt4Qt5 eqmake${MULTIBUILD_VARIANT#qt}
110 + }
111 + multibuild_foreach_variant run_in_build_dir configure
112 +}
113 +
114 +src_compile() {
115 + compile() {
116 + qsci_run_in Qt4Qt5 emake
117 + use designer && qsci_run_in designer-Qt4Qt5 emake
118 + }
119 + multibuild_foreach_variant run_in_build_dir compile
120 +}
121 +
122 +src_install() {
123 + install() {
124 + qsci_run_in Qt4Qt5 emake INSTALL_ROOT="${D}" install
125 + use designer && qsci_run_in designer-Qt4Qt5 emake INSTALL_ROOT="${D}" install
126 + }
127 + multibuild_foreach_variant run_in_build_dir install
128 +
129 + DOCS=( ChangeLog NEWS )
130 + use doc && HTML_DOCS=( doc/html-Qt4Qt5/. )
131 + einstalldocs
132 +}