old

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0x17A85C72

4 files changed, 19 insertions, 103 deletions

diff --git a/x11-libs/qscintilla/ChangeLog b/x11-libs/qscintilla/ChangeLog
index 4917bf826e25..9ecab9b16b07 100644
--- a/x11-libs/qscintilla/ChangeLog
+++ b/x11-libs/qscintilla/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/qscintilla
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qscintilla/ChangeLog,v 1.96 2013/12/23 15:31:06 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qscintilla/ChangeLog,v 1.97 2013/12/24 19:21:54 pesa Exp $
+
+  24 Dec 2013; Davide Pesavento <pesa@gentoo.org>
+  -files/qscintilla-2.6.2-designer.patch, -qscintilla-2.6.2.ebuild:
+  old
 
   23 Dec 2013; Agostino Sarubbo <ago@gentoo.org> qscintilla-2.7.2.ebuild:
   Stable for sparc, wrt bug #483112
diff --git a/x11-libs/qscintilla/Manifest b/x11-libs/qscintilla/Manifest
index e1108da487ce..69a7e11b5815 100644
--- a/x11-libs/qscintilla/Manifest
+++ b/x11-libs/qscintilla/Manifest
@@ -1,30 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX qscintilla-2.6.2-designer.patch 458 SHA256 bb73f63a41c86691058f10deb8d6429ed344c29613a2bb6b49e61ed6cc1c9b95 SHA512 abc27b859d0025f34e29bd159e438316347d64498939dff7789250909d5a85ac4498448c28a5949f7bcfede8ec046e371a52b33f6cb96fe5938b8e59974db4d5 WHIRLPOOL 644802baf2a7ff0392189fa4b08ce22b28a8254542098818f11e019a63e7817c357f07f37d367e4c6ca069cce897ca0bde320c028f2bfda5e10b2f20d44b3daa
 AUX qscintilla-2.7.1-designer.patch 434 SHA256 fa643d33e12ce21d041230285ab71f989f84963c422899a74508f74a8299154f SHA512 bf257cbaf0e30f41ba674778cc8c37d6b958eb25cc89046b5b88c4e6582ddfe8eb4f4daea07a6d7cb23808bdf8ce26954c2470f499e1cdd957046347897fcb23 WHIRLPOOL 2f731cea40791890d2962a88b65f46f750f7b558f45c41692a04363e66f210b4eb56d087a7259c762094b1700cd8b63249b39b4e83bdc4078126447cdff644eb
-DIST QScintilla-gpl-2.6.2.tar.gz 2662469 SHA256 fac245ecfa11676b0003ef605489f87332c2efe039a4111821aec61bb936c264 SHA512 5d92c70182817f34141c4166a41807a3ef506c38cc2cd3c83d140eeca329e4aa6f1fa379bb9422da95d65a3385eefc27b0948b342af89c93eeca49f233a63a81 WHIRLPOOL 9c2676e61c2706cc0d57fe7ba0fc00cd45f5a12646c8ffe9fbcd197b204cbbadbdc42a93781d07dbd7b198bbbb45584d74b6752173d150096ce900ef0de222cd
 DIST QScintilla-gpl-2.7.2.tar.gz 2842625 SHA256 14b47d686dc1586321f84fcf3c9a911ddaace37a1cb0b1e6a6195e252e5bb69c SHA512 d3ca9d75687687210ca6ae3599fd44bfbbad8c99d6d38aaf1c92c83250dc0c5af1c713bdd74d077d0fb9ba1eccbd5e2910eef855d3656392c33c4832d46ff7fb WHIRLPOOL 1ea4a189a5998755afaa0fad111a7f2153e5ecbe13290d62930cce992b0159040de9cb304e848705abc3d0f1909a82fde908d8179ddd9de05970323cee5ffebe
 DIST QScintilla-gpl-2.8.tar.gz 2917864 SHA256 41d32af71501bdfdfc0668f304ba7d7c15019462795e9441d3b23fc054fdfb71 SHA512 531cec5fb89037f79b71bfd07bc94f2744b8b43c7cf8376d102bd4c85d91af1213ac39cce0cb19e8b90d2fbcda47a8617d1b787dbbadaf6270b66660d7d72cd4 WHIRLPOOL 39eb0231fb6c557f49de1abf8c851dd22dd6416841acecf2350a0dcb23f500f571c1bab67a7e5c28d0c31c142781feb32c8475e5a9840dfbfe6decaa6909df80
