summaryrefslogtreecommitdiff
path: root/x11-libs/qscintilla
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2020-04-12 03:41:30 +0100
committerV3n3RiX <venerix@redcorelinux.org>2020-04-12 03:41:30 +0100
commit623ee73d661e5ed8475cb264511f683407d87365 (patch)
tree993eb27c93ec7a2d2d19550300d888fc1fed9e69 /x11-libs/qscintilla
parentceeeb463cc1eef97fd62eaee8bf2196ba04bc384 (diff)
gentoo Easter resync : 12.04.2020
Diffstat (limited to 'x11-libs/qscintilla')
-rw-r--r--x11-libs/qscintilla/Manifest4
-rw-r--r--x11-libs/qscintilla/qscintilla-2.11.3.ebuild82
-rw-r--r--x11-libs/qscintilla/qscintilla-2.11.4.ebuild4
3 files changed, 3 insertions, 87 deletions
diff --git a/x11-libs/qscintilla/Manifest b/x11-libs/qscintilla/Manifest
index 737ea51d1cb2..7f302e668c28 100644
--- a/x11-libs/qscintilla/Manifest
+++ b/x11-libs/qscintilla/Manifest
@@ -1,5 +1,3 @@
-DIST QScintilla-2.11.3.tar.gz 3006383 BLAKE2B 6238aaff44d6136a64e8c38e38c4886357eb72aa4067f54eda1e876040c41ebce8577e244b81a062e9020c4d142439f5612ca88055d0ba87172ff5b8893938d7 SHA512 83406ef2f425c6288fcac52b01417853186ba860e33e14b236801271e034c327cbb00817cb7247e98bafc1844aeff9f24ec4878ac8ec4bd52d0d2d9778f6b884
DIST QScintilla-2.11.4.tar.gz 3007719 BLAKE2B b0f88a15a3636a0056d3bdac6e5d5bb05a065461c7de7fe0d5ad1740e87ca78a47bc1fd1af90a8751b553e8e326c830088a4cb38c9ebcad6be8bf9ebdb49bad0 SHA512 90fc2427121ca9ae55e34cf636460099bbdadd844318d9ef05f86790a36e25fb64528264bb7bb99e46b7add96378eff0cc69bb692940c6a1bddfadf86a9abdbd
-EBUILD qscintilla-2.11.3.ebuild 1954 BLAKE2B 249d3628025e2ecd7c026290d337a1eefa30efb5700612b76189adc35a346593814b6c0d581cf7d31746d5ed631680440185dff5ab0e3e91810a1aa910ac027e SHA512 3df250303393e3b9cd8408cb47fffd83c7063e7b0f4961eab6ed24f45c2a9dc0cd4d19016d850e048c209d90cd944b74d7be7ac073bd51c268d85e1b844d3517
-EBUILD qscintilla-2.11.4.ebuild 1957 BLAKE2B 84a7752f28ce961ab39d41f5c2c63c6c040bb78ce4789075305496024d5fd0878689b095af9d01503998bc8c9c070750827314b6c1ce1abdb0ddc4c9235f2702 SHA512 d139200a4e02325878bded6c8f6858a47ed0444a1a6044992e783e79034b3896fe2aa68726f917faddf83dc112ae6b1764eac305394aea55efa7c6d069150078
+EBUILD qscintilla-2.11.4.ebuild 1961 BLAKE2B 86dfccd17bcf5d2aa8b20209aced0009fde39020466a7424f81f434a7bea536c72a93d9a82db006fcc9f65aedd29a757712f40c5131a501550b8bfc1cd4ca106 SHA512 cb82aa14bfdfb8f986ba9c28a0e0697ce969d433ad08eff97e4919506db36ad618c4bbad81839d0e2387e9c09269bf611d9695e986b10aa89f8ccff5c92c0659
MISC metadata.xml 604 BLAKE2B d353a492de987b1b7898a206a1d29fff43dc25ec7809d95fe8ddd816507c24b7fea26de43ce16cb0b939e31d663d280231202b787fcff2f6b79d4716c9a00713 SHA512 ff45db818793a808f2fee2a85fbf9d3a069bcf406f8d18c5a49f527d332002cad64295ae9b31f5297203610a4497db12e5aace0861069e55f127c736a4065580
diff --git a/x11-libs/qscintilla/qscintilla-2.11.3.ebuild b/x11-libs/qscintilla/qscintilla-2.11.3.ebuild
deleted file mode 100644
index f6b4a37b4593..000000000000
--- a/x11-libs/qscintilla/qscintilla-2.11.3.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic qmake-utils
-
-DESCRIPTION="Qt port of Neil Hodgson's Scintilla C++ editor control"
-HOMEPAGE="https://www.riverbankcomputing.com/software/qscintilla/intro"
-
-MY_PN=QScintilla
-MY_P=${MY_PN}-${PV/_pre/.dev}
-if [[ ${PV} == *_pre* ]]; then
- SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.gz"
-else
- SRC_URI="https://www.riverbankcomputing.com/static/Downloads/${MY_PN}/${PV}/${MY_P}.tar.gz"
-fi
-
-LICENSE="GPL-3"
-SLOT="0/15"
-KEYWORDS="amd64 ~arm ppc ~ppc64 x86"
-IUSE="designer doc"
-
-RDEPEND="
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtprintsupport:5
- dev-qt/qtwidgets:5
- designer? ( dev-qt/designer:5 )
-"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
- default
-
- # Sub-slot sanity check
- local subslot=${SLOT#*/}
- local version=$(sed -nre 's:.*VERSION\s*=\s*([0-9\.]+):\1:p' "${S}"/Qt4Qt5/qscintilla.pro || die)
- local major=${version%%.*}
- if [[ ${subslot} != ${major} ]]; then
- eerror
- eerror "Ebuild sub-slot (${subslot}) does not match QScintilla major version (${major})"
- eerror "Please update SLOT variable as follows:"
- eerror " SLOT=\"${SLOT%%/*}/${major}\""
- eerror
- die "sub-slot sanity check failed"
- fi
-}
-
-qsci_run_in() {
- pushd "$1" >/dev/null || die
- shift || die
- "$@" || die
- popd >/dev/null || die
-}
-
-src_configure() {
- if use designer; then
- # prevent building against system version (bug 466120)
- append-cxxflags -I../Qt4Qt5
- append-ldflags -L../Qt4Qt5
- fi
-
- qsci_run_in Qt4Qt5 eqmake5
- use designer && qsci_run_in designer-Qt4Qt5 eqmake5
-}
-
-src_compile() {
- qsci_run_in Qt4Qt5 emake
- use designer && qsci_run_in designer-Qt4Qt5 emake
-}
-
-src_install() {
- qsci_run_in Qt4Qt5 emake INSTALL_ROOT="${D}" install
- use designer && qsci_run_in designer-Qt4Qt5 emake INSTALL_ROOT="${D}" install
-
- DOCS=( ChangeLog NEWS )
- use doc && HTML_DOCS=( doc/html-Qt4Qt5/. )
- einstalldocs
-}
diff --git a/x11-libs/qscintilla/qscintilla-2.11.4.ebuild b/x11-libs/qscintilla/qscintilla-2.11.4.ebuild
index 9c5354a9b46e..b6721fffe964 100644
--- a/x11-libs/qscintilla/qscintilla-2.11.4.ebuild
+++ b/x11-libs/qscintilla/qscintilla-2.11.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -18,7 +18,7 @@ fi
LICENSE="GPL-3"
SLOT="0/15"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 x86"
IUSE="designer doc"
RDEPEND="