qscintilla-python no longer has a qt4 useflag (it is the only option now)

Package-Manager: portage-2.2_rc61/cvs/Linux x86_64

6 files changed, 19 insertions, 108 deletions

diff --git a/dev-util/eric/ChangeLog b/dev-util/eric/ChangeLog
index 6c030f4dee0d..82d80b57ec20 100644
--- a/dev-util/eric/ChangeLog
+++ b/dev-util/eric/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-util/eric
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/eric/ChangeLog,v 1.104 2009/12/28 18:16:04 nixnut Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/eric/ChangeLog,v 1.105 2010/01/02 16:55:53 yngwin Exp $
+
+  02 Jan 2010; Ben de Groot <yngwin@gentoo.org> eric-4.3.1.ebuild,
+  -eric-4.3.8.ebuild, eric-4.3.9.ebuild, eric-4.3.10-r1.ebuild:
+  qscintilla-python no longer has a qt4 useflag (it is the only option now)
 
   28 Dec 2009; nixnut <nixnut@gentoo.org> eric-4.3.9.ebuild:
   ppc stable #296580
diff --git a/dev-util/eric/Manifest b/dev-util/eric/Manifest
index 14edbaf88509..a60ee370b7d2 100644
--- a/dev-util/eric/Manifest
+++ b/dev-util/eric/Manifest
@@ -2,38 +2,29 @@ AUX 4.2.3-no-interactive.patch 958 RMD160 0f96217e49cd30e042315b73fe39afc827006c
 AUX eric-4.3-no-pykde.patch 3667 RMD160 49938766d7027433c2f6988edcef163fe159a260 SHA1 fa2927272ee02f85a28b561087d1bcc7dfe65b7b SHA256 fc77938c3f116fc339979938dc08c151ffcee5f7435021c09a6c33d2f9151f5d
 DIST eric4-4.3.1.tar.gz 5132500 RMD160 719a955bb1d2f64efb3e9958a63bb3f4313d1423 SHA1 58d6c8cf1cb9acbfeab634a165cdee731fe4a257 SHA256 463b82e1f226d0f5b76e5b6e4158e9518f88a6f7f751963a87d9587b423ff9a1
 DIST eric4-4.3.10.tar.gz 4930563 RMD160 7815090c7829a4e47395fc6659865f6c14dc8c64 SHA1 afde40a05d51d41bd7e9aa5bbdcbf04cf99b6b3a SHA256 aee1da03f4f1b1f1170d9190708c9e58336bc8036e3e12fa7941e89a41b7bd76
-DIST eric4-4.3.8.tar.gz 4921477 RMD160 7505423c93fdccc28c166d720a7d523a499e1ccc SHA1 e9479c09fba9b82068fa304cd07be13a34a75e26 SHA256 d4ccb99d92764d36f49d15c8075ed918b7f489af09fe369e724223a844514b3c
 DIST eric4-4.3.9.tar.gz 4930403 RMD160 ed5766371a4e9277a455f071f61ce7e21466e6e4 SHA1 bdb54fcb50b3d6eac38bd4dc8bbd1c3e138819dd SHA256 042de109e4332abcb7c159ee7451ec6f26a0667f457622b72c318926d7b0ed78
 DIST eric4-i18n-cs-4.3.1.tar.gz 401059 RMD160 fd5d67af1a279a146e1a80d319bc1372641a4f6e SHA1 568123f955cdc41c97c46c1c145e9450f034cb88 SHA256 f368d7c278484ab0fec5288b31a30c596d0515fe08f0533b2b9d0ffb222d459c
 DIST eric4-i18n-cs-4.3.10.tar.gz 399875 RMD160 a7b8a79f6fb7c1d8136b8599c8a4cbefec3cd92c SHA1 164fd0f170de4430e597112b734acf56a2fea28c SHA256 4527fc380c45f48871781b1425bbae54fe48ac4a9d3224220dd402451ee13ec2