-EBUILD qscintilla-2.6.2.ebuild 1695 SHA256 b70d93e927c6b78838a3e9342d4a596efcefbd7f457c877f968bcac8e1dc573a SHA512 75eb6f1103e3c98d8f861a9a207b3577a9c7e02b927fb6306d6f1d8bfbb2f17c7370c06e4bc4174b84cef8d59bd990e759b7820942a89a3e1e7c6071e89fec00 WHIRLPOOL 669cc8a196cfcce12978e2922b3a152bc90151f4c56593e62573fae39398a80537f30ae16638018d59d18c71262e86b6b9df7927da417cdc342ed72df006110d
 EBUILD qscintilla-2.7.2.ebuild 2155 SHA256 af2587f609b091a8725d6b5855162e1a04ac43096f22141c555750d5aa5c8811 SHA512 355050f374c81adfed0cdb31aee5cbd727e3f99df7979469a5c14ae63fa962f7708d571e23a9dde6d0841df695ce1ea79011bbc359465351addd60e44d3cf115 WHIRLPOOL dae3b2754571216741d4b5e929c9d7350c988cbae0242266a69a960a928fef871542e3e6165c5beca9583e676ccc03216b8e75becba2b29ff5764132e01f12b7
 EBUILD qscintilla-2.8.ebuild 2145 SHA256 d40cdfd5191e25e45499a802b6c29e0421a4fb7e9cc52a4c3bd5760b16c3efa8 SHA512 6effd7dea9bb8ed58f2e9b3a3701bfb80b0f99f4b25cf61b5e26b3410f19676db80482e88c4ff4aa708b63ec5e3a18ec2e7779a444bf4340fc70a4b5818eb83a WHIRLPOOL fdfbb51ad24c120575a78d4a9a57e6cc8f7cf03a74f16b05fdf3751bf9f0bb5ddfa82747c600c5fe34a44288d869a6f94405148248d372a30b7326f129a58f3e
-MISC ChangeLog 23335 SHA256 5f0d9486d00d189cb9e179bbfda3cc4fd15e8b845a667610b39e53f77fb8fbe9 SHA512 2005a76673c64153d155dd0e01f11f71daf7870c82b539ccd55591210e823984fa228017868db4c9da4d9f4002b5cdb9c5a60f333895082b29f88c14d39e937f WHIRLPOOL 98f1a0bfeb4714ddaab451c58bc1cca9aa7c7bca59d86df39f9deace84a75a8a5bff38f409085ea81333cc3a6374ee422a4805a15bad007fe29e5041acd86292
+MISC ChangeLog 23461 SHA256 63a055cfcc468f13a401bfed7736f34eb830c0281678906050fa8e45eb71499e SHA512 97e3970d2633ec7fd02c9f86f47f7af47d14a12c72282e8b8404823e0ad3a7c2825b121654d7efbd547bc43e12a8f96a961dc722a2bb4d5e468b9b6bc27e2c55 WHIRLPOOL ee30d4163e0fdcc1190f8a30c79f39a17a5758b4e8ad4a0b3e727501860b231b44b1bcd562ef90d57c2a4bbb303125dd5ef09bfd4daac854d1b6eadc5b10b5ba
 MISC metadata.xml 175 SHA256 26b18db06b1665422af8905fb70f8f48920a048578172d62b9689e273ee39a2d SHA512 bea471fa9163260e9198463bcd8e6f2a88f9fb25dea55be266216d5f99abf1492d069f8dbdc111e4a26d87928f44a19db96562886edfc0233d5a9c5c947fdc7c WHIRLPOOL 4266a6076b386b6bd3e374650ddfa7879920261bef209534de056c935279dba6da27db83162e5b73ed05d3a82e47f5b839274f8137d525ff4c68073f5efdfe6c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJSuFc9AAoJELp701BxlEWfFdEP/A3Pypj/O7AkRn50fv5F6VZM
