Version bump

Package-Manager: portage-2.2.0_alpha71/cvs/Linux x86_64

3 files changed, 94 insertions, 9 deletions

diff --git a/x11-libs/qscintilla/ChangeLog b/x11-libs/qscintilla/ChangeLog
index cf751cb677cb..fc1c1a587e6d 100644
--- a/x11-libs/qscintilla/ChangeLog
+++ b/x11-libs/qscintilla/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-libs/qscintilla
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qscintilla/ChangeLog,v 1.67 2011/07/25 20:40:01 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qscintilla/ChangeLog,v 1.68 2011/11/12 10:57:21 hwoarang Exp $
+
+*qscintilla-2.6 (12 Nov 2011)
+
+  12 Nov 2011; Markos Chandras <hwoarang@gentoo.org> +qscintilla-2.6.ebuild:
+  Version bump
 
   25 Jul 2011; Kacper Kowalik <xarthisius@gentoo.org> qscintilla-2.5.1.ebuild:
   ppc/ppc64 stable wrt #374591
diff --git a/x11-libs/qscintilla/Manifest b/x11-libs/qscintilla/Manifest
index 46ca515be38c..bc83f6f4cf28 100644
--- a/x11-libs/qscintilla/Manifest
+++ b/x11-libs/qscintilla/Manifest
@@ -1,21 +1,31 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
 AUX qscintilla-2.4-designer.patch 1042 RMD160 cfb80962caed15e4bb6c290edcc35d1acfc861a0 SHA1 d5586a13545be09e2d2126b6fcbef2f172470429 SHA256 af6c15f8cdc64041ddd692480d6bcc7d6c59aa7c1c5b963707b4d31e60288d78
 DIST QScintilla-gpl-2.4.5.tar.gz 2372380 RMD160 d96cf05c879f314ee828ec6a1609bd1864692bd6 SHA1 2401c2214ba0377ad61855c0fac6f6c7c95801d6 SHA256 cd73960e3c93e84b013cd5ec350f4a2810e3b95d9506083acf3608f7ccf43c09
 DIST QScintilla-gpl-2.4.6.tar.gz 2442792 RMD160 b48880e3e0fa0d285f04bf7ceb509f509d684929 SHA1 0527feedf74186a02ca0757d71be0c790149f674 SHA256 ad4dcc34922358aab8b0ce643e38e12188b41d00a87513ebfd2d6186c5824eab
 DIST QScintilla-gpl-2.5.1.tar.gz 2638790 RMD160 4cd5eaf87d831fa77212494e19624308dbd00900 SHA1 ff8eb7c49c949109abc434650f4b8215757574bd SHA256 982a3ea9cd42cd2bad65cd88c2cbf47c55397983ab11a7101215bca466ff9ac4
+DIST QScintilla-gpl-2.6.tar.gz 2655263 RMD160 5a04e13b2642d5611b15e4a1e49a3021f5dc25f3 SHA1 f55dfc6804b2140a5c3e69bd85eb64caa1a5c2ce SHA256 21bc3c0b970935c5d45ea2493e629ea3740b0290be43fed37bb389c94aaa1f41
 EBUILD qscintilla-2.4.5.ebuild 1678 RMD160 96b3d44384b0bd3c74649cfd61960ccae8762584 SHA1 34e6da4fa849cbbcc0552153eb3dc5852db0ff8f SHA256 e8d025685c2db976b0bee0ad7df85f74a174ba9c7261abeccc46a1ccc8a8344d
 EBUILD qscintilla-2.4.6.ebuild 1926 RMD160 310d02202cd8be508a393e7b58f76bec881a72af SHA1 f5e2b991b9944af86fe4b9fbb1c549d55c91531e SHA256 602ddb0e94e7c9f8767f7b56b10854faa55a8fcac6f7d0b6ec6ba91843dd3a5a
 EBUILD qscintilla-2.5.1.ebuild 1924 RMD160 d1ce2526f936701b6931bb35bd11b68ce7ebb9dc SHA1 f89cdebdebfa88e30ae229f13073a1f92bb1aa30 SHA256 1e68505ecd5a951a04e443a74042761465b949575f401dc14e1fbbba3715812f
