Change qscintilla depend to qscintilla-python, bug 198697. Drop old.

(Portage version: 2.1.4_rc14)

6 files changed, 16 insertions, 153 deletions

diff --git a/dev-util/eric/ChangeLog b/dev-util/eric/ChangeLog
index 7115aa6386f2..cd71cbd21e11 100644
--- a/dev-util/eric/ChangeLog
+++ b/dev-util/eric/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-util/eric
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/eric/ChangeLog,v 1.53 2008/01/04 00:44:01 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/eric/ChangeLog,v 1.54 2008/01/04 08:12:11 hawking Exp $
+
+  04 Jan 2008; Ali Polatel <hawking@gentoo.org> -eric-4.0.1.ebuild,
+  -eric-4.0.3.ebuild, eric-4.0.4.ebuild:
+  Changed qscintilla depend to qscintilla-python. Added built_with_use check
+  for qscintilla-python's qt4 USE flag, bug 198697. Drop old.
 
   04 Jan 2008; Brent Baude <ranger@gentoo.org> eric-4.0.1.ebuild,
   eric-4.0.3.ebuild, eric-4.0.4.ebuild:
diff --git a/dev-util/eric/eric-4.0.1.ebuild b/dev-util/eric/eric-4.0.1.ebuild
deleted file mode 100644
index bfe4599a904f..000000000000
--- a/dev-util/eric/eric-4.0.1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/eric/eric-4.0.1.ebuild,v 1.3 2008/01/04 00:44:01 ranger Exp $
-
-NEED_PYTHON=2.4
-
-inherit python eutils
-
-MY_PN=${PN}4
-MY_P=${MY_PN}-${PV}
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="eric4 is a full featured Python IDE that is written in PyQt4 using the QScintilla editor widget"
-HOMEPAGE="http://www.die-offenbachs.de/detlev/eric4.html"
-SRC_URI="mirror://sourceforge/eric-ide/${MY_P}.tar.gz
-	linguas_de? ( mirror://sourceforge/eric-ide/${MY_PN}-i18n-de-${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 )"
-
-SLOT="4"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-
-DEPEND=">=dev-python/PyQt4-4.1
-		>=x11-libs/qscintilla-2.1
-		>=x11-libs/qt-4.2.0"
-
-LANGS="de fr ru"
-
-python_version
-
-src_install() {
-	# Change qt dir to be located in ${D}
-	mkdir -p "${D}"/usr/share/qt4/
-	sed -i \
-		-e "s:pyqtconfig._pkg_config\[\"qt_data_dir\"\]:\"${D}/usr/share/qt4/\":" \
-		install.py
-
-	${python} install.py \
-		-b "/usr/bin" \
-		-i "${D}" \
-		-d "/usr/$(get_libdir)/python${PYVER}/site-packages" \
-		-c || die "python install.py failed"
-
-	dodir /usr/share/qt4/qsci/api/python/
-	dodoc THANKS eric/README*
-	make_desktop_entry "eric4 --nosplash" \
-			eric4 \
-			"/usr/$(get_libdir)/python${PYVER}/site-packages/eric4/icons/default/eric.png" \
-			"Development;IDE;Qt"
-}
-
-pkg_postinst() {
-	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
-	elog "dev-python/pylint"
-	elog "dev-python/pysvn            (NOT YET IN PORTAGE)"
-	elog "dev-python/cx_freeze        (NOT YET IN PORTAGE)"
-}
diff --git a/dev-util/eric/eric-4.0.3.ebuild b/dev-util/eric/eric-4.0.3.ebuild
deleted file mode 100644
index eaae90a35cf9..000000000000
--- a/dev-util/eric/eric-4.0.3.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/eric/eric-4.0.3.ebuild,v 1.5 2008/01/04 00:44:01 ranger Exp $
-
-NEED_PYTHON=2.4
-
-inherit python eutils
-
-MY_PN=${PN}4
-MY_P=${MY_PN}-${PV}
-S=${WORKDIR}/${MY_P}
-
-IUSE="linguas_de linguas_fr linguas_ru"
-
-DESCRIPTION="eric4 is a full featured Python IDE that is written in PyQt4 using the QScintilla editor widget"
-HOMEPAGE="http://www.die-offenbachs.de/detlev/eric4.html"
-SRC_URI="mirror://sourceforge/eric-ide/${MY_P}.tar.gz
-	linguas_de? ( mirror://sourceforge/eric-ide/${MY_PN}-i18n-de-${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 )"
-
-SLOT="4"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-
-DEPEND=">=dev-python/PyQt4-4.1
-	>=x11-libs/qscintilla-2.1
-	>=x11-libs/qt-4.2.0"
-
-LANGS="de fr ru"
-
-python_version
-
-src_install() {
-	# Change qt dir to be located in ${D}
-	dodir /usr/share/qt4/
-	sed -i \
-		-e "s:pyqtconfig._pkg_config\[\"qt_data_dir\"\]:\"${D}/usr/share/qt4/\":" \
-		install.py
-
-	${python} install.py \
-		-b "/usr/bin" \
-		-i "${D}" \
-		-d "/usr/$(get_libdir)/python${PYVER}/site-packages" \
-		-c || die "python install.py failed"
-
-	dodir /usr/share/qt4/qsci/api/python/
-	dodoc THANKS eric/README*
-	make_desktop_entry "eric4 --nosplash" \
-			eric4 \
-			"/usr/$(get_libdir)/python${PYVER}/site-packages/eric4/icons/default/eric.png" \
-			"Development;IDE;Qt"
-}
-
-pkg_postinst() {
-	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
-	elog "dev-python/pylint"
-	elog "dev-python/pysvn            (NOT YET IN PORTAGE)"
-	elog "dev-python/cx_freeze        (NOT YET IN PORTAGE)"
-}
diff --git a/dev-util/eric/eric-4.0.4.ebuild b/dev-util/eric/eric-4.0.4.ebuild
index a8fd01d6229a..966520ffced1 100644
--- a/dev-util/eric/eric-4.0.4.ebuild
+++ b/dev-util/eric/eric-4.0.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/eric/eric-4.0.4.ebuild,v 1.2 2008/01/04 00:44:01 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/eric/eric-4.0.4.ebuild,v 1.3 2008/01/04 08:12:11 hawking Exp $
 
 NEED_PYTHON=2.4
 
@@ -24,13 +24,21 @@ LICENSE="GPL-2"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
 
 DEPEND=">=dev-python/PyQt4-4.1
-	>=x11-libs/qscintilla-2.1
+	>=dev-python/qscintilla-python-2.1
 	>=x11-libs/qt-4.2.0"
+RDEPEND="${DEPEND}"
 
 LANGS="de fr ru"
 
 python_version
 
+pkg_setup() {
+	if ! built_with_use 'dev-python/qscintilla-python' 'qt4'; then
+		eerror "Please build qscintilla-python with qt4 useflag."
+		die "qscintilla-python built without qt4."
+	fi
+}
+
 src_install() {
 	# Change qt dir to be located in ${D}
 	dodir /usr/share/qt4/
diff --git a/dev-util/eric/files/digest-eric-4.0.1 b/dev-util/eric/files/digest-eric-4.0.1
deleted file mode 100644
index bde86255cf20..000000000000
--- a/dev-util/eric/files/digest-eric-4.0.1
+++ /dev/null
@@ -1,12 +0,0 @@
-MD5 bf38d851c86832fa40e07eb75394efc6 eric4-4.0.1.tar.gz 2424209
-RMD160 1abef5c9b537d7ba0d69f92eb571705e0b4da19f eric4-4.0.1.tar.gz 2424209
-SHA256 1dd930531bc0519b03a0b7de7c34714d7494fdf25d69dff2ded638bd1f85bf4d eric4-4.0.1.tar.gz 2424209
-MD5 7a0d9e4bc2e88c96586319c3b86f4075 eric4-i18n-de-4.0.1.tar.gz 393888
-RMD160 0870daf188b8efb1a34543babba7f22748cc0d9c eric4-i18n-de-4.0.1.tar.gz 393888
-SHA256 c9010a9fc4b26f25a620735a273a20402bcaa91db56be1ed0429068ddb1442ef eric4-i18n-de-4.0.1.tar.gz 393888
-MD5 57b684cda5b8ca886b591befd5d30fc6 eric4-i18n-fr-4.0.1.tar.gz 398318
-RMD160 e1b1ad72d56af47d2f9fbdfe42e114612afd9b40 eric4-i18n-fr-4.0.1.tar.gz 398318
-SHA256 9eb27e859983ffed6ddf8ee6e055060e3503733c29d7ebfc84ca3aa640a85665 eric4-i18n-fr-4.0.1.tar.gz 398318
-MD5 4ccd08741d0d60baec47eb2985990372 eric4-i18n-ru-4.0.1.tar.gz 410096
-RMD160 2db0788e03e04fa9cc038914f52dfe464303b041 eric4-i18n-ru-4.0.1.tar.gz 410096
-SHA256 f2308da8079f81f266b528bd331946cd7268daaab531a1bb23e13177cc00f367 eric4-i18n-ru-4.0.1.tar.gz 410096
diff --git a/dev-util/eric/files/digest-eric-4.0.3 b/dev-util/eric/files/digest-eric-4.0.3
deleted file mode 100644
index 1471ccdd3fa5..000000000000
--- a/dev-util/eric/files/digest-eric-4.0.3
+++ /dev/null
@@ -1,12 +0,0 @@
-MD5 cceb5cbe789bdf7de46683b613eb912c eric4-4.0.3.tar.gz 2425285
-RMD160 433465e1099f85455a4633939d21b55d29940e1f eric4-4.0.3.tar.gz 2425285
-SHA256 2a0baa19b6bdb3a76776f21ad5c0f86114fe198e6157ff7e4d2a09240dcd74cc eric4-4.0.3.tar.gz 2425285
-MD5 121dc6cb6429ebac147d8da006fc137f eric4-i18n-de-4.0.3.tar.gz 393889
-RMD160 f4357d4e725bc85a1a1259e1cf24d95c40185b4f eric4-i18n-de-4.0.3.tar.gz 393889
-SHA256 d023921ddc341f43043ebb111cc6758cf6753db62bb74e792f20ca439f3c34be eric4-i18n-de-4.0.3.tar.gz 393889
-MD5 5a8051fe64387bc18ceb2f713f8b10d7 eric4-i18n-fr-4.0.3.tar.gz 398317
-RMD160 064851bc6f6f1e44372b19fc5c95565cabe2ded3 eric4-i18n-fr-4.0.3.tar.gz 398317
-SHA256 70c556704bfbfd27305b77118b5e67f8e85356b16f2554325f3256b27e158d66 eric4-i18n-fr-4.0.3.tar.gz 398317
-MD5 c3b4889c3f2fcd506519d56df01d1415 eric4-i18n-ru-4.0.3.tar.gz 410094
-RMD160 c64e85d10152919f1782f829fb2adab9b333f607 eric4-i18n-ru-4.0.3.tar.gz 410094
-SHA256 ca6b92bd63b67e81c3203738b046a80f463886b8fbb7c4ad3363ee323de61df8 eric4-i18n-ru-4.0.3.tar.gz 410094