From 407525b571b48cfd65e1ad7a02d250a927c967c9 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 1 Dec 2017 03:04:39 +0000 Subject: gentoo resync : 01.12.2017 --- x11-libs/qscintilla/Manifest | 4 +- x11-libs/qscintilla/qscintilla-2.10.1.ebuild | 2 +- x11-libs/qscintilla/qscintilla-2.9.4.ebuild | 91 ---------------------------- 3 files changed, 2 insertions(+), 95 deletions(-) delete mode 100644 x11-libs/qscintilla/qscintilla-2.9.4.ebuild (limited to 'x11-libs/qscintilla') diff --git a/x11-libs/qscintilla/Manifest b/x11-libs/qscintilla/Manifest index e7e18d89d15c..e83cc934217a 100644 --- a/x11-libs/qscintilla/Manifest +++ b/x11-libs/qscintilla/Manifest @@ -1,7 +1,5 @@ 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 -EBUILD qscintilla-2.10.1.ebuild 2394 BLAKE2B 026325e856fbfcc76883182673cfe3448c7aa91883d786dda570de396f04a789c4135d192c1647e4406ddbca21bd01b15cf3a112314ebc48f273add6c133fbb5 SHA512 30b19c28a963ee508f40b832bfdbbd69f284e9ffb6569d4c57cb0a451f40e6443a130e19dadcf0113c691f5ec0c2f4ddea3bf3b9058103090d144cf499449ff5 +EBUILD qscintilla-2.10.1.ebuild 2392 BLAKE2B 8949f6e08aa13e41ec7ba1d8a0a2d029b3601c8cdb3c71e44a34a728cc05a923b5162c2f657df06bc564bd4042760f1229409f2e9e8420441731e769251e1522 SHA512 c53488e751beb5a52dfc6e9903442f436e976f26afaa4a765e9bada3d0621fec6acecf4df5c98e7434f206f04336b21f0a07dccb09372cd8a693ac6c0930ebec EBUILD qscintilla-2.10.2.ebuild 2396 BLAKE2B 28f458ac59aa6a8fe3dea42ad42e4fb0e85d0f385c72c6afc8e67c64e95ae18c65b0b92b9498a8d7fd6808b430fbf74c82eb7e2e2dfaf962fc4d2f48f996b540 SHA512 ec04a36a7db01686439adb97aad938eb966928c4ba1b3f7df23365f59e2401efe35fff12de86016937cf1cb4fc03c9e5f2e3226d5410b13bda0c1d8d1f85c4e8 -EBUILD qscintilla-2.9.4.ebuild 1998 BLAKE2B a6aea660246162acf0f8dc4a79a8fa57523b364a16c635c28eccdea3d34fa747ad38dd6d4a32fed5730ce4a62dfe4600ca15557820d5d2b6681f2e1b6d84362a SHA512 b17413f326e1f968d2f41a7df31e5709aff9c7f4b9f3d2954dd98ddf3026eaedaa073882010dc3c54fc8051b7cbdd8672189eea410da7ede732bea6ff57b4635 MISC metadata.xml 741 BLAKE2B 0ad895f5e6b73a5a89f527ceea61f323c13ec9329352b84a78982594a2bcdca2bd13bd67f4a4f60f21786cebef6da2bb233718fe0a90376c703de510b25e416f SHA512 393c6b16b403a5f14180ca4b010bd74b62dea7043dabaf463e6995690226105f872556d3df54e0cee1a6dfe2140b033aad25998fc65414e7380f41894201f43a diff --git a/x11-libs/qscintilla/qscintilla-2.10.1.ebuild b/x11-libs/qscintilla/qscintilla-2.10.1.ebuild index bf85437f8fcd..34580af5018c 100644 --- a/x11-libs/qscintilla/qscintilla-2.10.1.ebuild +++ b/x11-libs/qscintilla/qscintilla-2.10.1.ebuild @@ -13,7 +13,7 @@ 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" +KEYWORDS="~alpha amd64 ~arm ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux" IUSE="designer doc +qt4 qt5" REQUIRED_USE="|| ( qt4 qt5 )" 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 66c077633535..000000000000 --- 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 -} -- cgit v1.2.3