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 47B7E139082 for ; Mon, 27 Nov 2017 23:58:45 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 20BD0E0F38; Mon, 27 Nov 2017 23:58:44 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 E0F6AE0F25 for ; Mon, 27 Nov 2017 23:58:43 +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 B142B33D3C7 for ; Mon, 27 Nov 2017 23:58:42 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 512C7A9DA for ; Mon, 27 Nov 2017 23:58:41 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1511827044.438bdf60f5fb7c5a48a6cb9e924f5d61db514cd6.asturm@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: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 438bdf60f5fb7c5a48a6cb9e924f5d61db514cd6 X-VCS-Branch: master Date: Mon, 27 Nov 2017 23:58:41 +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-Archives-Salt: 778a5dc7-699e-4dd0-8132-63ac9f2c64f8 X-Archives-Hash: d1c991d477a3a7c2c22b69e87062b687 commit: 438bdf60f5fb7c5a48a6cb9e924f5d61db514cd6 Author: Andreas Sturmlechner gentoo org> AuthorDate: Mon Nov 20 17:04:27 2017 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Mon Nov 27 23:57:24 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=438bdf60 x11-libs/qscintilla: Drop old Package-Manager: Portage-2.3.13, Repoman-2.3.4 x11-libs/qscintilla/Manifest | 1 - x11-libs/qscintilla/qscintilla-2.9.4.ebuild | 91 ----------------------------- 2 files changed, 92 deletions(-) diff --git a/x11-libs/qscintilla/Manifest b/x11-libs/qscintilla/Manifest index e59930c4912..1e4c660b045 100644 --- a/x11-libs/qscintilla/Manifest +++ b/x11-libs/qscintilla/Manifest @@ -1,3 +1,2 @@ DIST QScintilla_gpl-2.10.1.tar.gz 2663446 BLAKE2B 720ce990b4e3dd65d47cd26b473bffc07240d76b2c10d393cba41331c6f160472d87b9b22985fd45b5b8064d5358b3b25f0decfe8759542a9c987381249bca42 SHA512 ea9b95ca371a8af9262493ab59ecaef77e1697ba21d1d594aab39e836917884fd829aa4f6c4e72cce60b0d3f40eac654157cc507d027945f0034881855123ccc DIST QScintilla_gpl-2.10.2.tar.gz 2665138 BLAKE2B 1c6349ea717997681e678cdfa6cc590a6a1cfbe652f2dd52d57fefff71229251c46cd4554b546d2e272deb7c3f970c44f657966ad08e45279813215a775c637d SHA512 755f486d62275acb5908262c4a50ad31dd9d8fca0501eb1eeec1aa2181872f8d16179b42f4213b207fd6b46fd8a72d25af7ce6c5cc10eabb363a92c0600ca972 -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 deleted file mode 100644 index 66c07763353..00000000000 --- a/x11-libs/qscintilla/qscintilla-2.9.4.ebuild +++ /dev/null @@ -1,91 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -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="https://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 -}