Index: general/prog/pycairo.xml
===================================================================
--- general/prog/pycairo.xml	(revision 75c30864a6dbd7523d7b91f1d0265f691ef5b894)
+++ general/prog/pycairo.xml	(revision 7979906f44b46ee772f995985a29448e5b2aab71)
@@ -5,10 +5,9 @@
   %general-entities;
 
-  <!ENTITY pycairo-download-http
-           "http://cairographics.org/releases/pycairo-&pycairo-version;.tar.bz2">
+  <!ENTITY pycairo-download-http "https://github.com/pygobject/pycairo/releases/download/v&pycairo-version;/pycairo-&pycairo-version;.tar.gz">
   <!ENTITY pycairo-download-ftp  " ">
-  <!ENTITY pycairo-md5sum        "e6fd3f2f1e6a72e0db0868c4985669c5">
-  <!ENTITY pycairo-size          "244 KB">
-  <!ENTITY pycairo-buildsize     "3.0 MB">
+  <!ENTITY pycairo-md5sum        "e6e8407d3f51b0b89863872da0760616">
+  <!ENTITY pycairo-size          "140 KB">
+  <!ENTITY pycairo-buildsize     "3.2 MB">
   <!ENTITY pycairo-time          "less than 0.1 SBU">
 ]>
@@ -27,9 +26,10 @@
 
       <para>
-        PyCairo provides <application>Python 3</application> bindings to
+        PyCairo provides <application>Python</application> bindings to
         <application>Cairo</application>.
       </para>
 
       &lfs80_checked;
+      <!-- Does not use gcc -->
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
@@ -67,25 +67,10 @@
       </itemizedlist>
 
-      <bridgehead renderas="sect4">Additional Downloads</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Required patch:
-            <ulink url="&patch-root;/pycairo-&pycairo-version;-waf_unpack-1.patch"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Required patch:
-            <ulink url="&patch-root;/pycairo-&pycairo-version;-waf_python_3_4-1.patch"/>
-          </para>
-        </listitem>
-      </itemizedlist>
-
       <bridgehead renderas="sect4">PyCairo Dependencies</bridgehead>
 
       <bridgehead renderas="sect5">Required</bridgehead>
       <para role="required">
-        <xref linkend="cairo"/> and
+        <xref linkend="cairo"/>, 
+        <xref linkend="python"/>, and/or 
         <xref linkend="python3"/>
       </para>
@@ -100,16 +85,9 @@
 
       <para>
-        Install <application>PyCairo</application> by running the following
-        commands:
+        Install <application>PyCairo</application> for Python2 by running 
+        the following commands:
       </para>
 
-<screen><userinput>patch -Np1 -i ../pycairo-&pycairo-version;-waf_unpack-1.patch     &amp;&amp;
-wafdir=$(./waf unpack) &amp;&amp;
-pushd $wafdir          &amp;&amp;
-patch -Np1 -i ../../pycairo-&pycairo-version;-waf_python_3_4-1.patch &amp;&amp;
-popd                   &amp;&amp;
-unset wafdir           &amp;&amp;
-PYTHON=/usr/bin/python3 ./waf configure --prefix=/usr  &amp;&amp;
-./waf build</userinput></screen>
+<screen><userinput>python2 setup.py build</userinput></screen>
 
       <para>
@@ -121,5 +99,22 @@
       </para>
 
-<screen role="root"><userinput>./waf install</userinput></screen>
+<screen role="root"><userinput>python2 setup.py install --optimize=1</userinput></screen>
+
+      <para>
+        Install <application>PyCairo</application> for Python3 by running 
+        the following commands:
+      </para>
+
+<screen><userinput>python3 setup.py build</userinput></screen>
+
+      <para>
+        This package does not come with a test suite.
+      </para>
+
+      <para>
+        Now, as the <systemitem class="username">root</systemitem> user:
+      </para>
+
+<screen role="root"><userinput>python3 setup.py install --optimize=1</userinput></screen>
 
     </sect3>
@@ -130,6 +125,6 @@
       <segmentedlist>
         <segtitle>Installed Programs</segtitle>
-        <segtitle>Installed Library</segtitle>
-        <segtitle>Installed Directory</segtitle>
+        <segtitle>Installed Libraries</segtitle>
+        <segtitle>Installed Directories</segtitle>
 
         <seglistitem>
@@ -138,8 +133,9 @@
           </seg>
           <seg>
-            None
+            _cairo.so (python2) and 
+            _cairo.cpython-36m-x86_64-linux-gnu.so (python3)
           </seg>
           <seg>
-            /usr/include/pycairo and
+            /usr/lib/python&python2-majorver;/site-packages/cairo and
             /usr/lib/python&python3-majorver;/site-packages/cairo
           </seg>
