Set MY_PACKAGE. Use twisted.eclass instead of distutils.eclass. Use twisted_pkg_postinst() and twisted_pkg_postrm() and avoid custom regeneration of Twisted plugin cache.

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

2 files changed, 10 insertions, 29 deletions

diff --git a/dev-python/twisted/ChangeLog b/dev-python/twisted/ChangeLog
index fd28dada94b1..97dd202b47f6 100644
--- a/dev-python/twisted/ChangeLog
+++ b/dev-python/twisted/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/twisted
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted/ChangeLog,v 1.130 2010/08/18 22:36:02 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted/ChangeLog,v 1.131 2010/10/10 19:55:05 arfrever Exp $
+
+  10 Oct 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  twisted-10.1.0.ebuild:
+  Set MY_PACKAGE. Use twisted.eclass instead of distutils.eclass. Use
+  twisted_pkg_postinst() and twisted_pkg_postrm() and avoid custom
+  regeneration of Twisted plugin cache.
 
   18 Aug 2010; Markos Chandras <hwoarang@gentoo.org> twisted-10.1.0.ebuild:
   Stable on amd64 wrt bug #333211
diff --git a/dev-python/twisted/twisted-10.1.0.ebuild b/dev-python/twisted/twisted-10.1.0.ebuild
index 907f8b4e4407..c09f77afd48e 100644
--- a/dev-python/twisted/twisted-10.1.0.ebuild
+++ b/dev-python/twisted/twisted-10.1.0.ebuild
@@ -1,19 +1,17 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted/twisted-10.1.0.ebuild,v 1.2 2010/08/18 22:36:02 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted/twisted-10.1.0.ebuild,v 1.3 2010/10/10 19:55:05 arfrever Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2"
 SUPPORT_PYTHON_ABIS="1"
 RESTRICT_PYTHON_ABIS="3.*"
+MY_PACKAGE="Core"
 
-inherit distutils eutils versionator
-
-MY_P="TwistedCore-${PV}"
+inherit eutils twisted versionator
 
 DESCRIPTION="An asynchronous networking framework written in Python"
 HOMEPAGE="http://www.twistedmatrix.com/ http://pypi.python.org/pypi/Twisted"
-SRC_URI="http://tmrc.mit.edu/mirror/${PN}/Core/$(get_version_component_range 1-2)/${MY_P}.tar.bz2"
 
 LICENSE="MIT"
 SLOT="0"
@@ -26,8 +24,6 @@ DEPEND=">=net-zope/zope-interface-3.0.1
 	serial? ( dev-python/pyserial )"
 RDEPEND="${DEPEND}"
 
-S="${WORKDIR}/${MY_P}"
-
 DOCS="CREDITS NEWS README"
 
 src_prepare(){
@@ -100,24 +96,3 @@ src_install() {
 	insinto /usr/share/zsh/site-functions
 	doins twisted/python/_twisted_zsh_stub
 }
-
-update_plugin_cache() {
-	rm -f "${EROOT%/}$(python_get_sitedir)/twisted/plugins/dropin.cache"
-
-	# Update dropin.cache only when Twisted is still installed.
-	if [[ -f "${EROOT%/}$(python_get_sitedir)/twisted/plugin.py" ]]; then
-		einfo "Regeneration of Twisted plugin cache with $(python_get_implementation) $(python_get_version)"
-		# http://twistedmatrix.com/documents/current/core/howto/plugin.html
-		"$(PYTHON)" -c "import sys; sys.path.insert(0, '${EROOT%/}$(python_get_sitedir)'); from twisted.plugin import IPlugin, getPlugins; list(getPlugins(IPlugin))"
-	fi
-}
-
-pkg_postinst() {
-	distutils_pkg_postinst
-	python_execute_function -q update_plugin_cache
-}
-
-pkg_postrm() {
-	distutils_pkg_postrm
-	python_execute_function -q update_plugin_cache
-}