Set SUPPORT_PYTHON_ABIS. Update message in pkg_postinst() (bug #282589).

Package-Manager: portage-14153-svn/cvs/Linux x86_64

3 files changed, 32 insertions, 19 deletions

diff --git a/dev-util/eric/ChangeLog b/dev-util/eric/ChangeLog
index 5406b03daa22..a3532c75b69e 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.86 2009/08/01 15:00:33 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/eric/ChangeLog,v 1.87 2009/08/24 20:21:54 arfrever Exp $
+
+  24 Aug 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  eric-4.3.6.ebuild:
+  Set SUPPORT_PYTHON_ABIS. Update message in pkg_postinst() (bug #282589).
 
 *eric-4.3.6 (01 Aug 2009)
 
diff --git a/dev-util/eric/Manifest b/dev-util/eric/Manifest
index d8c04feabf1c..0b3ba8700610 100644
--- a/dev-util/eric/Manifest
+++ b/dev-util/eric/Manifest
@@ -45,6 +45,6 @@ EBUILD eric-4.3.1.ebuild 2429 RMD160 68be29d2e18d8a070af40ba910cb960b31ffa3be SH
 EBUILD eric-4.3.3.ebuild 2508 RMD160 5bd0f417c5072f6b6b7a5ecdd83bc27722b87bea SHA1 2b73883a1d0d75d21f5594cdc8817279ba6d647a SHA256 f57d22e83856595a01e04b003cefddbe42e331c38f2eccc74f27a5fbc9c83bd4
 EBUILD eric-4.3.4.ebuild 2503 RMD160 474568c3aad819c0c5be2d6b184a1e9a009131ef SHA1 df8c696f752e0a57270bc515e6dbfeeec52950ed SHA256 9b5b765db80dcc5598aeab2994647edf82d417ec17f5a7cfe8bf3f608779469c
 EBUILD eric-4.3.5.ebuild 2462 RMD160 a75f3b145ff93d3700a49184128702c466ca93ee SHA1 0ad671bf796f64764d6938a73e452e3f309b4803 SHA256 87d557381357c6b1a074979e2016702ec24d618f8c05cbde210e065bcba1fec0
-EBUILD eric-4.3.6.ebuild 2462 RMD160 62afa0cbef91eff5fbd0f24956fdf534e66f86a6 SHA1 97a3262d753b87028665e3a67d2165bdf6916695 SHA256 f833c80235045319de983025f50e20be5c7ef2d874c880553da5241bb8f8bc12
-MISC ChangeLog 11234 RMD160 665040d2787865f7c294431c2258b64b036dfb9f SHA1 7d8ece50e55fd7c5dd9491156b518ab0f5c00bc2 SHA256 3ba228466e04593fb19c5a406ad398847c2cb1116604b4dbe86f60891d9d4244
+EBUILD eric-4.3.6.ebuild 2459 RMD160 f3c4af0b5bf8b82a6a81872c9960f044e7894805 SHA1 52512e70e0c711bd9a3d84c9f35ca460e21fafd9 SHA256 095071667543b9bb9c10804cdfe19a1001d3836a26c2a15bef541f48b7468802
+MISC ChangeLog 11404 RMD160 90c14b88f0cbeeb18b5ea6639ddcc1db8831ce61 SHA1 f11508f5f9210195d2b38e48f5a98396f1d0b691 SHA256 bb1c72e03f7ca0fe3eb89155bd7570611509a81e7c302372331336f9099e725e
 MISC metadata.xml 179 RMD160 887c899594fdaa3d82028c3d84188354d3784cd9 SHA1 551c6b2378ff31eadc1e4860211ec8709ce960bd SHA256 1fbdee58e0ba0f8730f6a27979cb7eeed8ebd3afa316d61b34a5f4893291a646
diff --git a/dev-util/eric/eric-4.3.6.ebuild b/dev-util/eric/eric-4.3.6.ebuild
index 118f8408ba30..823eb7126330 100644
--- a/dev-util/eric/eric-4.3.6.ebuild
+++ b/dev-util/eric/eric-4.3.6.ebuild
@@ -1,10 +1,12 @@
 # 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.6.ebuild,v 1.1 2009/08/01 15:00:33 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/eric/eric-4.3.6.ebuild,v 1.2 2009/08/24 20:21:54 arfrever Exp $
 
 EAPI="2"
-NEED_PYTHON=2.4
-inherit python eutils
+NEED_PYTHON="2.4"
+SUPPORT_PYTHON_ABIS="1"
+
+inherit eutils python
 
 MY_PN=${PN}4
 MY_P=${MY_PN}-${PV}
@@ -28,6 +30,8 @@ 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"
@@ -40,14 +44,19 @@ src_prepare() {
 
 src_install() {
 	# Change qt dir to be located in ${D}
-	dodir /usr/share/qt4/
-	${python} install.py \
-		-z \
-		-b "/usr/bin" \
-		-i "${D}" \
-		-d "/usr/$(get_libdir)/python${PYVER}/site-packages" \
-		-c || die "python install.py failed"
+	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" \
@@ -55,18 +64,18 @@ src_install() {
 }
 
 pkg_postinst() {
-	python_version
-	python_mod_optimize /usr/$(get_libdir)/python${PYVER}/site-packages/eric4{,plugins}
+	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
-	elog "dev-python/pylint"
-	elog "dev-python/pysvn            (in sunrise overlay atm)"
+	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() {