-DIST eric4-i18n-cs-4.3.8.tar.gz 399869 RMD160 99ca804d1475d42fdefdc8ebc5be1a60aa893f17 SHA1 d49d8438b0d33d4b2142b4f89c833f8f147a11b8 SHA256 d5aa049f4e5d51f2fc82680e34ed1d8ed5c8b70619ee7599ece2c119b2e74319
 DIST eric4-i18n-cs-4.3.9.tar.gz 399871 RMD160 7d1a03b8f62eb2077eff64e922f147696fd24d3f SHA1 6e22495ecc673a8a0cd011ac7df643e728c22d65 SHA256 9769948c7881fb02b0ddedaa8806471593a389891906b041263f7e7bb498c316
 DIST eric4-i18n-de-4.3.1.tar.gz 402971 RMD160 b60ace0ee8d0bc3c302e22d3594b156429471df3 SHA1 3dca4dd4221f05ae5915863362c473060f7b3386 SHA256 8ad20a9cca961a2d48d4095855c8cbd11dac0919794f97cc3d177e4fd72c87b4
 DIST eric4-i18n-de-4.3.10.tar.gz 403088 RMD160 79d4af3a001373410298b2015dd781a994b820c4 SHA1 99d21c7d92a1484c9d880064ad5cd7919eb1e00c SHA256 c409b77680de1c87f5b894aa041b9a7842f3b247f9420a45f0d1b2c35189882d
-DIST eric4-i18n-de-4.3.8.tar.gz 403083 RMD160 8e30b0db9b98d719fc3e07874a39f1d731a653d0 SHA1 8cfb9af52a096cbb086439b442629bb22e0be9c4 SHA256 501542656cfa9cc7b1cc30dfd36f4539ac19ae505fd9aab9e8a5eb8bd543fbc1
 DIST eric4-i18n-de-4.3.9.tar.gz 403084 RMD160 251c6ecf58f87d718e2a3bba5e89c74e4f52c796 SHA1 16747aaab1428f0a79dd1fd8e838ee83aacb3bd6 SHA256 178a83e0c5c80cc55c65ee313a8dfe3121c763983ba8e979f99417fd3b92f26d
 DIST eric4-i18n-es-4.3.1.tar.gz 406379 RMD160 0c0035c989e2008d8007e80e02c67607f951a0ae SHA1 3124595595bd141cb2467f14107b5159113f65d0 SHA256 e045a34254b6e6258f7bf56e4d70b852672f1be77f833043dd9991d268a15112
 DIST eric4-i18n-es-4.3.10.tar.gz 405724 RMD160 38817b230700e560de940b54b0af2020d6b41487 SHA1 ff0942050c8dd0234f1a23474462f6495cfded25 SHA256 73f84d20f3d28a7efd39c616716a17cf748ffdd0d940b97f483643c13a08ff23
-DIST eric4-i18n-es-4.3.8.tar.gz 405718 RMD160 c82c0b3294c8fe7c2b90758185630512cf5ad3e7 SHA1 32c44b8ccf176ffdc2756337978da41af8acced1 SHA256 a975c5e77a2bace9fc71ac33506b1abce50591df3ad222f862a829627224f05e
 DIST eric4-i18n-es-4.3.9.tar.gz 405720 RMD160 60770cdcfc6a1b8c69baf51129cee3fc22350448 SHA1 29f8b1ef117b76bcce9c2fc75a11a390d39cf693 SHA256 c57f86d432d46ea57d3388a8a005fdbaf2b02fcba981bf8dad0a6d3da1c007d9
 DIST eric4-i18n-fr-4.3.1.tar.gz 407259 RMD160 196a30a4eb46500dd3b4f29db0e73df58a3b8d7b SHA1 2ef4f75a9177d247a73f0d8ef58b705f9bef6621 SHA256 d08f7bec11f31515a9e418c44b3dfb6c8fc2082bfa12d219b0e225e560745ce3
 DIST eric4-i18n-fr-4.3.10.tar.gz 407318 RMD160 f32b1ba312cb52e0d3fa48673e71eb32436c0523 SHA1 9dbbbe0bc42f2043187cf6513dad0954c6211afc SHA256 88a8dd3e0ea70e40a830c009ffc5b22d31118dbfc6aa8e3617b5b9a467d1ba87
