Drop old version, which was also the only stable version on sparc, see bug #524466 comment #11.

(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 0xDADED6B2671CB57D!)

3 files changed, 6 insertions, 106 deletions

diff --git a/x11-libs/qscintilla/ChangeLog b/x11-libs/qscintilla/ChangeLog
index 3c9ada8d3ac9..51850c0ef97b 100644
--- a/x11-libs/qscintilla/ChangeLog
+++ b/x11-libs/qscintilla/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-libs/qscintilla
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qscintilla/ChangeLog,v 1.111 2015/05/08 17:15:17 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qscintilla/ChangeLog,v 1.112 2015/06/14 16:53:26 pesa Exp $
+
+  14 Jun 2015; Davide Pesavento <pesa@gentoo.org>
+  -files/qscintilla-2.7.1-designer.patch, -qscintilla-2.7.2.ebuild:
+  Drop old version, which was also the only stable version on sparc, see bug
+  #524466 comment #11.
 
   08 May 2015; Jeroen Roovers <jer@gentoo.org> qscintilla-2.8.4-r1.ebuild:
   Stable for PPC64 (bug #524466).
diff --git a/x11-libs/qscintilla/files/qscintilla-2.7.1-designer.patch b/x11-libs/qscintilla/files/qscintilla-2.7.1-designer.patch
deleted file mode 100644
index 3fe2f57992e2..000000000000
--- a/x11-libs/qscintilla/files/qscintilla-2.7.1-designer.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-This patch causes the designer plugin to be built against the just-built
-qscintilla, rather than trying to build against the system qscintilla
-which may not be installed yet.
-
---- designer-Qt4Qt5/designer.pro
-+++ designer-Qt4Qt5/designer.pro
-@@ -26,4 +26,5 @@
- target.path = $$[QT_INSTALL_PLUGINS]/designer
- INSTALLS += target
- 
--LIBS += -L$$[QT_INSTALL_LIBS] -lqscintilla2
-+INCLUDEPATH = ../Qt4Qt5
-+LIBS += -L../Qt4Qt5 -lqscintilla2
diff --git a/x11-libs/qscintilla/qscintilla-2.7.2.ebuild b/x11-libs/qscintilla/qscintilla-2.7.2.ebuild
deleted file mode 100644
index 8d34b47e4ef9..000000000000
--- a/x11-libs/qscintilla/qscintilla-2.7.2.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qscintilla/qscintilla-2.7.2.ebuild,v 1.10 2013/12/23 15:31:06 ago Exp $
-
-EAPI=5
-
-inherit qt4-r2
-
-MY_P=QScintilla-gpl-${PV}
-
-DESCRIPTION="A Qt port of Neil Hodgson's Scintilla C++ editor class"
-HOMEPAGE="http://www.riverbankcomputing.co.uk/software/qscintilla/intro"
-SRC_URI="mirror://sourceforge/pyqt/${MY_P}.tar.gz"
-
-LICENSE="|| ( GPL-2 GPL-3 )"
-SLOT="0/9"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86"
-IUSE="doc python"
-
-DEPEND="
-	dev-qt/qtcore:4
-	|| ( ( >=dev-qt/qtgui-4.8.5:4 dev-qt/designer:4 ) <dev-qt/qtgui-4.8.5:4 )
-"
-RDEPEND="${DEPEND}"
-PDEPEND="python? ( ~dev-python/qscintilla-python-${PV} )"
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.7.1-designer.patch"
-)
-
-src_unpack() {
-	qt4-r2_src_unpack
-
-	# 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
-	einfo "Configuration of qscintilla"
-	eqmake4 qscintilla.pro
-	popd > /dev/null
-
-	pushd designer-Qt4Qt5 > /dev/null
-	einfo "Configuration of designer plugin"
-	eqmake4 designer.pro
-	popd > /dev/null
-}
-
-src_compile() {
-	pushd Qt4Qt5 > /dev/null
-	einfo "Building of qscintilla"
-	emake
-	popd > /dev/null
-
-	pushd designer-Qt4Qt5 > /dev/null
-	einfo "Building of designer plugin"
-	emake
-	popd > /dev/null
-}
-
-src_install() {
-	pushd Qt4Qt5 > /dev/null
-	einfo "Installation of qscintilla"
-	emake INSTALL_ROOT="${D}" install
-	popd > /dev/null
-
-	pushd designer-Qt4Qt5 > /dev/null
-	einfo "Installation of designer plugin"
-	emake INSTALL_ROOT="${D}" install
-	popd > /dev/null
-
-	dodoc NEWS
-
-	if use doc; then
-		dohtml doc/html-Qt4Qt5/*
-		insinto /usr/share/doc/${PF}
-		doins -r doc/Scintilla
-	fi
-}