Fix last python related changes a suggested by Arfrever

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

3 files changed, 10 insertions, 8 deletions

diff --git a/media-libs/hamlib/ChangeLog b/media-libs/hamlib/ChangeLog
index 203dca8ffee3..a3ffe79ed1da 100644
--- a/media-libs/hamlib/ChangeLog
+++ b/media-libs/hamlib/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-libs/hamlib
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/hamlib/ChangeLog,v 1.53 2010/12/22 12:41:00 tomjbe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/hamlib/ChangeLog,v 1.54 2010/12/22 18:47:32 tomjbe Exp $
+
+  22 Dec 2010; Thomas Beierlein <tomjbe@gentoo.org> hamlib-1.2.12-r2.ebuild:
+  Fix last python related changes a suggested by Arfrever
 
 *hamlib-1.2.12-r2 (22 Dec 2010)
 
diff --git a/media-libs/hamlib/Manifest b/media-libs/hamlib/Manifest
index 85216bb1ff31..e5bce808fbe4 100644
--- a/media-libs/hamlib/Manifest
+++ b/media-libs/hamlib/Manifest
@@ -6,7 +6,7 @@ DIST hamlib-1.2.12.tar.gz 1860387 RMD160 9216b1801b458968d299d4c4e2141a4b15df04d
 EBUILD hamlib-1.2.10.ebuild 2002 RMD160 b677cf37d3e7d0560313353fa13b7ddd780466ae SHA1 02657809c0c7e9defe9305cade66c08cca006afe SHA256 b857aa531c38ba3900a452b7d9b8420e8488bb63217ef0abed82a17f74949110
 EBUILD hamlib-1.2.11.ebuild 1786 RMD160 8aa35a9607db0be4a8bf2c95f813457201f13c45 SHA1 d1aba3f23305f1fa5b8d21ca7a3500a37f460414 SHA256 aa80ca3375598e3a0c5c72ddc5afd9f5a5bd26e97135973e9c06d6ad0c9f9891
 EBUILD hamlib-1.2.12-r1.ebuild 1835 RMD160 240050e7cf640c0acd91ef99cd73341fc350ae7d SHA1 3b791b1c0b16710a276033ac7730e5855a2054ec SHA256 4e967cc77fc46000bd39656e5196ca851ea738872fb4ef0cdb35b7a6791f2eef
-EBUILD hamlib-1.2.12-r2.ebuild 2010 RMD160 3b290895d1983af70a1d3f29800efc0d9651fb79 SHA1 eb8429c99272595891464503dc25eb97daf747ed SHA256 00cbce0f8032cea802f845f855c993d845570fc958abc8fa833db2f92fe16980
+EBUILD hamlib-1.2.12-r2.ebuild 2020 RMD160 dba93b0a0f0b29cf829385cd182529027a04298f SHA1 1bbfcdce545171a2451be8557612728acf281133 SHA256 caba03f009b7d35c22460d1241bec84e54b08cbf1e687b077fabff3caec32948
 EBUILD hamlib-1.2.12.ebuild 1795 RMD160 a9b14c7890e4db14ce23d5c3e88aafc8dff5d724 SHA1 825eb1c1e59091a15c6779ac30659e7fc6faee6e SHA256 0eaf29054319547a2710b12437548316df5b0d56a6e178f5da46a941894944c2
-MISC ChangeLog 8565 RMD160 d1bf32d2ed210874653e032ec1732f970124128d SHA1 9f239451366522dd33361ea9181ac210b186720d SHA256 8937fafa86684a56e880a01ed910da79f316ff394a52c20b18fb859097513204
+MISC ChangeLog 8701 RMD160 50f956c4843f587966d51e6253b4b69e19c513d4 SHA1 895febb818c5bfeefa594e8ddd23e14a4a963d40 SHA256 9ed67d1bb565eee739d4ca3cab499660f0df4d05c45db1143b5a8ffa2d6403bc
 MISC metadata.xml 257 RMD160 c6f05f5951c1ad7388dd56f4abe0ccdbe23505dd SHA1 e31f6d71d2344810cca782e2accf9058eeb2c1fd SHA256 e52fb7be2e8c1ca2b7ce0066517558a34ee01c9e6340e0a31a053594b9077eda
diff --git a/media-libs/hamlib/hamlib-1.2.12-r2.ebuild b/media-libs/hamlib/hamlib-1.2.12-r2.ebuild
index a49be8fb70b8..ebff97678442 100644
--- a/media-libs/hamlib/hamlib-1.2.12-r2.ebuild
+++ b/media-libs/hamlib/hamlib-1.2.12-r2.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/hamlib/hamlib-1.2.12-r2.ebuild,v 1.1 2010/12/22 12:41:00 tomjbe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/hamlib/hamlib-1.2.12-r2.ebuild,v 1.2 2010/12/22 18:47:32 tomjbe Exp $
 
 EAPI="2"
-PYTHON_DEPEND="2"
+PYTHON_DEPEND="python? 2"
 
 inherit autotools-utils eutils multilib python
 
@@ -21,7 +21,6 @@ RESTRICT="test"
 RDEPEND="
 	=virtual/libusb-0*
 	dev-libs/libxml2
-	python? ( <dev-lang/python-3 )
 	tcl? ( dev-lang/tcl )"
 
 DEPEND=" ${RDEPEND}
@@ -83,9 +82,9 @@ src_install() {
 }
 
 pkg_postinst()  {
-	python_mod_optimize $(python_get_sitedir)
+	use python && python_mod_optimize $(python_get_sitedir)/Hamlib.py
 }
 
 pkg_postrm()  {
-	python_mod_cleanup $(python_get_sitedir)
+	python_mod_cleanup $(python_get_sitedir)/Hamlib.py
 }