01/01: gnu: python2-py2cairo: Rename to python2-pycairo.

[Andreas Enge]

andreas pushed a commit to branch master
in repository guix.

commit 7ca0dbc3f063ef26c6eff87ec9661eab84af5c85
Author: Andreas Enge <address@hidden>
Date:   Fri Feb 27 23:53:57 2015 +0100

    gnu: python2-py2cairo: Rename to python2-pycairo.
    
    * gnu/packages/gtk.scm (python2-py2cairo): Rename to ...
      (python2-pycairo): ... this
      (python2-pygtk): Adapt input.
    * gnu/packages/glib.scm (python2-pygobject-2): Adapt input.
    * gnu/packages/python.scm (package-with-python2): Adapt input.
---
 gnu/packages/glib.scm   |    6 +++---
 gnu/packages/gtk.scm    |    8 ++++----
 gnu/packages/python.scm |    2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm
index 66ee4fa..a2c01e6 100644
--- a/gnu/packages/glib.scm
+++ b/gnu/packages/glib.scm
@@ -212,11 +212,11 @@ dynamic loading, and an object system.")
                    "/gobject-introspection-" version ".tar.xz"))
              (sha256
               (base32 "1xwm7wmr9r9wp6xljb3bckx3a4siybavaq39w46ly7gpskxfv8iv"))
-             (patches (list 
+             (patches (list
                        (search-patch "gobject-introspection-cc.patch")
                        (search-patch
                         "gobject-introspection-girepository.patch")
-                       (search-patch 
+                       (search-patch
                         "gobject-introspection-absolute-shlib-path.patch")))))
     (build-system gnu-build-system)
     (inputs
@@ -466,7 +466,7 @@ useful for C++.")
     (inputs
      `(("python" ,python-2)
        ("glib"   ,glib)
-       ("python2-py2cairo" ,python2-py2cairo)
+       ("python2-pycairo" ,python2-pycairo)
        ("gobject-introspection" ,gobject-introspection)))
     (propagated-inputs
      `(("libffi" ,libffi)))             ;mentioned in pygobject-2.0.pc
diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index a5022ba..81f912e 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -532,7 +532,7 @@ graphics library with all of the benefits of Scheme: memory 
management,
 exceptions, macros, and a dynamic programming environment.")
     (license license:lgpl3+)))
 
-
+
 ;;;
 ;;; C++ bindings.
 ;;;
@@ -705,9 +705,9 @@ extensive documentation, including API reference and a 
tutorial.")
      "Pycairo is a set of Python bindings for the Cairo graphics library.")
     (license license:lgpl3+)))
 
-(define-public python2-py2cairo
+(define-public python2-pycairo
   (package (inherit python-pycairo)
-    (name "python2-py2cairo")
+    (name "python2-pycairo")
     (version "1.10.0")
     (source
      (origin
@@ -743,7 +743,7 @@ extensive documentation, including API reference and a 
tutorial.")
      `(("python" ,python-2)
        ("glib"   ,glib)))
     (propagated-inputs
-     `(("python-pycairo"   ,python2-py2cairo)    ;loaded at runtime
+     `(("python-pycairo"   ,python2-pycairo)     ;loaded at runtime
        ("python-pygobject" ,python2-pygobject-2) ;referenced in pc file
        ("gtk+"             ,gtk+-2)))
     (arguments
diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index bbff241..014e592 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -2290,7 +2290,7 @@ toolkits.")
       ;; Make sure we use exactly PYTHON2-NUMPYDOC, which is
       ;; customized for Python 2.
       (propagated-inputs
-       `(("python2-py2cairo" ,python2-py2cairo)
+       `(("python2-pycairo" ,python2-pycairo)
          ("python2-pygobject-2" ,python2-pygobject-2)
          ,@(alist-delete "python-pycairo"
                          (alist-delete "python-pygobject"