-if0UqdtrRZNh+I9siAw36gVjSWPP/J6mrB3Z9lsHz+RdF/bxgeBjnZ4aFa1AJ7xD
-RMny4XQLALAVmlTk4b8HIPab3lKveoOD8oagVh9mS+ut/yt2LPvk8tnjkc234hkm
-JZEI6HCTtk/aRyX2C+tmYBxbk/MwzcuKSJvCD2FrjR2TsmvTL6tRsRlW03NTUea2
-dE9a7pT7z1CN9/7BDz+UNsCKoqk5htHZg4Y8mXr593r+A3kDLP2+A4DAqDSwMhqI
-nzCHqm+fbtYTk/y+/TkvIp+Rs97+3B54IsQOeIwnbI9kncyHRfsSfIBAgnucbe2F
-BvwQI837C/VTXYu6WS4nxf18HN2SrOKUnSBeYuemKFAbzYgg3dR8HF8/OK5kaCtH
-R05eQUpVue4JYB6Ef5Z5W/xyhV4nR611YBY9p7IAzNjfv3h0lXFNC/92MuM8fgLa
-oQhv0c+Vk45lh2NJCTzK2FTtVhSVwOOFVW9PFJ7D4UiJLZc8M4pUiwMpGrInq/0x
-Bog3HbqenhltuSqWw3wDjMEGus6K5NpJTw/oEGO8c/adewGNFzKiv6O11pBzLhmb
-sNs++JX/G5RRFRUS1tKjMih/ZFpkOXHu1sz4ARnGY6Oelvrpw9mnAksrdISncs27
-Esij2wRnHg29PVO1AG1r
-=2UFU
+iQIcBAEBCAAGBQJSud7hAAoJENXLsxwXqFxyYYoP/2PxUtK3s1S10pRuBBsSFQC4
+p/4FbXLl2Ywcg8yvtF/rSfl9wMCGVVBENFfNab4HcJ5U7rRVj9GiOu5uYxB5Zk6g
+GjMzGup/DJtPgyshP1bOtaicXOcMEi8E3WUYlAFVglTGiAWUGsezkEEiSjXnP1zr
+bi+GMANq2jfEUR9nD2gvQ4KEFKGO/PpxN0O035OPlkg4RMnPc2zMY6nlGb8yt9Os
+nSptltfutKFk5PkJ0JzLKolb199vd2ZEdKkwbYS5KgOWM1wY+B9vaUfE+XvDwHIf
+Qrj+s3v38glcmPfghU+Eo5pz1V9FSzQxTB2j+9Mf/oBBWza02k/UQgExteaq9Wh6
+LzA/kcclZ7TX2qtCijZXbvurze0wGAK1gzTSmQC8w5R5561U1/N8SkVWYYxdhZth
+yOVhYPHfNFksSgG+VtM0NiCJGUzUt8AEof4yvfgvCVssMHnPCM/K+SZtnAa5QnE8
+ICNg4x1Mt+nTEjz8Th/zhDgxIVZKnZcYMkaVV0Fs73hscCS7M4tsPF8DDyrJuQ1z
+YMNnj6T2yTju/OIWqkwhro5Yu7hkb4/nA104eP4xUk7zinxOlMSeKQbHQIgk2RAk
+9ZZGfvYyOc2dGk/cgvyXOqkCDkJwgrwYCSpmbHSSfh0Od2x3Kvyj+mx8NMjp1O9y
+FbogEhAv9GQQAgurg862
+=O8pS
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/qscintilla/files/qscintilla-2.6.2-designer.patch b/x11-libs/qscintilla/files/qscintilla-2.6.2-designer.patch
deleted file mode 100644
index 978d068937da..000000000000
--- a/x11-libs/qscintilla/files/qscintilla-2.6.2-designer.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-diff -urN QScintilla-gpl-2.6.2.orig/designer-Qt4/designer.pro QScintilla-gpl-2.6.2/designer-Qt4/designer.pro
---- QScintilla-gpl-2.6.2.orig/designer-Qt4/designer.pro	2012-06-27 15:22:31.980241792 +0200
-+++ QScintilla-gpl-2.6.2/designer-Qt4/designer.pro	2012-06-27 15:23:39.802393898 +0200
-@@ -12,4 +12,5 @@
- target.path = $$[QT_INSTALL_PLUGINS]/designer
- INSTALLS += target
- 
--LIBS += -lqscintilla2
-+INCLUDEPATH = ../Qt4Qt5
-+LIBS += -L../Qt4Qt5 -lqscintilla2
diff --git a/x11-libs/qscintilla/qscintilla-2.6.2.ebuild b/x11-libs/qscintilla/qscintilla-2.6.2.ebuild
deleted file mode 100644
index b2caec866301..000000000000
--- a/x11-libs/qscintilla/qscintilla-2.6.2.ebuild
+++ /dev/null
@@ -1,75 +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.6.2.ebuild,v 1.9 2013/07/23 14:22:33 kensington Exp $
-
-EAPI=4
-
-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="http://www.riverbankcomputing.co.uk/static/Downloads/QScintilla2/${MY_P}.tar.gz"
-
-LICENSE="|| ( GPL-2 GPL-3 )"
-SLOT="0"
-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.6.2-designer.patch"
-)
-
-src_configure() {
-	pushd Qt4Qt5 > /dev/null
-	einfo "Configuration of qscintilla"
-	eqmake4 qscintilla.pro
-	popd > /dev/null
-
-	pushd designer-Qt4 > /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-Qt4 > /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-Qt4 > /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
-}