Simplify PYTHON_DEPEND. Don't install *.pyc and *.pyo files. Use python_src_install...

Package-Manager: portage-2.1.10.41/cvs/Linux x86_64

diff --git a/dev-python/pydb/ChangeLog b/dev-python/pydb/ChangeLog
index 2e26d09113b089c6225ea788c82a28f6f7438563..7f8f37c3fb19c7dc6d0c226b552f3e711fbf4840 100644 (file)
--- a/dev-python/pydb/ChangeLog
+++ b/dev-python/pydb/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-python/pydb
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pydb/ChangeLog,v 1.6 2011/12/24 15:41:51 maksbotan Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pydb/ChangeLog,v 1.7 2011/12/27 18:00:54 maksbotan Exp $
+
+  27 Dec 2011; Maxim Koltsov <maksbotan@gentoo.org> pydb-1.26-r1.ebuild:
+  Simplify PYTHON_DEPEND. Don't install *.pyc and *.pyo files. Use
+  python_src_install(). Call python_mod_optimize() and python_mod_cleanup().
+  Patch by Arfrever.
 
 *pydb-1.26-r1 (24 Dec 2011)
 

diff --git a/dev-python/pydb/Manifest b/dev-python/pydb/Manifest
index 0e3e265be5dca69153b9254989735f5e1166fc87..c31c830dcccd700f5123199826fc7ea26f28440f 100644 (file)
--- a/dev-python/pydb/Manifest
+++ b/dev-python/pydb/Manifest
@@ -1,5 +1,5 @@
 DIST pydb-1.26.tar.bz2 572184 RMD160 ecefe104f58b0857ec2e17d6d0421e28030d6160 SHA1 7f2de4530c3399cfb380fccdc440f5a8e14cc989 SHA256 01131848a58fce6a529766488884848c06068aa9ec4f39e19f8fb4d260f893f2
-EBUILD pydb-1.26-r1.ebuild 1338 RMD160 b78e392c4b1d87cffc966fa2a680011f0fa4705d SHA1 ab0dbccb27106bee767c1bca338c958cc2308e98 SHA256 f9fda38645c879729b0a3078419848a345e1aa8bb79d7bac0e61ecaf3c18d192
+EBUILD pydb-1.26-r1.ebuild 1324 RMD160 851f3f4a66e3c7837522c7444700cb6a25473911 SHA1 ca5d1c898185d3ef3b15eb8a3c5df5f8504fe549 SHA256 6d114086afdae80636ea18e3dd1b83d2b6e62bc2f1323548ee31afdcc35e3e61
 EBUILD pydb-1.26.ebuild 873 RMD160 689b638bfab9044fc76e8d4b38017b142c5d5ba3 SHA1 a57ee242aa10183bc262269bd33aee2f28a17526 SHA256 46c48307d5b721f41c469599e7017e6b67911c9764e567eaa009cf8c0df43bf6
-MISC ChangeLog 906 RMD160 33c52d8e49643e30e0849e06f0e69a65d214acb0 SHA1 0781c376c23dbbe2338df07e460bb038a731fcbd SHA256 a610db7dcbced155f40f8aa770f88498180fc043de4179a651f9a285ba134120
+MISC ChangeLog 1145 RMD160 5790bbf7a158b485e473f7f1bd0922eeef0c80c5 SHA1 0b452ec83e20c7bb8f384dd57545dcd996b0087b SHA256 94c749dd4dda291396a516b8018f0a45e0112560fe4e985422a0af6fd2bb8b27
 MISC metadata.xml 314 RMD160 122a3f09eb67c552d6aafe5104afaa7758204ebe SHA1 07a94cc27a901bc6aa6a9f357dc056254507f7ef SHA256 39e7e6e79a87600d9098557feda0da997fb238adc03130e52eef4b7c4f250c86

diff --git a/dev-python/pydb/pydb-1.26-r1.ebuild b/dev-python/pydb/pydb-1.26-r1.ebuild
index a2af8c36f32ab6a24969659e62f060fab29adb7b..b5c9d468a10062573229573794af064e77e4e00b 100644 (file)
--- a/dev-python/pydb/pydb-1.26-r1.ebuild
+++ b/dev-python/pydb/pydb-1.26-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pydb/pydb-1.26-r1.ebuild,v 1.1 2011/12/24 15:41:51 maksbotan Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pydb/pydb-1.26-r1.ebuild,v 1.2 2011/12/27 18:00:54 maksbotan Exp $
 
 EAPI=4
 
-PYTHON_DEPEND="2:2.4"
+PYTHON_DEPEND="2"
 SUPPORT_PYTHON_ABIS="1"
 RESTRICT_PYTHON_ABIS="3.*"
 PYTHON_EXPORT_PHASE_FUNCTIONS="1"
@@ -23,9 +23,14 @@ DEPEND="
        emacs? ( virtual/emacs )"
 RDEPEND="${DEPEND}"
 
-# This package uses not distutils but the usual
-# ./configure; make; make install
-# The default src_compile is OK
+src_prepare() {
+       echo "#!/bin/sh" > py-compile
+
+       # Fix pydb symlinks.
+       sed -e '/$(LN_S) "$(DESTDIR)$(pkgpythondir)\/$(python_debugger_script)" "$(DESTDIR)$(bindir)\/$(bin_SCRIPTS)"/s/$(DESTDIR)$(pkgpythondir)/$(pkgpythondir)/' -i Makefile.in
+
+       python_src_prepare
+}
 
 src_configure() {
        configuration() {
@@ -38,12 +43,14 @@ src_configure() {
 }
 
 src_install() {
-       installation(){
-               emake DESTDIR="${D}" install || die "emake install failed"
-               mv "${ED}"/usr/bin/${PN} "${ED}"/usr/bin/${PN}-${PYTHON_ABI} || die
-       }
-       python_execute_function -s installation
-       python_generate_wrapper_scripts "${ED}"/usr/bin/${PN}
+       python_src_install
+       dodoc AUTHORS ChangeLog NEWS README THANKS TODO
+}
+
+pkg_postinst() {
+       python_mod_optimize pydb
+}
 
-       dodoc AUTHORS ChangeLog NEWS README THANKS TODO || die "dodoc failed"
+pkg_postrm() {
+       python_mod_cleanup pydb
 }