-DIST eric4-i18n-fr-4.3.8.tar.gz 407314 RMD160 5c06513c7b98ee1185a360774f564b49deafb1d4 SHA1 18f70420f4ddfee886d79d95ca4affdc1de0df98 SHA256 20ba00f229ff5d9292f47fb3cc6e169dd505cd1100dcd152f786785034c2ba54
 DIST eric4-i18n-fr-4.3.9.tar.gz 407316 RMD160 1e48674ca2b38fff24d1534c12bd2e31d3f80fbd SHA1 23d8e0ba859822c2e3a02682d3eca77e8cfa629a SHA256 b721ef981aff5a3988bfc30cda39d369693f01f8c32ac03f95b9286e60984ea2
 DIST eric4-i18n-ru-4.3.1.tar.gz 398337 RMD160 38948a82abaa45f13ac81c7649dd61b605901659 SHA1 b9abc3497f0c5830931586402ab1f093dee1aad0 SHA256 c52e568cdf9cd366ba9bffd64a15d3a6eebb156ee50424b90b8a0034e53544c8
 DIST eric4-i18n-ru-4.3.10.tar.gz 398469 RMD160 0f724d174c2aed97d2fae380a5a237b166148f1e SHA1 05d25d13297f4678d6106cfff8a50853b586b12a SHA256 1c8fc364a07b4822b16437f64f41ac6dd8d64263dc100b2c17d1bcc8c57f8ee6
-DIST eric4-i18n-ru-4.3.8.tar.gz 398464 RMD160 458e1c4d49bc76463149cc191893e585dd3a158f SHA1 0e1006fe557a38b790090534e15f5992c06cfb2a SHA256 f09db969e7229218d35d7bfbaf39b1b558eca251c7e685acca70e61bbb8524d7
 DIST eric4-i18n-ru-4.3.9.tar.gz 398465 RMD160 441723250dee62fd82158d96457184b03e2744de SHA1 f3f2383c5d40d6894d40ad03fbb9668fe00ddab5 SHA256 63042012d9f51b006ea74324b978430702262e2627447f78d272df158c56b8ab
 DIST eric4-i18n-tr-4.3.1.tar.gz 365850 RMD160 a28a93b332905b313085253f19348980d6ae45ff SHA1 930163255d3fbb5435a075bf9304a0c7cc030868 SHA256 74beef347405ad4b2ba3c27d2b655e60d39f33bc6a3d49b3b1ff2e70066534f5
 DIST eric4-i18n-tr-4.3.10.tar.gz 365898 RMD160 083259dc7a5b44bd8c9cb964d861c1634dc42fc3 SHA1 e3dd2d50739b9937a4ca630934223484a0ca534b SHA256 c7a65a374464f03b0844b5a3a65b84618efb79881850d15ec89e90cb014519ec
-DIST eric4-i18n-tr-4.3.8.tar.gz 365896 RMD160 40012cec213b768becef7ef445565fb2d8410b60 SHA1 13b90c7ff2aa7475938bd128228e433712e24a7f SHA256 f530000432edf44b83f96cf585e6fb3fe35d27dc9a49a6b6b2df93e88825243b
 DIST eric4-i18n-tr-4.3.9.tar.gz 365899 RMD160 960815a2c075fc328cf83b4fd47784c9e54e950a SHA1 baa970438ee427dc27940f74843c8b6f9b10971c SHA256 b9110a6ad32c11fcb8bb30123011971b7d7fcd1253af88ce26d4c65acef8b62f
 DIST eric4-i18n-zh_CN.GB2312-4.3.10.tar.gz 370574 RMD160 34477924e9e82859ce78d2abd2e6ed40ddc8edd8 SHA1 f1e0c49c06803da0bddf64b342d4fdf90d5afa03 SHA256 6d959f0b195fd9bb69361942dc3933ba687d502ed74f29f76e8f24e2a005e67a