-MISC ChangeLog 19377 RMD160 3a137b1c4b665cd2e7872bdd1dde7173f7084a1c SHA1 04149e908166b2f5c20595ce42c6c013731e6594 SHA256 7cb6b42702308d2a75b3fc6377b6f9a2599eed3a98bc788824c4afcfc8679568
+EBUILD qscintilla-2.6.ebuild 1924 RMD160 9a6527920d5ad28b596a8d2d36619ebd90b8925a SHA1 d3b6e00198f26bfc2389c00672af006015c397ec SHA256 f8a7efc0d3cd627a649a5576f353ecaf10c4274acef56e9ca433e36948bd33fa
+MISC ChangeLog 19499 RMD160 487f730c70e111e48f8dfa0112ec0f4105b34110 SHA1 4aae8dabaeeebd04e0e18db54ca38b356007b615 SHA256 8a521ba9b9c25647ea93901c40afd16741339a3a071d0d65b7b8a10d0d78da90
 MISC metadata.xml 175 RMD160 74ecde8b999da503a2733b49ed618d5d50d26476 SHA1 ec86e15b85c2bc4429ad67bb52238b44f2b16cbd SHA256 26b18db06b1665422af8905fb70f8f48920a048578172d62b9689e273ee39a2d
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iJwEAQECAAYFAk4t1KcACgkQIiMqcbOVdxQIDwP/YHXlHQr/VNMx0EOIUm83yDVZ
-UWOSTdjMucPRlhybHT1D78Ptj11vFZGMY2XZgpilZrg7RcTJcC1LssQnlLdyfGuG
-DmzT/QlmhYAh2n/xOjctc0LpJYL6/2bpDiKyxIzz5wKutJCs2duuxTYvzuA4/x85
-Oncp8G59pekX10Cf+00=
-=NK++
+iQIcBAEBCgAGBQJOvl7TAAoJEPqDWhW0r/LC1H4P/1Qzc+rMV8b47rZ+6PmobCBx
+rok0qsF/gRjUrxY6Vhrbhkhux9syW7Okojb/UaSiNfQCMTCdiksFA89ZhrrWH+2v
++pgvRCFAwJb29Yu79OH/Kt/oqLwAWYxAU5yYCJrgM7FgLxLPan3GnmiMr9y6gl6f
+rdmIgW0qvtAXT5RGeKI34fVBoWnwl98pxgOLLFgPaiTVLg3WXnc4v4vT6r6mhde0
+nzvKJyhPuN/6W6eqoWIJ370d0yUX8he2jvkRDjVVk55TgqlqstJdZFutfUeJeXYi
+z++BFMNfFoML2sNc6DU5bRYm+LS+6zg4E7l+t/VsARjRAnoBViTkO4Fp1GTqLY4P
+kFuWpipCNeXD3HtQVtgiI1hfmtIPO9NVp/a8krD7T8L+gzz3jrU342l/KL2tU7qj
+tfcw+znDk7c8MZcCC8isr7iubnkgmYIg7fCf8hyyJlV1yfA9S6xBMVJFpVUX4EaY
+blrhSSEYg9px0spYN7Z29swdjyOl9tQg0YkLYZ6SwMVu86L0emY53Mc40EQcgcX5
++IXgFvUkQf5emdRtViEcKG1dT+HugpstSGBSf0KYKgQ98pfeodos0T5uzpmm2mod
+Z1yJ66HSHFJqeTqbRLRaz4IphA8m41YrC3R9gU5jQ6RRIgBQuW7EmphwoCoxDKbf
+Nrtq8JXVKXyCJtiosAAs
+=vPjD
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/qscintilla/qscintilla-2.6.ebuild b/x11-libs/qscintilla/qscintilla-2.6.ebuild
new file mode 100644
index 000000000000..c372e71e82e7
--- /dev/null
+++ b/x11-libs/qscintilla/qscintilla-2.6.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qscintilla/qscintilla-2.6.ebuild,v 1.1 2011/11/12 10:57:21 hwoarang Exp $
+
+EAPI="3"
+
+inherit qt4-r2
+
+MY_P="QScintilla-gpl-${PV/_pre/-snapshot-}"
+
+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 ~x86-fbsd"
+IUSE="doc python"
+
+DEPEND="x11-libs/qt-gui:4"
+RDEPEND="${DEPEND}"
+PDEPEND="python? ( ~dev-python/qscintilla-python-${PV} )"
+
+S=${WORKDIR}/${MY_P}
+
+PATCHES=("${FILESDIR}/${PN}-2.4-designer.patch")
+
+src_configure() {
+	pushd Qt4 > /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 Qt4 > /dev/null
+	einfo "Building of qscintilla"
+	emake || die "Building of qscintilla failed"
+	popd > /dev/null
+
+	pushd designer-Qt4 > /dev/null
+	einfo "Building of designer plugin"
+	emake || die "Building of designer plugin failed"
+	popd > /dev/null
+}
+
+src_install() {
+	pushd Qt4 > /dev/null
+	einfo "Installation of qscintilla"
+	emake INSTALL_ROOT="${D}" install || die "Installation of qscintilla failed"
+	popd > /dev/null
+
+	pushd designer-Qt4 > /dev/null
+	einfo "Installation of designer plugin"
+	emake INSTALL_ROOT="${D}" install || die "Installation of designer plugin failed"
+	popd > /dev/null
+
+	dodoc NEWS || die "dodoc failed"
+	if use doc; then
+		einfo "Installation of documentation"
+		dohtml doc/html-Qt4/* || die "dohtml failed"
+		insinto /usr/share/doc/${PF}/Scintilla
+		doins doc/Scintilla/* || die "doins failed"
+	fi
+}