From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <gentoo-commits+bounces-920272-garchives=archives.gentoo.org@lists.gentoo.org> Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id D30F1139085 for <garchives@archives.gentoo.org>; Sat, 31 Dec 2016 06:02:42 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 11B46E0C4A; Sat, 31 Dec 2016 06:02:42 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D8685E0C4A for <gentoo-commits@lists.gentoo.org>; Sat, 31 Dec 2016 06:02:41 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 919953416C8 for <gentoo-commits@lists.gentoo.org>; Sat, 31 Dec 2016 06:02:40 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0149B24C5 for <gentoo-commits@lists.gentoo.org>; Sat, 31 Dec 2016 06:02:39 +0000 (UTC) From: "Andrey Grozin" <grozin@gentoo.org> To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andrey Grozin" <grozin@gentoo.org> Message-ID: <1483164142.b230556f4170b37579061e4be750f69f73011a3a.grozin@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: x11-libs/qscintilla/ X-VCS-Repository: repo/gentoo X-VCS-Files: x11-libs/qscintilla/Manifest x11-libs/qscintilla/qscintilla-2.9.4.ebuild X-VCS-Directories: x11-libs/qscintilla/ X-VCS-Committer: grozin X-VCS-Committer-Name: Andrey Grozin X-VCS-Revision: b230556f4170b37579061e4be750f69f73011a3a X-VCS-Branch: master Date: Sat, 31 Dec 2016 06:02:39 +0000 (UTC) Precedence: bulk List-Post: <mailto:gentoo-commits@lists.gentoo.org> List-Help: <mailto:gentoo-commits+help@lists.gentoo.org> List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org> List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org> List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org> X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 9e1537ed-dd45-4be5-a818-03b34d641cc0 X-Archives-Hash: e83306ecfa43c56e43a22929c280eeff commit: b230556f4170b37579061e4be750f69f73011a3a Author: Andrey Grozin <grozin <AT> gentoo <DOT> org> AuthorDate: Sat Dec 31 06:02:22 2016 +0000 Commit: Andrey Grozin <grozin <AT> gentoo <DOT> org> CommitDate: Sat Dec 31 06:02:22 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b230556f x11-libs/qscintilla: bump to 2.9.4 Package-Manager: Portage-2.3.3, Repoman-2.3.1 x11-libs/qscintilla/Manifest | 1 + x11-libs/qscintilla/qscintilla-2.9.4.ebuild | 92 +++++++++++++++++++++++++++++ 2 files changed, 93 insertions(+) diff --git a/x11-libs/qscintilla/Manifest b/x11-libs/qscintilla/Manifest index ad29ccd..3f4483f 100644 --- a/x11-libs/qscintilla/Manifest +++ b/x11-libs/qscintilla/Manifest @@ -1,3 +1,4 @@ DIST QScintilla-gpl-2.8.4.tar.gz 3031919 SHA256 9b7b2d7440cc39736bbe937b853506b3bd218af3b79095d4f710cccb0fabe80f SHA512 ab10dc756231b293ddebc06e681bb65a11b2be2a4c4132a5b2a27ca583adef76af325fa95748888d9091f2e89a30494d370df262c4eaba7b7fbed04fb7c76907 WHIRLPOOL 7357addbc0ad8869c5749a67106c18e47d79e32399416cc2867461fa8ad0c662711b8937987cb7c3cd5b83fe9f88e1529911eefec28a972e86c7f242c8c0d634 DIST QScintilla_gpl-2.9.2.tar.gz 2491222 SHA256 f2c8ccdc9d3dbb90764ceed53ea096da9bb13b6260da1324e6ab4ecea29e620a SHA512 28f88111d7eb6a016a4b87f04d2b7f5d6481b521a3361a526b3b45a56240f5c8de10310e819234fcba773c6df73bf398ae2dce622976a8e760f506be1defb7c8 WHIRLPOOL a04420c66fd417e5304c92a1ee3c1998f6849bccb9088dae96ed48c06cab0a9b1c012f073aafb1e05aaee46564de9ac89ae07145f3ded35cf47beac78065650a DIST QScintilla_gpl-2.9.3.tar.gz 2503568 SHA256 98aab93d73b05635867c2fc757acb383b5856a0b416e3fd7659f1879996ddb7e SHA512 43c0edb91b7cf31f4cca71aae54d7bfea8ee66e296c0e99b694069eeedf394762b8a670952debfa2671363fd8ab5c46dd7a7da60e8f1234406a12d12afa503ab WHIRLPOOL 4a46b6cf38486d1642ad8899fc986272ddbffc33e2cb2e60e9f74c56a014c22fabdbf0f24e434cf386a9463fb82b30987d554a1419d606e152e785c3286ae063 +DIST QScintilla_gpl-2.9.4.tar.gz 2557199 SHA256 8b3a23023e9f0573caed6f9cee86f898d87b768ee15b8c211a423783a4cfa4e6 SHA512 5a2eebbe523a0f2f1c7bc63ce5ee9cb8793a597d00eea5b638f18f90d6e798e92c281be23ee5e7072d5afced9e1fccb6ae51526a3623d373d57c3db64d026b16 WHIRLPOOL 68aacdcd0fc7102494ccae1f0ea3e222845bdd3f9bef603d89fe50d50dba6ac77471228a84c1c281a46ccf74bdb6902aa3bb21f89388ec5408bdde5876cf8655 diff --git a/x11-libs/qscintilla/qscintilla-2.9.4.ebuild b/x11-libs/qscintilla/qscintilla-2.9.4.ebuild new file mode 100644 index 00000000..d63f3e1 --- /dev/null +++ b/x11-libs/qscintilla/qscintilla-2.9.4.ebuild @@ -0,0 +1,92 @@ +# 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 +qt4 qt5" + +REQUIRED_USE="^^ ( qt4 qt5 )" + +DEPEND=" + qt4? ( + dev-qt/qtcore:4 + dev-qt/qtgui:4 + designer? ( dev-qt/designer:4 ) + ) + qt5? ( + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtprintsupport:5 + dev-qt/qtwidgets:5 + designer? ( dev-qt/designer:5 ) + ) +" +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() { + local my_eqmake=eqmake$(usex qt5 5 4) + + qsci_run_in Qt4Qt5 ${my_eqmake} + + if use designer; then + # prevent building against system version (bug 466120) + append-cxxflags -I../Qt4Qt5 + append-ldflags -L../Qt4Qt5 + + qsci_run_in designer-Qt4Qt5 ${my_eqmake} + 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 + + DOCS=( ChangeLog NEWS ) + use doc && HTML_DOCS=( doc/html-Qt4Qt5/. ) + einstalldocs +}