-DIST eric4-i18n-zh_CN.GB2312-4.3.8.tar.gz 370570 RMD160 c4325fbaed7129e15bf75558e605a3b4736d0d7a SHA1 53d5793b4db8da779da93499f7a0631f4b241ee9 SHA256 05741dcdbaf5b3513b3a66a4baf60a92b2a0735d3f091539e769b75d76174c92
 DIST eric4-i18n-zh_CN.GB2312-4.3.9.tar.gz 370571 RMD160 ecb82b88d3d9b2b3be429b0e45db6ce197ab3092 SHA1 af0abbea9ac348a17eb54a2e40e56c79d42e506f SHA256 4b6b03691112e9e21fdb83b127766aa894bc1dc57675a8206cccef045160bd8c
-EBUILD eric-4.3.1.ebuild 2363 RMD160 c5f66997de9e963377706b06af863827d4901c7a SHA1 0a43987f730b69552230929ec064cd4b296ca135 SHA256 b82721ba89294521aff5cc99a36440ccc77d260f04b22f22ba8e0e2c53d2327e
-EBUILD eric-4.3.10-r1.ebuild 2569 RMD160 d7fec406989b7c16aeb94de1048cf41123918df4 SHA1 8962652fd774b0a0fd95a29bf2a95f1da57f35f3 SHA256 5cfc5cf9ec142dbd5fc453cdde9929a3a754e83207bf69e405e1ead1ed4a95a7
-EBUILD eric-4.3.8.ebuild 2463 RMD160 b0ddbab0c181973e9edb6ff8189c82223906eada SHA1 de6b2a2320fca73719d4e9a731bebbb134c257f4 SHA256 99bc54d467531eae24535606add61a2ecfe04b916d2073359f0e80db7db671b9
-EBUILD eric-4.3.9.ebuild 2461 RMD160 67a39e54080057fcd7935fc62df6ee2a11cb1ace SHA1 8cbec07fda17da5b60250ef6dcda765659406983 SHA256 70f4bea0a1953f3e681d5440a7fc0d7cbdb277bb0abba367381c3971edcce9eb
-MISC ChangeLog 13489 RMD160 7dd5b5105238a43fcb416ad3d79195e3fe8fab86 SHA1 5d4af0207aeb5957e01db758cd347ee5ff19da3b SHA256 eab0db498708536cb8014de8ce3263c25d3f6d744fd9907c54a942e807905052
+EBUILD eric-4.3.1.ebuild 2354 RMD160 330354e7428c335ef8e1bda6f6a20bec8c2cc425 SHA1 62cf3f1c0ff3e16654e4d8f565f4778b072bfbb3 SHA256 fcc07433818f144dce4eded9d3e674606614793c5076af89f6847e3acd8462d2
+EBUILD eric-4.3.10-r1.ebuild 2556 RMD160 8218cac21349f7df1f8954365d151cb811ba351e SHA1 419910ab3ba16daa739cf483e5ad5dab054d2409 SHA256 02c5297a1879f1eca6bb93e2294dc0b127dfa7f68dcc2350709fb2ae1907bea4
+EBUILD eric-4.3.9.ebuild 2450 RMD160 2b687c7e411edc04447f8b7a288c8270d150f9b3 SHA1 8ab825fc0c6c48eb7ce4bcc28c1237ab1b7341ea SHA256 8d2821881a6f13acd24297ea084f23f536e59b5d817c41e922b552b491162952
+MISC ChangeLog 13697 RMD160 31d98382ea760ad5b8f8e38befdaaff9dd2702ab SHA1 12cce8ddaa210a548948b885ff04e1b649d43963 SHA256 cdda9f9618030d3ddbce9e388878e587c5c0eafd35c00c8fc3d8bf686d17a39a
 MISC metadata.xml 179 RMD160 887c899594fdaa3d82028c3d84188354d3784cd9 SHA1 551c6b2378ff31eadc1e4860211ec8709ce960bd SHA256 1fbdee58e0ba0f8730f6a27979cb7eeed8ebd3afa316d61b34a5f4893291a646
