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

(Portage version: 2.2_rc61/cvs/Linux x86_64)

5 files changed, 15 insertions, 95 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/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*"