Update EAPI. Fix dependencies. Set SUPPORT_PYTHON_ABIS.

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

3 files changed, 26 insertions, 18 deletions

diff --git a/dev-python/htmlgen/ChangeLog b/dev-python/htmlgen/ChangeLog
index a57fa0958fe8..7a43bd13a21d 100644
--- a/dev-python/htmlgen/ChangeLog
+++ b/dev-python/htmlgen/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/htmlgen
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/htmlgen/ChangeLog,v 1.12 2009/07/18 01:52:56 arfrever Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/htmlgen/ChangeLog,v 1.13 2010/11/08 17:08:41 arfrever Exp $
+
+  08 Nov 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  htmlgen-2.2.2.ebuild:
+  Update EAPI. Fix dependencies. Set SUPPORT_PYTHON_ABIS.
 
   18 Jul 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
   htmlgen-2.2.2.ebuild, +files/htmlgen-2.2.2-python-2.5.patch:
diff --git a/dev-python/htmlgen/Manifest b/dev-python/htmlgen/Manifest
index 66b8484fca91..6012e48def46 100644
--- a/dev-python/htmlgen/Manifest
+++ b/dev-python/htmlgen/Manifest
@@ -1,5 +1,5 @@
 AUX htmlgen-2.2.2-python-2.5.patch 5226 RMD160 c4b1aa148caacc5479ef5d8534b0fb51742335b7 SHA1 c5b754da68fafd5a4e6b005fd005f36f4812b6cb SHA256 68e4ab27bcdee920df71143b6897635b9619100b2fca4c3eff59ae159f84eea6
 DIST HTMLgen.tgz 316415 RMD160 bb32b2822f7ce8e49eb42853aff330429df073de SHA1 a34b9c1f9cf5536a548c66522213ac9fee1b43cd SHA256 f3b39b4b07b5dd318780ad0e9b8b3c524a54138537697dd7966223f314d2177d
-EBUILD htmlgen-2.2.2.ebuild 1586 RMD160 df225f6a11509363add298c54c4131ddb3bb0005 SHA1 9722e39e0d1b6593a4df0e5bec056a460815e6dd SHA256 1159eef19be00fe8145f25775381aeba138b447a24d5954ceae44c85d2622876
-MISC ChangeLog 1491 RMD160 d2def329e1d994764ead62ba7cfd441ef0b1af73 SHA1 4f666a3628a2777d898b5c269d08e130ffc4d638 SHA256 635488725aa034bc1e2dae5029d0711ee0687afbfce55836bca6e73741317f0c
+EBUILD htmlgen-2.2.2.ebuild 1627 RMD160 d685efb355496bd6d19418f14f7e058c3b8885af SHA1 53bf7e31b3feb8d136b0ed6d35cd664c8ddfd928 SHA256 161070ca46c41f6922294c7a218665e955807c0f1dd80306ac3d21d7294f157f
+MISC ChangeLog 1647 RMD160 ad320a5757bcee3c2db8bdfa9429d40e51e2c09f SHA1 382d2a95332454874fdb745c6ccc10daf677b07b SHA256 d92f8eef8f6cb9e53acf85ff9bff5a17c09b335002308c6e62e34f843bf28480
 MISC metadata.xml 159 RMD160 900a8c55d7a7d2f6312594769aaf941bf9e99c7f SHA1 c8e604d56dae898258b5254d78cfeac0b981e288 SHA256 9f01104d3484792496faff4805eed0ecea2352a897151f3397d49a13800037b4
diff --git a/dev-python/htmlgen/htmlgen-2.2.2.ebuild b/dev-python/htmlgen/htmlgen-2.2.2.ebuild
index 03d050193e57..72df958f26e8 100644
--- a/dev-python/htmlgen/htmlgen-2.2.2.ebuild
+++ b/dev-python/htmlgen/htmlgen-2.2.2.ebuild
@@ -1,8 +1,11 @@
-# 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-python/htmlgen/htmlgen-2.2.2.ebuild,v 1.15 2009/07/18 01:52:56 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/htmlgen/htmlgen-2.2.2.ebuild,v 1.16 2010/11/08 17:08:41 arfrever Exp $
 
-EAPI="2"
+EAPI="3"
+PYTHON_DEPEND="2"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.*"
 
 inherit eutils python
 
@@ -16,8 +19,8 @@ SLOT="0"
 KEYWORDS="~amd64 ia64 ppc x86"
 IUSE="doc"
 
-DEPEND="virtual/python
-		dev-python/imaging"
+DEPEND="dev-python/imaging"
+RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${MY_P}"
 
@@ -26,18 +29,19 @@ src_prepare() {
 }
 
 src_install() {
-	python_need_rebuild
-
 	# doing this manually because their build scripts suck
-	local files="HTMLgen.py HTMLcolors.py HTMLutil.py HTMLcalendar.py \
-	barchart.py colorcube.py imgsize.py NavLinks.py Formtools.py \
-	ImageH.py ImageFileH.py ImagePaletteH.py GifImagePluginH.py \
+	local files="HTMLgen.py HTMLcolors.py HTMLutil.py HTMLcalendar.py
+	barchart.py colorcube.py imgsize.py NavLinks.py Formtools.py
+	ImageH.py ImageFileH.py ImagePaletteH.py GifImagePluginH.py
 	JpegImagePluginH.py PngImagePluginH.py"
 
 	touch __init__.py
 
-	insinto $(python_get_sitedir)/htmlgen
-	doins $files __init__.py || die "doins failed"
+	installation() {
+		insinto $(python_get_sitedir)/htmlgen
+		doins ${files} __init__.py
+	}
+	python_execute_function installation
 
 	if use doc; then
 		# fix the image locations in the docs
@@ -49,12 +53,12 @@ src_install() {
 }
 
 pkg_postinst() {
-	python_mod_optimize $(python_get_sitedir)/htmlgen
+	python_mod_optimize htmlgen
 
 	ewarn "htmlgen now resides in its own subdirectory"
 	ewarn "so you need to do \"from htmlgen import HTMLgen\" instead of \"import HTMLgen\""
 }
 
 pkg_postrm () {
-	python_mod_cleanup $(python_get_sitedir)/htmlgen
+	python_mod_cleanup htmlgen
 }