diff options
author | Davide Pesavento <pesa@gentoo.org> | 2016-04-18 21:14:36 +0200 |
---|---|---|
committer | Davide Pesavento <pesa@gentoo.org> | 2016-04-20 02:38:14 +0200 |
commit | 246690df749f75fa6c74290a05895e8593f4dac4 (patch) | |
tree | ffa360411227c9b03dbee329192365f2e074071e /x11-libs/qscintilla | |
parent | x11-libs/qscintilla: remove old (diff) | |
download | gentoo-246690df749f75fa6c74290a05895e8593f4dac4.tar.gz gentoo-246690df749f75fa6c74290a05895e8593f4dac4.tar.bz2 gentoo-246690df749f75fa6c74290a05895e8593f4dac4.zip |
x11-libs/qscintilla: version bump, EAPI=6, fix LICENSE
Package-Manager: portage-2.2.28
Diffstat (limited to 'x11-libs/qscintilla')
-rw-r--r-- | x11-libs/qscintilla/Manifest | 1 | ||||
-rw-r--r-- | x11-libs/qscintilla/qscintilla-2.9.1.ebuild | 4 | ||||
-rw-r--r-- | x11-libs/qscintilla/qscintilla-2.9.2.ebuild | 82 |
3 files changed, 85 insertions, 2 deletions
diff --git a/x11-libs/qscintilla/Manifest b/x11-libs/qscintilla/Manifest index 72e0c465173d..1a6077619de7 100644 --- a/x11-libs/qscintilla/Manifest +++ b/x11-libs/qscintilla/Manifest @@ -1,2 +1,3 @@ DIST QScintilla-gpl-2.8.4.tar.gz 3031919 SHA256 9b7b2d7440cc39736bbe937b853506b3bd218af3b79095d4f710cccb0fabe80f SHA512 ab10dc756231b293ddebc06e681bb65a11b2be2a4c4132a5b2a27ca583adef76af325fa95748888d9091f2e89a30494d370df262c4eaba7b7fbed04fb7c76907 WHIRLPOOL 7357addbc0ad8869c5749a67106c18e47d79e32399416cc2867461fa8ad0c662711b8937987cb7c3cd5b83fe9f88e1529911eefec28a972e86c7f242c8c0d634 DIST QScintilla-gpl-2.9.1.tar.gz 2490144 SHA256 79e9c39d51549061d3d489387bcee86ff20c1f746d1b25ac173d5165426eabaf SHA512 709a5251c9273c527740b138b099e42a57cefa4fcda34c04da11f4640b0ee53ca9a0a58752e963bc8c63933e382ac8a6e774965d838c9123c11c1c59a9d7100e WHIRLPOOL f47319c2cebd1fdf4ae95f26781ab52758ab698b1b72e9d7db4e081e6c27bb41ef1d1da0b450c1cefebf0a9f1c1a128d45c44ba490d2be1a77276f3e1bf75224 +DIST QScintilla_gpl-2.9.2.tar.gz 2491222 SHA256 f2c8ccdc9d3dbb90764ceed53ea096da9bb13b6260da1324e6ab4ecea29e620a SHA512 28f88111d7eb6a016a4b87f04d2b7f5d6481b521a3361a526b3b45a56240f5c8de10310e819234fcba773c6df73bf398ae2dce622976a8e760f506be1defb7c8 WHIRLPOOL a04420c66fd417e5304c92a1ee3c1998f6849bccb9088dae96ed48c06cab0a9b1c012f073aafb1e05aaee46564de9ac89ae07145f3ded35cf47beac78065650a diff --git a/x11-libs/qscintilla/qscintilla-2.9.1.ebuild b/x11-libs/qscintilla/qscintilla-2.9.1.ebuild index 99f80015ba9b..92d5dc10c591 100644 --- a/x11-libs/qscintilla/qscintilla-2.9.1.ebuild +++ b/x11-libs/qscintilla/qscintilla-2.9.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -12,7 +12,7 @@ DESCRIPTION="A Qt port of Neil Hodgson's Scintilla C++ editor class" HOMEPAGE="http://www.riverbankcomputing.com/software/qscintilla/intro" SRC_URI="mirror://sourceforge/pyqt/${MY_P}.tar.gz" -LICENSE="|| ( GPL-2 GPL-3 )" +LICENSE="GPL-3" SLOT="0/12" KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" IUSE="designer doc" diff --git a/x11-libs/qscintilla/qscintilla-2.9.2.ebuild b/x11-libs/qscintilla/qscintilla-2.9.2.ebuild new file mode 100644 index 000000000000..103e457a6e6d --- /dev/null +++ b/x11-libs/qscintilla/qscintilla-2.9.2.ebuild @@ -0,0 +1,82 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +inherit flag-o-matic qmake-utils + +MY_P=QScintilla_gpl-${PV} + +DESCRIPTION="A Qt port of Neil Hodgson's Scintilla C++ editor class" +HOMEPAGE="http://www.riverbankcomputing.com/software/qscintilla/intro" +SRC_URI="mirror://sourceforge/pyqt/${MY_P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0/12" +KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" +IUSE="designer doc" + +DEPEND=" + dev-qt/qtcore:4 + dev-qt/qtgui:4 + designer? ( dev-qt/designer:4 ) +" +RDEPEND="${DEPEND}" + +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) + 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() { + qsci_run_in Qt4Qt5 eqmake4 + + if use designer; then + # prevent building against system version (bug 466120) + append-cxxflags -I../Qt4Qt5 + append-ldflags -L../Qt4Qt5 + + qsci_run_in designer-Qt4Qt5 eqmake4 + fi +} + +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 + + dodoc ChangeLog NEWS + + if use doc; then + docinto html + dodoc -r doc/html-Qt4Qt5/* + fi +} |