diff --git a/dev-python/qscintilla-python-qt4/Manifest b/dev-python/qscintilla-python-qt4/Manifest
deleted file mode 100644
index b844363b8..000000000
--- a/dev-python/qscintilla-python-qt4/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST QScintilla_gpl-2.10.2.tar.gz 2665138 SHA256 14b31d20717eed95ea9bea4cd16e5e1b72cee7ebac647cba878e0f6db6a65ed0 SHA512 755f486d62275acb5908262c4a50ad31dd9d8fca0501eb1eeec1aa2181872f8d16179b42f4213b207fd6b46fd8a72d25af7ce6c5cc10eabb363a92c0600ca972 WHIRLPOOL 89dcdaab4d94862e33df82b0682afad69c341b1b5d5484418fa9e23118f76a7f16f53b3a8e3df04da5b0c6f005c2eaf01ba83d200e76319ebb14345782e91c15
diff --git a/dev-python/qscintilla-python-qt4/metadata.xml b/dev-python/qscintilla-python-qt4/metadata.xml
deleted file mode 100644
index 7054692c3..000000000
--- a/dev-python/qscintilla-python-qt4/metadata.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
-
- qt@gentoo.org
- Gentoo Qt Project
-
-
- python@gentoo.org
- Python
-
-
-
- phil@riverbankcomputing.com
- Phil Thompson
-
- mailto:qscintilla@riverbankcomputing.com
- http://pyqt.sourceforge.net/Docs/QScintilla2/
- pyqt
-
-
diff --git a/dev-python/qscintilla-python-qt4/qscintilla-python-qt4-2.10.2.ebuild b/dev-python/qscintilla-python-qt4/qscintilla-python-qt4-2.10.2.ebuild
deleted file mode 100644
index de393e595..000000000
--- a/dev-python/qscintilla-python-qt4/qscintilla-python-qt4-2.10.2.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-inherit multibuild python-r1 qmake-utils
-
-MY_P=QScintilla_gpl-${PV/_pre/.dev}
-
-DESCRIPTION="Python bindings for Qscintilla"
-HOMEPAGE="https://www.riverbankcomputing.com/software/qscintilla/intro"
-SRC_URI="mirror://sourceforge/pyqt/${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="debug +qt4 qt5"
-
-REQUIRED_USE="
- ${PYTHON_REQUIRED_USE}
- || ( qt4 qt5 )
-"
-
-DEPEND="
- ${PYTHON_DEPS}
- >=dev-python/sip-4.19:=[${PYTHON_USEDEP}]
- ~x11-libs/qscintilla-${PV}:=[qt4?,qt5?]
- qt4? (
- >=dev-python/PyQt4-4.11.3[X,${PYTHON_USEDEP}]
- dev-qt/qtcore:4
- dev-qt/qtgui:4
- )
- qt5? (
- dev-python/PyQt5[gui,printsupport,widgets,${PYTHON_USEDEP}]
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtprintsupport:5
- dev-qt/qtwidgets:5
- )
-"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P}/Python
-
-src_prepare() {
- default
-
- # Fix out-of-source build
- sed -i -e 's|sip/qscimod[45]\.sip|../Python/&|g' "${S}"/configure.py || die
-
- MULTIBUILD_VARIANTS=( $(usev qt4) $(usev qt5) )
-}
-
-src_configure() {
- configuration() {
- local my_qt_ver=4
- if [[ ${MULTIBUILD_ID} == *qt5* ]]; then
- my_qt_ver=5
- fi
-
- local myconf=(
- "${PYTHON}"
- "${S}"/configure.py
- --qmake="$(qt${my_qt_ver}_get_bindir)"/qmake
- --sip-incdir="$(python_get_includedir)"
- --pyqt=PyQt${my_qt_ver}
- $(usex debug '--debug --trace' '')
- --verbose
- )
- echo "${myconf[@]}"
- "${myconf[@]}" || die
-
- # Run eqmake to respect toolchain, build flags, and prevent stripping
- eqmake${my_qt_ver} -recursive
- }
- multibuild_foreach_variant python_foreach_impl run_in_build_dir configuration
-}
-
-src_compile() {
- multibuild_foreach_variant python_foreach_impl run_in_build_dir default
-}
-
-src_install() {
- installation() {
- emake INSTALL_ROOT="${D}" install
- python_optimize
- }
- multibuild_foreach_variant python_foreach_impl run_in_build_dir installation
-}
diff --git a/dev-python/qscintilla-python-qt5/Manifest b/dev-python/qscintilla-python-qt5/Manifest
deleted file mode 100644
index b844363b8..000000000
--- a/dev-python/qscintilla-python-qt5/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST QScintilla_gpl-2.10.2.tar.gz 2665138 SHA256 14b31d20717eed95ea9bea4cd16e5e1b72cee7ebac647cba878e0f6db6a65ed0 SHA512 755f486d62275acb5908262c4a50ad31dd9d8fca0501eb1eeec1aa2181872f8d16179b42f4213b207fd6b46fd8a72d25af7ce6c5cc10eabb363a92c0600ca972 WHIRLPOOL 89dcdaab4d94862e33df82b0682afad69c341b1b5d5484418fa9e23118f76a7f16f53b3a8e3df04da5b0c6f005c2eaf01ba83d200e76319ebb14345782e91c15
diff --git a/dev-python/qscintilla-python-qt5/metadata.xml b/dev-python/qscintilla-python-qt5/metadata.xml
deleted file mode 100644
index 7054692c3..000000000
--- a/dev-python/qscintilla-python-qt5/metadata.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
-
- qt@gentoo.org
- Gentoo Qt Project
-
-
- python@gentoo.org
- Python
-
-
-
- phil@riverbankcomputing.com
- Phil Thompson
-
- mailto:qscintilla@riverbankcomputing.com
- http://pyqt.sourceforge.net/Docs/QScintilla2/
- pyqt
-
-
diff --git a/dev-python/qscintilla-python-qt5/qscintilla-python-qt5-2.10.2.ebuild b/dev-python/qscintilla-python-qt5/qscintilla-python-qt5-2.10.2.ebuild
deleted file mode 100644
index de393e595..000000000
--- a/dev-python/qscintilla-python-qt5/qscintilla-python-qt5-2.10.2.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-inherit multibuild python-r1 qmake-utils
-
-MY_P=QScintilla_gpl-${PV/_pre/.dev}
-
-DESCRIPTION="Python bindings for Qscintilla"
-HOMEPAGE="https://www.riverbankcomputing.com/software/qscintilla/intro"
-SRC_URI="mirror://sourceforge/pyqt/${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="debug +qt4 qt5"
-
-REQUIRED_USE="
- ${PYTHON_REQUIRED_USE}
- || ( qt4 qt5 )
-"
-
-DEPEND="
- ${PYTHON_DEPS}
- >=dev-python/sip-4.19:=[${PYTHON_USEDEP}]
- ~x11-libs/qscintilla-${PV}:=[qt4?,qt5?]
- qt4? (
- >=dev-python/PyQt4-4.11.3[X,${PYTHON_USEDEP}]
- dev-qt/qtcore:4
- dev-qt/qtgui:4
- )
- qt5? (
- dev-python/PyQt5[gui,printsupport,widgets,${PYTHON_USEDEP}]
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtprintsupport:5
- dev-qt/qtwidgets:5
- )
-"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P}/Python
-
-src_prepare() {
- default
-
- # Fix out-of-source build
- sed -i -e 's|sip/qscimod[45]\.sip|../Python/&|g' "${S}"/configure.py || die
-
- MULTIBUILD_VARIANTS=( $(usev qt4) $(usev qt5) )
-}
-
-src_configure() {
- configuration() {
- local my_qt_ver=4
- if [[ ${MULTIBUILD_ID} == *qt5* ]]; then
- my_qt_ver=5
- fi
-
- local myconf=(
- "${PYTHON}"
- "${S}"/configure.py
- --qmake="$(qt${my_qt_ver}_get_bindir)"/qmake
- --sip-incdir="$(python_get_includedir)"
- --pyqt=PyQt${my_qt_ver}
- $(usex debug '--debug --trace' '')
- --verbose
- )
- echo "${myconf[@]}"
- "${myconf[@]}" || die
-
- # Run eqmake to respect toolchain, build flags, and prevent stripping
- eqmake${my_qt_ver} -recursive
- }
- multibuild_foreach_variant python_foreach_impl run_in_build_dir configuration
-}
-
-src_compile() {
- multibuild_foreach_variant python_foreach_impl run_in_build_dir default
-}
-
-src_install() {
- installation() {
- emake INSTALL_ROOT="${D}" install
- python_optimize
- }
- multibuild_foreach_variant python_foreach_impl run_in_build_dir installation
-}
diff --git a/dev-python/qscintilla-python/qscintilla-python-2.10.2.ebuild b/dev-python/qscintilla-python/qscintilla-python-2.10.2.ebuild
deleted file mode 100644
index df3816775..000000000
--- a/dev-python/qscintilla-python/qscintilla-python-2.10.2.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-inherit python-r1
-
-DESCRIPTION="Meta package for ${PN} (install ${PN}-qt4 or ${PN}-qt5 instead)"
-HOMEPAGE="https://www.riverbankcomputing.com/software/qscintilla/intro"
-SRC_URI=""
-
-LICENSE="metapackage"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug +qt4 qt5"
-
-DEPEND="
- qt4? ( =${CATEGORY}/${PN}-qt4-${PVR} )
- qt5? ( =${CATEGORY}/${PN}-qt5-${PVR} )
-"
-# Depend on qt4 for compatibility which was until the split ebuild was
-# introduced.
-RDEPEND="
- qt4? ( =${CATEGORY}/${PN}-qt4-${PVR} )
- !qt4? ( =${CATEGORY}/${PN}-qt5-${PVR} )
-"
diff --git a/x11-libs/qscintilla-qt4/Manifest b/x11-libs/qscintilla-qt4/Manifest
deleted file mode 100644
index b844363b8..000000000
--- a/x11-libs/qscintilla-qt4/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST QScintilla_gpl-2.10.2.tar.gz 2665138 SHA256 14b31d20717eed95ea9bea4cd16e5e1b72cee7ebac647cba878e0f6db6a65ed0 SHA512 755f486d62275acb5908262c4a50ad31dd9d8fca0501eb1eeec1aa2181872f8d16179b42f4213b207fd6b46fd8a72d25af7ce6c5cc10eabb363a92c0600ca972 WHIRLPOOL 89dcdaab4d94862e33df82b0682afad69c341b1b5d5484418fa9e23118f76a7f16f53b3a8e3df04da5b0c6f005c2eaf01ba83d200e76319ebb14345782e91c15
diff --git a/x11-libs/qscintilla-qt4/metadata.xml b/x11-libs/qscintilla-qt4/metadata.xml
deleted file mode 100644
index 29550d863..000000000
--- a/x11-libs/qscintilla-qt4/metadata.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
-
- qt@gentoo.org
- Gentoo Qt Project
-
-
- python@gentoo.org
- Python
-
-
-
-
- phil@riverbankcomputing.com
- Phil Thompson
-
- mailto:qscintilla@riverbankcomputing.com
- http://pyqt.sourceforge.net/Docs/QScintilla2/
- pyqt
-
-
diff --git a/x11-libs/qscintilla-qt4/qscintilla-qt4-2.10.2.ebuild b/x11-libs/qscintilla-qt4/qscintilla-qt4-2.10.2.ebuild
deleted file mode 100644
index eb9974633..000000000
--- a/x11-libs/qscintilla-qt4/qscintilla-qt4-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
-}
diff --git a/x11-libs/qscintilla-qt5/Manifest b/x11-libs/qscintilla-qt5/Manifest
deleted file mode 100644
index b844363b8..000000000
--- a/x11-libs/qscintilla-qt5/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST QScintilla_gpl-2.10.2.tar.gz 2665138 SHA256 14b31d20717eed95ea9bea4cd16e5e1b72cee7ebac647cba878e0f6db6a65ed0 SHA512 755f486d62275acb5908262c4a50ad31dd9d8fca0501eb1eeec1aa2181872f8d16179b42f4213b207fd6b46fd8a72d25af7ce6c5cc10eabb363a92c0600ca972 WHIRLPOOL 89dcdaab4d94862e33df82b0682afad69c341b1b5d5484418fa9e23118f76a7f16f53b3a8e3df04da5b0c6f005c2eaf01ba83d200e76319ebb14345782e91c15
diff --git a/x11-libs/qscintilla-qt5/metadata.xml b/x11-libs/qscintilla-qt5/metadata.xml
deleted file mode 100644
index 29550d863..000000000
--- a/x11-libs/qscintilla-qt5/metadata.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
-
- qt@gentoo.org
- Gentoo Qt Project
-
-
- python@gentoo.org
- Python
-
-
-
-
- phil@riverbankcomputing.com
- Phil Thompson
-
- mailto:qscintilla@riverbankcomputing.com
- http://pyqt.sourceforge.net/Docs/QScintilla2/
- pyqt
-
-
diff --git a/x11-libs/qscintilla-qt5/qscintilla-qt5-2.10.2.ebuild b/x11-libs/qscintilla-qt5/qscintilla-qt5-2.10.2.ebuild
deleted file mode 100644
index eb9974633..000000000
--- a/x11-libs/qscintilla-qt5/qscintilla-qt5-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
-}
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 6986aeb29..000000000
--- a/x11-libs/qscintilla/qscintilla-2.10.2.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Meta package for ${PN} (install ${PN}-qt4 or ${PN}-qt5 instead)"
-HOMEPAGE="https://www.riverbankcomputing.com/software/qscintilla/intro"
-SRC_URI=""
-
-LICENSE="metapackage"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="designer doc +qt4 qt5"
-
-DEPEND="
- qt4? ( =${CATEGORY}/${PN}-qt4-${PVR} )
- qt5? ( =${CATEGORY}/${PN}-qt5-${PVR} )
-"
-# Depend on qt4 for compatibility which was until the split ebuild was
-# introduced.
-RDEPEND="
- qt4? ( =${CATEGORY}/${PN}-qt4-${PVR} )
- !qt4? ( =${CATEGORY}/${PN}-qt5-${PVR} )
-"