From 5445db343d15bf741f107fc6e65112f4696ecc82 Mon Sep 17 00:00:00 2001 From: David Seifert Date: Thu, 22 Dec 2016 18:46:36 +0100 Subject: x11-libs/qscintilla: Make Qt5 compatible Gentoo-bug: 541604 Package-Manager: Portage-2.3.3, Repoman-2.3.1 Closes: https://github.com/gentoo/gentoo/pull/3188 --- x11-libs/qscintilla/qscintilla-2.8.4-r1.ebuild | 91 -------------------------- x11-libs/qscintilla/qscintilla-2.8.4-r2.ebuild | 91 ++++++++++++++++++++++++++ x11-libs/qscintilla/qscintilla-2.9.2-r1.ebuild | 82 +++++++++++++++++++++++ x11-libs/qscintilla/qscintilla-2.9.2.ebuild | 82 ----------------------- x11-libs/qscintilla/qscintilla-2.9.3-r1.ebuild | 82 +++++++++++++++++++++++ x11-libs/qscintilla/qscintilla-2.9.3-r2.ebuild | 89 +++++++++++++++++++++++++ x11-libs/qscintilla/qscintilla-2.9.3.ebuild | 82 ----------------------- 7 files changed, 344 insertions(+), 255 deletions(-) delete mode 100644 x11-libs/qscintilla/qscintilla-2.8.4-r1.ebuild create mode 100644 x11-libs/qscintilla/qscintilla-2.8.4-r2.ebuild create mode 100644 x11-libs/qscintilla/qscintilla-2.9.2-r1.ebuild delete mode 100644 x11-libs/qscintilla/qscintilla-2.9.2.ebuild create mode 100644 x11-libs/qscintilla/qscintilla-2.9.3-r1.ebuild create mode 100644 x11-libs/qscintilla/qscintilla-2.9.3-r2.ebuild delete mode 100644 x11-libs/qscintilla/qscintilla-2.9.3.ebuild (limited to 'x11-libs/qscintilla') diff --git a/x11-libs/qscintilla/qscintilla-2.8.4-r1.ebuild b/x11-libs/qscintilla/qscintilla-2.8.4-r1.ebuild deleted file mode 100644 index 9c5ece9fd7af..000000000000 --- a/x11-libs/qscintilla/qscintilla-2.8.4-r1.ebuild +++ /dev/null @@ -1,91 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -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-2 GPL-3 )" -SLOT="0/11" -KEYWORDS="alpha amd64 ~arm ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux" -IUSE="designer doc" - -DEPEND=" - >=dev-qt/qtcore-4.8.5:4 - >=dev-qt/qtgui-4.8.5:4 - designer? ( >=dev-qt/designer-4.8.5:4 ) -" -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 -} - -src_configure() { - pushd Qt4Qt5 > /dev/null - eqmake4 - popd > /dev/null - - if use designer; then - # prevent building against system version (bug 466120) - append-cxxflags -I../Qt4Qt5 - append-ldflags -L../Qt4Qt5 - - pushd designer-Qt4Qt5 > /dev/null - eqmake4 - popd > /dev/null - fi -} - -src_compile() { - pushd Qt4Qt5 > /dev/null - emake - popd > /dev/null - - if use designer; then - pushd designer-Qt4Qt5 > /dev/null - emake - popd > /dev/null - fi -} - -src_install() { - pushd Qt4Qt5 > /dev/null - emake INSTALL_ROOT="${D}" install - popd > /dev/null - - if use designer; then - pushd designer-Qt4Qt5 > /dev/null - emake INSTALL_ROOT="${D}" install - popd > /dev/null - fi - - dodoc NEWS - - if use doc; then - docinto html - dodoc -r doc/html-Qt4Qt5/* - fi -} diff --git a/x11-libs/qscintilla/qscintilla-2.8.4-r2.ebuild b/x11-libs/qscintilla/qscintilla-2.8.4-r2.ebuild new file mode 100644 index 000000000000..0d86621b5caa --- /dev/null +++ b/x11-libs/qscintilla/qscintilla-2.8.4-r2.ebuild @@ -0,0 +1,91 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +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-2 GPL-3 )" +SLOT="0/11" +KEYWORDS="alpha amd64 ~arm ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux" +IUSE="designer doc +qt4" + +DEPEND=" + >=dev-qt/qtcore-4.8.5:4 + >=dev-qt/qtgui-4.8.5:4 + designer? ( >=dev-qt/designer-4.8.5:4 ) +" +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 +} + +src_configure() { + pushd Qt4Qt5 > /dev/null + eqmake4 + popd > /dev/null + + if use designer; then + # prevent building against system version (bug 466120) + append-cxxflags -I../Qt4Qt5 + append-ldflags -L../Qt4Qt5 + + pushd designer-Qt4Qt5 > /dev/null + eqmake4 + popd > /dev/null + fi +} + +src_compile() { + pushd Qt4Qt5 > /dev/null + emake + popd > /dev/null + + if use designer; then + pushd designer-Qt4Qt5 > /dev/null + emake + popd > /dev/null + fi +} + +src_install() { + pushd Qt4Qt5 > /dev/null + emake INSTALL_ROOT="${D}" install + popd > /dev/null + + if use designer; then + pushd designer-Qt4Qt5 > /dev/null + emake INSTALL_ROOT="${D}" install + popd > /dev/null + fi + + dodoc NEWS + + if use doc; then + docinto html + dodoc -r doc/html-Qt4Qt5/* + fi +} diff --git a/x11-libs/qscintilla/qscintilla-2.9.2-r1.ebuild b/x11-libs/qscintilla/qscintilla-2.9.2-r1.ebuild new file mode 100644 index 000000000000..caf9749bae19 --- /dev/null +++ b/x11-libs/qscintilla/qscintilla-2.9.2-r1.ebuild @@ -0,0 +1,82 @@ +# 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" + +DEPEND=" + dev-qt/qtcore:4 + dev-qt/qtgui:4 + designer? ( dev-qt/designer:4 ) +" +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() { + qsci_run_in Qt4Qt5 eqmake4 + + if use designer; then + # prevent building against system version (bug 466120) + append-cxxflags -I../Qt4Qt5 + append-ldflags -L../Qt4Qt5 + + qsci_run_in designer-Qt4Qt5 eqmake4 + 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 + + dodoc ChangeLog NEWS + + if use doc; then + docinto html + dodoc -r doc/html-Qt4Qt5/* + fi +} diff --git a/x11-libs/qscintilla/qscintilla-2.9.2.ebuild b/x11-libs/qscintilla/qscintilla-2.9.2.ebuild deleted file mode 100644 index 544063103355..000000000000 --- a/x11-libs/qscintilla/qscintilla-2.9.2.ebuild +++ /dev/null @@ -1,82 +0,0 @@ -# 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" - -DEPEND=" - dev-qt/qtcore:4 - dev-qt/qtgui:4 - designer? ( dev-qt/designer:4 ) -" -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() { - qsci_run_in Qt4Qt5 eqmake4 - - if use designer; then - # prevent building against system version (bug 466120) - append-cxxflags -I../Qt4Qt5 - append-ldflags -L../Qt4Qt5 - - qsci_run_in designer-Qt4Qt5 eqmake4 - 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 - - dodoc ChangeLog NEWS - - if use doc; then - docinto html - dodoc -r doc/html-Qt4Qt5/* - fi -} diff --git a/x11-libs/qscintilla/qscintilla-2.9.3-r1.ebuild b/x11-libs/qscintilla/qscintilla-2.9.3-r1.ebuild new file mode 100644 index 000000000000..a73439a061a9 --- /dev/null +++ b/x11-libs/qscintilla/qscintilla-2.9.3-r1.ebuild @@ -0,0 +1,82 @@ +# 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" + +DEPEND=" + dev-qt/qtcore:4 + dev-qt/qtgui:4 + designer? ( dev-qt/designer:4 ) +" +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() { + qsci_run_in Qt4Qt5 eqmake4 + + if use designer; then + # prevent building against system version (bug 466120) + append-cxxflags -I../Qt4Qt5 + append-ldflags -L../Qt4Qt5 + + qsci_run_in designer-Qt4Qt5 eqmake4 + 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 + + dodoc ChangeLog NEWS + + if use doc; then + docinto html + dodoc -r doc/html-Qt4Qt5/* + fi +} diff --git a/x11-libs/qscintilla/qscintilla-2.9.3-r2.ebuild b/x11-libs/qscintilla/qscintilla-2.9.3-r2.ebuild new file mode 100644 index 000000000000..f4626d9e59bf --- /dev/null +++ b/x11-libs/qscintilla/qscintilla-2.9.3-r2.ebuild @@ -0,0 +1,89 @@ +# 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 )" + +RDEPEND=" + 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 ) + )" +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) + 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 + + use doc && HTML_DOCS=( doc/html-Qt4Qt5/. ) + einstalldocs +} diff --git a/x11-libs/qscintilla/qscintilla-2.9.3.ebuild b/x11-libs/qscintilla/qscintilla-2.9.3.ebuild deleted file mode 100644 index 103e457a6e6d..000000000000 --- a/x11-libs/qscintilla/qscintilla-2.9.3.ebuild +++ /dev/null @@ -1,82 +0,0 @@ -# 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" - -DEPEND=" - dev-qt/qtcore:4 - dev-qt/qtgui:4 - designer? ( dev-qt/designer:4 ) -" -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() { - qsci_run_in Qt4Qt5 eqmake4 - - if use designer; then - # prevent building against system version (bug 466120) - append-cxxflags -I../Qt4Qt5 - append-ldflags -L../Qt4Qt5 - - qsci_run_in designer-Qt4Qt5 eqmake4 - 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 - - dodoc ChangeLog NEWS - - if use doc; then - docinto html - dodoc -r doc/html-Qt4Qt5/* - fi -} -- cgit v1.2.3-65-gdbad