From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1020301-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 46A881382C5
for <garchives@archives.gentoo.org>; Thu, 26 Apr 2018 03:32:21 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 0F29EE0894;
Thu, 26 Apr 2018 03:32:14 +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 D20F3E0893
for <gentoo-commits@lists.gentoo.org>; Thu, 26 Apr 2018 03:32:13 +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 369A5335C82
for <gentoo-commits@lists.gentoo.org>; Thu, 26 Apr 2018 03:32:12 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 152EB2AD
for <gentoo-commits@lists.gentoo.org>; Thu, 26 Apr 2018 03:32:08 +0000 (UTC)
From: "Andreas Sturmlechner" <asturm@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, "Andreas Sturmlechner" <asturm@gentoo.org>
Message-ID: <1524713400.6e56663ad2f11eb0e3c0032dee225f75725bf3e5.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.10.1.ebuild x11-libs/qscintilla/qscintilla-2.10.2.ebuild
X-VCS-Directories: x11-libs/qscintilla/
X-VCS-Committer: asturm
X-VCS-Committer-Name: Andreas Sturmlechner
X-VCS-Revision: 6e56663ad2f11eb0e3c0032dee225f75725bf3e5
X-VCS-Branch: master
Date: Thu, 26 Apr 2018 03:32:08 +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: ec64a0db-1a45-4a97-a2e0-6c00ce9232f5
X-Archives-Hash: 1b7439ec0f772316766611b0e7b499c7
commit: 6e56663ad2f11eb0e3c0032dee225f75725bf3e5
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 26 03:27:52 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Apr 26 03:30:00 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e56663a
x11-libs/qscintilla: Drop 2.10.{1,2} with Qt4-support
Closes: https://bugs.gentoo.org/634970
Package-Manager: Portage-2.3.28, Repoman-2.3.9
x11-libs/qscintilla/Manifest | 2 -
x11-libs/qscintilla/qscintilla-2.10.1.ebuild | 100 ---------------------------
x11-libs/qscintilla/qscintilla-2.10.2.ebuild | 100 ---------------------------
3 files changed, 202 deletions(-)
diff --git a/x11-libs/qscintilla/Manifest b/x11-libs/qscintilla/Manifest
index b8473672244..4f7edbb1cb0 100644
--- a/x11-libs/qscintilla/Manifest
+++ b/x11-libs/qscintilla/Manifest
@@ -1,4 +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.10.3.tar.gz 2721287 BLAKE2B cc85eea17e563ae5f4a130d26ca88bec3e1a6cbff7bc0af096c63789384d03149105641d6324f53b37a2bd8ab4681a285ccb76e6063a06e5db30d070d3fd8219 SHA512 a1b9d6869797ec074e4e0727164804779792fb77b2230aae80e6d6b5fb3a3ff9d84e17d775d18ab74c97b78bac454511fd2cb49be1fa36f71d9097abf88045b6
DIST QScintilla_gpl-2.10.4.tar.gz 2721322 BLAKE2B df50dd0a34db96dd57147ddc399d4a30751b1bb4922dc1b8b3c3c1989e810937dc8345f92128e8a606b1edc04fde4b930a424ab8344818c9899c8fe496793a77 SHA512 dee6684f68173784d098931554c839a30e129b89f980cd9704f818c44eb7023199bd3682e4b342091fa3e0ce577ec576d34046477bdd1d7fc58ca5dd2ba947a3
diff --git a/x11-libs/qscintilla/qscintilla-2.10.1.ebuild b/x11-libs/qscintilla/qscintilla-2.10.1.ebuild
deleted file mode 100644
index 5c8d5a899dc..00000000000
--- a/x11-libs/qscintilla/qscintilla-2.10.1.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic multibuild qmake-utils
-
-MY_P=QScintilla_gpl-${PV/_pre/.dev}
-
-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/13"
-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
-
- MULTIBUILD_VARIANTS=( $(usev qt4) $(usev qt5) )
- multibuild_copy_sources
-}
-
-qsci_run_in() {
- pushd "$1" >/dev/null || die
- shift || die
- "$@" || die
- popd >/dev/null || die
-}
-
-src_configure() {
- use qt4 && append-cxxflags -std=gnu++0x
-
- if use designer; then
- # prevent building against system version (bug 466120)
- append-cxxflags -I../Qt4Qt5
- append-ldflags -L../Qt4Qt5
- fi
-
- qsci_configure() {
- qsci_run_in Qt4Qt5 eqmake${MULTIBUILD_VARIANT#qt}
- use designer && qsci_run_in designer-Qt4Qt5 eqmake${MULTIBUILD_VARIANT#qt}
- }
- multibuild_foreach_variant run_in_build_dir qsci_configure
-}
-
-src_compile() {
- qsci_compile() {
- qsci_run_in Qt4Qt5 emake
- use designer && qsci_run_in designer-Qt4Qt5 emake
- }
- multibuild_foreach_variant run_in_build_dir qsci_compile
-}
-
-src_install() {
- qsci_install() {
- qsci_run_in Qt4Qt5 emake INSTALL_ROOT="${D}" install
- use designer && qsci_run_in designer-Qt4Qt5 emake INSTALL_ROOT="${D}" install
- }
- multibuild_foreach_variant run_in_build_dir qsci_install
-
- DOCS=( ChangeLog NEWS )
- use doc && HTML_DOCS=( doc/html-Qt4Qt5/. )
- einstalldocs
-}
diff --git a/x11-libs/qscintilla/qscintilla-2.10.2.ebuild b/x11-libs/qscintilla/qscintilla-2.10.2.ebuild
deleted file mode 100644
index eb99746332b..00000000000
--- a/x11-libs/qscintilla/qscintilla-2.10.2.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic multibuild qmake-utils
-
-MY_P=QScintilla_gpl-${PV/_pre/.dev}
-
-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/13"
-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
-
- MULTIBUILD_VARIANTS=( $(usev qt4) $(usev qt5) )
- multibuild_copy_sources
-}
-
-qsci_run_in() {
- pushd "$1" >/dev/null || die
- shift || die
- "$@" || die
- popd >/dev/null || die
-}
-
-src_configure() {
- use qt4 && append-cxxflags -std=gnu++0x
-
- if use designer; then
- # prevent building against system version (bug 466120)
- append-cxxflags -I../Qt4Qt5
- append-ldflags -L../Qt4Qt5
- fi
-
- qsci_configure() {
- qsci_run_in Qt4Qt5 eqmake${MULTIBUILD_VARIANT#qt}
- use designer && qsci_run_in designer-Qt4Qt5 eqmake${MULTIBUILD_VARIANT#qt}
- }
- multibuild_foreach_variant run_in_build_dir qsci_configure
-}
-
-src_compile() {
- qsci_compile() {
- qsci_run_in Qt4Qt5 emake
- use designer && qsci_run_in designer-Qt4Qt5 emake
- }
- multibuild_foreach_variant run_in_build_dir qsci_compile
-}
-
-src_install() {
- qsci_install() {
- qsci_run_in Qt4Qt5 emake INSTALL_ROOT="${D}" install
- use designer && qsci_run_in designer-Qt4Qt5 emake INSTALL_ROOT="${D}" install
- }
- multibuild_foreach_variant run_in_build_dir qsci_install
-
- DOCS=( ChangeLog NEWS )
- use doc && HTML_DOCS=( doc/html-Qt4Qt5/. )
- einstalldocs
-}