Replaced deprecated python_version (fixes bug 314553) and fixes html documentation...

Package-Manager: portage-2.1.7.17/cvs/Linux i686

diff --git a/net-p2p/Circle/ChangeLog b/net-p2p/Circle/ChangeLog
index 9eec915a6aab73f0df717d0fc6b25b9b2d504169..c47977b9bc0df2e5c2748d2aa6591f015a65b691 100644 (file)
--- a/net-p2p/Circle/ChangeLog
+++ b/net-p2p/Circle/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-p2p/Circle
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/Circle/ChangeLog,v 1.13 2007/01/21 16:14:04 armin76 Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/Circle/ChangeLog,v 1.14 2010/04/11 18:11:47 sochotnicky Exp $
+
+  11 Apr 2010; Stanislav Ochotnicky <sochotnicky@gentoo.org>
+  Circle-0.41c.ebuild:
+  Replaced deprecated python_version and fixed html documentation
+  installation
 
   21 Jan 2007; Raúl Porcel <armin76@gentoo.org> -Circle-0.40e.ebuild:
   Drop old

diff --git a/net-p2p/Circle/Circle-0.41c.ebuild b/net-p2p/Circle/Circle-0.41c.ebuild
index 3eb70c2b56339f9d339e0c203740336826e67a50..48f60c9d64c519343fa48fcb79a0c638477b7a8f 100644 (file)
--- a/net-p2p/Circle/Circle-0.41c.ebuild
+++ b/net-p2p/Circle/Circle-0.41c.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/Circle/Circle-0.41c.ebuild,v 1.4 2005/09/06 21:49:32 sekretarz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/Circle/Circle-0.41c.ebuild,v 1.5 2010/04/11 18:11:47 sochotnicky Exp $
 
 inherit python
 
@@ -25,20 +25,19 @@ src_compile() {
 }
 
 src_install() {
-       python_version
        exeinto /usr/bin/
        doexe circle
-       insinto /usr/lib/python${PYVER}/site-packages/circlelib/
+       insinto ${python_get_sitedir}/circlelib
        doins circlelib/*.py
-       insinto /usr/lib/python${PYVER}/site-packages/circlelib/pixmaps/
+       insinto ${python_get_sitedir}/circlelib/pixmaps
        doins circlelib/pixmaps/*
-       insinto /usr/lib/python${PYVER}/site-packages/circlelib/crypto/
+       insinto ${python_get_sitedir}/circlelib/crypto/
        doins circlelib/crypto/*
-       insinto /usr/lib/python${PYVER}/site-packages/circlelib/ui_gtk/
+       insinto ${python_get_sitedir}/circlelib/ui_gtk/
        doins circlelib/ui_gtk/*
-       insinto /usr/lib/python${PYVER}/site-packages/circlelib/ui_http/
+       insinto ${python_get_sitedir}/circlelib/ui_http/
        doins circlelib/ui_http/*
-       insinto /usr/lib/python${PYVER}/site-packages/circlelib/ui_text/
+       insinto ${python_get_sitedir}/circlelib/ui_text/
        doins circlelib/ui_text/*
        insinto /usr/share/pixmaps/
        doins circle-icon.png
@@ -46,6 +45,6 @@ src_install() {
                insinto /usr/share/gnome/apps/Internet/
                doins circle.desktop
        fi
-       dohtml circlelib/*.html
+       dohtml circlelib/html/*.html
        dodoc NEWS PKG-INFO README
 }

diff --git a/net-p2p/Circle/Manifest b/net-p2p/Circle/Manifest
index d4f4bc4b95795d743891a36fa2b6cf7cbf8065f5..812bc4bf9af43fe986ae1fb8ec67db8ec8b0d405 100644 (file)
--- a/net-p2p/Circle/Manifest
+++ b/net-p2p/Circle/Manifest
@@ -1,4 +1,4 @@
 DIST Circle-0.41c.tar.gz 670536 RMD160 0c6f0631d081a6d7d86361a420f3eb05ce18d236 SHA1 a498d8285b6395cc08f302dd89e22307adf5606b SHA256 2b9745dafbfb66488c638cd065773446a131a87e95c2d6069165133b0a1a7fbc
-EBUILD Circle-0.41c.ebuild 1455 RMD160 165eb301798e7889fdfda55174387e615a19956e SHA1 ff57609c6e7bd644f591620799580165c6445ebc SHA256 448a5fa4b3c4fb1b5007dedcdaac9c448d71e0b76ec579faa5dd8341970427b3
-MISC ChangeLog 1562 RMD160 5ca6b863f27d53f60fcf717f281cd0e6262bea7f SHA1 a88632a837329cb25f0c3c94c1048e20a7875d85 SHA256 c804b29c8e9c52094c86f1a3905546975674ebdd68229499f0a0fff0fd9eadaf
+EBUILD Circle-0.41c.ebuild 1348 RMD160 b164628c237061e69f53629c61e4a9e658385e90 SHA1 bede5b1602d3b339af816874319b11ff43a6700a SHA256 e52aeb2acf36397c9b27d9a89eda9ffa15778af54c293415d4f2e4f2daa12776
+MISC ChangeLog 1732 RMD160 b4b5e54ca497b6c5378d0dabac72ab8936753d4d SHA1 2debb55247c6f4f500994ff46174fb2478b22d73 SHA256 6e6aba7ed73b5ee3582f23c2363e77c3968b3a83042663832b07374a25754ff6
 MISC metadata.xml 160 RMD160 828887200387b28c37fc97111fc6bc3a0a2fcccd SHA1 813ef5bc57f6a8d95e7cab7a745a2a824858f49c SHA256 fe06593409e7f28665c032001005e94cb650299711a0af7f1a558bdb56c4004f