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

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0xDADED6B2671CB57D!

4 files changed, 23 insertions, 114 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/Manifest b/x11-libs/qscintilla/Manifest
index eaa7452e0019..74ea30ed27da 100644
--- a/x11-libs/qscintilla/Manifest
+++ b/x11-libs/qscintilla/Manifest
@@ -1,19 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX qscintilla-2.7.1-designer.patch 434 SHA256 fa643d33e12ce21d041230285ab71f989f84963c422899a74508f74a8299154f SHA512 bf257cbaf0e30f41ba674778cc8c37d6b958eb25cc89046b5b88c4e6582ddfe8eb4f4daea07a6d7cb23808bdf8ce26954c2470f499e1cdd957046347897fcb23 WHIRLPOOL 2f731cea40791890d2962a88b65f46f750f7b558f45c41692a04363e66f210b4eb56d087a7259c762094b1700cd8b63249b39b4e83bdc4078126447cdff644eb
-DIST QScintilla-gpl-2.7.2.tar.gz 2842625 SHA256 14b47d686dc1586321f84fcf3c9a911ddaace37a1cb0b1e6a6195e252e5bb69c SHA512 d3ca9d75687687210ca6ae3599fd44bfbbad8c99d6d38aaf1c92c83250dc0c5af1c713bdd74d077d0fb9ba1eccbd5e2910eef855d3656392c33c4832d46ff7fb WHIRLPOOL 1ea4a189a5998755afaa0fad111a7f2153e5ecbe13290d62930cce992b0159040de9cb304e848705abc3d0f1909a82fde908d8179ddd9de05970323cee5ffebe
 DIST QScintilla-gpl-2.8.4.tar.gz 3031919 SHA256 9b7b2d7440cc39736bbe937b853506b3bd218af3b79095d4f710cccb0fabe80f SHA512 ab10dc756231b293ddebc06e681bb65a11b2be2a4c4132a5b2a27ca583adef76af325fa95748888d9091f2e89a30494d370df262c4eaba7b7fbed04fb7c76907 WHIRLPOOL 7357addbc0ad8869c5749a67106c18e47d79e32399416cc2867461fa8ad0c662711b8937987cb7c3cd5b83fe9f88e1529911eefec28a972e86c7f242c8c0d634
 DIST QScintilla-gpl-2.9.tar.gz 2435116 SHA256 d7c32e32582f93779de861006d87467b38b9ebc06e3d0b32e981cb24369fa417 SHA512 a74b7b1182e9f602aa9f61072877d8dba93c430453ed70e18d74013dbda8b0faef30629f2c086d3b06d0632b3f4980570362bb6e635c15686be1be47eaeecb00 WHIRLPOOL b27a3ff2b48dbbf034deb4fdf09259815dcee63bfffe29651cf1e5e9ceeedb408ebc0bae440479a8206af7046f80143c291c10a0293942b64eb61c5e02549ed4
-EBUILD qscintilla-2.7.2.ebuild 2155 SHA256 af2587f609b091a8725d6b5855162e1a04ac43096f22141c555750d5aa5c8811 SHA512 355050f374c81adfed0cdb31aee5cbd727e3f99df7979469a5c14ae63fa962f7708d571e23a9dde6d0841df695ce1ea79011bbc359465351addd60e44d3cf115 WHIRLPOOL dae3b2754571216741d4b5e929c9d7350c988cbae0242266a69a960a928fef871542e3e6165c5beca9583e676ccc03216b8e75becba2b29ff5764132e01f12b7
 EBUILD qscintilla-2.8.4-r1.ebuild 1998 SHA256 5a5b7ddafc555c07f250e9ebc2ae50474633c202abb461e83c892e33c645a6e1 SHA512 af20d693d52913ca99cd534a931e01f5dbbc8ea6c21a03425be081103abcd68b8d341eddbfe726b204c479ad43d02006930c7d4dfe30d6ad1cddf65e9a5364fe WHIRLPOOL ca5835ed31e44b47237a0db1cc522e8a68116f38ed1b3f40de348f706627112fc0868295a6fbeb88f26ba06115f839bafea90caa2f2f21e5e1b25531efb892c3
 EBUILD qscintilla-2.9.ebuild 2000 SHA256 7a90d217fc8bc9c2eb494b10b81a3e41ff3a4100980b564ef54c499cc1b93a01 SHA512 925fb8cd67036d4e1e8416d601eed5b6d7138b0d326ec4c8d569553594c5191e29d0d2dd2afc4d28b74223f0a18cf14cb664a1252f1bd01ef522f25391bf11d7 WHIRLPOOL 506ee34cdbfae74d9135f4029818c7a26188ded25eab3b8c7d026f881481ca9ed728dc026dd98585d6389e84a99109a5d67acae750a41736d38edbbe363d9eb9