diff --git a/dev-util/eric/eric-4.3.1.ebuild b/dev-util/eric/eric-4.3.1.ebuild
index 0e1791415d9f..89a4889f2978 100644
--- a/dev-util/eric/eric-4.3.1.ebuild
+++ b/dev-util/eric/eric-4.3.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/eric/eric-4.3.1.ebuild,v 1.8 2009/11/16 05:01:06 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/eric/eric-4.3.1.ebuild,v 1.9 2010/01/02 16:55:53 yngwin Exp $
 
 EAPI="2"
 
@@ -26,7 +26,7 @@ KEYWORDS="amd64 hppa ppc ppc64 sparc x86"
 IUSE="linguas_cs linguas_de linguas_es linguas_fr linguas_ru linguas_tr"
 
 DEPEND="dev-python/PyQt4[svg]
-	>=dev-python/qscintilla-python-2.2[qt4]"
+	dev-python/qscintilla-python"
 RDEPEND="${DEPEND}"
 
 S=${WORKDIR}/${MY_P}
diff --git a/dev-util/eric/eric-4.3.10-r1.ebuild b/dev-util/eric/eric-4.3.10-r1.ebuild
index e13446f2c93c..0c2eca094dbf 100644
--- a/dev-util/eric/eric-4.3.10-r1.ebuild
+++ b/dev-util/eric/eric-4.3.10-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/eric/eric-4.3.10-r1.ebuild,v 1.1 2009/12/13 18:00:14 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/eric/eric-4.3.10-r1.ebuild,v 1.2 2010/01/02 16:55:53 yngwin Exp $
 
 EAPI="2"
 SUPPORT_PYTHON_ABIS="1"
@@ -26,7 +26,7 @@ KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
 IUSE="kde linguas_cs linguas_de linguas_es linguas_fr linguas_ru linguas_tr"
 
 DEPEND="dev-python/PyQt4[svg,webkit,X]
-	>=dev-python/qscintilla-python-2.2[qt4]
+	dev-python/qscintilla-python
 	kde? ( kde-base/pykde4 )"
 RDEPEND="${DEPEND}"
 RESTRICT_PYTHON_ABIS="3.*"
