From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 0A490138334 for ; Mon, 23 Dec 2019 00:09:54 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 311A0E0D13; Mon, 23 Dec 2019 00:09:53 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 0ABABE0D13 for ; Mon, 23 Dec 2019 00:09:53 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id BC77B34DA8B for ; Mon, 23 Dec 2019 00:09:51 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 29D391C0B2 for ; Mon, 23 Dec 2019 00:09:50 +0000 (UTC) From: "Davide Pesavento" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Davide Pesavento" Message-ID: <1577059781.cc5c08824aed4d4abd1ce2d4a15cfc327274fa76.pesa@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.11.1.ebuild X-VCS-Directories: x11-libs/qscintilla/ X-VCS-Committer: pesa X-VCS-Committer-Name: Davide Pesavento X-VCS-Revision: cc5c08824aed4d4abd1ce2d4a15cfc327274fa76 X-VCS-Branch: master Date: Mon, 23 Dec 2019 00:09:50 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 8bacfc5f-0fc4-425b-81e5-584a0651d7a7 X-Archives-Hash: 59fb60548085d74817f2946b56484b9f commit: cc5c08824aed4d4abd1ce2d4a15cfc327274fa76 Author: Davide Pesavento gentoo org> AuthorDate: Mon Dec 23 00:09:41 2019 +0000 Commit: Davide Pesavento gentoo org> CommitDate: Mon Dec 23 00:09:41 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc5c0882 x11-libs/qscintilla: drop 2.11.1 Package-Manager: Portage-2.3.82, Repoman-2.3.20 Signed-off-by: Davide Pesavento gentoo.org> x11-libs/qscintilla/Manifest | 1 - x11-libs/qscintilla/qscintilla-2.11.1.ebuild | 82 ---------------------------- 2 files changed, 83 deletions(-) diff --git a/x11-libs/qscintilla/Manifest b/x11-libs/qscintilla/Manifest index c9fd8e685d5..afe4c275980 100644 --- a/x11-libs/qscintilla/Manifest +++ b/x11-libs/qscintilla/Manifest @@ -1,3 +1,2 @@ DIST QScintilla-2.11.3.tar.gz 3006383 BLAKE2B 6238aaff44d6136a64e8c38e38c4886357eb72aa4067f54eda1e876040c41ebce8577e244b81a062e9020c4d142439f5612ca88055d0ba87172ff5b8893938d7 SHA512 83406ef2f425c6288fcac52b01417853186ba860e33e14b236801271e034c327cbb00817cb7247e98bafc1844aeff9f24ec4878ac8ec4bd52d0d2d9778f6b884 DIST QScintilla_gpl-2.10.8.tar.gz 2736054 BLAKE2B 4bc7a2bc1974f8e10a96b7716a8e35d4854e9eeb8040734f99b796bddd9679ee2539f6517743689f9d7deff9ce523cdbb2f77ccd65eaadfc947dcc7a1337d918 SHA512 c0a216737dbda6bc390225196b37a43e4884c9cd67e6e81fc1b1b952683fe88dbfe7caf3c66d94a378f37502e1f08cbdf788426248e73f5f66ec65982b7652b5 -DIST QScintilla_gpl-2.11.1.tar.gz 2932060 BLAKE2B 9f2f9fd89667cc04c95d0a36e4a615dcf3c1c11a5446e19a43104513894b76bc7478f2aed7e8c94ce413f940327deb09e51507bee1fa35c79c176e01e6b74767 SHA512 40b600aa8eec17bc99491a08aeaee72bf498a66f0257d310a8df2667de82805715b9c859885c092acfb03ba8f69433a6517d0d4bb324bf99bd9db461172c08d5 diff --git a/x11-libs/qscintilla/qscintilla-2.11.1.ebuild b/x11-libs/qscintilla/qscintilla-2.11.1.ebuild deleted file mode 100644 index ae3d709bc0d..00000000000 --- a/x11-libs/qscintilla/qscintilla-2.11.1.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}_gpl-${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 -}