-MISC ChangeLog 25479 SHA256 f18c1528e793d80b06c97196cb08c575a2b5253a62556807c6b743e419610fe0 SHA512 37ffadffa7b67217191aa338f4cc4ef2627ef0d6c7a70e02824a2f5564dc4efe2fc181740d8c4043215a01ffe2cbb5bc9cc3cc99a7f7277f0d5728be0029b933 WHIRLPOOL 2046c7572510e11730ed487e64e83da92696ff6dcda6d2d5970c46d5216d37f292fcd72e4303bb8f626df5dfe67f8f269561abd2431644a7e7c2c2ececc15eed
+MISC ChangeLog 25699 SHA256 8f6a8831653642d9975b7389c455e91c447e642501b39ba3bf4f27549e6ffba2 SHA512 4dc378ca8d215623e7cb37220822429abfb90bbca691174e92414f43104107742b614056a1fc90a9b98c51cfa8311850c9681f6f7ba99cfd6775753716521c87 WHIRLPOOL 6a6789cbe7fcd93e10488640c62bfbb72220d19d72da1f6dbdc1e1ea5710a85dc43975b3a007d387e70988a404f6fe01bc37c39abb8c566f560404e6c73de13a
 MISC metadata.xml 462 SHA256 60d709965f0891482b26d7470afee6327c11f1d771e9b58966ebcdc61a9be5bc SHA512 fe8a640bc14aaae30e452a26b1e4d519af95c632525c93e1923be50e450e629acb93d82357efc94939fa6e7bf28d931918e9d4a688bd175cd4c3ea32f202cbaa WHIRLPOOL 6b49760a850aa33d33195855a75bff0863de5574759cf6d3053d6bc53559191c986bbb2768b16f20fb20405a892a1565b5e4a484899defbacf46f1987b8415e9
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.1
 
-iEYEAREIAAYFAlVM7yYACgkQVWmRsqeSphMx4ACfUklobr+k2bjVVtvcEkFFgEuT
-XIkAn1MCfrdxhSNoqMdR2fFdUAvhN9Cf
-=D0TJ
+iQJ8BAEBCABmBQJVfbGHXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ4N0Y5QkIzRDgwM0JERkYzMTc5RTI1MjhE
+QURFRDZCMjY3MUNCNTdEAAoJENre1rJnHLV9YzwP/14ZmbiGHuUSlTLzTKcBgrC0
+kb1wk1jUiSCjfOkrbu7xzwOoX2Sy/nwACeRwL1TUJa6eIfMlwNl3wqu43xl0qRc7
+dLXnXCWg+l0oS2XOEmMsvOpZwZwXDVyNoIBHeDIbHzI4aHQL2Bv92uTLgSfU4gW5
+d51Ex6iJVuIrWfC0Phu3f763Zxs4tvD13fleGJrz/5whiGMzYaLEDx7EkvSEvGNr
+snKwBajO/l6tcnA7yjEX7dXzNxuQZNLhfMBMH64BmpoTfrxra8fcxFo5YfocJoFM
+gPxPSzooio6btuQdmcvKDwewSqQTtWuj9uf3p+rNg52PWUUTjjMdswUdMaR98VIq
+sffo/VTa97ZsKpSUeM6vFQ8BRKuZEtLJ2bWYeiEEalFVpbLCpz2oLVgL31AWZjtv
+BdGcFyIdNGjJFHf3jek2/5tclptuRW4/m/SMbb+iwcGZrjjNHdv9Qmoh/ku9b0P8
+QxMpP/at3N5FM6wTvGYB/3WUPyjK/x2jNReX4Dr9/5ZSDX7LUHWCfccdT5PnmJCn
+FPm9XbzTlIp39dznsxExNtVVnH9sevVKyZlTl1MqReVFUcrhOUQTI/wSEgB/lzeZ
+q6jsRKeM6WlETa8ITHk5UvrUYZYe3Hc1HWeFCaTrWvM4zl2GMJBxUvjYFbsYgtvr
+X97RzlWNsl97t/dnxQ3r
+=nVr2
 -----END PGP SIGNATURE-----
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
-}