diff --git a/dev-util/eric/eric-4.3.8.ebuild b/dev-util/eric/eric-4.3.8.ebuild
deleted file mode 100644
index 6352ef4d8a44..000000000000
--- a/dev-util/eric/eric-4.3.8.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/eric/eric-4.3.8.ebuild,v 1.5 2009/12/12 03:58:58 arfrever Exp $
-
-EAPI="2"
-NEED_PYTHON="2.4"
-SUPPORT_PYTHON_ABIS="1"
-
-inherit eutils python
-
-MY_PN=${PN}4
-MY_P=${MY_PN}-${PV}
-DESCRIPTION="A full featured Python IDE that is written in PyQt4 using the QScintilla editor widget"
-HOMEPAGE="http://eric-ide.python-projects.org/index.html"
-SRC_URI="mirror://sourceforge/eric-ide/${MY_P}.tar.gz
-	linguas_cs? ( mirror://sourceforge/eric-ide/${MY_PN}-i18n-cs-${PV}.tar.gz )
-	linguas_de? ( mirror://sourceforge/eric-ide/${MY_PN}-i18n-de-${PV}.tar.gz )
-	linguas_es? ( mirror://sourceforge/eric-ide/${MY_PN}-i18n-es-${PV}.tar.gz )
-	linguas_fr? ( mirror://sourceforge/eric-ide/${MY_PN}-i18n-fr-${PV}.tar.gz )
-	linguas_ru? ( mirror://sourceforge/eric-ide/${MY_PN}-i18n-ru-${PV}.tar.gz )
-	linguas_tr? ( mirror://sourceforge/eric-ide/${MY_PN}-i18n-tr-${PV}.tar.gz )
-	linguas_zh_CN? ( mirror://sourceforge/eric-ide/${MY_PN}-i18n-zh_CN.GB2312-${PV}.tar.gz )"
-
-SLOT="4"
-LICENSE="GPL-2"
-KEYWORDS="amd64 hppa ppc ~ppc64 ~sparc x86"
-IUSE="linguas_cs linguas_de linguas_es linguas_fr linguas_ru linguas_tr"
-
-DEPEND="dev-python/PyQt4[svg,webkit,X]
-	>=dev-python/qscintilla-python-2.2[qt4]"
-RDEPEND="${DEPEND}"
-
-RESTRICT_PYTHON_ABIS="3*"
-
-S=${WORKDIR}/${MY_P}
-
-LANGS="cs de es fr ru tr"
-
-python_version
-
-src_prepare() {
-	epatch "${FILESDIR}/4.2.3-no-interactive.patch"
-}
-
-src_install() {
-	# Change qt dir to be located in ${D}
-	dodir /usr/share/qt4
-
-	installation() {
-		"$(PYTHON)" install.py \
-			-z \
-			-b "/usr/bin" \
-			-i "${D}" \
-			-d "$(python_get_sitedir)" \
-			-c
-	}
-	python_execute_function installation
-
-	python_version
-	make_desktop_entry "eric4 --nosplash" \
-			eric4 \
-			"/usr/$(get_libdir)/python${PYVER}/site-packages/eric4/icons/default/eric.png" \
-			"Development;IDE;Qt"
-}
-
-pkg_postinst() {
-	python_mod_optimize eric4{,config.py,plugins}
-
-	elog
-	elog "If you want to use eric4 with mod_python, have a look at"
-	elog "\"${ROOT}usr/$(get_libdir)/python${PYVER}/site-packages/eric4/patch_modpython.py\"."
-	elog
-	elog "The following packages will give eric extended functionality:"
-	elog "  dev-python/pylint"
-	elog "  dev-python/pysvn"
-	elog
-	elog "This version has a plugin interface with plugin-autofetch from"
-	elog "the App itself. You may want to check those as well."
-	elog
-}
-
-pkg_postrm() {
-	python_mod_cleanup
-}
diff --git a/dev-util/eric/eric-4.3.9.ebuild b/dev-util/eric/eric-4.3.9.ebuild
index 853db8c404e7..b38f1e155730 100644
--- a/dev-util/eric/eric-4.3.9.ebuild
+++ b/dev-util/eric/eric-4.3.9.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/eric/eric-4.3.9.ebuild,v 1.5 2009/12/28 18:16:04 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/eric/eric-4.3.9.ebuild,v 1.6 2010/01/02 16:55:53 yngwin Exp $
 
 EAPI="2"
 NEED_PYTHON="2.4"
@@ -27,7 +27,7 @@ KEYWORDS="amd64 hppa ppc ~ppc64 ~sparc x86"
 IUSE="linguas_cs linguas_de linguas_es linguas_fr linguas_ru linguas_tr"
 
 DEPEND="dev-python/PyQt4[svg,webkit,X]
-	>=dev-python/qscintilla-python-2.2[qt4]"
+	dev-python/qscintilla-python"
 RDEPEND="${DEPEND}"
 
 RESTRICT_PYTHON_ABIS="3*"